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 000000000..173bbd33a Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/electromagnetic_coil-ctm.png differ 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 000000000..4bbdd474c Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/electromagnetic_coil.png differ 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 000000000..ae69bdd3b Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/laser_focus_matrix-ctm.png differ diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/laser_focus_matrix.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/laser_focus_matrix.png new file mode 100644 index 000000000..d999e8f6e Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/laser_focus_matrix.png differ 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 000000000..2b0a07139 Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_controller_off-ctm.png differ diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_controller_off.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_controller_off.png new file mode 100644 index 000000000..853e63053 Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_controller_off.png differ 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 000000000..06e6ac08d Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_controller_on-ctm.png differ diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_controller_on.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_controller_on.png new file mode 100644 index 000000000..955a0feac Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_controller_on.png differ 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 000000000..b20bf91c0 Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_frame-ctm.png differ diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_frame.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_frame.png new file mode 100644 index 000000000..e297510bc Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_frame.png differ 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 000000000..1c15e5fe6 Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_glass-ctm.png differ 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 000000000..41cbacb46 Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_glass.png differ diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_logic_adapter-ctm.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_logic_adapter-ctm.png new file mode 100644 index 000000000..967b527f7 Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_logic_adapter-ctm.png differ diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_logic_adapter.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_logic_adapter.png new file mode 100644 index 000000000..1ed63f580 Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_logic_adapter.png differ 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 000000000..db6450a23 Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_neutron_capture-ctm.png differ 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 000000000..5236dc6fe Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_neutron_capture.png differ diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_port-ctm.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_port-ctm.png new file mode 100644 index 000000000..128faeb3e Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_port-ctm.png differ 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 000000000..373b8c12a Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/reactor_port.png differ diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/turbine_casing-ctm.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/turbine_casing-ctm.png new file mode 100644 index 000000000..f9da48d96 Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/turbine_casing-ctm.png differ 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 000000000..06215c275 Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/turbine_casing.png differ diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/turbine_valve-ctm.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/turbine_valve-ctm.png new file mode 100644 index 000000000..406b2a822 Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/turbine_valve-ctm.png differ 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 000000000..09d1ae1a8 Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/turbine_valve.png differ diff --git a/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/turbine_vent-ctm.png b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/turbine_vent-ctm.png new file mode 100644 index 000000000..241d8645a Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/turbine_vent-ctm.png differ 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 000000000..664a34cc9 Binary files /dev/null and b/src/main/resources/assets/mekanismgenerators/textures/blocks/ctm/turbine_vent.png differ