Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
cb4a81a3c1 | |||
|
76862db7c9 | ||
e5cba7fe6d | |||
770b7daa94 |
5
.idea/jarRepositories.xml
generated
5
.idea/jarRepositories.xml
generated
@@ -21,6 +21,11 @@
|
|||||||
<option name="name" value="spigot-repo" />
|
<option name="name" value="spigot-repo" />
|
||||||
<option name="url" value="https://hub.spigotmc.org/nexus/content/repositories/snapshots/" />
|
<option name="url" value="https://hub.spigotmc.org/nexus/content/repositories/snapshots/" />
|
||||||
</remote-repository>
|
</remote-repository>
|
||||||
|
<remote-repository>
|
||||||
|
<option name="id" value="sonatype-oss-snapshots1" />
|
||||||
|
<option name="name" value="sonatype-oss-snapshots1" />
|
||||||
|
<option name="url" value="https://s01.oss.sonatype.org/content/repositories/snapshots/" />
|
||||||
|
</remote-repository>
|
||||||
<remote-repository>
|
<remote-repository>
|
||||||
<option name="id" value="placeholderapi" />
|
<option name="id" value="placeholderapi" />
|
||||||
<option name="name" value="placeholderapi" />
|
<option name="name" value="placeholderapi" />
|
||||||
|
3
.idea/misc.xml
generated
3
.idea/misc.xml
generated
@@ -13,7 +13,6 @@
|
|||||||
<option value="$PROJECT_DIR$/pom.xml" />
|
<option value="$PROJECT_DIR$/pom.xml" />
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
<option name="workspaceImportForciblyTurnedOn" value="true" />
|
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK" />
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_16" default="true" project-jdk-name="16" project-jdk-type="JavaSDK" />
|
||||||
</project>
|
</project>
|
14
pom.xml
14
pom.xml
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>net.t2code</groupId>
|
<groupId>net.t2code</groupId>
|
||||||
<artifactId>T2CodeLib</artifactId>
|
<artifactId>T2CodeLib</artifactId>
|
||||||
<version>16.2</version>
|
<version>16.5</version>
|
||||||
<!--version>VERSION_snapshot-0</version-->
|
<!--version>VERSION_snapshot-0</version-->
|
||||||
<!--version>VERSION_beta-0</version-->
|
<!--version>VERSION_beta-0</version-->
|
||||||
<!--version>VERSION_dev-0</version-->
|
<!--version>VERSION_dev-0</version-->
|
||||||
@@ -105,11 +105,11 @@
|
|||||||
<url>https://nexus.bencodez.com/repository/maven-public/</url>
|
<url>https://nexus.bencodez.com/repository/maven-public/</url>
|
||||||
</repository>
|
</repository>
|
||||||
|
|
||||||
<!--Kyori MiniMessage
|
<!--Kyori MiniMessage-->
|
||||||
<repository>
|
<repository>
|
||||||
<id>sonatype-oss-snapshots1</id>
|
<id>sonatype-oss-snapshots1</id>
|
||||||
<url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
|
<url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
|
||||||
</repository>-->
|
</repository>
|
||||||
</repositories>
|
</repositories>
|
||||||
|
|
||||||
|
|
||||||
@@ -118,7 +118,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.spigotmc</groupId>
|
<groupId>org.spigotmc</groupId>
|
||||||
<artifactId>spigot-api</artifactId>
|
<artifactId>spigot-api</artifactId>
|
||||||
<version>1.20.2-R0.1-SNAPSHOT</version>
|
<version>1.20.6-R0.1-SNAPSHOT</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
@@ -182,19 +182,19 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.kyori</groupId>
|
<groupId>net.kyori</groupId>
|
||||||
<artifactId>adventure-text-minimessage</artifactId>
|
<artifactId>adventure-text-minimessage</artifactId>
|
||||||
<version>4.14.0</version>
|
<version>4.17.0</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.kyori</groupId>
|
<groupId>net.kyori</groupId>
|
||||||
<artifactId>adventure-platform-bukkit</artifactId>
|
<artifactId>adventure-platform-bukkit</artifactId>
|
||||||
<version>4.3.1</version>
|
<version>4.3.2</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.kyori</groupId>
|
<groupId>net.kyori</groupId>
|
||||||
<artifactId>adventure-platform-bungeecord</artifactId>
|
<artifactId>adventure-platform-bungeecord</artifactId>
|
||||||
<version>4.3.1</version>
|
<version>4.3.2</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
@@ -47,7 +47,6 @@ public class T2Ccmd {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static Map.Entry<String, Integer> delay(@NotNull String cmdInput) {
|
private static Map.Entry<String, Integer> delay(@NotNull String cmdInput) {
|
||||||
T2Cdebug.debugmsg(T2CodeLibMain.getPlugin(), "Input: " + cmdInput);
|
|
||||||
int delay = 0;
|
int delay = 0;
|
||||||
String cmd;
|
String cmd;
|
||||||
if (cmdInput.contains("!delay:")) {
|
if (cmdInput.contains("!delay:")) {
|
||||||
|
@@ -3,7 +3,6 @@ package net.t2code.t2codelib.SPIGOT.api.items;
|
|||||||
import com.mojang.authlib.GameProfile;
|
import com.mojang.authlib.GameProfile;
|
||||||
import com.mojang.authlib.properties.Property;
|
import com.mojang.authlib.properties.Property;
|
||||||
import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CmcVersion;
|
import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CmcVersion;
|
||||||
import net.t2code.t2codelib.SPIGOT.system.bstats.Metrics;
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.inventory.Inventory;
|
import org.bukkit.inventory.Inventory;
|
||||||
@@ -77,7 +76,7 @@ public class T2CitemBuilder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static ItemStack base64(String base64Value) {
|
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);
|
return base64Old(base64Value);
|
||||||
} else return base64New(base64Value);
|
} else return base64New(base64Value);
|
||||||
}
|
}
|
||||||
|
@@ -45,6 +45,9 @@ public class T2CmcVersion {
|
|||||||
nms1_19_R2 = nms.contains("1_19_R2");
|
nms1_19_R2 = nms.contains("1_19_R2");
|
||||||
nms1_20_R1 = nms.contains("1_20_R1");
|
nms1_20_R1 = nms.contains("1_20_R1");
|
||||||
nms1_20_R2 = nms.contains("1_20_R2");
|
nms1_20_R2 = nms.contains("1_20_R2");
|
||||||
|
nms1_20_R3 = nms.contains("1_20_R3");
|
||||||
|
nms1_20_R4 = nms.contains("1_20_R4");
|
||||||
|
nms1_20_R5 = nms.contains("1_20_R5");
|
||||||
nms1_21_R1 = nms.contains("1_21_R1");
|
nms1_21_R1 = nms.contains("1_21_R1");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -88,6 +91,9 @@ public class T2CmcVersion {
|
|||||||
private static boolean nms1_19_R2;
|
private static boolean nms1_19_R2;
|
||||||
private static boolean nms1_20_R1;
|
private static boolean nms1_20_R1;
|
||||||
private static boolean nms1_20_R2;
|
private static boolean nms1_20_R2;
|
||||||
|
private static boolean nms1_20_R3;
|
||||||
|
private static boolean nms1_20_R4;
|
||||||
|
private static boolean nms1_20_R5;
|
||||||
private static boolean nms1_21_R1;
|
private static boolean nms1_21_R1;
|
||||||
|
|
||||||
public static String getMcVersion() {
|
public static String getMcVersion() {
|
||||||
@@ -149,6 +155,7 @@ public class T2CmcVersion {
|
|||||||
public static boolean isMc1_20() {
|
public static boolean isMc1_20() {
|
||||||
return mc1_20;
|
return mc1_20;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isMc1_21() {
|
public static boolean isMc1_21() {
|
||||||
return mc1_21;
|
return mc1_21;
|
||||||
}
|
}
|
||||||
@@ -244,6 +251,19 @@ public class T2CmcVersion {
|
|||||||
public static boolean isNms1_20_R2() {
|
public static boolean isNms1_20_R2() {
|
||||||
return nms1_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_20_R5() {
|
||||||
|
return nms1_20_R5;
|
||||||
|
}
|
||||||
|
|
||||||
public static boolean isNms1_21_R1() {
|
public static boolean isNms1_21_R1() {
|
||||||
return nms1_21_R1;
|
return nms1_21_R1;
|
||||||
}
|
}
|
||||||
|
@@ -54,7 +54,7 @@ public class T2CupdateCheckerGit {
|
|||||||
|
|
||||||
T2CupdateAPI.pluginVersions.put(plugin.getName(), update);
|
T2CupdateAPI.pluginVersions.put(plugin.getName(), update);
|
||||||
if (T2CupdateAPI.pluginVersions.get(plugin.getName()) == null){
|
if (T2CupdateAPI.pluginVersions.get(plugin.getName()) == null){
|
||||||
T2Csend.debugmsg(T2CodeLibMain.getPlugin(),plugin.getName() + " UpdateAPI T2CupdateAPI.pluginVersions.get(plugin.getName()) == null");
|
T2Csend.debugmsg(T2CodeLibMain.getPlugin(),"'"+plugin.getName() + "' UpdateAPI T2CupdateAPI.pluginVersions.get(plugin.getName()) == null");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (T2CupdateAPI.pluginVersions.get(plugin.getName()).updateAvailable) {
|
if (T2CupdateAPI.pluginVersions.get(plugin.getName()).updateAvailable) {
|
||||||
|
@@ -62,10 +62,10 @@ public final class T2CodeLibMain extends JavaPlugin {
|
|||||||
}
|
}
|
||||||
T2CmcVersion.onCheck();
|
T2CmcVersion.onCheck();
|
||||||
|
|
||||||
if (T2CmcVersion.isNms1_20_R2()) {
|
if (T2CmcVersion.isNms1_20_R5()) {
|
||||||
T2Csend.console(prefix + " §4!!!!!!!!!!!!!!!!!!!!");
|
T2Csend.console(prefix + " §4!!!!!!!!!!!!!!!!!!!!");
|
||||||
T2Csend.console(prefix);
|
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 R5) 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);
|
||||||
T2Csend.console(prefix + " §4!!!!!!!!!!!!!!!!!!!!");
|
T2Csend.console(prefix + " §4!!!!!!!!!!!!!!!!!!!!");
|
||||||
if (!SelectLibConfig.getT2cTestDevelopment()) {
|
if (!SelectLibConfig.getT2cTestDevelopment()) {
|
||||||
|
Reference in New Issue
Block a user