From 4205c55093c96b8ffba8259b51c7d615e70ffaaf Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sat, 14 May 2016 23:40:29 -0400 Subject: [PATCH] Start work on generator rendering, I'm gonna stick with ISBRH for now until I decide which models can be transitioned --- .../java/mekanism/client/ClientProxy.java | 6 + .../client/render/ctm/CTMRegistry.java | 14 +- .../mekanism/common/block/BlockBasic.java | 3 - .../mekanism/common/block/BlockMachine.java | 6 +- .../client/BlockRenderingHandler.java | 118 ---------- .../client/GeneratorsClientProxy.java | 9 +- .../render/item/BakedGeneratorItemModel.java | 206 ++++++++++++++++++ .../item/GeneratorItemModelFactory.java | 69 ++++++ .../render/item/GeneratorsItemRenderer.java | 42 ---- .../common/GeneratorsCommonProxy.java | 2 + .../common/block/BlockGenerator.java | 95 +++----- .../generators/common/block/BlockReactor.java | 148 ++++--------- .../blockstates/electromagnetic_coil.json | 14 ++ .../blockstates/laser_focus_matrix.json | 14 ++ .../blockstates/reactor_controller.json | 5 +- .../blockstates/reactor_frame.json | 14 ++ .../blockstates/reactor_glass.json | 14 ++ .../blockstates/reactor_logic_adapter.json | 14 ++ .../blockstates/reactor_port.json | 14 ++ .../blockstates/rotational_complex.json | 8 +- .../blockstates/turbine_casing.json | 14 ++ .../blockstates/turbine_valve.json | 14 ++ .../blockstates/turbine_vent.json | 14 ++ .../blocks/ctm/electromagnetic_coil-ctm.png | Bin 0 -> 1496 bytes .../blocks/ctm/electromagnetic_coil.png | Bin 0 -> 1168 bytes .../blocks/ctm/laser_focus_matrix-ctm.png | Bin 0 -> 2371 bytes .../blocks/ctm/laser_focus_matrix.png | Bin 0 -> 1744 bytes .../blocks/ctm/reactor_controller_off-ctm.png | Bin 0 -> 1770 bytes .../blocks/ctm/reactor_controller_off.png | Bin 0 -> 1510 bytes .../blocks/ctm/reactor_controller_on-ctm.png | Bin 0 -> 1887 bytes .../blocks/ctm/reactor_controller_on.png | Bin 0 -> 1614 bytes .../textures/blocks/ctm/reactor_frame-ctm.png | Bin 0 -> 1783 bytes .../textures/blocks/ctm/reactor_frame.png | Bin 0 -> 1513 bytes .../textures/blocks/ctm/reactor_glass-ctm.png | Bin 0 -> 2174 bytes .../textures/blocks/ctm/reactor_glass.png | Bin 0 -> 1682 bytes .../blocks/ctm/reactor_logic_adapter-ctm.png | Bin 0 -> 1765 bytes .../blocks/ctm/reactor_logic_adapter.png | Bin 0 -> 1449 bytes .../ctm/reactor_neutron_capture-ctm.png | Bin 0 -> 1890 bytes .../blocks/ctm/reactor_neutron_capture.png | Bin 0 -> 1449 bytes .../textures/blocks/ctm/reactor_port-ctm.png | Bin 0 -> 1737 bytes .../textures/blocks/ctm/reactor_port.png | Bin 0 -> 1497 bytes .../blocks/ctm/turbine_casing-ctm.png | Bin 0 -> 1788 bytes .../textures/blocks/ctm/turbine_casing.png | Bin 0 -> 1401 bytes .../textures/blocks/ctm/turbine_valve-ctm.png | Bin 0 -> 1845 bytes .../textures/blocks/ctm/turbine_valve.png | Bin 0 -> 1455 bytes .../textures/blocks/ctm/turbine_vent-ctm.png | Bin 0 -> 1828 bytes .../textures/blocks/ctm/turbine_vent.png | Bin 0 -> 1454 bytes 47 files changed, 515 insertions(+), 342 deletions(-) delete mode 100644 src/main/java/mekanism/generators/client/BlockRenderingHandler.java create mode 100644 src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java create mode 100644 src/main/java/mekanism/generators/client/render/item/GeneratorItemModelFactory.java delete mode 100644 src/main/java/mekanism/generators/client/render/item/GeneratorsItemRenderer.java create mode 100644 src/main/resources/assets/mekanismgenerators/blockstates/electromagnetic_coil.json create mode 100644 src/main/resources/assets/mekanismgenerators/blockstates/laser_focus_matrix.json create mode 100644 src/main/resources/assets/mekanismgenerators/blockstates/reactor_frame.json create mode 100644 src/main/resources/assets/mekanismgenerators/blockstates/reactor_glass.json create mode 100644 src/main/resources/assets/mekanismgenerators/blockstates/reactor_logic_adapter.json create mode 100644 src/main/resources/assets/mekanismgenerators/blockstates/reactor_port.json create mode 100644 src/main/resources/assets/mekanismgenerators/blockstates/turbine_casing.json create mode 100644 src/main/resources/assets/mekanismgenerators/blockstates/turbine_valve.json create mode 100644 src/main/resources/assets/mekanismgenerators/blockstates/turbine_vent.json create mode 100644 src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/electromagnetic_coil-ctm.png create mode 100644 src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/electromagnetic_coil.png create mode 100644 src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/laser_focus_matrix-ctm.png create mode 100644 src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/laser_focus_matrix.png create mode 100644 src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_controller_off-ctm.png create mode 100644 src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_controller_off.png create mode 100644 src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_controller_on-ctm.png create mode 100644 src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_controller_on.png create mode 100644 src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_frame-ctm.png create mode 100644 src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_frame.png create mode 100644 src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_glass-ctm.png create mode 100644 src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_glass.png create mode 100644 src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_logic_adapter-ctm.png create mode 100644 src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_logic_adapter.png create mode 100644 src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_neutron_capture-ctm.png create mode 100644 src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_neutron_capture.png create mode 100644 src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_port-ctm.png create mode 100644 src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_port.png create mode 100644 src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/turbine_casing-ctm.png create mode 100644 src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/turbine_casing.png create mode 100644 src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/turbine_valve-ctm.png create mode 100644 src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/turbine_valve.png create mode 100644 src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/turbine_vent-ctm.png create mode 100644 src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/turbine_vent.png diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 73ecf6e59..ae61e4ed3 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -933,6 +933,12 @@ public class ClientProxy extends CommonProxy return ItemCraftingFormula.MODEL; } }); + + CTMRegistry.registerCTMs("mekanism", "dynamic_tank", "structural_glass", "dynamic_valve", "teleporter", "teleporter_frame", "induction_casing", "induction_port", "induction_port_output", + "induction_cell_basic", "induction_cell_advanced", "induction_cell_elite", "induction_cell_ultimate", "induction_provider_basic", "induction_provider_advanced", "induction_provider_elite", + "induction_provider_ultimate", "thermal_evaporation_controller", "thermal_evaporation_controller_on", "thermal_evaporation_valve", "superheating_element", "superheating_element_on", "reactor_port", + "reactor_neutron_capture", "reactor_logic_adapter", "reactor_laser_focus", "reactor_glass", "reactor_frame", "reactor_controller_on", "reactor_controller_off", "boiler_casing", "boiler_valve", + "electromagnetic_coil", "thermal_evaporation_valve", "thermal_evaporation_block", "turbine_casing", "turbine_vent", "turbine_valve"); } @Override diff --git a/src/main/java/mekanism/client/render/ctm/CTMRegistry.java b/src/main/java/mekanism/client/render/ctm/CTMRegistry.java index d264b9d8d..07bac5bb5 100644 --- a/src/main/java/mekanism/client/render/ctm/CTMRegistry.java +++ b/src/main/java/mekanism/client/render/ctm/CTMRegistry.java @@ -26,11 +26,7 @@ public class CTMRegistry private IBakedModel baseModel; public static ResourceLocation baseResource = new ResourceLocation("mekanism:block/ctm_block"); - public static String[] ctmTypes = new String[] {"dynamic_tank", "structural_glass", "dynamic_valve", "teleporter", "teleporter_frame", "induction_casing", "induction_port", "induction_port_output", - "induction_cell_basic", "induction_cell_advanced", "induction_cell_elite", "induction_cell_ultimate", "induction_provider_basic", "induction_provider_advanced", "induction_provider_elite", - "induction_provider_ultimate", "thermal_evaporation_controller", "thermal_evaporation_controller_on", "thermal_evaporation_valve", "superheating_element", "superheating_element_on", "reactor_port", - "reactor_neutron_capture", "reactor_logic_adapter", "reactor_laser_focus", "reactor_glass", "reactor_frame", "reactor_controller_on", "reactor_controller_off", "boiler_casing", "boiler_valve", - "electromagnetic_coil", "thermal_evaporation_valve", "thermal_evaporation_block", "turbine_casing", "turbine_vent", "turbine_valve"}; + public static List ctmTypes = new ArrayList(); public static Map textureCache = new HashMap(); @@ -67,6 +63,14 @@ public class CTMRegistry event.modelRegistry.putObject(new ModelResourceLocation("mekanism:" + ctm), new ModelChiselBlock(chiselModel)); } } + + public static void registerCTMs(String domain, String... ctms) + { + for(String s : ctms) + { + ctmTypes.add(domain + ":" + s); + } + } public static void register(TextureSpriteCallback callback) { diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index e393d8e60..52ea4d16e 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -262,7 +262,6 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple ctmData[11][0] = new CTMData(BasicBlockType.DYNAMIC_TANK, BasicBlockType.DYNAMIC_VALVE); ctmData[14][0] = new CTMData(BasicBlockType.THERMAL_EVAPORATION_BLOCK, BasicBlockType.THERMAL_EVAPORATION_VALVE, BasicBlockType.THERMAL_EVAPORATION_CONTROLLER); - ctmData[14][1] = new CTMData(BasicBlockType.THERMAL_EVAPORATION_BLOCK, BasicBlockType.THERMAL_EVAPORATION_VALVE, BasicBlockType.THERMAL_EVAPORATION_CONTROLLER); ctmData[15][0] = new CTMData(BasicBlockType.THERMAL_EVAPORATION_BLOCK, BasicBlockType.THERMAL_EVAPORATION_VALVE, BasicBlockType.THERMAL_EVAPORATION_CONTROLLER); break; @@ -270,7 +269,6 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple ctmData[0][0] = new CTMData(BasicBlockType.THERMAL_EVAPORATION_BLOCK, BasicBlockType.THERMAL_EVAPORATION_VALVE, BasicBlockType.THERMAL_EVAPORATION_CONTROLLER); ctmData[1][0] = new CTMData(BasicBlockType.INDUCTION_CASING, BasicBlockType.INDUCTION_PORT); ctmData[2][0] = new CTMData(BasicBlockType.INDUCTION_CASING, BasicBlockType.INDUCTION_PORT); - ctmData[2][1] = new CTMData(BasicBlockType.INDUCTION_CASING, BasicBlockType.INDUCTION_PORT); ctmData[3][0] = new CTMData(BasicBlockType.INDUCTION_CELL, BasicBlockType.INDUCTION_PROVIDER).setRenderConvexConnections(); ctmData[3][1] = new CTMData(BasicBlockType.INDUCTION_CELL, BasicBlockType.INDUCTION_PROVIDER).setRenderConvexConnections(); ctmData[3][2] = new CTMData(BasicBlockType.INDUCTION_CELL, BasicBlockType.INDUCTION_PROVIDER).setRenderConvexConnections(); @@ -280,7 +278,6 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple ctmData[4][2] = new CTMData(BasicBlockType.INDUCTION_CELL, BasicBlockType.INDUCTION_PROVIDER).setRenderConvexConnections(); ctmData[4][3] = new CTMData(BasicBlockType.INDUCTION_CELL, BasicBlockType.INDUCTION_PROVIDER).setRenderConvexConnections(); ctmData[5][0] = new CTMData(BasicBlockType.SUPERHEATING_ELEMENT).setRenderConvexConnections(); - ctmData[5][1] = new CTMData(BasicBlockType.SUPERHEATING_ELEMENT).setRenderConvexConnections(); ctmData[7][0] = new CTMData(BasicBlockType.BOILER_CASING, BasicBlockType.BOILER_VALVE); ctmData[8][0] = new CTMData(BasicBlockType.BOILER_CASING, BasicBlockType.BOILER_VALVE); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 419168417..8cc479877 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -131,7 +131,7 @@ import buildcraft.api.tools.IToolWrench; */ public abstract class BlockMachine extends BlockContainer implements ICTMBlock { - public CTMData[][] ctmData = new CTMData[16][4]; + public CTMData[] ctmData = new CTMData[16]; public BlockMachine() { @@ -226,7 +226,7 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock switch(getMachineBlock()) { case MACHINE_BLOCK_1: - ctmData[11][0] = new CTMData(BasicBlockType.TELEPORTER_FRAME, MachineType.TELEPORTER); + ctmData[11] = new CTMData(BasicBlockType.TELEPORTER_FRAME, MachineType.TELEPORTER); break; default: @@ -1032,7 +1032,7 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock @Override public CTMData getCTMData(IBlockState state) { - return ctmData[getMetaFromState(state)][0]; + return ctmData[getMetaFromState(state)]; } @Override diff --git a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java deleted file mode 100644 index ee7dd1154..000000000 --- a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java +++ /dev/null @@ -1,118 +0,0 @@ -package mekanism.generators.client; - -import mekanism.client.render.MekanismRenderer; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import mekanism.generators.client.model.ModelAdvancedSolarGenerator; -import mekanism.generators.client.model.ModelBioGenerator; -import mekanism.generators.client.model.ModelGasGenerator; -import mekanism.generators.client.model.ModelHeatGenerator; -import mekanism.generators.client.model.ModelSolarGenerator; -import mekanism.generators.client.model.ModelWindGenerator; -import mekanism.generators.common.GeneratorsBlocks; -import mekanism.generators.common.block.states.BlockStateGenerator; -import mekanism.generators.common.block.states.BlockStateGenerator.GeneratorType; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import org.lwjgl.opengl.GL11; - -@SideOnly(Side.CLIENT) -public class BlockRenderingHandler implements ISimpleBlockRenderingHandler -{ - private Minecraft mc = Minecraft.getMinecraft(); - - public ModelAdvancedSolarGenerator advancedSolarGenerator = new ModelAdvancedSolarGenerator(); - public ModelSolarGenerator solarGenerator = new ModelSolarGenerator(); - public ModelBioGenerator bioGenerator = new ModelBioGenerator(); - public ModelHeatGenerator heatGenerator = new ModelHeatGenerator(); - public ModelGasGenerator gasGenerator = new ModelGasGenerator(); - public ModelWindGenerator windGenerator = new ModelWindGenerator(); - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) - { - GlStateManager.pushMatrix(); - GlStateManager.rotate(90F, 0.0F, 1.0F, 0.0F); - - if(block == GeneratorsBlocks.Generator) - { - if(metadata == BlockStateGenerator.GeneratorType.BIO_GENERATOR.meta) - { - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - GL11.glTranslated(0.0F, -1.0F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "BioGenerator.png")); - bioGenerator.render(0.0625F); - } - else if(metadata == BlockStateGenerator.GeneratorType.ADVANCED_SOLAR_GENERATOR.meta) - { - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - GlStateManager.rotate(90F, 0.0F, 1.0F, 0.0F); - GlStateManager.translate(0.0F, 0.2F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "AdvancedSolarGenerator.png")); - advancedSolarGenerator.render(0.022F); - } - else if(metadata == BlockStateGenerator.GeneratorType.SOLAR_GENERATOR.meta) - { - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - GlStateManager.rotate(90F, 0.0F, -1.0F, 0.0F); - GL11.glTranslated(0.0F, -1.0F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarGenerator.png")); - solarGenerator.render(0.0625F); - } - else if(metadata == BlockStateGenerator.GeneratorType.HEAT_GENERATOR.meta) - { - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - GL11.glTranslated(0.0F, -1.0F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "HeatGenerator.png")); - heatGenerator.render(0.0625F, false, mc.renderEngine); - } - else if(metadata == BlockStateGenerator.GeneratorType.GAS_GENERATOR.meta) - { - GlStateManager.rotate(180F, 0.0F, 1.0F, 1.0F); - GlStateManager.rotate(90F, -1.0F, 0.0F, 0.0F); - GL11.glTranslated(0.0F, -1.0F, 0.0F); - GlStateManager.rotate(180F, 0.0F, 1.0F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasGenerator.png")); - gasGenerator.render(0.0625F); - } - else if(metadata == BlockStateGenerator.GeneratorType.WIND_GENERATOR.meta) - { - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - GlStateManager.rotate(180F, 0.0F, 1.0F, 0.0F); - GlStateManager.translate(0.0F, 0.4F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "WindGenerator.png")); - windGenerator.render(0.016F, 0); - } - else if(metadata != 2) - { - MekanismRenderer.renderItem(renderer, metadata, block); - } - } - - GlStateManager.popMatrix(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) - { - //Handled by CTMRenderingHandler - return false; - } - - @Override - public boolean shouldRender3DInInventory(int meta) - { - return true; - } - - @Override - public int getRenderId() - { - return GeneratorsClientProxy.GENERATOR_RENDER_ID; - } -} diff --git a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java index b2aa8cc23..bb4f586c7 100644 --- a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java +++ b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java @@ -1,5 +1,6 @@ package mekanism.generators.client; +import mekanism.client.render.ctm.CTMRegistry; import mekanism.generators.client.gui.GuiBioGenerator; import mekanism.generators.client.gui.GuiGasGenerator; import mekanism.generators.client.gui.GuiHeatGenerator; @@ -22,7 +23,6 @@ import mekanism.generators.client.render.RenderReactor; import mekanism.generators.client.render.RenderSolarGenerator; import mekanism.generators.client.render.RenderTurbineRotor; import mekanism.generators.client.render.RenderWindGenerator; -import mekanism.generators.client.render.item.GeneratorsItemRenderer; import mekanism.generators.common.GeneratorsBlocks; import mekanism.generators.common.GeneratorsCommonProxy; import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator; @@ -87,6 +87,13 @@ public class GeneratorsClientProxy extends GeneratorsCommonProxy System.out.println("[MekanismGenerators] Render registrations complete."); } + + @Override + public void preInit() + { + CTMRegistry.registerCTMs("mekanismgenerators", "turbine_vent", "turbine_valve", "turbine_casing", "electromagnetic_coil", + "reactor_controller", "reactor_frame", "reactor_port", "reactor_glass", "laser_focus_matrix", "reactor_logic_adapter"); + } @Override public GuiScreen getClientGui(int ID, EntityPlayer player, World world, BlockPos pos) diff --git a/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java b/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java new file mode 100644 index 000000000..447d96b32 --- /dev/null +++ b/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java @@ -0,0 +1,206 @@ +package mekanism.generators.client.render.item; + +import java.util.LinkedList; +import java.util.List; + +import javax.vecmath.Matrix4f; + +import mekanism.client.render.ctm.ModelChiselBlock; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import mekanism.generators.client.model.ModelAdvancedSolarGenerator; +import mekanism.generators.client.model.ModelBioGenerator; +import mekanism.generators.client.model.ModelGasGenerator; +import mekanism.generators.client.model.ModelHeatGenerator; +import mekanism.generators.client.model.ModelSolarGenerator; +import mekanism.generators.client.model.ModelWindGenerator; +import mekanism.generators.common.block.states.BlockStateGenerator.GeneratorType; +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.client.model.Attributes; +import net.minecraftforge.client.model.IFlexibleBakedModel; +import net.minecraftforge.client.model.IPerspectiveAwareModel; + +import org.apache.commons.lang3.tuple.Pair; +import org.lwjgl.opengl.GL11; + +public class BakedGeneratorItemModel implements IBakedModel, IPerspectiveAwareModel +{ + private IBakedModel baseModel; + private ItemStack stack; + + private Minecraft mc = Minecraft.getMinecraft(); + + public static ModelAdvancedSolarGenerator advancedSolarGenerator = new ModelAdvancedSolarGenerator(); + public static ModelSolarGenerator solarGenerator = new ModelSolarGenerator(); + public static ModelBioGenerator bioGenerator = new ModelBioGenerator(); + public static ModelHeatGenerator heatGenerator = new ModelHeatGenerator(); + public static ModelGasGenerator gasGenerator = new ModelGasGenerator(); + public static ModelWindGenerator windGenerator = new ModelWindGenerator(); + + public BakedGeneratorItemModel(IBakedModel model, ItemStack s) + { + baseModel = model; + stack = s; + } + + private void doRender(TransformType type) + { + GeneratorType generatorType = GeneratorType.get(stack); + + if(generatorType != null) + { + if(generatorType == GeneratorType.BIO_GENERATOR) + { + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GL11.glTranslated(0.0F, -1.0F, 0.0F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "BioGenerator.png")); + bioGenerator.render(0.0625F); + } + else if(generatorType == GeneratorType.ADVANCED_SOLAR_GENERATOR) + { + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(90F, 0.0F, 1.0F, 0.0F); + GlStateManager.translate(0.0F, 0.2F, 0.0F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "AdvancedSolarGenerator.png")); + advancedSolarGenerator.render(0.022F); + } + else if(generatorType == GeneratorType.SOLAR_GENERATOR) + { + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(90F, 0.0F, -1.0F, 0.0F); + GL11.glTranslated(0.0F, -1.0F, 0.0F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarGenerator.png")); + solarGenerator.render(0.0625F); + } + else if(generatorType == GeneratorType.HEAT_GENERATOR) + { + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GL11.glTranslated(0.0F, -1.0F, 0.0F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "HeatGenerator.png")); + heatGenerator.render(0.0625F, false, mc.renderEngine); + } + else if(generatorType == GeneratorType.GAS_GENERATOR) + { + GlStateManager.rotate(180F, 0.0F, 1.0F, 1.0F); + GlStateManager.rotate(90F, -1.0F, 0.0F, 0.0F); + GL11.glTranslated(0.0F, -1.0F, 0.0F); + GlStateManager.rotate(180F, 0.0F, 1.0F, 0.0F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasGenerator.png")); + gasGenerator.render(0.0625F); + } + else if(generatorType == GeneratorType.WIND_GENERATOR) + { + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(180F, 0.0F, 1.0F, 0.0F); + GlStateManager.translate(0.0F, 0.4F, 0.0F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "WindGenerator.png")); + windGenerator.render(0.016F, 0); + } + + return; + } + } + + @Override + public List getFaceQuads(EnumFacing facing) + { + List faceQuads = new LinkedList(); + + /*if(Block.getBlockFromItem(stack.getItem()) != null) + { + MachineType machineType = MachineType.get(stack); + + if(machineType != MachineType.QUANTUM_ENTANGLOPORTER && machineType != MachineType.RESISTIVE_HEATER) + { + if(!(stack.getItem() instanceof ItemBlockEnergyCube)) + { + faceQuads.addAll(baseModel.getFaceQuads(facing)); + } + } + }*/ + + return faceQuads; + } + + @Override + public List getGeneralQuads() + { + List generalQuads = new LinkedList(); + + if(Block.getBlockFromItem(stack.getItem()) != null) + { + generalQuads.addAll(baseModel.getGeneralQuads()); + } + + return generalQuads; + } + + @Override + public boolean isAmbientOcclusion() + { + return baseModel.isAmbientOcclusion(); + } + + @Override + public boolean isGui3d() + { + return baseModel.isGui3d(); + } + + @Override + public boolean isBuiltInRenderer() + { + return baseModel.isBuiltInRenderer(); + } + + @Override + public TextureAtlasSprite getParticleTexture() + { + return baseModel.getParticleTexture(); + } + + @Override + public ItemCameraTransforms getItemCameraTransforms() + { + return baseModel.getItemCameraTransforms(); + } + + @Override + public VertexFormat getFormat() + { + return Attributes.DEFAULT_BAKED_FORMAT; + } + + @Override + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) + { + if(cameraTransformType == TransformType.THIRD_PERSON) + { + ForgeHooksClient.multiplyCurrentGlMatrix(ModelChiselBlock.DEFAULT_BLOCK_THIRD_PERSON_MATRIX); + } + + GlStateManager.pushMatrix(); + GlStateManager.scale(0.5F, 0.5F, 0.5F); + doRender(cameraTransformType); + GlStateManager.scale(2.0F, 2.0F, 2.0F); + GlStateManager.enableLighting(); + GlStateManager.enableLight(0); + GlStateManager.enableLight(1); + GlStateManager.enableColorMaterial(); + GlStateManager.colorMaterial(1032, 5634); + GlStateManager.popMatrix(); + + return Pair.of(this, null); + } +} diff --git a/src/main/java/mekanism/generators/client/render/item/GeneratorItemModelFactory.java b/src/main/java/mekanism/generators/client/render/item/GeneratorItemModelFactory.java new file mode 100644 index 000000000..a51a2d1f4 --- /dev/null +++ b/src/main/java/mekanism/generators/client/render/item/GeneratorItemModelFactory.java @@ -0,0 +1,69 @@ +package mekanism.generators.client.render.item; + +import java.util.List; + +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.client.model.ISmartItemModel; + +public class GeneratorItemModelFactory implements ISmartItemModel +{ + private IBakedModel baseModel; + + public GeneratorItemModelFactory(IBakedModel base) + { + baseModel = base; + } + + @Override + public IBakedModel handleItemState(ItemStack stack) + { + return new BakedGeneratorItemModel(baseModel, stack); + } + + @Override + public List getFaceQuads(EnumFacing p_177551_1_) + { + throw new UnsupportedOperationException(); + } + + @Override + public List getGeneralQuads() + { + throw new UnsupportedOperationException(); + } + + @Override + public boolean isAmbientOcclusion() + { + throw new UnsupportedOperationException(); + } + + @Override + public boolean isGui3d() + { + throw new UnsupportedOperationException(); + } + + @Override + public boolean isBuiltInRenderer() + { + throw new UnsupportedOperationException(); + } + + @Override + public TextureAtlasSprite getParticleTexture() + { + throw new UnsupportedOperationException(); + } + + @Override + public ItemCameraTransforms getItemCameraTransforms() + { + throw new UnsupportedOperationException(); + } +} diff --git a/src/main/java/mekanism/generators/client/render/item/GeneratorsItemRenderer.java b/src/main/java/mekanism/generators/client/render/item/GeneratorsItemRenderer.java deleted file mode 100644 index f4e6374d3..000000000 --- a/src/main/java/mekanism/generators/client/render/item/GeneratorsItemRenderer.java +++ /dev/null @@ -1,42 +0,0 @@ -package mekanism.generators.client.render.item; - -import mekanism.generators.client.GeneratorsClientProxy; -import mekanism.generators.common.item.ItemBlockGenerator; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.client.registry.RenderingRegistry; -import net.minecraftforge.fml.relauncher.SideOnly; -import codechicken.lib.render.IItemRenderer; - -@SideOnly(Side.CLIENT) -public class GeneratorsItemRenderer implements IItemRenderer -{ - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) - { - return true; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) - { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) - { - RenderBlocks renderBlocks = (RenderBlocks)data[0]; - - if(type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) - { - GlStateManager.translate(0.5F, 0.5F, 0.5F); - } - - if(item.getItem() instanceof ItemBlockGenerator) - { - RenderingRegistry.instance().renderInventoryBlock((RenderBlocks)data[0], Block.getBlockFromItem(item.getItem()), item.getItemDamage(), GeneratorsClientProxy.GENERATOR_RENDER_ID); - } - } -} diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index 5c78dafcc..08906ff6f 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -82,6 +82,8 @@ public class GeneratorsCommonProxy implements IGuiProvider * Register and load client-only render information. */ public void registerRenderInformation() {} + + public void preInit() {} /** * Set and load the mod's common configuration properties. diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 1978b2166..b45a36111 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -16,6 +16,7 @@ import mekanism.common.base.ISustainedData; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ISustainedTank; import mekanism.common.block.states.BlockStateBasic; +import mekanism.common.block.states.BlockStateBasic.BasicBlockType; import mekanism.common.multiblock.IMultiblock; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; @@ -79,7 +80,7 @@ import codechicken.lib.render.TextureUtils.IIconRegister; */ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock { - public CTMData[] ctms = new CTMData[16]; + public CTMData[] ctmData = new CTMData[16]; public Random machineRand = new Random(); @@ -89,6 +90,8 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock setHardness(3.5F); setResistance(8F); setCreativeTab(Mekanism.tabMekanism); + + initCTMs(); } public static BlockGenerator getGeneratorBlock(GeneratorBlock block) @@ -105,6 +108,20 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock public abstract GeneratorBlock getGeneratorBlock(); + public void initCTMs() + { + switch(getGeneratorBlock()) + { + case GENERATOR_BLOCK_1: + ctmData[9] = new CTMData(GeneratorType.ELECTROMAGNETIC_COIL); + ctmData[10] = new CTMData(GeneratorType.TURBINE_CASING); + ctmData[11] = new CTMData(GeneratorType.TURBINE_VALVE); + ctmData[12] = new CTMData(GeneratorType.TURBINE_VENT); + + break; + } + } + @SideOnly(Side.CLIENT) @Override public IBlockState getExtendedState(IBlockState stateIn, IBlockAccess w, BlockPos pos) @@ -140,33 +157,6 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock GeneratorType type = state.getValue(getTypeProperty()); return type.meta; } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister register) - { - BASE_ICON = register.registerIcon("mekanism:SteelCasing"); - - ctms[9] = new CTMData("ctm/ElectromagneticCoil", this, Arrays.asList(9)).registerIcons(register); - ctms[10] = new CTMData("ctm/TurbineCasing", this, Arrays.asList(10, 11, 12)).registerIcons(register); - ctms[11] = new CTMData("ctm/TurbineValve", this, Arrays.asList(10, 11, 12)).registerIcons(register); - ctms[12] = new CTMData("ctm/TurbineVent", this, Arrays.asList(10, 11, 12)).registerIcons(register); - - icons[7][0] = register.registerIcon("mekanism:TurbineRod"); - icons[8][0] = register.registerIcon("mekanism:RotationalComplexSide"); - icons[8][1] = register.registerIcon("mekanism:RotationalComplexTop"); - - icons[9][0] = ctms[9].mainTextureData.icon; - icons[10][0] = ctms[10].mainTextureData.icon; - icons[11][0] = ctms[11].mainTextureData.icon; - icons[12][0] = ctms[12].mainTextureData.icon; - } - - @Override - public CTMData getCTMData(IBlockState state) - { - return ctms[meta]; - } @Override public AxisAlignedBB getCollisionBoundingBox(World world, BlockPos pos, IBlockState state) @@ -175,31 +165,6 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock return super.getCollisionBoundingBox(world, pos, state); } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) - { - GeneratorType type = GeneratorType.getFromMetadata(meta); - - if(type == GeneratorType.ROTATIONAL_COMPLEX) - { - if(side != 0 && side != 1) - { - return icons[meta][0]; - } - else { - return icons[meta][1]; - } - } - else if(!type.hasModel) - { - return icons[meta][0]; - } - else { - return BASE_ICON; - } - } @Override public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block neighborBlock) @@ -725,12 +690,6 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock return false; } - - @Override - public PropertyEnum getTypeProperty() - { - return getGeneratorBlock().getProperty(); - } @Override public EnumFacing[] getValidRotations(World world, BlockPos pos) @@ -772,4 +731,22 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock return false; } + + @Override + public CTMData getCTMData(IBlockState state) + { + return ctmData[getMetaFromState(state)]; + } + + @Override + public String getOverrideTexture(IBlockState state, EnumFacing side) + { + return null; + } + + @Override + public PropertyEnum getTypeProperty() + { + return getGeneratorBlock().getProperty(); + } } diff --git a/src/main/java/mekanism/generators/common/block/BlockReactor.java b/src/main/java/mekanism/generators/common/block/BlockReactor.java index 23347290a..e01d0d079 100644 --- a/src/main/java/mekanism/generators/common/block/BlockReactor.java +++ b/src/main/java/mekanism/generators/common/block/BlockReactor.java @@ -1,6 +1,5 @@ package mekanism.generators.common.block; -import java.util.Arrays; import java.util.List; import mekanism.client.render.ctm.CTMBlockRenderContext; @@ -38,11 +37,10 @@ import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import buildcraft.api.tools.IToolWrench; -import codechicken.lib.render.TextureUtils.IIconRegister; public abstract class BlockReactor extends BlockContainer implements ICTMBlock { - public CTMData[][] ctms = new CTMData[16][2]; + public CTMData[] ctmData = new CTMData[16]; public BlockReactor() { @@ -50,6 +48,8 @@ public abstract class BlockReactor extends BlockContainer implements ICTMBlock setHardness(3.5F); setResistance(8F); setCreativeTab(Mekanism.tabMekanism); + + initCTMs(); } public static BlockReactor getReactorBlock(ReactorBlock block) @@ -66,6 +66,26 @@ public abstract class BlockReactor extends BlockContainer implements ICTMBlock public abstract ReactorBlock getReactorBlock(); + public void initCTMs() + { + switch(getReactorBlock()) + { + case REACTOR_BLOCK: + ctmData[0] = new CTMData(ReactorBlockType.REACTOR_CONTROLLER, ReactorBlockType.REACTOR_FRAME, ReactorBlockType.NEUTRON_CAPTURE, ReactorBlockType.REACTOR_PORT, ReactorBlockType.REACTOR_LOGIC_ADAPTER); + ctmData[1] = new CTMData(ReactorBlockType.REACTOR_CONTROLLER, ReactorBlockType.REACTOR_FRAME, ReactorBlockType.NEUTRON_CAPTURE, ReactorBlockType.REACTOR_PORT, ReactorBlockType.REACTOR_LOGIC_ADAPTER); + ctmData[2] = new CTMData(ReactorBlockType.REACTOR_CONTROLLER, ReactorBlockType.REACTOR_FRAME, ReactorBlockType.NEUTRON_CAPTURE, ReactorBlockType.REACTOR_PORT, ReactorBlockType.REACTOR_LOGIC_ADAPTER); + ctmData[3] = new CTMData(ReactorBlockType.REACTOR_CONTROLLER, ReactorBlockType.REACTOR_FRAME, ReactorBlockType.NEUTRON_CAPTURE, ReactorBlockType.REACTOR_PORT, ReactorBlockType.REACTOR_LOGIC_ADAPTER); + ctmData[4] = new CTMData(ReactorBlockType.REACTOR_CONTROLLER, ReactorBlockType.REACTOR_FRAME, ReactorBlockType.NEUTRON_CAPTURE, ReactorBlockType.REACTOR_PORT, ReactorBlockType.REACTOR_LOGIC_ADAPTER); + + break; + case REACTOR_GLASS: + ctmData[0] = new CTMData(ReactorBlockType.REACTOR_GLASS, ReactorBlockType.LASER_FOCUS_MATRIX); + ctmData[1] = new CTMData(ReactorBlockType.REACTOR_GLASS, ReactorBlockType.LASER_FOCUS_MATRIX); + + break; + } + } + @SideOnly(Side.CLIENT) @Override public IBlockState getExtendedState(IBlockState stateIn, IBlockAccess w, BlockPos pos) @@ -81,89 +101,6 @@ public abstract class BlockReactor extends BlockContainer implements ICTMBlock return state.withProperty(BlockStateBasic.ctmProperty, ctx); } - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister register) - { - if(this == GeneratorsBlocks.Reactor) - { - ctms[0][0] = new CTMData("ctm/ReactorFrame", this, Arrays.asList(0, 1, 2, 3, 4)).addSideOverride(EnumFacing.UP, "ctm/ReactorControllerOff").registerIcons(register); - ctms[0][1] = new CTMData("ctm/ReactorFrame", this, Arrays.asList(0, 1, 2, 3, 4)).addSideOverride(EnumFacing.UP, "ctm/ReactorControllerOn").registerIcons(register); - ctms[1][0] = new CTMData("ctm/ReactorFrame", this, Arrays.asList(0, 1, 2, 3, 4)).registerIcons(register); - ctms[2][0] = new CTMData("ctm/ReactorNeutronCapture", this, Arrays.asList(0, 1, 2, 3, 4)).registerIcons(register); - ctms[3][0] = new CTMData("ctm/ReactorPort", this, Arrays.asList(0, 1, 2, 3, 4)).registerIcons(register); - ctms[4][0] = new CTMData("ctm/ReactorLogicAdapter", this, Arrays.asList(0, 1, 2, 3, 4)).registerIcons(register); - - icons[0][0] = ctms[0][0].sideOverrides[1].icon; - icons[0][1] = ctms[0][1].sideOverrides[1].icon; - icons[0][2] = ctms[0][0].mainTextureData.icon; - icons[1][0] = ctms[1][0].mainTextureData.icon; - icons[2][0] = ctms[2][0].mainTextureData.icon; - icons[3][0] = ctms[3][0].mainTextureData.icon; - icons[4][0] = ctms[4][0].mainTextureData.icon; - } - else if(this == GeneratorsBlocks.ReactorGlass) - { - ctms[0][0] = new CTMData("ctm/ReactorGlass", this, Arrays.asList(0, 1)).registerIcons(register); - ctms[1][0] = new CTMData("ctm/ReactorLaserFocus", this, Arrays.asList(1, 0)).registerIcons(register); - - icons[0][0] = ctms[0][0].mainTextureData.icon; - icons[1][0] = ctms[1][0].mainTextureData.icon; - } - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) - { - if(this == GeneratorsBlocks.Reactor) - { - if(meta == 0) - { - return icons[0][side == 1 ? 0 : 2]; - } - else { - return icons[meta][0]; - } - } - else if(this == GeneratorsBlocks.ReactorGlass) - { - return icons[meta][0]; - } - - return null; - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) - { - int metadata = world.getBlockMetadata(x, y, z); - - if(this == GeneratorsBlocks.Reactor) - { - if(metadata == 0) - { - if(side == 1) - { - return MekanismUtils.isActive(world, x, y, z) ? icons[0][1] : icons[0][0]; - } - else { - return icons[0][2]; - } - } - else { - return icons[metadata][0]; - } - } - else if(this == GeneratorsBlocks.ReactorGlass) - { - return icons[metadata][0]; - } - - return null; - } - @Override public int damageDropped(IBlockState state) { @@ -288,18 +225,7 @@ public abstract class BlockReactor extends BlockContainer implements ICTMBlock { return null; } - - @Override - public CTMData getCTMData(IBlockAccess world, int x, int y, int z, int meta) - { - if(ctms[meta][1] != null && MekanismUtils.isActive(world, x, y, z)) - { - return ctms[meta][1]; - } - - return ctms[meta][0]; - } - + @Override @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockAccess world, BlockPos pos, EnumFacing side) @@ -315,7 +241,7 @@ public abstract class BlockReactor extends BlockContainer implements ICTMBlock { case 0: case 1: - return ctms[metadata][0].shouldRenderSide(world, pos, side); + return ctmData[metadata].shouldRenderSide(world, pos, side); default: return super.shouldSideBeRendered(world, pos, side); } @@ -369,12 +295,6 @@ public abstract class BlockReactor extends BlockContainer implements ICTMBlock return false; } } - - @Override - public PropertyEnum getTypeProperty() - { - return getReactorBlock().getProperty(); - } public ItemStack dismantleBlock(World world, BlockPos pos, boolean returnBlock) { @@ -397,4 +317,22 @@ public abstract class BlockReactor extends BlockContainer implements ICTMBlock return itemStack; } + + @Override + public CTMData getCTMData(IBlockState state) + { + return ctmData[getMetaFromState(state)]; + } + + @Override + public String getOverrideTexture(IBlockState state, EnumFacing side) + { + return null; + } + + @Override + public PropertyEnum getTypeProperty() + { + return getReactorBlock().getProperty(); + } } diff --git a/src/main/resources/assets/mekanismgenerators/blockstates/electromagnetic_coil.json b/src/main/resources/assets/mekanismgenerators/blockstates/electromagnetic_coil.json new file mode 100644 index 000000000..cb9368072 --- /dev/null +++ b/src/main/resources/assets/mekanismgenerators/blockstates/electromagnetic_coil.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:basic_cube", + "textures": { + "all": "mekanismgenerators:blocks/ctm/electromagnetic_coil" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanismgenerators/blockstates/laser_focus_matrix.json b/src/main/resources/assets/mekanismgenerators/blockstates/laser_focus_matrix.json new file mode 100644 index 000000000..cb1c6899e --- /dev/null +++ b/src/main/resources/assets/mekanismgenerators/blockstates/laser_focus_matrix.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:basic_cube", + "textures": { + "all": "mekanismgenerators:blocks/ctm/laser_focus_matrix" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanismgenerators/blockstates/reactor_controller.json b/src/main/resources/assets/mekanismgenerators/blockstates/reactor_controller.json index 61ab2f43f..d23429914 100644 --- a/src/main/resources/assets/mekanismgenerators/blockstates/reactor_controller.json +++ b/src/main/resources/assets/mekanismgenerators/blockstates/reactor_controller.json @@ -3,8 +3,9 @@ "defaults": { "model": "mekanism:machine", "textures": { - "sides": "mekanism:blocks/ctm/thermal_evaporation_block", - "front": "mekanism:blocks/ctm/thermal_evaporation_controller" + "sides": "mekanismgenerators:blocks/ctm/reactor_frame", + "front": "mekanismgenerators:blocks/ctm/reactor_frame", + "top": "mekanismgenerators:blocks/ctm/reactor_controller" } }, "variants": { diff --git a/src/main/resources/assets/mekanismgenerators/blockstates/reactor_frame.json b/src/main/resources/assets/mekanismgenerators/blockstates/reactor_frame.json new file mode 100644 index 000000000..4301c212c --- /dev/null +++ b/src/main/resources/assets/mekanismgenerators/blockstates/reactor_frame.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:basic_cube", + "textures": { + "all": "mekanismgenerators:blocks/ctm/reactor_frame" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanismgenerators/blockstates/reactor_glass.json b/src/main/resources/assets/mekanismgenerators/blockstates/reactor_glass.json new file mode 100644 index 000000000..ee9fbcb58 --- /dev/null +++ b/src/main/resources/assets/mekanismgenerators/blockstates/reactor_glass.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:basic_cube", + "textures": { + "all": "mekanismgenerators:blocks/ctm/reactor_glass" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanismgenerators/blockstates/reactor_logic_adapter.json b/src/main/resources/assets/mekanismgenerators/blockstates/reactor_logic_adapter.json new file mode 100644 index 000000000..76ac4001d --- /dev/null +++ b/src/main/resources/assets/mekanismgenerators/blockstates/reactor_logic_adapter.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:basic_cube", + "textures": { + "all": "mekanismgenerators:blocks/ctm/reactor_logic_adapter" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanismgenerators/blockstates/reactor_port.json b/src/main/resources/assets/mekanismgenerators/blockstates/reactor_port.json new file mode 100644 index 000000000..7c206e9c1 --- /dev/null +++ b/src/main/resources/assets/mekanismgenerators/blockstates/reactor_port.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:basic_cube", + "textures": { + "all": "mekanismgenerators:blocks/ctm/reactor_port" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanismgenerators/blockstates/rotational_complex.json b/src/main/resources/assets/mekanismgenerators/blockstates/rotational_complex.json index e492f62f0..51f2cc316 100644 --- a/src/main/resources/assets/mekanismgenerators/blockstates/rotational_complex.json +++ b/src/main/resources/assets/mekanismgenerators/blockstates/rotational_complex.json @@ -3,10 +3,10 @@ "defaults": { "model": "mekanism:machine", "textures": { - "sides": "mekanism:blocks/RotationalComplexSide", - "front": "mekanism:blocks/RotationalComplexSide", - "up": "mekanism:blocks/RotationalComplexTop", - "down": "mekanism:blocks/RotationalComplexTop" + "sides": "mekanismgenerators:blocks/RotationalComplexSide", + "front": "mekanismgenerators:blocks/RotationalComplexSide", + "up": "mekanismgenerators:blocks/RotationalComplexTop", + "down": "mekanismgenerators:blocks/RotationalComplexTop" } }, "variants": { diff --git a/src/main/resources/assets/mekanismgenerators/blockstates/turbine_casing.json b/src/main/resources/assets/mekanismgenerators/blockstates/turbine_casing.json new file mode 100644 index 000000000..5ab17c563 --- /dev/null +++ b/src/main/resources/assets/mekanismgenerators/blockstates/turbine_casing.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:basic_cube", + "textures": { + "all": "mekanismgenerators:blocks/ctm/turbine_casing" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanismgenerators/blockstates/turbine_valve.json b/src/main/resources/assets/mekanismgenerators/blockstates/turbine_valve.json new file mode 100644 index 000000000..efbffc748 --- /dev/null +++ b/src/main/resources/assets/mekanismgenerators/blockstates/turbine_valve.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:basic_cube", + "textures": { + "all": "mekanismgenerators:blocks/ctm/turbine_valve" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanismgenerators/blockstates/turbine_vent.json b/src/main/resources/assets/mekanismgenerators/blockstates/turbine_vent.json new file mode 100644 index 000000000..104893fa1 --- /dev/null +++ b/src/main/resources/assets/mekanismgenerators/blockstates/turbine_vent.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:basic_cube", + "textures": { + "all": "mekanismgenerators:blocks/ctm/turbine_vent" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/electromagnetic_coil-ctm.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/electromagnetic_coil-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..173bbd33a6c1a74b57b1353c9cba5efa5b791f2a GIT binary patch literal 1496 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFso&TM3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWnQpS7p`n7grJkXw zg|U&Tj)IYap{c%srM{tou7RPIp@Ef=fdUjL0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LbwWAlok!2}F2{ffi_eM3D1ke6TzeSPsO&CP|YE-nd5MYtEM!Nnn! z1*!T$sm1xFMajU3OH&3}Rbb^@l$uzQUlfv`p92fUfQydR_99OLJ56N?>|Z5PDs4>IEf-+ybD@E~!PCWvMA{Mftf3U~gMx;&zJ@ zPV=C8Q*gV*8K+)-pkwqwk&6`BFd<+H0x{u97s!Dp{?t5RiZ22t?IV-k9bjN!^6+$V z45_&FX4-x)W=DZz@AW3vFX3ofus|b2x$%K9htf8)ZP)fSceF0ZPe{(r)#gyT5pjEk zLdV4pr3h7(olo@YKJMn3-F+x8^|8q8v+wfD%G1)*&#ezzJx?)EB-LnU-TwE#?QU80 zH7hu*c36E?ON492QHy^?r{2tFim+I#om8r|nP0YK(@hLDLKvi zohTs9a%a`;w?!RmU%l{ToWZ{3xiEKy#-%qI^O=-O?sUq3oI9^$!b{)JKm7K5Xuq6s z`|Y-@N!nuFHd}YL+v@L)O(l6`yS(Y4N(T?e%m@7dPL zS|{?@-)&Rv45dZeMNV9(Hn8d17}T&r_ACEl%d`BdJDa!O_1@KC^4G%R(1)JWx0kQ- zbPxO?cf4}%B$YE-Q@f7IuuNZeP4Llf)dt=VWv8BQQoWyH((>M^_w4h}%bc{*N{-AE zKezF!_NO|*xtpF$Zf9F``Q-}d`WV4=4fR)cPWy9!X;;Tf9oE2lnSw{I@)IQ$mwl=b zN?Yc=G^2KxX56f^%Vw^!;ZBTL{%C4t$(}lnAa>*V&veeRxSajdSJm+J&1?6flmEXy zc>kJlZ(1aO#msMe=E$$Hy4w7_-(TIXU@iN)J!{^@806@_W;9s->tPK4m&2zgm9J)R zx%;XyyRLk#yyv!!XWs8xSNm6h@8%SD==6{S?5~3A(jlV{*hSPw-^~$?HTCV@B PL1nF{tDnm{r-UW|$2mvR literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/electromagnetic_coil.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/electromagnetic_coil.png new file mode 100644 index 0000000000000000000000000000000000000000..4bbdd474cb2463c78eab3a68989054e860b1f59c GIT binary patch literal 1168 zcmaJ>ZDBn6gp?h|GgN&ETo$=Py#Ert;L5 zkiSsfdU?8-P3@~hnW}-C9_!yRB87{z(vk!%%S!yqr5tFmA z@QJ4i2$>vBm&;{;Ip~L0AI(OiQJM+Rfq)Mqe0INqWXEUNO;rUE*ovi@NP`CHD$03S zLOg{t{ZN8#&dD0~Y@2YyXh$|_*3Y;lRe_T9|4?0@L)$0=KIZ$M!gjXb1at=2uw*HC zaJ@}#D3cQ`AR}mHA>3K*VpjnoXcwSK3PPo8exv zENwSXlNQv;O4*!NJD1j)db3=$b}o^cTpA}syTkq0u&Yeqdn7TiDt? zO^rthVjhta<5}n4zD&>JL8jr@pKm>Vm*_|O%yfF?Wlz7Sg=MD~G_*N&=8gknqeDh} z_eAikU+$k+ck@v6$IPP$ck%L-pPLtrHk(&2+!ZP;d<@uR+ zvBRgY{`2*%@!!+>34VAC_DtP>rjHSa(D4h`PCmGO6poG2IyLP$=X=V&oJH^U b|4Mj>eM9&5q}${P_aBi;bc(0icMQG<^&^lS literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/laser_focus_matrix-ctm.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/laser_focus_matrix-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..ae69bdd3b582bca4e3f026eb35ac6b7e752ba9b5 GIT binary patch literal 2371 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_controller_off-ctm.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_controller_off-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..2b0a0713990ceb86e754daf79ed7369c790e8fc4 GIT binary patch literal 1770 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFe_$;M3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWscy1?k)eXQrJkXw ziKU^Tj)IYap|QT9fxeNYuA!loiMf@bnF16j0c|TvNwW%aaf8|g1^l#~=$>Fbx5 zm+O@q>*W`v>l<2HTIw4Z=^Gj80#)c1SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WA zUs__T1av9H3%LbwWAlok!2}F2{ffi_eM3D1ke6TzeSPsO&CP|YE-nd5MYtEM!Nnn! z1*!T$sm1xFMajU3OH&3}Rbb^@l$uzQUlfv`p92fUfQ2-5f>J_m0nlcb)S}F?)D*X({9FaFkF7FsyTuu& zc~HG6xZUD{Q?EYIG5Vl*MT%#b5HRt8nDA5!-l)@&9f6TKYtE5vVIl=gZ;}@6R(ShtqUsu zo9!9o*|a&utD@i8HSi8w+RMW)m5q)iG{1auwcaJydBO~h0#5yu-3$v%c3R(ddO7RQ zwG7T12ff_Ix@VZWrp;|V?rI|@!TMB+|7q`*&x)Je7FZ~joDDp>$GA{hdHp2y=ewEs zp7wq>>sGw-V%q!p|9hB=#FO7C3f_5eOZ>yR-S0Wfw4ZkUPzji*=BHJ@^2?Tz)%WjQ zp6kVOGuNV?`{73eJB8#)tOpp~cYWB^|3dzjK;-HgpT^B%?VqkmbsJ1mv`T+}Z=T>P z5h)Lcr5(+Y&n>rHa6A>bV{?^g5?}RAo@cimUi@2~{QcS0m;L9<_Rs#mWp8cr=VQnC z&)3h~e`EK~clojN&z1Afd-pCjdj6XAp;8a0ec+l@QSiRG(=L{eGP^(fWcwS4+^-pK|eM%kQ2o_r3e(QtUrg*OGgobLB7GuX_;x znfZNjbYI}}xpU`o1G#6vYyY41eqM5eyuyr!{}!5=>px^qt=TBQK(qTtlDz}F$j75~ z0cWQFa@34}!+sYkE+DzVqeL+N75mbfJd;V=@+1@gey?%A^^jfelJ>*@ z@%9&{e_+lp6c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvU3|9Isw0=c3falKi5O{QMkPDhSBP zFUc>?$S+WEc2>{`&&*57FE7>v#Sp~9E~!PCWvMA{Mftf3;2^fj#A1DtnPGBjQj)o@ zQIdtRu4#&ip{`}3QL?U~X_AGdVPcA@p<#*=RDTM&L8lLNls+h(Af+3a5HK-jRq8@Zi zW9eEkhs?!W4o#iWd86|E>9@SkyI*D9cihRKMzJX+3kK1>zzH|l8#k>Cp7PTaw@bwH7PTa43ztka5;mMbO`;=x&SZ*xLJvit3mObpROaEn? zx*Ko=D!FG|P!oK}oDk)FtnJXxdEXS(4k@s38L)e4r7jDYEEFn~!*Nb|;*Lu`^ZV)@ z7@m4nCYw6`n-_OXyIxl=`|otu z&UlvRYn*SU&fQaf`L2<^&l?a%G= zReN22J-^n@Zth$iv*U@c&t;g||F??2BgcRIuan}U<^6Kgq=n16R-O9V##y}f^@7l* zkW?;qZ=v9;??spVxp?xB>$Ju1mv?GLxW7`@c~aW)TW0&wM+xFQMxKFdx;_62CNTJ& W_1TenaNadg$?NIr=d#Wzp$Pz;2QOy; literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_controller_on-ctm.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_controller_on-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..06e6ac08d709186df9edc658bd525b756ce5e154 GIT binary patch literal 1887 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 afWG8mjM-cisJj#T!yEPKx_Zr;l79fGQC?2~ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_frame-ctm.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_frame-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..b20bf91c088d2986b1c52782716532afcfebe084 GIT binary patch literal 1783 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 bYle?UR9cBWOom#+KVR#@rF7$h+_nDzzyUmd literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_glass-ctm.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_glass-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..1c15e5fe6c298f2e7a65942fe94a5a4db9f73af1 GIT binary patch literal 2174 zcmaJ@dpwi-AK!ABYkRi2ZY60$OOwkqr5D!rV6i>3J!~U&QsfdRx*$X3 z9FpiH$FDkvLn-C->qKrzi87bsNSsciep@G<^T)5>^Ljnc_wstb-=Ew2k0;&F*IQrL zTo-{r=+n2-0#qwn{px6|zT$+0H>%}p*fSUogd$)GTLdCJxX@k@P3N;C!2poWmBrox zHzE)k);wk~9L(5G;Xr&mTaCd>`9c*Nf!OFS6|y6Q^xNkyllu}dzd=O@%rTiFym?CwDC zqunrnB^Au@LsKCUh<3s|;Wz{m5$!_86P+B%MB;ihi9mD!hy;K{#u14WM;8jw8U5+O zsG^Cu5tIO$*QZ#jlN%-qhJ_RWkVqtWi31)IMFK=JnG6s}0EvWCA#h@u0A@>Z0k7BoVLu2xl-Tbb%OV3pgO1=7v!T;CVbQg+wB`5Qsz)jp#uo5_PJ+JG(A&X%Hul4+`K#F86P)!xy<~C-8-;$TU#IiwC)0B8ZRvSTTk7#aaDW`m z4-i(4rle>&S!K0^HkBk!6}5mDXSSuwribfT?hEtn@hj#t749!b$Ka}LL&Fdcqa)qB z3-00XNnQ15H-`zl`rXM3HBDFKoO?X}JeTBOVKOAm!tlYLPE<*!sx`Ia2hq(9 zhh5COO|jULU6z${aYpg%J0E98=Mub9f>QFUuirx%M#fr3|8&G^e4VrxyZD@BV|BEU~0$e#towg z6EuVuI1fa*GJmgn5aX<+?CR?)DD<@}GASNVzJ9McVO4DUD<^2b$-bp6_OIJcXz%Ly zS2`z*Igx-%;@G?X6BKrR8>0%K*eF*7qW z(A6?^wflaZXJGRs5_fnySYF>eI8=5>Lo;8;};0i z1UFu1%?8WzJl4+gzI|iBKJnwp43_QT9RJ z+7vT~<>|9vsYcNBLnPi*8jf4GwG&->sV`Sv{mNIN?NsFd-Ib2ORAbxrw#{h;II^Es zN#t+H+(XZ-cllLlTC59c=pR00Yt(x8xNzoAy&#KIAT6olaYnf*NK`6S@X>>BDwEO9`qzxW3=@Wxpg)Wel z!;YQ>d5yF0hfQ&9thq4vCf5&&gA0}u+#j#bd3Ci+O->4kw39xm#}&=k_RH5M6($yQ zV#6b33gwu40qSmEPfJe`YJ4dAzDC@1y#hHHv}*q=*;#z!+(tjM+9!=k%Cyq6zx{Ie za_zA9B8Ur;tvADOtzdzzY?+@X;B|GaR?^*>e z0PbdUkG1U$+-tk)u#wYz`O$~XJ;nbBwpV4pw8K5RaH>snug^9cFJZ>;>2=E5 zuik56Q92$Lc+qrkq0Q_?FZ-tVbIR@@rQ+Byy=KiBc(G f(*rZ(VMuMn_8H3+z*BjH`j3F_=}W8G5}y2DgVBtm literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_glass.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_glass.png new file mode 100644 index 0000000000000000000000000000000000000000..41cbacb46e2de69b237dc3cf0ac90283f2c49a6f GIT binary patch literal 1682 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_neutron_capture-ctm.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_neutron_capture-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..db6450a230b97bfeb1fb1546435bc9c522870470 GIT binary patch literal 1890 zcmaJ?c~BEq9FC%e;?*!XDxxd_DH5VJv00yIQ9Y)3+}gf;GN+$@k_K@kgB zP@zS^0YQzWoSq03QR`G%a3qzsg5nXi)k>?P22?CZH&$r>DBYRe_ug;5@B5u^c1L9R z${F@f_6!DNMra5uqgTNC+D)dvLvtS+>17@ziJ_v1L@HH5B8(svk$?c9m_m)n5QWOH zsT~nA7&fk`Jcf#qh6$7e##UG{Y(1u>*$jp-P_I=eH3$VHAZipBvHH%OX91{6#ERxg zIZ~|{NkT)?NF*vPT&_&hDETT@U;rT03uplhp%j1~+lcD~dJ*f5u7KWK%^(YS1EDk` z*55(JNFxC;K_UQ;&GS)mxDepaXG1(cJ_LCKTn^+5LL89G_kkdRpT7WF3cP(-v^P?f zD3HOyZ++1x5i5zJv;q)JO-*H|`mza94MKcAALMXBF4u=f_~;BcrO^A}I=3+e7||(7 zR7;@*4pp`aiLlK3r?_={Hr!7z{OC*g^g290rH zLYa&qI5oyqjdNkngk0++U|QNUjF4ywq6#Jn40w~V0G&7%ctX9mT-AiJh$RzpK{^=F z+Sh;edCWu)k99jfwe(?p?h%|Gc9Ndz^6bhK`m%I~!a;I*Tj{dI~HDb1Oc&!eSM~Iyc~F z8y%JA3iGEe_FX-j@}(jN*=GRw)VpD+2e5b?jGmAu=3@kGiN{yFPs|wjTBpr5&yH z${9I2e>d#82)$&BH72Jv^-8*m_T;sEY!-d;QXesL-7>9%+vO!KuWiosu3xvHsdMg( zeJ!bxF3`OXjf)>t;t4aktNyfbZR5&R^Y0z{L%3Mh6OrD%fbnPD!#mpETL&a_)^-0} z*OZT+oImU4Lkj63*VpDw5Gcd+E-VVq)*~Cx2qkYZ%f39Yr_*B<^FU>_&2Q^aBGHW;FkY*_X3qYi=akW*74e(Y zUCZ=nE1Lc6UexOczpn~kKe8%JmY@9M<*OgfS54;GCQZ=ee)ZJ&y6P0e*3k!<>5FF7 z?YA7LuM6Pw2O}0w~SeXl& zvSj6^aC08ifVr_N9S706(p`sxv6-{Xm)bS4d2!LV66dZ6tCG(f4Yn-Tr;#Z&nOjNf z$c7%fOJ_o};g&0{*Rxu&Z7yE*bG7!~E?JV6*H5!n^1p0r|2$k~e$;mo>W-%IBALH#j|ID22N>5neEVqg~$5Y1p!+!2Adc*jPlO&zx1}cUbg=ALM7qwkrnaV F{sNkg22KC~ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_neutron_capture.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_neutron_capture.png new file mode 100644 index 0000000000000000000000000000000000000000..5236dc6fe7db0d6a907dd749743b8b639cebf8aa GIT binary patch literal 1449 zcmaJ>ZBP_-99{(rQHrSXB>~q3H4JWdk2~a+I~cgVi%U+<;{;Msj@yM>k9~1>f#cAL z6iH?*aGDYbwQR(xk*=ITkr2ucjRM9PS0fq|o?q}%0?ca8iS`h%57Ex-{$J*Kp5NOu zTW8w(T3G1Ip#T7c88UIRw1x-Xkj2us;g~&1T2_m?d@+YD7Aveg38WKj5eXV-YYAy4 ztwiO%tE3tLf;Lc=d@|lP+Zh%&CE9bTMfkxP~Ec1|m8% z(37O{jV4gb@+7E~B_-HU6a_b{WT-MZQLc;!T5fzLg2?&az2qs6s*$0xM@kB9Z z#`UwYq>~1+iz0`?a79IhtRhjy@+B~;QmJ4>4$I{U5+XsUWJIeofe~Wn6mU|o@f0Ug zECU76lv^;4QS>D33rE^_0*;$bl>?{XrwKH7IYo(8}&`sa|>fu4fOx2UYG6ufBtGrtb(*-3RfY_(U^Et9!>H%7SYGgPp;-;=rR!ru6|dJ99ua?v-Oeq&Ti zZ}QftA0McCeqC}`X8!9@L9aGc$8pKGv;6+5yN@RK%ROoC65zFN6Qam=RL!d^&8*(IXti0d)!|zft(37_m#hYZVhC2oN#ro*)`znjCouWzQ{FB z9l58inpkUJ$wgd8qoA(X;oTkOZNE(Gr=GKxlDC#s<3TT)+AnqDXMW54q z4Ih+xow(0;sZ~+AgL#keC^nq+eK>ah!oH&e^pd#F{$rg5Cf|47wwM)pY43VPVMKmt zYW>9%895EYjrr2}X1#R?OIU>lJLEJ2Jy1fCQLhX5fgj)Vdru{1IEA>>9N z=&zIohF~G0bsPx-)5JOqO$94(Hi6*gp;Cw?(GUiNLyV4 zC`#t5Mxl-B^??#~w1h3Cc(?;@Dh@6HLzoy)!7*|rN5!Q~>2h#ecTA@MQxGhgOZgI1 zh{zxCLQn``(O6Uog9!pIY#PXNVuRosfXM(I=^%s7WK%(q_G6oMhjC`18xc>#98GPx8Cd07+Rfp^^9!WWz}R1_IlP0IglM#cxQcuLx!XBjUg{^bx46HQ?Pu?5 zkdxzUS6zI3)YjKvVT1P7C-P#!-i~a&NyTb7Dxx zUegL|>q9B4>jTcKtLjZXHv~0a$$GNansjWpSq(|dBKF*PPCb2dYiXLeiWGUYewF*; zYM`!q!H;g1zo+=$R5RNL;u$?7BjzJdpISvtlmrzI4-a>Lcq~|*nQ5mzlL%4U%$l$J zE!IoZ4{LoC;n)qk7j{k7hR@UYd2i8IW6uW;W@Q|iZ}m8S;ZDFK4ZF9^b)QSwH?d29 zt0v7GO}WA?NJwFwxh&}2r?oBeGU;eI)xVbPo-%skh#7fB=xf!Ee*JE^XX08(EW2%w zg}q>2)}~D>NZNEX+*wnXNE(}r+M!t1?oqm~2}=gs<4P{QT$ye}Zpf1z-z*>JEjj+Z z9JD7n!hi|gZBQq=B{8rX>joV{ByQL2KVd6-W2v|e22pxXxF5h z@AQtyWC@<=j|DI4U%)MkkEy>@_OY+8kIXG=8crU4nN)71H$tehE+u2JT4U~muB-0= z>CjX4_Ke0(+{|xkN!>CDzuUF#oMGbak4c|+i-~t)Ze7S;5Sg8PFi6O&T3&;N=B`u) z?jbE_r8c#uu5;hK2px;znx4J-p}a-^EmCaQQG2YZkTUe>p2Ld$Pm;(z=!ro;+vdYH zuH@YKf=ksW3r@PdzUNx#!|gbx-sP=5J2IHB@zDF05dTW^OQ;>GL-%tL3fA*WJh$)u E2OlP~=>Px# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_port.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_port.png new file mode 100644 index 0000000000000000000000000000000000000000..373b8c12a4f84cd89efdc7aa61201a792cc419a7 GIT binary patch literal 1497 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 B(ewZS literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/turbine_casing.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/turbine_casing.png new file mode 100644 index 0000000000000000000000000000000000000000..06215c275983567a1a293872b8b249e91188df99 GIT binary patch literal 1401 zcmaJ>ZA=?w9535&4FN^mFfcaH;{$`xUa$1+ZY|jMT4-1+@=}`3;jY)Ga4C1!U61vJ zu}n7;x2eObB!`$~rnPDPTs-H8ZgQL-^2|YQz{JApr*@8i{b7e29#g&_!Mnu2aVtiY%H) z0Ta69l*ieCSOpOvTBT0G;5d%x2_>#IRH?OQ1c&pVw;W|BGvs17dHmzBsQ4v<1O=GZFD1*hG!8-Vm zMDq;DXtPi|jWygCOIk%hOM=)e2%VWOXy_0mA=DuR5vvv1+{*GkAsi}CRcI+-3W)4( z;IoSYhb*R;WLJ<^=`@tiiW3yBwm{c41ZCG!1a7w5aiU6NsY26O-wJ6i1 zlYIN`l78_8v>`h=`07``{+xwso$A|v&&>1<%s$%UaEOoVPEC91;qS(%n%Rdc+9wIU&#Z^uD)r9yIQe-}9f@c6TiB zxxa28d@-K;P`n}6d*uoDIlc7wz}B|f-lzH}ttUpm*9|04&m%8S*e8?o?Hj6BT{`g1 z@Wkmgx{4pJ_gbDmR8l+}tFEs3wEMgGk^S2b8qUuB-WE&dDY)J4z@E8@L zLK*EKS{0Q777sj7TZ92TP%O%DiANQ6Mg$`&0zpDI3bub(cV_qd-uJ!Vd%t(h?hIPu zJJRVpCkBHt(r+Q6pjW{DIu544A11YB)5~PaCyWXv)RYM&afVbyMB;#-7LCFcII4L5G@8Mf=VjKTSPV`9k$99wCt+GHUtt0om4q28 z2mk~0GCW$da2<&UuUn$T*2Q2V71L`zFwZQe4QO!+1gv1aihC!hJVbb16 zm0GMo`QwUmpK)`3iIzxY==#=rysGbLLL7rA?kL#nhfl}cA()gmb zK^d>dc?#S>7)gw-hnh72rgQgoM|MS;jX03h&_zLG5dt%6aUJD{NSO2uSEW&jMHqw% zu}GAIV=56x?ct7bgeo=65yB9N!nnITh^Ytcd?u-Xy1PBep>iEKe&z_8j_xld+O&Vdgvnk5UJ99 zFJte`z;V*iS9=7P%bFRF)1qBnyAE_AO{G{W+~9alE6t!ohLzl@H52 z_3d{h`wz6euwBY&${bt|4_{n=RtmXC{nelS>FvSIg)&DGYYT`Iz| z4T_tTrI>Z~`UCMz3DSK^vXuekP?y3SqrVST?5bN)y?uO??_Bs`Ra8xH`JL85SMQSD zE)8{c@5df2EU9nr>#C^;EL-SeFm~iPQz4C_M)bt+`C+H2lAX`U8`*a@n#0vw;_6yk zW3j(p~u)5xV06x(Z>vn^m(Yxl!P`(K{xFwUGF9+q6#P`k}E zDT!s=QVtGLM^x`kF8^UNV0_b%+?%IXu~xrmb^85K?S}dL)}$A`*mv@qoSyY@>67-1 z;8(J}y02BPsqlAx`ZBzV6PKDFV|kcRR9t+uvvI>X8}oSjnw=*`btbwK*P4Sn7}us) zI!dv$I$-bsYbTn=u1}q)i5MZ`xTU^XkeL*cHW3c=uSL4{u-2}0@rW?b zooYIk9^d`!q<`+zvp$s%7G}Dz0>7PF{^;%75)E%O0<| zT+9z{DacOPF|5tH`axUEw1QdE?Bad3_iMfK!Y{O}Us_UZLl-%`sP24dd%Vc+e9PQn z?SU8b6N-|P-xe0~tKD*ay0&!6cl|Z*H&b_vje-n%eM5uSgyagZK|>h_$=r}Bhlj7W P|H%A&mLLV*5lR05kBk78 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/turbine_valve.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/turbine_valve.png new file mode 100644 index 0000000000000000000000000000000000000000..09d1ae1a81b8fffeb18530809bc8ed6e5173f92c GIT binary patch literal 1455 zcmaJ>drT8|96!J~VY0F56kO)ck|h{v??GSJQR}tW3T~}fK^t_PNAK5imb>fj4%;HS z#RPoBWa`)^*(1gw%n*zVvQ6<7H5%roFo@gKIVWxq--hX4sQVSE+aJtJ?)SRy=ll75 zAHQ2);+dP7F)af@kj&yD#tY}H#5*Asj+-`D8sU_qI(_OwDX2zS86Y$#RRFYDU_-zQ zST6oX7brxKG@dW@sXq6smVhMa*o2KPCPW|_K?-fL2pb3k6|DdvUbJd%b{^88JZIG` zHn?$j!~rV#q8b@2tnrivYQh1E)7WOCg)s|sAOMv`V?vdvSYlSqh+hj_Cyp@aGK8Km8}&(Sv8br5 z7ywCb9&(Rj>BnL%4jHhjB$rB3Rk908DkW7?Dy0bOaG-gMd6AQ%%FINC9tO++nO^}o zmn;eBNQy1|81%SN&lnv9#So+&O4n12%fL_s?Q#)Rf!z{8cLr*mT%bi!_qW9^Z4cbj&D7}gs^r%Zr@A4J#;LuUA@{w zuW9aE-b!`8vpRiJZ$sHqPsY8J$^NtDJ6rm@c6-L}DBr|pA6}C0J(V-qbnoYelj_Iw z_CELv)L$I_=3G>pQ`flj*tnNh)gm|N4);ua+IH|w$L;n3?EZaf>8?dZ$92~RUs2X5 zX_DxuyY&5w$LE;0ZY75&>?vJ|#-2a%Ow)}e{)08vk4~%4Hq8HeTzmY=^mUCF2d)k7 z_xTS#xOF>X-X>&Yb2>7rQB(7{fd>tFhr3=nif%voOUAnREHY*JHrv!@|8vWN7iV?9 zW!DnfLPK><_QThwlvb2HvlIq3^`@E3bF_G3CtNTepT{h5Kfm+4MJ$+rZ&Q)bynMSdHwtrZ6X7~Hv_r2eHzjw{9jfw~z z?l#_y!C(wmguyC$1?;b@BmK3F>)cB(UX(1JnoA~921JK5#2A@?0}3^=1Xtk*mXUf5 z4`eW$2qGq)idTk^f|tT1%rDjKC117D1D73P`}05Sk!n*SSh2Kwv@4IKGmj z)JpLrA}mvf&&`a8K{Jz4A;t^|1_F&D+JG9T5WuKT(db3SAm)3!B6@E>2ARNn6)HK1 z`GHitG76BAIvn7$XR=TTf&hOZ8{!N6xcqMbE(hX+93cpCSR6row{ zr3g|3*exOnWEvI3q?vvQL9JCPKN{BP`x8Z{3^XEI5Mpycwb~xndu=_X!vCf5No{>h zh871^xSmYYp>#bGy$8T_?mq9xu1K>HMd}E;C`bxSqG@VeLn+`OCVj)k2uvhIAw+;C zAS@ikgsjAwJd`EC61gk^7vdmXoX6v!i34^%g%|L-0!R$WWOA4bK{CG3j|WM_d`Qga z@cBZRJAhSa^c12&@d4ii?Ykcfe-TrZ2bulEFGSCH4NhC$;lSnNfl>#&32n|LW z^gi|qeFzxFbwoOj$#tX}c%Nbs@d@{0p@b)p%cU^H71PvtVvbZI@E7>e0?$v*pULdU zVxLG`KNkL9EJ%|9?fvneei=BTo6x@f*!{HdaeizCQlqvipa}Oe)QeG{3X> z*X}wp%eMzDS*$O=JG-Q_-epwx$dg$&z8rPF@^qAHY)cE*BkY!2)Vntg!E&1jN z-QehHmv=3y?5psE%$&{n!$$uK$1?6kgsK!-$8#0IlipIk>rSeR_D|tW>GN{VaaecZ zOlMzDmDBE;HwS*KtuE_{hC&uRe)5BS@7ZIUJ<=bQ>^kUs=w|rr)h;#nmM$GTB;Pw% zzC57P(X}uO&GlP*{Q4VX^|u~I=Txm|visB(kF-54&%WY)AGR8sb7K=i=J8NVzt|6JP@22}WXn%vKxJGb!YyxsVA=Ruy? vP+n1FP?wl+fM+ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/turbine_vent.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/turbine_vent.png new file mode 100644 index 0000000000000000000000000000000000000000..664a34cc94ae42d796d1861cb5f34aaf0b53d9bb GIT binary patch literal 1454 zcmaJ>drT8|96xXmAux0=6}NF5Iv-nmcWtljU0PV_6{%YlOD9B~+qHM4C%wn+jkw%U*xOtUmsu~sMrwFskdkb{-{9PAdD63)vp zZ28;Yb2bQ?!t=gjt=RJ#6_5ly6T|4Ef(+OYWXp-lOrVt0U_V#Fi*{t7`3wT{tQ{#L zJeWszav?syLg5N4miPh{r2&#fa! z+^J$u0qm3%4kq+wT>!^%*h1=Y!fG@SFT(~5Cs2$;aZHEd6pm2_44!xpU`=6zl$Xw% zumyH@B&2CFg`$y2L?1EgC8Y$#Ns>e{18Okn079phiy9NviE36{f#%eJ!pj;jiEvDj z@k?cz9RZ$>hakuv&jVpmok$c&85(6|6xU;@AjIMtL#vvX``3+0(WJM5?q{YAzah=Kd77J#@%mnVrqYXIjBCJ5mX|)oh)9JF%E?1oE7FCTA16wq;7sM(w9x%-*{5u?*r$_=k zmST#Z#5`s;(Pk%3(zqcPxNaipJc1^1M_wLI8cn%IWP;01lC}x1t(EeF!^R6aSX zNO8bcRXnG9XvN}`%wIY?54Al49pIDi1qU16XjC^e^1C+GR#gde{z86xAtR|Pt?tgA z#-7bhbq#BZHV^jq>mJQ|uQnLEapB$eW7iW*R_Ko>>Ya@p<`)yk~hNg9~hthv?T&%jj zEH}T;7(M;!{=Ne{TD#@TM{ln^yMO0!!I4XH+1x8v`v$L6rryuqxphtY&4jJDdWJ5% zxnOS5seMg54=!G?3OTkiZI3zk{($%AvLA0enRw@5-Ekpv?jPQc{-MU+`lj5r!rl8v zM*lXYwEB}cX%W% zV-|ZN>_|EO%I2lds0>r+S>2g)v#EwEiT6 UWi8!!G4=;_yOz*La^KqU4>>d%3jhEB literal 0 HcmV?d00001