From 960c2750da4f9dd5a64384357565c9883f4aca51 Mon Sep 17 00:00:00 2001
From: xSquishyLiam <56977759+xSquishyLiam@users.noreply.github.com>
Date: Mon, 1 Sep 2025 20:22:00 +0100
Subject: [PATCH] I think i replaced all the hardcoded namespaces

---
 .../geysermodelenginepackgenerator/generator/Entity.java   | 7 ++++---
 .../geysermodelenginepackgenerator/generator/Geometry.java | 2 +-
 .../generator/RenderController.java                        | 7 ++++---
 .../managers/resourcepack/ResourcePackManager.java         | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/re/imc/geysermodelenginepackgenerator/generator/Entity.java b/src/main/java/re/imc/geysermodelenginepackgenerator/generator/Entity.java
index a4ede90..35c9095 100644
--- a/src/main/java/re/imc/geysermodelenginepackgenerator/generator/Entity.java
+++ b/src/main/java/re/imc/geysermodelenginepackgenerator/generator/Entity.java
@@ -30,7 +30,7 @@ public class Entity {
               "format_version": "1.10.0",
               "minecraft:client_entity": {
                 "description": {
-                  "identifier": "modelengine:%entity_id%",
+                  "identifier": "%namespace%:%entity_id%",
                   "materials": {
                     "default": "%material%",
                     "anim": "entity_alphatest_anim_change_color_one_sided"
@@ -59,8 +59,9 @@ public class Entity {
         this.modelId = modelId;
     }
 
-    public void modify() {
-        this.json = JsonParser.parseString(TEMPLATE.replace("%entity_id%", modelId)
+    public void modify(String namespace) {
+        this.json = JsonParser.parseString(TEMPLATE.replace("%namespace%", namespace)
+                .replace("%entity_id%", modelId)
                 .replace("%geometry%", "geometry.meg_" + modelId)
                 .replace("%texture%", "textures/entity/" + path + modelId)
                 .replace("%look_at_target%", modelConfig.isEnableHeadRotation() ? "animation." + modelId + ".look_at_target" : "animation.none")
diff --git a/src/main/java/re/imc/geysermodelenginepackgenerator/generator/Geometry.java b/src/main/java/re/imc/geysermodelenginepackgenerator/generator/Geometry.java
index 6b6c62e..eb18849 100644
--- a/src/main/java/re/imc/geysermodelenginepackgenerator/generator/Geometry.java
+++ b/src/main/java/re/imc/geysermodelenginepackgenerator/generator/Geometry.java
@@ -13,7 +13,7 @@ public class Geometry {
     private String modelId;
     private String geometryId;
     private JsonObject json;
-    private Map<String, Bone> bones = new HashMap<>();
+    private final Map<String, Bone> bones = new HashMap<>();
 
     private String path;
 
diff --git a/src/main/java/re/imc/geysermodelenginepackgenerator/generator/RenderController.java b/src/main/java/re/imc/geysermodelenginepackgenerator/generator/RenderController.java
index 0560d44..59c53c3 100644
--- a/src/main/java/re/imc/geysermodelenginepackgenerator/generator/RenderController.java
+++ b/src/main/java/re/imc/geysermodelenginepackgenerator/generator/RenderController.java
@@ -8,9 +8,10 @@ import java.util.*;
 public class RenderController {
 
     public static final Set<String> NEED_REMOVE_WHEN_SORT = Set.of("pbody_", "plarm_", "prarm_", "plleg_", "prleg_", "phead_", "p_");
-    String modelId;
-    Map<String, Bone> bones;
-    Entity entity;
+
+    private final String modelId;
+    private final Map<String, Bone> bones;
+    private final Entity entity;
 
     public RenderController(String modelId, Map<String, Bone> bones, Entity entity) {
         this.modelId = modelId;
diff --git a/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/ResourcePackManager.java b/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/ResourcePackManager.java
index 3594904..fb9e6ab 100644
--- a/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/ResourcePackManager.java
+++ b/src/main/java/re/imc/geysermodelenginepackgenerator/managers/resourcepack/ResourcePackManager.java
@@ -180,7 +180,7 @@ public class ResourcePackManager {
 
         for (Map.Entry<String, Entity> entry : entityCache.entrySet()) {
             Entity entity = entry.getValue();
-            entity.modify();
+            entity.modify(extension.getConfigManager().getConfig().getString("models.namespace"));
 
             Path entityPath = entityFolder.toPath().resolve(entity.getPath() + entry.getKey() + ".entity.json");
             entityPath.toFile().getParentFile().mkdirs();