diff --git a/Compatibility/pom.xml b/Compatibility/pom.xml
index ef35414e..51a3aed2 100644
--- a/Compatibility/pom.xml
+++ b/Compatibility/pom.xml
@@ -7,7 +7,7 @@
com.songoda
SongodaCore-Modules
- 2.6.7
+ 2.6.8
../pom.xml
diff --git a/Compatibility/src/main/java/com/songoda/core/compatibility/MethodMapping.java b/Compatibility/src/main/java/com/songoda/core/compatibility/MethodMapping.java
index 70be8270..26890834 100644
--- a/Compatibility/src/main/java/com/songoda/core/compatibility/MethodMapping.java
+++ b/Compatibility/src/main/java/com/songoda/core/compatibility/MethodMapping.java
@@ -14,21 +14,24 @@ public enum MethodMapping {
MC_NBT_TAG_COMPOUND__SET_STRING("setString", "setString", "a", String.class, String.class),
MC_NBT_TAG_COMPOUND__REMOVE("remove", "remove", "r", String.class),
+ MC_NBT_TAG_LIST__ADD("add", "a", "add", "a", ClassMapping.NBT_BASE.getClazz()),
+
+ MC_CHUNK__GET_WORLD("getWorld", "D"),
+
CB_GENERIC__GET_HANDLE("getHandle"),
- CB_BLOCK__GET_NMS("getNMS"),
+ CB_BLOCK__GET_NMS("getNMSBlock", "getNMS"),
CB_BLOCK__GET_POSITION("getPosition"),
+ CB_BLOCK_DATA__GET_STATE("getState"),
+
CB_ITEM_STACK__AS_NMS_COPY("asNMSCopy", ItemStack.class),
CB_ITEM_STACK__AS_CRAFT_MIRROR("asCraftMirror", ClassMapping.ITEM_STACK.getClazz()),
CRAFT_MAGIC_NUMBERS__GET_BLOCK__MATERIAL("getBlock", Material.class),
- MC_CHUNK__GET_WORLD("getWorld", "D"),
-
- MC_NBT_TAG_LIST__ADD("add", "a", "add", "c", ClassMapping.NBT_BASE.getClazz()),
-
I_BLOCK_DATA__GET_BLOCK("getBlock", "b"),
+
BLOCK__GET_BLOCK_DATA("getBlockData", "n"),
CHUNK__SET_BLOCK_STATE("setType", "setBlockState", ClassMapping.BLOCK_POSITION.getClazz(), ClassMapping.I_BLOCK_DATA.getClazz(), boolean.class, boolean.class),
@@ -42,7 +45,6 @@ public enum MethodMapping {
WORLD_BOARDER__SET_CENTER("setCenter", "setCenter", "setCenter", "c", double.class, double.class),
WORLD_BOARDER__SET_SIZE("setSize", "setSize", "setSize", "a", double.class),
-
WORLD_BOARDER__SET_WARNING_TIME("setWarningTime", "setWarningTime", "setWarningTime", "b", int.class),
WORLD_BOARDER__SET_WARNING_DISTANCE("setWarningDistance", "setWarningDistance", "setWarningDistance", "c", int.class),
WORLD_BOARDER__TRANSITION_SIZE_BETWEEN("transitionSizeBetween", "transitionSizeBetween", "transitionSizeBetween", "a", double.class, double.class, long.class),
diff --git a/Core/pom.xml b/Core/pom.xml
index 24538cb5..7bd29b17 100644
--- a/Core/pom.xml
+++ b/Core/pom.xml
@@ -7,7 +7,7 @@
com.songoda
SongodaCore-Modules
- 2.6.7
+ 2.6.8
../pom.xml
diff --git a/Core/src/main/java/com/songoda/core/SongodaCore.java b/Core/src/main/java/com/songoda/core/SongodaCore.java
index b2713a16..2c294568 100644
--- a/Core/src/main/java/com/songoda/core/SongodaCore.java
+++ b/Core/src/main/java/com/songoda/core/SongodaCore.java
@@ -53,7 +53,7 @@ public class SongodaCore {
/**
* @since coreRevision 6
*/
- private final static String coreVersion = "2.6.5";
+ private final static String coreVersion = "2.6.8";
/**
* This is specific to the website api
diff --git a/Core/src/main/java/com/songoda/core/lootables/gui/GuiLootableEditor.java b/Core/src/main/java/com/songoda/core/lootables/gui/GuiLootableEditor.java
index 3a489359..2de34645 100644
--- a/Core/src/main/java/com/songoda/core/lootables/gui/GuiLootableEditor.java
+++ b/Core/src/main/java/com/songoda/core/lootables/gui/GuiLootableEditor.java
@@ -45,7 +45,7 @@ public class GuiLootableEditor extends Gui {
gui.setAction((event1 -> {
try {
lootable.registerLoot(new LootBuilder().setMaterial(CompatibleMaterial
- .valueOf(gui.getInputText().trim())).build());
+ .valueOf(gui.getInputText().trim().toUpperCase())).build());
} catch (IllegalArgumentException ex) {
event.player.sendMessage("That is not a valid material.");
}
diff --git a/Core/src/main/java/com/songoda/core/utils/BlockUtilsModern.java b/Core/src/main/java/com/songoda/core/utils/BlockUtilsModern.java
index 2bfbb371..9eff9b46 100644
--- a/Core/src/main/java/com/songoda/core/utils/BlockUtilsModern.java
+++ b/Core/src/main/java/com/songoda/core/utils/BlockUtilsModern.java
@@ -2,6 +2,7 @@ package com.songoda.core.utils;
import com.songoda.core.SongodaCore;
import com.songoda.core.compatibility.ClassMapping;
+import com.songoda.core.compatibility.MethodMapping;
import com.songoda.core.compatibility.ServerVersion;
import org.bukkit.Effect;
import org.bukkit.Material;
@@ -95,15 +96,15 @@ public class BlockUtilsModern {
clazzCraftWorld = ClassMapping.CRAFT_WORLD.getClazz();
clazzCraftBlock = ClassMapping.CRAFT_BLOCK.getClazz();
- craftWorld_getHandle = clazzCraftWorld.getMethod("getHandle");
- craftBlock_getPostition = clazzCraftBlock.getDeclaredMethod("getPosition");
+ craftWorld_getHandle = MethodMapping.CB_GENERIC__GET_HANDLE.getMethod(clazzCraftWorld);
+ craftBlock_getPostition = MethodMapping.CB_BLOCK__GET_POSITION.getMethod(clazzCraftBlock);
- craftBlock_getNMS = clazzCraftBlock.getDeclaredMethod("getNMS");
+ craftBlock_getNMS = MethodMapping.CB_BLOCK__GET_NMS.getMethod(clazzCraftBlock);
Class clazzBlockData = ClassMapping.BLOCK_BASE.getClazz("BlockData");
- nmsBlockData_getBlock = clazzBlockData.getDeclaredMethod("getBlock");
+ nmsBlockData_getBlock = MethodMapping.I_BLOCK_DATA__GET_BLOCK.getMethod(clazzBlockData);
Class clazzCraftBlockData = ClassMapping.CRAFT_BLOCK_DATA.getClazz();
- craftBlockData_getState = clazzCraftBlockData.getDeclaredMethod("getState");
+ craftBlockData_getState = MethodMapping.CB_BLOCK_DATA__GET_STATE.getMethod(clazzCraftBlockData);
Class clazzWorld = ClassMapping.WORLD.getClazz();
Class clazzBlockState = ClassMapping.I_BLOCK_DATA.getClazz();
@@ -112,7 +113,6 @@ public class BlockUtilsModern {
clazzButtonBlock = ClassMapping.BLOCK_BUTTON_ABSTRACT.getClazz();
clazzPressurePlateBlock = ClassMapping.BLOCK_PRESSURE_PLATE_ABSTRACT.getClazz();
- // nmsLever_updateNeighbours, nmsButton_updateNeighbours, nmsPlate_updateNeighbours
nmsLever_updateNeighbours = clazzLeverBlock.getDeclaredMethod(ServerVersion.isServerVersionAbove(ServerVersion.V1_13)
? "e" : "b", clazzBlockState, clazzWorld, clazzBlockPos);
nmsLever_updateNeighbours.setAccessible(true);
diff --git a/NMS/NMS-API/pom.xml b/NMS/NMS-API/pom.xml
index 80798cbf..f8252ae3 100644
--- a/NMS/NMS-API/pom.xml
+++ b/NMS/NMS-API/pom.xml
@@ -7,7 +7,7 @@
com.songoda
SongodaCore-Modules
- 2.6.7
+ 2.6.8
../../pom.xml
diff --git a/NMS/NMS-v1_10_R1/pom.xml b/NMS/NMS-v1_10_R1/pom.xml
index 33ea32cd..683d92af 100644
--- a/NMS/NMS-v1_10_R1/pom.xml
+++ b/NMS/NMS-v1_10_R1/pom.xml
@@ -7,7 +7,7 @@
com.songoda
SongodaCore-Modules
- 2.6.7
+ 2.6.8
../../pom.xml
diff --git a/NMS/NMS-v1_11_R1/pom.xml b/NMS/NMS-v1_11_R1/pom.xml
index 61b2a75a..60027daa 100644
--- a/NMS/NMS-v1_11_R1/pom.xml
+++ b/NMS/NMS-v1_11_R1/pom.xml
@@ -7,7 +7,7 @@
com.songoda
SongodaCore-Modules
- 2.6.7
+ 2.6.8
../../pom.xml
diff --git a/NMS/NMS-v1_12_R1/pom.xml b/NMS/NMS-v1_12_R1/pom.xml
index 66e0d451..130b13ab 100644
--- a/NMS/NMS-v1_12_R1/pom.xml
+++ b/NMS/NMS-v1_12_R1/pom.xml
@@ -7,7 +7,7 @@
com.songoda
SongodaCore-Modules
- 2.6.7
+ 2.6.8
../../pom.xml
diff --git a/NMS/NMS-v1_13_R1/pom.xml b/NMS/NMS-v1_13_R1/pom.xml
index da63ef42..7849c317 100644
--- a/NMS/NMS-v1_13_R1/pom.xml
+++ b/NMS/NMS-v1_13_R1/pom.xml
@@ -7,7 +7,7 @@
com.songoda
SongodaCore-Modules
- 2.6.7
+ 2.6.8
../../pom.xml
diff --git a/NMS/NMS-v1_13_R2/pom.xml b/NMS/NMS-v1_13_R2/pom.xml
index cf3fb211..61d1c9da 100644
--- a/NMS/NMS-v1_13_R2/pom.xml
+++ b/NMS/NMS-v1_13_R2/pom.xml
@@ -7,7 +7,7 @@
com.songoda
SongodaCore-Modules
- 2.6.7
+ 2.6.8
../../pom.xml
diff --git a/NMS/NMS-v1_14_R1/pom.xml b/NMS/NMS-v1_14_R1/pom.xml
index a724745f..6dd2d582 100644
--- a/NMS/NMS-v1_14_R1/pom.xml
+++ b/NMS/NMS-v1_14_R1/pom.xml
@@ -7,7 +7,7 @@
com.songoda
SongodaCore-Modules
- 2.6.7
+ 2.6.8
../../pom.xml
diff --git a/NMS/NMS-v1_15_R1/pom.xml b/NMS/NMS-v1_15_R1/pom.xml
index d9d3d22d..f1caf7fb 100644
--- a/NMS/NMS-v1_15_R1/pom.xml
+++ b/NMS/NMS-v1_15_R1/pom.xml
@@ -7,7 +7,7 @@
com.songoda
SongodaCore-Modules
- 2.6.7
+ 2.6.8
../../pom.xml
diff --git a/NMS/NMS-v1_16_R1/pom.xml b/NMS/NMS-v1_16_R1/pom.xml
index 8cfaf63b..86d98b26 100644
--- a/NMS/NMS-v1_16_R1/pom.xml
+++ b/NMS/NMS-v1_16_R1/pom.xml
@@ -7,7 +7,7 @@
com.songoda
SongodaCore-Modules
- 2.6.7
+ 2.6.8
../../pom.xml
diff --git a/NMS/NMS-v1_16_R2/pom.xml b/NMS/NMS-v1_16_R2/pom.xml
index 580dee90..87a7fa57 100644
--- a/NMS/NMS-v1_16_R2/pom.xml
+++ b/NMS/NMS-v1_16_R2/pom.xml
@@ -7,7 +7,7 @@
com.songoda
SongodaCore-Modules
- 2.6.7
+ 2.6.8
../../pom.xml
diff --git a/NMS/NMS-v1_16_R3/pom.xml b/NMS/NMS-v1_16_R3/pom.xml
index b7cdb1a0..8299e235 100644
--- a/NMS/NMS-v1_16_R3/pom.xml
+++ b/NMS/NMS-v1_16_R3/pom.xml
@@ -7,7 +7,7 @@
com.songoda
SongodaCore-Modules
- 2.6.7
+ 2.6.8
../../pom.xml
diff --git a/NMS/NMS-v1_17_R1/pom.xml b/NMS/NMS-v1_17_R1/pom.xml
index 3159cda5..6c822597 100644
--- a/NMS/NMS-v1_17_R1/pom.xml
+++ b/NMS/NMS-v1_17_R1/pom.xml
@@ -7,7 +7,7 @@
com.songoda
SongodaCore-Modules
- 2.6.7
+ 2.6.8
../../pom.xml
diff --git a/NMS/NMS-v1_18_R1/pom.xml b/NMS/NMS-v1_18_R1/pom.xml
index 9808b2d5..a1838e1a 100644
--- a/NMS/NMS-v1_18_R1/pom.xml
+++ b/NMS/NMS-v1_18_R1/pom.xml
@@ -19,7 +19,7 @@
com.songoda
SongodaCore-Modules
- 2.6.7
+ 2.6.8
../../pom.xml
diff --git a/NMS/NMS-v1_8_R1/pom.xml b/NMS/NMS-v1_8_R1/pom.xml
index aa47d584..4ce34f69 100644
--- a/NMS/NMS-v1_8_R1/pom.xml
+++ b/NMS/NMS-v1_8_R1/pom.xml
@@ -7,7 +7,7 @@
com.songoda
SongodaCore-Modules
- 2.6.7
+ 2.6.8
../../pom.xml
diff --git a/NMS/NMS-v1_8_R2/pom.xml b/NMS/NMS-v1_8_R2/pom.xml
index 25ea90ce..1688546a 100644
--- a/NMS/NMS-v1_8_R2/pom.xml
+++ b/NMS/NMS-v1_8_R2/pom.xml
@@ -7,7 +7,7 @@
com.songoda
SongodaCore-Modules
- 2.6.7
+ 2.6.8
../../pom.xml
diff --git a/NMS/NMS-v1_8_R3/pom.xml b/NMS/NMS-v1_8_R3/pom.xml
index 5942cfde..30325eaa 100644
--- a/NMS/NMS-v1_8_R3/pom.xml
+++ b/NMS/NMS-v1_8_R3/pom.xml
@@ -7,7 +7,7 @@
com.songoda
SongodaCore-Modules
- 2.6.7
+ 2.6.8
../../pom.xml
diff --git a/NMS/NMS-v1_9_R1/pom.xml b/NMS/NMS-v1_9_R1/pom.xml
index 0d72adbd..f9eb07ac 100644
--- a/NMS/NMS-v1_9_R1/pom.xml
+++ b/NMS/NMS-v1_9_R1/pom.xml
@@ -7,7 +7,7 @@
com.songoda
SongodaCore-Modules
- 2.6.7
+ 2.6.8
../../pom.xml
diff --git a/NMS/NMS-v1_9_R2/pom.xml b/NMS/NMS-v1_9_R2/pom.xml
index fa48537a..5485a8d7 100644
--- a/NMS/NMS-v1_9_R2/pom.xml
+++ b/NMS/NMS-v1_9_R2/pom.xml
@@ -7,7 +7,7 @@
com.songoda
SongodaCore-Modules
- 2.6.7
+ 2.6.8
../../pom.xml
diff --git a/pom.xml b/pom.xml
index 08f623e3..238ed3a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
com.songoda
SongodaCore-Modules
- 2.6.7
+ 2.6.8
pom