Merge pull request #10 from ParallelMC/1.18

1.18

Author: UnknownSilicon

pom.xml

@@ -6,15 +6,15 @@
 
     <groupId>parallelmc</groupId>
     <artifactId>parallelutils</artifactId>
-    <version>1.9.0</version>
+    <version>1.10.0</version>
     <packaging>jar</packaging>
 
     <name>Parallelutils</name>
 
     <properties>
-        <java.version>16</java.version>
-        <maven.compiler.source>16</maven.compiler.source>
-        <maven.compiler.target>16</maven.compiler.target>
+        <java.version>17</java.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
@@ -109,8 +109,14 @@
         </dependency>
         <dependency>
             <groupId>io.papermc.paper</groupId>
-            <artifactId>paper</artifactId>
-            <version>1.17.1-R0.1-SNAPSHOT</version>
+            <artifactId>paper-server</artifactId>
+            <version>1.18-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.papermc.paper</groupId>
+            <artifactId>paper-api</artifactId>
+            <version>1.18-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <!--<dependency>
@@ -128,7 +134,7 @@
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>4.3.0_277</version>
+            <version>4.4.0_350</version>
             <scope>compile</scope>
         </dependency>
 
@@ -158,7 +164,7 @@
         <dependency>
             <groupId>com.sk89q.worldguard</groupId>
             <artifactId>worldguard-bukkit</artifactId>
-            <version>7.0.5</version>
+            <version>7.0.6</version>
             <scope>provided</scope>
         </dependency>
 
@@ -175,5 +181,6 @@
             <artifactId>mysql-connector-java</artifactId>
             <version>8.0.26</version>
         </dependency>
+
     </dependencies>
 </project>

src/main/java/parallelmc/parallelutils/Constants.java

@@ -2,7 +2,7 @@
 
 public class Constants {
 
-	public static final Version VERSION = new Version(1, 9, 0);
+	public static final Version VERSION = new Version(1, 10, 0);
 	public static final String PLUGIN_NAME = "ParallelUtils";
 	public static final String DEFAULT_WORLD = "world";
 }

src/main/java/parallelmc/parallelutils/commands/Commands.java

@@ -5,7 +5,7 @@
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.command.*;
-import org.bukkit.craftbukkit.v1_17_R1.command.ServerCommandSender;
+import org.bukkit.craftbukkit.v1_18_R1.command.ServerCommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

src/main/java/parallelmc/parallelutils/modules/bitsandbobs/minimodules/KeepSpecialItems.java

@@ -2,7 +2,7 @@
 
 import net.minecraft.nbt.NBTTagCompound;
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftItemStack;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.PlayerDeathEvent;
@@ -31,21 +31,21 @@ public void onPlayerDeath(PlayerDeathEvent event) {
                 // TODO: Try to change this code to use item.getItemMeta().getPersistentDataContainer()
                 net.minecraft.world.item.ItemStack nmsItem = CraftItemStack.asNMSCopy(item); // does this even work lol
                 // Grabs the NMS items compound and checks if it's null
-                NBTTagCompound compound = (nmsItem.hasTag()) ? nmsItem.getTag() : new NBTTagCompound();
+                NBTTagCompound compound = (nmsItem.r()) ? nmsItem.s() : new NBTTagCompound();
 
                 if (compound == null) continue;
 
-                if (compound.hasKey("CustomHat")) {
+                if (compound.e("CustomHat")) {
                     preventedDrops.add(item);
                 }
             } else if (item.getType() == Material.PLAYER_HEAD) {
                 net.minecraft.world.item.ItemStack nmsItem = CraftItemStack.asNMSCopy(item); // does this even work lol
                 // Grabs the NMS items compound and checks if it's null
-                NBTTagCompound compound = (nmsItem.hasTag()) ? nmsItem.getTag() : new NBTTagCompound();
+                NBTTagCompound compound = (nmsItem.r()) ? nmsItem.s() : new NBTTagCompound();
 
                 if (compound == null) continue;
 
-                if (compound.hasKey("CustomTrophy")) {
+                if (compound.e("CustomTrophy")) {
                     preventedDrops.add(item);
                 }
             }

src/main/java/parallelmc/parallelutils/modules/custommobs/CustomMobs.java

@@ -4,8 +4,8 @@
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Particle;
-import org.bukkit.craftbukkit.v1_17_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_17_R1.entity.CraftZombie;
+import org.bukkit.craftbukkit.v1_18_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_18_R1.entity.CraftZombie;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.scheduler.BukkitTask;

src/main/java/parallelmc/parallelutils/modules/custommobs/bukkitmobs/CraftFireWisp.java

@@ -9,7 +9,7 @@
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
-import org.bukkit.craftbukkit.v1_17_R1.entity.CraftZombie;
+import org.bukkit.craftbukkit.v1_18_R1.entity.CraftZombie;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.inventory.ItemFlag;

src/main/java/parallelmc/parallelutils/modules/custommobs/bukkitmobs/CraftWisp.java

@@ -8,7 +8,7 @@
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
-import org.bukkit.craftbukkit.v1_17_R1.entity.CraftZombie;
+import org.bukkit.craftbukkit.v1_18_R1.entity.CraftZombie;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.inventory.ItemFlag;

src/main/java/parallelmc/parallelutils/modules/custommobs/commands/ParallelSummonCommand.java

@@ -5,8 +5,8 @@
 import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.bukkit.craftbukkit.v1_17_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_17_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_18_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_18_R1.CraftWorld;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;

src/main/java/parallelmc/parallelutils/modules/custommobs/events/CustomMobsGeneralEntityListener.java

@@ -5,7 +5,7 @@
 import net.minecraft.world.entity.Entity;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_17_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_18_R1.entity.CraftEntity;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import parallelmc.parallelutils.Parallelutils;

src/main/java/parallelmc/parallelutils/modules/custommobs/nmsmobs/CustomEntityHelper.java

@@ -19,13 +19,13 @@ public class CustomEntityHelper {
 	 */
 	public static void clearGoals(EntityInsentient entity) {
 
-		Map goalC = (Map) getPrivateField("c", PathfinderGoalSelector.class, entity.bP);
+		Map goalC = (Map) getPrivateField("c", PathfinderGoalSelector.class, entity.bR);
 		goalC.clear();
-		Set goalD = (Set) getPrivateField("d", PathfinderGoalSelector.class, entity.bP);
+		Set goalD = (Set) getPrivateField("d", PathfinderGoalSelector.class, entity.bR);
 		goalD.clear();
-		Map targetC = (Map) getPrivateField("c", PathfinderGoalSelector.class, entity.bQ);
+		Map targetC = (Map) getPrivateField("c", PathfinderGoalSelector.class, entity.bS);
 		targetC.clear();
-		Set targetD = (Set) getPrivateField("d", PathfinderGoalSelector.class, entity.bQ);
+		Set targetD = (Set) getPrivateField("d", PathfinderGoalSelector.class, entity.bS);
 		targetD.clear();
 	}