Extract corner coloring of energy cube models to their own textures

mekanism · Aug 1, 2023 · 9fdb089 · 9fdb089
1 parent c5aa075
commit 9fdb089
Show file tree

Hide file tree

Showing 18 changed files with 84 additions and 74 deletions.
diff --git a/src/main/java/mekanism/client/ClientRegistration.java b/src/main/java/mekanism/client/ClientRegistration.java
@@ -146,13 +146,11 @@
 import mekanism.client.sound.SoundHandler;
 import mekanism.common.Mekanism;
 import mekanism.common.base.HolidayManager;
-import mekanism.common.block.attribute.Attribute;
 import mekanism.common.content.gear.shared.ModuleColorModulationUnit;
 import mekanism.common.integration.MekanismHooks;
 import mekanism.common.item.ItemConfigurationCard;
 import mekanism.common.item.ItemCraftingFormula;
 import mekanism.common.item.block.ItemBlockCardboardBox;
-import mekanism.common.item.block.ItemBlockEnergyCube;
 import mekanism.common.lib.Color;
 import mekanism.common.lib.FieldReflectionHelper;
 import mekanism.common.lib.radiation.RadiationManager;
@@ -170,7 +168,6 @@
 import mekanism.common.resource.IResource;
 import mekanism.common.resource.PrimaryResource;
 import mekanism.common.resource.ResourceType;
-import mekanism.common.tier.EnergyCubeTier;
 import mekanism.common.tile.qio.TileEntityQIOComponent;
 import mekanism.common.tile.transmitter.TileEntityLogisticalTransporter;
 import mekanism.common.util.RegistryUtils;
@@ -527,16 +524,6 @@ public static void registerBlockColorHandlers(RegisterColorHandlersEvent.Block e
  ClientRegistrationUtil.registerBlockColorHandler(event, (state, world, pos, index) -> index == 1 ? tint : -1, entry.getValue());
  }
  }
- ClientRegistrationUtil.registerBlockColorHandler(event, (state, world, pos, index) -> {
- if (index == 1) {
- EnergyCubeTier tier = Attribute.getTier(state.getBlock(), EnergyCubeTier.class);
- if (tier != null) {
- return MekanismRenderer.getColorARGB(tier.getBaseTier().getColor(), 1);
- }
- }
- return -1;
- }, MekanismBlocks.BASIC_ENERGY_CUBE, MekanismBlocks.ADVANCED_ENERGY_CUBE, MekanismBlocks.ELITE_ENERGY_CUBE, MekanismBlocks.ULTIMATE_ENERGY_CUBE,
- MekanismBlocks.CREATIVE_ENERGY_CUBE);
  }
 
  @SubscribeEvent
@@ -564,13 +551,6 @@ public static void registerItemColorHandlers(RegisterColorHandlersEvent.Item eve
  }
  return -1;
  }, MekanismItems.MEKASUIT_HELMET, MekanismItems.MEKASUIT_BODYARMOR, MekanismItems.MEKASUIT_PANTS, MekanismItems.MEKASUIT_BOOTS);
- ClientRegistrationUtil.registerItemColorHandler(event, (stack, index) -> {
- if (index == 1 && stack.getItem() instanceof ItemBlockEnergyCube cube) {
- return MekanismRenderer.getColorARGB(cube.getTier().getBaseTier().getColor(), 1);
- }
- return -1;
- }, MekanismBlocks.BASIC_ENERGY_CUBE, MekanismBlocks.ADVANCED_ENERGY_CUBE, MekanismBlocks.ELITE_ENERGY_CUBE, MekanismBlocks.ULTIMATE_ENERGY_CUBE,
- MekanismBlocks.CREATIVE_ENERGY_CUBE);
 
  for (Map.Entry<IResource, BlockRegistryObject<?, ?>> entry : MekanismBlocks.PROCESSED_RESOURCE_BLOCKS.entrySet()) {
  if (entry.getKey() instanceof PrimaryResource primaryResource) {

diff --git a/src/main/resources/assets/mekanism/blockstates/advanced_energy_cube.json b/src/main/resources/assets/mekanism/blockstates/advanced_energy_cube.json
@@ -1,26 +1,26 @@
 {
  "variants": {
  "facing=up": {
- "model": "mekanism:block/energy_cube",
+ "model": "mekanism:block/energy_cube/advanced",
  "x": -90
  },
  "facing=down": {
- "model": "mekanism:block/energy_cube",
+ "model": "mekanism:block/energy_cube/advanced",
  "x": 90
  },
  "facing=north": {
- "model": "mekanism:block/energy_cube"
+ "model": "mekanism:block/energy_cube/advanced"
  },
  "facing=south": {
- "model": "mekanism:block/energy_cube",
+ "model": "mekanism:block/energy_cube/advanced",
  "y": 180
  },
  "facing=east": {
- "model": "mekanism:block/energy_cube",
+ "model": "mekanism:block/energy_cube/advanced",
  "y": 90
  },
  "facing=west": {
- "model": "mekanism:block/energy_cube",
+ "model": "mekanism:block/energy_cube/advanced",
  "y": -90
  }
  }

diff --git a/src/main/resources/assets/mekanism/blockstates/basic_energy_cube.json b/src/main/resources/assets/mekanism/blockstates/basic_energy_cube.json
@@ -1,26 +1,26 @@
 {
  "variants": {
  "facing=up": {
- "model": "mekanism:block/energy_cube",
+ "model": "mekanism:block/energy_cube/basic",
  "x": -90
  },
  "facing=down": {
- "model": "mekanism:block/energy_cube",
+ "model": "mekanism:block/energy_cube/basic",
  "x": 90
  },
  "facing=north": {
- "model": "mekanism:block/energy_cube"
+ "model": "mekanism:block/energy_cube/basic"
  },
  "facing=south": {
- "model": "mekanism:block/energy_cube",
+ "model": "mekanism:block/energy_cube/basic",
  "y": 180
  },
  "facing=east": {
- "model": "mekanism:block/energy_cube",
+ "model": "mekanism:block/energy_cube/basic",
  "y": 90
  },
  "facing=west": {
- "model": "mekanism:block/energy_cube",
+ "model": "mekanism:block/energy_cube/basic",
  "y": -90
  }
  }

diff --git a/src/main/resources/assets/mekanism/blockstates/creative_energy_cube.json b/src/main/resources/assets/mekanism/blockstates/creative_energy_cube.json
@@ -1,26 +1,26 @@
 {
  "variants": {
  "facing=up": {
- "model": "mekanism:block/energy_cube",
+ "model": "mekanism:block/energy_cube/creative",
  "x": -90
  },
  "facing=down": {
- "model": "mekanism:block/energy_cube",
+ "model": "mekanism:block/energy_cube/creative",
  "x": 90
  },
  "facing=north": {
- "model": "mekanism:block/energy_cube"
+ "model": "mekanism:block/energy_cube/creative"
  },
  "facing=south": {
- "model": "mekanism:block/energy_cube",
+ "model": "mekanism:block/energy_cube/creative",
  "y": 180
  },
  "facing=east": {
- "model": "mekanism:block/energy_cube",
+ "model": "mekanism:block/energy_cube/creative",
  "y": 90
  },
  "facing=west": {
- "model": "mekanism:block/energy_cube",
+ "model": "mekanism:block/energy_cube/creative",
  "y": -90
  }
  }

diff --git a/src/main/resources/assets/mekanism/blockstates/elite_energy_cube.json b/src/main/resources/assets/mekanism/blockstates/elite_energy_cube.json
@@ -1,26 +1,26 @@
 {
  "variants": {
  "facing=up": {
- "model": "mekanism:block/energy_cube",
+ "model": "mekanism:block/energy_cube/elite",
  "x": -90
  },
  "facing=down": {
- "model": "mekanism:block/energy_cube",
+ "model": "mekanism:block/energy_cube/elite",
  "x": 90
  },
  "facing=north": {
- "model": "mekanism:block/energy_cube"
+ "model": "mekanism:block/energy_cube/elite"
  },
  "facing=south": {
- "model": "mekanism:block/energy_cube",
+ "model": "mekanism:block/energy_cube/elite",
  "y": 180
  },
  "facing=east": {
- "model": "mekanism:block/energy_cube",
+ "model": "mekanism:block/energy_cube/elite",
  "y": 90
  },
  "facing=west": {
- "model": "mekanism:block/energy_cube",
+ "model": "mekanism:block/energy_cube/elite",
  "y": -90
  }
  }

diff --git a/src/main/resources/assets/mekanism/blockstates/ultimate_energy_cube.json b/src/main/resources/assets/mekanism/blockstates/ultimate_energy_cube.json
@@ -1,26 +1,26 @@
 {
  "variants": {
  "facing=up": {
- "model": "mekanism:block/energy_cube",
+ "model": "mekanism:block/energy_cube/ultimate",
  "x": -90
  },
  "facing=down": {
- "model": "mekanism:block/energy_cube",
+ "model": "mekanism:block/energy_cube/ultimate",
  "x": 90
  },
  "facing=north": {
- "model": "mekanism:block/energy_cube"
+ "model": "mekanism:block/energy_cube/ultimate"
  },
  "facing=south": {
- "model": "mekanism:block/energy_cube",
+ "model": "mekanism:block/energy_cube/ultimate",
  "y": 180
  },
  "facing=east": {
- "model": "mekanism:block/energy_cube",
+ "model": "mekanism:block/energy_cube/ultimate",
  "y": 90
  },
  "facing=west": {
- "model": "mekanism:block/energy_cube",
+ "model": "mekanism:block/energy_cube/ultimate",
  "y": -90
  }
  }

diff --git a/src/main/resources/assets/mekanism/models/block/energy_cube/advanced.json b/src/main/resources/assets/mekanism/models/block/energy_cube/advanced.json
@@ -0,0 +1,6 @@
+{
+ "parent": "mekanism:block/energy_cube/base",
+ "textures": {
+ "corner": "mekanism:block/models/energy_cube_advanced_corner"
+ }
+}
diff --git a/...ts/mekanism/models/block/energy_cube.json → ...kanism/models/block/energy_cube/base.json b/...ts/mekanism/models/block/energy_cube.json → ...kanism/models/block/energy_cube/base.json
@@ -157,9 +157,9 @@
  "from": [13, 13, 0],
  "to": [16, 16, 3],
  "faces": {
- "north": {"uv": [13, 6, 16, 9], "texture": "#1", "cullface": "north", "tintindex": 1},
- "east": {"uv": [13, 9, 16, 12], "texture": "#1", "cullface": "east", "tintindex": 1},
- "up": {"uv": [13, 3, 16, 6], "texture": "#1", "cullface": "up", "tintindex": 1}
+ "north": {"uv": [0, 3, 3, 6], "texture": "#corner", "cullface": "north"},
+ "east": {"uv": [0, 3, 3, 6], "texture": "#corner", "cullface": "east"},
+ "up": {"uv": [0, 0, 3, 3], "texture": "#corner", "cullface": "up"}
  },
  "forge_data": {
  "block_light": 10,
@@ -181,9 +181,9 @@
  "from": [13, 13, 13],
  "to": [16, 16, 16],
  "faces": {
- "east": {"uv": [13, 6, 16, 9], "texture": "#1", "cullface": "east", "tintindex": 1},
- "south": {"uv": [13, 9, 16, 12], "texture": "#1", "cullface": "south", "tintindex": 1},
- "up": {"uv": [13, 3, 16, 6], "texture": "#1", "cullface": "up", "tintindex": 1}
+ "east": {"uv": [0, 3, 3, 6], "texture": "#corner", "cullface": "east"},
+ "south": {"uv": [0, 3, 3, 6], "texture": "#corner", "cullface": "south"},
+ "up": {"uv": [0, 0, 3, 3], "texture": "#corner", "cullface": "up"}
  },
  "forge_data": {
  "block_light": 10,
@@ -205,9 +205,9 @@
  "from": [0, 13, 0],
  "to": [3, 16, 3],
  "faces": {
- "north": {"uv": [13, 9, 16, 12], "texture": "#1", "cullface": "north", "tintindex": 1},
- "west": {"uv": [13, 6, 16, 9], "texture": "#1", "cullface": "west", "tintindex": 1},
- "up": {"uv": [13, 3, 16, 6], "texture": "#1", "cullface": "up", "tintindex": 1}
+ "north": {"uv": [0, 3, 3, 6], "texture": "#corner", "cullface": "north"},
+ "west": {"uv": [0, 3, 3, 6], "texture": "#corner", "cullface": "west"},
+ "up": {"uv": [0, 0, 3, 3], "texture": "#corner", "cullface": "up"}
  },
  "forge_data": {
  "block_light": 10,
@@ -229,9 +229,9 @@
  "from": [0, 13, 13],
  "to": [3, 16, 16],
  "faces": {
- "south": {"uv": [13, 6, 16, 9], "texture": "#1", "cullface": "south", "tintindex": 1},
- "west": {"uv": [13, 9, 16, 12], "texture": "#1", "cullface": "west", "tintindex": 1},
- "up": {"uv": [13, 3, 16, 6], "texture": "#1", "cullface": "up", "tintindex": 1}
+ "south": {"uv": [0, 3, 3, 6], "texture": "#corner", "cullface": "south"},
+ "west": {"uv": [0, 3, 3, 6], "texture": "#corner", "cullface": "west"},
+ "up": {"uv": [0, 0, 3, 3], "texture": "#corner", "cullface": "up"}
  },
  "forge_data": {
  "block_light": 10,
@@ -253,9 +253,9 @@
  "from": [13, 0, 0],
  "to": [16, 3, 3],
  "faces": {
- "north": {"uv": [13, 9, 16, 12], "texture": "#1", "cullface": "north", "tintindex": 1},
- "east": {"uv": [13, 6, 16, 9], "texture": "#1", "cullface": "east", "tintindex": 1},
- "down": {"uv": [13, 3, 16, 6], "texture": "#1", "cullface": "down", "tintindex": 1}
+ "north": {"uv": [0, 3, 3, 6], "texture": "#corner", "cullface": "north"},
+ "east": {"uv": [0, 3, 3, 6], "texture": "#corner", "cullface": "east"},
+ "down": {"uv": [0, 0, 3, 3], "texture": "#corner", "cullface": "down"}
  },
  "forge_data": {
  "block_light": 10,
@@ -277,9 +277,9 @@
  "from": [13, 0, 13],
  "to": [16, 3, 16],
  "faces": {
- "east": {"uv": [13, 9, 16, 12], "texture": "#1", "cullface": "east", "tintindex": 1},
- "south": {"uv": [13, 6, 16, 9], "texture": "#1", "cullface": "south", "tintindex": 1},
- "down": {"uv": [13, 3, 16, 6], "texture": "#1", "cullface": "down", "tintindex": 1}
+ "east": {"uv": [0, 3, 3, 6], "texture": "#corner", "cullface": "east"},
+ "south": {"uv": [0, 3, 3, 6], "texture": "#corner", "cullface": "south"},
+ "down": {"uv": [0, 0, 3, 3], "texture": "#corner", "cullface": "down"}
  },
  "forge_data": {
  "block_light": 10,
@@ -301,9 +301,9 @@
  "from": [0, 0, 0],
  "to": [3, 3, 3],
  "faces": {
- "north": {"uv": [13, 6, 16, 9], "texture": "#1", "cullface": "north", "tintindex": 1},
- "west": {"uv": [13, 9, 16, 12], "texture": "#1", "cullface": "west", "tintindex": 1},
- "down": {"uv": [13, 3, 16, 6], "texture": "#1", "cullface": "down", "tintindex": 1}
+ "north": {"uv": [0, 3, 3, 6], "texture": "#corner", "cullface": "north"},
+ "west": {"uv": [0, 3, 3, 6], "texture": "#corner", "cullface": "west"},
+ "down": {"uv": [0, 0, 3, 3], "texture": "#corner", "cullface": "down"}
  },
  "forge_data": {
  "block_light": 10,
@@ -325,9 +325,9 @@
  "from": [0, 0, 13],
  "to": [3, 3, 16],
  "faces": {
- "south": {"uv": [13, 6, 16, 9], "texture": "#1", "cullface": "south", "tintindex": 1},
- "west": {"uv": [13, 9, 16, 12], "texture": "#1", "cullface": "west", "tintindex": 1},
- "down": {"uv": [13, 3, 16, 6], "texture": "#1", "cullface": "down", "tintindex": 1}
+ "south": {"uv": [0, 3, 3, 6], "texture": "#corner", "cullface": "south"},
+ "west": {"uv": [0, 3, 3, 6], "texture": "#corner", "cullface": "west"},
+ "down": {"uv": [0, 0, 3, 3], "texture": "#corner", "cullface": "down"}
  },
  "forge_data": {
  "block_light": 10,

diff --git a/src/main/resources/assets/mekanism/models/block/energy_cube/basic.json b/src/main/resources/assets/mekanism/models/block/energy_cube/basic.json
@@ -0,0 +1,6 @@
+{
+ "parent": "mekanism:block/energy_cube/base",
+ "textures": {
+ "corner": "mekanism:block/models/energy_cube_basic_corner"
+ }
+}
diff --git a/src/main/resources/assets/mekanism/models/block/energy_cube/creative.json b/src/main/resources/assets/mekanism/models/block/energy_cube/creative.json
@@ -0,0 +1,6 @@
+{
+ "parent": "mekanism:block/energy_cube/base",
+ "textures": {
+ "corner": "mekanism:block/models/energy_cube_creative_corner"
+ }
+}
diff --git a/src/main/resources/assets/mekanism/models/block/energy_cube/elite.json b/src/main/resources/assets/mekanism/models/block/energy_cube/elite.json
@@ -0,0 +1,6 @@
+{
+ "parent": "mekanism:block/energy_cube/base",
+ "textures": {
+ "corner": "mekanism:block/models/energy_cube_elite_corner"
+ }
+}
diff --git a/src/main/resources/assets/mekanism/models/block/energy_cube/ultimate.json b/src/main/resources/assets/mekanism/models/block/energy_cube/ultimate.json
@@ -0,0 +1,6 @@
+{
+ "parent": "mekanism:block/energy_cube/base",
+ "textures": {
+ "corner": "mekanism:block/models/energy_cube_ultimate_corner"
+ }
+}
diff --git a/src/main/resources/assets/mekanism/textures/block/models/energy_cube.png b/src/main/resources/assets/mekanism/textures/block/models/energy_cube.png
diff --git a/...resources/assets/mekanism/textures/block/models/energy_cube_advanced_corner.png b/...resources/assets/mekanism/textures/block/models/energy_cube_advanced_corner.png
diff --git a/...in/resources/assets/mekanism/textures/block/models/energy_cube_basic_corner.png b/...in/resources/assets/mekanism/textures/block/models/energy_cube_basic_corner.png
diff --git a/...resources/assets/mekanism/textures/block/models/energy_cube_creative_corner.png b/...resources/assets/mekanism/textures/block/models/energy_cube_creative_corner.png
diff --git a/...in/resources/assets/mekanism/textures/block/models/energy_cube_elite_corner.png b/...in/resources/assets/mekanism/textures/block/models/energy_cube_elite_corner.png
diff --git a/...resources/assets/mekanism/textures/block/models/energy_cube_ultimate_corner.png b/...resources/assets/mekanism/textures/block/models/energy_cube_ultimate_corner.png