Update textures/models for interface and pattern provider

62832 · Sep 8, 2023 · e54f1cc · e54f1cc
1 parent dfbb385
commit e54f1cc
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 21 deletions.
diff --git a/common/src/main/resources/assets/megacells/textures/part/mega_interface.png b/common/src/main/resources/assets/megacells/textures/part/mega_interface.png
diff --git a/common/src/main/resources/assets/megacells/textures/part/mega_interface_back.png b/common/src/main/resources/assets/megacells/textures/part/mega_interface_back.png
diff --git a/common/src/main/resources/assets/megacells/textures/part/mega_interface_sides.png b/common/src/main/resources/assets/megacells/textures/part/mega_interface_sides.png
diff --git a/common/src/main/resources/assets/megacells/textures/part/mega_monitor_back.png b/common/src/main/resources/assets/megacells/textures/part/mega_monitor_back.png
diff --git a/common/src/main/resources/assets/megacells/textures/part/mega_monitor_sides.png b/common/src/main/resources/assets/megacells/textures/part/mega_monitor_sides.png
diff --git a/common/src/main/resources/assets/megacells/textures/part/mega_pattern_provider.png b/common/src/main/resources/assets/megacells/textures/part/mega_pattern_provider.png
diff --git a/...rc/main/resources/assets/megacells/textures/part/mega_pattern_provider_back.png b/...rc/main/resources/assets/megacells/textures/part/mega_pattern_provider_back.png
diff --git a/...c/main/resources/assets/megacells/textures/part/mega_pattern_provider_sides.png b/...c/main/resources/assets/megacells/textures/part/mega_pattern_provider_sides.png
diff --git a/fabric/src/data/java/gripe/_90/megacells/datagen/ModelProvider.java b/fabric/src/data/java/gripe/_90/megacells/datagen/ModelProvider.java
@@ -350,24 +350,24 @@ private VariantProperties.Rotation rotationByAngle(int angle) {
 
     private void interfaceOrProviderPart(ItemModelGenerators generator, ItemDefinition<?> part) {
         var partName = part.id().getPath().substring(6);
-        var frontTexture = MEGACells.makeId("block/" + partName);
-        var monitorBack = MEGACells.makeId("part/mega_monitor_back");
-        var monitorSides = MEGACells.makeId("part/mega_monitor_sides");
+        var front = MEGACells.makeId("part/" + partName);
+        var back = MEGACells.makeId("part/" + partName + "_back");
+        var sides = MEGACells.makeId("part/" + partName + "_sides");
         INTERFACE.create(
                 MEGACells.makeId("part/" + partName),
                 new TextureMapping()
                         .put(SIDES_STATUS, MEGACells.makeId("part/mega_monitor_sides_status"))
-                        .put(SIDES, monitorSides)
-                        .put(TextureSlot.BACK, monitorBack)
-                        .put(TextureSlot.FRONT, frontTexture)
-                        .put(TextureSlot.PARTICLE, monitorBack),
+                        .put(SIDES, sides)
+                        .put(TextureSlot.BACK, back)
+                        .put(TextureSlot.FRONT, front)
+                        .put(TextureSlot.PARTICLE, back),
                 generator.output);
         CABLE_INTERFACE.create(
                 MEGACells.makeId("item/" + part.id().getPath()),
                 new TextureMapping()
-                        .put(SIDES, monitorSides)
-                        .put(TextureSlot.FRONT, frontTexture)
-                        .put(TextureSlot.BACK, monitorBack),
+                        .put(SIDES, sides)
+                        .put(TextureSlot.FRONT, front)
+                        .put(TextureSlot.BACK, back),
                 generator.output);
     }
 

diff --git a/forge/src/data/java/gripe/_90/megacells/datagen/ModelProvider.java b/forge/src/data/java/gripe/_90/megacells/datagen/ModelProvider.java
@@ -126,8 +126,8 @@ protected void registerModels() {
 
             cells.forEach(this::cellModel);
 
-            interfaceOrProviderPart(MEGAItems.MEGA_INTERFACE, MEGABlocks.MEGA_INTERFACE);
-            interfaceOrProviderPart(MEGAItems.MEGA_PATTERN_PROVIDER, MEGABlocks.MEGA_PATTERN_PROVIDER);
+            interfaceOrProviderPart(MEGAItems.MEGA_INTERFACE);
+            interfaceOrProviderPart(MEGAItems.MEGA_PATTERN_PROVIDER);
         }
 
         private void cellModel(ItemDefinition<?> cell) {
@@ -154,11 +154,12 @@ private void driveCell(String texture) {
             withExistingParent(path, DRIVE_CELL).texture("cell", path);
         }
 
-        private void interfaceOrProviderPart(ItemDefinition<?> part, BlockDefinition<?> equivalentBlock) {
-            withExistingParent(part.id().getPath(), CABLE_INTERFACE)
-                    .texture("back", "part/mega_monitor_back")
-                    .texture("front", "block/" + equivalentBlock.id().getPath())
-                    .texture("sides", "part/mega_monitor_sides");
+        private void interfaceOrProviderPart(ItemDefinition<?> part) {
+            var partPath = part.id().getPath().substring(6);
+            withExistingParent(partPath, CABLE_INTERFACE)
+                    .texture("back", "part/" + partPath + "_back")
+                    .texture("front", "part/" + partPath)
+                    .texture("sides", "part/" + partPath + "_sides");
         }
     }
 
@@ -311,10 +312,10 @@ protected void registerModels() {
         private void interfaceOrPatternProvider(ItemDefinition<?> part) {
             var partName = part.id().getPath().substring(6);
             withExistingParent("part/" + partName, INTERFACE)
-                    .texture("back", "part/mega_monitor_back")
-                    .texture("front", "block/" + partName)
-                    .texture("particle", "part/mega_monitor_back")
-                    .texture("sides", "part/mega_monitor_sides")
+                    .texture("back", "part/" + partName + "_back")
+                    .texture("front", "part/" + partName)
+                    .texture("particle", "part/" + partName + "_back")
+                    .texture("sides", "part/" + partName + "_sides")
                     .texture("sidesStatus", "part/mega_monitor_sides_status");
         }
     }