Move machine and wall block models to datagen

robotgryphon · robotgryphon · commit e160825ab384 · 2020-12-26T20:23:50.000-05:00
diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
@@ -1,4 +1,11 @@
 df4f774cf0ac0996ff2ddd7d9e74b4c430160efa assets/compactmachines/blockstates/tunnel_wall.json
+5209eb9eac1c0bf576abc4cbc5b63589508f3439 assets/compactmachines/models/block/machine/machine_giant.json
+18afef1e36852ed4922c445ff417f8e63e72c331 assets/compactmachines/models/block/machine/machine_large.json
+7ce6981c034b18fbc969db9f74eef0106c528a78 assets/compactmachines/models/block/machine/machine_maximum.json
+9b039e2e16effb12e3e4e7cbba883cc0f6c2b974 assets/compactmachines/models/block/machine/machine_normal.json
+19f5b672b055de9f1e3446f0a224a336819bde54 assets/compactmachines/models/block/machine/machine_small.json
+5d3e57c7dda1c98bd8c57fe4ccea7a149c9f7ac9 assets/compactmachines/models/block/machine/machine_tiny.json
+0b890fe71060bead276ffd5f0fe98774c6d55b95 assets/compactmachines/models/block/wall.json
 7ce0bf865e6842abe3033e8ce6bb72ff85e0bbd0 assets/compactmachines/models/tunnels/base.json
 ccd9841486b1a03f50c906c2b0f7813938368099 assets/compactmachines/models/tunnels/down.json
 196ca7fe376c1b974b1ce3789dd464c2f4a784b8 assets/compactmachines/models/tunnels/east.json
diff --git a/src/generated/resources/assets/compactmachines/models/block/machine/machine_giant.json b/src/generated/resources/assets/compactmachines/models/block/machine/machine_giant.json
@@ -1,6 +1,5 @@
-
 {
-  "parent": "block/cube_all",
+  "parent": "minecraft:block/cube_all",
   "textures": {
     "all": "compactmachines:block/machine/machine_giant"
   }
diff --git a/src/generated/resources/assets/compactmachines/models/block/machine/machine_large.json b/src/generated/resources/assets/compactmachines/models/block/machine/machine_large.json
@@ -1,6 +1,5 @@
-
 {
-  "parent": "block/cube_all",
+  "parent": "minecraft:block/cube_all",
   "textures": {
     "all": "compactmachines:block/machine/machine_large"
   }
diff --git a/src/generated/resources/assets/compactmachines/models/block/machine/machine_maximum.json b/src/generated/resources/assets/compactmachines/models/block/machine/machine_maximum.json
@@ -1,6 +1,5 @@
-
 {
-  "parent": "block/cube_all",
+  "parent": "minecraft:block/cube_all",
   "textures": {
     "all": "compactmachines:block/machine/machine_maximum"
   }
diff --git a/src/generated/resources/assets/compactmachines/models/block/machine/machine_normal.json b/src/generated/resources/assets/compactmachines/models/block/machine/machine_normal.json
@@ -1,6 +1,5 @@
-
 {
-  "parent": "block/cube_all",
+  "parent": "minecraft:block/cube_all",
   "textures": {
     "all": "compactmachines:block/machine/machine_normal"
   }
diff --git a/src/generated/resources/assets/compactmachines/models/block/machine/machine_small.json b/src/generated/resources/assets/compactmachines/models/block/machine/machine_small.json
@@ -1,6 +1,5 @@
-
 {
-  "parent": "block/cube_all",
+  "parent": "minecraft:block/cube_all",
   "textures": {
     "all": "compactmachines:block/machine/machine_small"
   }
diff --git a/src/generated/resources/assets/compactmachines/models/block/machine/machine_tiny.json b/src/generated/resources/assets/compactmachines/models/block/machine/machine_tiny.json
@@ -1,6 +1,5 @@
-
 {
-  "parent": "block/cube_all",
+  "parent": "minecraft:block/cube_all",
   "textures": {
     "all": "compactmachines:block/machine/machine_tiny"
   }
diff --git a/src/generated/resources/assets/compactmachines/models/block/wall.json b/src/generated/resources/assets/compactmachines/models/block/wall.json
@@ -1,5 +1,5 @@
 {
-  "parent": "block/cube_all",
+  "parent": "minecraft:block/cube_all",
   "textures": {
     "all": "compactmachines:block/wall"
   }
diff --git a/src/main/java/com/robotgryphon/compactmachines/datagen/DataGeneration.java b/src/main/java/com/robotgryphon/compactmachines/datagen/DataGeneration.java
@@ -26,6 +26,7 @@ private static void registerServerProviders(DataGenerator generator, GatherDataE
 
     private static void registerClientProviders(DataGenerator generator, GatherDataEvent event) {
         ExistingFileHelper helper = event.getExistingFileHelper();
+        generator.addProvider(new StateGenerator(generator, helper));
         generator.addProvider(new TunnelWallStateGenerator(generator, helper));
     }
 }
diff --git a/src/main/java/com/robotgryphon/compactmachines/datagen/StateGenerator.java b/src/main/java/com/robotgryphon/compactmachines/datagen/StateGenerator.java
@@ -1,17 +1,31 @@
 package com.robotgryphon.compactmachines.datagen;
 
 import com.robotgryphon.compactmachines.CompactMachines;
+import com.robotgryphon.compactmachines.reference.EnumMachineSize;
 import net.minecraft.data.DataGenerator;
 import net.minecraftforge.client.model.generators.BlockStateProvider;
 import net.minecraftforge.common.data.ExistingFileHelper;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 public class StateGenerator extends BlockStateProvider {
     public StateGenerator(DataGenerator gen, ExistingFileHelper exFileHelper) {
         super(gen, CompactMachines.MOD_ID, exFileHelper);
     }
 
     @Override
     protected void registerStatesAndModels() {
+        // Wall block model
+        models().cubeAll("block/wall", modLoc("block/wall"));
+
+        // Machine models
+        for(EnumMachineSize size : EnumMachineSize.values()) {
+            String sizeName = size.getName();
 
+            models()
+                    .cubeAll("block/machine/machine_" + sizeName, modLoc("block/machine/machine_" + sizeName));
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`		`-`
`2`	`1`	`{`
`3`		`- "parent": "block/cube_all",`
	`2`	`+ "parent": "minecraft:block/cube_all",`
`4`	`3`	`"textures": {`
`5`	`4`	`"all": "compactmachines:block/machine/machine_giant"`
`6`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "parent": "block/cube_all",`
	`2`	`+ "parent": "minecraft:block/cube_all",`
`3`	`3`	`"textures": {`
`4`	`4`	`"all": "compactmachines:block/wall"`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ private static void registerServerProviders(DataGenerator generator, GatherDataE`
`26`	`26`
`27`	`27`	`private static void registerClientProviders(DataGenerator generator, GatherDataEvent event) {`
`28`	`28`	`ExistingFileHelper helper = event.getExistingFileHelper();`
	`29`	`+ generator.addProvider(new StateGenerator(generator, helper));`
`29`	`30`	`generator.addProvider(new TunnelWallStateGenerator(generator, helper));`
`30`	`31`	`}`
`31`	`32`	`}`