Merge pull request #466 from ferriarnus/activetextures

Team-EnderIO · Aug 16, 2023 · 16c7252 · 16c7252
2 parents 38a1f32 + e9c50f5
commit 16c7252
Show file tree

Hide file tree

Showing 37 changed files with 306 additions and 68 deletions.
diff --git a/src/generated/resources/assets/enderio/blockstates/alloy_smelter.json b/src/generated/resources/assets/enderio/blockstates/alloy_smelter.json
@@ -5,29 +5,29 @@
       "y": 90
     },
     "facing=east,powered=true": {
-      "model": "enderio:block/alloy_smelter_combined",
+      "model": "enderio:block/alloy_smelter_active_combined",
       "y": 90
     },
     "facing=north,powered=false": {
       "model": "enderio:block/alloy_smelter_combined"
     },
     "facing=north,powered=true": {
-      "model": "enderio:block/alloy_smelter_combined"
+      "model": "enderio:block/alloy_smelter_active_combined"
     },
     "facing=south,powered=false": {
       "model": "enderio:block/alloy_smelter_combined",
       "y": 180
     },
     "facing=south,powered=true": {
-      "model": "enderio:block/alloy_smelter_combined",
+      "model": "enderio:block/alloy_smelter_active_combined",
       "y": 180
     },
     "facing=west,powered=false": {
       "model": "enderio:block/alloy_smelter_combined",
       "y": 270
     },
     "facing=west,powered=true": {
-      "model": "enderio:block/alloy_smelter_combined",
+      "model": "enderio:block/alloy_smelter_active_combined",
       "y": 270
     }
   }

diff --git a/src/generated/resources/assets/enderio/blockstates/crafter.json b/src/generated/resources/assets/enderio/blockstates/crafter.json
@@ -5,29 +5,29 @@
       "y": 90
     },
     "facing=east,powered=true": {
-      "model": "enderio:block/crafter_combined",
+      "model": "enderio:block/crafter_active_combined",
       "y": 90
     },
     "facing=north,powered=false": {
       "model": "enderio:block/crafter_combined"
     },
     "facing=north,powered=true": {
-      "model": "enderio:block/crafter_combined"
+      "model": "enderio:block/crafter_active_combined"
     },
     "facing=south,powered=false": {
       "model": "enderio:block/crafter_combined",
       "y": 180
     },
     "facing=south,powered=true": {
-      "model": "enderio:block/crafter_combined",
+      "model": "enderio:block/crafter_active_combined",
       "y": 180
     },
     "facing=west,powered=false": {
       "model": "enderio:block/crafter_combined",
       "y": 270
     },
     "facing=west,powered=true": {
-      "model": "enderio:block/crafter_combined",
+      "model": "enderio:block/crafter_active_combined",
       "y": 270
     }
   }

diff --git a/src/generated/resources/assets/enderio/blockstates/impulse_hopper.json b/src/generated/resources/assets/enderio/blockstates/impulse_hopper.json
@@ -5,29 +5,29 @@
       "y": 90
     },
     "facing=east,powered=true": {
-      "model": "enderio:block/impulse_hopper_combined",
+      "model": "enderio:block/impulse_hopper_active_combined",
       "y": 90
     },
     "facing=north,powered=false": {
       "model": "enderio:block/impulse_hopper_combined"
     },
     "facing=north,powered=true": {
-      "model": "enderio:block/impulse_hopper_combined"
+      "model": "enderio:block/impulse_hopper_active_combined"
     },
     "facing=south,powered=false": {
       "model": "enderio:block/impulse_hopper_combined",
       "y": 180
     },
     "facing=south,powered=true": {
-      "model": "enderio:block/impulse_hopper_combined",
+      "model": "enderio:block/impulse_hopper_active_combined",
       "y": 180
     },
     "facing=west,powered=false": {
       "model": "enderio:block/impulse_hopper_combined",
       "y": 270
     },
     "facing=west,powered=true": {
-      "model": "enderio:block/impulse_hopper_combined",
+      "model": "enderio:block/impulse_hopper_active_combined",
       "y": 270
     }
   }

diff --git a/src/generated/resources/assets/enderio/blockstates/painting_machine.json b/src/generated/resources/assets/enderio/blockstates/painting_machine.json
@@ -5,29 +5,29 @@
       "y": 90
     },
     "facing=east,powered=true": {
-      "model": "enderio:block/painting_machine_combined",
+      "model": "enderio:block/painting_machine_active_combined",
       "y": 90
     },
     "facing=north,powered=false": {
       "model": "enderio:block/painting_machine_combined"
     },
     "facing=north,powered=true": {
-      "model": "enderio:block/painting_machine_combined"
+      "model": "enderio:block/painting_machine_active_combined"
     },
     "facing=south,powered=false": {
       "model": "enderio:block/painting_machine_combined",
       "y": 180
     },
     "facing=south,powered=true": {
-      "model": "enderio:block/painting_machine_combined",
+      "model": "enderio:block/painting_machine_active_combined",
       "y": 180
     },
     "facing=west,powered=false": {
       "model": "enderio:block/painting_machine_combined",
       "y": 270
     },
     "facing=west,powered=true": {
-      "model": "enderio:block/painting_machine_combined",
+      "model": "enderio:block/painting_machine_active_combined",
       "y": 270
     }
   }

diff --git a/src/generated/resources/assets/enderio/blockstates/powered_spawner.json b/src/generated/resources/assets/enderio/blockstates/powered_spawner.json
@@ -5,29 +5,29 @@
       "y": 90
     },
     "facing=east,powered=true": {
-      "model": "enderio:block/powered_spawner_combined",
+      "model": "enderio:block/powered_spawner_active_combined",
       "y": 90
     },
     "facing=north,powered=false": {
       "model": "enderio:block/powered_spawner_combined"
     },
     "facing=north,powered=true": {
-      "model": "enderio:block/powered_spawner_combined"
+      "model": "enderio:block/powered_spawner_active_combined"
     },
     "facing=south,powered=false": {
       "model": "enderio:block/powered_spawner_combined",
       "y": 180
     },
     "facing=south,powered=true": {
-      "model": "enderio:block/powered_spawner_combined",
+      "model": "enderio:block/powered_spawner_active_combined",
       "y": 180
     },
     "facing=west,powered=false": {
       "model": "enderio:block/powered_spawner_combined",
       "y": 270
     },
     "facing=west,powered=true": {
-      "model": "enderio:block/powered_spawner_combined",
+      "model": "enderio:block/powered_spawner_active_combined",
       "y": 270
     }
   }

diff --git a/src/generated/resources/assets/enderio/blockstates/primitive_alloy_smelter.json b/src/generated/resources/assets/enderio/blockstates/primitive_alloy_smelter.json
@@ -5,29 +5,29 @@
       "y": 90
     },
     "facing=east,powered=true": {
-      "model": "enderio:block/primitive_alloy_smelter_combined",
+      "model": "enderio:block/primitive_alloy_smelter_active_combined",
       "y": 90
     },
     "facing=north,powered=false": {
       "model": "enderio:block/primitive_alloy_smelter_combined"
     },
     "facing=north,powered=true": {
-      "model": "enderio:block/primitive_alloy_smelter_combined"
+      "model": "enderio:block/primitive_alloy_smelter_active_combined"
     },
     "facing=south,powered=false": {
       "model": "enderio:block/primitive_alloy_smelter_combined",
       "y": 180
     },
     "facing=south,powered=true": {
-      "model": "enderio:block/primitive_alloy_smelter_combined",
+      "model": "enderio:block/primitive_alloy_smelter_active_combined",
       "y": 180
     },
     "facing=west,powered=false": {
       "model": "enderio:block/primitive_alloy_smelter_combined",
       "y": 270
     },
     "facing=west,powered=true": {
-      "model": "enderio:block/primitive_alloy_smelter_combined",
+      "model": "enderio:block/primitive_alloy_smelter_active_combined",
       "y": 270
     }
   }

diff --git a/src/generated/resources/assets/enderio/blockstates/sag_mill.json b/src/generated/resources/assets/enderio/blockstates/sag_mill.json
@@ -5,29 +5,29 @@
       "y": 90
     },
     "facing=east,powered=true": {
-      "model": "enderio:block/sag_mill_combined",
+      "model": "enderio:block/sag_mill_active_combined",
       "y": 90
     },
     "facing=north,powered=false": {
       "model": "enderio:block/sag_mill_combined"
     },
     "facing=north,powered=true": {
-      "model": "enderio:block/sag_mill_combined"
+      "model": "enderio:block/sag_mill_active_combined"
     },
     "facing=south,powered=false": {
       "model": "enderio:block/sag_mill_combined",
       "y": 180
     },
     "facing=south,powered=true": {
-      "model": "enderio:block/sag_mill_combined",
+      "model": "enderio:block/sag_mill_active_combined",
       "y": 180
     },
     "facing=west,powered=false": {
       "model": "enderio:block/sag_mill_combined",
       "y": 270
     },
     "facing=west,powered=true": {
-      "model": "enderio:block/sag_mill_combined",
+      "model": "enderio:block/sag_mill_active_combined",
       "y": 270
     }
   }

diff --git a/src/generated/resources/assets/enderio/blockstates/slice_and_splice.json b/src/generated/resources/assets/enderio/blockstates/slice_and_splice.json
@@ -5,29 +5,29 @@
       "y": 90
     },
     "facing=east,powered=true": {
-      "model": "enderio:block/slice_and_splice_combined",
+      "model": "enderio:block/slice_and_splice_active_combined",
       "y": 90
     },
     "facing=north,powered=false": {
       "model": "enderio:block/slice_and_splice_combined"
     },
     "facing=north,powered=true": {
-      "model": "enderio:block/slice_and_splice_combined"
+      "model": "enderio:block/slice_and_splice_active_combined"
     },
     "facing=south,powered=false": {
       "model": "enderio:block/slice_and_splice_combined",
       "y": 180
     },
     "facing=south,powered=true": {
-      "model": "enderio:block/slice_and_splice_combined",
+      "model": "enderio:block/slice_and_splice_active_combined",
       "y": 180
     },
     "facing=west,powered=false": {
       "model": "enderio:block/slice_and_splice_combined",
       "y": 270
     },
     "facing=west,powered=true": {
-      "model": "enderio:block/slice_and_splice_combined",
+      "model": "enderio:block/slice_and_splice_active_combined",
       "y": 270
     }
   }

diff --git a/src/generated/resources/assets/enderio/blockstates/soul_binder.json b/src/generated/resources/assets/enderio/blockstates/soul_binder.json
@@ -5,29 +5,29 @@
       "y": 90
     },
     "facing=east,powered=true": {
-      "model": "enderio:block/soul_binder_combined",
+      "model": "enderio:block/soul_binder_active_combined",
       "y": 90
     },
     "facing=north,powered=false": {
       "model": "enderio:block/soul_binder_combined"
     },
     "facing=north,powered=true": {
-      "model": "enderio:block/soul_binder_combined"
+      "model": "enderio:block/soul_binder_active_combined"
     },
     "facing=south,powered=false": {
       "model": "enderio:block/soul_binder_combined",
       "y": 180
     },
     "facing=south,powered=true": {
-      "model": "enderio:block/soul_binder_combined",
+      "model": "enderio:block/soul_binder_active_combined",
       "y": 180
     },
     "facing=west,powered=false": {
       "model": "enderio:block/soul_binder_combined",
       "y": 270
     },
     "facing=west,powered=true": {
-      "model": "enderio:block/soul_binder_combined",
+      "model": "enderio:block/soul_binder_active_combined",
       "y": 270
     }
   }

diff --git a/src/generated/resources/assets/enderio/blockstates/stirling_generator.json b/src/generated/resources/assets/enderio/blockstates/stirling_generator.json
@@ -5,29 +5,29 @@
       "y": 90
     },
     "facing=east,powered=true": {
-      "model": "enderio:block/stirling_generator_combined",
+      "model": "enderio:block/stirling_generator_active_combined",
       "y": 90
     },
     "facing=north,powered=false": {
       "model": "enderio:block/stirling_generator_combined"
     },
     "facing=north,powered=true": {
-      "model": "enderio:block/stirling_generator_combined"
+      "model": "enderio:block/stirling_generator_active_combined"
     },
     "facing=south,powered=false": {
       "model": "enderio:block/stirling_generator_combined",
       "y": 180
     },
     "facing=south,powered=true": {
-      "model": "enderio:block/stirling_generator_combined",
+      "model": "enderio:block/stirling_generator_active_combined",
       "y": 180
     },
     "facing=west,powered=false": {
       "model": "enderio:block/stirling_generator_combined",
       "y": 270
     },
     "facing=west,powered=true": {
-      "model": "enderio:block/stirling_generator_combined",
+      "model": "enderio:block/stirling_generator_active_combined",
       "y": 270
     }
   }

diff --git a/src/generated/resources/assets/enderio/models/block/alloy_smelter_active_combined.json b/src/generated/resources/assets/enderio/models/block/alloy_smelter_active_combined.json
@@ -0,0 +1,19 @@
+{
+  "parent": "minecraft:block/block",
+  "children": {
+    "machine": {
+      "parent": "enderio:block/alloy_smelter_active"
+    },
+    "overlay": {
+      "parent": "enderio:block/io_overlay"
+    }
+  },
+  "item_render_order": [
+    "machine",
+    "overlay"
+  ],
+  "loader": "forge:composite",
+  "textures": {
+    "particle": "enderio:block/alloy_smelter_front"
+  }
+}
diff --git a/src/generated/resources/assets/enderio/models/block/alloy_smelter_combined.json b/src/generated/resources/assets/enderio/models/block/alloy_smelter_combined.json
@@ -2,7 +2,7 @@
   "parent": "minecraft:block/block",
   "children": {
     "machine": {
-      "parent": "enderio:block/alloy_smelter_active"
+      "parent": "enderio:block/alloy_smelter"
     },
     "overlay": {
       "parent": "enderio:block/io_overlay"
@@ -12,5 +12,8 @@
     "machine",
     "overlay"
   ],
-  "loader": "forge:composite"
+  "loader": "forge:composite",
+  "textures": {
+    "particle": "enderio:block/alloy_smelter_front"
+  }
 }