diff --git a/.idea/misc.xml b/.idea/misc.xml
index d0aa95e..cb9e3da 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -15,5 +15,5 @@
-
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index c200e43..fda24f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
net.t2code
T2CodeLib
- 16.2
+ 16.3
@@ -118,7 +118,7 @@
org.spigotmc
spigot-api
- 1.20.2-R0.1-SNAPSHOT
+ 1.20.4-R0.1-SNAPSHOT
provided
diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/commands/T2Ccmd.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/commands/T2Ccmd.java
index 4e01474..2680673 100644
--- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/commands/T2Ccmd.java
+++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/commands/T2Ccmd.java
@@ -47,7 +47,6 @@ public class T2Ccmd {
}
private static Map.Entry delay(@NotNull String cmdInput) {
- T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), "Input: " + cmdInput);
int delay = 0;
String cmd;
if (cmdInput.contains("!delay:")) {
diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/items/T2CitemBuilder.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/items/T2CitemBuilder.java
index 60b5631..d073d15 100644
--- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/items/T2CitemBuilder.java
+++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/items/T2CitemBuilder.java
@@ -3,7 +3,6 @@ package net.t2code.t2codelib.SPIGOT.api.items;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.Property;
import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CmcVersion;
-import net.t2code.t2codelib.SPIGOT.system.bstats.Metrics;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.inventory.Inventory;
@@ -77,7 +76,7 @@ public class T2CitemBuilder {
}
public static ItemStack base64(String base64Value) {
- if (!T2CmcVersion.minMc1_20() || T2CmcVersion.isNms1_20_R1()) {
+ if (!T2CmcVersion.minMc1_20() || T2CmcVersion.isNms1_20_R1()|| T2CmcVersion.isNms1_20_R2()|| T2CmcVersion.isNms1_20_R3()) {
return base64Old(base64Value);
} else return base64New(base64Value);
}
diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CmcVersion.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CmcVersion.java
index 73f98ff..b2a2ce6 100644
--- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CmcVersion.java
+++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CmcVersion.java
@@ -45,6 +45,8 @@ public class T2CmcVersion {
nms1_19_R2 = nms.contains("1_19_R2");
nms1_20_R1 = nms.contains("1_20_R1");
nms1_20_R2 = nms.contains("1_20_R2");
+ nms1_20_R2 = nms.contains("1_20_R3");
+ nms1_20_R2 = nms.contains("1_20_R4");
nms1_21_R1 = nms.contains("1_21_R1");
}
@@ -88,6 +90,8 @@ public class T2CmcVersion {
private static boolean nms1_19_R2;
private static boolean nms1_20_R1;
private static boolean nms1_20_R2;
+ private static boolean nms1_20_R3;
+ private static boolean nms1_20_R4;
private static boolean nms1_21_R1;
public static String getMcVersion() {
@@ -149,6 +153,7 @@ public class T2CmcVersion {
public static boolean isMc1_20() {
return mc1_20;
}
+
public static boolean isMc1_21() {
return mc1_21;
}
@@ -243,7 +248,12 @@ public class T2CmcVersion {
public static boolean isNms1_20_R2() {
return nms1_20_R2;
+ }public static boolean isNms1_20_R3() {
+ return nms1_20_R3;
+ }public static boolean isNms1_20_R4() {
+ return nms1_20_R4;
}
+
public static boolean isNms1_21_R1() {
return nms1_21_R1;
}
@@ -270,7 +280,7 @@ public class T2CmcVersion {
}
public static boolean minMc1_13() {
- return !isMc1_8() && !isMc1_9() && !isMc1_10() && !isMc1_11() && !isMc1_12() ;
+ return !isMc1_8() && !isMc1_9() && !isMc1_10() && !isMc1_11() && !isMc1_12();
}
public static boolean minMc1_14() {
@@ -278,7 +288,7 @@ public class T2CmcVersion {
}
public static boolean minMc1_15() {
- return !isMc1_8() && !isMc1_9() && !isMc1_10() && !isMc1_11() && !isMc1_12() && !isMc1_13() && !isMc1_14() ;
+ return !isMc1_8() && !isMc1_9() && !isMc1_10() && !isMc1_11() && !isMc1_12() && !isMc1_13() && !isMc1_14();
}
public static boolean minMc1_16() {
diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/system/T2CodeLibMain.java b/src/main/java/net/t2code/t2codelib/SPIGOT/system/T2CodeLibMain.java
index 1be92ed..8393f67 100644
--- a/src/main/java/net/t2code/t2codelib/SPIGOT/system/T2CodeLibMain.java
+++ b/src/main/java/net/t2code/t2codelib/SPIGOT/system/T2CodeLibMain.java
@@ -62,10 +62,10 @@ public final class T2CodeLibMain extends JavaPlugin {
}
T2CmcVersion.onCheck();
- if (T2CmcVersion.isNms1_20_R2()) {
+ if (T2CmcVersion.isNms1_20_R4()) {
T2Csend.console(prefix + " §4!!!!!!!!!!!!!!!!!!!!");
T2Csend.console(prefix);
- T2Csend.warning(plugin, "The 1.20.* (NMS R2) is a very fresh / new version. If there are any bugs in our plugins, please report them to us via our Discord: http://dc.t2code.net");
+ T2Csend.warning(plugin, "The 1.20.* (NMS R4) is a very fresh / new version. If there are any bugs in our plugins, please report them to us via our Discord: http://dc.t2code.net");
T2Csend.console(prefix);
T2Csend.console(prefix + " §4!!!!!!!!!!!!!!!!!!!!");
if (!SelectLibConfig.getT2cTestDevelopment()) {