FreeMinecraftModels 2.0.0:

- Added prop command & prop system
- Armor stands now work
- Fixed problems with contact damage
- Added scale to animations
- Updated for Minecraft 1.21.5
- Added a centralized ticking system for better performance
- Several improvements to the prop system, damage system and bounding box system
- A lot of optimizations around the watchers and animation system
- New correctly checking for remote updates
- Added new hitbox system which supports having x and z dimension be different for hitboxes, and increases accuracy as it supports hitboxes rotating when entities rotate (this is not something Minecraft can do)
- Plugin is now more optimized around having significantly more entities

Author: MagmaGuy

ReadMe.md

@@ -5,7 +5,7 @@
 
     <groupId>com.magmaguy</groupId>
     <artifactId>FreeMinecraftModels</artifactId>
-    <version>1.6.0</version>
+    <version>2.0.0</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
@@ -86,7 +86,7 @@
         <dependency>
             <groupId>com.magmaguy</groupId>
             <artifactId>EasyMinecraftGoals-dist</artifactId>
-            <version>1.19.2-SNAPSHOT</version>
+            <version>1.19.3</version>
         </dependency>
 
         <dependency>

pom.xml

@@ -10,7 +10,6 @@
 import com.magmaguy.freeminecraftmodels.customentity.core.OBBHitDetection;
 import com.magmaguy.freeminecraftmodels.dataconverter.FileModelConverter;
 import com.magmaguy.freeminecraftmodels.listeners.EntityTeleportEvent;
-import com.magmaguy.freeminecraftmodels.utils.VersionChecker;
 import com.magmaguy.magmacore.MagmaCore;
 import com.magmaguy.magmacore.command.CommandManager;
 import org.bstats.bukkit.Metrics;
@@ -34,24 +33,20 @@ public void onEnable() {
         Bukkit.getLogger().info("Version " + this.getDescription().getVersion());
         MetadataHandler.PLUGIN = this;
         MagmaCore.onEnable();
+        MagmaCore.checkVersionUpdate("111660");
         //Initialize plugin configuration files
         new DefaultConfig();
         MagmaCore.initializeImporter();
         OutputFolder.initializeConfig();
         ModelsFolder.initializeConfig();
         Metrics metrics = new Metrics(this, 19337);
         Bukkit.getPluginManager().registerEvents(new ModeledEntityEvents(), this);
-//        Bukkit.getPluginManager().registerEvents(new LegacyHitDetection(), this);
         Bukkit.getPluginManager().registerEvents(new OBBHitDetection(), this);
         Bukkit.getPluginManager().registerEvents(new PropEntity.PropEntityEvents(), this);
-
-        Bukkit.getPluginManager().registerEvents(new VersionChecker.VersionCheckerEvents(), this);
         Bukkit.getPluginManager().registerEvents(new EntityTeleportEvent(), this);
         NMSManager.initializeAdapter(this);
-        VersionChecker.checkPluginVersion();
         CommandManager manager = new CommandManager(this, "freeminecraftmodels");
         manager.registerCommand(new MountCommand());
-        manager.registerCommand(new PropCommand());
         manager.registerCommand(new HitboxDebugCommand());
         manager.registerCommand(new ReloadCommand());
         manager.registerCommand(new SpawnCommand());

src/main/java/com/magmaguy/freeminecraftmodels/FreeMinecraftModels.java

@@ -1,5 +1,7 @@
 package com.magmaguy.freeminecraftmodels.commands;
 
+import com.magmaguy.freeminecraftmodels.config.props.PropsConfig;
+import com.magmaguy.freeminecraftmodels.config.props.PropsConfigFields;
 import com.magmaguy.freeminecraftmodels.customentity.DynamicEntity;
 import com.magmaguy.freeminecraftmodels.customentity.StaticEntity;
 import com.magmaguy.freeminecraftmodels.dataconverter.FileModelConverter;
@@ -19,39 +21,60 @@
 
 public class SpawnCommand extends AdvancedCommand {
 
-    List<String> spawnTypes = List.of("static", "dynamic");
+    List<String> spawnTypes = List.of("static", "dynamic", "prop");
     List<String> entityIDs = new ArrayList<>();
 
     public SpawnCommand() {
         super(List.of("spawn"));
-        addArgument("type", new ListStringCommandArgument(List.of("STATIC", "DYNAMIC"), "<spawn>"));
+        addArgument("type", new ListStringCommandArgument(List.of("STATIC", "DYNAMIC", "PROP"), "<spawn>"));
         entityIDs = new ArrayList<>();
         FileModelConverter.getConvertedFileModels().values().forEach(fileModelConverter -> entityIDs.add(fileModelConverter.getID()));
         addArgument("model", new ListStringCommandArgument(entityIDs, "<model>"));
-        setDescription("Spawns a custom models");
+        setDescription("Spawns custom models or creates props");
         setPermission("freeminecraftmodels.*");
-        setUsage("/fmm spawn <static/dynamic> <modelID>");
+        setUsage("/fmm spawn <static/dynamic/prop> <modelID>");
         setSenderType(SenderType.PLAYER);
     }
 
     @Override
     public void execute(CommandData commandData) {
         Player player = commandData.getPlayerSender();
-        if (!entityIDs.contains(commandData.getStringArgument("model"))) {
+        String modelID = commandData.getStringArgument("model");
+
+        if (!entityIDs.contains(modelID)) {
             Logger.sendMessage(commandData.getCommandSender(), "Invalid entity ID!");
             return;
         }
+
+        String type = commandData.getStringArgument("type").toLowerCase();
+
+        if (type.equals("prop")) {
+            createProp(player, modelID);
+            return;
+        }
+
+        // Handle static and dynamic types (existing functionality)
         RayTraceResult rayTraceResult = player.rayTraceBlocks(300);
         if (rayTraceResult == null) {
             Logger.sendMessage(commandData.getCommandSender(), "You need to be looking at the ground to spawn a mob!");
             return;
         }
+
         Location location = rayTraceResult.getHitBlock().getLocation().add(0.5, 1, 0.5);
         location.setPitch(0);
         location.setYaw(180);
-        if (commandData.getStringArgument("type").equalsIgnoreCase("static"))
-            StaticEntity.create(commandData.getStringArgument("model"), location);
-        else if (commandData.getStringArgument("type").equalsIgnoreCase("dynamic"))
-            DynamicEntity.create(commandData.getStringArgument("model"), (LivingEntity) location.getWorld().spawnEntity(location, EntityType.PIG));
+
+        if (type.equals("static")) {
+            StaticEntity.create(modelID, location);
+        } else if (type.equals("dynamic")) {
+            DynamicEntity.create(modelID, (LivingEntity) location.getWorld().spawnEntity(location, EntityType.PIG));
+        }
+    }
+
+    private void createProp(Player player, String propFilename) {
+        // Get or create the prop configuration, messaging is now handled in PropsConfig
+        PropsConfigFields prop = PropsConfig.addPropConfigurationFile(propFilename, player);
+        prop.permanentlyAddLocation(player.getLocation());
+        Logger.sendMessage(player, "Successfully added prop!");
     }
-}
+}

src/main/java/com/magmaguy/freeminecraftmodels/commands/PropCommand.java

@@ -4,8 +4,8 @@
 import com.magmaguy.freeminecraftmodels.MetadataHandler;
 import com.magmaguy.freeminecraftmodels.dataconverter.BoneBlueprint;
 import com.magmaguy.freeminecraftmodels.dataconverter.FileModelConverter;
-import com.magmaguy.freeminecraftmodels.utils.VersionChecker;
 import com.magmaguy.magmacore.util.Logger;
+import com.magmaguy.magmacore.util.VersionChecker;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;

src/main/java/com/magmaguy/freeminecraftmodels/commands/SpawnCommand.java

@@ -3,8 +3,10 @@
 import com.magmaguy.magmacore.config.ConfigurationEngine;
 import com.magmaguy.magmacore.config.CustomConfig;
 import com.magmaguy.magmacore.config.CustomConfigFields;
+import com.magmaguy.magmacore.util.Logger;
 import lombok.Getter;
 import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.entity.Player;
 
 import java.io.File;
 import java.util.HashMap;
@@ -23,12 +25,20 @@ public PropsConfig() {
                 propsConfigs.put(key, (PropsConfigFields) super.getCustomConfigFieldsHashMap().get(key));
     }
 
-    public static PropsConfigFields addPropConfigurationFile(String propFilename) {
-        PropsConfig.getPropsConfigs().put(propFilename, new PropsConfigFields(propFilename, true));
-        PropsConfigFields newProp = PropsConfig.getPropsConfigs().get(propFilename);
-        propsConfigs.put(propFilename, newProp);
-        INSTANCE.initialize(newProp);
-        return newProp;
+    public static PropsConfigFields addPropConfigurationFile(String propFilename, Player player) {
+        if (!propsConfigs.containsKey(propFilename)) {
+            PropsConfigFields newProp = new PropsConfigFields(propFilename, true);
+            propsConfigs.put(propFilename, newProp);
+            INSTANCE.initialize(newProp);
+
+            // Only show this message if a new config was created
+            Logger.sendMessage(player, "Created new prop config file at ~/plugins/FreeMinecraftModels/props/" + propFilename + ".yml");
+            return newProp;
+        } else {
+            // If the config already exists, inform the user where they can edit the values
+            Logger.sendMessage(player, "Using existing prop config. You can edit properties at ~/plugins/FreeMinecraftModels/props/" + propFilename + ".yml");
+            return propsConfigs.get(propFilename);
+        }
     }
 
     private void initialize(CustomConfigFields customConfigFields) {
@@ -51,5 +61,4 @@ private void initialize(CustomConfigFields customConfigFields) {
         //Store for use by the plugin
         addCustomConfigFields(file.getName(), customConfigFields);
     }
-
-}
+}

src/main/java/com/magmaguy/freeminecraftmodels/config/ModelsFolder.java

@@ -4,7 +4,6 @@
 import com.magmaguy.freeminecraftmodels.MetadataHandler;
 import com.magmaguy.freeminecraftmodels.customentity.core.ModeledEntityInterface;
 import com.magmaguy.freeminecraftmodels.customentity.core.OBBHitDetection;
-import com.magmaguy.freeminecraftmodels.customentity.core.OrientedBoundingBox;
 import com.magmaguy.freeminecraftmodels.customentity.core.RegisterModelEntity;
 import com.magmaguy.freeminecraftmodels.dataconverter.FileModelConverter;
 import com.magmaguy.magmacore.util.AttributeManager;
@@ -18,7 +17,6 @@
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.persistence.PersistentDataType;
-import org.bukkit.util.BoundingBox;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.ArrayList;
@@ -32,11 +30,12 @@ public class DynamicEntity extends ModeledEntity implements ModeledEntityInterfa
     @Getter
     private final String name = "default";
     boolean oneTimeDamageWarning = false;
+    int counter = 0;
     // Contact damage detection is integrated into the entity's internal clock
     // Contact damage properties
     @Getter
     @Setter
-    private boolean damagesOnContact = true;
+    private boolean damagesOnContact = false;
     @Getter
     private int customDamage = 1;
 
@@ -117,8 +116,8 @@ private void syncSkeletonWithEntity() {
         getSkeleton().setCurrentHeadPitch(livingEntity.getEyeLocation().getPitch());
         getSkeleton().setCurrentHeadYaw(livingEntity.getEyeLocation().getYaw());
 
-        //todo: might want to run every other tick for performance
-        if (damagesOnContact) checkPlayerCollisions();
+        if (damagesOnContact && counter % 2 == 0) checkPlayerCollisions();
+        counter++;
     }
 
     @Override
@@ -175,7 +174,7 @@ private void checkPlayerCollisions() {
 
         // Check for nearby players (within 5 blocks)
         List<Player> nearbyPlayers = livingEntity.getWorld().getPlayers().stream()
-                .filter(player -> player.getLocation().distanceSquared(livingEntity.getLocation()) < 25)
+                .filter(player -> player.getLocation().distanceSquared(livingEntity.getLocation()) < Math.pow(10, 2))
                 .collect(Collectors.toList());
 
         // For each nearby player, check collision and apply damage if colliding
@@ -199,14 +198,8 @@ private void checkPlayerCollisions() {
      * Checks if a player is colliding with this entity
      */
     private boolean isPlayerColliding(Player player) {
-        // Get fresh OBB for entity
-        OrientedBoundingBox entityOBB = OrientedBoundingBox.createOBB(this);
-
-        // Get player's bounding box
-        BoundingBox playerBB = player.getBoundingBox();
-
         // Check for collision
-        return getObbHitbox().isAABBCollidingWithOBB(playerBB, entityOBB);
+        return getObbHitbox().isAABBCollidingWithOBB(player.getBoundingBox(), getObbHitbox());
     }
 
 }

src/main/java/com/magmaguy/freeminecraftmodels/config/props/PropsConfig.java

@@ -15,7 +15,6 @@
 import org.bukkit.entity.Player;
 import org.bukkit.entity.TextDisplay;
 import org.bukkit.persistence.PersistentDataType;
-import org.joml.Vector3d;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -100,8 +99,7 @@ public OrientedBoundingBox getObbHitbox() {
 
     public void tick() {
         getSkeleton().transform();
-        Location location = getLocation();
-        getObbHitbox().setCenter(new Vector3d(location.getX(), location.getY(), location.getZ()));
+        getObbHitbox().update(getLocation());
         if (animationManager != null)
             animationManager.tick();
         //overriden by extending classes

src/main/java/com/magmaguy/freeminecraftmodels/customentity/DynamicEntity.java

@@ -3,7 +3,7 @@
 import com.magmaguy.freeminecraftmodels.config.DefaultConfig;
 import com.magmaguy.freeminecraftmodels.dataconverter.BoneBlueprint;
 import com.magmaguy.freeminecraftmodels.thirdparty.Floodgate;
-import com.magmaguy.freeminecraftmodels.utils.VersionChecker;
+import com.magmaguy.magmacore.util.VersionChecker;
 import lombok.Getter;
 import org.bukkit.Color;
 import org.bukkit.entity.ArmorStand;