From 9cbc96a88ebef1fd3d5cf436b32fce6b1e4c3cc2 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 22 Jan 2016 19:36:39 -0500 Subject: [PATCH] Textures for turbine components! Still need to texture turbine structure blocks. --- .../render/block/CTMRenderingHandler.java | 42 +++++----- .../client/render/block/RenderBlocksCTM.java | 1 - .../java/mekanism/common/base/IBlockCTM.java | 3 +- .../mekanism/common/block/BlockBasic.java | 6 ++ .../mekanism/common/block/BlockMachine.java | 79 ++++++++++++++++-- .../client/BlockRenderingHandler.java | 13 +-- .../common/block/BlockGenerator.java | 50 ++++++++++- .../generators/common/block/BlockReactor.java | 26 ++++-- .../TileEntityElectromagneticCoil.java | 7 +- .../turbine/TileEntityPressureDisperser.java | 7 +- .../resources/assets/mekanism/lang/en_US.lang | 1 + .../textures/blocks/PressureDisperser.png | Bin 0 -> 1774 bytes .../textures/blocks/RotationalComplexSide.png | Bin 0 -> 1327 bytes .../textures/blocks/RotationalComplexTop.png | Bin 0 -> 1251 bytes .../blocks/ctm/ElectromagneticCoil-ctm.png | Bin 0 -> 1584 bytes .../blocks/ctm/ElectromagneticCoil.png | Bin 0 -> 1281 bytes 16 files changed, 177 insertions(+), 58 deletions(-) create mode 100644 src/main/resources/assets/mekanism/textures/blocks/PressureDisperser.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/RotationalComplexSide.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/RotationalComplexTop.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/ElectromagneticCoil-ctm.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/ElectromagneticCoil.png diff --git a/src/main/java/mekanism/client/render/block/CTMRenderingHandler.java b/src/main/java/mekanism/client/render/block/CTMRenderingHandler.java index 431b2f901..a2ff40b87 100644 --- a/src/main/java/mekanism/client/render/block/CTMRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/CTMRenderingHandler.java @@ -32,6 +32,11 @@ public class CTMRenderingHandler implements ISimpleBlockRenderingHandler public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks rendererOld) { int meta = world.getBlockMetadata(x, y, z); + + if(block instanceof IBlockCTM && !((IBlockCTM)block).shouldRenderBlock(world, x, y, z, meta)) + { + return false; + } CTMData blockCTM = ((IBlockCTM)block).getCTMData(world, x, y, z, meta); @@ -57,32 +62,27 @@ public class CTMRenderingHandler implements ISimpleBlockRenderingHandler if(MachineType.get(block, meta) != null) { - if(!MachineType.get(block, meta).hasModel) + TileEntity tile = world.getTileEntity(x, y, z); + + int prevRotateTop = rendererOld.uvRotateTop; + int prevRotateBottom = rendererOld.uvRotateBottom; + + if(tile instanceof TileEntityBasicBlock) { - TileEntity tile = world.getTileEntity(x, y, z); - - int prevRotateTop = rendererOld.uvRotateTop; - int prevRotateBottom = rendererOld.uvRotateBottom; - - if(tile instanceof TileEntityBasicBlock) + if(((TileEntityBasicBlock)tile).facing >= 2) { - if(((TileEntityBasicBlock)tile).facing >= 2) - { - rendererOld.uvRotateTop = MekanismRenderer.directionMap[((TileEntityBasicBlock)tile).facing-2]; - rendererOld.uvRotateBottom = MekanismRenderer.directionMap[((TileEntityBasicBlock)tile).facing-2]; - } + rendererOld.uvRotateTop = MekanismRenderer.directionMap[((TileEntityBasicBlock)tile).facing-2]; + rendererOld.uvRotateBottom = MekanismRenderer.directionMap[((TileEntityBasicBlock)tile).facing-2]; } - - rendererOld.renderStandardBlock(block, x, y, z); - rendererOld.setRenderBoundsFromBlock(block); - - rendererOld.uvRotateTop = prevRotateTop; - rendererOld.uvRotateBottom = prevRotateBottom; - - return true; } - return false; + rendererOld.renderStandardBlock(block, x, y, z); + rendererOld.setRenderBoundsFromBlock(block); + + rendererOld.uvRotateTop = prevRotateTop; + rendererOld.uvRotateBottom = prevRotateBottom; + + return true; } return rendererOld.renderStandardBlock(block, x, y, z); diff --git a/src/main/java/mekanism/client/render/block/RenderBlocksCTM.java b/src/main/java/mekanism/client/render/block/RenderBlocksCTM.java index 6a319c14d..0676e396e 100644 --- a/src/main/java/mekanism/client/render/block/RenderBlocksCTM.java +++ b/src/main/java/mekanism/client/render/block/RenderBlocksCTM.java @@ -15,7 +15,6 @@ import net.minecraft.util.IIcon; */ public class RenderBlocksCTM extends RenderBlocks { - RenderBlocksCTM() { super(); diff --git a/src/main/java/mekanism/common/base/IBlockCTM.java b/src/main/java/mekanism/common/base/IBlockCTM.java index 36a54a45c..c00d69f55 100644 --- a/src/main/java/mekanism/common/base/IBlockCTM.java +++ b/src/main/java/mekanism/common/base/IBlockCTM.java @@ -1,10 +1,11 @@ package mekanism.common.base; import mekanism.common.CTMData; - import net.minecraft.world.IBlockAccess; public interface IBlockCTM { public CTMData getCTMData(IBlockAccess world, int x, int y, int z, int meta); + + public boolean shouldRenderBlock(IBlockAccess world, int x, int y, int z, int meta); } diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 9f93d6d95..dc07463c8 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -1069,6 +1069,12 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon return ctms[meta][0]; } + + @Override + public boolean shouldRenderBlock(IBlockAccess world, int x, int y, int z, int meta) + { + return true; + } public static enum BasicBlock { diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index e1c49a94d..04bfd5610 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -1,8 +1,12 @@ package mekanism.common.block; -import buildcraft.api.tools.IToolWrench; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Random; + import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.client; @@ -19,15 +23,63 @@ import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.Tier.BaseTier; -import mekanism.common.base.*; +import mekanism.common.base.IActiveState; +import mekanism.common.base.IBlockCTM; +import mekanism.common.base.IBoundingBlock; +import mekanism.common.base.IElectricChest; +import mekanism.common.base.IFactory; import mekanism.common.base.IFactory.RecipeType; +import mekanism.common.base.IRedstoneControl; +import mekanism.common.base.ISideConfiguration; +import mekanism.common.base.ISpecialBounds; +import mekanism.common.base.ISustainedData; +import mekanism.common.base.ISustainedInventory; +import mekanism.common.base.ISustainedTank; +import mekanism.common.base.IUpgradeTile; import mekanism.common.item.ItemBlockMachine; import mekanism.common.network.PacketElectricChest.ElectricChestMessage; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage; import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.recipe.ShapedMekanismRecipe; -import mekanism.common.tile.*; +import mekanism.common.tile.TileEntityAdvancedFactory; +import mekanism.common.tile.TileEntityAmbientAccumulator; +import mekanism.common.tile.TileEntityBasicBlock; +import mekanism.common.tile.TileEntityChargepad; +import mekanism.common.tile.TileEntityChemicalCrystallizer; +import mekanism.common.tile.TileEntityChemicalDissolutionChamber; +import mekanism.common.tile.TileEntityChemicalInfuser; +import mekanism.common.tile.TileEntityChemicalInjectionChamber; +import mekanism.common.tile.TileEntityChemicalOxidizer; +import mekanism.common.tile.TileEntityChemicalWasher; +import mekanism.common.tile.TileEntityCombiner; +import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.tile.TileEntityCrusher; +import mekanism.common.tile.TileEntityDigitalMiner; +import mekanism.common.tile.TileEntityElectricChest; +import mekanism.common.tile.TileEntityElectricPump; +import mekanism.common.tile.TileEntityElectrolyticSeparator; +import mekanism.common.tile.TileEntityEliteFactory; +import mekanism.common.tile.TileEntityEnergizedSmelter; +import mekanism.common.tile.TileEntityEnrichmentChamber; +import mekanism.common.tile.TileEntityEntangledBlock; +import mekanism.common.tile.TileEntityFactory; +import mekanism.common.tile.TileEntityFluidicPlenisher; +import mekanism.common.tile.TileEntityLaser; +import mekanism.common.tile.TileEntityLaserAmplifier; +import mekanism.common.tile.TileEntityLaserTractorBeam; +import mekanism.common.tile.TileEntityLogisticalSorter; +import mekanism.common.tile.TileEntityMetallurgicInfuser; +import mekanism.common.tile.TileEntityOredictionificator; +import mekanism.common.tile.TileEntityOsmiumCompressor; +import mekanism.common.tile.TileEntityPRC; +import mekanism.common.tile.TileEntityPortableTank; +import mekanism.common.tile.TileEntityPrecisionSawmill; +import mekanism.common.tile.TileEntityPurificationChamber; +import mekanism.common.tile.TileEntityRotaryCondensentrator; +import mekanism.common.tile.TileEntitySeismicVibrator; +import mekanism.common.tile.TileEntitySolarNeutronActivator; +import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; @@ -45,7 +97,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -53,8 +109,9 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; - -import java.util.*; +import buildcraft.api.tools.IToolWrench; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * Block class for handling multiple machine block IDs. @@ -1355,4 +1412,10 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo return ctms[meta][0]; } + + @Override + public boolean shouldRenderBlock(IBlockAccess world, int x, int y, int z, int meta) + { + return !MachineType.get(this, meta).hasModel; + } } diff --git a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java index dca3cad48..8e7bb173b 100644 --- a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java +++ b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java @@ -100,18 +100,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - if(block == GeneratorsBlocks.Generator) - { - int metadata = world.getBlockMetadata(x, y, z); - - if(GeneratorType.getFromMetadata(metadata) == null || !GeneratorType.getFromMetadata(metadata).hasModel) - { - renderer.renderStandardBlock(block, x, y, z); - renderer.setRenderBoundsFromBlock(block); - return true; - } - } - + //Handled by CTMRenderingHandler return false; } diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 19bdf55fb..53831ce96 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -1,13 +1,16 @@ package mekanism.generators.common.block; +import java.util.Arrays; import java.util.List; import java.util.Random; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; +import mekanism.common.CTMData; import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; +import mekanism.common.base.IBlockCTM; import mekanism.common.base.IBoundingBlock; import mekanism.common.base.ISpecialBounds; import mekanism.common.base.ISustainedData; @@ -27,6 +30,8 @@ import mekanism.generators.common.tile.TileEntityGasGenerator; import mekanism.generators.common.tile.TileEntityHeatGenerator; import mekanism.generators.common.tile.TileEntitySolarGenerator; import mekanism.generators.common.tile.TileEntityWindGenerator; +import mekanism.generators.common.tile.turbine.TileEntityElectromagneticCoil; +import mekanism.generators.common.tile.turbine.TileEntityPressureDisperser; import mekanism.generators.common.tile.turbine.TileEntityRotationalComplex; import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; import net.minecraft.block.Block; @@ -69,9 +74,12 @@ import cpw.mods.fml.relauncher.SideOnly; * @author AidanBrady * */ -public class BlockGenerator extends BlockContainer implements ISpecialBounds +public class BlockGenerator extends BlockContainer implements ISpecialBounds, IBlockCTM { public IIcon[][] icons = new IIcon[16][16]; + + public CTMData[] ctms = new CTMData[16]; + public IIcon BASE_ICON; public Random machineRand = new Random(); @@ -89,8 +97,26 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds public void registerBlockIcons(IIconRegister register) { BASE_ICON = register.registerIcon("mekanism:SteelCasing"); + + ctms[10] = new CTMData("ctm/ElectromagneticCoil", this, Arrays.asList(10)).registerIcons(register); + icons[7][0] = register.registerIcon("mekanism:TurbineRod"); - icons[8][0] = register.registerIcon("mekanism:TurbineRod"); + icons[8][0] = register.registerIcon("mekanism:RotationalComplexSide"); + icons[8][1] = register.registerIcon("mekanism:RotationalComplexTop"); + icons[9][0] = register.registerIcon("mekanism:PressureDisperser"); + icons[10][0] = ctms[10].mainTextureData.icon; + } + + @Override + public CTMData getCTMData(IBlockAccess world, int x, int y, int z, int meta) + { + return ctms[meta]; + } + + @Override + public boolean shouldRenderBlock(IBlockAccess world, int x, int y, int z, int meta) + { + return !GeneratorType.getFromMetadata(meta).hasModel; } @Override @@ -102,6 +128,20 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds return icons[meta][0]; } else if(meta == GeneratorType.ROTATIONAL_COMPLEX.meta) + { + if(side != 0 && side != 1) + { + return icons[meta][0]; + } + else { + return icons[meta][1]; + } + } + else if(meta == GeneratorType.PRESSURE_DISPERSER.meta) + { + return icons[meta][0]; + } + else if(meta == GeneratorType.ELECTROMAGNETIC_COIL.meta) { return icons[meta][0]; } @@ -517,7 +557,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds @Override public int getRenderType() { - return MekanismGenerators.proxy.GENERATOR_RENDER_ID; + return Mekanism.proxy.CTM_RENDER_ID; } /*This method is not used, metadata manipulation is required to create a Tile Entity.*/ @@ -665,7 +705,9 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds ADVANCED_SOLAR_GENERATOR(5, "AdvancedSolarGenerator", 1, 200000, TileEntityAdvancedSolarGenerator.class, true), WIND_GENERATOR(6, "WindGenerator", 5, 200000, TileEntityWindGenerator.class, true), TURBINE_ROTOR(7, "TurbineRotor", -1, -1, TileEntityTurbineRotor.class, false), - ROTATIONAL_COMPLEX(8, "RotationalComplex", -1, -1, TileEntityRotationalComplex.class, false); + ROTATIONAL_COMPLEX(8, "RotationalComplex", -1, -1, TileEntityRotationalComplex.class, false), + PRESSURE_DISPERSER(9, "PressureDisperser", -1, -1, TileEntityPressureDisperser.class, false), + ELECTROMAGNETIC_COIL(10, "ElectromagneticCoil", -1, -1, TileEntityElectromagneticCoil.class, false); public int meta; public String name; diff --git a/src/main/java/mekanism/generators/common/block/BlockReactor.java b/src/main/java/mekanism/generators/common/block/BlockReactor.java index 1c6434fc3..0f351b75c 100644 --- a/src/main/java/mekanism/generators/common/block/BlockReactor.java +++ b/src/main/java/mekanism/generators/common/block/BlockReactor.java @@ -1,8 +1,8 @@ package mekanism.generators.common.block; -import buildcraft.api.tools.IToolWrench; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.Arrays; +import java.util.List; + import mekanism.api.Coord4D; import mekanism.common.CTMData; import mekanism.common.ItemAttacher; @@ -14,7 +14,13 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.GeneratorsBlocks; import mekanism.generators.common.MekanismGenerators; -import mekanism.generators.common.tile.reactor.*; +import mekanism.generators.common.tile.reactor.TileEntityReactorController; +import mekanism.generators.common.tile.reactor.TileEntityReactorFrame; +import mekanism.generators.common.tile.reactor.TileEntityReactorGlass; +import mekanism.generators.common.tile.reactor.TileEntityReactorLaserFocusMatrix; +import mekanism.generators.common.tile.reactor.TileEntityReactorLogicAdapter; +import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture; +import mekanism.generators.common.tile.reactor.TileEntityReactorPort; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -29,9 +35,9 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; - -import java.util.Arrays; -import java.util.List; +import buildcraft.api.tools.IToolWrench; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockReactor extends BlockContainer implements IBlockCTM { @@ -304,6 +310,12 @@ public class BlockReactor extends BlockContainer implements IBlockCTM return ctms[meta][0]; } + + @Override + public boolean shouldRenderBlock(IBlockAccess world, int x, int y, int z, int meta) + { + return true; + } @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityElectromagneticCoil.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityElectromagneticCoil.java index e22b48ffb..54de2ed9b 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityElectromagneticCoil.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityElectromagneticCoil.java @@ -1,12 +1,15 @@ package mekanism.generators.common.tile.turbine; -import net.minecraft.tileentity.TileEntity; +import mekanism.common.tile.TileEntityBasicBlock; -public class TileEntityElectromagneticCoil extends TileEntity +public class TileEntityElectromagneticCoil extends TileEntityBasicBlock { @Override public boolean canUpdate() { return false; } + + @Override + public void onUpdate() {} } diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityPressureDisperser.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityPressureDisperser.java index 29cf3003f..4f38a86b5 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityPressureDisperser.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityPressureDisperser.java @@ -1,12 +1,15 @@ package mekanism.generators.common.tile.turbine; -import net.minecraft.tileentity.TileEntity; +import mekanism.common.tile.TileEntityBasicBlock; -public class TileEntityPressureDisperser extends TileEntity +public class TileEntityPressureDisperser extends TileEntityBasicBlock { @Override public boolean canUpdate() { return false; } + + @Override + public void onUpdate() {} } diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 23344eaa4..475c2c82f 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -312,6 +312,7 @@ fluid.lithium=Liquid Lithium fluid.deuterium=Liquid Deuterium fluid.tritium=Liquid Tritium fluid.fusionFuelDT=Liquid D-T Fuel +fluid.steam=Steam //OreGas names oregas.iron=Iron Ore diff --git a/src/main/resources/assets/mekanism/textures/blocks/PressureDisperser.png b/src/main/resources/assets/mekanism/textures/blocks/PressureDisperser.png new file mode 100644 index 0000000000000000000000000000000000000000..52cbb419068d8b5c251dd062f680efd7d741a5a6 GIT binary patch literal 1774 zcmV4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%S zoJmAMR9Fe^S4*!cK@je9???#oTzEu0R<;&)7VN~ox_`^Y8bO2&5@A6i5#nc5ySl1te3Z-O&p;p`-qno#e*dny1vdWYZL?n|Hsl42$7A7g zx#X^=yhkFDn_ZI!Hk*xDuh$}z$%y0eNOHAWS<1;|BJfi=Dwb{BX1>1sO{G%*91aJ; z`Ft+&`MfxtP9hqOlJt7L$5#48jECQc%eFkzXq+wFwM;~^frZSnwm zd%d2(f~wUj$>DHF%8=-nF%4)qk8Ci9Ou?On)I!%CGph3d@>=6}1N9Cwk#{mybn+50dSvZ|eivDmoObg;j4hDk) z&{cvQL&CgE5AIx6$7lylF#!cF<^C` zJUJGHbi|^tb2KXs#}O%AA9o%&91imM!}nY+N8`gM#*wVk8$Vs{+QJxC_GH zC`Rxgny!G^79*q(h|}qmjI>%U!nImWi_xia+U+)RI4xBhWa#?%aSY%*IR@Bk90UJ9 zNZ?(*uJO?!$AoPR*cB38VNp3M)^Ruvv{}G|Ealyxk1^MSmwb?PyIoojc84rsj83)q zs947#W0%LB2YBFF64!A$ohI{$57R%RY&QF>c`fbU6(dW{Ck>DX-uVyt3-kf<%w^L0 QiU0rr07*qoM6N<$g4CsG*8l(j literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexSide.png b/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexSide.png new file mode 100644 index 0000000000000000000000000000000000000000..61b18bac1506b3e82ec967b7ac1152910b9d9b86 GIT binary patch literal 1327 zcmV+~14Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q z-AP12R9Fe^moW~*APhyFiUo-!XXp*OaRd&~8+7FoEWKS9=H3E{F_qiebre=`2eKGh zQU3cMCn8G-VO!S~v@TO?)zStueo|Ba3QvHUfO-PPdk@xHwU@z^Qs8#IGr;-sSw0`! zf?mCp(w}_?$m!2Ju=`%U<`ByGNw`<92|%JFDg$W5j|Lfl-1dr^o{v>(9025vBi3&K zt@zR4E&&-0x$oWE0g&j(+5{N6B@ECzYD~4I!2ly;ms(4Vag&XaYv&x8oU___U>?hH lyVZwq0;nfoa1b>AkYC0PPC-TH{>=aY002ovPDHLkV1hx3hk*b9 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexTop.png b/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexTop.png new file mode 100644 index 0000000000000000000000000000000000000000..5b0da119347f400ee662bb5dc00e6947367afff5 GIT binary patch literal 1251 zcmV<91RVQ`P)4Tx062|}Rb6NtRTMtEb7vzY&QokOg>Hg1+lHrgWS zWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6wD^Ni=!>T7nL9I? zX}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8rehoBb*p;u8ID_yBf z0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J`jH<$>RKN5V(7Oq zK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYvwjAKwmYb0gKL(K8 z-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z>!FI&AHCpoWI|RUq zx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVTrI(b06~u#xf1yS} z_UGdMvD``!0~u->P=lA4?YN`hilQ|3tHka)7T{2CGqw zjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^7T9R1gAN8V6s;5) zieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2bW$~+pTw@bIek?Zv zKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L_AC5qq~L$#SMj%U z$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6=b6>{xYV#Ue-+LB$ z7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re4r3qYr~6#KE>;1F z`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+5K}u-6REM(K@W$s zrgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5h^QEb$V`rCQ-|7Z zS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX2i^rZ^Mu;6+rb@? zNPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV0id6JRZw95ZvX%Q zkx4{BR9Fe^maz@MAPfYZh=!6)Sc3srf~6RTB^U#VG7(X#$V9RmH&1EHygAH^Bc*hO z5Xfq|Ij5C2t%ILt>aQ>w009sH0doRQ>Vz>y^4@RDT5H=Jmk>8F#-Lg&w-=RC*!W-2 z{0h(j2#8<7n&_M}JJ_1vmAHZ4J1edYVg^6}1V8`;9xK*(xYl~VbvMF67sX`%GA{rC N002ovPDHLkV1hqpT-N{q literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ElectromagneticCoil-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ElectromagneticCoil-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..47ce61b383073097e62ddb8b9d3af367ad506f49 GIT binary patch literal 1584 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 literal 0 HcmV?d00001