Update to 1.20.3(4)

Foxikle · Dec 10, 2023 · d2da4b3 · d2da4b3
1 parent f838f31
commit d2da4b3
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -13,13 +13,13 @@ repositories {
 }
 
 dependencies {
-    paperweight.paperDevBundle("1.20.2-R0.1-SNAPSHOT")
+    paperweight.paperDevBundle("1.20.3-R0.1-SNAPSHOT")
     implementation("org.bstats:bstats-bukkit:3.0.2")
     compileOnly("me.clip:placeholderapi:2.11.5")
 }
 
 group = "dev.foxikle"
-version = "1.5.2-pre3"
+version = "1.6-pre1"
 description = "CustomNPCs"
 java.sourceCompatibility = JavaVersion.VERSION_16
 

diff --git a/src/main/java/dev/foxikle/customnpcs/api/NPC.java b/src/main/java/dev/foxikle/customnpcs/api/NPC.java
@@ -15,9 +15,9 @@
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_20_R2.CraftServer;
-import org.bukkit.craftbukkit.v1_20_R2.CraftWorld;
-import org.bukkit.craftbukkit.v1_20_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_20_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_20_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;

diff --git a/src/main/java/dev/foxikle/customnpcs/api/NPCApi.java b/src/main/java/dev/foxikle/customnpcs/api/NPCApi.java
@@ -11,9 +11,9 @@
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.phys.Vec3;
 import org.bukkit.*;
-import org.bukkit.craftbukkit.v1_20_R2.CraftServer;
-import org.bukkit.craftbukkit.v1_20_R2.CraftWorld;
-import org.bukkit.craftbukkit.v1_20_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_20_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_20_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;

diff --git a/src/main/java/dev/foxikle/customnpcs/internal/CustomNPCs.java b/src/main/java/dev/foxikle/customnpcs/internal/CustomNPCs.java
@@ -164,7 +164,7 @@ public final class CustomNPCs extends JavaPlugin implements PluginMessageListene
     public void onEnable() {
         instance = this;
         if (!setup()) {
-            Bukkit.getLogger().severe("Incompatible server version! Please use 1.20.2! Shutting down plugin.");
+            Bukkit.getLogger().severe("Incompatible server version! Please use 1.20.3 - 1.20.4! Shutting down plugin.");
             Bukkit.getPluginManager().disablePlugin(this);
         }
 
@@ -225,7 +225,7 @@ public void onEnable() {
      */
 
     public boolean setup() {
-        return (Bukkit.getServer().getMinecraftVersion().equals("1.20.2"));
+        return (Bukkit.getServer().getMinecraftVersion().equals("1.20.3") || Bukkit.getServer().getMinecraftVersion().equals("1.20.4"));
     }
 
     /**

diff --git a/src/main/java/dev/foxikle/customnpcs/internal/FileManager.java b/src/main/java/dev/foxikle/customnpcs/internal/FileManager.java
@@ -11,8 +11,8 @@
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.craftbukkit.v1_20_R2.CraftServer;
-import org.bukkit.craftbukkit.v1_20_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_20_R3.CraftWorld;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/src/main/java/dev/foxikle/customnpcs/internal/InternalNpc.java b/src/main/java/dev/foxikle/customnpcs/internal/InternalNpc.java
@@ -17,8 +17,8 @@
 import net.minecraft.server.network.ServerGamePacketListenerImpl;
 import net.minecraft.world.phys.Vec3;
 import org.bukkit.*;
-import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack;
 import org.bukkit.entity.Display;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;

diff --git a/src/main/java/dev/foxikle/customnpcs/internal/commands/CommandCore.java b/src/main/java/dev/foxikle/customnpcs/internal/commands/CommandCore.java
@@ -18,8 +18,8 @@
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.command.*;
-import org.bukkit.craftbukkit.v1_20_R2.CraftServer;
-import org.bukkit.craftbukkit.v1_20_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_20_R3.CraftWorld;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.bukkit.inventory.ItemStack;

diff --git a/src/main/java/dev/foxikle/customnpcs/internal/listeners/Listeners.java b/src/main/java/dev/foxikle/customnpcs/internal/listeners/Listeners.java
@@ -12,7 +12,7 @@
 import net.minecraft.world.phys.Vec3;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
-import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;