mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-06 23:54:43 +02:00
Compare commits
12 Commits
Author | SHA1 | Date | |
---|---|---|---|
e9baa802ec | |||
63e2d325cf | |||
94abd69e22 | |||
661e4ae8d3 | |||
974c639a51 | |||
11b806bd4d | |||
0275372051 | |||
c18cf3acfe | |||
fa52149394 | |||
f5108ec253 | |||
a7058eeff2 | |||
eabae8db44 |
2
.github/workflows/label-merge-conflicts.yaml
vendored
2
.github/workflows/label-merge-conflicts.yaml
vendored
@ -15,7 +15,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Label conflicting PRs
|
- name: Label conflicting PRs
|
||||||
uses: eps1lon/actions-label-merge-conflict@v3.0.2
|
uses: eps1lon/actions-label-merge-conflict@v3.0.3
|
||||||
with:
|
with:
|
||||||
dirtyLabel: "unresolved-merge-conflict"
|
dirtyLabel: "unresolved-merge-conflict"
|
||||||
repoToken: "${{ secrets.GITHUB_TOKEN }}"
|
repoToken: "${{ secrets.GITHUB_TOKEN }}"
|
||||||
|
@ -60,6 +60,9 @@ public class Music extends SubCommand {
|
|||||||
"music_disc_creator_music_box", "music_disc_precipice"
|
"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 InventoryUtil inventoryUtil;
|
||||||
private final EventDispatcher eventDispatcher;
|
private final EventDispatcher eventDispatcher;
|
||||||
|
|
||||||
@ -94,7 +97,7 @@ public class Music extends SubCommand {
|
|||||||
PlotInventory inv = new PlotInventory(
|
PlotInventory inv = new PlotInventory(
|
||||||
this.inventoryUtil,
|
this.inventoryUtil,
|
||||||
player,
|
player,
|
||||||
2,
|
INVENTORY_ROWS,
|
||||||
TranslatableCaption.of("plotjukebox.jukebox_header").getComponent(player)
|
TranslatableCaption.of("plotjukebox.jukebox_header").getComponent(player)
|
||||||
) {
|
) {
|
||||||
@Override
|
@Override
|
||||||
|
@ -22,7 +22,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
group = "com.intellectualsites.plotsquared"
|
group = "com.intellectualsites.plotsquared"
|
||||||
version = "7.4.2-SNAPSHOT"
|
version = "7.4.2"
|
||||||
|
|
||||||
if (!File("$rootDir/.git").exists()) {
|
if (!File("$rootDir/.git").exists()) {
|
||||||
logger.lifecycle("""
|
logger.lifecycle("""
|
||||||
|
@ -2,8 +2,8 @@
|
|||||||
# Platform expectations
|
# Platform expectations
|
||||||
paper = "1.20.4-R0.1-SNAPSHOT"
|
paper = "1.20.4-R0.1-SNAPSHOT"
|
||||||
guice = "7.0.0"
|
guice = "7.0.0"
|
||||||
spotbugs = "4.8.6"
|
spotbugs = "4.9.1"
|
||||||
checkerqual = "3.48.3"
|
checkerqual = "3.49.0"
|
||||||
gson = "2.10"
|
gson = "2.10"
|
||||||
guava = "31.1-jre"
|
guava = "31.1-jre"
|
||||||
snakeyaml = "2.0"
|
snakeyaml = "2.0"
|
||||||
@ -33,9 +33,9 @@ vault = "1.7.1"
|
|||||||
serverlib = "2.3.6"
|
serverlib = "2.3.6"
|
||||||
|
|
||||||
# Gradle plugins
|
# Gradle plugins
|
||||||
shadow = "8.3.5"
|
shadow = "8.3.6"
|
||||||
grgit = "4.1.1"
|
grgit = "4.1.1"
|
||||||
spotless = "6.25.0"
|
spotless = "7.0.2"
|
||||||
nexus = "2.0.0"
|
nexus = "2.0.0"
|
||||||
runPaper = "2.3.1"
|
runPaper = "2.3.1"
|
||||||
|
|
||||||
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
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
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
Reference in New Issue
Block a user