Compare commits

...

9 Commits

Author SHA1 Message Date
f48fc55798 fix: grow music inventory dynamically 2025-01-25 21:34:11 +01:00
11b806bd4d Update dependency gradle to v8.12.1 (#4581)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-24 14:14:20 +00:00
0275372051 Update dependency com.github.spotbugs:spotbugs-annotations to v4.9.0 (#4572)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-16 13:14:02 +00:00
c18cf3acfe Update dependency com.diffplug.spotless to v7.0.2 (#4571)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-14 21:41:40 +00:00
fa52149394 Update dependency com.diffplug.spotless to v7.0.1 (#4566)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-07 20:31:41 +00:00
f5108ec253 Update dependency com.diffplug.spotless to v7 (#4565)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-07 09:10:19 +00:00
a7058eeff2 Update eps1lon/actions-label-merge-conflict action to v3.0.3 (#4564)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-07 08:01:24 +00:00
eabae8db44 Update dependency org.checkerframework:checker-qual to v3.48.4 (#4563)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-01-07 08:01:08 +00:00
a836e8e763 Back to snapshot for development
Signed-off-by: Alexander Brandes <mc.cache@web.de>
2024-12-30 21:07:08 +01:00
5 changed files with 10 additions and 7 deletions

View File

@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Label conflicting PRs
uses: eps1lon/actions-label-merge-conflict@v3.0.2
uses: eps1lon/actions-label-merge-conflict@v3.0.3
with:
dirtyLabel: "unresolved-merge-conflict"
repoToken: "${{ secrets.GITHUB_TOKEN }}"

View File

@ -60,6 +60,9 @@ public class Music extends SubCommand {
"music_disc_creator_music_box", "music_disc_precipice"
);
// make sure all discs and the bedrock ("cancel") fit into the inventory
private static final int INVENTORY_ROWS = (int) Math.ceil((DISCS.size() + 1) / 9.0);
private final InventoryUtil inventoryUtil;
private final EventDispatcher eventDispatcher;
@ -94,7 +97,7 @@ public class Music extends SubCommand {
PlotInventory inv = new PlotInventory(
this.inventoryUtil,
player,
2,
INVENTORY_ROWS,
TranslatableCaption.of("plotjukebox.jukebox_header").getComponent(player)
) {
@Override

View File

@ -22,7 +22,7 @@ plugins {
}
group = "com.intellectualsites.plotsquared"
version = "7.4.1"
version = "7.4.2-SNAPSHOT"
if (!File("$rootDir/.git").exists()) {
logger.lifecycle("""

View File

@ -2,8 +2,8 @@
# Platform expectations
paper = "1.20.4-R0.1-SNAPSHOT"
guice = "7.0.0"
spotbugs = "4.8.6"
checkerqual = "3.48.3"
spotbugs = "4.9.0"
checkerqual = "3.48.4"
gson = "2.10"
guava = "31.1-jre"
snakeyaml = "2.0"
@ -35,7 +35,7 @@ serverlib = "2.3.6"
# Gradle plugins
shadow = "8.3.5"
grgit = "4.1.1"
spotless = "6.25.0"
spotless = "7.0.2"
nexus = "2.0.0"
runPaper = "2.3.1"

View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME