Browse Source

added support for 1.13 + 1.13.1

linus 5 years ago
parent
commit
5b577d054b

+ 10 - 10
Plugin/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>de.Linus122.TimeIsMoney</groupId>
         <artifactId>parent</artifactId>
-        <version>1.9.6.3</version>
+        <version>1.9.6.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -83,47 +83,47 @@
         <dependency>
             <groupId>de.Linus122.TimeIsMoney</groupId>
             <artifactId>Tools</artifactId>
-            <version>1.9.6.3</version>
+            <version>1.9.6.4</version>
         </dependency>
         <dependency>
             <groupId>de.Linus122.TimeIsMoney</groupId>
             <artifactId>v1_8_R1</artifactId>
-            <version>1.9.6.3</version>
+            <version>1.9.6.4</version>
         </dependency>
         <dependency>
             <groupId>de.Linus122.TimeIsMoney</groupId>
             <artifactId>v1_8_R2</artifactId>
-            <version>1.9.6.3</version>
+            <version>1.9.6.4</version>
         </dependency>
         <dependency>
             <groupId>de.Linus122.TimeIsMoney</groupId>
             <artifactId>v1_8_R3</artifactId>
-            <version>1.9.6.3</version>
+            <version>1.9.6.4</version>
         </dependency>
         <dependency>
             <groupId>de.Linus122.TimeIsMoney</groupId>
             <artifactId>v1_9_R1</artifactId>
-            <version>1.9.6.3</version>
+            <version>1.9.6.4</version>
         </dependency>
         <dependency>
             <groupId>de.Linus122.TimeIsMoney</groupId>
             <artifactId>v1_9_R2</artifactId>
-            <version>1.9.6.3</version>
+            <version>1.9.6.4</version>
         </dependency>
         <dependency>
             <groupId>de.Linus122.TimeIsMoney</groupId>
             <artifactId>v1_10_R1</artifactId>
-            <version>1.9.6.3</version>
+            <version>1.9.6.4</version>
         </dependency>
         <dependency>
             <groupId>de.Linus122.TimeIsMoney</groupId>
             <artifactId>v1_11_R1</artifactId>
-            <version>1.9.6.3</version>
+            <version>1.9.6.4</version>
         </dependency>
         <dependency>
             <groupId>de.Linus122.TimeIsMoney</groupId>
             <artifactId>v1_12_R1</artifactId>
-            <version>1.9.6.3</version>
+            <version>1.9.6.4</version>
         </dependency>
     </dependencies>
 </project>

+ 3 - 1
pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>de.Linus122.TimeIsMoney</groupId>
     <artifactId>parent</artifactId>
-    <version>1.9.6.3</version>
+    <version>1.9.6.4</version>
     <name>TimeIsMoney Parent</name>
     <url>https://www.spigotmc.org/resources/time-is-money.12409/</url>
     <packaging>pom</packaging>
@@ -26,6 +26,8 @@
         <module>v1_10_R1</module>
         <module>v1_11_R1</module>
         <module>v1_12_R1</module>
+        <module>v1_13_R1</module>
+        <module>v1_13_R2</module>
     </modules>
 
     <repositories>

+ 2 - 2
v1_12_R1/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>de.Linus122.TimeIsMoney</groupId>
         <artifactId>parent</artifactId>
-        <version>1.9.6.3</version>
+        <version>1.9.6.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>de.Linus122.TimeIsMoney</groupId>
             <artifactId>Tools</artifactId>
-            <version>1.9.6.3</version>
+            <version>1.9.6.4</version>
         </dependency>
     </dependencies>
 </project>

+ 41 - 0
v1_13_R1/pom.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>de.Linus122.TimeIsMoney</groupId>
+        <artifactId>parent</artifactId>
+        <version>1.9.6.4</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <name>TimeIsMoney v1_13_R1</name>
+    <packaging>jar</packaging>
+    <artifactId>v1_13_R1</artifactId>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.13-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>craftbukkit</artifactId>
+            <version>1.13-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>de.Linus122.TimeIsMoney</groupId>
+            <artifactId>Tools</artifactId>
+            <version>1.9.6.4</version>
+        </dependency>
+    </dependencies>
+</project>

+ 28 - 0
v1_13_R1/src/main/java/main/java/de/Linus122/TimeIsMoney/version/v1_13_R1/NBTUtils.java

@@ -0,0 +1,28 @@
+package main.java.de.Linus122.TimeIsMoney.version.v1_13_R1;
+
+import de.Linus122.TimeIsMoney.tools.ActionBarUtils;
+import net.minecraft.server.v1_13_R1.ChatMessageType;
+import net.minecraft.server.v1_13_R1.IChatBaseComponent;
+import net.minecraft.server.v1_13_R1.PacketPlayOutChat;
+import org.bukkit.craftbukkit.v1_13_R1.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+import static de.Linus122.TimeIsMoney.tools.Utils.CC;
+
+/**
+ * NBT Utils for v1_13_R1.
+ *
+ * @author Linus122
+ * @since 1.9.6.4
+ */
+public class NBTUtils implements ActionBarUtils {
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void sendActionBarMessage(Player p, String message) {
+		IChatBaseComponent icbc = IChatBaseComponent.ChatSerializer.a("{\"text\": \"" + CC(message) + "\"}");
+		PacketPlayOutChat bar = new PacketPlayOutChat(icbc, ChatMessageType.GAME_INFO);
+		((CraftPlayer) p).getHandle().playerConnection.sendPacket(bar);
+	}
+}

+ 41 - 0
v1_13_R2/pom.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>de.Linus122.TimeIsMoney</groupId>
+        <artifactId>parent</artifactId>
+        <version>1.9.6.4</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <name>TimeIsMoney v1_13_R2</name>
+    <packaging>jar</packaging>
+    <artifactId>v1_13_2</artifactId>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.13.1-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>craftbukkit</artifactId>
+            <version>1.13.1-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>de.Linus122.TimeIsMoney</groupId>
+            <artifactId>Tools</artifactId>
+            <version>1.9.6.4</version>
+        </dependency>
+    </dependencies>
+</project>

+ 28 - 0
v1_13_R2/src/main/java/main/java/de/Linus122/TimeIsMoney/version/v1_13_R2/NBTUtils.java

@@ -0,0 +1,28 @@
+package main.java.de.Linus122.TimeIsMoney.version.v1_13_R2;
+
+import de.Linus122.TimeIsMoney.tools.ActionBarUtils;
+import net.minecraft.server.v1_13_R2.ChatMessageType;
+import net.minecraft.server.v1_13_R2.IChatBaseComponent;
+import net.minecraft.server.v1_13_R2.PacketPlayOutChat;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+import static de.Linus122.TimeIsMoney.tools.Utils.CC;
+
+/**
+ * NBT Utils for v1_13_R1.
+ *
+ * @author Linus122
+ * @since 1.9.6.4
+ */
+public class NBTUtils implements ActionBarUtils {
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void sendActionBarMessage(Player p, String message) {
+		IChatBaseComponent icbc = IChatBaseComponent.ChatSerializer.a("{\"text\": \"" + CC(message) + "\"}");
+		PacketPlayOutChat bar = new PacketPlayOutChat(icbc, ChatMessageType.GAME_INFO);
+		((CraftPlayer) p).getHandle().playerConnection.sendPacket(bar);
+	}
+}