From 1ba3a7a2734bab7c31c15c8828084dd074a53846 Mon Sep 17 00:00:00 2001 From: BONNe Date: Mon, 9 Sep 2019 19:09:48 +0300 Subject: [PATCH] Downgrade to Spigot 1.13.2 and BentoBox 1.6 --- pom.xml | 8 ++++---- .../world/bentobox/challenges/panel/CommonGUI.java | 4 ++-- .../challenges/panel/admin/EditSettingsGUI.java | 2 +- .../challenges/panel/user/ChallengesGUI.java | 12 ++++++------ .../bentobox/challenges/panel/user/MultipleGUI.java | 12 ++++++------ .../challenges/panel/util/ChallengeTypeGUI.java | 8 ++++---- .../challenges/panel/util/SelectBlocksGUI.java | 4 ++-- .../challenges/panel/util/SelectChallengeGUI.java | 4 ++-- .../challenges/panel/util/SelectEntityGUI.java | 4 ++-- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index 320a870..7964d53 100644 --- a/pom.xml +++ b/pom.xml @@ -35,15 +35,15 @@ 1.8 1.7.4 - 1.14.4-R0.1-SNAPSHOT - 1.7.0 + 1.13.2-R0.1-SNAPSHOT + 1.6.0 1.6.0 1.7 - ${build.version}-SNAPSHOT + ${build.version} 0.8.0 - -LOCAL + -1.6.0 diff --git a/src/main/java/world/bentobox/challenges/panel/CommonGUI.java b/src/main/java/world/bentobox/challenges/panel/CommonGUI.java index e33e8aa..ecc674a 100644 --- a/src/main/java/world/bentobox/challenges/panel/CommonGUI.java +++ b/src/main/java/world/bentobox/challenges/panel/CommonGUI.java @@ -273,7 +273,7 @@ public abstract class CommonGUI { name = this.user.getTranslation("challenges.gui.buttons.next"); description = Collections.emptyList(); - icon = new ItemStack(Material.OAK_SIGN); + icon = new ItemStack(Material.SIGN); clickHandler = (panel, user, clickType, slot) -> { this.pageIndex++; this.build(); @@ -286,7 +286,7 @@ public abstract class CommonGUI { name = this.user.getTranslation("challenges.gui.buttons.previous"); description = Collections.emptyList(); - icon = new ItemStack(Material.OAK_SIGN); + icon = new ItemStack(Material.SIGN); clickHandler = (panel, user, clickType, slot) -> { this.pageIndex--; this.build(); diff --git a/src/main/java/world/bentobox/challenges/panel/admin/EditSettingsGUI.java b/src/main/java/world/bentobox/challenges/panel/admin/EditSettingsGUI.java index b1a6b3d..7ffe451 100644 --- a/src/main/java/world/bentobox/challenges/panel/admin/EditSettingsGUI.java +++ b/src/main/java/world/bentobox/challenges/panel/admin/EditSettingsGUI.java @@ -455,7 +455,7 @@ public class EditSettingsGUI extends CommonGUI this.user.getTranslation("challenges.gui.descriptions.enabled") : this.user.getTranslation("challenges.gui.descriptions.disabled"))); name = this.user.getTranslation("challenges.gui.buttons.admin.title-enable"); - icon = new ItemStack(Material.OAK_SIGN); + icon = new ItemStack(Material.SIGN); clickHandler = (panel, user1, clickType, i) -> { this.settings.setShowCompletionTitle(!this.settings.isShowCompletionTitle()); diff --git a/src/main/java/world/bentobox/challenges/panel/user/ChallengesGUI.java b/src/main/java/world/bentobox/challenges/panel/user/ChallengesGUI.java index f29f873..a4540f8 100644 --- a/src/main/java/world/bentobox/challenges/panel/user/ChallengesGUI.java +++ b/src/main/java/world/bentobox/challenges/panel/user/ChallengesGUI.java @@ -168,7 +168,7 @@ public class ChallengesGUI extends CommonGUI if (this.freeChallengeIndex > 0) { panelBuilder.item(index++, new PanelItemBuilder(). - icon(Material.OAK_SIGN). + icon(Material.SIGN). name(this.user.getTranslation("challenges.gui.buttons.previous")). clickHandler((panel, user1, clickType, slot) -> { this.freeChallengeIndex--; @@ -192,7 +192,7 @@ public class ChallengesGUI extends CommonGUI else if (currentIndex < freeChallengesCount) { panelBuilder.item(index, new PanelItemBuilder(). - icon(Material.OAK_SIGN). + icon(Material.SIGN). name(this.user.getTranslation("challenges.gui.buttons.next")). clickHandler((panel, user1, clickType, slot) -> { this.freeChallengeIndex++; @@ -244,7 +244,7 @@ public class ChallengesGUI extends CommonGUI if (this.pageIndex > 0) { panelBuilder.item(index++, new PanelItemBuilder(). - icon(Material.OAK_SIGN). + icon(Material.SIGN). name(this.user.getTranslation("challenges.gui.buttons.previous")). clickHandler((panel, user1, clickType, slot) -> { this.pageIndex--; @@ -268,7 +268,7 @@ public class ChallengesGUI extends CommonGUI else if (currentIndex < challengesCount) { panelBuilder.item(index, new PanelItemBuilder(). - icon(Material.OAK_SIGN). + icon(Material.SIGN). name(this.user.getTranslation("challenges.gui.buttons.next")). clickHandler((panel, user1, clickType, slot) -> { this.pageIndex++; @@ -305,7 +305,7 @@ public class ChallengesGUI extends CommonGUI if (this.levelIndex > 0) { panelBuilder.item(index++, new PanelItemBuilder(). - icon(Material.OAK_SIGN). + icon(Material.SIGN). name(this.user.getTranslation("challenges.gui.buttons.previous")). clickHandler((panel, user1, clickType, slot) -> { this.levelIndex--; @@ -329,7 +329,7 @@ public class ChallengesGUI extends CommonGUI else if (currentIndex < levelCounts) { panelBuilder.item(index, new PanelItemBuilder(). - icon(Material.OAK_SIGN). + icon(Material.SIGN). name(this.user.getTranslation("challenges.gui.buttons.next")). clickHandler((panel, user1, clickType, slot) -> { this.levelIndex++; diff --git a/src/main/java/world/bentobox/challenges/panel/user/MultipleGUI.java b/src/main/java/world/bentobox/challenges/panel/user/MultipleGUI.java index 509f29c..54dc751 100644 --- a/src/main/java/world/bentobox/challenges/panel/user/MultipleGUI.java +++ b/src/main/java/world/bentobox/challenges/panel/user/MultipleGUI.java @@ -42,18 +42,18 @@ public class MultipleGUI { PanelBuilder panelBuilder = new PanelBuilder(). user(this.user). - type(Panel.Type.HOPPER). +// type(Panel.Type.HOPPER). name(this.user.getTranslation("challenges.gui.title.multiple-complete")); - panelBuilder.item(2, this.getButton(Button.VALUE)); + panelBuilder.item(4, this.getButton(Button.VALUE)); // Reduce - panelBuilder.item(0, this.getButton(Button.REDUCE_LOT)); - panelBuilder.item(1, this.getButton(Button.REDUCE)); + panelBuilder.item(2, this.getButton(Button.REDUCE_LOT)); + panelBuilder.item(3, this.getButton(Button.REDUCE)); // Increase - panelBuilder.item(3, this.getButton(Button.INCREASE)); - panelBuilder.item(4, this.getButton(Button.INCREASE_LOT)); + panelBuilder.item(5, this.getButton(Button.INCREASE)); + panelBuilder.item(6, this.getButton(Button.INCREASE_LOT)); panelBuilder.build(); } diff --git a/src/main/java/world/bentobox/challenges/panel/util/ChallengeTypeGUI.java b/src/main/java/world/bentobox/challenges/panel/util/ChallengeTypeGUI.java index 7956082..d8a316b 100644 --- a/src/main/java/world/bentobox/challenges/panel/util/ChallengeTypeGUI.java +++ b/src/main/java/world/bentobox/challenges/panel/util/ChallengeTypeGUI.java @@ -64,12 +64,12 @@ public class ChallengeTypeGUI { PanelBuilder panelBuilder = new PanelBuilder(). user(this.user). - type(Panel.Type.HOPPER). +// type(Panel.Type.HOPPER). name(this.user.getTranslation("challenges.gui.title.admin.type-select")); - panelBuilder.item(0, this.getButton(Challenge.ChallengeType.INVENTORY)); - panelBuilder.item(1, this.getButton(Challenge.ChallengeType.ISLAND)); - panelBuilder.item(2, this.getButton(Challenge.ChallengeType.OTHER)); + panelBuilder.item(3, this.getButton(Challenge.ChallengeType.INVENTORY)); + panelBuilder.item(4, this.getButton(Challenge.ChallengeType.ISLAND)); + panelBuilder.item(5, this.getButton(Challenge.ChallengeType.OTHER)); panelBuilder.build(); } diff --git a/src/main/java/world/bentobox/challenges/panel/util/SelectBlocksGUI.java b/src/main/java/world/bentobox/challenges/panel/util/SelectBlocksGUI.java index d7c6855..d0882b6 100644 --- a/src/main/java/world/bentobox/challenges/panel/util/SelectBlocksGUI.java +++ b/src/main/java/world/bentobox/challenges/panel/util/SelectBlocksGUI.java @@ -145,7 +145,7 @@ public class SelectBlocksGUI panelBuilder.item(18, new PanelItemBuilder(). - icon(Material.OAK_SIGN). + icon(Material.SIGN). name(this.user.getTranslation("challenges.gui.buttons.previous")). clickHandler((panel, user1, clickType, slot) -> { this.build(correctPage - 1); @@ -154,7 +154,7 @@ public class SelectBlocksGUI panelBuilder.item(26, new PanelItemBuilder(). - icon(Material.OAK_SIGN). + icon(Material.SIGN). name(this.user.getTranslation("challenges.gui.buttons.next")). clickHandler((panel, user1, clickType, slot) -> { this.build(correctPage + 1); diff --git a/src/main/java/world/bentobox/challenges/panel/util/SelectChallengeGUI.java b/src/main/java/world/bentobox/challenges/panel/util/SelectChallengeGUI.java index 1b37a97..9008081 100644 --- a/src/main/java/world/bentobox/challenges/panel/util/SelectChallengeGUI.java +++ b/src/main/java/world/bentobox/challenges/panel/util/SelectChallengeGUI.java @@ -76,7 +76,7 @@ public class SelectChallengeGUI panelBuilder.item(18, new PanelItemBuilder(). - icon(Material.OAK_SIGN). + icon(Material.SIGN). name(this.user.getTranslation("challenges.gui.buttons.previous")). clickHandler((panel, user1, clickType, slot) -> { this.build(correctPage - 1); @@ -85,7 +85,7 @@ public class SelectChallengeGUI panelBuilder.item(26, new PanelItemBuilder(). - icon(Material.OAK_SIGN). + icon(Material.SIGN). name(this.user.getTranslation("challenges.gui.buttons.next")). clickHandler((panel, user1, clickType, slot) -> { this.build(correctPage + 1); diff --git a/src/main/java/world/bentobox/challenges/panel/util/SelectEntityGUI.java b/src/main/java/world/bentobox/challenges/panel/util/SelectEntityGUI.java index b4019f6..ad52080 100644 --- a/src/main/java/world/bentobox/challenges/panel/util/SelectEntityGUI.java +++ b/src/main/java/world/bentobox/challenges/panel/util/SelectEntityGUI.java @@ -115,7 +115,7 @@ public class SelectEntityGUI panelBuilder.item(18, new PanelItemBuilder(). - icon(Material.OAK_SIGN). + icon(Material.SIGN). name(this.user.getTranslation("challenges.gui.buttons.previous")). clickHandler((panel, user1, clickType, slot) -> { this.build(correctPage - 1); @@ -124,7 +124,7 @@ public class SelectEntityGUI panelBuilder.item(26, new PanelItemBuilder(). - icon(Material.OAK_SIGN). + icon(Material.SIGN). name(this.user.getTranslation("challenges.gui.buttons.next")). clickHandler((panel, user1, clickType, slot) -> { this.build(correctPage + 1);