Preliminary 1.19.4+ support

CozmycDev · CozmycDev · commit 3f7f46371df6 · 2024-09-26T03:45:32.000-04:00
diff --git a/README.md b/README.md
@@ -32,7 +32,6 @@ Future updates will support custom mobs and models through MythicMobs and ModelE
 Here is the default `config.yml` for BendingMobs:
 
 ```yaml
-Version: 1.2.0
 Properties:
   EntityTypes:
   - ZOMBIE
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>net.doodcraft</groupId>
     <artifactId>bendingmobs</artifactId>
-    <version>1.2.0</version>
+    <version>1.3.0</version>
 
     <properties>
         <java.version>1.8</java.version>
@@ -20,8 +20,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
+                    <source>8</source>
+                    <target>8</target>
                 </configuration>
             </plugin>
         </plugins>
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.20.4-R0.1-SNAPSHOT</version>
+            <version>1.19.4-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/net/doodcraft/cozmyc/bendingmobs/BendingMobs.java b/src/main/java/net/doodcraft/cozmyc/bendingmobs/BendingMobs.java
@@ -9,6 +9,7 @@
 import net.doodcraft.cozmyc.bendingmobs.manager.AbilityManager;
 import net.doodcraft.cozmyc.bendingmobs.manager.EntityManager;
 
+import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.util.logging.Logger;
@@ -30,6 +31,11 @@ public void onDisable() {
 
     @Override
     public void onEnable() {
+        if (!isVersionAtLeast1_19_4()) {
+            log.warning("Looks like you're trying to load BendingMobs on an unsupported MC version. This is for 1.19.4+ only.");
+            return;
+        }
+
         plugin = this;
         BendingMobs.log = this.getLogger();
         new ConfigManager(this);
@@ -75,4 +81,20 @@ private void scheduleTasks() {
         getServer().getScheduler().scheduleSyncRepeatingTask(this, new AbilityManager(), 0L, 1L);
         MobMethods.startMobUpdateTask(this);
     }
+
+    public static boolean isVersionAtLeast1_19_4() {
+        String version = Bukkit.getBukkitVersion();
+
+        String[] versionParts = version.split("-")[0].split("\\.");
+
+        int major = Integer.parseInt(versionParts[0]);
+        int minor = Integer.parseInt(versionParts[1]);
+        int patch = Integer.parseInt(versionParts.length > 2 ? versionParts[2] : "0");
+
+        if (major > 1) {
+            return true;
+        } else if (major == 1 && minor > 19) {
+            return true;
+        } else return major == 1 && minor == 19 && patch >= 4;
+    }
 }
diff --git a/src/main/java/net/doodcraft/cozmyc/bendingmobs/Compatibility.java b/src/main/java/net/doodcraft/cozmyc/bendingmobs/Compatibility.java
@@ -14,20 +14,20 @@ public static boolean isHooked(String name) {
         return hookedPlugins.containsKey(name);
     }
 
-    public static boolean hookPlugin(String name, String minVersion, String maxVersion) {
+    public static void hookPlugin(String name, String minVersion, String maxVersion) {
         Plugin plugin = Bukkit.getPluginManager().getPlugin(name);
 
         if (plugin == null) {
-            return false;
+            return;
         }
 
         String version = plugin.getDescription().getVersion().split("-")[0];
 
         if (isVersionSupported(version, minVersion, maxVersion)) {
-            return hookPlugin(name, plugin);
+            hookPlugin(name, plugin);
         } else {
             Bukkit.getLogger().info(String.format("%s v%s is unknown or unsupported. Attempting to hook anyway. There may be errors.", name, version));
-            return hookPlugin(name, plugin);
+            hookPlugin(name, plugin);
         }
     }
 
@@ -39,13 +39,12 @@ private static boolean isVersionSupported(String version, String minVersion, Str
         }
     }
 
-    private static boolean hookPlugin(String name, Plugin plugin) {
+    private static void hookPlugin(String name, Plugin plugin) {
         if (hookedPlugins.containsKey(name)) {
-            return false;
+            return;
         }
         hookedPlugins.put(name, plugin);
         Bukkit.getLogger().info(String.format("Hooked into %s successfully!", name));
-        return true;
     }
 
     private static int compareVersions(String version, String otherVersion) {
diff --git a/src/main/java/net/doodcraft/cozmyc/bendingmobs/MobMethods.java b/src/main/java/net/doodcraft/cozmyc/bendingmobs/MobMethods.java
@@ -26,10 +26,10 @@ public class MobMethods {
     private static final double movementSpeed = BendingMobs.plugin.getConfig().getDouble("Properties.MovementSpeed");
     private static final boolean mobsSwim = BendingMobs.plugin.getConfig().getBoolean("Properties.DoMobsSwim");
 
-    public static List<String> disabledWorlds = new ArrayList<String>();
-    public static List<String> entityTypes = new ArrayList<String>();
+    public static final List<String> disabledWorlds = new ArrayList<>();
+    public static final List<String> entityTypes = new ArrayList<>();
 
-    public static Random rand = new Random();
+    public static final Random rand = new Random();
 
     public static void assignElement(Entity entity) {
         if (!entity.hasMetadata("element")) {
@@ -61,10 +61,7 @@ public static void assignElement(Entity entity, Element element) {
     }
 
     public static boolean isAvatar(LivingEntity entity) {
-        if (entity.hasMetadata("element") && !entity.getMetadata("element").isEmpty() && (entity.getMetadata("element").get(0).asInt() == 4)) {
-            return true;
-        }
-        return false;
+        return entity.hasMetadata("element") && !entity.getMetadata("element").isEmpty() && (entity.getMetadata("element").get(0).asInt() == 4);
     }
 
     public static boolean isDisabledWorld(World world) {
@@ -78,11 +75,16 @@ public static void startMobUpdateTask(JavaPlugin plugin) {
             public void run() {
                 List<Entity> entitiesToRemove = new ArrayList<>();
 
-                for (Entity entity : Bukkit.getWorlds().stream().flatMap(world -> world.getEntities().stream()).toList()) {
+                List<Entity> entities = new ArrayList<>();
+                for (World world : Bukkit.getWorlds()) {
+                    entities.addAll(world.getEntities());
+                }
+
+                for (Entity entity : entities) {
                     if (!(entity instanceof LivingEntity)) continue;
                     if (!canEntityBend(entity.getType().name())) continue;
 
-                    if (!(hasElement((LivingEntity) entity))) {
+                    if (!hasElement((LivingEntity) entity)) {
                         entitiesToRemove.add(entity);
                         continue;
                     }
@@ -145,13 +147,27 @@ public static void disguiseEntity(Entity entity, Element element) {
     }
 
     private static String getNameFor(Element element, String configPath) {
-        return switch (element) {
-            case Air -> BendingMobs.plugin.getConfig().getString(configPath + ".Air");
-            case Earth -> BendingMobs.plugin.getConfig().getString(configPath + ".Earth");
-            case Fire -> BendingMobs.plugin.getConfig().getString(configPath + ".Fire");
-            case Water -> BendingMobs.plugin.getConfig().getString(configPath + ".Water");
-            case Avatar -> BendingMobs.plugin.getConfig().getString(configPath + ".Avatar");
-            default -> "Herobrine";
-        };
+        String name;
+        switch (element) {
+            case Air:
+                name = BendingMobs.plugin.getConfig().getString(configPath + ".Air");
+                break;
+            case Earth:
+                name = BendingMobs.plugin.getConfig().getString(configPath + ".Earth");
+                break;
+            case Fire:
+                name = BendingMobs.plugin.getConfig().getString(configPath + ".Fire");
+                break;
+            case Water:
+                name = BendingMobs.plugin.getConfig().getString(configPath + ".Water");
+                break;
+            case Avatar:
+                name = BendingMobs.plugin.getConfig().getString(configPath + ".Avatar");
+                break;
+            default:
+                name = "Herobrine";
+                break;
+        }
+        return name;
     }
 }
diff --git a/src/main/java/net/doodcraft/cozmyc/bendingmobs/PKMethods.java b/src/main/java/net/doodcraft/cozmyc/bendingmobs/PKMethods.java
@@ -10,6 +10,7 @@
 
 public class PKMethods {
 
+    // using deprecated methods
     public static boolean isWithinPKShield(Location loc) {
         if (!Compatibility.isHooked("ProjectKorra")) return false;
         if (AirShield.isWithinShield(loc)) {
diff --git a/src/main/java/net/doodcraft/cozmyc/bendingmobs/StaticMethods.java b/src/main/java/net/doodcraft/cozmyc/bendingmobs/StaticMethods.java
@@ -20,9 +20,9 @@
 public class StaticMethods {
 
     public static final Set<Material> TRANSPARENT = new HashSet<>();
-    public static Set<String> EARTH_BLOCKS = new HashSet<>();
-    public static Set<String> ICE_BLOCKS = new HashSet<>();
-    public static Set<String> LAVA_BLOCKS = new HashSet<>();
+    public static final Set<String> EARTH_BLOCKS = new HashSet<>();
+    public static final Set<String> ICE_BLOCKS = new HashSet<>();
+    public static final Set<String> LAVA_BLOCKS = new HashSet<>();
 
     static {
         for (final Material mat : Material.values()) {
@@ -48,7 +48,7 @@ public class StaticMethods {
     }
 
     public static boolean isFinite(Location loc) {
-        return Double.isFinite(loc.getX()) && Double.isFinite(loc.getY()) && Double.isFinite(loc.getZ());
+        return !Double.isFinite(loc.getX()) || !Double.isFinite(loc.getY()) || !Double.isFinite(loc.getZ());
     }
 
     public static boolean isFinite(Vector vec) {
@@ -190,7 +190,7 @@ public static BlockFace getCardinalDirection(Vector vector) {
     }
 
     public static Block getRandomSourceBlock(Location location, int radius, Element element) {
-        List<Integer> checked = new ArrayList<Integer>();
+        List<Integer> checked = new ArrayList<>();
         List<Block> blocks = getBlocksAroundPoint(location, radius);
 
         for (int i = 0; i < blocks.size(); i++) {
diff --git a/src/main/java/net/doodcraft/cozmyc/bendingmobs/ability/air/AirBlast.java b/src/main/java/net/doodcraft/cozmyc/bendingmobs/ability/air/AirBlast.java
@@ -16,13 +16,13 @@
 public class AirBlast {
 
     private static final double knockBack = BendingMobs.plugin.getConfig().getDouble("Abilities.Air.AirBlast.Knockback");
-    public static ConcurrentHashMap<Integer, AirBlast> instances = new ConcurrentHashMap<Integer, AirBlast>();
+    public static final ConcurrentHashMap<Integer, AirBlast> instances = new ConcurrentHashMap<>();
     private static int ID = Integer.MIN_VALUE;
     private final LivingEntity entity;
     private final Location origin;
     private final int id;
-    private Location head;
-    private Vector dir;
+    private final Location head;
+    private final Vector dir;
 
     public AirBlast(LivingEntity entity, Location target) {
         this.entity = entity;
@@ -46,7 +46,7 @@ public static void progressAll() {
     }
 
     private boolean progress() {
-        if (entity == null || !StaticMethods.isFinite(head) || !StaticMethods.isFinite(dir)) {
+        if (entity == null || StaticMethods.isFinite(head) || !StaticMethods.isFinite(dir)) {
             return false;
         }
         if (entity.getWorld() != head.getWorld()) {
diff --git a/src/main/java/net/doodcraft/cozmyc/bendingmobs/ability/air/AirScooter.java b/src/main/java/net/doodcraft/cozmyc/bendingmobs/ability/air/AirScooter.java
@@ -12,7 +12,7 @@ public class AirScooter {
 
     private static final long duration = BendingMobs.plugin.getConfig().getLong("Abilities.Air.AirScooter.Duration");
     private static final double speed = BendingMobs.plugin.getConfig().getDouble("Abilities.Air.AirScooter.Speed");
-    public static ConcurrentHashMap<Integer, AirScooter> instances = new ConcurrentHashMap<Integer, AirScooter>();
+    public static final ConcurrentHashMap<Integer, AirScooter> instances = new ConcurrentHashMap<>();
     private static int ID = Integer.MIN_VALUE;
     private final LivingEntity entity;
     private final Location target;
diff --git a/src/main/java/net/doodcraft/cozmyc/bendingmobs/ability/earth/EarthBlast.java b/src/main/java/net/doodcraft/cozmyc/bendingmobs/ability/earth/EarthBlast.java
@@ -24,7 +24,7 @@
 public class EarthBlast {
 
     private static final double damage = BendingMobs.plugin.getConfig().getDouble("Abilities.Earth.EarthBlast.Damage");
-    public static ConcurrentHashMap<Integer, EarthBlast> instances = new ConcurrentHashMap<Integer, EarthBlast>();
+    public static final ConcurrentHashMap<Integer, EarthBlast> instances = new ConcurrentHashMap<>();
     private static int ID = Integer.MIN_VALUE;
     private final LivingEntity entity;
     private Location origin;
@@ -68,7 +68,7 @@ public static void progressAll() {
     }
 
     private boolean progress() {
-        if (entity == null || !StaticMethods.isFinite(head) || !StaticMethods.isFinite(dir)) {
+        if (entity == null || StaticMethods.isFinite(head) || !StaticMethods.isFinite(dir)) {
             return false;
         }
         if (entity.isDead()) {
diff --git a/src/main/java/net/doodcraft/cozmyc/bendingmobs/ability/fire/FireBlast.java b/src/main/java/net/doodcraft/cozmyc/bendingmobs/ability/fire/FireBlast.java
@@ -17,7 +17,7 @@ public class FireBlast {
 
     private static final double damage = BendingMobs.plugin.getConfig().getDouble("Abilities.Fire.FireBlast.Damage");
     private static final long fireTick = BendingMobs.plugin.getConfig().getLong("Abilities.Fire.FireBlast.FireTick");
-    public static ConcurrentHashMap<Integer, FireBlast> instances = new ConcurrentHashMap<Integer, FireBlast>();
+    public static final ConcurrentHashMap<Integer, FireBlast> instances = new ConcurrentHashMap<>();
     private static int ID = Integer.MIN_VALUE;
     private final LivingEntity entity;
     private final Location origin;
@@ -47,7 +47,7 @@ public static void progressAll() {
     }
 
     private boolean progress() {
-        if (entity == null || !StaticMethods.isFinite(head) || !StaticMethods.isFinite(dir)) {
+        if (entity == null || StaticMethods.isFinite(head) || !StaticMethods.isFinite(dir)) {
             return false;
         }
         if (entity.getWorld() != head.getWorld()) {
diff --git a/src/main/java/net/doodcraft/cozmyc/bendingmobs/ability/fire/FireJet.java b/src/main/java/net/doodcraft/cozmyc/bendingmobs/ability/fire/FireJet.java
@@ -12,7 +12,7 @@ public class FireJet {
 
     private static final long duration = BendingMobs.plugin.getConfig().getLong("Abilities.Fire.FireJet.Duration");
     private static final double speed = BendingMobs.plugin.getConfig().getDouble("Abilities.Fire.FireJet.Speed");
-    public static ConcurrentHashMap<Integer, FireJet> instances = new ConcurrentHashMap<Integer, FireJet>();
+    public static final ConcurrentHashMap<Integer, FireJet> instances = new ConcurrentHashMap<>();
     private static int ID = Integer.MIN_VALUE;
     private final LivingEntity entity;
     private final Location target;
diff --git a/src/main/java/net/doodcraft/cozmyc/bendingmobs/ability/water/WaterBlast.java b/src/main/java/net/doodcraft/cozmyc/bendingmobs/ability/water/WaterBlast.java
@@ -21,13 +21,13 @@
 public class WaterBlast {
 
     private static final double damage = BendingMobs.plugin.getConfig().getDouble("Abilities.Water.WaterBlast.Damage");
-    public static ConcurrentHashMap<Integer, WaterBlast> instances = new ConcurrentHashMap<>();
+    public static final ConcurrentHashMap<Integer, WaterBlast> instances = new ConcurrentHashMap<>();
     private static int ID = Integer.MIN_VALUE;
     private final LivingEntity entity;
     private final Location origin;
     private final int id;
-    private Location head;
-    private Vector dir;
+    private final Location head;
+    private final Vector dir;
 
     public WaterBlast(LivingEntity entity, Location target) {
         this.entity = entity;
@@ -52,7 +52,7 @@ public static void progressAll() {
     }
 
     private boolean progress() {
-        if (entity == null || !StaticMethods.isFinite(head) || !StaticMethods.isFinite(dir)) {
+        if (entity == null || StaticMethods.isFinite(head) || !StaticMethods.isFinite(dir)) {
             return false;
         }
         if (entity.isDead()) {
@@ -106,7 +106,7 @@ private void remove() {
     private void displayBlock(Location location) {
         BlockDisplay blockDisplay = Objects.requireNonNull(location.getWorld()).spawn(location, BlockDisplay.class);
 
-        blockDisplay.setBlock(Material.SAND.createBlockData());
+        blockDisplay.setBlock(Material.BLUE_ICE.createBlockData());
         blockDisplay.setDisplayHeight(0.5F);
         blockDisplay.setDisplayWidth(0.5F);
         blockDisplay.setPersistent(false);
diff --git a/src/main/java/net/doodcraft/cozmyc/bendingmobs/config/ConfigManager.java b/src/main/java/net/doodcraft/cozmyc/bendingmobs/config/ConfigManager.java
@@ -6,7 +6,7 @@
 
 public class ConfigManager {
 
-    BendingMobs plugin;
+    final BendingMobs plugin;
 
     public ConfigManager(BendingMobs plugin) {
         this.plugin = plugin;
@@ -17,8 +17,6 @@ private void init() {
         FileConfiguration config;
         config = plugin.getConfig();
 
-        config.addDefault("Version", "1.2.0");
-
         config.addDefault("Properties.EntityTypes", new String[]{
                 EntityType.ZOMBIE.name().toUpperCase()
         });
@@ -44,13 +42,6 @@ private void init() {
         config.addDefault("LibsDisguises.SkinName.Fire", "FireBender");
         config.addDefault("LibsDisguises.SkinName.Water", "WaterBender");
 
-//        config.addDefault("MythicMobs.Enabled", false);
-//        config.addDefault("MythicMobs.Mob.Avatar", "Avatar");
-//        config.addDefault("MythicMobs.Mob.Air", "AirBender");
-//        config.addDefault("MythicMobs.Mob.Earth", "EarthBender");
-//        config.addDefault("MythicMobs.Mob.Fire", "FireBender");
-//        config.addDefault("MythicMobs.Mob.Water", "WaterBender");
-
         config.addDefault("Abilities.Air.Enabled", true);
         config.addDefault("Abilities.Air.AirBlast.Knockback", 2.0);
         config.addDefault("Abilities.Air.AirScooter.Duration", 1000);
diff --git a/src/main/java/net/doodcraft/cozmyc/bendingmobs/listener/MobListener.java b/src/main/java/net/doodcraft/cozmyc/bendingmobs/listener/MobListener.java
diff --git a/src/main/java/net/doodcraft/cozmyc/bendingmobs/manager/EntityManager.java b/src/main/java/net/doodcraft/cozmyc/bendingmobs/manager/EntityManager.java
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml

Original file line number	Diff line number	Diff line change
`@@ -14,20 +14,20 @@ public static boolean isHooked(String name) {`
`14`	`14`	`return hookedPlugins.containsKey(name);`
`15`	`15`	`}`
`16`	`16`
`17`		`- public static boolean hookPlugin(String name, String minVersion, String maxVersion) {`
	`17`	`+ public static void hookPlugin(String name, String minVersion, String maxVersion) {`
`18`	`18`	`Plugin plugin = Bukkit.getPluginManager().getPlugin(name);`
`19`	`19`
`20`	`20`	`if (plugin == null) {`
`21`		`- return false;`
	`21`	`+ return;`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`String version = plugin.getDescription().getVersion().split("-")[0];`
`25`	`25`
`26`	`26`	`if (isVersionSupported(version, minVersion, maxVersion)) {`
`27`		`- return hookPlugin(name, plugin);`
	`27`	`+ hookPlugin(name, plugin);`
`28`	`28`	`} else {`
`29`	`29`	`Bukkit.getLogger().info(String.format("%s v%s is unknown or unsupported. Attempting to hook anyway. There may be errors.", name, version));`
`30`		`- return hookPlugin(name, plugin);`
	`30`	`+ hookPlugin(name, plugin);`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`@@ -39,13 +39,12 @@ private static boolean isVersionSupported(String version, String minVersion, Str`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`42`		`- private static boolean hookPlugin(String name, Plugin plugin) {`
	`42`	`+ private static void hookPlugin(String name, Plugin plugin) {`
`43`	`43`	`if (hookedPlugins.containsKey(name)) {`
`44`		`- return false;`
	`44`	`+ return;`
`45`	`45`	`}`
`46`	`46`	`hookedPlugins.put(name, plugin);`
`47`	`47`	`Bukkit.getLogger().info(String.format("Hooked into %s successfully!", name));`
`48`		`- return true;`
`49`	`48`	`}`
`50`	`49`
`51`	`50`	`private static int compareVersions(String version, String otherVersion) {`