From 7ddf11004ba3a26cf6db8930f81a493ba572620a Mon Sep 17 00:00:00 2001
From: QubicQuantum <destroyermce@gmail.com>
Date: Sun, 15 Aug 2021 20:54:00 -0700
Subject: [PATCH] custom namespace support of CustomRenderedItemModels

---
 .../curiosities/symmetry/client/SymmetryWandModel.java       | 4 ++--
 .../create/content/curiosities/tools/ExtendoGripModel.java   | 2 +-
 .../content/curiosities/weapons/PotatoCannonModel.java       | 2 +-
 .../curiosities/zapper/terrainzapper/WorldshaperModel.java   | 2 +-
 .../foundation/item/render/CustomRenderedItemModel.java      | 5 +++--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/simibubi/create/content/curiosities/symmetry/client/SymmetryWandModel.java b/src/main/java/com/simibubi/create/content/curiosities/symmetry/client/SymmetryWandModel.java
index f361c3c9f..aac4957b9 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/symmetry/client/SymmetryWandModel.java
+++ b/src/main/java/com/simibubi/create/content/curiosities/symmetry/client/SymmetryWandModel.java
@@ -8,7 +8,7 @@ import net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer;
 public class SymmetryWandModel extends CustomRenderedItemModel {
 
 	public SymmetryWandModel(IBakedModel template) {
-		super(template, "wand_of_symmetry");
+		super(template, "create", "wand_of_symmetry");
 		addPartials("bits", "core", "core_glow");
 	}
 
@@ -16,5 +16,5 @@ public class SymmetryWandModel extends CustomRenderedItemModel {
 	public ItemStackTileEntityRenderer createRenderer() {
 		return new SymmetryWandItemRenderer();
 	}
-	
+
 }
diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripModel.java b/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripModel.java
index cd37439f5..274a1f350 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripModel.java
+++ b/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripModel.java
@@ -8,7 +8,7 @@ import net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer;
 public class ExtendoGripModel extends CustomRenderedItemModel {
 
 	public ExtendoGripModel(IBakedModel template) {
-		super(template, "extendo_grip");
+		super(template, "create", "extendo_grip");
 		addPartials("cog", "thin_short", "wide_short", "thin_long", "wide_long");
 	}
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonModel.java b/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonModel.java
index 5896c4d8e..43645055b 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonModel.java
+++ b/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonModel.java
@@ -8,7 +8,7 @@ import net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer;
 public class PotatoCannonModel extends CustomRenderedItemModel {
 
 	public PotatoCannonModel(IBakedModel template) {
-		super(template, "potato_cannon");
+		super(template, "create", "potato_cannon");
 		addPartials("cog");
 	}
 
diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperModel.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperModel.java
index c27b76932..283005e3e 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperModel.java
+++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperModel.java
@@ -8,7 +8,7 @@ import net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer;
 public class WorldshaperModel extends CustomRenderedItemModel {
 
 	public WorldshaperModel(IBakedModel template) {
-		super(template, "handheld_worldshaper");
+		super(template, "create", "handheld_worldshaper");
 		addPartials("core", "core_glow", "accelerator");
 	}
 
diff --git a/src/main/java/com/simibubi/create/foundation/item/render/CustomRenderedItemModel.java b/src/main/java/com/simibubi/create/foundation/item/render/CustomRenderedItemModel.java
index 23fa7f229..799c15a96 100644
--- a/src/main/java/com/simibubi/create/foundation/item/render/CustomRenderedItemModel.java
+++ b/src/main/java/com/simibubi/create/foundation/item/render/CustomRenderedItemModel.java
@@ -22,8 +22,9 @@ public abstract class CustomRenderedItemModel extends BakedModelWrapper<IBakedMo
 	protected Map<String, IBakedModel> partials = new HashMap<>();
 	protected ItemStackTileEntityRenderer renderer;
 
-	public CustomRenderedItemModel(IBakedModel template, String basePath) {
+	public CustomRenderedItemModel(IBakedModel template, String namespace, String basePath) {
 		super(template);
+		this.namespace = namespace;
 		this.basePath = basePath;
 		this.renderer = createRenderer();
 	}
@@ -72,7 +73,7 @@ public abstract class CustomRenderedItemModel extends BakedModelWrapper<IBakedMo
 	}
 
 	private ResourceLocation getPartialModelLocation(String name) {
-		return new ResourceLocation(Create.ID, "item/" + basePath + "/" + name);
+		return new ResourceLocation(namespace, "item/" + basePath + "/" + name);
 	}
 
 	public IBakedModel getPartial(String name) {