diff --git a/src/main/java/mekanism/api/ISalinationSolar.java b/src/main/java/mekanism/api/IEvaporationSolar.java similarity index 84% rename from src/main/java/mekanism/api/ISalinationSolar.java rename to src/main/java/mekanism/api/IEvaporationSolar.java index 20e3e1ecf..fd5d2cf7d 100644 --- a/src/main/java/mekanism/api/ISalinationSolar.java +++ b/src/main/java/mekanism/api/IEvaporationSolar.java @@ -5,7 +5,7 @@ package mekanism.api; * @author aidancbrady * */ -public interface ISalinationSolar +public interface IEvaporationSolar { public boolean seesSun(); } diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index dae1fc598..3b0522bc7 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -17,7 +17,6 @@ public class MekanismConfig public static boolean voiceServerEnabled = true; public static boolean cardboardSpawners = true; public static boolean enableWorldRegeneration = true; - public static boolean creativeOverrideElectricChest = true; public static boolean spawnBabySkeletons = true; public static int obsidianTNTBlastRadius = 12; public static int osmiumPerChunk = 12; @@ -64,6 +63,7 @@ public class MekanismConfig public static double energyPerHeat = 1000; public static double maxEnergyPerSteam = 100; public static double superheatingHeatTransfer = 10000; + public static double heatPerFuelTick = 1; } public static class client diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index eb9c2a475..9e264ffb9 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -22,7 +22,6 @@ import mekanism.client.gui.GuiCrusher; import mekanism.client.gui.GuiDictionary; import mekanism.client.gui.GuiDigitalMiner; import mekanism.client.gui.GuiDynamicTank; -import mekanism.client.gui.GuiElectricChest; import mekanism.client.gui.GuiElectricPump; import mekanism.client.gui.GuiElectrolyticSeparator; import mekanism.client.gui.GuiEnergizedSmelter; @@ -32,6 +31,7 @@ import mekanism.client.gui.GuiFactory; import mekanism.client.gui.GuiFluidTank; import mekanism.client.gui.GuiFluidicPlenisher; import mekanism.client.gui.GuiFormulaicAssemblicator; +import mekanism.client.gui.GuiFuelwoodHeater; import mekanism.client.gui.GuiGasTank; import mekanism.client.gui.GuiInductionMatrix; import mekanism.client.gui.GuiLaserAmplifier; @@ -41,8 +41,7 @@ import mekanism.client.gui.GuiMetallurgicInfuser; import mekanism.client.gui.GuiOredictionificator; import mekanism.client.gui.GuiOsmiumCompressor; import mekanism.client.gui.GuiPRC; -import mekanism.client.gui.GuiPasswordEnter; -import mekanism.client.gui.GuiPasswordModify; +import mekanism.client.gui.GuiPersonalChest; import mekanism.client.gui.GuiPrecisionSawmill; import mekanism.client.gui.GuiPurificationChamber; import mekanism.client.gui.GuiQuantumEntangloporter; @@ -53,6 +52,7 @@ import mekanism.client.gui.GuiRobitMain; import mekanism.client.gui.GuiRobitRepair; import mekanism.client.gui.GuiRobitSmelting; import mekanism.client.gui.GuiRotaryCondensentrator; +import mekanism.client.gui.GuiSecurityDesk; import mekanism.client.gui.GuiSeismicReader; import mekanism.client.gui.GuiSeismicVibrator; import mekanism.client.gui.GuiSideConfiguration; @@ -78,7 +78,6 @@ import mekanism.client.render.tileentity.RenderChemicalWasher; import mekanism.client.render.tileentity.RenderConfigurableMachine; import mekanism.client.render.tileentity.RenderDigitalMiner; import mekanism.client.render.tileentity.RenderDynamicTank; -import mekanism.client.render.tileentity.RenderElectricChest; import mekanism.client.render.tileentity.RenderElectricPump; import mekanism.client.render.tileentity.RenderElectrolyticSeparator; import mekanism.client.render.tileentity.RenderEnergyCube; @@ -88,8 +87,12 @@ import mekanism.client.render.tileentity.RenderGasTank; import mekanism.client.render.tileentity.RenderLaserAmplifier; import mekanism.client.render.tileentity.RenderLaserTractorBeam; import mekanism.client.render.tileentity.RenderLogisticalSorter; +import mekanism.client.render.tileentity.RenderPersonalChest; import mekanism.client.render.tileentity.RenderPressurizedReactionChamber; +import mekanism.client.render.tileentity.RenderQuantumEntangloporter; +import mekanism.client.render.tileentity.RenderResistiveHeater; import mekanism.client.render.tileentity.RenderThermalEvaporationController; +import mekanism.client.render.tileentity.RenderSecurityDesk; import mekanism.client.render.tileentity.RenderSeismicVibrator; import mekanism.client.render.tileentity.RenderTeleporter; import mekanism.client.render.tileentity.RenderThermalEvaporationController; @@ -98,7 +101,6 @@ import mekanism.common.CommonProxy; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; -import mekanism.common.base.IElectricChest; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; @@ -107,7 +109,7 @@ import mekanism.common.entity.EntityBalloon; import mekanism.common.entity.EntityFlame; import mekanism.common.entity.EntityObsidianTNT; import mekanism.common.entity.EntityRobit; -import mekanism.common.inventory.InventoryElectricChest; +import mekanism.common.inventory.InventoryPersonalChest; import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.item.ItemSeismicReader; import mekanism.common.multiblock.MultiblockManager; @@ -130,7 +132,6 @@ import mekanism.common.tile.TileEntityCrusher; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.tile.TileEntityDynamicValve; -import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.tile.TileEntityElectricMachine; import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.tile.TileEntityElectrolyticSeparator; @@ -142,6 +143,7 @@ import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.tile.TileEntityFormulaicAssemblicator; +import mekanism.common.tile.TileEntityFuelwoodHeater; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.tile.TileEntityInductionCasing; import mekanism.common.tile.TileEntityInductionCell; @@ -155,11 +157,13 @@ import mekanism.common.tile.TileEntityMultiblock; import mekanism.common.tile.TileEntityOredictionificator; import mekanism.common.tile.TileEntityOsmiumCompressor; import mekanism.common.tile.TileEntityPRC; +import mekanism.common.tile.TileEntityPersonalChest; import mekanism.common.tile.TileEntityPrecisionSawmill; import mekanism.common.tile.TileEntityPurificationChamber; import mekanism.common.tile.TileEntityQuantumEntangloporter; import mekanism.common.tile.TileEntityResistiveHeater; import mekanism.common.tile.TileEntityRotaryCondensentrator; +import mekanism.common.tile.TileEntitySecurityDesk; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.tile.TileEntitySolarNeutronActivator; import mekanism.common.tile.TileEntityStructuralGlass; @@ -233,58 +237,28 @@ public class ClientProxy extends CommonProxy */ @Override - public void openElectricChest(EntityPlayer entityplayer, int id, int windowId, boolean isBlock, BlockPos pos) + public void openPersonalChest(EntityPlayer entityplayer, int id, int windowId, boolean isBlock, BlockPos pos) { - TileEntityElectricChest tileEntity = (TileEntityElectricChest)entityplayer.worldObj.getTileEntity(pos); + TileEntityPersonalChest tileEntity = (TileEntityPersonalChest)entityplayer.worldObj.getTileEntity(pos); if(id == 0) { if(isBlock) { - FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiElectricChest(entityplayer.inventory, tileEntity)); + FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiPersonalChest(entityplayer.inventory, tileEntity)); entityplayer.openContainer.windowId = windowId; } else { ItemStack stack = entityplayer.getCurrentEquippedItem(); - if(stack != null && stack.getItem() instanceof IElectricChest && BlockStateMachine.MachineType.get(stack) == BlockStateMachine.MachineType.ELECTRIC_CHEST) + if(MachineType.get(stack) == MachineType.PERSONAL_CHEST) { - InventoryElectricChest inventory = new InventoryElectricChest(entityplayer); - FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiElectricChest(entityplayer.inventory, inventory)); + InventoryPersonalChest inventory = new InventoryPersonalChest(entityplayer); + FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiPersonalChest(entityplayer.inventory, inventory)); entityplayer.openContainer.windowId = windowId; } } } - else if(id == 1) - { - if(isBlock) - { - FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiPasswordEnter(tileEntity)); - } - else { - ItemStack stack = entityplayer.getCurrentEquippedItem(); - - if(stack != null && stack.getItem() instanceof IElectricChest && BlockStateMachine.MachineType.get(stack) == BlockStateMachine.MachineType.ELECTRIC_CHEST) - { - FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiPasswordEnter(stack)); - } - } - } - else if(id == 2) - { - if(isBlock) - { - FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiPasswordModify(tileEntity)); - } - else { - ItemStack stack = entityplayer.getCurrentEquippedItem(); - - if(stack != null && stack.getItem() instanceof IElectricChest && BlockStateMachine.MachineType.get(stack) == BlockStateMachine.MachineType.ELECTRIC_CHEST) - { - FMLClientHandler.instance().displayGuiScreen(entityplayer, new GuiPasswordModify(stack)); - } - } - } } @Override @@ -304,7 +278,7 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityGasTank.class, "GasTank", new RenderGasTank()); ClientRegistry.registerTileEntity(TileEntityEnergyCube.class, "EnergyCube", new RenderEnergyCube()); ClientRegistry.registerTileEntity(TileEntityElectricPump.class, "ElectricPump", new RenderElectricPump()); - ClientRegistry.registerTileEntity(TileEntityElectricChest.class, "ElectricChest", new RenderElectricChest()); + ClientRegistry.registerTileEntity(TileEntityPersonalChest.class, "ElectricChest", new RenderPersonalChest()); //TODO rename ClientRegistry.registerTileEntity(TileEntityDynamicTank.class, "DynamicTank", new RenderDynamicTank()); ClientRegistry.registerTileEntity(TileEntityDynamicValve.class, "DynamicValve", new RenderDynamicTank()); ClientRegistry.registerTileEntity(TileEntityChargepad.class, "Chargepad", new RenderChargepad()); @@ -337,9 +311,13 @@ public class ClientProxy extends CommonProxy GameRegistry.registerTileEntity(TileEntityInductionProvider.class, "InductionProvider"); GameRegistry.registerTileEntity(TileEntityOredictionificator.class, "Oredictionificator"); GameRegistry.registerTileEntity(TileEntityStructuralGlass.class, "StructuralGlass"); - GameRegistry.registerTileEntity(TileEntityResistiveHeater.class, "ResistiveHeater"); + ClientRegistry.registerTileEntity(TileEntityFormulaicAssemblicator.class, "FormulaicAssemblicator", new RenderConfigurableMachine()); + ClientRegistry.registerTileEntity(TileEntityResistiveHeater.class, "ResistiveHeater", new RenderResistiveHeater()); ClientRegistry.registerTileEntity(TileEntityBoilerCasing.class, "BoilerCasing", new RenderThermoelectricBoiler()); ClientRegistry.registerTileEntity(TileEntityBoilerValve.class, "BoilerValve", new RenderThermoelectricBoiler()); + ClientRegistry.registerTileEntity(TileEntitySecurityDesk.class, "SecurityDesk", new RenderSecurityDesk()); + ClientRegistry.registerTileEntity(TileEntityQuantumEntangloporter.class, "QuantumEntangloporter", new RenderQuantumEntangloporter()); + GameRegistry.registerTileEntity(TileEntityFuelwoodHeater.class, "FuelwoodHeater"); } @Override @@ -532,10 +510,7 @@ public class ClientProxy extends CommonProxy return new GuiElectricPump(player.inventory, (TileEntityElectricPump)tileEntity); case 18: return new GuiDynamicTank(player.inventory, (TileEntityDynamicTank)tileEntity); - case 19: - return new GuiPasswordEnter((TileEntityElectricChest)tileEntity); - case 20: - return new GuiPasswordModify((TileEntityElectricChest)tileEntity); + //EMPTY 19, 20 case 21: EntityRobit robit = (EntityRobit)world.getEntityByID(pos.getX()); @@ -622,6 +597,10 @@ public class ClientProxy extends CommonProxy return new GuiBoilerStats(player.inventory, (TileEntityBoilerCasing)tileEntity); case 56: return new GuiFormulaicAssemblicator(player.inventory, (TileEntityFormulaicAssemblicator)tileEntity); + case 57: + return new GuiSecurityDesk(player.inventory, (TileEntitySecurityDesk)tileEntity); + case 58: + return new GuiFuelwoodHeater(player.inventory, (TileEntityFuelwoodHeater)tileEntity); } return null; diff --git a/src/main/java/mekanism/client/MekanismClient.java b/src/main/java/mekanism/client/MekanismClient.java index eaf251ca9..d40b7fb3e 100644 --- a/src/main/java/mekanism/client/MekanismClient.java +++ b/src/main/java/mekanism/client/MekanismClient.java @@ -6,6 +6,8 @@ import mekanism.api.MekanismConfig.general; import mekanism.client.sound.SoundHandler; import mekanism.client.voice.VoiceClient; import mekanism.common.Mekanism; +import mekanism.common.base.IModule; +import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.network.PacketKey.KeyMessage; import net.minecraft.client.Minecraft; import net.minecraft.client.settings.KeyBinding; @@ -48,8 +50,13 @@ public class MekanismClient extends Mekanism Mekanism.gasmaskOn.clear(); Mekanism.flamethrowerActive.clear(); Mekanism.activeVibrators.clear(); - - //TileEntityRotationalComplex.clientRotationMap.clear(); + + SynchronizedBoilerData.clientHotMap.clear(); + + for(IModule module : Mekanism.modulesLoaded) + { + module.resetClient(); + } SoundHandler.soundMaps.clear(); diff --git a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java index b0036a6eb..81d3a7eb3 100644 --- a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java @@ -11,6 +11,7 @@ import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; @@ -41,6 +42,7 @@ public class GuiAdvancedElectricMachine extends GuiMekanism guiElements.add(new GuiRedstoneControl(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiUpgradeTab(this, tileEntity, tileEntity.guiLocation)); + guiElements.add(new GuiSecurityTab(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiSideConfigurationTab(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiPowerBar(this, tileEntity, tileEntity.guiLocation, 164, 15)); diff --git a/src/main/java/mekanism/client/gui/GuiChanceMachine.java b/src/main/java/mekanism/client/gui/GuiChanceMachine.java index 980c05603..9fdca649c 100644 --- a/src/main/java/mekanism/client/gui/GuiChanceMachine.java +++ b/src/main/java/mekanism/client/gui/GuiChanceMachine.java @@ -10,6 +10,7 @@ import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; @@ -39,6 +40,7 @@ public class GuiChanceMachine extends GuiMekanism guiElements.add(new GuiRedstoneControl(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiUpgradeTab(this, tileEntity, tileEntity.guiLocation)); + guiElements.add(new GuiSecurityTab(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiSideConfigurationTab(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiPowerBar(this, tileEntity, tileEntity.guiLocation, 164, 15)); diff --git a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java index b73a8230d..0de4a869d 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java @@ -17,6 +17,7 @@ import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; @@ -59,6 +60,7 @@ public class GuiChemicalCrystallizer extends GuiMekanism super(tentity, new ContainerChemicalCrystallizer(inventory, tentity)); tileEntity = tentity; + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"))); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"))); guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"))); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalCrystallizer.png"), 160, 23)); diff --git a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java index 0f1fb0fc3..007e50e8e 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java @@ -7,6 +7,7 @@ import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiProgress; @@ -39,6 +40,7 @@ public class GuiChemicalDissolutionChamber extends GuiMekanism super(tentity, new ContainerChemicalDissolutionChamber(inventory, tentity)); tileEntity = tentity; + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalDissolutionChamber.png"))); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalDissolutionChamber.png"))); guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalDissolutionChamber.png"))); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java index 7991117e6..9e7d5b188 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java @@ -13,6 +13,7 @@ import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -39,6 +40,7 @@ public class GuiChemicalInfuser extends GuiMekanism super(tentity, new ContainerChemicalInfuser(inventory, tentity)); tileEntity = tentity; + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"))); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"))); guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalInfuser.png"))); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java index 5f2cc16cd..cfe8c24bb 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java @@ -13,6 +13,7 @@ import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -39,6 +40,7 @@ public class GuiChemicalOxidizer extends GuiMekanism super(tentity, new ContainerChemicalOxidizer(inventory, tentity)); tileEntity = tentity; + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"))); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"))); guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalOxidizer.png"))); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java index f02d654e8..78927cea2 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java @@ -17,6 +17,7 @@ import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -44,6 +45,7 @@ public class GuiChemicalWasher extends GuiMekanism super(tentity, new ContainerChemicalWasher(inventory, tentity)); tileEntity = tentity; + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png"))); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png"))); guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png"))); guiElements.add(new GuiBucketIO(this, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalWasher.png"))); diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index 1b74e2f39..fb6a49e60 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -11,6 +11,7 @@ import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -52,6 +53,7 @@ public class GuiDigitalMiner extends GuiMekanism tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"))); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"))); guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"))); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"), 163, 23)); guiElements.add(new GuiVisualsTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiDigitalMiner.png"))); diff --git a/src/main/java/mekanism/client/gui/GuiDynamicTank.java b/src/main/java/mekanism/client/gui/GuiDynamicTank.java index 3bf62f3f1..c7fa039a2 100644 --- a/src/main/java/mekanism/client/gui/GuiDynamicTank.java +++ b/src/main/java/mekanism/client/gui/GuiDynamicTank.java @@ -63,7 +63,7 @@ public class GuiDynamicTank extends GuiMekanism int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); - + if(tileEntity.getScaledFluidLevel(58) > 0) { displayGauge(7, 14, tileEntity.getScaledFluidLevel(58), tileEntity.structure.fluidStored, 0); diff --git a/src/main/java/mekanism/client/gui/GuiElectricChest.java b/src/main/java/mekanism/client/gui/GuiElectricChest.java deleted file mode 100644 index c6eae0664..000000000 --- a/src/main/java/mekanism/client/gui/GuiElectricChest.java +++ /dev/null @@ -1,188 +0,0 @@ -package mekanism.client.gui; - -import java.io.IOException; - -import mekanism.api.Coord4D; -import mekanism.api.EnumColor; -import mekanism.api.energy.IEnergizedItem; -import mekanism.client.sound.SoundHandler; -import mekanism.common.Mekanism; -import mekanism.common.base.IElectricChest; -import mekanism.common.inventory.container.ContainerElectricChest; -import mekanism.common.network.PacketElectricChest.ElectricChestMessage; -import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; -import mekanism.common.tile.TileEntityElectricChest; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - -import net.minecraftforge.fml.client.FMLClientHandler; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class GuiElectricChest extends GuiMekanism -{ - public TileEntityElectricChest tileEntity; - public IInventory itemInventory; - public boolean isBlock; - - public GuiElectricChest(InventoryPlayer inventory, TileEntityElectricChest tentity) - { - super(tentity, new ContainerElectricChest(inventory, tentity, null, true)); - - xSize+=26; - ySize+=64; - tileEntity = tentity; - isBlock = true; - } - - public GuiElectricChest(InventoryPlayer inventory, IInventory inv) - { - super(new ContainerElectricChest(inventory, null, inv, false)); - - xSize+=26; - ySize+=64; - itemInventory = inv; - isBlock = false; - } - - @Override - public void initGui() - { - super.initGui(); - - int guiWidth = (width - xSize) / 2; - int guiHeight = (height - ySize) / 2; - - buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 93, guiHeight + 4, 76, 20, LangUtils.localize("gui.electricChest.editPassword"))); - } - - @Override - protected void actionPerformed(GuiButton guibutton) - { - if(guibutton.id == 0) - { - if(isBlock) - { - mc.thePlayer.openGui(Mekanism.instance, 20, mc.theWorld, tileEntity.getPos().getX(), tileEntity.getPos().getY(), tileEntity.getPos().getZ()); - } - else { - FMLClientHandler.instance().displayGuiScreen(mc.thePlayer, new GuiPasswordModify(mc.thePlayer.getCurrentEquippedItem())); - } - } - } - - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) - { - int xAxis = (mouseX - (width - xSize) / 2); - int yAxis = (mouseY - (height - ySize) / 2); - - fontRendererObj.drawString(LangUtils.localize("tile.MachineBlock.ElectricChest.name"), 8, 6, 0x404040); - fontRendererObj.drawString(getLocked() ? EnumColor.DARK_RED + "Locked" : EnumColor.BRIGHT_GREEN + "Unlocked", 97, 137, 0x404040); - fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); - - if(xAxis >= 180 && xAxis <= 184 && yAxis >= 32 && yAxis <= 84) - { - drawCreativeTabHoveringText(MekanismUtils.getEnergyDisplay(getEnergy()), xAxis, yAxis); - } - - super.drawGuiContainerForegroundLayer(mouseX, mouseY); - } - - @Override - protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException - { - super.mouseClicked(mouseX, mouseY, button); - - if(button == 0) - { - int xAxis = (mouseX - (width - xSize) / 2); - int yAxis = (mouseY - (height - ySize) / 2); - - if(xAxis >= 179 && xAxis <= 197 && yAxis >= 88 && yAxis <= 106) - { - SoundHandler.playSound("gui.button.press"); - - if(isBlock) - { - Mekanism.packetHandler.sendToServer(new ElectricChestMessage(ElectricChestPacketType.LOCK, !getLocked(), true, 0, 0, null, Coord4D.get(tileEntity))); - } - else { - Mekanism.packetHandler.sendToServer(new ElectricChestMessage(ElectricChestPacketType.LOCK, !getLocked(), false, 0, 0, null, null)); - - ItemStack stack = mc.thePlayer.getCurrentEquippedItem(); - ((IElectricChest)stack.getItem()).setLocked(stack, !getLocked()); - } - } - } - } - - @Override - protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) - { - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiElectricChest.png")); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - int guiWidth = (width - xSize) / 2; - int guiHeight = (height - ySize) / 2; - drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); - - int xAxis = (mouseX - (width - xSize) / 2); - int yAxis = (mouseY - (height - ySize) / 2); - - if(xAxis >= 179 && xAxis <= 197 && yAxis >= 88 && yAxis <= 106) - { - drawTexturedModalRect(guiWidth + 179, guiHeight + 88, 176 + 26, 52, 18, 18); - } - else { - drawTexturedModalRect(guiWidth + 179, guiHeight + 88, 176 + 26, 70, 18, 18); - } - - int displayInt = getScale(); - drawTexturedModalRect(guiWidth + 180, guiHeight + 32 + 52 - displayInt, 176 + 26, 52 - displayInt, 4, displayInt); - } - - public boolean getLocked() - { - if(isBlock) - { - return tileEntity.locked; - } - else { - ItemStack stack = mc.thePlayer.getCurrentEquippedItem(); - return ((IElectricChest)stack.getItem()).getLocked(stack); - } - } - - public int getScale() - { - if(isBlock) - { - return tileEntity.getScaledEnergyLevel(52); - } - else { - ItemStack stack = mc.thePlayer.getCurrentEquippedItem(); - return (int)(((IEnergizedItem)stack.getItem()).getEnergy(stack)*52 / ((IEnergizedItem)stack.getItem()).getMaxEnergy(stack)); - } - } - - public double getEnergy() - { - if(isBlock) - { - return tileEntity.getEnergy(); - } - else { - ItemStack stack = mc.thePlayer.getCurrentEquippedItem(); - return ((IEnergizedItem)stack.getItem()).getEnergy(stack); - } - } -} diff --git a/src/main/java/mekanism/client/gui/GuiElectricMachine.java b/src/main/java/mekanism/client/gui/GuiElectricMachine.java index 321a792af..3722cdeb1 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiElectricMachine.java @@ -10,6 +10,7 @@ import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; @@ -39,6 +40,7 @@ public class GuiElectricMachine extends GuiMekanism guiElements.add(new GuiRedstoneControl(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiUpgradeTab(this, tileEntity, tileEntity.guiLocation)); + guiElements.add(new GuiSecurityTab(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiSideConfigurationTab(this, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, tileEntity.guiLocation)); guiElements.add(new GuiPowerBar(this, tileEntity, tileEntity.guiLocation, 164, 15)); diff --git a/src/main/java/mekanism/client/gui/GuiElectricPump.java b/src/main/java/mekanism/client/gui/GuiElectricPump.java index b6c71c248..1ac6cbdaf 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricPump.java +++ b/src/main/java/mekanism/client/gui/GuiElectricPump.java @@ -10,6 +10,7 @@ import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -59,6 +60,7 @@ public class GuiElectricPump extends GuiMekanism return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, guiLocation)); + guiElements.add(new GuiSecurityTab(this, tileEntity, guiLocation)); guiElements.add(new GuiRedstoneControl(this, tileEntity, guiLocation)); guiElements.add(new GuiUpgradeTab(this, tileEntity, guiLocation)); } diff --git a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java index e084ed910..b568b2518 100755 --- a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java @@ -18,6 +18,7 @@ import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -83,6 +84,7 @@ public class GuiElectrolyticSeparator extends GuiMekanism } }, GuiGauge.Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 100, 18)); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 164, 15)); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"))); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 25, 34)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 58, 51)); diff --git a/src/main/java/mekanism/client/gui/GuiEnergyCube.java b/src/main/java/mekanism/client/gui/GuiEnergyCube.java index 20a2cb172..3c7d6fc86 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergyCube.java +++ b/src/main/java/mekanism/client/gui/GuiEnergyCube.java @@ -9,6 +9,7 @@ import mekanism.client.gui.element.GuiEnergyGauge; import mekanism.client.gui.element.GuiEnergyGauge.IEnergyInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; @@ -36,6 +37,7 @@ public class GuiEnergyCube extends GuiMekanism super(tentity, new ContainerEnergyCube(inventory, tentity)); tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiEnergyCube.png"))); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiEnergyCube.png"))); guiElements.add(new GuiSideConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiEnergyCube.png"))); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiEnergyCube.png"))); guiElements.add(new GuiEnergyGauge(new IEnergyInfoHandler() diff --git a/src/main/java/mekanism/client/gui/GuiEntangledBlock.java b/src/main/java/mekanism/client/gui/GuiEntangledBlock.java deleted file mode 100644 index 39665bc55..000000000 --- a/src/main/java/mekanism/client/gui/GuiEntangledBlock.java +++ /dev/null @@ -1,131 +0,0 @@ -package mekanism.client.gui; - -import java.io.IOException; -import java.util.ArrayList; - -import mekanism.api.Coord4D; -import mekanism.common.Mekanism; -import mekanism.common.inventory.container.ContainerNull; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; -import mekanism.common.tile.TileEntityQuantumEntangloporter; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.gui.GuiTextField; -import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.GL11; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class GuiEntangledBlock extends GuiMekanism -{ - public TileEntityQuantumEntangloporter tileEntity; - - public GuiTextField frequencyField; - - public boolean isCreative; - - public GuiEntangledBlock(InventoryPlayer inventory, TileEntityQuantumEntangloporter tentity) - { - super(tentity, new ContainerNull(inventory.player, tentity)); - tileEntity = tentity; - isCreative = inventory.player.capabilities.isCreativeMode; - } - - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) - { - fontRendererObj.drawString(tileEntity.getName(), 55, 6, 0x404040); - fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); - - super.drawGuiContainerForegroundLayer(mouseX, mouseY); - } - - @Override - protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) - { - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png")); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - int guiWidth = (width - xSize) / 2; - int guiHeight = (height - ySize) / 2; - drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); - - super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); - - frequencyField.drawTextBox(); - } - - @Override - public void updateScreen() - { - super.updateScreen(); - - frequencyField.updateCursorCounter(); - } - - @Override - public void mouseClicked(int mouseX, int mouseY, int button) throws IOException - { - super.mouseClicked(mouseX, mouseY, button); - - frequencyField.mouseClicked(mouseX, mouseY, button); - } - - @Override - public void keyTyped(char c, int i) throws IOException - { - if(!frequencyField.isFocused() || i == Keyboard.KEY_ESCAPE) - { - super.keyTyped(c, i); - } - - if(i == Keyboard.KEY_RETURN) - { - if(frequencyField.isFocused()) - { - setFrequency(); - } - } - - frequencyField.textboxKeyTyped(c, i); - } - - private void setFrequency() - { - if(!frequencyField.getText().isEmpty()) - { - String toUse; - - toUse = frequencyField.getText(); - - ArrayList data = new ArrayList(); - data.add(0); - data.add(toUse); - - if(!toUse.startsWith("creative.") || isCreative) - { - Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); - } - - frequencyField.setText(""); - } - } - - @Override - public void initGui() - { - super.initGui(); - - int guiWidth = (width - xSize) / 2; - int guiHeight = (height - ySize) / 2; - - String prevFreq = frequencyField != null ? frequencyField.getText() : ""; - - frequencyField = new GuiTextField(0, fontRendererObj, guiWidth + 75, guiHeight + 55, 96, 11); - frequencyField.setText(prevFreq); - } -} diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index 85cfb5469..d6d1b0af3 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -10,6 +10,7 @@ import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiRecipeType; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSortingTab; import mekanism.client.gui.element.GuiTransporterConfigTab; @@ -49,6 +50,7 @@ public class GuiFactory extends GuiMekanism ySize += 11; guiElements.add(new GuiRedstoneControl(this, tileEntity, tileEntity.tier.guiLocation)); + guiElements.add(new GuiSecurityTab(this, tileEntity, tileEntity.tier.guiLocation)); guiElements.add(new GuiUpgradeTab(this, tileEntity, tileEntity.tier.guiLocation)); guiElements.add(new GuiRecipeType(this, tileEntity, tileEntity.tier.guiLocation)); guiElements.add(new GuiSideConfigurationTab(this, tileEntity, tileEntity.tier.guiLocation)); diff --git a/src/main/java/mekanism/client/gui/GuiFluidTank.java b/src/main/java/mekanism/client/gui/GuiFluidTank.java index 55ff1e979..86e83b999 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidTank.java +++ b/src/main/java/mekanism/client/gui/GuiFluidTank.java @@ -3,6 +3,7 @@ package mekanism.client.gui; import mekanism.client.gui.element.GuiContainerEditMode; import mekanism.client.gui.element.GuiFluidGauge; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -29,6 +30,7 @@ public class GuiFluidTank extends GuiMekanism super(tentity, new ContainerFluidTank(inventory, tentity)); tileEntity = tentity; guiElements.add(new GuiContainerEditMode(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() { @Override diff --git a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java index 22e8ad809..1e21e00dc 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java +++ b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java @@ -10,6 +10,7 @@ import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -59,6 +60,7 @@ public class GuiFluidicPlenisher extends GuiMekanism return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, guiLocation)); + guiElements.add(new GuiSecurityTab(this, tileEntity, guiLocation)); guiElements.add(new GuiRedstoneControl(this, tileEntity, guiLocation)); guiElements.add(new GuiUpgradeTab(this, tileEntity, guiLocation)); } diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java index 0afbdab18..f6e08e456 100644 --- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java +++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java @@ -10,11 +10,13 @@ import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.gui.element.GuiTransporterConfigTab; +import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; @@ -28,6 +30,7 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -38,15 +41,19 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class GuiFormulaicAssemblicator extends GuiMekanism { public TileEntityFormulaicAssemblicator tileEntity; + + public ResourceLocation guiLocation = MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"); public GuiFormulaicAssemblicator(InventoryPlayer inventory, TileEntityFormulaicAssemblicator tentity) { super(tentity, new ContainerFormulaicAssemblicator(inventory, tentity)); tileEntity = tentity; - guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"))); - guiElements.add(new GuiSideConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"))); - guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"))); - guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"), 159, 15)); + guiElements.add(new GuiSecurityTab(this, tileEntity, guiLocation)); + guiElements.add(new GuiUpgradeTab(this, tileEntity, guiLocation)); + guiElements.add(new GuiRedstoneControl(this, tileEntity, guiLocation)); + guiElements.add(new GuiSideConfigurationTab(this, tileEntity, guiLocation)); + guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, guiLocation)); + guiElements.add(new GuiPowerBar(this, tileEntity, guiLocation, 159, 15)); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { @Override public List getInfo() @@ -54,8 +61,8 @@ public class GuiFormulaicAssemblicator extends GuiMekanism String multiplier = MekanismUtils.getEnergyDisplay(tileEntity.energyPerTick); return ListUtils.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } - }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"))); - guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png"), 151, 75).with(SlotOverlay.POWER)); + }, this, guiLocation)); + guiElements.add(new GuiSlot(SlotType.POWER, this, guiLocation, 151, 75).with(SlotOverlay.POWER)); ySize+=64; } @@ -100,7 +107,7 @@ public class GuiFormulaicAssemblicator extends GuiMekanism @Override protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) { - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiFormulaicAssemblicator.png")); + mc.renderEngine.bindTexture(guiLocation); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); int guiWidth = (width - xSize) / 2; int guiHeight = (height - ySize) / 2; @@ -181,11 +188,8 @@ public class GuiFormulaicAssemblicator extends GuiMekanism drawTexturedModalRect(guiWidth + 86, guiHeight + 43, 176, 48, display, 16); } - if(tileEntity.isRecipe) - { - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, "GuiSlot.png")); - drawTexturedModalRect(guiWidth + 90, guiHeight + 25, 2, 39, 14, 12); - } + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, "GuiSlot.png")); + drawTexturedModalRect(guiWidth + 90, guiHeight + 25, tileEntity.isRecipe ? 2 : 20, 39, 14, 12); if(tileEntity.formula != null) { @@ -196,10 +200,16 @@ public class GuiFormulaicAssemblicator extends GuiMekanism if(stack != null) { Slot slot = (Slot)inventorySlots.inventorySlots.get(i+20); - GL11.glPushMatrix(); + + if(slot.getStack() == null || !slot.getStack().isItemEqual(stack)) + { + drawGradientRect(guiWidth + slot.xDisplayPosition, guiHeight + slot.yDisplayPosition, guiWidth + slot.xDisplayPosition + 16, guiHeight + slot.yDisplayPosition + 16, -2137456640, -2137456640); + } + GL11.glEnable(GL11.GL_LIGHTING); MekanismRenderer.blendOn(); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.4F); itemRender.renderItemAndEffectIntoGUI(stack, guiWidth + slot.xDisplayPosition, guiHeight + slot.yDisplayPosition); MekanismRenderer.blendOff(); GL11.glDisable(GL11.GL_LIGHTING); diff --git a/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java b/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java new file mode 100644 index 000000000..640d5b73e --- /dev/null +++ b/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java @@ -0,0 +1,80 @@ +package mekanism.client.gui; + +import java.util.List; + +import mekanism.api.util.ListUtils; +import mekanism.api.util.UnitDisplayUtils; +import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; +import mekanism.client.gui.element.GuiElement.IInfoHandler; +import mekanism.client.gui.element.GuiHeatInfo; +import mekanism.client.gui.element.GuiSecurityTab; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.common.inventory.container.ContainerFuelwoodHeater; +import mekanism.common.tile.TileEntityFuelwoodHeater; +import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.entity.player.InventoryPlayer; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiFuelwoodHeater extends GuiMekanism +{ + public TileEntityFuelwoodHeater tileEntity; + + public GuiFuelwoodHeater(InventoryPlayer inventory, TileEntityFuelwoodHeater tentity) + { + super(tentity, new ContainerFuelwoodHeater(inventory, tentity)); + tileEntity = tentity; + + guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiFuelwoodHeater.png"), 14, 28)); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFuelwoodHeater.png"))); + guiElements.add(new GuiHeatInfo(new IInfoHandler() { + @Override + public List getInfo() + { + String transfer = UnitDisplayUtils.getDisplayShort(tileEntity.lastTransferLoss, TemperatureUnit.KELVIN); + String environment = UnitDisplayUtils.getDisplayShort(tileEntity.lastEnvironmentLoss, TemperatureUnit.KELVIN); + return ListUtils.asList(LangUtils.localize("gui.transferred") + ": " + transfer + "/t", LangUtils.localize("gui.dissipated") + ": " + environment + "/t"); + } + }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiFuelwoodHeater.png"))); + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) + { + fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize / 2) - (fontRendererObj.getStringWidth(tileEntity.getInventoryName()) / 2), 6, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); + + renderScaledText(LangUtils.localize("gui.temp") + ": " + MekanismUtils.getTemperatureDisplay(tileEntity.temperature, TemperatureUnit.AMBIENT), 50, 25, 0x00CD00, 76); + renderScaledText(LangUtils.localize("gui.fuel") + ": " + tileEntity.burnTime, 50, 41, 0x00CD00, 76); + + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) + { + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiFuelwoodHeater.png")); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + int guiWidth = (width - xSize) / 2; + int guiHeight = (height - ySize) / 2; + drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); + + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + if(tileEntity.burnTime > 0) + { + int displayInt = tileEntity.burnTime*13 / tileEntity.maxBurnTime; + drawTexturedModalRect(guiWidth + 143, guiHeight + 30 + 12 - displayInt, 176, 12 - displayInt, 14, displayInt + 1); + } + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); + } +} diff --git a/src/main/java/mekanism/client/gui/GuiGasTank.java b/src/main/java/mekanism/client/gui/GuiGasTank.java index c87bf7d9d..e2420e394 100644 --- a/src/main/java/mekanism/client/gui/GuiGasTank.java +++ b/src/main/java/mekanism/client/gui/GuiGasTank.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; @@ -35,6 +36,7 @@ public class GuiGasTank extends GuiMekanism super(tentity, new ContainerGasTank(inventory, tentity)); tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiGasTank.png"))); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiGasTank.png"))); guiElements.add(new GuiSideConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiGasTank.png"))); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiGasTank.png"))); guiElements.add(new GuiSlot(SlotType.OUTPUT, this, MekanismUtils.getResource(ResourceType.GUI, "GuiGasTank.png"), 7, 7).with(SlotOverlay.PLUS)); diff --git a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java index 57effd19b..2e27b0b2b 100644 --- a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java +++ b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java @@ -9,6 +9,7 @@ import mekanism.client.gui.element.GuiGauge.Type; import mekanism.client.gui.element.GuiNumberGauge; import mekanism.client.gui.element.GuiNumberGauge.INumberInfoHandler; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.render.MekanismRenderer; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerLaserAmplifier; @@ -67,6 +68,7 @@ public class GuiLaserAmplifier extends GuiMekanism return LangUtils.localize("gui.storing") + ": " + MekanismUtils.getEnergyDisplay(level); } }, Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 6, 10)); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiDetectionTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); } diff --git a/src/main/java/mekanism/client/gui/GuiLaserTractorBeam.java b/src/main/java/mekanism/client/gui/GuiLaserTractorBeam.java index 41f8221de..2a5501ce9 100644 --- a/src/main/java/mekanism/client/gui/GuiLaserTractorBeam.java +++ b/src/main/java/mekanism/client/gui/GuiLaserTractorBeam.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.common.inventory.container.ContainerLaserTractorBeam; import mekanism.common.tile.TileEntityLaserTractorBeam; import mekanism.common.util.LangUtils; @@ -17,6 +18,8 @@ public class GuiLaserTractorBeam extends GuiMekanism { super(tentity, new ContainerLaserTractorBeam(inventory, tentity)); tileEntity = tentity; + + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiFullInv.png"))); } @Override diff --git a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java index 46c86c1a0..456eb43dd 100644 --- a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java +++ b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java @@ -11,6 +11,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; @@ -93,6 +94,7 @@ public class GuiLogisticalSorter extends GuiMekanism // Add common Mekanism gui elements guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiLogisticalSorter.png"))); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiLogisticalSorter.png"))); } public int getScroll() diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index bbb2d63d9..7d80c4425 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -13,6 +13,7 @@ import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; @@ -47,6 +48,7 @@ public class GuiMetallurgicInfuser extends GuiMekanism guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"))); guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"))); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"))); guiElements.add(new GuiSideConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"))); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"))); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiMetallurgicInfuser.png"), 164, 15)); diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificator.java b/src/main/java/mekanism/client/gui/GuiOredictionificator.java index 32af9f960..747e54f28 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificator.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificator.java @@ -10,6 +10,8 @@ import mekanism.api.EnumColor; import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.render.MekanismRenderer; @@ -51,6 +53,8 @@ public class GuiOredictionificator extends GuiMekanism super(tentity, new ContainerOredictionificator(inventory, tentity)); tileEntity = tentity; + guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiOredictionificator.png"))); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiOredictionificator.png"))); guiElements.add(new GuiProgress(new IProgressInfoHandler() { @Override @@ -67,7 +71,7 @@ public class GuiOredictionificator extends GuiMekanism public int getScroll() { - return Math.max(Math.min((int)(scroll*88), 88), 0); + return Math.max(Math.min((int)(scroll*73), 73), 0); } public int getFilterIndex() @@ -164,7 +168,7 @@ public class GuiOredictionificator extends GuiMekanism if(tileEntity.filters.get(getFilterIndex()+i) != null) { int yStart = i*22 + 18; - boolean mouseOver = xAxis >= 10 && xAxis <= 152 && yAxis >= yStart && yAxis <= yStart+22; + boolean mouseOver = xAxis > 10 && xAxis <= 152 && yAxis > yStart && yAxis <= yStart+22; if(mouseOver) { @@ -204,9 +208,9 @@ public class GuiOredictionificator extends GuiMekanism { if(tileEntity.filters.get(getFilterIndex()+i) != null) { - int yStart = i*29 + 18; + int yStart = i*22 + 18; - if(xAxis >= 10 && xAxis <= 152 && yAxis >= yStart && yAxis <= yStart+22) + if(xAxis > 10 && xAxis <= 152 && yAxis > yStart && yAxis <= yStart+22) { OredictionificatorFilter filter = tileEntity.filters.get(getFilterIndex()+i); @@ -228,7 +232,7 @@ public class GuiOredictionificator extends GuiMekanism if(isDragging) { - scroll = Math.min(Math.max((float)(yAxis-18-dragOffset)/88F, 0), 1); + scroll = Math.min(Math.max((float)(yAxis-18-dragOffset)/73F, 0), 1); } } diff --git a/src/main/java/mekanism/client/gui/GuiPRC.java b/src/main/java/mekanism/client/gui/GuiPRC.java index 44747136e..1434a7294 100644 --- a/src/main/java/mekanism/client/gui/GuiPRC.java +++ b/src/main/java/mekanism/client/gui/GuiPRC.java @@ -16,6 +16,7 @@ import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; @@ -46,6 +47,7 @@ public class GuiPRC extends GuiMekanism tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiSideConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); diff --git a/src/main/java/mekanism/client/gui/GuiPasswordEnter.java b/src/main/java/mekanism/client/gui/GuiPasswordEnter.java deleted file mode 100644 index ae07ef10e..000000000 --- a/src/main/java/mekanism/client/gui/GuiPasswordEnter.java +++ /dev/null @@ -1,193 +0,0 @@ -package mekanism.client.gui; - -import java.io.IOException; - -import mekanism.api.Coord4D; -import mekanism.api.EnumColor; -import mekanism.api.energy.IEnergizedItem; -import mekanism.client.sound.SoundHandler; -import mekanism.common.Mekanism; -import mekanism.common.base.IElectricChest; -import mekanism.common.network.PacketElectricChest.ElectricChestMessage; -import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; -import mekanism.common.tile.TileEntityElectricChest; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.gui.GuiTextField; -import net.minecraft.item.ItemStack; - -import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.GL11; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class GuiPasswordEnter extends GuiScreen -{ - public int xSize = 176; - public int ySize = 95; - - public TileEntityElectricChest tileEntity; - - public ItemStack itemStack; - - public boolean isBlock; - - public GuiTextField passwordField; - - public String displayText = EnumColor.BRIGHT_GREEN + LangUtils.localize("gui.password.enterPassword"); - - public int ticker = 0; - - public GuiPasswordEnter(TileEntityElectricChest tileentity) - { - isBlock = true; - tileEntity = tileentity; - } - - public GuiPasswordEnter(ItemStack itemstack) - { - isBlock = false; - itemStack = itemstack; - } - - @Override - protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException - { - super.mouseClicked(mouseX, mouseY, button); - passwordField.mouseClicked(mouseX, mouseY, button); - } - - @Override - public void initGui() - { - super.initGui(); - - int guiWidth = (width - xSize) / 2; - int guiHeight = (height - ySize) / 2; - - buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 55, guiHeight + 68, 60, 20, LangUtils.localize("gui.open"))); - - passwordField = new GuiTextField(1, fontRendererObj, guiWidth + 45, guiHeight + 50, 80, 12); - passwordField.setMaxStringLength(12); - passwordField.setFocused(true); - } - - @Override - public void keyTyped(char c, int i) throws IOException - { - super.keyTyped(c, i); - - if(i == Keyboard.KEY_RETURN) - { - tryOpen(); - } - - passwordField.textboxKeyTyped(c, i); - } - - @Override - public boolean doesGuiPauseGame() - { - return false; - } - - @Override - public void updateScreen() - { - passwordField.updateCursorCounter(); - - if(ticker > 0) - { - ticker--; - } - else { - displayText = EnumColor.BRIGHT_GREEN + LangUtils.localize("gui.password.enterPassword"); - } - } - - @Override - protected void actionPerformed(GuiButton guibutton) - { - if(guibutton.id == 0) - { - tryOpen(); - } - } - - public void tryOpen() - { - if(passwordField.getText() == null || passwordField.getText() == "") - { - displayText = EnumColor.DARK_RED + LangUtils.localize("gui.password.fieldsEmpty"); - SoundHandler.playSound("mekanism:etc.Error"); - ticker = 30; - } - else if(!getPassword().equals(passwordField.getText())) - { - displayText = EnumColor.DARK_RED + LangUtils.localize("gui.password.invalid"); - passwordField.setText(""); - SoundHandler.playSound("mekanism:etc.Error"); - ticker = 30; - } - else { - if(isBlock) - { - tileEntity.setEnergy(tileEntity.getEnergy() - 100); - Mekanism.packetHandler.sendToServer(new ElectricChestMessage(ElectricChestPacketType.SERVER_OPEN, true, true, 0, 0, null, Coord4D.get(tileEntity))); - } - else { - ((IEnergizedItem)itemStack.getItem()).setEnergy(itemStack, ((IEnergizedItem)itemStack.getItem()).getEnergy(itemStack) - 100); - Mekanism.packetHandler.sendToServer(new ElectricChestMessage(ElectricChestPacketType.SERVER_OPEN, true, false, 0, 0, null, null)); - } - - SoundHandler.playSound("mekanism:etc.Success"); - } - } - - public String getPassword() - { - if(isBlock) - { - return tileEntity.password; - } - else { - return ((IElectricChest)itemStack.getItem()).getPassword(itemStack); - } - } - - @Override - public void drawScreen(int mouseX, int mouseY, float partialTick) - { - drawDefaultBackground(); - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiPasswordEnter.png")); - - int guiWidth = (width - xSize) / 2; - int guiHeight = (height - ySize) / 2; - - drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); - String actualPass = passwordField.getText(); - String censored = new String(new char[actualPass.length()]).replace("\0", "*"); - passwordField.setText(censored); - passwordField.drawTextBox(); - passwordField.setText(actualPass); - - super.drawScreen(mouseX, mouseY, partialTick); - - fontRendererObj.drawString(LangUtils.localize("gui.password"), guiWidth + 64, guiHeight + 5, 0x404040); - fontRendererObj.drawString("Enter:", guiWidth + 45, guiHeight + 40, 0x404040); - fontRendererObj.drawString(displayText, guiWidth + 37, guiHeight + 19, 0x404040); - - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_DEPTH_TEST); - } -} diff --git a/src/main/java/mekanism/client/gui/GuiPasswordModify.java b/src/main/java/mekanism/client/gui/GuiPasswordModify.java deleted file mode 100644 index 88577e711..000000000 --- a/src/main/java/mekanism/client/gui/GuiPasswordModify.java +++ /dev/null @@ -1,224 +0,0 @@ -package mekanism.client.gui; - -import java.io.IOException; - -import mekanism.api.Coord4D; -import mekanism.api.EnumColor; -import mekanism.common.Mekanism; -import mekanism.common.base.IElectricChest; -import mekanism.common.network.PacketElectricChest.ElectricChestMessage; -import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; -import mekanism.common.tile.TileEntityElectricChest; -import mekanism.common.util.LangUtils; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.gui.GuiTextField; -import net.minecraft.item.ItemStack; - -import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.GL11; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class GuiPasswordModify extends GuiScreen -{ - public int xSize = 176; - public int ySize = 95; - - public TileEntityElectricChest tileEntity; - - public ItemStack itemStack; - - public boolean isBlock; - - public GuiTextField newPasswordField; - - public GuiTextField confirmPasswordField; - - public String displayText = EnumColor.BRIGHT_GREEN + LangUtils.localize("gui.password.setPassword"); - - public int ticker = 0; - - public GuiPasswordModify(TileEntityElectricChest tileentity) - { - isBlock = true; - tileEntity = tileentity; - } - - public GuiPasswordModify(ItemStack itemstack) - { - isBlock = false; - itemStack = itemstack; - } - - @Override - public void initGui() - { - super.initGui(); - - int guiWidth = (width - xSize) / 2; - int guiHeight = (height - ySize) / 2; - - buttonList.clear(); - buttonList.add(new GuiButton(0, guiWidth + 55, guiHeight + 68, 60, 20, LangUtils.localize("gui.confirm"))); - - newPasswordField = new GuiTextField(1, fontRendererObj, guiWidth + 60, guiHeight + 34, 80, 12); - newPasswordField.setMaxStringLength(12); - newPasswordField.setFocused(true); - - confirmPasswordField = new GuiTextField(2, fontRendererObj, guiWidth + 60, guiHeight + 51, 80, 12); - confirmPasswordField.setMaxStringLength(12); - confirmPasswordField.setFocused(false); - } - - @Override - protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException - { - super.mouseClicked(mouseX, mouseY, button); - newPasswordField.mouseClicked(mouseX, mouseY, button); - confirmPasswordField.mouseClicked(mouseX, mouseY, button); - } - - @Override - public void keyTyped(char c, int i) throws IOException - { - super.keyTyped(c, i); - - if(i == Keyboard.KEY_TAB) - { - if(!newPasswordField.isFocused() && !confirmPasswordField.isFocused()) - { - newPasswordField.setFocused(true); - return; - } - else if(newPasswordField.isFocused() && confirmPasswordField.isFocused()) - { - newPasswordField.setFocused(true); - confirmPasswordField.setFocused(false); - return; - } - else { - newPasswordField.setFocused(!newPasswordField.isFocused()); - confirmPasswordField.setFocused(!confirmPasswordField.isFocused()); - return; - } - } - else if(i == Keyboard.KEY_RETURN) - { - tryModify(); - } - - newPasswordField.textboxKeyTyped(c, i); - confirmPasswordField.textboxKeyTyped(c, i); - } - - @Override - public boolean doesGuiPauseGame() - { - return false; - } - - @Override - public void updateScreen() - { - newPasswordField.updateCursorCounter(); - - if(ticker > 0) - { - ticker--; - } - else { - displayText = EnumColor.BRIGHT_GREEN + LangUtils.localize("gui.password.setPassword"); - } - } - - @Override - protected void actionPerformed(GuiButton guibutton) - { - if(guibutton.id == 0) - { - tryModify(); - } - } - - public void tryModify() - { - if(newPasswordField.getText() == null || newPasswordField.getText().equals("") || confirmPasswordField.getText() == null || confirmPasswordField.getText().equals("")) - { - displayText = EnumColor.DARK_RED + LangUtils.localize("gui.password.fieldsEmpty"); - ticker = 30; - } - else if(!newPasswordField.getText().equals(confirmPasswordField.getText())) - { - displayText = EnumColor.DARK_RED + LangUtils.localize("gui.password.notMatching"); - ticker = 30; - } - else if(confirmPasswordField.getText().equals(getPassword())) - { - displayText = EnumColor.DARK_RED + LangUtils.localize("gui.password.identical"); - ticker = 30; - } - else { - if(isBlock) - { - Mekanism.packetHandler.sendToServer(new ElectricChestMessage(ElectricChestPacketType.PASSWORD, true, false, 0, 0, confirmPasswordField.getText(), Coord4D.get(tileEntity))); - Mekanism.packetHandler.sendToServer(new ElectricChestMessage(ElectricChestPacketType.SERVER_OPEN, false, true, 0, 0, null, Coord4D.get(tileEntity))); - } - else { - ((IElectricChest)itemStack.getItem()).setPassword(itemStack, confirmPasswordField.getText()); - Mekanism.packetHandler.sendToServer(new ElectricChestMessage(ElectricChestPacketType.PASSWORD, false, false, 0, 0, confirmPasswordField.getText(), null)); - Mekanism.packetHandler.sendToServer(new ElectricChestMessage(ElectricChestPacketType.SERVER_OPEN, false, false, 0, 0, null, null)); - } - } - } - - public String getPassword() - { - if(isBlock) - { - return tileEntity.password; - } - else { - return ((IElectricChest)itemStack.getItem()).getPassword(itemStack); - } - } - - @Override - public void drawScreen(int mouseX, int mouseY, float partialTick) - { - drawDefaultBackground(); - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiPasswordModify.png")); - - int guiWidth = (width - xSize) / 2; - int guiHeight = (height - ySize) / 2; - - drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); - - super.drawScreen(mouseX, mouseY, partialTick); - - fontRendererObj.drawString(LangUtils.localize("gui.password"), guiWidth + 64, guiHeight + 5, 0x404040); - fontRendererObj.drawString(displayText, guiWidth + 37, guiHeight + 19, 0x404040); - fontRendererObj.drawString("Enter:", guiWidth + 27, guiHeight + 37, 0x404040); - fontRendererObj.drawString("Repeat:", guiWidth + 21, guiHeight + 54, 0x404040); - String actualPass = newPasswordField.getText(); - String censored = new String(new char[actualPass.length()]).replace("\0", "*"); - newPasswordField.setText(censored); - newPasswordField.drawTextBox(); - newPasswordField.setText(actualPass); - actualPass = confirmPasswordField.getText(); - censored = new String(new char[actualPass.length()]).replace("\0", "*"); - confirmPasswordField.setText(censored); - confirmPasswordField.drawTextBox(); - confirmPasswordField.setText(actualPass); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_DEPTH_TEST); - } -} diff --git a/src/main/java/mekanism/client/gui/GuiPersonalChest.java b/src/main/java/mekanism/client/gui/GuiPersonalChest.java new file mode 100644 index 000000000..6c51d68e2 --- /dev/null +++ b/src/main/java/mekanism/client/gui/GuiPersonalChest.java @@ -0,0 +1,69 @@ +package mekanism.client.gui; + +import mekanism.client.gui.element.GuiSecurityTab; +import mekanism.common.inventory.container.ContainerPersonalChest; +import mekanism.common.tile.TileEntityPersonalChest; +import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IInventory; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiPersonalChest extends GuiMekanism +{ + public TileEntityPersonalChest tileEntity; + + public GuiPersonalChest(InventoryPlayer inventory, TileEntityPersonalChest tentity) + { + super(tentity, new ContainerPersonalChest(inventory, tentity, null, true)); + + xSize+=26; + ySize+=64; + tileEntity = tentity; + + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiPersonalChest.png"))); + } + + public GuiPersonalChest(InventoryPlayer inventory, IInventory inv) + { + super(new ContainerPersonalChest(inventory, null, inv, false)); + + xSize+=26; + ySize+=64; + + guiElements.add(new GuiSecurityTab(this, MekanismUtils.getResource(ResourceType.GUI, "GuiPersonalChest.png"))); + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) + { + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + fontRendererObj.drawString(LangUtils.localize("tile.MachineBlock.PersonalChest.name"), 8, 6, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) + { + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiPersonalChest.png")); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + int guiWidth = (width - xSize) / 2; + int guiHeight = (height - ySize) / 2; + drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); + + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); + } +} diff --git a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java index f3d20d9e1..4c7aaae4b 100644 --- a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java @@ -49,8 +49,6 @@ public class GuiQuantumEntangloporter extends GuiMekanism public GuiButton setButton; public GuiButton deleteButton; - public GuiButton teleportButton; - public GuiScrollList scrollList; public GuiTextField frequencyField; @@ -125,7 +123,7 @@ public class GuiQuantumEntangloporter extends GuiMekanism public void updateButtons() { - if(tileEntity.owner == null) + if(tileEntity.getSecurity().getOwner() == null) { return; } @@ -162,7 +160,7 @@ public class GuiQuantumEntangloporter extends GuiMekanism { Frequency freq = privateMode ? tileEntity.privateCache.get(scrollList.selected) : tileEntity.publicCache.get(scrollList.selected); - if(tileEntity.getFrequency() == null || !tileEntity.getFrequency().equals(freq)) + if(tileEntity.getFrequency(null) == null || !tileEntity.getFrequency(null).equals(freq)) { setButton.enabled = true; } @@ -170,7 +168,7 @@ public class GuiQuantumEntangloporter extends GuiMekanism setButton.enabled = false; } - if(tileEntity.owner.equals(freq.owner)) + if(tileEntity.getSecurity().getOwner().equals(freq.owner)) { deleteButton.enabled = true; } @@ -301,13 +299,13 @@ public class GuiQuantumEntangloporter extends GuiMekanism int yAxis = (mouseY-(height-ySize)/2); fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 4, 0x404040); - fontRendererObj.drawString(LangUtils.localize("gui.owner") + ": " + (tileEntity.owner != null ? tileEntity.owner : LangUtils.localize("gui.none")), 8, (ySize-96)+4, 0x404040); - + fontRendererObj.drawString(LangUtils.localize("gui.owner") + ": " + (tileEntity.getSecurity().getOwner() != null ? tileEntity.getSecurity().getOwner() : LangUtils.localize("gui.none")), 8, (ySize-96)+4, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.freq") + ":", 32, 81, 0x404040); fontRendererObj.drawString(LangUtils.localize("gui.security") + ":", 32, 91, 0x404040); - fontRendererObj.drawString(" " + (tileEntity.getFrequency() != null ? tileEntity.getFrequency().name : EnumColor.DARK_RED + LangUtils.localize("gui.none")), 32 + fontRendererObj.getStringWidth(LangUtils.localize("gui.freq") + ":"), 81, 0x797979); - fontRendererObj.drawString(" " + (tileEntity.getFrequency() != null ? getSecurity(tileEntity.getFrequency()) : EnumColor.DARK_RED + LangUtils.localize("gui.none")), 32 + fontRendererObj.getStringWidth(LangUtils.localize("gui.security") + ":"), 91, 0x797979); + fontRendererObj.drawString(" " + (tileEntity.getFrequency(null) != null ? tileEntity.getFrequency(null).name : EnumColor.DARK_RED + LangUtils.localize("gui.none")), 32 + fontRendererObj.getStringWidth(LangUtils.localize("gui.freq") + ":"), 81, 0x797979); + fontRendererObj.drawString(" " + (tileEntity.getFrequency(null) != null ? getSecurity(tileEntity.getFrequency(null)) : EnumColor.DARK_RED + LangUtils.localize("gui.none")), 32 + fontRendererObj.getStringWidth(LangUtils.localize("gui.security") + ":"), 91, 0x797979); String str = LangUtils.localize("gui.set") + ":"; renderScaledText(str, 27, 104, 0x404040, 20); diff --git a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java index c215bd346..0fe576737 100644 --- a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java +++ b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java @@ -13,6 +13,7 @@ import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiHeatInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -47,6 +48,7 @@ public class GuiResistiveHeater extends GuiMekanism guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"), 164, 15)); guiElements.add(new GuiSlot(SlotType.POWER, this, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"), 14, 34).with(SlotOverlay.POWER)); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"))); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiResistiveHeater.png"))); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { @Override diff --git a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java index 5cffa4297..0482d5f5b 100644 --- a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -18,6 +18,7 @@ import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -48,6 +49,7 @@ public class GuiRotaryCondensentrator extends GuiMekanism super(tentity, new ContainerRotaryCondensentrator(inventory, tentity)); tileEntity = tentity; + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"))); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"))); guiElements.add(new GuiUpgradeTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"))); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiRotaryCondensentrator.png"), 4, 24).with(SlotOverlay.PLUS)); diff --git a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java new file mode 100644 index 000000000..0a26ada75 --- /dev/null +++ b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java @@ -0,0 +1,385 @@ +package mekanism.client.gui; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import mekanism.api.Coord4D; +import mekanism.api.EnumColor; +import mekanism.client.gui.element.GuiScrollList; +import mekanism.client.sound.SoundHandler; +import mekanism.common.Mekanism; +import mekanism.common.inventory.container.ContainerSecurityDesk; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile.SecurityMode; +import mekanism.common.tile.TileEntitySecurityDesk; +import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiTextField; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.input.Keyboard; +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiSecurityDesk extends GuiMekanism +{ + public static int MAX_LENGTH = 24; + + public ResourceLocation resource; + + public TileEntitySecurityDesk tileEntity; + + public EntityPlayer entityPlayer; + + public GuiButton removeButton; + + public GuiScrollList scrollList; + + public GuiTextField trustedField; + + public static final List SPECIAL_CHARS = Arrays.asList('-', '|', '_'); + + public GuiSecurityDesk(InventoryPlayer inventory, TileEntitySecurityDesk tentity) + { + super(tentity, new ContainerSecurityDesk(inventory, tentity)); + tileEntity = tentity; + resource = MekanismUtils.getResource(ResourceType.GUI, "GuiSecurityDesk.png"); + + guiElements.add(scrollList = new GuiScrollList(this, resource, 14, 14, 120, 4)); + + ySize+=64; + } + + @Override + public void initGui() + { + super.initGui(); + + int guiWidth = (width - xSize) / 2; + int guiHeight = (height - ySize) / 2; + + buttonList.clear(); + + removeButton = new GuiButton(0, guiWidth + 13, guiHeight + 81, 122, 20, LangUtils.localize("gui.remove")); + + trustedField = new GuiTextField(fontRendererObj, guiWidth + 35, guiHeight + 69, 86, 11); + trustedField.setMaxStringLength(MAX_LENGTH); + trustedField.setEnableBackgroundDrawing(false); + + updateButtons(); + + buttonList.add(removeButton); + } + + public void addTrusted(String trusted) + { + if(trusted.isEmpty()) + { + return; + } + + ArrayList data = new ArrayList(); + data.add(0); + data.add(trusted); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + } + + public void updateButtons() + { + if(tileEntity.owner == null) + { + return; + } + + List text = new ArrayList(); + + if(tileEntity.frequency != null) + { + for(String s : tileEntity.frequency.trusted) + { + text.add(s); + } + } + + scrollList.setText(text); + + if(scrollList.hasSelection()) + { + removeButton.enabled = true; + } + else { + removeButton.enabled = false; + } + } + + @Override + public void updateScreen() + { + super.updateScreen(); + + updateButtons(); + + trustedField.updateCursorCounter(); + } + + @Override + public void mouseClicked(int mouseX, int mouseY, int button) + { + super.mouseClicked(mouseX, mouseY, button); + + updateButtons(); + + trustedField.mouseClicked(mouseX, mouseY, button); + + if(button == 0) + { + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + if(tileEntity.frequency != null && tileEntity.owner != null && tileEntity.owner.equals(mc.thePlayer.getCommandSenderName())) + { + if(xAxis >= 123 && xAxis <= 134 && yAxis >= 68 && yAxis <= 79) + { + addTrusted(trustedField.getText()); + trustedField.setText(""); + SoundHandler.playSound("gui.button.press"); + } + + ArrayList data = new ArrayList(); + + if(xAxis >= 146 && xAxis <= 162 && yAxis >= 59 && yAxis <= 75) + { + data.add(2); + } + + if(tileEntity.frequency.securityMode != SecurityMode.PUBLIC) + { + if(xAxis >= 13 && xAxis <= 53 && yAxis >= 113 && yAxis <= 129) + { + data.add(3); + data.add(0); + } + } + + if(tileEntity.frequency.securityMode != SecurityMode.PRIVATE) + { + if(xAxis >= 54 && xAxis <= 94 && yAxis >= 113 && yAxis <= 129) + { + data.add(3); + data.add(1); + } + } + + if(tileEntity.frequency.securityMode != SecurityMode.TRUSTED) + { + if(xAxis >= 95 && xAxis <= 135 && yAxis >= 113 && yAxis <= 129) + { + data.add(3); + data.add(2); + } + } + + if(!data.isEmpty()) + { + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + } + } + } + } + + @Override + public void keyTyped(char c, int i) + { + if(!trustedField.isFocused() || i == Keyboard.KEY_ESCAPE) + { + super.keyTyped(c, i); + } + + if(i == Keyboard.KEY_RETURN) + { + if(trustedField.isFocused()) + { + addTrusted(trustedField.getText()); + trustedField.setText(""); + } + } + + if(SPECIAL_CHARS.contains(c) || Character.isDigit(c) || Character.isLetter(c) || i == Keyboard.KEY_BACK || i == Keyboard.KEY_DELETE || i == Keyboard.KEY_LEFT || i == Keyboard.KEY_RIGHT) + { + trustedField.textboxKeyTyped(c, i); + } + + updateButtons(); + } + + @Override + protected void actionPerformed(GuiButton guibutton) + { + super.actionPerformed(guibutton); + + if(guibutton.id == 0) + { + int selection = scrollList.getSelection(); + + if(tileEntity.frequency != null && selection != -1) + { + if(tileEntity != null) + { + ArrayList data = new ArrayList(); + data.add(1); + data.add(tileEntity.frequency.trusted.get(selection)); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + } + + scrollList.selected = -1; + } + } + + updateButtons(); + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) + { + int xAxis = (mouseX-(width-xSize)/2); + int yAxis = (mouseY-(height-ySize)/2); + + String ownerText = EnumColor.RED + tileEntity.owner != null ? (LangUtils.localize("gui.owner") + ": " + tileEntity.owner) : LangUtils.localize("gui.noOwner"); + fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 4, 0x404040); + fontRendererObj.drawString(ownerText, (xSize - 7) - fontRendererObj.getStringWidth(ownerText), (ySize - 96) + 2, 0x404040); + fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + + String trusted = LangUtils.localize("gui.trustedPlayers"); + fontRendererObj.drawString(trusted, 74-(fontRendererObj.getStringWidth(trusted)/2), 57, 0x787878); + + String security = EnumColor.RED + LangUtils.localize("gui.securityOffline"); + + if(tileEntity.frequency != null) + { + security = LangUtils.localize("gui.security") + ": " + tileEntity.frequency.securityMode.getDisplay(); + } + + fontRendererObj.drawString(security, 13, 103, 0x404040); + + renderScaledText(LangUtils.localize("gui.add") + ":", 13, 70, 0x404040, 20); + + if(tileEntity.frequency != null && xAxis >= 146 && xAxis <= 162 && yAxis >= 59 && yAxis <= 75) + { + displayTooltip(LangUtils.localize("gui.securityOverride") + ": " + LangUtils.transOnOff(tileEntity.frequency.override), xAxis, yAxis); + } + + if(xAxis >= 13 && xAxis <= 53 && yAxis >= 113 && yAxis <= 129) + { + displayTooltip(LangUtils.localize("gui.publicMode"), xAxis, yAxis); + } + + if(xAxis >= 54 && xAxis <= 94 && yAxis >= 113 && yAxis <= 129) + { + displayTooltip(LangUtils.localize("gui.privateMode"), xAxis, yAxis); + } + + if(xAxis >= 95 && xAxis <= 135 && yAxis >= 113 && yAxis <= 129) + { + displayTooltip(LangUtils.localize("gui.trustedMode"), xAxis, yAxis); + } + + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) + { + mc.renderEngine.bindTexture(resource); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + int guiWidth = (width-xSize)/2; + int guiHeight = (height-ySize)/2; + drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); + + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + if(tileEntity.frequency != null && tileEntity.owner != null && mc.thePlayer.getCommandSenderName().equals(tileEntity.owner)) + { + drawTexturedModalRect(guiWidth + 145, guiHeight + 78, xSize + (tileEntity.frequency.override ? 0 : 6), 22, 6, 6); + + if(xAxis >= 146 && xAxis <= 162 && yAxis >= 59 && yAxis <= 75) + { + drawTexturedModalRect(guiWidth + 146, guiHeight + 59, xSize + 12, 0, 16, 16); + } + else { + drawTexturedModalRect(guiWidth + 146, guiHeight + 59, xSize + 12, 16, 16, 16); + } + + if(tileEntity.frequency.securityMode != SecurityMode.PUBLIC) + { + if(xAxis >= 13 && xAxis <= 53 && yAxis >= 113 && yAxis <= 129) + { + drawTexturedModalRect(guiWidth + 13, guiHeight + 113, xSize, 48, 40, 16); + } + else { + drawTexturedModalRect(guiWidth + 13, guiHeight + 113, xSize, 64, 40, 16); + } + } + else { + drawTexturedModalRect(guiWidth + 13, guiHeight + 113, xSize, 80, 40, 16); + } + + if(tileEntity.frequency.securityMode != SecurityMode.PRIVATE) + { + if(xAxis >= 54 && xAxis <= 94 && yAxis >= 113 && yAxis <= 129) + { + drawTexturedModalRect(guiWidth + 54, guiHeight + 113, xSize + 40, 48, 40, 16); + } + else { + drawTexturedModalRect(guiWidth + 54, guiHeight + 113, xSize + 40, 64, 40, 16); + } + } + else { + drawTexturedModalRect(guiWidth + 54, guiHeight + 113, xSize + 40, 80, 40, 16); + } + + if(tileEntity.frequency.securityMode != SecurityMode.TRUSTED) + { + if(xAxis >= 95 && xAxis <= 135 && yAxis >= 113 && yAxis <= 129) + { + drawTexturedModalRect(guiWidth + 95, guiHeight + 113, xSize, 96, 40, 16); + } + else { + drawTexturedModalRect(guiWidth + 95, guiHeight + 113, xSize, 112, 40, 16); + } + } + else { + drawTexturedModalRect(guiWidth + 95, guiHeight + 113, xSize, 128, 40, 16); + } + } + else { + drawTexturedModalRect(guiWidth + 145, guiHeight + 78, xSize, 28, 6, 6); + drawTexturedModalRect(guiWidth + 146, guiHeight + 59, xSize + 12, 32, 16, 16); + drawTexturedModalRect(guiWidth + 13, guiHeight + 113, xSize, 80, 40, 16); + drawTexturedModalRect(guiWidth + 54, guiHeight + 113, xSize + 40, 80, 40, 16); + drawTexturedModalRect(guiWidth + 95, guiHeight + 113, xSize, 128, 40, 16); + } + + if(xAxis >= 123 && xAxis <= 134 && yAxis >= 68 && yAxis <= 79) + { + drawTexturedModalRect(guiWidth + 123, guiHeight + 68, xSize, 0, 11, 11); + } + else { + drawTexturedModalRect(guiWidth + 123, guiHeight + 68, xSize, 11, 11, 11); + } + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); + + trustedField.drawTextBox(); + } +} diff --git a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java index 71671ef29..8eb74f2df 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java @@ -8,6 +8,7 @@ import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -33,6 +34,7 @@ public class GuiSeismicVibrator extends GuiMekanism super(tentity, new ContainerSeismicVibrator(inventory, tentity)); tileEntity = tentity; + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiSeismicVibrator.png"))); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiSeismicVibrator.png"))); guiElements.add(new GuiPowerBar(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiSeismicVibrator.png"), 164, 15)); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { diff --git a/src/main/java/mekanism/client/gui/GuiSideConfiguration.java b/src/main/java/mekanism/client/gui/GuiSideConfiguration.java index a767e03f1..80c180430 100644 --- a/src/main/java/mekanism/client/gui/GuiSideConfiguration.java +++ b/src/main/java/mekanism/client/gui/GuiSideConfiguration.java @@ -20,6 +20,7 @@ import mekanism.common.network.PacketConfigurationUpdate.ConfigurationPacket; import mekanism.common.network.PacketConfigurationUpdate.ConfigurationUpdateMessage; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -136,17 +137,23 @@ public class GuiSideConfiguration extends GuiMekanism SideData data = configurable.getConfig().getOutput(currentType, EnumFacing.getFront(i)); - if(data.color != EnumColor.GREY) + if(data != TileComponentConfig.EMPTY) { - MekanismRenderer.color(data.color); - } - - if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) - { - drawTexturedModalRect(guiWidth + x, guiHeight + y, 176, 0, 14, 14); + if(data.color != EnumColor.GREY) + { + MekanismRenderer.color(data.color); + } + + if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) + { + drawTexturedModalRect(guiWidth + x, guiHeight + y, 176, 0, 14, 14); + } + else { + drawTexturedModalRect(guiWidth + x, guiHeight + y, 176, 14, 14, 14); + } } else { - drawTexturedModalRect(guiWidth + x, guiHeight + y, 176, 14, 14, 14); + drawTexturedModalRect(guiWidth + x, guiHeight + y, 176, 28, 14, 14); } } @@ -179,9 +186,12 @@ public class GuiSideConfiguration extends GuiMekanism SideData data = configurable.getConfig().getOutput(currentType, EnumFacing.getFront(i)); - if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) + if(data != TileComponentConfig.EMPTY) { - drawCreativeTabHoveringText(data.color + data.localize() + " (" + data.color.getName() + ")", xAxis, yAxis); + if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) + { + drawCreativeTabHoveringText(data.color + data.localize() + " (" + data.color.getName() + ")", xAxis, yAxis); + } } } diff --git a/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java b/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java index 14804e516..35da165d0 100644 --- a/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java +++ b/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java @@ -8,6 +8,7 @@ import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -33,6 +34,7 @@ public class GuiSolarNeutronActivator extends GuiMekanism super(tentity, new ContainerSolarNeutronActivator(inventory, tentity)); tileEntity = tentity; + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"))); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 4, 55).with(SlotOverlay.MINUS)); guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 154, 55).with(SlotOverlay.PLUS)); diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index c1a0cdcc2..9ccc02d61 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -8,6 +8,7 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiScrollList; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; @@ -21,6 +22,7 @@ import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage; import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterPacketType; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.IOwnerItem; import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; @@ -69,6 +71,8 @@ public class GuiTeleporter extends GuiMekanism public List clientPublicCache = new ArrayList(); public List clientPrivateCache = new ArrayList(); + + public boolean isInit = true; public GuiTeleporter(InventoryPlayer inventory, TileEntityTeleporter tentity) { @@ -76,6 +80,7 @@ public class GuiTeleporter extends GuiMekanism tileEntity = tentity; resource = MekanismUtils.getResource(ResourceType.GUI, "GuiTeleporter.png"); + guiElements.add(new GuiRedstoneControl(this, tileEntity, resource)); guiElements.add(new GuiPowerBar(this, new IPowerInfoHandler() { @Override public String getTooltip() @@ -122,6 +127,17 @@ public class GuiTeleporter extends GuiMekanism }, resource, 158, 26)); guiElements.add(scrollList = new GuiScrollList(this, resource, 28, 37, 120, 4)); + ItemPortableTeleporter item = (ItemPortableTeleporter)itemStack.getItem(); + + if(item.getFrequency(stack) != null) + { + privateMode = item.isPrivateMode(itemStack); + setFrequency(item.getFrequency(stack)); + } + else { + Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.DATA_REQUEST, clientFreq)); + } + ySize = 175; } @@ -160,9 +176,15 @@ public class GuiTeleporter extends GuiMekanism if(itemStack != null) { buttonList.add(teleportButton); + + if(!isInit) + { + Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.DATA_REQUEST, clientFreq)); + } + else { + isInit = false; + } } - - Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.DATA_REQUEST, clientFreq)); } public void setFrequency(String freq) @@ -464,7 +486,13 @@ public class GuiTeleporter extends GuiMekanism private String getOwner() { - return tileEntity != null ? tileEntity.owner : entityPlayer.getName(); + if(tileEntity != null) + { + return tileEntity.getSecurity().getOwner(); + } + else { + return ((IOwnerItem)itemStack.getItem()).getOwner(itemStack); + } } private byte getStatus() diff --git a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java index 15174d243..6f496b7ea 100644 --- a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java +++ b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java @@ -6,6 +6,7 @@ import java.util.Map; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.transmitters.TransmissionType; import mekanism.client.gui.GuiSideConfiguration.GuiPos; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; @@ -16,6 +17,7 @@ import mekanism.common.network.PacketConfigurationUpdate.ConfigurationPacket; import mekanism.common.network.PacketConfigurationUpdate.ConfigurationUpdateMessage; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -94,17 +96,23 @@ public class GuiTransporterConfig extends GuiMekanism EnumColor color = configurable.getEjector().getInputColor(EnumFacing.getFront(i)); - if(color != null) + if(configurable.getConfig().getOutput(TransmissionType.ITEM, i) != TileComponentConfig.EMPTY) { - MekanismRenderer.color(color); - } - - if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) - { - drawTexturedModalRect(guiWidth + x, guiHeight + y, 176, 0, 14, 14); + if(color != null) + { + MekanismRenderer.color(color); + } + + if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) + { + drawTexturedModalRect(guiWidth + x, guiHeight + y, 176, 0, 14, 14); + } + else { + drawTexturedModalRect(guiWidth + x, guiHeight + y, 176, 14, 14, 14); + } } else { - drawTexturedModalRect(guiWidth + x, guiHeight + y, 176, 14, 14, 14); + drawTexturedModalRect(guiWidth + x, guiHeight + y, 176, 28, 14, 14); } } @@ -146,9 +154,12 @@ public class GuiTransporterConfig extends GuiMekanism EnumColor color = configurable.getEjector().getInputColor(EnumFacing.getFront(i)); - if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) + if(configurable.getConfig().getOutput(TransmissionType.ITEM, i) != TileComponentConfig.EMPTY) { - drawCreativeTabHoveringText(color != null ? color.getName() : LangUtils.localize("gui.none"), xAxis, yAxis); + if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) + { + drawCreativeTabHoveringText(color != null ? color.getName() : LangUtils.localize("gui.none"), xAxis, yAxis); + } } } diff --git a/src/main/java/mekanism/client/gui/element/GuiRedstoneControl.java b/src/main/java/mekanism/client/gui/element/GuiRedstoneControl.java index 4413d88a9..99cff4bd4 100644 --- a/src/main/java/mekanism/client/gui/element/GuiRedstoneControl.java +++ b/src/main/java/mekanism/client/gui/element/GuiRedstoneControl.java @@ -12,7 +12,10 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +@SideOnly(Side.CLIENT) public class GuiRedstoneControl extends GuiElement { TileEntity tileEntity; diff --git a/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java b/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java new file mode 100644 index 000000000..c287d5c71 --- /dev/null +++ b/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java @@ -0,0 +1,195 @@ +package mekanism.client.gui.element; + +import mekanism.api.Coord4D; +import mekanism.api.EnumColor; +import mekanism.api.util.ListUtils; +import mekanism.client.gui.IGuiWrapper; +import mekanism.client.sound.SoundHandler; +import mekanism.common.Mekanism; +import mekanism.common.network.PacketSecurityMode.SecurityModeMessage; +import mekanism.common.security.ISecurityItem; +import mekanism.common.security.ISecurityTile; +import mekanism.common.security.ISecurityTile.SecurityMode; +import mekanism.common.security.SecurityFrequency; +import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import mekanism.common.util.SecurityUtils; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiSecurityTab extends GuiElement +{ + public boolean isItem; + + public TileEntity tileEntity; + + public GuiSecurityTab(IGuiWrapper gui, TileEntity tile, ResourceLocation def) + { + super(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, "GuiSecurityTab.png"), gui, def); + + tileEntity = tile; + } + + public GuiSecurityTab(IGuiWrapper gui, ResourceLocation def) + { + super(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, "GuiSecurityTab.png"), gui, def); + + isItem = true; + } + + @Override + public Rectangle4i getBounds(int guiWidth, int guiHeight) + { + return new Rectangle4i(guiWidth + 176, guiHeight + 32, 26, 26); + } + + @Override + public void renderBackground(int xAxis, int yAxis, int guiWidth, int guiHeight) + { + mc.renderEngine.bindTexture(RESOURCE); + + guiObj.drawTexturedRect(guiWidth + 176, guiHeight + 32, 0, 0, 26, 26); + + SecurityMode mode = getSecurity(); + SecurityFrequency freq = getFrequency(); + + if(freq != null && freq.override) + { + mode = freq.securityMode; + } + + int renderX = 26 + (18*mode.ordinal()); + + if(getOwner() != null && getOwner().equals(mc.thePlayer.getCommandSenderName()) && + (getFrequency() == null || !getFrequency().override)) + { + if(xAxis >= 179 && xAxis <= 197 && yAxis >= 36 && yAxis <= 54) + { + guiObj.drawTexturedRect(guiWidth + 179, guiHeight + 36, renderX, 0, 18, 18); + } + else { + guiObj.drawTexturedRect(guiWidth + 179, guiHeight + 36, renderX, 18, 18, 18); + } + } + else { + guiObj.drawTexturedRect(guiWidth + 179, guiHeight + 36, renderX, 36, 18, 18); + } + + mc.renderEngine.bindTexture(defaultLocation); + } + + @Override + public void renderForeground(int xAxis, int yAxis) + { + mc.renderEngine.bindTexture(RESOURCE); + + if(xAxis >= 179 && xAxis <= 197 && yAxis >= 36 && yAxis <= 54) + { + String securityDisplay = isItem ? SecurityUtils.getSecurityDisplay(getItem()) : SecurityUtils.getSecurityDisplay(tileEntity); + String securityText = EnumColor.GREY + LangUtils.localize("gui.security") + ": " + securityDisplay; + String ownerText = SecurityUtils.getOwnerDisplay(mc.thePlayer.getCommandSenderName(), getOwner()); + String overrideText = EnumColor.RED + "(" + LangUtils.localize("gui.overridden") + ")"; + + if(isItem ? SecurityUtils.isOverridden(getItem()) : SecurityUtils.isOverridden(tileEntity)) + { + displayTooltips(ListUtils.asList(securityText, ownerText, overrideText), xAxis, yAxis); + } + else { + displayTooltips(ListUtils.asList(securityText, ownerText), xAxis, yAxis); + } + } + + mc.renderEngine.bindTexture(defaultLocation); + } + + private SecurityFrequency getFrequency() + { + if(isItem) + { + if(getItem() == null || !(getItem().getItem() instanceof ISecurityItem)) + { + mc.thePlayer.closeScreen(); + return null; + } + + return SecurityUtils.getFrequency(getOwner()); + } + else { + return ((ISecurityTile)tileEntity).getSecurity().getFrequency(); + } + } + + private SecurityMode getSecurity() + { + if(isItem) + { + if(getItem() == null || !(getItem().getItem() instanceof ISecurityItem)) + { + mc.thePlayer.closeScreen(); + return SecurityMode.PUBLIC; + } + + return ((ISecurityItem)getItem().getItem()).getSecurity(getItem()); + } + else { + return ((ISecurityTile)tileEntity).getSecurity().getMode(); + } + } + + private String getOwner() + { + if(isItem) + { + if(getItem() == null || !(getItem().getItem() instanceof ISecurityItem)) + { + mc.thePlayer.closeScreen(); + return null; + } + + return ((ISecurityItem)getItem().getItem()).getOwner(getItem()); + } + else { + return ((ISecurityTile)tileEntity).getSecurity().getOwner(); + } + } + + private ItemStack getItem() + { + return mc.thePlayer.getCurrentEquippedItem(); + } + + @Override + public void preMouseClicked(int xAxis, int yAxis, int button) {} + + @Override + public void mouseClicked(int xAxis, int yAxis, int button) + { + if(button == 0) + { + if(getOwner() != null && mc.thePlayer.getCommandSenderName().equals(getOwner())) + { + if(xAxis >= 179 && xAxis <= 197 && yAxis >= 36 && yAxis <= 54) + { + SecurityMode current = getSecurity(); + int ordinalToSet = current.ordinal() < (SecurityMode.values().length-1) ? current.ordinal()+1 : 0; + + SoundHandler.playSound("gui.button.press"); + + if(isItem) + { + Mekanism.packetHandler.sendToServer(new SecurityModeMessage(SecurityMode.values()[ordinalToSet])); + } + else { + Mekanism.packetHandler.sendToServer(new SecurityModeMessage(Coord4D.get(tileEntity), SecurityMode.values()[ordinalToSet])); + } + } + } + } + } +} diff --git a/src/main/java/mekanism/client/model/ModelChargepad.java b/src/main/java/mekanism/client/model/ModelChargepad.java index cea4d1716..731e5509f 100644 --- a/src/main/java/mekanism/client/model/ModelChargepad.java +++ b/src/main/java/mekanism/client/model/ModelChargepad.java @@ -1,63 +1,105 @@ package mekanism.client.model; +import mekanism.client.render.MekanismRenderer; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelChargepad extends ModelBase { - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape4; - ModelRenderer Shape5; + public static ResourceLocation OVERLAY = MekanismUtils.getResource(ResourceType.RENDER, "Chargepad_Overlay.png"); + + ModelRenderer base; + ModelRenderer port; + ModelRenderer plug; + ModelRenderer connector; + ModelRenderer stand; + ModelRenderer pillar2; + ModelRenderer pillar1; - public ModelChargepad() + public ModelChargepad() { textureWidth = 64; textureHeight = 64; - Shape1 = new ModelRenderer(this, 0, 0); - Shape1.addBox(0F, 0F, 0F, 16, 1, 16); - Shape1.setRotationPoint(-8F, 23F, -8F); - Shape1.setTextureSize(64, 64); - Shape1.mirror = true; - setRotation(Shape1, 0F, 0F, 0F); - Shape2 = new ModelRenderer(this, 0, 18); - Shape2.addBox(0F, 0F, 0F, 8, 11, 2); - Shape2.setRotationPoint(-4F, 12F, 6F); - Shape2.setTextureSize(64, 64); - Shape2.mirror = true; - setRotation(Shape2, 0F, 0F, 0F); - Shape3 = new ModelRenderer(this, 0, 0); - Shape3.addBox(0F, 0F, 0F, 4, 3, 1); - Shape3.setRotationPoint(-2F, 14F, 5F); - Shape3.setTextureSize(64, 64); - Shape3.mirror = true; - setRotation(Shape3, 0F, 0F, 0F); - Shape4 = new ModelRenderer(this, 3, 8); - Shape4.addBox(0F, 0F, 0F, 2, 5, 2); - Shape4.setRotationPoint(-5F, 18F, 5F); - Shape4.setTextureSize(64, 64); - Shape4.mirror = true; - setRotation(Shape4, 0F, 0F, 0F); - Shape5 = new ModelRenderer(this, 3, 8); - Shape5.addBox(0F, 0F, 0F, 2, 5, 2); - Shape5.setRotationPoint(3F, 18F, 5F); - Shape5.setTextureSize(64, 64); - Shape5.mirror = true; - setRotation(Shape5, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 1, 16); + base.setRotationPoint(-8F, 23F, -8F); + base.setTextureSize(64, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + port = new ModelRenderer(this, 0, 17); + port.addBox(0F, 0F, 0F, 8, 8, 1); + port.setRotationPoint(-4F, 12F, 7F); + port.setTextureSize(64, 64); + port.mirror = true; + setRotation(port, 0F, 0F, 0F); + plug = new ModelRenderer(this, 0, 11); + plug.addBox(0F, 0F, 0F, 2, 1, 2); + plug.setRotationPoint(-1F, 19F, 3F); + plug.setTextureSize(64, 64); + plug.mirror = true; + setRotation(plug, 0F, 0F, 0F); + connector = new ModelRenderer(this, 18, 17); + connector.addBox(0F, 0F, 0F, 6, 6, 1); + connector.setRotationPoint(-3F, 13F, 6F); + connector.setTextureSize(64, 64); + connector.mirror = true; + setRotation(connector, 0F, 0F, 0F); + stand = new ModelRenderer(this, 0, 0); + stand.addBox(0F, 0F, 0F, 6, 10, 1); + stand.setRotationPoint(-3F, 13F, 5F); + stand.setTextureSize(64, 64); + stand.mirror = true; + setRotation(stand, 0F, 0F, 0F); + pillar2 = new ModelRenderer(this, 48, 0); + pillar2.mirror = true; + pillar2.addBox(0F, 0F, 0F, 2, 7, 2); + pillar2.setRotationPoint(2F, 16F, 3.99F); + pillar2.setTextureSize(64, 64); + setRotation(pillar2, 0F, 0F, 0F); + pillar1 = new ModelRenderer(this, 48, 0); + pillar1.addBox(0F, 0F, 0F, 2, 7, 2); + pillar1.setRotationPoint(-4F, 16F, 3.99F); + pillar1.setTextureSize(64, 64); + pillar1.mirror = true; + setRotation(pillar1, 0F, 0F, 0F); + } + + public void render(float size, TextureManager manager) + { + doRender(size); + + GL11.glPushMatrix(); + manager.bindTexture(OVERLAY); + GL11.glScalef(1.001F, 1.001F, 1.001F); + GL11.glTranslatef(0, -0.0011F, 0); + MekanismRenderer.glowOn(); + + doRender(size); + + MekanismRenderer.glowOff(); + GL11.glPopMatrix(); } - public void render(float size) + private void doRender(float size) { - Shape1.render(size); - Shape2.render(size); - Shape3.render(size); - Shape4.render(size); - Shape5.render(size); + base.render(size); + port.render(size); + plug.render(size); + connector.render(size); + stand.render(size); + pillar2.render(size); + pillar1.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java b/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java index 37473256e..ecee4cc64 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java @@ -9,315 +9,158 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelChemicalCrystallizer extends ModelBase { - ModelRenderer Base; - ModelRenderer IO1; - ModelRenderer IO2; - ModelRenderer Base3; - ModelRenderer Base2; - ModelRenderer Can1B; - ModelRenderer Can1T; - ModelRenderer Can1Side3; - ModelRenderer Can1Side1; - ModelRenderer Can1Side2; - ModelRenderer Can1Side4; - ModelRenderer Can2Side4; - ModelRenderer Can3Side3; - ModelRenderer Can2Side2; - ModelRenderer Can2Side3; - ModelRenderer Can2Side1; - ModelRenderer Can4Side3; - ModelRenderer Can4Side1; - ModelRenderer Can4Sjde4; - ModelRenderer Can4Side2; - ModelRenderer Can3Side4; - ModelRenderer Can4B; - ModelRenderer Can3Side2; - ModelRenderer Can3Side1; - ModelRenderer Can2B; - ModelRenderer Can4T; - ModelRenderer Can2T; - ModelRenderer Can3T; - ModelRenderer Can3B; - ModelRenderer Spire; - ModelRenderer Spin; - ModelRenderer Vial1; - ModelRenderer Vial2; - ModelRenderer Vial3; - ModelRenderer Vial4; + ModelRenderer tray; + ModelRenderer support4; + ModelRenderer rimBack; + ModelRenderer portRight; + ModelRenderer rimRight; + ModelRenderer rimLeft; + ModelRenderer rimFront; + ModelRenderer portLeft; + ModelRenderer support3; + ModelRenderer support2; + ModelRenderer support1; + ModelRenderer tank; + ModelRenderer rod1; + ModelRenderer rod2; + ModelRenderer rod3; + ModelRenderer base; + ModelRenderer Shape1; - public ModelChemicalCrystallizer() + public ModelChemicalCrystallizer() { textureWidth = 128; textureHeight = 64; - Base = new ModelRenderer(this, 16, 0); - Base.addBox(0F, 0F, 0F, 14, 1, 14); - Base.setRotationPoint(-7F, 23F, -7F); - Base.setTextureSize(128, 64); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - IO1 = new ModelRenderer(this, 9, 17); - IO1.addBox(0F, 0F, 0F, 1, 8, 8); - IO1.setRotationPoint(-8F, 12F, -4F); - IO1.setTextureSize(128, 64); - IO1.mirror = true; - setRotation(IO1, 0F, 0F, 0F); - IO2 = new ModelRenderer(this, 9, 17); - IO2.addBox(0F, 0F, 0F, 1, 8, 8); - IO2.setRotationPoint(7F, 12F, -4F); - IO2.setTextureSize(128, 64); - IO2.mirror = true; - setRotation(IO2, 0F, 0F, 0F); - Base3 = new ModelRenderer(this, 16, 0); - Base3.addBox(0F, 0F, 0F, 14, 1, 14); - Base3.setRotationPoint(-7F, 9F, -7F); - Base3.setTextureSize(128, 64); - Base3.mirror = true; - setRotation(Base3, 0F, 0F, 0F); - Base2 = new ModelRenderer(this, 16, 0); - Base2.addBox(0F, 0F, 0F, 14, 1, 14); - Base2.setRotationPoint(-7F, 14F, -7F); - Base2.setTextureSize(128, 64); - Base2.mirror = true; - setRotation(Base2, 0F, 0F, 0F); - Can1B = new ModelRenderer(this, 0, 0); - Can1B.addBox(0F, 0F, 0F, 4, 1, 4); - Can1B.setRotationPoint(2F, 13F, 2F); - Can1B.setTextureSize(128, 64); - Can1B.mirror = true; - setRotation(Can1B, 0F, 0F, 0F); - Can1T = new ModelRenderer(this, 0, 0); - Can1T.addBox(0F, 0F, 0F, 4, 1, 4); - Can1T.setRotationPoint(2F, 10F, 2F); - Can1T.setTextureSize(128, 64); - Can1T.mirror = true; - setRotation(Can1T, 0F, 0F, 0F); - Can1Side3 = new ModelRenderer(this, 0, 0); - Can1Side3.addBox(0F, 0F, 0F, 1, 2, 2); - Can1Side3.setRotationPoint(5F, 11F, 3F); - Can1Side3.setTextureSize(128, 64); - Can1Side3.mirror = true; - setRotation(Can1Side3, 0F, 0F, 0F); - Can1Side1 = new ModelRenderer(this, 0, 0); - Can1Side1.addBox(0F, 0F, 0F, 4, 2, 1); - Can1Side1.setRotationPoint(2F, 11F, 5F); - Can1Side1.setTextureSize(128, 64); - Can1Side1.mirror = true; - setRotation(Can1Side1, 0F, 0F, 0F); - Can1Side2 = new ModelRenderer(this, 0, 0); - Can1Side2.addBox(0F, 0F, 0F, 4, 2, 1); - Can1Side2.setRotationPoint(2F, 11F, 2F); - Can1Side2.setTextureSize(128, 64); - Can1Side2.mirror = true; - setRotation(Can1Side2, 0F, 0F, 0F); - Can1Side4 = new ModelRenderer(this, 0, 0); - Can1Side4.addBox(0F, 0F, 0F, 1, 2, 2); - Can1Side4.setRotationPoint(2F, 11F, 3F); - Can1Side4.setTextureSize(128, 64); - Can1Side4.mirror = true; - setRotation(Can1Side4, 0F, 0F, 0F); - Can2Side4 = new ModelRenderer(this, 0, 0); - Can2Side4.addBox(0F, 0F, 0F, 1, 2, 2); - Can2Side4.setRotationPoint(-6F, 11F, 3F); - Can2Side4.setTextureSize(128, 64); - Can2Side4.mirror = true; - setRotation(Can2Side4, 0F, 0F, 0F); - Can3Side3 = new ModelRenderer(this, 0, 0); - Can3Side3.addBox(0F, 0F, 0F, 1, 2, 2); - Can3Side3.setRotationPoint(5F, 11F, -5F); - Can3Side3.setTextureSize(128, 64); - Can3Side3.mirror = true; - setRotation(Can3Side3, 0F, 0F, 0F); - Can2Side2 = new ModelRenderer(this, 0, 0); - Can2Side2.addBox(0F, 0F, 0F, 4, 2, 1); - Can2Side2.setRotationPoint(-6F, 11F, 2F); - Can2Side2.setTextureSize(128, 64); - Can2Side2.mirror = true; - setRotation(Can2Side2, 0F, 0F, 0F); - Can2Side3 = new ModelRenderer(this, 0, 0); - Can2Side3.addBox(0F, 0F, 0F, 1, 2, 2); - Can2Side3.setRotationPoint(-3F, 11F, 3F); - Can2Side3.setTextureSize(128, 64); - Can2Side3.mirror = true; - setRotation(Can2Side3, 0F, 0F, 0F); - Can2Side1 = new ModelRenderer(this, 0, 0); - Can2Side1.addBox(0F, 0F, 0F, 4, 2, 1); - Can2Side1.setRotationPoint(-6F, 11F, 5F); - Can2Side1.setTextureSize(128, 64); - Can2Side1.mirror = true; - setRotation(Can2Side1, 0F, 0F, 0F); - Can4Side3 = new ModelRenderer(this, 0, 0); - Can4Side3.addBox(0F, 0F, 0F, 1, 2, 2); - Can4Side3.setRotationPoint(-3F, 11F, -5F); - Can4Side3.setTextureSize(128, 64); - Can4Side3.mirror = true; - setRotation(Can4Side3, 0F, 0F, 0F); - Can4Side1 = new ModelRenderer(this, 0, 0); - Can4Side1.addBox(0F, 0F, 0F, 4, 2, 1); - Can4Side1.setRotationPoint(-6F, 11F, -3F); - Can4Side1.setTextureSize(128, 64); - Can4Side1.mirror = true; - setRotation(Can4Side1, 0F, 0F, 0F); - Can4Sjde4 = new ModelRenderer(this, 0, 0); - Can4Sjde4.addBox(0F, 0F, 0F, 1, 2, 2); - Can4Sjde4.setRotationPoint(-6F, 11F, -5F); - Can4Sjde4.setTextureSize(128, 64); - Can4Sjde4.mirror = true; - setRotation(Can4Sjde4, 0F, 0F, 0F); - Can4Side2 = new ModelRenderer(this, 0, 0); - Can4Side2.addBox(0F, 0F, 0F, 4, 2, 1); - Can4Side2.setRotationPoint(-6F, 11F, -6F); - Can4Side2.setTextureSize(128, 64); - Can4Side2.mirror = true; - setRotation(Can4Side2, 0F, 0F, 0F); - Can3Side4 = new ModelRenderer(this, 0, 0); - Can3Side4.addBox(0F, 0F, 0F, 1, 2, 2); - Can3Side4.setRotationPoint(2F, 11F, -5F); - Can3Side4.setTextureSize(128, 64); - Can3Side4.mirror = true; - setRotation(Can3Side4, 0F, 0F, 0F); - Can4B = new ModelRenderer(this, 0, 0); - Can4B.addBox(0F, 0F, 0F, 4, 1, 4); - Can4B.setRotationPoint(-6F, 13F, -6F); - Can4B.setTextureSize(128, 64); - Can4B.mirror = true; - setRotation(Can4B, 0F, 0F, 0F); - Can3Side2 = new ModelRenderer(this, 0, 0); - Can3Side2.addBox(0F, 0F, 0F, 4, 2, 1); - Can3Side2.setRotationPoint(2F, 11F, -6F); - Can3Side2.setTextureSize(128, 64); - Can3Side2.mirror = true; - setRotation(Can3Side2, 0F, 0F, 0F); - Can3Side1 = new ModelRenderer(this, 0, 0); - Can3Side1.addBox(0F, 0F, 0F, 4, 2, 1); - Can3Side1.setRotationPoint(2F, 11F, -3F); - Can3Side1.setTextureSize(128, 64); - Can3Side1.mirror = true; - setRotation(Can3Side1, 0F, 0F, 0F); - Can2B = new ModelRenderer(this, 0, 0); - Can2B.addBox(0F, 0F, 0F, 4, 1, 4); - Can2B.setRotationPoint(-6F, 13F, 2F); - Can2B.setTextureSize(128, 64); - Can2B.mirror = true; - setRotation(Can2B, 0F, 0F, 0F); - Can4T = new ModelRenderer(this, 0, 0); - Can4T.addBox(0F, 0F, 0F, 4, 1, 4); - Can4T.setRotationPoint(-6F, 10F, -6F); - Can4T.setTextureSize(128, 64); - Can4T.mirror = true; - setRotation(Can4T, 0F, 0F, 0F); - Can2T = new ModelRenderer(this, 0, 0); - Can2T.addBox(0F, 0F, 0F, 4, 1, 4); - Can2T.setRotationPoint(-6F, 10F, 2F); - Can2T.setTextureSize(128, 64); - Can2T.mirror = true; - setRotation(Can2T, 0F, 0F, 0F); - Can3T = new ModelRenderer(this, 0, 0); - Can3T.addBox(0F, 0F, 0F, 4, 1, 4); - Can3T.setRotationPoint(2F, 10F, -6F); - Can3T.setTextureSize(128, 64); - Can3T.mirror = true; - setRotation(Can3T, 0F, 0F, 0F); - Can3B = new ModelRenderer(this, 0, 0); - Can3B.addBox(0F, 0F, 0F, 4, 1, 4); - Can3B.setRotationPoint(2F, 13F, -6F); - Can3B.setTextureSize(128, 64); - Can3B.mirror = true; - setRotation(Can3B, 0F, 0F, 0F); - Spire = new ModelRenderer(this, 0, 6); - Spire.addBox(0F, 0F, 0F, 2, 8, 2); - Spire.setRotationPoint(-1F, 15F, -1F); - Spire.setTextureSize(128, 64); - Spire.mirror = true; - setRotation(Spire, 0F, 0F, 0F); - Spin = new ModelRenderer(this, 28, 24); - Spin.addBox(-4F, 0F, -4F, 8, 1, 8); - Spin.setRotationPoint(0F, 16F, 0F); - Spin.setTextureSize(128, 64); - Spin.mirror = true; - setRotation(Spin, 0F, 0F, 0F); - Vial1 = new ModelRenderer(this, 8, 6); - Vial1.addBox(-3F, 0.5F, 3F, 2, 3, 2); - Vial1.setRotationPoint(0F, 16F, 0F); - Vial1.setTextureSize(128, 64); - Vial1.mirror = true; - setRotation(Vial1, 0F, 0F, 0F); - Vial2 = new ModelRenderer(this, 8, 6); - Vial2.addBox(1F, 0.5F, 3F, 2, 3, 2); - Vial2.setRotationPoint(0F, 16F, 0F); - Vial2.setTextureSize(128, 64); - Vial2.mirror = true; - setRotation(Vial2, 0F, 0F, 0F); - Vial3 = new ModelRenderer(this, 8, 6); - Vial3.addBox(-3F, 0.5F, -5F, 2, 3, 2); - Vial3.setRotationPoint(0F, 16F, 0F); - Vial3.setTextureSize(128, 64); - Vial3.mirror = true; - setRotation(Vial3, 0F, 0F, 0F); - Vial4 = new ModelRenderer(this, 8, 6); - Vial4.addBox(1F, 0.5F, -5F, 2, 3, 2); - Vial4.setRotationPoint(0F, 16F, 0F); - Vial4.setTextureSize(128, 64); - Vial4.mirror = true; - setRotation(Vial4, 0F, 0F, 0F); + tray = new ModelRenderer(this, 48, 0); + tray.addBox(0F, 0F, 0F, 10, 1, 10); + tray.setRotationPoint(-5F, 18.5F, -5F); + tray.setTextureSize(128, 64); + tray.mirror = true; + setRotation(tray, 0F, 0F, 0F); + support4 = new ModelRenderer(this, 0, 0); + support4.addBox(0F, 0F, 0F, 1, 5, 1); + support4.setRotationPoint(6.5F, 13F, 6.5F); + support4.setTextureSize(128, 64); + support4.mirror = true; + setRotation(support4, 0F, 0F, 0F); + rimBack = new ModelRenderer(this, 0, 46); + rimBack.addBox(0F, 0F, 0F, 16, 2, 2); + rimBack.setRotationPoint(-8F, 17F, 6F); + rimBack.setTextureSize(128, 64); + rimBack.mirror = true; + setRotation(rimBack, 0F, 0F, 0F); + portRight = new ModelRenderer(this, 54, 42); + portRight.mirror = true; + portRight.addBox(0F, 0F, 0F, 1, 10, 10); + portRight.setRotationPoint(7.01F, 11F, -5F); + portRight.setTextureSize(128, 64); + setRotation(portRight, 0F, 0F, 0F); + rimRight = new ModelRenderer(this, 0, 50); + rimRight.mirror = true; + rimRight.addBox(0F, 0F, 0F, 2, 2, 12); + rimRight.setRotationPoint(6F, 17F, -6F); + rimRight.setTextureSize(128, 64); + setRotation(rimRight, 0F, 0F, 0F); + rimLeft = new ModelRenderer(this, 0, 50); + rimLeft.addBox(0F, 0F, 0F, 2, 2, 12); + rimLeft.setRotationPoint(-8F, 17F, -6F); + rimLeft.setTextureSize(128, 64); + rimLeft.mirror = true; + setRotation(rimLeft, 0F, 0F, 0F); + rimFront = new ModelRenderer(this, 0, 42); + rimFront.addBox(0F, 0F, 0F, 16, 2, 2); + rimFront.setRotationPoint(-8F, 17F, -8F); + rimFront.setTextureSize(128, 64); + rimFront.mirror = true; + setRotation(rimFront, 0F, 0F, 0F); + portLeft = new ModelRenderer(this, 36, 42); + portLeft.addBox(0F, 0F, 0F, 1, 8, 8); + portLeft.setRotationPoint(-8.01F, 12F, -4F); + portLeft.setTextureSize(128, 64); + portLeft.mirror = true; + setRotation(portLeft, 0F, 0F, 0F); + support3 = new ModelRenderer(this, 0, 0); + support3.addBox(0F, 0F, 0F, 1, 5, 1); + support3.setRotationPoint(-7.5F, 13F, 6.5F); + support3.setTextureSize(128, 64); + support3.mirror = true; + setRotation(support3, 0F, 0F, 0F); + support2 = new ModelRenderer(this, 0, 0); + support2.addBox(0F, 0F, 0F, 1, 5, 1); + support2.setRotationPoint(6.5F, 13F, -7.5F); + support2.setTextureSize(128, 64); + support2.mirror = true; + setRotation(support2, 0F, 0F, 0F); + support1 = new ModelRenderer(this, 0, 0); + support1.addBox(0F, 0F, 0F, 1, 5, 1); + support1.setRotationPoint(-7.5F, 13F, -7.5F); + support1.setTextureSize(128, 64); + support1.mirror = true; + setRotation(support1, 0F, 0F, 0F); + tank = new ModelRenderer(this, 0, 0); + tank.addBox(0F, 0F, 0F, 16, 5, 16); + tank.setRotationPoint(-8F, 8F, -8F); + tank.setTextureSize(128, 64); + tank.mirror = true; + setRotation(tank, 0F, 0F, 0F); + rod1 = new ModelRenderer(this, 8, 0); + rod1.addBox(0F, 0F, 0F, 1, 2, 1); + rod1.setRotationPoint(-2F, 13F, 0F); + rod1.setTextureSize(128, 64); + rod1.mirror = true; + setRotation(rod1, 0F, 0F, 0F); + rod2 = new ModelRenderer(this, 8, 3); + rod2.addBox(0F, 0F, 0F, 1, 3, 1); + rod2.setRotationPoint(1F, 13F, 1F); + rod2.setTextureSize(128, 64); + rod2.mirror = true; + setRotation(rod2, 0F, 0F, 0F); + rod3 = new ModelRenderer(this, 4, 0); + rod3.addBox(0F, 0F, 0F, 1, 4, 1); + rod3.setRotationPoint(-0.5F, 13F, -2F); + rod3.setTextureSize(128, 64); + rod3.mirror = true; + setRotation(rod3, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 21); + base.addBox(0F, 0F, 0F, 16, 5, 16); + base.setRotationPoint(-8F, 19F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + Shape1 = new ModelRenderer(this, 64, 11); + Shape1.addBox(0F, 0F, 0F, 14, 4, 14); + Shape1.setRotationPoint(-7F, 13F, -7F); + Shape1.setTextureSize(128, 64); + Shape1.mirror = true; + setRotation(Shape1, 0F, 0F, 0F); } public void render(float size) { MekanismRenderer.blendOn(); - - Base.render(size); - IO1.render(size); - IO2.render(size); - Base3.render(size); - Base2.render(size); - Can1B.render(size); - Can1T.render(size); - Can1Side3.render(size); - Can1Side1.render(size); - Can1Side2.render(size); - Can1Side4.render(size); - Can2Side4.render(size); - Can3Side3.render(size); - Can2Side2.render(size); - Can2Side3.render(size); - Can2Side1.render(size); - Can4Side3.render(size); - Can4Side1.render(size); - Can4Sjde4.render(size); - Can4Side2.render(size); - Can3Side4.render(size); - Can4B.render(size); - Can3Side2.render(size); - Can3Side1.render(size); - Can2B.render(size); - Can4T.render(size); - Can2T.render(size); - Can3T.render(size); - Can3B.render(size); - Spire.render(size); - Spin.render(size); - Vial1.render(size); - Vial2.render(size); - Vial3.render(size); - Vial4.render(size); - + + tray.render(size); + support4.render(size); + rimBack.render(size); + portRight.render(size); + rimRight.render(size); + rimLeft.render(size); + rimFront.render(size); + portLeft.render(size); + support3.render(size); + support2.render(size); + support1.render(size); + tank.render(size); + rod1.render(size); + rod2.render(size); + rod3.render(size); + base.render(size); + Shape1.render(size); + MekanismRenderer.blendOff(); } - public void renderWithRotation(float size, float rotate) - { - rotate *= Math.PI; - - Spin.rotateAngleY = rotate; - Vial1.rotateAngleY = rotate; - Vial2.rotateAngleY = rotate; - Vial3.rotateAngleY = rotate; - Vial4.rotateAngleY = rotate; - - render(size); - } - private void setRotation(ModelRenderer model, float x, float y, float z) { model.rotateAngleX = x; diff --git a/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java b/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java index bd1b22f0c..5ec6c32c9 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java @@ -9,299 +9,259 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelChemicalDissolutionChamber extends ModelBase { - ModelRenderer Centre; - ModelRenderer Base; - ModelRenderer Base2; - ModelRenderer Can1B; - ModelRenderer Can1T; - ModelRenderer Can1Side3; - ModelRenderer Can1Side1; - ModelRenderer Can1Side2; - ModelRenderer Can1Side4; - ModelRenderer Can2Side4; - ModelRenderer Can3Side3; - ModelRenderer Can2Side2; - ModelRenderer Can2Side3; - ModelRenderer Can2Side1; - ModelRenderer Can4Side3; - ModelRenderer Can4Side1; - ModelRenderer Can4Sjde4; - ModelRenderer Can4Side2; - ModelRenderer Can3Side4; - ModelRenderer Can4B; - ModelRenderer Can3Side2; - ModelRenderer Can3Side1; - ModelRenderer Can2B; - ModelRenderer Can4T; - ModelRenderer Can2T; - ModelRenderer Can3T; - ModelRenderer Can3B; - ModelRenderer IO1; - ModelRenderer IO2Port; - ModelRenderer IO2; - ModelRenderer IO2Port2; - ModelRenderer Coil1; - ModelRenderer Coil2; - ModelRenderer Coil3; - ModelRenderer Coil4; + ModelRenderer support2; + ModelRenderer vat5; + ModelRenderer top2; + ModelRenderer top; + ModelRenderer base; + ModelRenderer vat2; + ModelRenderer vat3; + ModelRenderer vat6; + ModelRenderer vat9; + ModelRenderer vat8; + ModelRenderer vat7; + ModelRenderer vat4; + ModelRenderer backEdge2; + ModelRenderer back; + ModelRenderer backEdge1; + ModelRenderer vents; + ModelRenderer support1; + ModelRenderer vat1; + ModelRenderer nozzle8; + ModelRenderer nozzle5; + ModelRenderer nozzle7; + ModelRenderer nozzle4; + ModelRenderer nozzle9; + ModelRenderer nozzle6; + ModelRenderer nozzle3; + ModelRenderer nozzle2; + ModelRenderer nozzle1; + ModelRenderer glass; + ModelRenderer portToggle1; + ModelRenderer portToggle2; - public ModelChemicalDissolutionChamber() + public ModelChemicalDissolutionChamber() { textureWidth = 128; textureHeight = 64; - Centre = new ModelRenderer(this, 0, 17); - Centre.addBox(0F, 0F, 0F, 2, 13, 2); - Centre.setRotationPoint(-1F, 9F, -1F); - Centre.setTextureSize(128, 64); - Centre.mirror = true; - setRotation(Centre, 0F, 0F, 0F); - Base = new ModelRenderer(this, 16, 0); - Base.addBox(0F, 0F, 0F, 14, 2, 14); - Base.setRotationPoint(-7F, 22F, -7F); - Base.setTextureSize(128, 64); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - Base2 = new ModelRenderer(this, 16, 0); - Base2.addBox(0F, 0F, 0F, 14, 1, 14); - Base2.setRotationPoint(-7F, 16F, -7F); - Base2.setTextureSize(128, 64); - Base2.mirror = true; - setRotation(Base2, 0F, 0F, 0F); - Can1B = new ModelRenderer(this, 0, 0); - Can1B.addBox(0F, 0F, 0F, 4, 1, 4); - Can1B.setRotationPoint(2F, 21F, 2F); - Can1B.setTextureSize(128, 64); - Can1B.mirror = true; - setRotation(Can1B, 0F, 0F, 0F); - Can1T = new ModelRenderer(this, 0, 0); - Can1T.addBox(0F, 0F, 0F, 4, 1, 4); - Can1T.setRotationPoint(2F, 17F, 2F); - Can1T.setTextureSize(128, 64); - Can1T.mirror = true; - setRotation(Can1T, 0F, 0F, 0F); - Can1Side3 = new ModelRenderer(this, 0, 0); - Can1Side3.addBox(0F, 0F, 0F, 1, 3, 2); - Can1Side3.setRotationPoint(5F, 18F, 3F); - Can1Side3.setTextureSize(128, 64); - Can1Side3.mirror = true; - setRotation(Can1Side3, 0F, 0F, 0F); - Can1Side1 = new ModelRenderer(this, 0, 0); - Can1Side1.addBox(0F, 0F, 0F, 4, 3, 1); - Can1Side1.setRotationPoint(2F, 18F, 5F); - Can1Side1.setTextureSize(128, 64); - Can1Side1.mirror = true; - setRotation(Can1Side1, 0F, 0F, 0F); - Can1Side2 = new ModelRenderer(this, 0, 0); - Can1Side2.addBox(0F, 0F, 0F, 4, 3, 1); - Can1Side2.setRotationPoint(2F, 18F, 2F); - Can1Side2.setTextureSize(128, 64); - Can1Side2.mirror = true; - setRotation(Can1Side2, 0F, 0F, 0F); - Can1Side4 = new ModelRenderer(this, 0, 0); - Can1Side4.addBox(0F, 0F, 0F, 1, 3, 2); - Can1Side4.setRotationPoint(2F, 18F, 3F); - Can1Side4.setTextureSize(128, 64); - Can1Side4.mirror = true; - setRotation(Can1Side4, 0F, 0F, 0F); - Can2Side4 = new ModelRenderer(this, 0, 0); - Can2Side4.addBox(0F, 0F, 0F, 1, 3, 2); - Can2Side4.setRotationPoint(-6F, 18F, 3F); - Can2Side4.setTextureSize(128, 64); - Can2Side4.mirror = true; - setRotation(Can2Side4, 0F, 0F, 0F); - Can3Side3 = new ModelRenderer(this, 0, 0); - Can3Side3.addBox(0F, 0F, 0F, 1, 3, 2); - Can3Side3.setRotationPoint(5F, 18F, -5F); - Can3Side3.setTextureSize(128, 64); - Can3Side3.mirror = true; - setRotation(Can3Side3, 0F, 0F, 0F); - Can2Side2 = new ModelRenderer(this, 0, 0); - Can2Side2.addBox(0F, 0F, 0F, 4, 3, 1); - Can2Side2.setRotationPoint(-6F, 18F, 2F); - Can2Side2.setTextureSize(128, 64); - Can2Side2.mirror = true; - setRotation(Can2Side2, 0F, 0F, 0F); - Can2Side3 = new ModelRenderer(this, 0, 0); - Can2Side3.addBox(0F, 0F, 0F, 1, 3, 2); - Can2Side3.setRotationPoint(-3F, 18F, 3F); - Can2Side3.setTextureSize(128, 64); - Can2Side3.mirror = true; - setRotation(Can2Side3, 0F, 0F, 0F); - Can2Side1 = new ModelRenderer(this, 0, 0); - Can2Side1.addBox(0F, 0F, 0F, 4, 3, 1); - Can2Side1.setRotationPoint(-6F, 18F, 5F); - Can2Side1.setTextureSize(128, 64); - Can2Side1.mirror = true; - setRotation(Can2Side1, 0F, 0F, 0F); - Can4Side3 = new ModelRenderer(this, 0, 0); - Can4Side3.addBox(0F, 0F, 0F, 1, 3, 2); - Can4Side3.setRotationPoint(-3F, 18F, -5F); - Can4Side3.setTextureSize(128, 64); - Can4Side3.mirror = true; - setRotation(Can4Side3, 0F, 0F, 0F); - Can4Side1 = new ModelRenderer(this, 0, 0); - Can4Side1.addBox(0F, 0F, 0F, 4, 3, 1); - Can4Side1.setRotationPoint(-6F, 18F, -3F); - Can4Side1.setTextureSize(128, 64); - Can4Side1.mirror = true; - setRotation(Can4Side1, 0F, 0F, 0F); - Can4Sjde4 = new ModelRenderer(this, 0, 0); - Can4Sjde4.addBox(0F, 0F, 0F, 1, 3, 2); - Can4Sjde4.setRotationPoint(-6F, 18F, -5F); - Can4Sjde4.setTextureSize(128, 64); - Can4Sjde4.mirror = true; - setRotation(Can4Sjde4, 0F, 0F, 0F); - Can4Side2 = new ModelRenderer(this, 0, 0); - Can4Side2.addBox(0F, 0F, 0F, 4, 3, 1); - Can4Side2.setRotationPoint(-6F, 18F, -6F); - Can4Side2.setTextureSize(128, 64); - Can4Side2.mirror = true; - setRotation(Can4Side2, 0F, 0F, 0F); - Can3Side4 = new ModelRenderer(this, 0, 0); - Can3Side4.addBox(0F, 0F, 0F, 1, 3, 2); - Can3Side4.setRotationPoint(2F, 18F, -5F); - Can3Side4.setTextureSize(128, 64); - Can3Side4.mirror = true; - setRotation(Can3Side4, 0F, 0F, 0F); - Can4B = new ModelRenderer(this, 0, 0); - Can4B.addBox(0F, 0F, 0F, 4, 1, 4); - Can4B.setRotationPoint(-6F, 21F, -6F); - Can4B.setTextureSize(128, 64); - Can4B.mirror = true; - setRotation(Can4B, 0F, 0F, 0F); - Can3Side2 = new ModelRenderer(this, 0, 0); - Can3Side2.addBox(0F, 0F, 0F, 4, 3, 1); - Can3Side2.setRotationPoint(2F, 18F, -6F); - Can3Side2.setTextureSize(128, 64); - Can3Side2.mirror = true; - setRotation(Can3Side2, 0F, 0F, 0F); - Can3Side1 = new ModelRenderer(this, 0, 0); - Can3Side1.addBox(0F, 0F, 0F, 4, 3, 1); - Can3Side1.setRotationPoint(2F, 18F, -3F); - Can3Side1.setTextureSize(128, 64); - Can3Side1.mirror = true; - setRotation(Can3Side1, 0F, 0F, 0F); - Can2B = new ModelRenderer(this, 0, 0); - Can2B.addBox(0F, 0F, 0F, 4, 1, 4); - Can2B.setRotationPoint(-6F, 21F, 2F); - Can2B.setTextureSize(128, 64); - Can2B.mirror = true; - setRotation(Can2B, 0F, 0F, 0F); - Can4T = new ModelRenderer(this, 0, 0); - Can4T.addBox(0F, 0F, 0F, 4, 1, 4); - Can4T.setRotationPoint(-6F, 17F, -6F); - Can4T.setTextureSize(128, 64); - Can4T.mirror = true; - setRotation(Can4T, 0F, 0F, 0F); - Can2T = new ModelRenderer(this, 0, 0); - Can2T.addBox(0F, 0F, 0F, 4, 1, 4); - Can2T.setRotationPoint(-6F, 17F, 2F); - Can2T.setTextureSize(128, 64); - Can2T.mirror = true; - setRotation(Can2T, 0F, 0F, 0F); - Can3T = new ModelRenderer(this, 0, 0); - Can3T.addBox(0F, 0F, 0F, 4, 1, 4); - Can3T.setRotationPoint(2F, 17F, -6F); - Can3T.setTextureSize(128, 64); - Can3T.mirror = true; - setRotation(Can3T, 0F, 0F, 0F); - Can3B = new ModelRenderer(this, 0, 0); - Can3B.addBox(0F, 0F, 0F, 4, 1, 4); - Can3B.setRotationPoint(2F, 21F, -6F); - Can3B.setTextureSize(128, 64); - Can3B.mirror = true; - setRotation(Can3B, 0F, 0F, 0F); - IO1 = new ModelRenderer(this, 9, 17); - IO1.addBox(0F, 0F, 0F, 1, 8, 8); - IO1.setRotationPoint(-8F, 12F, -4F); - IO1.setTextureSize(128, 64); - IO1.mirror = true; - setRotation(IO1, 0F, 0F, 0F); - IO2Port = new ModelRenderer(this, 28, 17); - IO2Port.addBox(0F, 0F, 0F, 2, 2, 4); - IO2Port.setRotationPoint(-7F, 14F, -2F); - IO2Port.setTextureSize(128, 64); - IO2Port.mirror = true; - setRotation(IO2Port, 0F, 0F, 0F); - IO2 = new ModelRenderer(this, 9, 17); - IO2.addBox(0F, 0F, 0F, 1, 8, 8); - IO2.setRotationPoint(7F, 12F, -4F); - IO2.setTextureSize(128, 64); - IO2.mirror = true; - setRotation(IO2, 0F, 0F, 0F); - IO2Port2 = new ModelRenderer(this, 28, 17); - IO2Port2.addBox(0F, 0F, 0F, 2, 2, 4); - IO2Port2.setRotationPoint(5F, 14F, -2F); - IO2Port2.setTextureSize(128, 64); - IO2Port2.mirror = true; - setRotation(IO2Port2, 0F, 0F, 0F); - Coil1 = new ModelRenderer(this, 0, 34); - Coil1.addBox(0F, 0F, 0F, 8, 1, 8); - Coil1.setRotationPoint(-4F, 14F, -4F); - Coil1.setTextureSize(128, 64); - Coil1.mirror = true; - setRotation(Coil1, 0F, 0F, 0F); - Coil2 = new ModelRenderer(this, 0, 34); - Coil2.addBox(0F, 0F, 0F, 8, 1, 8); - Coil2.setRotationPoint(-4F, 12F, -4F); - Coil2.setTextureSize(128, 64); - Coil2.mirror = true; - setRotation(Coil2, 0F, 0F, 0F); - Coil3 = new ModelRenderer(this, 0, 34); - Coil3.addBox(0F, 0F, 0F, 8, 1, 8); - Coil3.setRotationPoint(-4F, 10F, -4F); - Coil3.setTextureSize(128, 64); - Coil3.mirror = true; - setRotation(Coil3, 0F, 0F, 0F); - Coil4 = new ModelRenderer(this, 0, 34); - Coil4.addBox(0F, 0F, 0F, 8, 1, 8); - Coil4.setRotationPoint(-4F, 8F, -4F); - Coil4.setTextureSize(128, 64); - Coil4.mirror = true; - setRotation(Coil4, 0F, 0F, 0F); + support2 = new ModelRenderer(this, 4, 0); + support2.addBox(0F, 0F, 0F, 1, 2, 1); + support2.setRotationPoint(6F, 9F, -7F); + support2.setTextureSize(128, 64); + support2.mirror = true; + setRotation(support2, 0F, 0F, 0F); + vat5 = new ModelRenderer(this, 0, 23); + vat5.addBox(0F, 0F, 0F, 3, 4, 3); + vat5.setRotationPoint(-1.5F, 13F, -1.5F); + vat5.setTextureSize(128, 64); + vat5.mirror = true; + setRotation(vat5, 0F, 0F, 0F); + top2 = new ModelRenderer(this, 0, 40); + top2.addBox(0F, 0F, 0F, 16, 1, 15); + top2.setRotationPoint(-8F, 11F, -8F); + top2.setTextureSize(128, 64); + top2.mirror = true; + setRotation(top2, 0F, 0F, 0F); + top = new ModelRenderer(this, 0, 23); + top.addBox(0F, 0F, 0F, 16, 1, 16); + top.setRotationPoint(-8F, 8F, -8F); + top.setTextureSize(128, 64); + top.mirror = true; + setRotation(top, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 7, 16); + base.setRotationPoint(-8F, 17F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + vat2 = new ModelRenderer(this, 0, 23); + vat2.addBox(0F, 0F, 0F, 3, 4, 3); + vat2.setRotationPoint(-5F, 13F, -1.5F); + vat2.setTextureSize(128, 64); + vat2.mirror = true; + setRotation(vat2, 0F, 0F, 0F); + vat3 = new ModelRenderer(this, 0, 23); + vat3.addBox(0F, 0F, 0F, 3, 4, 3); + vat3.setRotationPoint(-5F, 13F, 2F); + vat3.setTextureSize(128, 64); + vat3.mirror = true; + setRotation(vat3, 0F, 0F, 0F); + vat6 = new ModelRenderer(this, 0, 23); + vat6.addBox(0F, 0F, 0F, 3, 4, 3); + vat6.setRotationPoint(-1.5F, 13F, 2F); + vat6.setTextureSize(128, 64); + vat6.mirror = true; + setRotation(vat6, 0F, 0F, 0F); + vat9 = new ModelRenderer(this, 0, 23); + vat9.addBox(0F, 0F, 0F, 3, 4, 3); + vat9.setRotationPoint(2F, 13F, 2F); + vat9.setTextureSize(128, 64); + vat9.mirror = true; + setRotation(vat9, 0F, 0F, 0F); + vat8 = new ModelRenderer(this, 0, 23); + vat8.addBox(0F, 0F, 0F, 3, 4, 3); + vat8.setRotationPoint(2F, 13F, -1.5F); + vat8.setTextureSize(128, 64); + vat8.mirror = true; + setRotation(vat8, 0F, 0F, 0F); + vat7 = new ModelRenderer(this, 0, 23); + vat7.addBox(0F, 0F, 0F, 3, 4, 3); + vat7.setRotationPoint(2F, 13F, -5F); + vat7.setTextureSize(128, 64); + vat7.mirror = true; + setRotation(vat7, 0F, 0F, 0F); + vat4 = new ModelRenderer(this, 0, 23); + vat4.addBox(0F, 0F, 0F, 3, 4, 3); + vat4.setRotationPoint(-1.5F, 13F, -5F); + vat4.setTextureSize(128, 64); + vat4.mirror = true; + setRotation(vat4, 0F, 0F, 0F); + backEdge2 = new ModelRenderer(this, 8, 0); + backEdge2.addBox(0F, 0F, 0F, 1, 8, 1); + backEdge2.setRotationPoint(7F, 9F, 7F); + backEdge2.setTextureSize(128, 64); + backEdge2.mirror = true; + setRotation(backEdge2, 0F, 0F, 0F); + back = new ModelRenderer(this, 48, 0); + back.addBox(0F, 0F, 0F, 14, 8, 2); + back.setRotationPoint(-7F, 9F, 6F); + back.setTextureSize(128, 64); + back.mirror = true; + setRotation(back, 0F, 0F, 0F); + backEdge1 = new ModelRenderer(this, 8, 0); + backEdge1.addBox(0F, 0F, 0F, 1, 8, 1); + backEdge1.setRotationPoint(-8F, 9F, 7F); + backEdge1.setTextureSize(128, 64); + backEdge1.mirror = true; + setRotation(backEdge1, 0F, 0F, 0F); + vents = new ModelRenderer(this, 70, 0); + vents.addBox(0F, 0F, 0F, 8, 2, 10); + vents.setRotationPoint(-4F, 9F, -4F); + vents.setTextureSize(128, 64); + vents.mirror = true; + setRotation(vents, 0F, 0F, 0F); + support1 = new ModelRenderer(this, 4, 0); + support1.addBox(0F, 0F, 0F, 1, 2, 1); + support1.setRotationPoint(-7F, 9F, -7F); + support1.setTextureSize(128, 64); + support1.mirror = true; + setRotation(support1, 0F, 0F, 0F); + vat1 = new ModelRenderer(this, 0, 23); + vat1.addBox(0F, 0F, 0F, 3, 4, 3); + vat1.setRotationPoint(-5F, 13F, -5F); + vat1.setTextureSize(128, 64); + vat1.mirror = true; + setRotation(vat1, 0F, 0F, 0F); + nozzle8 = new ModelRenderer(this, 0, 0); + nozzle8.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle8.setRotationPoint(3F, 11.5F, -0.5F); + nozzle8.setTextureSize(128, 64); + nozzle8.mirror = true; + setRotation(nozzle8, 0F, 0F, 0F); + nozzle5 = new ModelRenderer(this, 0, 0); + nozzle5.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle5.setRotationPoint(-0.5F, 11.5F, -0.5F); + nozzle5.setTextureSize(128, 64); + nozzle5.mirror = true; + setRotation(nozzle5, 0F, 0F, 0F); + nozzle7 = new ModelRenderer(this, 0, 0); + nozzle7.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle7.setRotationPoint(3F, 11.5F, -4F); + nozzle7.setTextureSize(128, 64); + nozzle7.mirror = true; + setRotation(nozzle7, 0F, 0F, 0F); + nozzle4 = new ModelRenderer(this, 0, 0); + nozzle4.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle4.setRotationPoint(-0.5F, 11.5F, -4F); + nozzle4.setTextureSize(128, 64); + nozzle4.mirror = true; + setRotation(nozzle4, 0F, 0F, 0F); + nozzle9 = new ModelRenderer(this, 0, 0); + nozzle9.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle9.setRotationPoint(3F, 11.5F, 3F); + nozzle9.setTextureSize(128, 64); + nozzle9.mirror = true; + setRotation(nozzle9, 0F, 0F, 0F); + nozzle6 = new ModelRenderer(this, 0, 0); + nozzle6.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle6.setRotationPoint(-0.5F, 11.5F, 3F); + nozzle6.setTextureSize(128, 64); + nozzle6.mirror = true; + setRotation(nozzle6, 0F, 0F, 0F); + nozzle3 = new ModelRenderer(this, 0, 0); + nozzle3.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle3.setRotationPoint(-4F, 11.5F, 3F); + nozzle3.setTextureSize(128, 64); + nozzle3.mirror = true; + setRotation(nozzle3, 0F, 0F, 0F); + nozzle2 = new ModelRenderer(this, 0, 0); + nozzle2.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle2.setRotationPoint(-4F, 11.5F, -0.5F); + nozzle2.setTextureSize(128, 64); + nozzle2.mirror = true; + setRotation(nozzle2, 0F, 0F, 0F); + nozzle1 = new ModelRenderer(this, 0, 0); + nozzle1.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle1.setRotationPoint(-4F, 11.5F, -4F); + nozzle1.setTextureSize(128, 64); + nozzle1.mirror = true; + setRotation(nozzle1, 0F, 0F, 0F); + glass = new ModelRenderer(this, 64, 14); + glass.addBox(0F, 0F, 0F, 14, 5, 13); + glass.setRotationPoint(-7F, 12F, -7F); + glass.setTextureSize(128, 64); + glass.mirror = true; + setRotation(glass, 0F, 0F, 0F); + portToggle1 = new ModelRenderer(this, 106, 0); + portToggle1.addBox(0F, 0F, 0F, 1, 10, 10); + portToggle1.setRotationPoint(-8.01F, 10.99F, -5F); + portToggle1.setTextureSize(128, 64); + portToggle1.mirror = true; + setRotation(portToggle1, 0F, 0F, 0F); + portToggle2 = new ModelRenderer(this, 64, 32); + portToggle2.addBox(0F, 0F, 0F, 1, 8, 8); + portToggle2.setRotationPoint(7.01F, 12F, -4F); + portToggle2.setTextureSize(128, 64); + portToggle2.mirror = true; + setRotation(portToggle2, 0F, 0F, 0F); } public void render(float size) { MekanismRenderer.blendOn(); - - Centre.render(size); - Base.render(size); - Base2.render(size); - Can1B.render(size); - Can1T.render(size); - Can1Side3.render(size); - Can1Side1.render(size); - Can1Side2.render(size); - Can1Side4.render(size); - Can2Side4.render(size); - Can3Side3.render(size); - Can2Side2.render(size); - Can2Side3.render(size); - Can2Side1.render(size); - Can4Side3.render(size); - Can4Side1.render(size); - Can4Sjde4.render(size); - Can4Side2.render(size); - Can3Side4.render(size); - Can4B.render(size); - Can3Side2.render(size); - Can3Side1.render(size); - Can2B.render(size); - Can4T.render(size); - Can2T.render(size); - Can3T.render(size); - Can3B.render(size); - IO1.render(size); - IO2Port.render(size); - IO2.render(size); - IO2Port2.render(size); - Coil1.render(size); - Coil2.render(size); - Coil3.render(size); - Coil4.render(size); - + + support2.render(size); + vat5.render(size); + top2.render(size); + top.render(size); + base.render(size); + vat2.render(size); + vat3.render(size); + vat6.render(size); + vat9.render(size); + vat8.render(size); + vat7.render(size); + vat4.render(size); + backEdge2.render(size); + back.render(size); + backEdge1.render(size); + vents.render(size); + support1.render(size); + vat1.render(size); + nozzle8.render(size); + nozzle5.render(size); + nozzle7.render(size); + nozzle4.render(size); + nozzle9.render(size); + nozzle6.render(size); + nozzle3.render(size); + nozzle2.render(size); + nozzle1.render(size); + glass.render(size); + portToggle1.render(size); + portToggle2.render(size); + MekanismRenderer.blendOff(); } diff --git a/src/main/java/mekanism/client/model/ModelChemicalInfuser.java b/src/main/java/mekanism/client/model/ModelChemicalInfuser.java index 8f7963913..47ec844d5 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalInfuser.java +++ b/src/main/java/mekanism/client/model/ModelChemicalInfuser.java @@ -1,339 +1,255 @@ package mekanism.client.model; -import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelChemicalInfuser extends ModelBase { - ModelRenderer Base; - ModelRenderer GasExit; - ModelRenderer GasLeft; - ModelRenderer GasRight; - ModelRenderer MachineCore; - ModelRenderer TopPanel; - ModelRenderer SidePanel; - ModelRenderer LPanelNW; - ModelRenderer RPanelNW; - ModelRenderer RPanelNE; - ModelRenderer LPanelSW; - ModelRenderer RPanelSW; - ModelRenderer RPanelSE; - ModelRenderer LPanelNE; - ModelRenderer LPanelSE; - ModelRenderer LTopS; - ModelRenderer RTopN; - ModelRenderer LTopN; - ModelRenderer RTopS; - ModelRenderer RTopW; - ModelRenderer RTopE; - ModelRenderer LTopE; - ModelRenderer LTopW; - ModelRenderer FrontPanel; - ModelRenderer FrontConnection; - ModelRenderer RightConnection; - ModelRenderer LeftConnection; - ModelRenderer LGlassT; - ModelRenderer RGlassT; - ModelRenderer LGlassS; - ModelRenderer RGlassS; - ModelRenderer RGlassN; - ModelRenderer LGlassN; - ModelRenderer LGlassL; - ModelRenderer RGlassR; - ModelRenderer RGlassL; - ModelRenderer LGlassR; + ModelRenderer base; + ModelRenderer tank2; + ModelRenderer portRight; + ModelRenderer portBack; + ModelRenderer portLeft; + ModelRenderer tank1; + ModelRenderer portFront; + ModelRenderer tank3; + ModelRenderer pipeAngle2; + ModelRenderer connectorAngle; + ModelRenderer pipe2; + ModelRenderer connector; + ModelRenderer compressor; + ModelRenderer tube10; + ModelRenderer tube8; + ModelRenderer tube9; + ModelRenderer tube7; + ModelRenderer tube6; + ModelRenderer tube5; + ModelRenderer tube4; + ModelRenderer tube3; + ModelRenderer tube2; + ModelRenderer tube1; + ModelRenderer pipe1; + ModelRenderer pipeAngle1; + ModelRenderer exhaust4; + ModelRenderer exhaust3; + ModelRenderer exhaust2; + ModelRenderer exhaust1; - public ModelChemicalInfuser() + public ModelChemicalInfuser() { textureWidth = 128; - textureHeight = 128; + textureHeight = 64; - Base = new ModelRenderer(this, 0, 0); - Base.addBox(0F, 0F, 0F, 16, 1, 16); - Base.setRotationPoint(-8F, 23F, -8F); - Base.setTextureSize(128, 128); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - GasExit = new ModelRenderer(this, 0, 17); - GasExit.addBox(0F, 0F, 0F, 6, 6, 1); - GasExit.setRotationPoint(-3F, 13F, -8F); - GasExit.setTextureSize(128, 128); - GasExit.mirror = true; - setRotation(GasExit, 0F, 0F, 0F); - GasLeft = new ModelRenderer(this, 64, 0); - GasLeft.addBox(0F, 0F, 0F, 1, 6, 6); - GasLeft.setRotationPoint(-8F, 13F, -3F); - GasLeft.setTextureSize(128, 128); - GasLeft.mirror = true; - setRotation(GasLeft, 0F, 0F, 0F); - GasRight = new ModelRenderer(this, 64, 0); - GasRight.addBox(0F, 0F, 0F, 1, 6, 6); - GasRight.setRotationPoint(7F, 13F, -3F); - GasRight.setTextureSize(128, 128); - GasRight.mirror = true; - setRotation(GasRight, 0F, 0F, 0F); - MachineCore = new ModelRenderer(this, 0, 24); - MachineCore.addBox(0F, 0F, 0F, 10, 11, 5); - MachineCore.setRotationPoint(-5F, 12F, -4F); - MachineCore.setTextureSize(128, 128); - MachineCore.mirror = true; - setRotation(MachineCore, 0F, 0F, 0F); - TopPanel = new ModelRenderer(this, 0, 40); - TopPanel.addBox(0F, 0F, 0F, 2, 1, 8); - TopPanel.setRotationPoint(-1F, 11F, -3F); - TopPanel.setTextureSize(128, 128); - TopPanel.mirror = true; - setRotation(TopPanel, 0F, 0F, 0F); - SidePanel = new ModelRenderer(this, 30, 17); - SidePanel.addBox(0F, 0F, 0F, 2, 11, 1); - SidePanel.setRotationPoint(-1F, 12F, 4F); - SidePanel.setTextureSize(128, 128); - SidePanel.mirror = true; - setRotation(SidePanel, 0F, 0F, 0F); - LPanelNW = new ModelRenderer(this, 78, 0); - LPanelNW.addBox(0F, 0F, 0F, 1, 15, 1); - LPanelNW.setRotationPoint(-6F, 8F, 1F); - LPanelNW.setTextureSize(128, 128); - LPanelNW.mirror = true; - setRotation(LPanelNW, 0F, 0F, 0F); - RPanelNW = new ModelRenderer(this, 78, 0); - RPanelNW.addBox(0F, 0F, 0F, 1, 15, 1); - RPanelNW.setRotationPoint(1F, 8F, 1F); - RPanelNW.setTextureSize(128, 128); - RPanelNW.mirror = true; - setRotation(RPanelNW, 0F, 0F, 0F); - RPanelNE = new ModelRenderer(this, 78, 0); - RPanelNE.addBox(7F, 0F, 0F, 1, 15, 1); - RPanelNE.setRotationPoint(-2F, 8F, 1F); - RPanelNE.setTextureSize(128, 128); - RPanelNE.mirror = true; - setRotation(RPanelNE, 0F, 0F, 0F); - LPanelSW = new ModelRenderer(this, 78, 0); - LPanelSW.addBox(0F, 0F, 0F, 1, 15, 1); - LPanelSW.setRotationPoint(-6F, 8F, 5F); - LPanelSW.setTextureSize(128, 128); - LPanelSW.mirror = true; - setRotation(LPanelSW, 0F, 0F, 0F); - RPanelSW = new ModelRenderer(this, 78, 0); - RPanelSW.addBox(0F, 0F, 0F, 1, 15, 1); - RPanelSW.setRotationPoint(1F, 8F, 5F); - RPanelSW.setTextureSize(128, 128); - RPanelSW.mirror = true; - setRotation(RPanelSW, 0F, 0F, 0F); - RPanelSE = new ModelRenderer(this, 78, 0); - RPanelSE.addBox(0F, 0F, 0F, 1, 15, 1); - RPanelSE.setRotationPoint(5F, 8F, 5F); - RPanelSE.setTextureSize(128, 128); - RPanelSE.mirror = true; - setRotation(RPanelSE, 0F, 0F, 0F); - LPanelNE = new ModelRenderer(this, 78, 0); - LPanelNE.addBox(0F, 0F, 0F, 1, 15, 1); - LPanelNE.setRotationPoint(-2F, 8F, 1F); - LPanelNE.setTextureSize(128, 128); - LPanelNE.mirror = true; - setRotation(LPanelNE, 0F, 0F, 0F); - LPanelSE = new ModelRenderer(this, 78, 0); - LPanelSE.addBox(0F, 0F, 0F, 1, 15, 1); - LPanelSE.setRotationPoint(-2F, 8F, 5F); - LPanelSE.setTextureSize(128, 128); - LPanelSE.mirror = true; - setRotation(LPanelSE, 0F, 0F, 0F); - LTopS = new ModelRenderer(this, 82, 0); - LTopS.addBox(0F, 0F, 4F, 3, 1, 1); - LTopS.setRotationPoint(-5F, 8F, 1F); - LTopS.setTextureSize(128, 128); - LTopS.mirror = true; - setRotation(LTopS, 0F, 0F, 0F); - RTopN = new ModelRenderer(this, 82, 0); - RTopN.addBox(0F, 0F, 0F, 3, 1, 1); - RTopN.setRotationPoint(2F, 8F, 1F); - RTopN.setTextureSize(128, 128); - RTopN.mirror = true; - setRotation(RTopN, 0F, 0F, 0F); - LTopN = new ModelRenderer(this, 82, 0); - LTopN.addBox(0F, 0F, 0F, 3, 1, 1); - LTopN.setRotationPoint(-5F, 8F, 1F); - LTopN.setTextureSize(128, 128); - LTopN.mirror = true; - setRotation(LTopN, 0F, 0F, 0F); - RTopS = new ModelRenderer(this, 82, 0); - RTopS.addBox(0F, 0F, 4F, 3, 1, 1); - RTopS.setRotationPoint(2F, 8F, 1F); - RTopS.setTextureSize(128, 128); - RTopS.mirror = true; - setRotation(RTopS, 0F, 0F, 0F); - RTopW = new ModelRenderer(this, 90, 0); - RTopW.addBox(0F, 0F, 0F, 1, 1, 3); - RTopW.setRotationPoint(1F, 8F, 2F); - RTopW.setTextureSize(128, 128); - RTopW.mirror = true; - setRotation(RTopW, 0F, 0F, 0F); - RTopE = new ModelRenderer(this, 90, 0); - RTopE.addBox(0F, 1F, 0F, 1, 1, 3); - RTopE.setRotationPoint(5F, 7F, 2F); - RTopE.setTextureSize(128, 128); - RTopE.mirror = true; - setRotation(RTopE, 0F, 0F, 0F); - LTopE = new ModelRenderer(this, 90, 0); - LTopE.addBox(0F, 0F, 0F, 1, 1, 3); - LTopE.setRotationPoint(-2F, 8F, 2F); - LTopE.setTextureSize(128, 128); - LTopE.mirror = true; - setRotation(LTopE, 0F, 0F, 0F); - LTopW = new ModelRenderer(this, 90, 0); - LTopW.addBox(0F, 0F, 0F, 1, 1, 3); - LTopW.setRotationPoint(-6F, 8F, 2F); - LTopW.setTextureSize(128, 128); - LTopW.mirror = true; - setRotation(LTopW, 0F, 0F, 0F); - FrontPanel = new ModelRenderer(this, 0, 49); - FrontPanel.addBox(0F, 0F, 0F, 8, 9, 1); - FrontPanel.setRotationPoint(-4F, 13F, -5F); - FrontPanel.setTextureSize(128, 128); - FrontPanel.mirror = true; - setRotation(FrontPanel, 0F, 0F, 0F); - FrontConnection = new ModelRenderer(this, 0, 59); - FrontConnection.addBox(0F, 0F, 0F, 4, 4, 2); - FrontConnection.setRotationPoint(-2F, 14F, -7F); - FrontConnection.setTextureSize(128, 128); - FrontConnection.mirror = true; - setRotation(FrontConnection, 0F, 0F, 0F); - RightConnection = new ModelRenderer(this, 98, 0); - RightConnection.addBox(0F, 0F, 0F, 2, 4, 4); - RightConnection.setRotationPoint(5F, 14F, -2F); - RightConnection.setTextureSize(128, 128); - RightConnection.mirror = true; - setRotation(RightConnection, 0F, 0F, 0F); - LeftConnection = new ModelRenderer(this, 98, 0); - LeftConnection.addBox(0F, 0F, 0F, 2, 4, 4); - LeftConnection.setRotationPoint(-7F, 14F, -2F); - LeftConnection.setTextureSize(128, 128); - LeftConnection.mirror = true; - setRotation(LeftConnection, 0F, 0F, 0F); - LGlassT = new ModelRenderer(this, 36, 17); - LGlassT.addBox(0F, 0F, 0F, 3, 1, 3); - LGlassT.setRotationPoint(-5F, 8F, 2F); - LGlassT.setTextureSize(128, 128); - LGlassT.mirror = true; - setRotation(LGlassT, 0F, 0F, 0F); - RGlassT = new ModelRenderer(this, 36, 17); - RGlassT.addBox(0F, 0F, 0F, 3, 1, 3); - RGlassT.setRotationPoint(2F, 8F, 2F); - RGlassT.setTextureSize(128, 128); - RGlassT.mirror = true; - setRotation(RGlassT, 0F, 0F, 0F); - LGlassS = new ModelRenderer(this, 48, 17); - LGlassS.addBox(0F, 0F, 0F, 3, 14, 1); - LGlassS.setRotationPoint(-5F, 9F, 5F); - LGlassS.setTextureSize(128, 128); - LGlassS.mirror = true; - setRotation(LGlassS, 0F, 0F, 0F); - RGlassS = new ModelRenderer(this, 48, 17); - RGlassS.addBox(0F, 0F, 0F, 3, 14, 1); - RGlassS.setRotationPoint(2F, 9F, 5F); - RGlassS.setTextureSize(128, 128); - RGlassS.mirror = true; - setRotation(RGlassS, 0F, 0F, 0F); - RGlassN = new ModelRenderer(this, 48, 17); - RGlassN.addBox(0F, 0F, 0F, 3, 14, 1); - RGlassN.setRotationPoint(2F, 9F, 1F); - RGlassN.setTextureSize(128, 128); - RGlassN.mirror = true; - setRotation(RGlassN, 0F, 0F, 0F); - LGlassN = new ModelRenderer(this, 48, 17); - LGlassN.addBox(0F, 0F, 0F, 3, 14, 1); - LGlassN.setRotationPoint(-5F, 9F, 1F); - LGlassN.setTextureSize(128, 128); - LGlassN.mirror = true; - setRotation(LGlassN, 0F, 0F, 0F); - LGlassL = new ModelRenderer(this, 0, 65); - LGlassL.addBox(0F, 0F, 0F, 1, 14, 3); - LGlassL.setRotationPoint(-6F, 9F, 2F); - LGlassL.setTextureSize(128, 128); - LGlassL.mirror = true; - setRotation(LGlassL, 0F, 0F, 0F); - RGlassR = new ModelRenderer(this, 0, 65); - RGlassR.addBox(0F, 0F, 0F, 1, 14, 3); - RGlassR.setRotationPoint(5F, 9F, 2F); - RGlassR.setTextureSize(128, 128); - RGlassR.mirror = true; - setRotation(RGlassR, 0F, 0F, 0F); - RGlassL = new ModelRenderer(this, 0, 65); - RGlassL.addBox(0F, 0F, 0F, 1, 14, 3); - RGlassL.setRotationPoint(1F, 9F, 2F); - RGlassL.setTextureSize(128, 128); - RGlassL.mirror = true; - setRotation(RGlassL, 0F, 0F, 0F); - LGlassR = new ModelRenderer(this, 0, 65); - LGlassR.addBox(0F, 0F, 0F, 1, 14, 3); - LGlassR.setRotationPoint(-2F, 9F, 2F); - LGlassR.setTextureSize(128, 128); - LGlassR.mirror = true; - setRotation(LGlassR, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 5, 16); + base.setRotationPoint(-8F, 19F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + tank2 = new ModelRenderer(this, 0, 21); + tank2.mirror = true; + tank2.addBox(0F, 0F, 0F, 6, 11, 6); + tank2.setRotationPoint(1F, 8F, 1F); + tank2.setTextureSize(128, 64); + setRotation(tank2, 0F, 0F, 0F); + portRight = new ModelRenderer(this, 0, 38); + portRight.addBox(0F, 0F, 0F, 1, 8, 8); + portRight.setRotationPoint(7.01F, 12F, -4F); + portRight.setTextureSize(128, 64); + portRight.mirror = true; + setRotation(portRight, 0F, 0F, 0F); + portBack = new ModelRenderer(this, 0, 54); + portBack.addBox(0F, 0F, 0F, 8, 8, 1); + portBack.setRotationPoint(-4F, 12F, 7.01F); + portBack.setTextureSize(128, 64); + portBack.mirror = true; + setRotation(portBack, 0F, 0F, 0F); + portLeft = new ModelRenderer(this, 0, 38); + portLeft.addBox(0F, 0F, 0F, 1, 8, 8); + portLeft.setRotationPoint(-8.01F, 12F, -4F); + portLeft.setTextureSize(128, 64); + portLeft.mirror = true; + setRotation(portLeft, 0F, 0F, 0F); + tank1 = new ModelRenderer(this, 0, 21); + tank1.addBox(0F, 0F, 0F, 6, 11, 6); + tank1.setRotationPoint(-7F, 8F, 1F); + tank1.setTextureSize(128, 64); + tank1.mirror = true; + setRotation(tank1, 0F, 0F, 0F); + portFront = new ModelRenderer(this, 18, 38); + portFront.addBox(0F, 0F, 0F, 8, 8, 1); + portFront.setRotationPoint(-4F, 12F, -8.01F); + portFront.setTextureSize(128, 64); + portFront.mirror = true; + setRotation(portFront, 0F, 0F, 0F); + tank3 = new ModelRenderer(this, 24, 21); + tank3.addBox(0F, 0F, 0F, 12, 7, 7); + tank3.setRotationPoint(-6F, 12F, -7F); + tank3.setTextureSize(128, 64); + tank3.mirror = true; + setRotation(tank3, 0F, 0F, 0F); + pipeAngle2 = new ModelRenderer(this, 18, 55); + pipeAngle2.addBox(-5F, 0F, 0F, 5, 6, 3); + pipeAngle2.setRotationPoint(5F, 13.01F, -2F); + pipeAngle2.setTextureSize(128, 64); + pipeAngle2.mirror = true; + setRotation(pipeAngle2, 0F, 0.7853982F, 0F); + connectorAngle = new ModelRenderer(this, 40, 45); + connectorAngle.addBox(0F, 0F, 0F, 2, 8, 2); + connectorAngle.setRotationPoint(-1F, 13F, 5F); + connectorAngle.setTextureSize(128, 64); + connectorAngle.mirror = true; + setRotation(connectorAngle, -0.4886922F, 0F, 0F); + pipe2 = new ModelRenderer(this, 40, 35); + pipe2.addBox(0F, 0F, 0F, 1, 6, 4); + pipe2.setRotationPoint(6F, 13F, -3F); + pipe2.setTextureSize(128, 64); + pipe2.mirror = true; + setRotation(pipe2, 0F, 0F, 0F); + connector = new ModelRenderer(this, 50, 35); + connector.addBox(0F, 0F, 0F, 2, 6, 2); + connector.setRotationPoint(-1F, 13F, 5F); + connector.setTextureSize(128, 64); + connector.mirror = true; + setRotation(connector, 0F, 0F, 0F); + compressor = new ModelRenderer(this, 18, 49); + compressor.addBox(0F, 0F, 0F, 6, 3, 3); + compressor.setRotationPoint(-3F, 8.5F, -2.5F); + compressor.setTextureSize(128, 64); + compressor.mirror = true; + setRotation(compressor, 0F, 0F, 0F); + tube10 = new ModelRenderer(this, 0, 14); + tube10.addBox(0F, 0F, 0F, 2, 1, 1); + tube10.setRotationPoint(-1F, 9F, 5F); + tube10.setTextureSize(128, 64); + tube10.mirror = true; + setRotation(tube10, 0F, 0F, 0F); + tube8 = new ModelRenderer(this, 0, 2); + tube8.addBox(0F, 0F, 0F, 1, 1, 2); + tube8.setRotationPoint(4F, 9.5F, -0.5F); + tube8.setTextureSize(128, 64); + tube8.mirror = true; + setRotation(tube8, 0F, 0F, 0F); + tube9 = new ModelRenderer(this, 0, 14); + tube9.addBox(0F, 0F, 0F, 2, 1, 1); + tube9.setRotationPoint(-1F, 9F, 2F); + tube9.setTextureSize(128, 64); + tube9.mirror = true; + setRotation(tube9, 0F, 0F, 0F); + tube7 = new ModelRenderer(this, 0, 0); + tube7.addBox(0F, 0F, 0F, 2, 1, 1); + tube7.setRotationPoint(3F, 9.5F, -1.5F); + tube7.setTextureSize(128, 64); + tube7.mirror = true; + setRotation(tube7, 0F, 0F, 0F); + tube6 = new ModelRenderer(this, 12, 13); + tube6.addBox(0F, 0F, 0F, 1, 2, 1); + tube6.setRotationPoint(1F, 10.5F, -4F); + tube6.setTextureSize(128, 64); + tube6.mirror = true; + setRotation(tube6, 0F, 0F, 0F); + tube5 = new ModelRenderer(this, 0, 2); + tube5.addBox(0F, 0F, 0F, 1, 1, 2); + tube5.setRotationPoint(1F, 9.5F, -4F); + tube5.setTextureSize(128, 64); + tube5.mirror = true; + setRotation(tube5, 0F, 0F, 0F); + tube4 = new ModelRenderer(this, 0, 2); + tube4.addBox(0F, 0F, 0F, 1, 1, 2); + tube4.setRotationPoint(-2F, 9.5F, -4F); + tube4.setTextureSize(128, 64); + tube4.mirror = true; + setRotation(tube4, 0F, 0F, 0F); + tube3 = new ModelRenderer(this, 12, 13); + tube3.addBox(0F, 0F, 0F, 1, 2, 1); + tube3.setRotationPoint(-2F, 10.5F, -4F); + tube3.setTextureSize(128, 64); + tube3.mirror = true; + setRotation(tube3, 0F, 0F, 0F); + tube2 = new ModelRenderer(this, 0, 0); + tube2.addBox(0F, 0F, 0F, 2, 1, 1); + tube2.setRotationPoint(-5F, 9.5F, -1.5F); + tube2.setTextureSize(128, 64); + tube2.mirror = true; + setRotation(tube2, 0F, 0F, 0F); + tube1 = new ModelRenderer(this, 0, 2); + tube1.addBox(0F, 0F, 0F, 1, 1, 2); + tube1.setRotationPoint(-5F, 9.5F, -0.5F); + tube1.setTextureSize(128, 64); + tube1.mirror = true; + setRotation(tube1, 0F, 0F, 0F); + pipe1 = new ModelRenderer(this, 40, 35); + pipe1.addBox(0F, 0F, 0F, 1, 6, 4); + pipe1.setRotationPoint(-7F, 13F, -3F); + pipe1.setTextureSize(128, 64); + pipe1.mirror = true; + setRotation(pipe1, 0F, 0F, 0F); + pipeAngle1 = new ModelRenderer(this, 18, 55); + pipeAngle1.addBox(0F, 0F, 0F, 5, 6, 3); + pipeAngle1.setRotationPoint(-5F, 13.01F, -2F); + pipeAngle1.setTextureSize(128, 64); + pipeAngle1.mirror = true; + setRotation(pipeAngle1, 0F, -0.7853982F, 0F); + exhaust4 = new ModelRenderer(this, 0, 9); + exhaust4.addBox(0F, 0F, 0F, 1, 1, 1); + exhaust4.setRotationPoint(-1.33F, 11.5F, -6.2F); + exhaust4.setTextureSize(128, 64); + exhaust4.mirror = true; + setRotation(exhaust4, 0.3490659F, 0F, 0F); + exhaust3 = new ModelRenderer(this, 0, 9); + exhaust3.addBox(0F, 0F, 0F, 1, 1, 1); + exhaust3.setRotationPoint(-3F, 11.5F, -6.2F); + exhaust3.setTextureSize(128, 64); + exhaust3.mirror = true; + setRotation(exhaust3, 0.3490659F, 0F, 0F); + exhaust2 = new ModelRenderer(this, 0, 9); + exhaust2.addBox(0F, 0F, 0F, 1, 1, 1); + exhaust2.setRotationPoint(2F, 11.5F, -6.2F); + exhaust2.setTextureSize(128, 64); + exhaust2.mirror = true; + setRotation(exhaust2, 0.3490659F, 0F, 0F); + exhaust1 = new ModelRenderer(this, 0, 9); + exhaust1.addBox(0F, 0F, 0F, 1, 1, 1); + exhaust1.setRotationPoint(0.33F, 11.5F, -6.2F); + exhaust1.setTextureSize(128, 64); + exhaust1.mirror = true; + setRotation(exhaust1, 0.3490659F, 0F, 0F); } public void render(float size) { - Base.render(size); - GasExit.render(size); - GasLeft.render(size); - GasRight.render(size); - MachineCore.render(size); - TopPanel.render(size); - SidePanel.render(size); - LPanelNW.render(size); - RPanelNW.render(size); - RPanelNE.render(size); - LPanelSW.render(size); - RPanelSW.render(size); - RPanelSE.render(size); - LPanelNE.render(size); - LPanelSE.render(size); - LTopS.render(size); - RTopN.render(size); - LTopN.render(size); - RTopS.render(size); - RTopW.render(size); - RTopE.render(size); - LTopE.render(size); - LTopW.render(size); - FrontPanel.render(size); - FrontConnection.render(size); - - GL11.glPushMatrix(); - GL11.glScalef(0.999F, 0.999F, 0.999F); - RightConnection.render(size); - LeftConnection.render(size); - GL11.glPopMatrix(); - } - - public void renderGlass(float size) - { - GL11.glPushMatrix(); - MekanismRenderer.blendOn(); - GL11.glColor4f(1, 1, 1, 0.2F); - - LGlassT.render(size); - RGlassT.render(size); - LGlassS.render(size); - RGlassS.render(size); - RGlassN.render(size); - LGlassN.render(size); - LGlassL.render(size); - RGlassR.render(size); - RGlassL.render(size); - LGlassR.render(size); - - MekanismRenderer.blendOff(); - GL11.glColor4f(1, 1, 1, 1); - GL11.glPopMatrix(); + base.render(size); + tank2.render(size); + portRight.render(size); + portBack.render(size); + portLeft.render(size); + tank1.render(size); + portFront.render(size); + tank3.render(size); + pipeAngle2.render(size); + connectorAngle.render(size); + pipe2.render(size); + connector.render(size); + compressor.render(size); + tube10.render(size); + tube8.render(size); + tube9.render(size); + tube7.render(size); + tube6.render(size); + tube5.render(size); + tube4.render(size); + tube3.render(size); + tube2.render(size); + tube1.render(size); + pipe1.render(size); + pipeAngle1.render(size); + exhaust4.render(size); + exhaust3.render(size); + exhaust2.render(size); + exhaust1.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java index 339fabe6b..13c18a3a1 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java +++ b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java @@ -1,199 +1,103 @@ package mekanism.client.model; -import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelChemicalOxidizer extends ModelBase { - ModelRenderer Base; - ModelRenderer TSSW; - ModelRenderer TSNW; - ModelRenderer TSSE; - ModelRenderer TSNE; - ModelRenderer TTN; - ModelRenderer TTS; - ModelRenderer TTE; - ModelRenderer TTW; - ModelRenderer Connection; - ModelRenderer ItemEntry; - ModelRenderer GasExit; - ModelRenderer GasConnection; - ModelRenderer Machine; - ModelRenderer Post; - ModelRenderer GlassN; - ModelRenderer GlassS; - ModelRenderer GlassW; - ModelRenderer GlassE; - ModelRenderer GlassU; + ModelRenderer stand; + ModelRenderer tank; + ModelRenderer pipe2; + ModelRenderer bridge; + ModelRenderer pipe1; + ModelRenderer tower2; + ModelRenderer tower1; + ModelRenderer base; + ModelRenderer connector; + ModelRenderer connectorToggle; public ModelChemicalOxidizer() { textureWidth = 128; - textureHeight = 128; + textureHeight = 64; - Base = new ModelRenderer(this, 0, 0); - Base.addBox(0F, 0F, 0F, 16, 1, 16); - Base.setRotationPoint(-8F, 23F, -8F); - Base.setTextureSize(128, 128); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - TSSW = new ModelRenderer(this, 0, 17); - TSSW.addBox(0F, 0F, 0F, 1, 15, 1); - TSSW.setRotationPoint(-1F, 8F, 3F); - TSSW.setTextureSize(128, 128); - TSSW.mirror = true; - setRotation(TSSW, 0F, 0F, 0F); - TSNW = new ModelRenderer(this, 0, 17); - TSNW.addBox(0F, 0F, 0F, 1, 15, 1); - TSNW.setRotationPoint(-1F, 8F, -4F); - TSNW.setTextureSize(128, 128); - TSNW.mirror = true; - setRotation(TSNW, 0F, 0F, 0F); - TSSE = new ModelRenderer(this, 0, 17); - TSSE.addBox(0F, 0F, 0F, 1, 15, 1); - TSSE.setRotationPoint(6F, 8F, 3F); - TSSE.setTextureSize(128, 128); - TSSE.mirror = true; - setRotation(TSSE, 0F, 0F, 0F); - TSNE = new ModelRenderer(this, 0, 17); - TSNE.addBox(0F, 0F, 0F, 1, 15, 1); - TSNE.setRotationPoint(6F, 8F, -4F); - TSNE.setTextureSize(128, 128); - TSNE.mirror = true; - setRotation(TSNE, 0F, 0F, 0F); - TTN = new ModelRenderer(this, 4, 17); - TTN.addBox(0F, 0F, 0F, 6, 1, 1); - TTN.setRotationPoint(0F, 8F, -4F); - TTN.setTextureSize(128, 128); - TTN.mirror = true; - setRotation(TTN, 0F, 0F, 0F); - TTS = new ModelRenderer(this, 4, 17); - TTS.addBox(0F, 0F, 0F, 6, 1, 1); - TTS.setRotationPoint(0F, 8F, 3F); - TTS.setTextureSize(128, 128); - TTS.mirror = true; - setRotation(TTS, 0F, 0F, 0F); - TTE = new ModelRenderer(this, 18, 17); - TTE.addBox(0F, 0F, 0F, 1, 1, 6); - TTE.setRotationPoint(6F, 8F, -3F); - TTE.setTextureSize(128, 128); - TTE.mirror = true; - setRotation(TTE, 0F, 0F, 0F); - TTW = new ModelRenderer(this, 18, 17); - TTW.addBox(0F, 0F, 0F, 1, 1, 6); - TTW.setRotationPoint(-1F, 8F, -3F); - TTW.setTextureSize(128, 128); - TTW.mirror = true; - setRotation(TTW, 0F, 0F, 0F); - Connection = new ModelRenderer(this, 32, 17); - Connection.addBox(0F, 0F, 0F, 7, 4, 4); - Connection.setRotationPoint(-7F, 14F, -2F); - Connection.setTextureSize(128, 128); - Connection.mirror = true; - setRotation(Connection, 0F, 0F, 0F); - ItemEntry = new ModelRenderer(this, 64, 0); - ItemEntry.addBox(0F, 0F, 0F, 1, 8, 8); - ItemEntry.setRotationPoint(-8F, 12F, -4F); - ItemEntry.setTextureSize(128, 128); - ItemEntry.mirror = true; - setRotation(ItemEntry, 0F, 0F, 0F); - GasExit = new ModelRenderer(this, 0, 33); - GasExit.addBox(0F, 1F, 0F, 1, 6, 6); - GasExit.setRotationPoint(7F, 12F, -3F); - GasExit.setTextureSize(128, 128); - GasExit.mirror = true; - setRotation(GasExit, 0F, 0F, 0F); - GasConnection = new ModelRenderer(this, 82, 0); - GasConnection.addBox(0F, 1F, 0F, 1, 4, 4); - GasConnection.setRotationPoint(6F, 13F, -2F); - GasConnection.setTextureSize(128, 128); - GasConnection.mirror = true; - setRotation(GasConnection, 0F, 0F, 0F); - Machine = new ModelRenderer(this, 0, 45); - Machine.addBox(0F, 0F, 0F, 4, 6, 6); - Machine.setRotationPoint(-6F, 13F, -3F); - Machine.setTextureSize(128, 128); - Machine.mirror = true; - setRotation(Machine, 0F, 0F, 0F); - Post = new ModelRenderer(this, 0, 57); - Post.addBox(0F, 0F, 0F, 2, 4, 2); - Post.setRotationPoint(-5F, 19F, -1F); - Post.setTextureSize(128, 128); - Post.mirror = true; - setRotation(Post, 0F, 0F, 0F); - GlassN = new ModelRenderer(this, 92, 0); - GlassN.addBox(0F, 0F, 0F, 6, 14, 1); - GlassN.setRotationPoint(0F, 9F, -4F); - GlassN.setTextureSize(128, 128); - GlassN.mirror = true; - setRotation(GlassN, 0F, 0F, 0F); - GlassS = new ModelRenderer(this, 92, 0); - GlassS.addBox(0F, 0F, 0F, 6, 14, 1); - GlassS.setRotationPoint(0F, 9F, 3F); - GlassS.setTextureSize(128, 128); - GlassS.mirror = true; - setRotation(GlassS, 0F, 0F, 0F); - GlassW = new ModelRenderer(this, 0, 70); - GlassW.addBox(0F, 0F, 0F, 1, 14, 6); - GlassW.setRotationPoint(-1F, 9F, -3F); - GlassW.setTextureSize(128, 128); - GlassW.mirror = true; - setRotation(GlassW, 0F, 0F, 0F); - GlassE = new ModelRenderer(this, 0, 70); - GlassE.addBox(0F, 0F, 0F, 1, 14, 6); - GlassE.setRotationPoint(6F, 9F, -3F); - GlassE.setTextureSize(128, 128); - GlassE.mirror = true; - setRotation(GlassE, 0F, 0F, 0F); - GlassU = new ModelRenderer(this, 0, 63); - GlassU.addBox(0F, 0F, 0F, 6, 1, 6); - GlassU.setRotationPoint(0F, 8F, -3F); - GlassU.setTextureSize(128, 128); - GlassU.mirror = true; - setRotation(GlassU, 0F, 0F, 0F); + stand = new ModelRenderer(this, 0, 20); + stand.addBox(0F, 0F, 0F, 5, 1, 13); + stand.setRotationPoint(-5.5F, 19F, -6.5F); + stand.setTextureSize(128, 64); + stand.mirror = true; + setRotation(stand, 0F, 0F, 0F); + tank = new ModelRenderer(this, 66, 0); + tank.addBox(0F, 0F, 0F, 7, 12, 16); + tank.setRotationPoint(1F, 8F, -8F); + tank.setTextureSize(128, 64); + tank.mirror = true; + setRotation(tank, 0F, 0F, 0F); + pipe2 = new ModelRenderer(this, 82, 28); + pipe2.addBox(0F, 0F, 0F, 2, 6, 6); + pipe2.setRotationPoint(-7F, 13F, -3F); + pipe2.setTextureSize(128, 64); + pipe2.mirror = true; + setRotation(pipe2, 0F, 0F, 0F); + bridge = new ModelRenderer(this, 70, 0); + bridge.addBox(0F, 0F, 0F, 5, 10, 1); + bridge.setRotationPoint(-5.5F, 8.5F, -2F); + bridge.setTextureSize(128, 64); + bridge.mirror = true; + setRotation(bridge, 0F, 0F, 0F); + pipe1 = new ModelRenderer(this, 0, 0); + pipe1.addBox(0F, 0F, 0F, 1, 3, 3); + pipe1.setRotationPoint(0F, 14F, 1F); + pipe1.setTextureSize(128, 64); + pipe1.mirror = true; + setRotation(pipe1, 0F, 0F, 0F); + tower2 = new ModelRenderer(this, 36, 20); + tower2.addBox(0F, 0F, 0F, 6, 11, 8); + tower2.setRotationPoint(-6F, 8F, -1F); + tower2.setTextureSize(128, 64); + tower2.mirror = true; + setRotation(tower2, 0F, 0F, 0F); + tower1 = new ModelRenderer(this, 48, 0); + tower1.addBox(0F, 0F, 0F, 6, 11, 5); + tower1.setRotationPoint(-6F, 8F, -7F); + tower1.setTextureSize(128, 64); + tower1.mirror = true; + setRotation(tower1, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 4, 16); + base.setRotationPoint(-8F, 20F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + connector = new ModelRenderer(this, 0, 34); + connector.addBox(0F, 0F, 0F, 1, 10, 10); + connector.setRotationPoint(-8F, 11F, -5F); + connector.setTextureSize(128, 64); + connector.mirror = true; + setRotation(connector, 0F, 0F, 0F); + connectorToggle = new ModelRenderer(this, 64, 28); + connectorToggle.addBox(0F, 0F, 0F, 1, 8, 8); + connectorToggle.setRotationPoint(7.01F, 12F, -4F); + connectorToggle.setTextureSize(128, 64); + connectorToggle.mirror = true; + setRotation(connectorToggle, 0F, 0F, 0F); } public void render(float size) { - Base.render(size); - TSSW.render(size); - TSNW.render(size); - TSSE.render(size); - TSNE.render(size); - TTN.render(size); - TTS.render(size); - TTE.render(size); - TTW.render(size); - Connection.render(size); - ItemEntry.render(size); - GasExit.render(size); - GasConnection.render(size); - Machine.render(size); - Post.render(size); - } - - public void renderGlass(float size) - { - GL11.glPushMatrix(); - MekanismRenderer.blendOn(); - GL11.glColor4f(1, 1, 1, 0.2F); - - GlassN.render(size); - GlassS.render(size); - GlassW.render(size); - GlassE.render(size); - GlassU.render(size); - - MekanismRenderer.blendOff(); - GL11.glColor4f(1, 1, 1, 1); - GL11.glPopMatrix(); + stand.render(size); + tank.render(size); + pipe2.render(size); + bridge.render(size); + pipe1.render(size); + tower2.render(size); + tower1.render(size); + base.render(size); + connector.render(size); + connectorToggle.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelChemicalWasher.java b/src/main/java/mekanism/client/model/ModelChemicalWasher.java index e6950886a..757063f79 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalWasher.java +++ b/src/main/java/mekanism/client/model/ModelChemicalWasher.java @@ -1,6 +1,5 @@ package mekanism.client.model; -import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraftforge.fml.relauncher.Side; @@ -9,285 +8,200 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelChemicalWasher extends ModelBase { - ModelRenderer Base; - ModelRenderer Base2; - ModelRenderer IO1; - ModelRenderer IO2; - ModelRenderer IO3; - ModelRenderer Base3; - ModelRenderer Base4; - ModelRenderer Base5; - ModelRenderer Base6; - ModelRenderer Can1B; - ModelRenderer Can1T; - ModelRenderer Can1Side3; - ModelRenderer Can1Side1; - ModelRenderer Can1Side2; - ModelRenderer Can1Side4; - ModelRenderer Can2Side4; - ModelRenderer Can3Side3; - ModelRenderer Can2Side2; - ModelRenderer Can2Side3; - ModelRenderer Can2Side1; - ModelRenderer Can4Side3; - ModelRenderer Can4Side1; - ModelRenderer Can4Sjde4; - ModelRenderer Can4Side2; - ModelRenderer Can3Side4; - ModelRenderer Can4B; - ModelRenderer Can3Side2; - ModelRenderer Can3Side1; - ModelRenderer Can2B; - ModelRenderer Can4T; - ModelRenderer Can2T; - ModelRenderer Can3T; - ModelRenderer Can3B; + ModelRenderer tankBack; + ModelRenderer base; + ModelRenderer portTop; + ModelRenderer pipe1; + ModelRenderer pipe2b; + ModelRenderer portRight; + ModelRenderer bridge1; + ModelRenderer bridge2; + ModelRenderer bridge3; + ModelRenderer conduit; + ModelRenderer bridge4; + ModelRenderer pipe2; + ModelRenderer tankLeft; + ModelRenderer connectorRight; + ModelRenderer portLeft; + ModelRenderer connectorLeft; + ModelRenderer tankRight; + ModelRenderer tubeLeft1; + ModelRenderer tubeLeft2; + ModelRenderer tubeRight3; + ModelRenderer tubeRight1; + ModelRenderer tubeRight2; + ModelRenderer tubeLeft3; - public ModelChemicalWasher() + public ModelChemicalWasher() { textureWidth = 128; textureHeight = 64; - Base = new ModelRenderer(this, 16, 0); - Base.addBox(0F, 0F, 0F, 14, 1, 14); - Base.setRotationPoint(-7F, 23F, -7F); - Base.setTextureSize(128, 64); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - Base2 = new ModelRenderer(this, 72, 0); - Base2.addBox(0F, 0F, 0F, 14, 10, 1); - Base2.setRotationPoint(-7F, 8F, 6F); - Base2.setTextureSize(128, 64); - Base2.mirror = true; - setRotation(Base2, 0F, 0F, 0F); - Base2.mirror = false; - IO1 = new ModelRenderer(this, 9, 17); - IO1.addBox(0F, 0F, 0F, 1, 8, 8); - IO1.setRotationPoint(-8F, 12F, -4F); - IO1.setTextureSize(128, 64); - IO1.mirror = true; - setRotation(IO1, 0F, 0F, 0F); - IO2 = new ModelRenderer(this, 9, 17); - IO2.addBox(0F, 0F, 0F, 1, 8, 8); - IO2.setRotationPoint(7F, 12F, -4F); - IO2.setTextureSize(128, 64); - IO2.mirror = true; - setRotation(IO2, 0F, 0F, 0F); - IO3 = new ModelRenderer(this, 0, 42); - IO3.addBox(0F, 0F, 0F, 12, 1, 8); - IO3.setRotationPoint(-6F, 8F, -4F); - IO3.setTextureSize(128, 64); - IO3.mirror = true; - setRotation(IO3, 0F, 0F, 0F); - Base3 = new ModelRenderer(this, 72, 0); - Base3.addBox(0F, 0F, 0F, 14, 10, 1); - Base3.setRotationPoint(-7F, 8F, -7F); - Base3.setTextureSize(128, 64); - Base3.mirror = true; - setRotation(Base3, 0F, 0F, 0F); - Base4 = new ModelRenderer(this, 72, 12); - Base4.addBox(0F, 0F, 0F, 1, 10, 12); - Base4.setRotationPoint(6F, 8F, -6F); - Base4.setTextureSize(128, 64); - Base4.mirror = true; - setRotation(Base4, 0F, 0F, 0F); - Base5 = new ModelRenderer(this, 72, 12); - Base5.addBox(0F, 0F, 0F, 1, 10, 12); - Base5.setRotationPoint(-7F, 8F, -6F); - Base5.setTextureSize(128, 64); - Base5.mirror = true; - setRotation(Base5, 0F, 0F, 0F); - Base6 = new ModelRenderer(this, 16, 0); - Base6.addBox(0F, 0F, 0F, 14, 1, 14); - Base6.setRotationPoint(-7F, 18F, -7F); - Base6.setTextureSize(128, 64); - Base6.mirror = true; - setRotation(Base6, 0F, 0F, 0F); - Can1B = new ModelRenderer(this, 0, 0); - Can1B.addBox(0F, 0F, 0F, 4, 1, 4); - Can1B.setRotationPoint(2F, 22F, 2F); - Can1B.setTextureSize(128, 64); - Can1B.mirror = true; - setRotation(Can1B, 0F, 0F, 0F); - Can1T = new ModelRenderer(this, 0, 0); - Can1T.addBox(0F, 0F, 0F, 4, 1, 4); - Can1T.setRotationPoint(2F, 19F, 2F); - Can1T.setTextureSize(128, 64); - Can1T.mirror = true; - setRotation(Can1T, 0F, 0F, 0F); - Can1Side3 = new ModelRenderer(this, 0, 0); - Can1Side3.addBox(0F, 0F, 0F, 1, 2, 2); - Can1Side3.setRotationPoint(5F, 20F, 3F); - Can1Side3.setTextureSize(128, 64); - Can1Side3.mirror = true; - setRotation(Can1Side3, 0F, 0F, 0F); - Can1Side1 = new ModelRenderer(this, 0, 0); - Can1Side1.addBox(0F, 0F, 0F, 4, 2, 1); - Can1Side1.setRotationPoint(2F, 20F, 5F); - Can1Side1.setTextureSize(128, 64); - Can1Side1.mirror = true; - setRotation(Can1Side1, 0F, 0F, 0F); - Can1Side2 = new ModelRenderer(this, 0, 0); - Can1Side2.addBox(0F, 0F, 0F, 4, 2, 1); - Can1Side2.setRotationPoint(2F, 20F, 2F); - Can1Side2.setTextureSize(128, 64); - Can1Side2.mirror = true; - setRotation(Can1Side2, 0F, 0F, 0F); - Can1Side4 = new ModelRenderer(this, 0, 0); - Can1Side4.addBox(0F, 0F, 0F, 1, 2, 2); - Can1Side4.setRotationPoint(2F, 20F, 3F); - Can1Side4.setTextureSize(128, 64); - Can1Side4.mirror = true; - setRotation(Can1Side4, 0F, 0F, 0F); - Can2Side4 = new ModelRenderer(this, 0, 0); - Can2Side4.addBox(0F, 0F, 0F, 1, 2, 2); - Can2Side4.setRotationPoint(-6F, 20F, 3F); - Can2Side4.setTextureSize(128, 64); - Can2Side4.mirror = true; - setRotation(Can2Side4, 0F, 0F, 0F); - Can3Side3 = new ModelRenderer(this, 0, 0); - Can3Side3.addBox(0F, 0F, 0F, 1, 2, 2); - Can3Side3.setRotationPoint(5F, 20F, -5F); - Can3Side3.setTextureSize(128, 64); - Can3Side3.mirror = true; - setRotation(Can3Side3, 0F, 0F, 0F); - Can2Side2 = new ModelRenderer(this, 0, 0); - Can2Side2.addBox(0F, 0F, 0F, 4, 2, 1); - Can2Side2.setRotationPoint(-6F, 20F, 2F); - Can2Side2.setTextureSize(128, 64); - Can2Side2.mirror = true; - setRotation(Can2Side2, 0F, 0F, 0F); - Can2Side3 = new ModelRenderer(this, 0, 0); - Can2Side3.addBox(0F, 0F, 0F, 1, 2, 2); - Can2Side3.setRotationPoint(-3F, 20F, 3F); - Can2Side3.setTextureSize(128, 64); - Can2Side3.mirror = true; - setRotation(Can2Side3, 0F, 0F, 0F); - Can2Side1 = new ModelRenderer(this, 0, 0); - Can2Side1.addBox(0F, 0F, 0F, 4, 2, 1); - Can2Side1.setRotationPoint(-6F, 20F, 5F); - Can2Side1.setTextureSize(128, 64); - Can2Side1.mirror = true; - setRotation(Can2Side1, 0F, 0F, 0F); - Can4Side3 = new ModelRenderer(this, 0, 0); - Can4Side3.addBox(0F, 0F, 0F, 1, 2, 2); - Can4Side3.setRotationPoint(-3F, 20F, -5F); - Can4Side3.setTextureSize(128, 64); - Can4Side3.mirror = true; - setRotation(Can4Side3, 0F, 0F, 0F); - Can4Side1 = new ModelRenderer(this, 0, 0); - Can4Side1.addBox(0F, 0F, 0F, 4, 2, 1); - Can4Side1.setRotationPoint(-6F, 20F, -3F); - Can4Side1.setTextureSize(128, 64); - Can4Side1.mirror = true; - setRotation(Can4Side1, 0F, 0F, 0F); - Can4Sjde4 = new ModelRenderer(this, 0, 0); - Can4Sjde4.addBox(0F, 0F, 0F, 1, 2, 2); - Can4Sjde4.setRotationPoint(-6F, 20F, -5F); - Can4Sjde4.setTextureSize(128, 64); - Can4Sjde4.mirror = true; - setRotation(Can4Sjde4, 0F, 0F, 0F); - Can4Side2 = new ModelRenderer(this, 0, 0); - Can4Side2.addBox(0F, 0F, 0F, 4, 2, 1); - Can4Side2.setRotationPoint(-6F, 20F, -6F); - Can4Side2.setTextureSize(128, 64); - Can4Side2.mirror = true; - setRotation(Can4Side2, 0F, 0F, 0F); - Can3Side4 = new ModelRenderer(this, 0, 0); - Can3Side4.addBox(0F, 0F, 0F, 1, 2, 2); - Can3Side4.setRotationPoint(2F, 20F, -5F); - Can3Side4.setTextureSize(128, 64); - Can3Side4.mirror = true; - setRotation(Can3Side4, 0F, 0F, 0F); - Can4B = new ModelRenderer(this, 0, 0); - Can4B.addBox(0F, 0F, 0F, 4, 1, 4); - Can4B.setRotationPoint(-6F, 22F, -6F); - Can4B.setTextureSize(128, 64); - Can4B.mirror = true; - setRotation(Can4B, 0F, 0F, 0F); - Can3Side2 = new ModelRenderer(this, 0, 0); - Can3Side2.addBox(0F, 0F, 0F, 4, 2, 1); - Can3Side2.setRotationPoint(2F, 20F, -6F); - Can3Side2.setTextureSize(128, 64); - Can3Side2.mirror = true; - setRotation(Can3Side2, 0F, 0F, 0F); - Can3Side1 = new ModelRenderer(this, 0, 0); - Can3Side1.addBox(0F, 0F, 0F, 4, 2, 1); - Can3Side1.setRotationPoint(2F, 20F, -3F); - Can3Side1.setTextureSize(128, 64); - Can3Side1.mirror = true; - setRotation(Can3Side1, 0F, 0F, 0F); - Can2B = new ModelRenderer(this, 0, 0); - Can2B.addBox(0F, 0F, 0F, 4, 1, 4); - Can2B.setRotationPoint(-6F, 22F, 2F); - Can2B.setTextureSize(128, 64); - Can2B.mirror = true; - setRotation(Can2B, 0F, 0F, 0F); - Can4T = new ModelRenderer(this, 0, 0); - Can4T.addBox(0F, 0F, 0F, 4, 1, 4); - Can4T.setRotationPoint(-6F, 19F, -6F); - Can4T.setTextureSize(128, 64); - Can4T.mirror = true; - setRotation(Can4T, 0F, 0F, 0F); - Can2T = new ModelRenderer(this, 0, 0); - Can2T.addBox(0F, 0F, 0F, 4, 1, 4); - Can2T.setRotationPoint(-6F, 19F, 2F); - Can2T.setTextureSize(128, 64); - Can2T.mirror = true; - setRotation(Can2T, 0F, 0F, 0F); - Can3T = new ModelRenderer(this, 0, 0); - Can3T.addBox(0F, 0F, 0F, 4, 1, 4); - Can3T.setRotationPoint(2F, 19F, -6F); - Can3T.setTextureSize(128, 64); - Can3T.mirror = true; - setRotation(Can3T, 0F, 0F, 0F); - Can3B = new ModelRenderer(this, 0, 0); - Can3B.addBox(0F, 0F, 0F, 4, 1, 4); - Can3B.setRotationPoint(2F, 22F, -6F); - Can3B.setTextureSize(128, 64); - Can3B.mirror = true; - setRotation(Can3B, 0F, 0F, 0F); + tankBack = new ModelRenderer(this, 0, 20); + tankBack.addBox(0F, 0F, 0F, 16, 10, 6); + tankBack.setRotationPoint(-8F, 10F, 2F); + tankBack.setTextureSize(128, 64); + tankBack.mirror = true; + setRotation(tankBack, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 4, 16); + base.setRotationPoint(-8F, 20F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + portTop = new ModelRenderer(this, 53, 33); + portTop.addBox(0F, 0F, 0F, 10, 1, 10); + portTop.setRotationPoint(-5F, 8F, -5F); + portTop.setTextureSize(128, 64); + portTop.mirror = true; + setRotation(portTop, 0F, 0F, 0F); + pipe1 = new ModelRenderer(this, 66, 9); + pipe1.addBox(0F, 0F, 0F, 7, 5, 7); + pipe1.setRotationPoint(-3.5F, 9F, -3.5F); + pipe1.setTextureSize(128, 64); + pipe1.mirror = true; + setRotation(pipe1, 0F, 0F, 0F); + pipe2b = new ModelRenderer(this, 44, 21); + pipe2b.addBox(0F, 0F, 0F, 1, 8, 4); + pipe2b.setRotationPoint(-3.49F, 14F, -3.5F); + pipe2b.setTextureSize(128, 64); + pipe2b.mirror = true; + setRotation(pipe2b, 0.837758F, 0F, 0F); + portRight = new ModelRenderer(this, 48, 0); + portRight.addBox(0F, 0F, 0F, 1, 8, 8); + portRight.setRotationPoint(7.01F, 12F, -4F); + portRight.setTextureSize(128, 64); + portRight.mirror = true; + setRotation(portRight, 0F, 0F, 0F); + bridge1 = new ModelRenderer(this, 0, 0); + bridge1.addBox(0F, 0F, 0F, 2, 1, 1); + bridge1.setRotationPoint(-1F, 11F, -7F); + bridge1.setTextureSize(128, 64); + bridge1.mirror = true; + setRotation(bridge1, 0F, 0F, 0F); + bridge2 = new ModelRenderer(this, 0, 0); + bridge2.addBox(0F, 0F, 0F, 2, 1, 1); + bridge2.setRotationPoint(-1F, 13F, -7F); + bridge2.setTextureSize(128, 64); + bridge2.mirror = true; + setRotation(bridge2, 0F, 0F, 0F); + bridge3 = new ModelRenderer(this, 0, 0); + bridge3.addBox(0F, 0F, 0F, 2, 1, 1); + bridge3.setRotationPoint(-1F, 15F, -7F); + bridge3.setTextureSize(128, 64); + bridge3.mirror = true; + setRotation(bridge3, 0F, 0F, 0F); + conduit = new ModelRenderer(this, 0, 3); + conduit.addBox(0F, 0F, 0F, 2, 1, 2); + conduit.setRotationPoint(-1F, 19.5F, -5F); + conduit.setTextureSize(128, 64); + conduit.mirror = true; + setRotation(conduit, 0F, 0F, 0F); + bridge4 = new ModelRenderer(this, 0, 0); + bridge4.addBox(0F, 0F, 0F, 2, 1, 1); + bridge4.setRotationPoint(-1F, 17F, -7F); + bridge4.setTextureSize(128, 64); + bridge4.mirror = true; + setRotation(bridge4, 0F, 0F, 0F); + pipe2 = new ModelRenderer(this, 54, 21); + pipe2.addBox(0F, 0F, 0F, 6, 8, 4); + pipe2.setRotationPoint(-2.51F, 14F, -3.5F); + pipe2.setTextureSize(128, 64); + pipe2.mirror = true; + setRotation(pipe2, 0.837758F, 0F, 0F); + tankLeft = new ModelRenderer(this, 0, 36); + tankLeft.addBox(0F, 0F, 0F, 7, 10, 8); + tankLeft.setRotationPoint(-8F, 10F, -8F); + tankLeft.setTextureSize(128, 64); + tankLeft.mirror = true; + setRotation(tankLeft, 0F, 0F, 0F); + connectorRight = new ModelRenderer(this, 0, 7); + connectorRight.addBox(0F, 0F, 0F, 2, 6, 2); + connectorRight.setRotationPoint(5F, 13F, 0F); + connectorRight.setTextureSize(128, 64); + connectorRight.mirror = true; + setRotation(connectorRight, 0F, 0F, 0F); + portLeft = new ModelRenderer(this, 48, 0); + portLeft.addBox(0F, 0F, 0F, 1, 8, 8); + portLeft.setRotationPoint(-8.01F, 12F, -4F); + portLeft.setTextureSize(128, 64); + portLeft.mirror = true; + setRotation(portLeft, 0F, 0F, 0F); + connectorLeft = new ModelRenderer(this, 0, 7); + connectorLeft.addBox(0F, 0F, 0F, 2, 6, 2); + connectorLeft.setRotationPoint(-7F, 13F, 0F); + connectorLeft.setTextureSize(128, 64); + connectorLeft.mirror = true; + setRotation(connectorLeft, 0F, 0F, 0F); + tankRight = new ModelRenderer(this, 0, 36); + tankRight.mirror = true; + tankRight.addBox(0F, 0F, 0F, 7, 10, 8); + tankRight.setRotationPoint(1F, 10F, -8F); + tankRight.setTextureSize(128, 64); + setRotation(tankRight, 0F, 0F, 0F); + tubeLeft1 = new ModelRenderer(this, 30, 36); + tubeLeft1.addBox(0F, 0F, -1F, 1, 2, 1); + tubeLeft1.setRotationPoint(-6F, 8.5F, 4F); + tubeLeft1.setTextureSize(128, 64); + tubeLeft1.mirror = true; + setRotation(tubeLeft1, 0.6806784F, 0F, 0F); + tubeLeft2 = new ModelRenderer(this, 30, 36); + tubeLeft2.addBox(0F, 0F, 0F, 1, 1, 8); + tubeLeft2.setRotationPoint(-6F, 8.5F, -4F); + tubeLeft2.setTextureSize(128, 64); + tubeLeft2.mirror = true; + setRotation(tubeLeft2, 0F, 0F, 0F); + tubeRight3 = new ModelRenderer(this, 30, 39); + tubeRight3.addBox(0F, -1F, 0F, 1, 2, 1); + tubeRight3.setRotationPoint(6F, 10F, -2.5F); + tubeRight3.setTextureSize(128, 64); + tubeRight3.mirror = true; + setRotation(tubeRight3, 0F, 0F, 0.3141593F); + tubeRight1 = new ModelRenderer(this, 30, 39); + tubeRight1.addBox(0F, -1F, 0F, 1, 2, 1); + tubeRight1.setRotationPoint(6F, 10F, -6.5F); + tubeRight1.setTextureSize(128, 64); + tubeRight1.mirror = true; + setRotation(tubeRight1, 0F, 0F, 0.3141593F); + tubeRight2 = new ModelRenderer(this, 30, 39); + tubeRight2.addBox(0F, -1F, 0F, 1, 2, 1); + tubeRight2.setRotationPoint(6F, 10F, -4.5F); + tubeRight2.setTextureSize(128, 64); + tubeRight2.mirror = true; + setRotation(tubeRight2, 0F, 0F, 0.3141593F); + tubeLeft3 = new ModelRenderer(this, 30, 36); + tubeLeft3.addBox(0F, 0F, 0F, 1, 2, 1); + tubeLeft3.setRotationPoint(-6F, 9.5F, -4F); + tubeLeft3.setTextureSize(128, 64); + tubeLeft3.mirror = true; + setRotation(tubeLeft3, 0F, 0F, -0.8203047F); } public void render(float size) { - MekanismRenderer.blendOn(); - - Base.render(size); - Base2.render(size); - IO1.render(size); - IO2.render(size); - IO3.render(size); - Base3.render(size); - Base4.render(size); - Base5.render(size); - Base6.render(size); - Can1B.render(size); - Can1T.render(size); - Can1Side3.render(size); - Can1Side1.render(size); - Can1Side2.render(size); - Can1Side4.render(size); - Can2Side4.render(size); - Can3Side3.render(size); - Can2Side2.render(size); - Can2Side3.render(size); - Can2Side1.render(size); - Can4Side3.render(size); - Can4Side1.render(size); - Can4Sjde4.render(size); - Can4Side2.render(size); - Can3Side4.render(size); - Can4B.render(size); - Can3Side2.render(size); - Can3Side1.render(size); - Can2B.render(size); - Can4T.render(size); - Can2T.render(size); - Can3T.render(size); - Can3B.render(size); - - MekanismRenderer.blendOff(); + tankBack.render(size); + base.render(size); + portTop.render(size); + pipe1.render(size); + pipe2b.render(size); + portRight.render(size); + bridge1.render(size); + bridge2.render(size); + bridge3.render(size); + conduit.render(size); + bridge4.render(size); + pipe2.render(size); + tankLeft.render(size); + connectorRight.render(size); + portLeft.render(size); + connectorLeft.render(size); + tankRight.render(size); + tubeLeft1.render(size); + tubeLeft2.render(size); + tubeRight3.render(size); + tubeRight1.render(size); + tubeRight2.render(size); + tubeLeft3.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelDigitalMiner.java b/src/main/java/mekanism/client/model/ModelDigitalMiner.java index 20e85e7b5..5de768cec 100644 --- a/src/main/java/mekanism/client/model/ModelDigitalMiner.java +++ b/src/main/java/mekanism/client/model/ModelDigitalMiner.java @@ -1,14 +1,24 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelDigitalMiner extends ModelBase { + public static ResourceLocation OVERLAY_ON = MekanismUtils.getResource(ResourceType.RENDER, "DigitalMiner_OverlayOn.png"); + public static ResourceLocation OVERLAY_OFF = MekanismUtils.getResource(ResourceType.RENDER, "DigitalMiner_OverlayOff.png"); + ModelRenderer keyboard; ModelRenderer keyboardBottom; ModelRenderer keyboardSupportExt1; @@ -411,8 +421,24 @@ public class ModelDigitalMiner extends ModelBase monitor3.mirror = true; setRotation(monitor3, 0.0872665F, 0.2094395F, 0F); } + + public void render(float size, boolean on, TextureManager manager) + { + doRender(size); + + GL11.glPushMatrix(); + manager.bindTexture(on ? OVERLAY_ON : OVERLAY_OFF); + GL11.glScalef(1.001F, 1.001F, 1.001F); + GL11.glTranslatef(0, -0.0011F, 0); + MekanismRenderer.glowOn(); + + doRender(size); + + MekanismRenderer.glowOff(); + GL11.glPopMatrix(); + } - public void render(float size, boolean on) + private void doRender(float size) { keyboard.render(size); keyboardBottom.render(size); @@ -425,25 +451,12 @@ public class ModelDigitalMiner extends ModelBase monitor3back.render(size); monitorBar1.render(size); monitorBar2.render(size); - - if(on) - { - MekanismRenderer.glowOn(); - } - led1.render(size); led2.render(size); led3.render(size); - monitor1.render(size); monitor2.render(size); monitor3.render(size); - - if(on) - { - MekanismRenderer.glowOff(); - } - monitorMount1.render(size); monitorMount2.render(size); frame1.render(size); diff --git a/src/main/java/mekanism/client/model/ModelElectricPump.java b/src/main/java/mekanism/client/model/ModelElectricPump.java index 06bd1b587..8de86bbaf 100644 --- a/src/main/java/mekanism/client/model/ModelElectricPump.java +++ b/src/main/java/mekanism/client/model/ModelElectricPump.java @@ -8,112 +8,176 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelElectricPump extends ModelBase { - ModelRenderer PumpHead; - ModelRenderer Connector; - ModelRenderer Panel1; - ModelRenderer Panel2; - ModelRenderer Panel3; - ModelRenderer Body; - ModelRenderer Axil; - ModelRenderer Axil2; - ModelRenderer Ring1; - ModelRenderer Ring2; - ModelRenderer Plug; - ModelRenderer Ring3; + ModelRenderer pumpRingTop; + ModelRenderer pumpPortTop; + ModelRenderer pumpCasing; + ModelRenderer pumpBase; + ModelRenderer powerPort; + ModelRenderer powerConnector; + ModelRenderer powerConnectorFrame4; + ModelRenderer powerConnectorFrame3; + ModelRenderer powerConnectorFrame2; + ModelRenderer powerConnectorFrame1; + ModelRenderer pipeToggleBack; + ModelRenderer pipeToggleRingBack; + ModelRenderer pipeTogglePortBack; + ModelRenderer pipeToggleLeft; + ModelRenderer pipeToggleRingLeft; + ModelRenderer pipeTogglePortLeft; + ModelRenderer pipeToggleRight; + ModelRenderer pipeToggleRingRight; + ModelRenderer pipeTogglePortRight; + ModelRenderer pumpPipe; - public ModelElectricPump() + public ModelElectricPump() { - textureWidth = 64; + textureWidth = 128; textureHeight = 64; - PumpHead = new ModelRenderer(this, 33, 0); - PumpHead.addBox(0F, 0F, 0F, 6, 3, 6); - PumpHead.setRotationPoint(-3F, 19F, -3F); - PumpHead.setTextureSize(64, 64); - PumpHead.mirror = true; - setRotation(PumpHead, 0F, 0F, 0F); - Connector = new ModelRenderer(this, 33, 10); - Connector.addBox(0F, 0F, 0F, 4, 1, 5); - Connector.setRotationPoint(-2F, 14F, 2.5F); - Connector.setTextureSize(64, 64); - Connector.mirror = true; - setRotation(Connector, 0F, 0F, 0F); - Panel1 = new ModelRenderer(this, 0, 15); - Panel1.addBox(-3F, -6F, 0F, 6, 6, 1); - Panel1.setRotationPoint(0F, 21F, -3F); - Panel1.setTextureSize(64, 64); - Panel1.mirror = true; - setRotation(Panel1, 0.5585054F, 0F, 0F); - Panel2 = new ModelRenderer(this, 15, 15); - Panel2.addBox(0F, -6F, -3F, 1, 6, 6); - Panel2.setRotationPoint(-3F, 21F, 0F); - Panel2.setTextureSize(64, 64); - Panel2.mirror = true; - setRotation(Panel2, 0F, 0F, -0.5585054F); - Panel3 = new ModelRenderer(this, 15, 15); - Panel3.addBox(-1F, -6F, -3F, 1, 6, 6); - Panel3.setRotationPoint(3F, 21F, 0F); - Panel3.setTextureSize(64, 64); - Panel3.mirror = true; - setRotation(Panel3, 0F, 0F, 0.5585054F); - Body = new ModelRenderer(this, 30, 17); - Body.addBox(0F, 0F, 0F, 6, 10, 6); - Body.setRotationPoint(-3F, 9F, -3F); - Body.setTextureSize(64, 64); - Body.mirror = true; - setRotation(Body, 0F, 0F, 0F); - Axil = new ModelRenderer(this, 0, 28); - Axil.addBox(0F, 0F, 0F, 9, 2, 4); - Axil.setRotationPoint(-4.5F, 17F, -2F); - Axil.setTextureSize(64, 64); - Axil.mirror = true; - setRotation(Axil, 0F, 0F, 0F); - Axil2 = new ModelRenderer(this, 0, 0); - Axil2.addBox(0F, 0F, 0F, 4, 2, 12); - Axil2.setRotationPoint(-2F, 17F, -4.5F); - Axil2.setTextureSize(64, 64); - Axil2.mirror = true; - setRotation(Axil2, 0F, 0F, 0F); - Ring1 = new ModelRenderer(this, 0, 35); - Ring1.addBox(0F, 0F, 0F, 8, 1, 8); - Ring1.setRotationPoint(-4F, 12F, -4F); - Ring1.setTextureSize(64, 64); - Ring1.mirror = true; - setRotation(Ring1, 0F, 0F, 0F); - Ring2 = new ModelRenderer(this, 0, 35); - Ring2.addBox(0F, 0F, 0F, 8, 1, 8); - Ring2.setRotationPoint(-4F, 10F, -4F); - Ring2.setTextureSize(64, 64); - Ring2.mirror = true; - setRotation(Ring2, 0F, 0F, 0F); - Plug = new ModelRenderer(this, 0, 45); - Plug.addBox(0F, 0F, 0F, 6, 6, 1); - Plug.setRotationPoint(-3F, 13F, 7F); - Plug.setTextureSize(64, 64); - Plug.mirror = true; - setRotation(Plug, 0F, 0F, 0F); - Ring3 = new ModelRenderer(this, 0, 35); - Ring3.addBox(0F, 0F, 0F, 8, 1, 8); - Ring3.setRotationPoint(-4F, 8F, -4F); - Ring3.setTextureSize(64, 64); - Ring3.mirror = true; - setRotation(Ring3, 0F, 0F, 0F); + pumpRingTop = new ModelRenderer(this, 68, 9); + pumpRingTop.addBox(0F, 0F, 0F, 8, 1, 8); + pumpRingTop.setRotationPoint(-4F, 10F, -4F); + pumpRingTop.setTextureSize(128, 64); + pumpRingTop.mirror = true; + setRotation(pumpRingTop, 0F, 0F, 0F); + pumpPortTop = new ModelRenderer(this, 68, 0); + pumpPortTop.addBox(0F, 0F, 0F, 8, 1, 8); + pumpPortTop.setRotationPoint(-4F, 8F, -4F); + pumpPortTop.setTextureSize(128, 64); + pumpPortTop.mirror = true; + setRotation(pumpPortTop, 0F, 0F, 0F); + pumpCasing = new ModelRenderer(this, 0, 0); + pumpCasing.addBox(0F, 0F, 0F, 7, 12, 7); + pumpCasing.setRotationPoint(-3.5F, 11F, -3.5F); + pumpCasing.setTextureSize(128, 64); + pumpCasing.mirror = true; + setRotation(pumpCasing, 0F, 0F, 0F); + pumpBase = new ModelRenderer(this, 28, 0); + pumpBase.addBox(0F, 0F, 0F, 6, 15, 6); + pumpBase.setRotationPoint(-3F, 9F, -3F); + pumpBase.setTextureSize(128, 64); + pumpBase.mirror = true; + setRotation(pumpBase, 0F, 0F, 0F); + powerPort = new ModelRenderer(this, 38, 29); + powerPort.addBox(0F, 0F, 0F, 8, 8, 1); + powerPort.setRotationPoint(-4F, 12F, -8F); + powerPort.setTextureSize(128, 64); + powerPort.mirror = true; + setRotation(powerPort, 0F, 0F, 0F); + powerConnector = new ModelRenderer(this, 0, 29); + powerConnector.addBox(0F, 0F, 0F, 5, 5, 4); + powerConnector.setRotationPoint(-2.5F, 13.5F, -7F); + powerConnector.setTextureSize(128, 64); + powerConnector.mirror = true; + setRotation(powerConnector, 0F, 0F, 0F); + powerConnectorFrame4 = new ModelRenderer(this, 38, 21); + powerConnectorFrame4.addBox(0F, 0F, 0F, 1, 1, 4); + powerConnectorFrame4.setRotationPoint(2F, 18F, -7F); + powerConnectorFrame4.setTextureSize(128, 64); + powerConnectorFrame4.mirror = true; + setRotation(powerConnectorFrame4, 0F, 0F, 0F); + powerConnectorFrame3 = new ModelRenderer(this, 38, 21); + powerConnectorFrame3.addBox(0F, 0F, 0F, 1, 1, 4); + powerConnectorFrame3.setRotationPoint(-3F, 18F, -7F); + powerConnectorFrame3.setTextureSize(128, 64); + powerConnectorFrame3.mirror = true; + setRotation(powerConnectorFrame3, 0F, 0F, 0F); + powerConnectorFrame2 = new ModelRenderer(this, 38, 21); + powerConnectorFrame2.addBox(0F, 0F, 0F, 1, 1, 4); + powerConnectorFrame2.setRotationPoint(2F, 13F, -7F); + powerConnectorFrame2.setTextureSize(128, 64); + powerConnectorFrame2.mirror = true; + setRotation(powerConnectorFrame2, 0F, 0F, 0F); + powerConnectorFrame1 = new ModelRenderer(this, 38, 21); + powerConnectorFrame1.addBox(0F, 0F, 0F, 1, 1, 4); + powerConnectorFrame1.setRotationPoint(-3F, 13F, -7F); + powerConnectorFrame1.setTextureSize(128, 64); + powerConnectorFrame1.mirror = true; + setRotation(powerConnectorFrame1, 0F, 0F, 0F); + pipeToggleBack = new ModelRenderer(this, 0, 19); + pipeToggleBack.addBox(0F, 0F, 0F, 6, 6, 4); + pipeToggleBack.setRotationPoint(-3F, 13F, 3F); + pipeToggleBack.setTextureSize(128, 64); + pipeToggleBack.mirror = true; + setRotation(pipeToggleBack, 0F, 0F, 0F); + pipeToggleRingBack = new ModelRenderer(this, 18, 30); + pipeToggleRingBack.addBox(0F, 0F, 0F, 7, 7, 1); + pipeToggleRingBack.setRotationPoint(-3.5F, 12.5F, 5F); + pipeToggleRingBack.setTextureSize(128, 64); + pipeToggleRingBack.mirror = true; + setRotation(pipeToggleRingBack, 0F, 0F, 0F); + pipeTogglePortBack = new ModelRenderer(this, 20, 21); + pipeTogglePortBack.addBox(0F, 0F, 0F, 8, 8, 1); + pipeTogglePortBack.setRotationPoint(-4F, 12F, 7F); + pipeTogglePortBack.setTextureSize(128, 64); + pipeTogglePortBack.mirror = true; + setRotation(pipeTogglePortBack, 0F, 0F, 0F); + pipeToggleLeft = new ModelRenderer(this, 34, 38); + pipeToggleLeft.addBox(0F, 0F, 0F, 4, 6, 6); + pipeToggleLeft.setRotationPoint(3F, 13F, -3F); + pipeToggleLeft.setTextureSize(128, 64); + pipeToggleLeft.mirror = true; + setRotation(pipeToggleLeft, 0F, 0F, 0F); + pipeToggleRingLeft = new ModelRenderer(this, 18, 38); + pipeToggleRingLeft.addBox(0F, 0F, 0F, 1, 7, 7); + pipeToggleRingLeft.setRotationPoint(5F, 12.5F, -3.5F); + pipeToggleRingLeft.setTextureSize(128, 64); + pipeToggleRingLeft.mirror = true; + setRotation(pipeToggleRingLeft, 0F, 0F, 0F); + pipeTogglePortLeft = new ModelRenderer(this, 0, 38); + pipeTogglePortLeft.addBox(0F, 0F, 0F, 1, 8, 8); + pipeTogglePortLeft.setRotationPoint(7F, 12F, -4F); + pipeTogglePortLeft.setTextureSize(128, 64); + pipeTogglePortLeft.mirror = true; + setRotation(pipeTogglePortLeft, 0F, 0F, 0F); + pipeToggleRight = new ModelRenderer(this, 34, 38); + pipeToggleRight.mirror = true; + pipeToggleRight.addBox(0F, 0F, 0F, 4, 6, 6); + pipeToggleRight.setRotationPoint(-7F, 13F, -3F); + pipeToggleRight.setTextureSize(128, 64); + setRotation(pipeToggleRight, 0F, 0F, 0F); + pipeToggleRingRight = new ModelRenderer(this, 18, 38); + pipeToggleRingRight.addBox(0F, 0F, 0F, 1, 7, 7); + pipeToggleRingRight.setRotationPoint(-6F, 12.5F, -3.5F); + pipeToggleRingRight.setTextureSize(128, 64); + pipeToggleRingRight.mirror = true; + setRotation(pipeToggleRingRight, 0F, 0F, 0F); + pipeTogglePortRight = new ModelRenderer(this, 0, 38); + pipeTogglePortRight.addBox(0F, 0F, 0F, 1, 8, 8); + pipeTogglePortRight.setRotationPoint(-8F, 12F, -4F); + pipeTogglePortRight.setTextureSize(128, 64); + pipeTogglePortRight.mirror = true; + setRotation(pipeTogglePortRight, 0F, 0F, 0F); + pumpPipe = new ModelRenderer(this, 52, 0); + pumpPipe.addBox(0F, 0F, 0F, 4, 8, 4); + pumpPipe.setRotationPoint(-2F, 24F, -2F); + pumpPipe.setTextureSize(128, 64); + pumpPipe.mirror = true; + setRotation(pumpPipe, 0F, 0F, 0F); } public void render(float size) { - PumpHead.render(size); - Connector.render(size); - Panel1.render(size); - Panel2.render(size); - Panel3.render(size); - Body.render(size); - Axil.render(size); - Axil2.render(size); - Ring1.render(size); - Ring2.render(size); - Plug.render(size); - Ring3.render(size); + pumpRingTop.render(size); + pumpPortTop.render(size); + pumpCasing.render(size); + pumpBase.render(size); + powerPort.render(size); + powerConnector.render(size); + powerConnectorFrame4.render(size); + powerConnectorFrame3.render(size); + powerConnectorFrame2.render(size); + powerConnectorFrame1.render(size); + /*pipeToggleBack.render(size); + pipeToggleRingBack.render(size); + pipeTogglePortBack.render(size); + pipeToggleLeft.render(size); + pipeToggleRingLeft.render(size); + pipeTogglePortLeft.render(size); + pipeToggleRight.render(size); + pipeToggleRingRight.render(size); + pipeTogglePortRight.render(size); + pumpPipe.render(size);*/ } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java b/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java index 6fd70f870..16e18f2cf 100644 --- a/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java @@ -8,192 +8,152 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelElectrolyticSeparator extends ModelBase { - ModelRenderer A; - ModelRenderer B; - ModelRenderer C; - ModelRenderer D; - ModelRenderer E; - ModelRenderer F; - ModelRenderer G; - ModelRenderer H; - ModelRenderer I; - ModelRenderer J; - ModelRenderer K; - ModelRenderer L; - ModelRenderer M; - ModelRenderer N; - ModelRenderer OUTPUT; - ModelRenderer P; - ModelRenderer Q; - ModelRenderer R; - ModelRenderer S; - ModelRenderer T; - ModelRenderer U; - ModelRenderer V; + ModelRenderer tank2; + ModelRenderer tank1; + ModelRenderer tank3; + ModelRenderer tube6; + ModelRenderer tube5; + ModelRenderer tube4; + ModelRenderer tube3; + ModelRenderer tube2; + ModelRenderer tube1; + ModelRenderer base; + ModelRenderer portToggle1; + ModelRenderer portToggle2a; + ModelRenderer portToggle2b; + ModelRenderer portToggle3a; + ModelRenderer portToggle3b; + ModelRenderer portToggle4a; + ModelRenderer portToggle4b; - public ModelElectrolyticSeparator() + public ModelElectrolyticSeparator() { textureWidth = 128; - textureHeight = 128; + textureHeight = 64; - A = new ModelRenderer(this, 0, 0); - A.addBox(-8F, 0F, -8F, 16, 1, 16); - A.setRotationPoint(0F, 23F, 0F); - A.setTextureSize(128, 128); - A.mirror = true; - setRotation(A, 0F, 0F, 0F); - B = new ModelRenderer(this, 85, 0); - B.addBox(-2F, 0F, -2F, 4, 10, 4); - B.setRotationPoint(4F, 12F, -4F); - B.setTextureSize(128, 128); - B.mirror = true; - setRotation(B, 0F, 1.570796F, 0F); - C = new ModelRenderer(this, 66, 0); - C.addBox(-2F, 0F, -2F, 4, 10, 4); - C.setRotationPoint(-4F, 12F, -4F); - C.setTextureSize(128, 128); - C.mirror = true; - setRotation(C, 0F, 1.570796F, 0F); - D = new ModelRenderer(this, 48, 19); - D.addBox(-1F, -1F, 0F, 2, 2, 6); - D.setRotationPoint(-2F, 18F, -4F); - D.setTextureSize(128, 128); - D.mirror = true; - setRotation(D, 0F, 1.570796F, 0F); - E = new ModelRenderer(this, 0, 19); - E.addBox(0F, 0F, -6F, 4, 15, 14); - E.setRotationPoint(0F, 8F, 8F); - E.setTextureSize(128, 128); - E.mirror = true; - setRotation(E, 0F, 1.570796F, 0F); - F = new ModelRenderer(this, 103, 0); - F.addBox(-3F, -1F, -1F, 6, 2, 2); - F.setRotationPoint(4F, 20F, 1F); - F.setTextureSize(128, 128); - F.mirror = true; - setRotation(F, 0F, 1.570796F, 0F); - G = new ModelRenderer(this, 103, 0); - G.addBox(-3F, 0F, 0F, 6, 2, 2); - G.setRotationPoint(-5F, 20F, 1F); - G.setTextureSize(128, 128); - G.mirror = true; - setRotation(G, 0F, 1.570796F, 0F); - H = new ModelRenderer(this, 0, 50); - H.addBox(-2F, 0F, 0F, 4, 12, 2); - H.setRotationPoint(-8F, 11F, 6F); - H.setTextureSize(128, 128); - H.mirror = true; - setRotation(H, 0F, 1.570796F, 0F); - I = new ModelRenderer(this, 41, 28); - I.addBox(0F, 0F, 0F, 6, 1, 6); - I.setRotationPoint(-7F, 22F, -7F); - I.setTextureSize(128, 128); - I.mirror = true; - setRotation(I, 0F, 0F, 0F); - J = new ModelRenderer(this, 41, 28); - J.addBox(0F, 0F, 0F, 6, 1, 6); - J.setRotationPoint(1F, 22F, -7F); - J.setTextureSize(128, 128); - J.mirror = true; - setRotation(J, 0F, 0F, 0F); - K = new ModelRenderer(this, 66, 16); - K.addBox(0F, 0F, 0F, 2, 1, 2); - K.setRotationPoint(-5F, 11F, -5F); - K.setTextureSize(128, 128); - K.mirror = true; - setRotation(K, 0F, 0F, 0F); - L = new ModelRenderer(this, 85, 15); - L.addBox(0F, 0F, 0F, 2, 2, 2); - L.setRotationPoint(3F, 10F, -5F); - L.setTextureSize(128, 128); - L.mirror = true; - setRotation(L, 0F, 0F, 0F); - M = new ModelRenderer(this, 66, 22); - M.addBox(-1F, 0F, -1F, 2, 2, 6); - M.setRotationPoint(-4F, 9F, -4F); - M.setTextureSize(128, 128); - M.mirror = true; - setRotation(M, 0F, 1.570796F, 0F); - N = new ModelRenderer(this, 66, 32); - N.addBox(-1F, -1F, -1F, 2, 6, 2); - N.setRotationPoint(0F, 12F, -4F); - N.setTextureSize(128, 128); - N.mirror = true; - setRotation(N, 0F, 0F, 0F); - OUTPUT = new ModelRenderer(this, 66, 42); - OUTPUT.addBox(-1F, -1F, -1F, 4, 2, 2); - OUTPUT.setRotationPoint(0F, 16F, -5F); - OUTPUT.setTextureSize(128, 128); - OUTPUT.mirror = true; - setRotation(OUTPUT, 0F, 1.570796F, 0F); - P = new ModelRenderer(this, 85, 21); - P.addBox(-1F, -1F, -1F, 2, 3, 2); - P.setRotationPoint(5F, 9F, -4F); - P.setTextureSize(128, 128); - P.mirror = true; - setRotation(P, 0F, 0F, 0.6457718F); - Q = new ModelRenderer(this, 0, 65); - Q.addBox(0F, 0F, -2F, 3, 11, 6); - Q.setRotationPoint(-8F, 12F, 0F); - Q.setTextureSize(128, 128); - Q.mirror = true; - setRotation(Q, 0F, 0F, 0F); - R = new ModelRenderer(this, 0, 65); - R.addBox(0F, 0F, -3F, 3, 11, 6); - R.setRotationPoint(8F, 12F, 1F); - R.setTextureSize(128, 128); - R.mirror = true; - setRotation(R, 0F, 3.141593F, 0F); - S = new ModelRenderer(this, 0, 84); - S.addBox(0F, 0F, 0F, 4, 1, 1); - S.setRotationPoint(2F, 16F, 3F); - S.setTextureSize(128, 128); - S.mirror = true; - setRotation(S, 0F, 0F, 0F); - T = new ModelRenderer(this, 0, 84); - T.addBox(0F, 0F, 0F, 4, 1, 1); - T.setRotationPoint(-6F, 16F, 3F); - T.setTextureSize(128, 128); - T.mirror = true; - setRotation(T, 0F, 0F, 0F); - U = new ModelRenderer(this, 0, 87); - U.addBox(0F, 0F, 0F, 4, 1, 1); - U.setRotationPoint(-6F, 18F, 3F); - U.setTextureSize(128, 128); - U.mirror = true; - setRotation(U, 0F, 0F, 0F); - V = new ModelRenderer(this, 0, 87); - V.addBox(0F, 0F, 0F, 4, 1, 1); - V.setRotationPoint(2F, 18F, 3F); - V.setTextureSize(128, 128); - V.mirror = true; - setRotation(V, 0F, 0F, 0F); + tank2 = new ModelRenderer(this, 64, 0); + tank2.addBox(0F, 0F, 0F, 7, 10, 7); + tank2.setRotationPoint(1F, 10F, 1F); + tank2.setTextureSize(128, 64); + tank2.mirror = true; + setRotation(tank2, 0F, 0F, 0F); + tank1 = new ModelRenderer(this, 0, 20); + tank1.addBox(0F, 0F, 0F, 8, 12, 16); + tank1.setRotationPoint(-8F, 8F, -8F); + tank1.setTextureSize(128, 64); + tank1.mirror = true; + setRotation(tank1, 0F, 0F, 0F); + tank3 = new ModelRenderer(this, 64, 0); + tank3.addBox(0F, 0F, 0F, 7, 10, 7); + tank3.setRotationPoint(1F, 10F, -8F); + tank3.setTextureSize(128, 64); + tank3.mirror = true; + setRotation(tank3, 0F, 0F, 0F); + tube6 = new ModelRenderer(this, 0, 0); + tube6.addBox(0F, 0F, 0F, 1, 1, 1); + tube6.setRotationPoint(4F, 9F, 4F); + tube6.setTextureSize(128, 64); + tube6.mirror = true; + setRotation(tube6, 0F, 0F, 0F); + tube5 = new ModelRenderer(this, 0, 0); + tube5.addBox(0F, 0F, 0F, 1, 1, 1); + tube5.setRotationPoint(4F, 9F, -5F); + tube5.setTextureSize(128, 64); + tube5.mirror = true; + setRotation(tube5, 0F, 0F, 0F); + tube4 = new ModelRenderer(this, 0, 48); + tube4.addBox(0F, 0F, 0F, 1, 1, 10); + tube4.setRotationPoint(4F, 8F, -5F); + tube4.setTextureSize(128, 64); + tube4.mirror = true; + setRotation(tube4, 0F, 0F, 0F); + tube3 = new ModelRenderer(this, 0, 0); + tube3.addBox(0F, 0F, 0F, 1, 3, 1); + tube3.setRotationPoint(4F, 9F, -0.5F); + tube3.setTextureSize(128, 64); + tube3.mirror = true; + setRotation(tube3, 0F, 0F, 0F); + tube2 = new ModelRenderer(this, 0, 0); + tube2.addBox(-4F, -1F, 0F, 4, 1, 1); + tube2.setRotationPoint(5F, 12F, -0.5F); + tube2.setTextureSize(128, 64); + tube2.mirror = true; + setRotation(tube2, 0F, 0F, -0.5235988F); + tube1 = new ModelRenderer(this, 0, 0); + tube1.addBox(-3F, -1F, 0F, 3, 1, 1); + tube1.setRotationPoint(1.5F, 14F, -0.5F); + tube1.setTextureSize(128, 64); + tube1.mirror = true; + setRotation(tube1, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 4, 16); + base.setRotationPoint(-8F, 20F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + portToggle1 = new ModelRenderer(this, 48, 20); + portToggle1.addBox(0F, 0F, 0F, 1, 8, 8); + portToggle1.setRotationPoint(-8.01F, 12F, -4F); + portToggle1.setTextureSize(128, 64); + portToggle1.mirror = true; + setRotation(portToggle1, 0F, 0F, 0F); + portToggle2a = new ModelRenderer(this, 48, 20); + portToggle2a.addBox(0F, 0F, 0F, 1, 8, 8); + portToggle2a.setRotationPoint(7.01F, 12F, -4F); + portToggle2a.setTextureSize(128, 64); + portToggle2a.mirror = true; + setRotation(portToggle2a, 0F, 0F, 0F); + portToggle2b = new ModelRenderer(this, 0, 4); + portToggle2b.addBox(0F, 0F, 0F, 2, 7, 2); + portToggle2b.setRotationPoint(5F, 13F, -1F); + portToggle2b.setTextureSize(128, 64); + portToggle2b.mirror = true; + setRotation(portToggle2b, 0F, 0F, 0F); + portToggle3a = new ModelRenderer(this, 66, 20); + portToggle3a.addBox(0F, 0F, 0F, 8, 8, 1); + portToggle3a.setRotationPoint(-4F, 12F, -8.01F); + portToggle3a.setTextureSize(128, 64); + portToggle3a.mirror = true; + setRotation(portToggle3a, 0F, 0F, 0F); + portToggle3b = new ModelRenderer(this, 0, 4); + portToggle3b.addBox(0F, 0F, 0F, 1, 7, 2); + portToggle3b.setRotationPoint(0F, 13F, -7F); + portToggle3b.setTextureSize(128, 64); + portToggle3b.mirror = true; + setRotation(portToggle3b, 0F, 0F, 0F); + portToggle4a = new ModelRenderer(this, 66, 20); + portToggle4a.addBox(0F, 0F, 0F, 8, 8, 1); + portToggle4a.setRotationPoint(-4F, 12F, 7.01F); + portToggle4a.setTextureSize(128, 64); + portToggle4a.mirror = true; + setRotation(portToggle4a, 0F, 0F, 0F); + portToggle4b = new ModelRenderer(this, 0, 4); + portToggle4b.addBox(0F, 0F, 0F, 1, 7, 2); + portToggle4b.setRotationPoint(0F, 13F, 5F); + portToggle4b.setTextureSize(128, 64); + portToggle4b.mirror = true; + setRotation(portToggle4b, 0F, 0F, 0F); } public void render(float size) { - A.render(size); - B.render(size); - C.render(size); - D.render(size); - E.render(size); - F.render(size); - G.render(size); - H.render(size); - I.render(size); - J.render(size); - K.render(size); - L.render(size); - M.render(size); - N.render(size); - OUTPUT.render(size); - P.render(size); - Q.render(size); - R.render(size); - S.render(size); - T.render(size); - U.render(size); - V.render(size); + tank2.render(size); + tank1.render(size); + tank3.render(size); + tube6.render(size); + tube5.render(size); + tube4.render(size); + tube3.render(size); + tube2.render(size); + tube1.render(size); + base.render(size); + portToggle1.render(size); + portToggle2a.render(size); + portToggle2b.render(size); + portToggle3a.render(size); + portToggle3b.render(size); + portToggle4a.render(size); + portToggle4b.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelEnergyCube.java b/src/main/java/mekanism/client/model/ModelEnergyCube.java index 79505ad46..9876c6364 100644 --- a/src/main/java/mekanism/client/model/ModelEnergyCube.java +++ b/src/main/java/mekanism/client/model/ModelEnergyCube.java @@ -1,195 +1,431 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; +import mekanism.client.render.tileentity.RenderEnergyCube; +import mekanism.common.SideData.IOState; +import mekanism.common.Tier.EnergyCubeTier; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.util.ForgeDirection; + +import org.lwjgl.opengl.GL11; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelEnergyCube extends ModelBase { - ModelRenderer Corner1; - ModelRenderer Corner2; - ModelRenderer Corner3; - ModelRenderer Corner4; - ModelRenderer Corner5; - ModelRenderer Corner6; - ModelRenderer Corner7; - ModelRenderer Corner8; - ModelRenderer Frame4; - ModelRenderer Frame3; - ModelRenderer Frame2; - ModelRenderer Frame1; - ModelRenderer Connection; - ModelRenderer HoriPole1; - ModelRenderer HoriPole2; - ModelRenderer HoriPole3; - ModelRenderer HoriPole4; - ModelRenderer HoriPole5; - ModelRenderer HoriPole6; - ModelRenderer HoriPole7; - ModelRenderer HoriPole8; + public static ResourceLocation OVERLAY_ON = MekanismUtils.getResource(ResourceType.RENDER, "EnergyCube_OverlayOn.png"); + public static ResourceLocation OVERLAY_OFF = MekanismUtils.getResource(ResourceType.RENDER, "EnergyCube_OverlayOff.png"); + + ModelRenderer frame12; + ModelRenderer frame11; + ModelRenderer frame10; + ModelRenderer frame9; + ModelRenderer frame8; + ModelRenderer frame7; + ModelRenderer frame6; + ModelRenderer frame5; + ModelRenderer frame4; + ModelRenderer frame3; + ModelRenderer frame2; + ModelRenderer frame1; + ModelRenderer corner8; + ModelRenderer corner7; + ModelRenderer corner6; + ModelRenderer corner5; + ModelRenderer corner4; + ModelRenderer corner3; + ModelRenderer corner2; + ModelRenderer corner1; + ModelRenderer connectorBackToggle; + ModelRenderer connectorRightToggle; + ModelRenderer connectorBottomToggle; + ModelRenderer connectorLeftToggle; + ModelRenderer connectorFrontToggle; + ModelRenderer connectorTopToggle; + ModelRenderer portBackToggle; + ModelRenderer portBottomToggle; + ModelRenderer portFrontToggle; + ModelRenderer portLeftToggle; + ModelRenderer portRightToggle; + ModelRenderer portTopToggle; + ModelRenderer ledTop1; + ModelRenderer ledTop2; + ModelRenderer ledBack1; + ModelRenderer ledBack2; + ModelRenderer ledBottom2; + ModelRenderer ledBottom1; + ModelRenderer ledFront1; + ModelRenderer ledFront2; + ModelRenderer ledRight2; + ModelRenderer ledRight1; + ModelRenderer ledLeft1; + ModelRenderer ledLeft2; + + public ModelRenderer[] leds1; + public ModelRenderer[] leds2; + + public ModelRenderer[] ports; + public ModelRenderer[] connectors; - public ModelEnergyCube() + public ModelEnergyCube() { textureWidth = 64; textureHeight = 64; - Corner1 = new ModelRenderer(this, 0, 17); - Corner1.addBox(0F, 0F, 0F, 3, 3, 3); - Corner1.setRotationPoint(5F, 21F, -8F); - Corner1.setTextureSize(64, 64); - Corner1.mirror = true; - setRotation(Corner1, 0F, 0F, 0F); - Corner2 = new ModelRenderer(this, 0, 17); - Corner2.addBox(0F, 0F, 0F, 3, 3, 3); - Corner2.setRotationPoint(-8F, 21F, -8F); - Corner2.setTextureSize(64, 64); - Corner2.mirror = true; - setRotation(Corner2, 0F, 0F, 0F); - Corner3 = new ModelRenderer(this, 0, 17); - Corner3.addBox(0F, 0F, 0F, 3, 3, 3); - Corner3.setRotationPoint(5F, 21F, 5F); - Corner3.setTextureSize(64, 64); - Corner3.mirror = true; - setRotation(Corner3, 0F, 0F, 0F); - Corner4 = new ModelRenderer(this, 0, 17); - Corner4.addBox(0F, 0F, 0F, 3, 3, 3); - Corner4.setRotationPoint(-8F, 21F, 5F); - Corner4.setTextureSize(64, 64); - Corner4.mirror = true; - setRotation(Corner4, 0F, 0F, 0F); - Corner5 = new ModelRenderer(this, 0, 17); - Corner5.addBox(0F, 0F, 0F, 3, 3, 3); - Corner5.setRotationPoint(5F, 8F, -8F); - Corner5.setTextureSize(64, 64); - Corner5.mirror = true; - setRotation(Corner5, 0F, 0F, 0F); - Corner6 = new ModelRenderer(this, 0, 17); - Corner6.addBox(0F, 0F, 0F, 3, 3, 3); - Corner6.setRotationPoint(-8F, 8F, -8F); - Corner6.setTextureSize(64, 64); - Corner6.mirror = true; - setRotation(Corner6, 0F, 0F, 0F); - Corner7 = new ModelRenderer(this, 0, 17); - Corner7.addBox(0F, 0F, 0F, 3, 3, 3); - Corner7.setRotationPoint(-8F, 8F, 5F); - Corner7.setTextureSize(64, 64); - Corner7.mirror = true; - setRotation(Corner7, 0F, 0F, 0F); - Corner8 = new ModelRenderer(this, 0, 17); - Corner8.addBox(0F, 0F, 0F, 3, 3, 3); - Corner8.setRotationPoint(5F, 8F, 5F); - Corner8.setTextureSize(64, 64); - Corner8.mirror = true; - setRotation(Corner8, 0F, 0F, 0F); - Frame4 = new ModelRenderer(this, 0, 24); - Frame4.addBox(0F, 0F, 0F, 3, 10, 3); - Frame4.setRotationPoint(5F, 11F, -8F); - Frame4.setTextureSize(64, 64); - Frame4.mirror = true; - setRotation(Frame4, 0F, 0F, 0F); - Frame3 = new ModelRenderer(this, 0, 24); - Frame3.addBox(0F, 0F, 0F, 3, 10, 3); - Frame3.setRotationPoint(-8F, 11F, -8F); - Frame3.setTextureSize(64, 64); - Frame3.mirror = true; - setRotation(Frame3, 0F, 0F, 0F); - Frame2 = new ModelRenderer(this, 0, 24); - Frame2.addBox(0F, 0F, 0F, 3, 10, 3); - Frame2.setRotationPoint(-8F, 11F, 5F); - Frame2.setTextureSize(64, 64); - Frame2.mirror = true; - setRotation(Frame2, 0F, 0F, 0F); - Frame1 = new ModelRenderer(this, 0, 24); - Frame1.addBox(0F, 0F, 0F, 3, 10, 3); - Frame1.setRotationPoint(5F, 11F, 5F); - Frame1.setTextureSize(64, 64); - Frame1.mirror = true; - setRotation(Frame1, 0F, 0F, 0F); - Connection = new ModelRenderer(this, 0, 7); - Connection.addBox(0F, 0F, 0F, 10, 6, 1); - Connection.setRotationPoint(-5F, 13F, -8F); - Connection.setTextureSize(64, 64); - Connection.mirror = true; - setRotation(Connection, 0F, 0F, 0F); - HoriPole1 = new ModelRenderer(this, 27, 0); - HoriPole1.addBox(0F, 0F, 0F, 3, 3, 10); - HoriPole1.setRotationPoint(5F, 21F, -5F); - HoriPole1.setTextureSize(64, 64); - HoriPole1.mirror = true; - setRotation(HoriPole1, 0F, 0F, 0F); - HoriPole2 = new ModelRenderer(this, 0, 0); - HoriPole2.addBox(0F, 0F, 0F, 10, 3, 3); - HoriPole2.setRotationPoint(-5F, 21F, 5F); - HoriPole2.setTextureSize(64, 64); - HoriPole2.mirror = true; - setRotation(HoriPole2, 0F, 0F, 0F); - HoriPole3 = new ModelRenderer(this, 27, 0); - HoriPole3.addBox(0F, 0F, 0F, 3, 3, 10); - HoriPole3.setRotationPoint(-8F, 21F, -5F); - HoriPole3.setTextureSize(64, 64); - HoriPole3.mirror = true; - setRotation(HoriPole3, 0F, 0F, 0F); - HoriPole4 = new ModelRenderer(this, 0, 0); - HoriPole4.addBox(0F, 0F, 0F, 10, 3, 3); - HoriPole4.setRotationPoint(-5F, 21F, -8F); - HoriPole4.setTextureSize(64, 64); - HoriPole4.mirror = true; - setRotation(HoriPole4, 0F, 0F, 0F); - HoriPole5 = new ModelRenderer(this, 27, 0); - HoriPole5.addBox(0F, 0F, 0F, 3, 3, 10); - HoriPole5.setRotationPoint(5F, 8F, -5F); - HoriPole5.setTextureSize(64, 64); - HoriPole5.mirror = true; - setRotation(HoriPole5, 0F, 0F, 0F); - HoriPole6 = new ModelRenderer(this, 0, 0); - HoriPole6.addBox(0F, 0F, 0F, 10, 3, 3); - HoriPole6.setRotationPoint(-5F, 8F, 5F); - HoriPole6.setTextureSize(64, 64); - HoriPole6.mirror = true; - setRotation(HoriPole6, 0F, 0F, 0F); - HoriPole7 = new ModelRenderer(this, 27, 0); - HoriPole7.addBox(0F, 0F, 0F, 3, 3, 10); - HoriPole7.setRotationPoint(-8F, 8F, -5F); - HoriPole7.setTextureSize(64, 64); - HoriPole7.mirror = true; - setRotation(HoriPole7, 0F, 0F, 0F); - HoriPole8 = new ModelRenderer(this, 0, 0); - HoriPole8.addBox(0F, 0F, 0F, 10, 3, 3); - HoriPole8.setRotationPoint(-5F, 8F, -8F); - HoriPole8.setTextureSize(64, 64); - HoriPole8.mirror = true; - setRotation(HoriPole8, 0F, 0F, 0F); + frame12 = new ModelRenderer(this, 0, 0); + frame12.addBox(0F, 0F, 0F, 3, 10, 3); + frame12.setRotationPoint(-8F, 11F, 5F); + frame12.setTextureSize(64, 64); + frame12.mirror = true; + setRotation(frame12, 0F, 0F, 0F); + frame11 = new ModelRenderer(this, 0, 0); + frame11.addBox(0F, 0F, 0F, 3, 10, 3); + frame11.setRotationPoint(5F, 11F, -8F); + frame11.setTextureSize(64, 64); + frame11.mirror = true; + setRotation(frame11, 0F, 0F, 0F); + frame10 = new ModelRenderer(this, 0, 13); + frame10.addBox(0F, 0F, 0F, 10, 3, 3); + frame10.setRotationPoint(-5F, 21F, 5F); + frame10.setTextureSize(64, 64); + frame10.mirror = true; + setRotation(frame10, 0F, 0F, 0F); + frame9 = new ModelRenderer(this, 12, 0); + frame9.addBox(0F, 0F, 0F, 3, 3, 10); + frame9.setRotationPoint(5F, 21F, -5F); + frame9.setTextureSize(64, 64); + frame9.mirror = true; + setRotation(frame9, 0F, 0F, 0F); + frame8 = new ModelRenderer(this, 0, 13); + frame8.addBox(0F, 0F, 0F, 10, 3, 3); + frame8.setRotationPoint(-5F, 8F, 5F); + frame8.setTextureSize(64, 64); + frame8.mirror = true; + setRotation(frame8, 0F, 0F, 0F); + frame7 = new ModelRenderer(this, 0, 13); + frame7.addBox(0F, 0F, 0F, 10, 3, 3); + frame7.setRotationPoint(-5F, 21F, -8F); + frame7.setTextureSize(64, 64); + frame7.mirror = true; + setRotation(frame7, 0F, 0F, 0F); + frame6 = new ModelRenderer(this, 0, 0); + frame6.addBox(0F, 0F, 0F, 3, 10, 3); + frame6.setRotationPoint(5F, 11F, 5F); + frame6.setTextureSize(64, 64); + frame6.mirror = true; + setRotation(frame6, 0F, 0F, 0F); + frame5 = new ModelRenderer(this, 0, 0); + frame5.addBox(0F, 0F, 0F, 3, 10, 3); + frame5.setRotationPoint(-8F, 11F, -8F); + frame5.setTextureSize(64, 64); + frame5.mirror = true; + setRotation(frame5, 0F, 0F, 0F); + frame4 = new ModelRenderer(this, 12, 0); + frame4.addBox(0F, 0F, 0F, 3, 3, 10); + frame4.setRotationPoint(5F, 8F, -5F); + frame4.setTextureSize(64, 64); + frame4.mirror = true; + setRotation(frame4, 0F, 0F, 0F); + frame3 = new ModelRenderer(this, 12, 0); + frame3.addBox(0F, 0F, 0F, 3, 3, 10); + frame3.setRotationPoint(-8F, 21F, -5F); + frame3.setTextureSize(64, 64); + frame3.mirror = true; + setRotation(frame3, 0F, 0F, 0F); + frame2 = new ModelRenderer(this, 12, 0); + frame2.addBox(0F, 0F, 0F, 3, 3, 10); + frame2.setRotationPoint(-8F, 8F, -5F); + frame2.setTextureSize(64, 64); + frame2.mirror = true; + setRotation(frame2, 0F, 0F, 0F); + frame1 = new ModelRenderer(this, 0, 13); + frame1.addBox(0F, 0F, 0F, 10, 3, 3); + frame1.setRotationPoint(-5F, 8F, -8F); + frame1.setTextureSize(64, 64); + frame1.mirror = true; + setRotation(frame1, 0F, 0F, 0F); + corner8 = new ModelRenderer(this, 26, 13); + corner8.addBox(0F, 0F, 0F, 3, 3, 3); + corner8.setRotationPoint(5F, 21F, 5F); + corner8.setTextureSize(64, 64); + corner8.mirror = true; + setRotation(corner8, 0F, 0F, 0F); + corner7 = new ModelRenderer(this, 26, 13); + corner7.addBox(0F, 0F, 0F, 3, 3, 3); + corner7.setRotationPoint(5F, 21F, -8F); + corner7.setTextureSize(64, 64); + corner7.mirror = true; + setRotation(corner7, 0F, 0F, 0F); + corner6 = new ModelRenderer(this, 26, 13); + corner6.addBox(0F, 0F, 0F, 3, 3, 3); + corner6.setRotationPoint(-8F, 21F, 5F); + corner6.setTextureSize(64, 64); + corner6.mirror = true; + setRotation(corner6, 0F, 0F, 0F); + corner5 = new ModelRenderer(this, 26, 13); + corner5.addBox(0F, 0F, 0F, 3, 3, 3); + corner5.setRotationPoint(-8F, 21F, -8F); + corner5.setTextureSize(64, 64); + corner5.mirror = true; + setRotation(corner5, 0F, 0F, 0F); + corner4 = new ModelRenderer(this, 26, 13); + corner4.addBox(0F, 0F, 0F, 3, 3, 3); + corner4.setRotationPoint(5F, 8F, 5F); + corner4.setTextureSize(64, 64); + corner4.mirror = true; + setRotation(corner4, 0F, 0F, 0F); + corner3 = new ModelRenderer(this, 26, 13); + corner3.addBox(0F, 0F, 0F, 3, 3, 3); + corner3.setRotationPoint(5F, 8F, -8F); + corner3.setTextureSize(64, 64); + corner3.mirror = true; + setRotation(corner3, 0F, 0F, 0F); + corner2 = new ModelRenderer(this, 26, 13); + corner2.addBox(0F, 0F, 0F, 3, 3, 3); + corner2.setRotationPoint(-8F, 8F, 5F); + corner2.setTextureSize(64, 64); + corner2.mirror = true; + setRotation(corner2, 0F, 0F, 0F); + corner1 = new ModelRenderer(this, 26, 13); + corner1.addBox(0F, 0F, 0F, 3, 3, 3); + corner1.setRotationPoint(-8F, 8F, -8F); + corner1.setTextureSize(64, 64); + corner1.mirror = true; + setRotation(corner1, 0F, 0F, 0F); + connectorBackToggle = new ModelRenderer(this, 38, 16); + connectorBackToggle.addBox(0F, 0F, 0F, 10, 6, 1); + connectorBackToggle.setRotationPoint(-5F, 13F, 6F); + connectorBackToggle.setTextureSize(64, 64); + connectorBackToggle.mirror = true; + setRotation(connectorBackToggle, 0F, 0F, 0F); + connectorRightToggle = new ModelRenderer(this, 38, 0); + connectorRightToggle.addBox(0F, 0F, 0F, 1, 6, 10); + connectorRightToggle.setRotationPoint(6F, 13F, -5F); + connectorRightToggle.setTextureSize(64, 64); + connectorRightToggle.mirror = true; + setRotation(connectorRightToggle, 0F, 0F, 0F); + connectorBottomToggle = new ModelRenderer(this, 0, 19); + connectorBottomToggle.addBox(0F, 0F, 0F, 10, 1, 6); + connectorBottomToggle.setRotationPoint(-5F, 22F, -3F); + connectorBottomToggle.setTextureSize(64, 64); + connectorBottomToggle.mirror = true; + setRotation(connectorBottomToggle, 0F, 0F, 0F); + connectorLeftToggle = new ModelRenderer(this, 38, 0); + connectorLeftToggle.addBox(0F, 0F, 0F, 1, 6, 10); + connectorLeftToggle.setRotationPoint(-7F, 13F, -5F); + connectorLeftToggle.setTextureSize(64, 64); + connectorLeftToggle.mirror = true; + setRotation(connectorLeftToggle, 0F, 0F, 0F); + connectorFrontToggle = new ModelRenderer(this, 38, 16); + connectorFrontToggle.addBox(0F, 0F, 0F, 10, 6, 1); + connectorFrontToggle.setRotationPoint(-5F, 13F, -7F); + connectorFrontToggle.setTextureSize(64, 64); + connectorFrontToggle.mirror = true; + setRotation(connectorFrontToggle, 0F, 0F, 0F); + connectorTopToggle = new ModelRenderer(this, 0, 19); + connectorTopToggle.addBox(0F, 0F, 0F, 10, 1, 6); + connectorTopToggle.setRotationPoint(-5F, 9F, -3F); + connectorTopToggle.setTextureSize(64, 64); + connectorTopToggle.mirror = true; + setRotation(connectorTopToggle, 0F, 0F, 0F); + portBackToggle = new ModelRenderer(this, 18, 35); + portBackToggle.addBox(0F, 0F, 0F, 8, 8, 1); + portBackToggle.setRotationPoint(-4F, 12F, 7F); + portBackToggle.setTextureSize(64, 64); + portBackToggle.mirror = true; + setRotation(portBackToggle, 0F, 0F, 0F); + portBottomToggle = new ModelRenderer(this, 0, 26); + portBottomToggle.addBox(0F, 0F, 0F, 8, 1, 8); + portBottomToggle.setRotationPoint(-4F, 23F, -4F); + portBottomToggle.setTextureSize(64, 64); + portBottomToggle.mirror = true; + setRotation(portBottomToggle, 0F, 0F, 0F); + portFrontToggle = new ModelRenderer(this, 18, 35); + portFrontToggle.addBox(0F, 0F, 0F, 8, 8, 1); + portFrontToggle.setRotationPoint(-4F, 12F, -8F); + portFrontToggle.setTextureSize(64, 64); + portFrontToggle.mirror = true; + setRotation(portFrontToggle, 0F, 0F, 0F); + portLeftToggle = new ModelRenderer(this, 0, 35); + portLeftToggle.addBox(0F, 0F, 0F, 1, 8, 8); + portLeftToggle.setRotationPoint(-8F, 12F, -4F); + portLeftToggle.setTextureSize(64, 64); + portLeftToggle.mirror = true; + setRotation(portLeftToggle, 0F, 0F, 0F); + portRightToggle = new ModelRenderer(this, 0, 35); + portRightToggle.addBox(0F, 0F, 0F, 1, 8, 8); + portRightToggle.setRotationPoint(7F, 12F, -4F); + portRightToggle.setTextureSize(64, 64); + portRightToggle.mirror = true; + setRotation(portRightToggle, 0F, 0F, 0F); + portTopToggle = new ModelRenderer(this, 0, 26); + portTopToggle.addBox(0F, 0F, 0F, 8, 1, 8); + portTopToggle.setRotationPoint(-4F, 8F, -4F); + portTopToggle.setTextureSize(64, 64); + portTopToggle.mirror = true; + setRotation(portTopToggle, 0F, 0F, 0F); + ledTop1 = new ModelRenderer(this, 0, 51); + ledTop1.addBox(0F, 0F, 0F, 1, 1, 1); + ledTop1.setRotationPoint(-5.5F, 8.1F, -0.5F); + ledTop1.setTextureSize(64, 64); + ledTop1.mirror = true; + setRotation(ledTop1, 0F, 0F, 0F); + ledTop2 = new ModelRenderer(this, 0, 51); + ledTop2.addBox(0F, 0F, 0F, 1, 1, 1); + ledTop2.setRotationPoint(4.5F, 8.1F, -0.5F); + ledTop2.setTextureSize(64, 64); + ledTop2.mirror = true; + setRotation(ledTop2, 0F, 0F, 0F); + ledBack1 = new ModelRenderer(this, 0, 51); + ledBack1.addBox(0F, 0F, 0F, 1, 1, 1); + ledBack1.setRotationPoint(-5.5F, 15.5F, 6.9F); + ledBack1.setTextureSize(64, 64); + ledBack1.mirror = true; + setRotation(ledBack1, 0F, 0F, 0F); + ledBack2 = new ModelRenderer(this, 0, 51); + ledBack2.addBox(0F, 0F, 0F, 1, 1, 1); + ledBack2.setRotationPoint(4.5F, 15.5F, 6.9F); + ledBack2.setTextureSize(64, 64); + ledBack2.mirror = true; + setRotation(ledBack2, 0F, 0F, 0F); + ledBottom2 = new ModelRenderer(this, 0, 51); + ledBottom2.addBox(0F, 0F, 0F, 1, 1, 1); + ledBottom2.setRotationPoint(4.5F, 22.9F, -0.5F); + ledBottom2.setTextureSize(64, 64); + ledBottom2.mirror = true; + setRotation(ledBottom2, 0F, 0F, 0F); + ledBottom1 = new ModelRenderer(this, 0, 51); + ledBottom1.addBox(0F, 0F, 0F, 1, 1, 1); + ledBottom1.setRotationPoint(-5.5F, 22.9F, -0.5F); + ledBottom1.setTextureSize(64, 64); + ledBottom1.mirror = true; + setRotation(ledBottom1, 0F, 0F, 0F); + ledFront1 = new ModelRenderer(this, 0, 51); + ledFront1.addBox(0F, 0F, 0F, 1, 1, 1); + ledFront1.setRotationPoint(-5.5F, 15.5F, -7.9F); + ledFront1.setTextureSize(64, 64); + ledFront1.mirror = true; + setRotation(ledFront1, 0F, 0F, 0F); + ledFront2 = new ModelRenderer(this, 0, 51); + ledFront2.addBox(0F, 0F, 0F, 1, 1, 1); + ledFront2.setRotationPoint(4.5F, 15.5F, -7.9F); + ledFront2.setTextureSize(64, 64); + ledFront2.mirror = true; + setRotation(ledFront2, 0F, 0F, 0F); + ledRight2 = new ModelRenderer(this, 0, 51); + ledRight2.addBox(0F, 0F, 0F, 1, 1, 1); + ledRight2.setRotationPoint(6.9F, 15.5F, 4.5F); + ledRight2.setTextureSize(64, 64); + ledRight2.mirror = true; + setRotation(ledRight2, 0F, 0F, 0F); + ledRight1 = new ModelRenderer(this, 0, 51); + ledRight1.addBox(0F, 0F, 0F, 1, 1, 1); + ledRight1.setRotationPoint(6.9F, 15.5F, -5.5F); + ledRight1.setTextureSize(64, 64); + ledRight1.mirror = true; + setRotation(ledRight1, 0F, 0F, 0F); + ledLeft1 = new ModelRenderer(this, 0, 51); + ledLeft1.addBox(0F, 0F, 0F, 1, 1, 1); + ledLeft1.setRotationPoint(-7.9F, 15.5F, 4.5F); + ledLeft1.setTextureSize(64, 64); + ledLeft1.mirror = true; + setRotation(ledLeft1, 0F, 0F, 0F); + ledLeft2 = new ModelRenderer(this, 0, 51); + ledLeft2.addBox(0F, 0F, 0F, 1, 1, 1); + ledLeft2.setRotationPoint(-7.9F, 15.5F, -5.5F); + ledLeft2.setTextureSize(64, 64); + ledLeft2.mirror = true; + setRotation(ledLeft2, 0F, 0F, 0F); + + leds1 = new ModelRenderer[] {ledBottom1, ledTop1, ledFront1, ledBack1, ledLeft1, ledRight1}; + leds2 = new ModelRenderer[] {ledBottom2, ledTop2, ledFront2, ledBack2, ledLeft2, ledRight2}; + + ports = new ModelRenderer[] {portBottomToggle, portTopToggle, portFrontToggle, portBackToggle, portLeftToggle, portRightToggle}; + connectors = new ModelRenderer[] {connectorBottomToggle, connectorTopToggle, connectorFrontToggle, connectorBackToggle, connectorLeftToggle, connectorRightToggle}; } - public void render(float size) + public void render(float size, EnergyCubeTier tier, TextureManager manager) { + frame12.render(size); + frame11.render(size); + frame10.render(size); + frame9.render(size); + frame8.render(size); + frame7.render(size); + frame6.render(size); + frame5.render(size); + frame4.render(size); + frame3.render(size); + frame2.render(size); + frame1.render(size); + + corner8.render(size); + corner7.render(size); + corner6.render(size); + corner5.render(size); + corner4.render(size); + corner3.render(size); + corner2.render(size); + corner1.render(size); + + GL11.glPushMatrix(); + GL11.glScalef(1.0001F, 1.0001F, 1.0001F); + GL11.glTranslatef(0, -0.00011F, 0); + manager.bindTexture(RenderEnergyCube.resources.get(tier)); MekanismRenderer.glowOn(); - Corner1.render(size); - Corner2.render(size); - Corner3.render(size); - Corner4.render(size); - Corner5.render(size); - Corner6.render(size); - Corner7.render(size); - Corner8.render(size); + + corner8.render(size); + corner7.render(size); + corner6.render(size); + corner5.render(size); + corner4.render(size); + corner3.render(size); + corner2.render(size); + corner1.render(size); + MekanismRenderer.glowOff(); - - Frame4.render(size); - Frame3.render(size); - Frame2.render(size); - Frame1.render(size); - Connection.render(size); - HoriPole1.render(size); - HoriPole2.render(size); - HoriPole3.render(size); - HoriPole4.render(size); - HoriPole5.render(size); - HoriPole6.render(size); - HoriPole7.render(size); - HoriPole8.render(size); + GL11.glPopMatrix(); + } + + public void renderSide(float size, ForgeDirection side, IOState state, EnergyCubeTier tier, TextureManager renderer) + { + if(state != IOState.OFF) + { + connectors[side.ordinal()].render(size); + ports[side.ordinal()].render(size); + + if(state == IOState.OUTPUT) + { + MekanismRenderer.glowOn(); + renderer.bindTexture(RenderEnergyCube.resources.get(tier)); + + ports[side.ordinal()].render(size); + + MekanismRenderer.glowOff(); + } + } + + renderer.bindTexture(state == IOState.OUTPUT ? OVERLAY_ON : OVERLAY_OFF); + + if(state == IOState.OUTPUT) + { + MekanismRenderer.glowOn(); + } + + leds1[side.ordinal()].render(size); + leds2[side.ordinal()].render(size); + + if(state == IOState.OUTPUT) + { + MekanismRenderer.glowOff(); + } } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelFluidicPlenisher.java b/src/main/java/mekanism/client/model/ModelFluidicPlenisher.java index fbfef097c..7f6115008 100644 --- a/src/main/java/mekanism/client/model/ModelFluidicPlenisher.java +++ b/src/main/java/mekanism/client/model/ModelFluidicPlenisher.java @@ -8,136 +8,136 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelFluidicPlenisher extends ModelBase { - ModelRenderer PumpBase; - ModelRenderer PumpTube; - ModelRenderer CoreStart; - ModelRenderer Core; - ModelRenderer FluidOutput; - ModelRenderer EnergyInput; - ModelRenderer EnergyTube; - ModelRenderer Screen; - ModelRenderer Keyboard; - ModelRenderer RightThing; - ModelRenderer LeftThing; - ModelRenderer RightCable; - ModelRenderer LeftCable; - ModelRenderer LeftConnector; - ModelRenderer RightConnector; + ModelRenderer bearingRight; + ModelRenderer ringTank; + ModelRenderer portTop; + ModelRenderer portBack; + ModelRenderer Connector; + ModelRenderer pipeToggle; + ModelRenderer ringTop; + ModelRenderer ringBottom; + ModelRenderer tank; + ModelRenderer bearingLeft; + ModelRenderer connectorRing; + ModelRenderer rod4; + ModelRenderer rod3; + ModelRenderer rod2; + ModelRenderer rod1; public ModelFluidicPlenisher() { - textureWidth = 128; - textureHeight = 128; + textureWidth = 64; + textureHeight = 64; - PumpBase = new ModelRenderer(this, 0, 29); - PumpBase.addBox(0F, 0F, 0F, 6, 1, 6); - PumpBase.setRotationPoint(-3F, 23F, -3F); - PumpBase.setTextureSize(128, 128); - PumpBase.mirror = true; - setRotation(PumpBase, 0F, 0F, 0F); - PumpTube = new ModelRenderer(this, 40, 5); - PumpTube.addBox(0F, 0F, 0F, 2, 3, 2); - PumpTube.setRotationPoint(-1F, 20F, -1F); - PumpTube.setTextureSize(128, 128); - PumpTube.mirror = true; - setRotation(PumpTube, 0F, 0F, 0F); - CoreStart = new ModelRenderer(this, 40, 0); - CoreStart.addBox(0F, 0F, 0F, 4, 1, 4); - CoreStart.setRotationPoint(-2F, 19F, -2F); - CoreStart.setTextureSize(128, 128); - CoreStart.mirror = true; - setRotation(CoreStart, 0F, 0F, 0F); - Core = new ModelRenderer(this, 0, 0); - Core.addBox(0F, 0F, 0F, 10, 8, 10); - Core.setRotationPoint(-5F, 11F, -5F); - Core.setTextureSize(128, 128); - Core.mirror = true; - setRotation(Core, 0F, 0F, 0F); - FluidOutput = new ModelRenderer(this, 0, 18); - FluidOutput.addBox(0F, 0F, 0F, 8, 3, 8); - FluidOutput.setRotationPoint(-4F, 8F, -4F); - FluidOutput.setTextureSize(128, 128); - FluidOutput.mirror = true; - setRotation(FluidOutput, 0F, 0F, 0F); - EnergyInput = new ModelRenderer(this, 0, 36); - EnergyInput.addBox(0F, 0F, 0F, 6, 6, 1); - EnergyInput.setRotationPoint(-3F, 13F, 7F); - EnergyInput.setTextureSize(128, 128); - EnergyInput.mirror = true; - setRotation(EnergyInput, 0F, 0F, 0F); - EnergyTube = new ModelRenderer(this, 14, 36); - EnergyTube.addBox(0F, 0F, 0F, 2, 2, 2); - EnergyTube.setRotationPoint(-1F, 15F, 5F); - EnergyTube.setTextureSize(128, 128); - EnergyTube.mirror = true; - setRotation(EnergyTube, 0F, 0F, 0F); - Screen = new ModelRenderer(this, 40, 17); - Screen.addBox(0F, 0F, 0F, 8, 5, 1); - Screen.setRotationPoint(-4F, 12F, -6F); - Screen.setTextureSize(128, 128); - Screen.mirror = true; - setRotation(Screen, 0F, 0F, 0F); - Keyboard = new ModelRenderer(this, 40, 13); - Keyboard.addBox(0F, 0F, 0F, 8, 1, 3); - Keyboard.setRotationPoint(-4F, 17F, -8F); - Keyboard.setTextureSize(128, 128); - Keyboard.mirror = true; - setRotation(Keyboard, 0.3490659F, 0F, 0F); - RightThing = new ModelRenderer(this, 24, 29); - RightThing.addBox(0F, 0F, 0F, 1, 4, 4); - RightThing.setRotationPoint(-6F, 13F, -2F); - RightThing.setTextureSize(128, 128); - RightThing.mirror = true; - setRotation(RightThing, 0F, 0F, 0F); - LeftThing = new ModelRenderer(this, 24, 29); - LeftThing.addBox(0F, 0F, 0F, 1, 4, 4); - LeftThing.setRotationPoint(5F, 13F, -2F); - LeftThing.setTextureSize(128, 128); - LeftThing.mirror = true; - setRotation(LeftThing, 0F, 0F, 0F); - RightCable = new ModelRenderer(this, 32, 18); - RightCable.addBox(0F, 0F, 0F, 1, 3, 2); - RightCable.setRotationPoint(-6F, 17F, -1F); - RightCable.setTextureSize(128, 128); - RightCable.mirror = true; - setRotation(RightCable, 0F, 0F, 0F); - LeftCable = new ModelRenderer(this, 32, 18); - LeftCable.addBox(0F, 0F, 0F, 1, 3, 2); - LeftCable.setRotationPoint(5F, 17F, -1F); - LeftCable.setTextureSize(128, 128); - LeftCable.mirror = true; - setRotation(LeftCable, 0F, 0F, 0F); - LeftConnector = new ModelRenderer(this, 40, 10); - LeftConnector.addBox(0F, 0F, 0F, 3, 1, 2); - LeftConnector.setRotationPoint(2F, 19F, -1F); - LeftConnector.setTextureSize(128, 128); - LeftConnector.mirror = true; - setRotation(LeftConnector, 0F, 0F, 0F); - RightConnector = new ModelRenderer(this, 40, 10); - RightConnector.addBox(0F, 0F, 0F, 3, 1, 2); - RightConnector.setRotationPoint(-5F, 19F, -1F); - RightConnector.setTextureSize(128, 128); - RightConnector.mirror = true; - setRotation(RightConnector, 0F, 0F, 0F); + bearingRight = new ModelRenderer(this, 44, 26); + bearingRight.mirror = true; + bearingRight.addBox(0F, 0F, 0F, 1, 4, 4); + bearingRight.setRotationPoint(4F, 14F, -2F); + bearingRight.setTextureSize(64, 64); + setRotation(bearingRight, 0F, 0F, 0F); + ringTank = new ModelRenderer(this, 0, 32); + ringTank.addBox(0F, 0F, 0F, 11, 1, 11); + ringTank.setRotationPoint(-5.5F, 10F, -5.5F); + ringTank.setTextureSize(64, 64); + ringTank.mirror = true; + setRotation(ringTank, 0F, 0F, 0F); + portTop = new ModelRenderer(this, 0, 21); + portTop.addBox(0F, 0F, 0F, 10, 1, 10); + portTop.setRotationPoint(-5F, 8F, -5F); + portTop.setTextureSize(64, 64); + portTop.mirror = true; + setRotation(portTop, 0F, 0F, 0F); + portBack = new ModelRenderer(this, 36, 0); + portBack.addBox(0F, 0F, 0F, 8, 8, 1); + portBack.setRotationPoint(-4F, 12F, 7F); + portBack.setTextureSize(64, 64); + portBack.mirror = true; + setRotation(portBack, 0F, 0F, 0F); + Connector = new ModelRenderer(this, 36, 9); + Connector.addBox(0F, 0F, 0F, 5, 5, 4); + Connector.setRotationPoint(-2.5F, 13.5F, 3F); + Connector.setTextureSize(64, 64); + Connector.mirror = true; + setRotation(Connector, 0F, 0F, 0F); + pipeToggle = new ModelRenderer(this, 32, 44); + pipeToggle.addBox(0F, 0F, 0F, 6, 8, 6); + pipeToggle.setRotationPoint(-3F, 24F, -3F); + pipeToggle.setTextureSize(64, 64); + pipeToggle.mirror = true; + setRotation(pipeToggle, 0F, 0F, 0F); + ringTop = new ModelRenderer(this, 0, 44); + ringTop.addBox(0F, 0F, 0F, 8, 1, 8); + ringTop.setRotationPoint(-4F, 9F, -4F); + ringTop.setTextureSize(64, 64); + ringTop.mirror = true; + setRotation(ringTop, 0F, 0F, 0F); + ringBottom = new ModelRenderer(this, 0, 53); + ringBottom.addBox(0F, 0F, 0F, 8, 1, 8); + ringBottom.setRotationPoint(-4F, 23F, -4F); + ringBottom.setTextureSize(64, 64); + ringBottom.mirror = true; + setRotation(ringBottom, 0F, 0F, 0F); + tank = new ModelRenderer(this, 0, 0); + tank.addBox(0F, 0F, 0F, 9, 12, 9); + tank.setRotationPoint(-4.5F, 11F, -4.5F); + tank.setTextureSize(64, 64); + tank.mirror = true; + setRotation(tank, 0F, 0F, 0F); + bearingLeft = new ModelRenderer(this, 44, 26); + bearingLeft.addBox(0F, 0F, 0F, 1, 4, 4); + bearingLeft.setRotationPoint(-5F, 14F, -2F); + bearingLeft.setTextureSize(64, 64); + bearingLeft.mirror = true; + setRotation(bearingLeft, 0F, 0F, 0F); + connectorRing = new ModelRenderer(this, 40, 18); + connectorRing.addBox(0F, 0F, 0F, 7, 7, 1); + connectorRing.setRotationPoint(-3.5F, 12.5F, 5F); + connectorRing.setTextureSize(64, 64); + connectorRing.mirror = true; + setRotation(connectorRing, 0F, 0F, 0F); + rod4 = new ModelRenderer(this, 0, 0); + rod4.addBox(0F, 0F, 0F, 1, 1, 3); + rod4.setRotationPoint(2F, 18F, 4F); + rod4.setTextureSize(64, 64); + rod4.mirror = true; + setRotation(rod4, 0F, 0F, 0F); + rod3 = new ModelRenderer(this, 0, 0); + rod3.addBox(0F, 0F, 0F, 1, 1, 3); + rod3.setRotationPoint(-3F, 18F, 4F); + rod3.setTextureSize(64, 64); + rod3.mirror = true; + setRotation(rod3, 0F, 0F, 0F); + rod2 = new ModelRenderer(this, 0, 0); + rod2.addBox(0F, 0F, 0F, 1, 1, 3); + rod2.setRotationPoint(2F, 13F, 4F); + rod2.setTextureSize(64, 64); + rod2.mirror = true; + setRotation(rod2, 0F, 0F, 0F); + rod1 = new ModelRenderer(this, 0, 0); + rod1.addBox(0F, 0F, 0F, 1, 1, 3); + rod1.setRotationPoint(-3F, 13F, 4F); + rod1.setTextureSize(64, 64); + rod1.mirror = true; + setRotation(rod1, 0F, 0F, 0F); } public void render(float size) { - PumpBase.render(size); - PumpTube.render(size); - CoreStart.render(size); - Core.render(size); - FluidOutput.render(size); - EnergyInput.render(size); - EnergyTube.render(size); - Screen.render(size); - Keyboard.render(size); - RightThing.render(size); - LeftThing.render(size); - RightCable.render(size); - LeftCable.render(size); - LeftConnector.render(size); - RightConnector.render(size); + bearingRight.render(size); + ringTank.render(size); + portTop.render(size); + portBack.render(size); + Connector.render(size); + //pipeToggle.render(size); + ringTop.render(size); + ringBottom.render(size); + tank.render(size); + bearingLeft.render(size); + connectorRing.render(size); + rod4.render(size); + rod3.render(size); + rod2.render(size); + rod1.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelGasTank.java b/src/main/java/mekanism/client/model/ModelGasTank.java index ad697ac9b..9942e6ae1 100644 --- a/src/main/java/mekanism/client/model/ModelGasTank.java +++ b/src/main/java/mekanism/client/model/ModelGasTank.java @@ -8,72 +8,97 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelGasTank extends ModelBase { - ModelRenderer Panel1; - ModelRenderer Panel2; - ModelRenderer Panel3; - ModelRenderer Tank; - ModelRenderer Panel4; - ModelRenderer Top; - ModelRenderer Exit; + ModelRenderer rim4; + ModelRenderer rim5; + ModelRenderer rim2; + ModelRenderer tankBase; + ModelRenderer valve; + ModelRenderer rim3; + ModelRenderer tank; + ModelRenderer rim0; + ModelRenderer valveBase; + ModelRenderer rim1; public ModelGasTank() { - textureWidth = 32; - textureHeight = 64; + textureWidth = 64; + textureHeight = 32; - Panel1 = new ModelRenderer(this, 0, 22); - Panel1.addBox(0F, 0F, 0F, 5, 13, 1); - Panel1.setRotationPoint(-2.5F, 11F, 3.5F); - Panel1.setTextureSize(32, 64); - Panel1.mirror = true; - setRotation(Panel1, 0F, 0F, 0F); - Panel2 = new ModelRenderer(this, 0, 37); - Panel2.addBox(0F, 0F, 0F, 1, 13, 5); - Panel2.setRotationPoint(3.5F, 11F, -2.5F); - Panel2.setTextureSize(32, 64); - Panel2.mirror = true; - setRotation(Panel2, 0F, 0F, 0F); - Panel3 = new ModelRenderer(this, 0, 22); - Panel3.addBox(0F, 0F, 0F, 5, 13, 1); - Panel3.setRotationPoint(-2.5F, 11F, -4.5F); - Panel3.setTextureSize(32, 64); - Panel3.mirror = true; - setRotation(Panel3, 0F, 0F, 0F); - Tank = new ModelRenderer(this, 0, 0); - Tank.addBox(0F, 0F, 0F, 7, 14, 7); - Tank.setRotationPoint(-3.5F, 10F, -3.5F); - Tank.setTextureSize(32, 64); - Tank.mirror = true; - setRotation(Tank, 0F, 0F, 0F); - Panel4 = new ModelRenderer(this, 0, 37); - Panel4.addBox(0F, 0F, 0F, 1, 13, 5); - Panel4.setRotationPoint(-4.5F, 11F, -2.5F); - Panel4.setTextureSize(32, 64); - Panel4.mirror = true; - setRotation(Panel4, 0F, 0F, 0F); - Top = new ModelRenderer(this, 13, 22); - Top.addBox(0F, 0F, 0F, 2, 2, 2); - Top.setRotationPoint(-1F, 8F, -1F); - Top.setTextureSize(32, 64); - Top.mirror = true; - setRotation(Top, 0F, 0F, 0F); - Exit = new ModelRenderer(this, 22, 22); - Exit.addBox(0F, 0F, 0F, 1, 1, 1); - Exit.setRotationPoint(1F, 8.2F, -0.5F); - Exit.setTextureSize(32, 64); - Exit.mirror = true; - setRotation(Exit, 0F, 0F, 0F); + rim4 = new ModelRenderer(this, 30, 0); + rim4.addBox(0F, 0F, 0F, 1, 3, 6); + rim4.setRotationPoint(3F, 8F, -3F); + rim4.setTextureSize(64, 32); + rim4.mirror = true; + setRotation(rim4, 0F, 0F, 0F); + rim4.mirror = false; + rim5 = new ModelRenderer(this, 0, 4); + rim5.addBox(0F, 0F, 0F, 2, 3, 1); + rim5.setRotationPoint(2F, 8F, -4F); + rim5.setTextureSize(64, 32); + rim5.mirror = true; + setRotation(rim5, 0F, 0F, 0F); + rim2 = new ModelRenderer(this, 30, 0); + rim2.addBox(0F, 0F, 0F, 1, 3, 6); + rim2.setRotationPoint(-4F, 8F, -3F); + rim2.setTextureSize(64, 32); + rim2.mirror = true; + setRotation(rim2, 0F, 0F, 0F); + tankBase = new ModelRenderer(this, 0, 22); + tankBase.addBox(0F, 0F, 0F, 9, 1, 9); + tankBase.setRotationPoint(-4.5F, 22.5F, -4.5F); + tankBase.setTextureSize(64, 32); + tankBase.mirror = true; + setRotation(tankBase, 0F, 0F, 0F); + valve = new ModelRenderer(this, 46, 0); + valve.addBox(0F, 0F, 0F, 3, 1, 3); + valve.setRotationPoint(-1.5F, 8.5F, -1.5F); + valve.setTextureSize(64, 32); + valve.mirror = true; + setRotation(valve, 0F, 0F, 0F); + rim3 = new ModelRenderer(this, 44, 5); + rim3.addBox(0F, 0F, 0F, 8, 3, 1); + rim3.setRotationPoint(-4F, 8F, 3F); + rim3.setTextureSize(64, 32); + rim3.mirror = true; + setRotation(rim3, 0F, 0F, 0F); + tank = new ModelRenderer(this, 0, 0); + tank.addBox(0F, 0F, 0F, 10, 12, 10); + tank.setRotationPoint(-5F, 10.5F, -5F); + tank.setTextureSize(64, 32); + tank.mirror = true; + setRotation(tank, 0F, 0F, 0F); + rim0 = new ModelRenderer(this, 0, 8); + rim0.addBox(0F, 0F, 0F, 4, 1, 1); + rim0.setRotationPoint(-2F, 10F, -4F); + rim0.setTextureSize(64, 32); + rim0.mirror = true; + setRotation(rim0, 0F, 0F, 0F); + valveBase = new ModelRenderer(this, 38, 0); + valveBase.addBox(0F, 0F, 0F, 2, 1, 2); + valveBase.setRotationPoint(-1F, 9.5F, -1F); + valveBase.setTextureSize(64, 32); + valveBase.mirror = true; + setRotation(valveBase, 0F, 0F, 0F); + rim1 = new ModelRenderer(this, 0, 0); + rim1.addBox(0F, 0F, 0F, 2, 3, 1); + rim1.setRotationPoint(-4F, 8F, -4F); + rim1.setTextureSize(64, 32); + rim1.mirror = true; + setRotation(rim1, 0F, 0F, 0F); } public void render(float size) { - Panel1.render(size); - Panel2.render(size); - Panel3.render(size); - Tank.render(size); - Panel4.render(size); - Top.render(size); - Exit.render(size); + rim4.render(size); + rim5.render(size); + rim2.render(size); + tankBase.render(size); + valve.render(size); + rim3.render(size); + tank.render(size); + rim0.render(size); + valveBase.render(size); + rim1.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelLaser.java b/src/main/java/mekanism/client/model/ModelLaser.java index 079f869b6..dfe696903 100644 --- a/src/main/java/mekanism/client/model/ModelLaser.java +++ b/src/main/java/mekanism/client/model/ModelLaser.java @@ -5,168 +5,176 @@ import net.minecraft.client.model.ModelRenderer; public class ModelLaser extends ModelBase { - ModelRenderer LeftOuterRail; - ModelRenderer LowerCache; - ModelRenderer LeftInnerRail; - ModelRenderer RightInnerRail; - ModelRenderer RightOuterRail; - ModelRenderer RightTopDecor; - ModelRenderer Base; - ModelRenderer LeftTopDecor; - ModelRenderer RightBottomDecor; - ModelRenderer LeftBottomDecor; - ModelRenderer HigherCache; - ModelRenderer LaserTip; - ModelRenderer LaserCable1; - ModelRenderer LaserCable2; - ModelRenderer LaserCable3; - ModelRenderer LaserCable4; - ModelRenderer LaserBase; - ModelRenderer LaserDecor; - ModelRenderer LaserDecor2; + ModelRenderer connector; + ModelRenderer center; + ModelRenderer shaft; + ModelRenderer ring1; + ModelRenderer port; + ModelRenderer rod1; + ModelRenderer fin1; + ModelRenderer fin2; + ModelRenderer fin3; + ModelRenderer fin4; + ModelRenderer ring2; + ModelRenderer body; + ModelRenderer rod2; + ModelRenderer wire; + ModelRenderer rod3; + ModelRenderer fin5; + ModelRenderer fin6; + ModelRenderer fin7; + ModelRenderer fin8; + ModelRenderer rod4; public ModelLaser() { textureWidth = 64; - textureHeight = 64; + textureHeight = 32; - LeftOuterRail = new ModelRenderer(this, 22, 29); - LeftOuterRail.addBox(0F, 0F, 0F, 1, 2, 14); - LeftOuterRail.setRotationPoint(-7F, 18F, -7F); - LeftOuterRail.setTextureSize(64, 64); - LeftOuterRail.mirror = true; - setRotation(LeftOuterRail, 0F, 0F, 0F); - LowerCache = new ModelRenderer(this, 0, 18); - LowerCache.addBox(0F, -4F, 0F, 12, 1, 10); - LowerCache.setRotationPoint(-6F, 23F, -5F); - LowerCache.setTextureSize(64, 64); - LowerCache.mirror = true; - setRotation(LowerCache, 0F, 0F, 0F); - LeftInnerRail = new ModelRenderer(this, 22, 29); - LeftInnerRail.addBox(0F, 0F, 0F, 1, 2, 14); - LeftInnerRail.setRotationPoint(-5F, 18F, -7F); - LeftInnerRail.setTextureSize(64, 64); - LeftInnerRail.mirror = true; - setRotation(LeftInnerRail, 0F, 0F, 0F); - RightInnerRail = new ModelRenderer(this, 22, 29); - RightInnerRail.addBox(0F, 0F, 0F, 1, 2, 14); - RightInnerRail.setRotationPoint(4F, 18F, -7F); - RightInnerRail.setTextureSize(64, 64); - RightInnerRail.mirror = true; - setRotation(RightInnerRail, 0F, 0F, 0F); - RightOuterRail = new ModelRenderer(this, 22, 29); - RightOuterRail.addBox(0F, 0F, 0F, 1, 2, 14); - RightOuterRail.setRotationPoint(6F, 18F, -7F); - RightOuterRail.setTextureSize(64, 64); - RightOuterRail.mirror = true; - setRotation(RightOuterRail, 0F, 0F, 0F); - RightTopDecor = new ModelRenderer(this, 0, 43); - RightTopDecor.addBox(0F, 0F, 0F, 1, 1, 8); - RightTopDecor.setRotationPoint(7F, 19F, -4F); - RightTopDecor.setTextureSize(64, 64); - RightTopDecor.mirror = true; - setRotation(RightTopDecor, 0F, 0F, 0F); - Base = new ModelRenderer(this, 0, 0); - Base.addBox(0F, 0F, 0F, 14, 4, 14); - Base.setRotationPoint(-7F, 20F, -7F); - Base.setTextureSize(64, 64); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - LeftTopDecor = new ModelRenderer(this, 0, 43); - LeftTopDecor.addBox(0F, 0F, 0F, 1, 1, 8); - LeftTopDecor.setRotationPoint(-8F, 19F, -4F); - LeftTopDecor.setTextureSize(64, 64); - LeftTopDecor.mirror = true; - setRotation(LeftTopDecor, 0F, 0F, 0F); - RightBottomDecor = new ModelRenderer(this, 0, 29); - RightBottomDecor.addBox(0F, 0F, 0F, 1, 4, 10); - RightBottomDecor.setRotationPoint(7F, 20F, -5F); - RightBottomDecor.setTextureSize(64, 64); - RightBottomDecor.mirror = true; - setRotation(RightBottomDecor, 0F, 0F, 0F); - LeftBottomDecor = new ModelRenderer(this, 0, 29); - LeftBottomDecor.addBox(0F, 0F, 0F, 1, 4, 10); - LeftBottomDecor.setRotationPoint(-8F, 20F, -5F); - LeftBottomDecor.setTextureSize(64, 64); - LeftBottomDecor.mirror = true; - setRotation(LeftBottomDecor, 0F, 0F, 0F); - HigherCache = new ModelRenderer(this, 0, 18); - HigherCache.addBox(0F, -4F, 0F, 12, 1, 10); - HigherCache.setRotationPoint(-6F, 21.5F, -5F); - HigherCache.setTextureSize(64, 64); - HigherCache.mirror = true; - setRotation(HigherCache, 0F, 0F, 0F); - LaserTip = new ModelRenderer(this, 30, 45); - LaserTip.addBox(0F, -4F, 0F, 2, 3, 2); - LaserTip.setRotationPoint(-1F, 13.5F, -1F); - LaserTip.setTextureSize(64, 64); - LaserTip.mirror = true; - setRotation(LaserTip, 0F, 0F, 0F); - LaserCable1 = new ModelRenderer(this, 22, 45); - LaserCable1.addBox(0F, 0F, 0F, 1, 1, 3); - LaserCable1.setRotationPoint(1F, 11.5F, -3F); - LaserCable1.setTextureSize(64, 64); - LaserCable1.mirror = true; - setRotation(LaserCable1, 0F, 0F, 0F); - LaserCable2 = new ModelRenderer(this, 18, 43); - LaserCable2.addBox(0F, -4F, 0F, 1, 6, 1); - LaserCable2.setRotationPoint(1F, 15.5F, -4F); - LaserCable2.setTextureSize(64, 64); - LaserCable2.mirror = true; - setRotation(LaserCable2, 0F, 0F, 0F); - LaserCable3 = new ModelRenderer(this, 22, 45); - LaserCable3.addBox(0F, 0F, 0F, 1, 1, 3); - LaserCable3.setRotationPoint(-2F, 11.5F, -3F); - LaserCable3.setTextureSize(64, 64); - LaserCable3.mirror = true; - setRotation(LaserCable3, 0F, 0F, 0F); - LaserCable4 = new ModelRenderer(this, 18, 43); - LaserCable4.addBox(0F, -4F, 0F, 1, 6, 1); - LaserCable4.setRotationPoint(-2F, 15.5F, -4F); - LaserCable4.setTextureSize(64, 64); - LaserCable4.mirror = true; - setRotation(LaserCable4, 0F, 0F, 0F); - LaserBase = new ModelRenderer(this, 0, 52); - LaserBase.addBox(0F, -4F, 0F, 6, 5, 6); - LaserBase.setRotationPoint(-3F, 16.5F, -3F); - LaserBase.setTextureSize(64, 64); - LaserBase.mirror = true; - setRotation(LaserBase, 0F, 0F, 0F); - LaserDecor = new ModelRenderer(this, 44, 18); - LaserDecor.addBox(-0.5F, 0F, 0F, 1, 4, 4); - LaserDecor.setRotationPoint(2.5F, 14.7F, -2F); - LaserDecor.setTextureSize(64, 64); - LaserDecor.mirror = true; - setRotation(LaserDecor, 0F, 0F, -0.6320361F); - LaserDecor2 = new ModelRenderer(this, 44, 18); - LaserDecor2.addBox(-0.5F, 0F, 0F, 1, 4, 4); - LaserDecor2.setRotationPoint(-2.5F, 14.7F, -2F); - LaserDecor2.setTextureSize(64, 64); - LaserDecor2.mirror = true; - setRotation(LaserDecor2, 0F, 0F, 0.6320364F); + connector = new ModelRenderer(this, 32, 15); + connector.addBox(0F, 0F, 0F, 6, 1, 6); + connector.setRotationPoint(-3F, 22F, -3F); + connector.setTextureSize(64, 32); + connector.mirror = true; + setRotation(connector, 0F, 0F, 0F); + center = new ModelRenderer(this, 18, 9); + center.addBox(0F, 0F, 0F, 2, 15, 2); + center.setRotationPoint(-1F, 8F, -1F); + center.setTextureSize(64, 32); + center.mirror = true; + setRotation(center, 0F, 0F, 0F); + shaft = new ModelRenderer(this, 0, 18); + shaft.addBox(0F, 0F, 0F, 3, 2, 3); + shaft.setRotationPoint(-1.5F, 13F, -1.5F); + shaft.setTextureSize(64, 32); + shaft.mirror = true; + setRotation(shaft, 0F, 0F, 0F); + ring1 = new ModelRenderer(this, 0, 23); + ring1.addBox(0F, 0F, 0F, 4, 1, 4); + ring1.setRotationPoint(-2F, 10F, -2F); + ring1.setTextureSize(64, 32); + ring1.mirror = true; + setRotation(ring1, 0F, 0F, 0F); + port = new ModelRenderer(this, 0, 0); + port.addBox(0F, 0F, 0F, 8, 1, 8); + port.setRotationPoint(-4F, 23F, -4F); + port.setTextureSize(64, 32); + port.mirror = true; + setRotation(port, 0F, 0F, 0F); + rod1 = new ModelRenderer(this, 0, 9); + rod1.addBox(0F, 0F, 0F, 1, 5, 1); + rod1.setRotationPoint(2.8F, 16F, 1F); + rod1.setTextureSize(64, 32); + rod1.mirror = true; + setRotation(rod1, 0F, 0F, 0F); + fin1 = new ModelRenderer(this, 0, 9); + fin1.addBox(0F, 0F, 0F, 1, 1, 8); + fin1.setRotationPoint(3F, 21F, -4F); + fin1.setTextureSize(64, 32); + fin1.mirror = true; + setRotation(fin1, 0F, 0F, 0F); + fin2 = new ModelRenderer(this, 0, 9); + fin2.addBox(0F, 0F, 0F, 1, 1, 8); + fin2.setRotationPoint(3F, 19F, -4F); + fin2.setTextureSize(64, 32); + fin2.mirror = true; + setRotation(fin2, 0F, 0F, 0F); + fin3 = new ModelRenderer(this, 0, 9); + fin3.addBox(0F, 0F, 0F, 1, 1, 8); + fin3.setRotationPoint(3F, 17F, -4F); + fin3.setTextureSize(64, 32); + fin3.mirror = true; + setRotation(fin3, 0F, 0F, 0F); + fin4 = new ModelRenderer(this, 0, 9); + fin4.addBox(0F, 0F, 0F, 1, 1, 8); + fin4.setRotationPoint(3F, 15F, -4F); + fin4.setTextureSize(64, 32); + fin4.mirror = true; + setRotation(fin4, 0F, 0F, 0F); + ring2 = new ModelRenderer(this, 0, 23); + ring2.addBox(0F, 0F, 0F, 4, 1, 4); + ring2.setRotationPoint(-2F, 12F, -2F); + ring2.setTextureSize(64, 32); + ring2.mirror = true; + setRotation(ring2, 0F, 0F, 0F); + body = new ModelRenderer(this, 32, 0); + body.addBox(0F, 0F, 0F, 6, 7, 8); + body.setRotationPoint(-3F, 15F, -4F); + body.setTextureSize(64, 32); + body.mirror = true; + setRotation(body, 0F, 0F, 0F); + rod2 = new ModelRenderer(this, 0, 9); + rod2.addBox(0F, 0F, 0F, 1, 5, 1); + rod2.setRotationPoint(2.8F, 16F, -2F); + rod2.setTextureSize(64, 32); + rod2.mirror = true; + setRotation(rod2, 0F, 0F, 0F); + wire = new ModelRenderer(this, 10, 9); + wire.addBox(0F, -1F, 0F, 1, 6, 1); + wire.setRotationPoint(-1.5F, 11F, -0.5F); + wire.setTextureSize(64, 32); + wire.mirror = true; + setRotation(wire, 0F, 0F, 0.1919862F); + rod3 = new ModelRenderer(this, 0, 9); + rod3.addBox(0F, 0F, 0F, 1, 5, 1); + rod3.setRotationPoint(-3.8F, 16F, 1F); + rod3.setTextureSize(64, 32); + rod3.mirror = true; + setRotation(rod3, 0F, 0F, 0F); + fin5 = new ModelRenderer(this, 0, 9); + fin5.addBox(0F, 0F, 0F, 1, 1, 8); + fin5.setRotationPoint(-4F, 15F, -4F); + fin5.setTextureSize(64, 32); + fin5.mirror = true; + setRotation(fin5, 0F, 0F, 0F); + fin6 = new ModelRenderer(this, 0, 9); + fin6.addBox(0F, 0F, 0F, 1, 1, 8); + fin6.setRotationPoint(-4F, 17F, -4F); + fin6.setTextureSize(64, 32); + fin6.mirror = true; + setRotation(fin6, 0F, 0F, 0F); + fin7 = new ModelRenderer(this, 0, 9); + fin7.addBox(0F, 0F, 0F, 1, 1, 8); + fin7.setRotationPoint(-4F, 19F, -4F); + fin7.setTextureSize(64, 32); + fin7.mirror = true; + setRotation(fin7, 0F, 0F, 0F); + fin8 = new ModelRenderer(this, 0, 9); + fin8.addBox(0F, 0F, 0F, 1, 1, 8); + fin8.setRotationPoint(-4F, 21F, -4F); + fin8.setTextureSize(64, 32); + fin8.mirror = true; + setRotation(fin8, 0F, 0F, 0F); + rod4 = new ModelRenderer(this, 0, 9); + rod4.addBox(0F, 0F, 0F, 1, 5, 1); + rod4.setRotationPoint(-3.8F, 16F, -2F); + rod4.setTextureSize(64, 32); + rod4.mirror = true; + setRotation(rod4, 0F, 0F, 0F); } public void render(float size) { - LeftOuterRail.render(size); - LowerCache.render(size); - LeftInnerRail.render(size); - RightInnerRail.render(size); - RightOuterRail.render(size); - RightTopDecor.render(size); - Base.render(size); - LeftTopDecor.render(size); - RightBottomDecor.render(size); - LeftBottomDecor.render(size); - HigherCache.render(size); - LaserTip.render(size); - LaserCable1.render(size); - LaserCable2.render(size); - LaserCable3.render(size); - LaserCable4.render(size); - LaserBase.render(size); - LaserDecor.render(size); - LaserDecor2.render(size); + connector.render(size); + center.render(size); + shaft.render(size); + ring1.render(size); + port.render(size); + rod1.render(size); + fin1.render(size); + fin2.render(size); + fin3.render(size); + fin4.render(size); + ring2.render(size); + body.render(size); + rod2.render(size); + wire.render(size); + rod3.render(size); + fin5.render(size); + fin6.render(size); + fin7.render(size); + fin8.render(size); + rod4.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelLogisticalSorter.java b/src/main/java/mekanism/client/model/ModelLogisticalSorter.java index ac329f046..f6f6abc78 100644 --- a/src/main/java/mekanism/client/model/ModelLogisticalSorter.java +++ b/src/main/java/mekanism/client/model/ModelLogisticalSorter.java @@ -9,196 +9,236 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelLogisticalSorter extends ModelBase { - ModelRenderer LeftThing; - ModelRenderer RightThing; - ModelRenderer BottomPlate; - ModelRenderer TopPlate; - ModelRenderer LeftPlate; - ModelRenderer RightPlate; - ModelRenderer BR1Block1; - ModelRenderer BL1Block1; - ModelRenderer TL1Block1; - ModelRenderer TR1Block1; - ModelRenderer BR1Block2; - ModelRenderer BL1Block2; - ModelRenderer TL1Block2; - ModelRenderer TR1Block2; - ModelRenderer PoleBR; - ModelRenderer PoleTL; - ModelRenderer PoleTR; - ModelRenderer PoleBL; - ModelRenderer Base; - ModelRenderer PipeBase; - ModelRenderer DecorPlate; + ModelRenderer portBack; + ModelRenderer portBackLarge; + ModelRenderer connectorBack; + ModelRenderer portFront; + ModelRenderer ring1; + ModelRenderer ring2; + ModelRenderer ring3; + ModelRenderer ring4; + ModelRenderer ring5; + ModelRenderer ring6; + ModelRenderer ring7; + ModelRenderer pistonBar1; + ModelRenderer pipe; + ModelRenderer pistonBase1; + ModelRenderer pistonBrace1; + ModelRenderer pistonConnector1; + ModelRenderer pistonBrace2; + ModelRenderer pistonConnector2; + ModelRenderer pistonBar2; + ModelRenderer pistonBase2; + ModelRenderer panel2; + ModelRenderer led4; + ModelRenderer led3; + ModelRenderer led2; + ModelRenderer led1; + ModelRenderer panel1; - public ModelLogisticalSorter() + public ModelLogisticalSorter() { textureWidth = 128; textureHeight = 64; - LeftThing = new ModelRenderer(this, 0, 29); - LeftThing.addBox(0F, 0F, 0F, 1, 12, 1); - LeftThing.setRotationPoint(5.5F, 10F, 5F); - LeftThing.setTextureSize(128, 64); - LeftThing.mirror = true; - setRotation(LeftThing, 0F, 0F, 0F); - RightThing = new ModelRenderer(this, 0, 29); - RightThing.addBox(0F, 0F, 0F, 1, 12, 1); - RightThing.setRotationPoint(5.5F, 10F, -6F); - RightThing.setTextureSize(128, 64); - RightThing.mirror = true; - setRotation(RightThing, 0F, 0F, 0F); - BottomPlate = new ModelRenderer(this, 60, 7); - BottomPlate.addBox(0F, 0F, 0F, 12, 1, 4); - BottomPlate.setRotationPoint(-6F, 18F, -2F); - BottomPlate.setTextureSize(128, 64); - BottomPlate.mirror = true; - setRotation(BottomPlate, 0F, 0F, 0F); - TopPlate = new ModelRenderer(this, 60, 7); - TopPlate.addBox(0F, 0F, 0F, 12, 1, 4); - TopPlate.setRotationPoint(-6F, 13F, -2F); - TopPlate.setTextureSize(128, 64); - TopPlate.mirror = true; - setRotation(TopPlate, 0F, 0F, 0F); - LeftPlate = new ModelRenderer(this, 33, 5); - LeftPlate.addBox(0F, 0F, 0F, 12, 6, 1); - LeftPlate.setRotationPoint(-6F, 13F, 2F); - LeftPlate.setTextureSize(128, 64); - LeftPlate.mirror = true; - setRotation(LeftPlate, 0F, 0F, 0F); - RightPlate = new ModelRenderer(this, 33, 5); - RightPlate.addBox(0F, 0F, 0F, 12, 6, 1); - RightPlate.setRotationPoint(-6F, 13F, -3F); - RightPlate.setTextureSize(128, 64); - RightPlate.mirror = true; - setRotation(RightPlate, 0F, 0F, 0F); - BR1Block1 = new ModelRenderer(this, 33, 0); - BR1Block1.addBox(0F, 0F, 0F, 1, 2, 2); - BR1Block1.setRotationPoint(4F, 17.5F, -3.5F); - BR1Block1.setTextureSize(128, 64); - BR1Block1.mirror = true; - setRotation(BR1Block1, 0F, 0.0174533F, 0F); - BL1Block1 = new ModelRenderer(this, 33, 0); - BL1Block1.addBox(0F, 0F, 0F, 1, 2, 2); - BL1Block1.setRotationPoint(4F, 17.5F, 1.473333F); - BL1Block1.setTextureSize(128, 64); - BL1Block1.mirror = true; - setRotation(BL1Block1, 0F, 0F, 0F); - TL1Block1 = new ModelRenderer(this, 33, 0); - TL1Block1.addBox(0F, 0F, 0F, 1, 2, 2); - TL1Block1.setRotationPoint(4F, 12.5F, 1.473333F); - TL1Block1.setTextureSize(128, 64); - TL1Block1.mirror = true; - setRotation(TL1Block1, 0F, 0F, 0F); - TR1Block1 = new ModelRenderer(this, 33, 0); - TR1Block1.addBox(0F, 0F, 0F, 1, 2, 2); - TR1Block1.setRotationPoint(4F, 12.5F, -3.5F); - TR1Block1.setTextureSize(128, 64); - TR1Block1.mirror = true; - setRotation(TR1Block1, 0F, 0F, 0F); - BR1Block2 = new ModelRenderer(this, 33, 0); - BR1Block2.addBox(0F, 0F, 0F, 1, 2, 2); - BR1Block2.setRotationPoint(-5F, 17.5F, -3.5F); - BR1Block2.setTextureSize(128, 64); - BR1Block2.mirror = true; - setRotation(BR1Block2, 0F, 0F, 0F); - BL1Block2 = new ModelRenderer(this, 33, 0); - BL1Block2.addBox(0F, 0F, 0F, 1, 2, 2); - BL1Block2.setRotationPoint(-5F, 17.5F, 1.473333F); - BL1Block2.setTextureSize(128, 64); - BL1Block2.mirror = true; - setRotation(BL1Block2, 0F, 0F, 0F); - TL1Block2 = new ModelRenderer(this, 33, 0); - TL1Block2.addBox(0F, 0F, 0F, 1, 2, 2); - TL1Block2.setRotationPoint(-5F, 12.5F, 1.473333F); - TL1Block2.setTextureSize(128, 64); - TL1Block2.mirror = true; - setRotation(TL1Block2, 0F, 0F, 0F); - TR1Block2 = new ModelRenderer(this, 33, 0); - TR1Block2.addBox(0F, 0F, 0F, 1, 2, 2); - TR1Block2.setRotationPoint(-5F, 12.5F, -3.5F); - TR1Block2.setTextureSize(128, 64); - TR1Block2.mirror = true; - setRotation(TR1Block2, 0F, 0F, 0F); - PoleBR = new ModelRenderer(this, 40, 0); - PoleBR.addBox(0F, 0F, 0F, 8, 1, 1); - PoleBR.setRotationPoint(-4F, 18.2F, 2.2F); - PoleBR.setTextureSize(128, 64); - PoleBR.mirror = true; - setRotation(PoleBR, 0F, 0F, 0F); - PoleTL = new ModelRenderer(this, 40, 0); - PoleTL.addBox(0F, 0F, 0F, 8, 1, 1); - PoleTL.setRotationPoint(-4F, 12.8F, -3.2F); - PoleTL.setTextureSize(128, 64); - PoleTL.mirror = true; - setRotation(PoleTL, 0F, 0F, 0F); - PoleTR = new ModelRenderer(this, 40, 0); - PoleTR.addBox(0F, 0F, 0F, 8, 1, 1); - PoleTR.setRotationPoint(-4F, 12.8F, 2.2F); - PoleTR.setTextureSize(128, 64); - PoleTR.mirror = true; - setRotation(PoleTR, 0F, 0F, 0F); - PoleBL = new ModelRenderer(this, 40, 0); - PoleBL.addBox(0F, 0F, 0F, 8, 1, 1); - PoleBL.setRotationPoint(-4F, 18.2F, -3.2F); - PoleBL.setTextureSize(128, 64); - PoleBL.mirror = true; - setRotation(PoleBL, 0F, 0F, 0F); - Base = new ModelRenderer(this, 0, 0); - Base.addBox(0F, 0F, 0F, 2, 14, 14); - Base.setRotationPoint(6F, 9F, -7F); - Base.setTextureSize(128, 64); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - PipeBase = new ModelRenderer(this, 33, 13); - PipeBase.addBox(0F, 0F, 0F, 3, 8, 8); - PipeBase.setRotationPoint(-8F, 12F, -4F); - PipeBase.setTextureSize(128, 64); - PipeBase.mirror = true; - setRotation(PipeBase, 0F, 0F, 0F); - DecorPlate = new ModelRenderer(this, 5, 29); - DecorPlate.addBox(0F, 0F, 0F, 1, 8, 8); - DecorPlate.setRotationPoint(5F, 12F, -4F); - DecorPlate.setTextureSize(128, 64); - DecorPlate.mirror = true; - setRotation(DecorPlate, 0F, 0F, 0F); + portBack = new ModelRenderer(this, 26, 11); + portBack.addBox(0F, 0F, 0F, 8, 8, 1); + portBack.setRotationPoint(-4F, 12F, 8F); + portBack.setTextureSize(128, 64); + portBack.mirror = true; + setRotation(portBack, 0F, 0F, 0F); + portBackLarge = new ModelRenderer(this, 0, 0); + portBackLarge.addBox(0F, 0F, 0F, 12, 12, 1); + portBackLarge.setRotationPoint(-6F, 10F, 7F); + portBackLarge.setTextureSize(128, 64); + portBackLarge.mirror = true; + setRotation(portBackLarge, 0F, 0F, 0F); + connectorBack = new ModelRenderer(this, 26, 0); + connectorBack.addBox(0F, 0F, 0F, 10, 10, 1); + connectorBack.setRotationPoint(-5F, 11F, 6F); + connectorBack.setTextureSize(128, 64); + connectorBack.mirror = true; + setRotation(connectorBack, 0F, 0F, 0F); + portFront = new ModelRenderer(this, 48, 0); + portFront.addBox(0F, 0F, 0F, 10, 10, 1); + portFront.setRotationPoint(-5F, 11F, -8F); + portFront.setTextureSize(128, 64); + portFront.mirror = true; + setRotation(portFront, 0F, 0F, 0F); + ring1 = new ModelRenderer(this, 44, 11); + ring1.addBox(0F, 0F, 0F, 7, 7, 1); + ring1.setRotationPoint(-3.5F, 12.5F, -7F); + ring1.setTextureSize(128, 64); + ring1.mirror = true; + setRotation(ring1, 0F, 0F, 0F); + ring2 = new ModelRenderer(this, 44, 11); + ring2.addBox(0F, 0F, 0F, 7, 7, 1); + ring2.setRotationPoint(-3.5F, 12.5F, -5F); + ring2.setTextureSize(128, 64); + ring2.mirror = true; + setRotation(ring2, 0F, 0F, 0F); + ring3 = new ModelRenderer(this, 44, 11); + ring3.addBox(0F, 0F, 0F, 7, 7, 1); + ring3.setRotationPoint(-3.5F, 12.5F, -3F); + ring3.setTextureSize(128, 64); + ring3.mirror = true; + setRotation(ring3, 0F, 0F, 0F); + ring4 = new ModelRenderer(this, 44, 11); + ring4.addBox(0F, 0F, 0F, 7, 7, 1); + ring4.setRotationPoint(-3.5F, 12.5F, -1F); + ring4.setTextureSize(128, 64); + ring4.mirror = true; + setRotation(ring4, 0F, 0F, 0F); + ring5 = new ModelRenderer(this, 44, 11); + ring5.addBox(0F, 0F, 0F, 7, 7, 1); + ring5.setRotationPoint(-3.5F, 12.5F, 1F); + ring5.setTextureSize(128, 64); + ring5.mirror = true; + setRotation(ring5, 0F, 0F, 0F); + ring6 = new ModelRenderer(this, 44, 11); + ring6.addBox(0F, 0F, 0F, 7, 7, 1); + ring6.setRotationPoint(-3.5F, 12.5F, 3F); + ring6.setTextureSize(128, 64); + ring6.mirror = true; + setRotation(ring6, 0F, 0F, 0F); + ring7 = new ModelRenderer(this, 44, 11); + ring7.addBox(0F, 0F, 0F, 7, 7, 1); + ring7.setRotationPoint(-3.5F, 12.5F, 5F); + ring7.setTextureSize(128, 64); + ring7.mirror = true; + setRotation(ring7, 0F, 0F, 0F); + pistonBar1 = new ModelRenderer(this, 0, 20); + pistonBar1.addBox(0F, 0F, 0F, 1, 1, 5); + pistonBar1.setRotationPoint(-0.5F, 19.5F, -2.99F); + pistonBar1.setTextureSize(128, 64); + pistonBar1.mirror = true; + setRotation(pistonBar1, 0F, 0F, 0F); + pipe = new ModelRenderer(this, 0, 13); + pipe.addBox(0F, 0F, 0F, 6, 6, 14); + pipe.setRotationPoint(-3F, 13F, -7F); + pipe.setTextureSize(128, 64); + pipe.mirror = true; + setRotation(pipe, 0F, 0F, 0F); + pistonBase1 = new ModelRenderer(this, 0, 13); + pistonBase1.addBox(0F, 0F, 0F, 2, 2, 5); + pistonBase1.setRotationPoint(-1F, 19F, 1.01F); + pistonBase1.setTextureSize(128, 64); + pistonBase1.mirror = true; + setRotation(pistonBase1, 0F, 0F, 0F); + pistonBrace1 = new ModelRenderer(this, 0, 33); + pistonBrace1.addBox(0F, 0F, 0F, 2, 2, 3); + pistonBrace1.setRotationPoint(-1F, 18.5F, -7F); + pistonBrace1.setTextureSize(128, 64); + pistonBrace1.mirror = true; + setRotation(pistonBrace1, 0F, 0F, 0F); + pistonConnector1 = new ModelRenderer(this, 10, 33); + pistonConnector1.addBox(0F, 0F, 0F, 2, 2, 1); + pistonConnector1.setRotationPoint(-1F, 19F, -4F); + pistonConnector1.setTextureSize(128, 64); + pistonConnector1.mirror = true; + setRotation(pistonConnector1, 0F, 0F, 0F); + pistonBrace2 = new ModelRenderer(this, 0, 33); + pistonBrace2.addBox(0F, 0F, 0F, 2, 2, 3); + pistonBrace2.setRotationPoint(-1F, 11.5F, -7F); + pistonBrace2.setTextureSize(128, 64); + pistonBrace2.mirror = true; + setRotation(pistonBrace2, 0F, 0F, 0F); + pistonConnector2 = new ModelRenderer(this, 10, 33); + pistonConnector2.addBox(0F, 0F, 0F, 2, 2, 1); + pistonConnector2.setRotationPoint(-1F, 11F, -4F); + pistonConnector2.setTextureSize(128, 64); + pistonConnector2.mirror = true; + setRotation(pistonConnector2, 0F, 0F, 0F); + pistonBar2 = new ModelRenderer(this, 0, 20); + pistonBar2.addBox(0F, 0F, 0F, 1, 1, 5); + pistonBar2.setRotationPoint(-0.5F, 11.5F, -2.99F); + pistonBar2.setTextureSize(128, 64); + pistonBar2.mirror = true; + setRotation(pistonBar2, 0F, 0F, 0F); + pistonBase2 = new ModelRenderer(this, 0, 13); + pistonBase2.addBox(0F, 0F, 0F, 2, 2, 5); + pistonBase2.setRotationPoint(-1F, 11F, 1.01F); + pistonBase2.setTextureSize(128, 64); + pistonBase2.mirror = true; + setRotation(pistonBase2, 0F, 0F, 0F); + panel2 = new ModelRenderer(this, 40, 22); + panel2.addBox(0F, 0F, 0F, 1, 3, 8); + panel2.setRotationPoint(3F, 14.5F, -4.5F); + panel2.setTextureSize(128, 64); + panel2.mirror = true; + setRotation(panel2, 0F, 0F, 0F); + led4 = new ModelRenderer(this, 40, 22); + led4.addBox(0F, 0F, 0F, 1, 1, 1); + led4.setRotationPoint(3.5F, 15.5F, -1.5F); + led4.setTextureSize(128, 64); + led4.mirror = true; + setRotation(led4, 0F, 0F, 0F); + led3 = new ModelRenderer(this, 40, 22); + led3.addBox(0F, 0F, 0F, 1, 1, 1); + led3.setRotationPoint(3.5F, 15.5F, -3.5F); + led3.setTextureSize(128, 64); + led3.mirror = true; + setRotation(led3, 0F, 0F, 0F); + led2 = new ModelRenderer(this, 40, 22); + led2.addBox(0F, 0F, 0F, 1, 1, 1); + led2.setRotationPoint(-4.5F, 15.5F, -3.5F); + led2.setTextureSize(128, 64); + led2.mirror = true; + setRotation(led2, 0F, 0F, 0F); + led1 = new ModelRenderer(this, 40, 22); + led1.addBox(0F, 0F, 0F, 1, 1, 1); + led1.setRotationPoint(-4.5F, 15.5F, -1.5F); + led1.setTextureSize(128, 64); + led1.mirror = true; + setRotation(led1, 0F, 0F, 0F); + panel1 = new ModelRenderer(this, 40, 22); + panel1.addBox(0F, 0F, 0F, 1, 3, 8); + panel1.setRotationPoint(-4F, 14.5F, -4.5F); + panel1.setTextureSize(128, 64); + panel1.mirror = true; + setRotation(panel1, 0F, 0F, 0F); } public void render(float size, boolean active) { - LeftThing.render(size); - RightThing.render(size); - BottomPlate.render(size); - TopPlate.render(size); - LeftPlate.render(size); - RightPlate.render(size); - + portBack.render(size); + portBackLarge.render(size); + connectorBack.render(size); + portFront.render(size); + ring1.render(size); + ring2.render(size); + ring3.render(size); + ring4.render(size); + ring5.render(size); + ring6.render(size); + ring7.render(size); + pistonBar1.render(size); + pipe.render(size); + pistonBase1.render(size); + pistonBrace1.render(size); + pistonConnector1.render(size); + pistonBrace2.render(size); + pistonConnector2.render(size); + pistonBar2.render(size); + pistonBase2.render(size); + panel2.render(size); + if(active) { MekanismRenderer.glowOn(); } - - BR1Block1.render(size); - BL1Block1.render(size); - TL1Block1.render(size); - TR1Block1.render(size); - BR1Block2.render(size); - BL1Block2.render(size); - TL1Block2.render(size); - TR1Block2.render(size); - + + led4.render(size); + led3.render(size); + led2.render(size); + led1.render(size); + if(active) { MekanismRenderer.glowOff(); } - - PoleBR.render(size); - PoleTL.render(size); - PoleTR.render(size); - PoleBL.render(size); - Base.render(size); - PipeBase.render(size); - DecorPlate.render(size); + + panel1.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java b/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java index 4c25f09e3..a7c1b4365 100644 --- a/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java @@ -8,216 +8,152 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelMetallurgicInfuser extends ModelBase { - ModelRenderer Base; - ModelRenderer RightChamber; - ModelRenderer TopChamber; - ModelRenderer BackChamber; - ModelRenderer LeftChamber; - ModelRenderer FCTop; - ModelRenderer FCBottom; - ModelRenderer FCRight; - ModelRenderer FCLeft; - ModelRenderer FCDoor; - ModelRenderer Cable1; - ModelRenderer Cable3; - ModelRenderer Cable5; - ModelRenderer Cable2; - ModelRenderer Cable4; - ModelRenderer Cable6; - ModelRenderer TopPanelDec; - ModelRenderer BackPlate; - ModelRenderer TopPanel; - ModelRenderer TopPanelExtr; - ModelRenderer ConnectorRight; - ModelRenderer ConnectorLeft; - ModelRenderer ConnectorWireRight; - ModelRenderer ConnectorWireLeft; - ModelRenderer ConnectorWireTop; + ModelRenderer base; + ModelRenderer back; + ModelRenderer connector1; + ModelRenderer connector2; + ModelRenderer sideRight; + ModelRenderer top; + ModelRenderer sideLeft; + ModelRenderer tap1; + ModelRenderer tap2; + ModelRenderer tapBase1; + ModelRenderer tapBase2; + ModelRenderer divider; + ModelRenderer plate1; + ModelRenderer plate2; + ModelRenderer plate3; + ModelRenderer bar1; + ModelRenderer bar2; - public ModelMetallurgicInfuser() + public ModelMetallurgicInfuser() { textureWidth = 128; textureHeight = 64; - Base = new ModelRenderer(this, 0, 0); - Base.addBox(0F, 0F, 0F, 14, 2, 16); - Base.setRotationPoint(-7F, 22F, -8F); - Base.setTextureSize(128, 64); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - RightChamber = new ModelRenderer(this, 61, 0); - RightChamber.addBox(0F, 0F, 0F, 1, 6, 5); - RightChamber.setRotationPoint(5.5F, 16F, -6F); - RightChamber.setTextureSize(128, 64); - RightChamber.mirror = true; - setRotation(RightChamber, 0F, 0F, 0F); - TopChamber = new ModelRenderer(this, 86, 12); - TopChamber.addBox(0F, 0F, 0F, 11, 1, 5); - TopChamber.setRotationPoint(-5.5F, 15F, -6F); - TopChamber.setTextureSize(128, 64); - TopChamber.mirror = true; - setRotation(TopChamber, 0F, 0F, 0F); - BackChamber = new ModelRenderer(this, 74, 0); - BackChamber.addBox(0F, 0F, 0F, 11, 6, 1); - BackChamber.setRotationPoint(-5.5F, 16F, -1F); - BackChamber.setTextureSize(128, 64); - BackChamber.mirror = true; - setRotation(BackChamber, 0F, 0F, 0F); - LeftChamber = new ModelRenderer(this, 61, 0); - LeftChamber.addBox(0F, 0F, 0F, 1, 6, 5); - LeftChamber.setRotationPoint(-6.5F, 16F, -6F); - LeftChamber.setTextureSize(128, 64); - LeftChamber.mirror = true; - setRotation(LeftChamber, 0F, 0F, 0F); - FCTop = new ModelRenderer(this, 99, 6); - FCTop.addBox(0F, 0F, 0F, 11, 1, 1); - FCTop.setRotationPoint(-5.5F, 16F, -7F); - FCTop.setTextureSize(128, 64); - FCTop.mirror = true; - setRotation(FCTop, 0F, 0F, 0F); - FCBottom = new ModelRenderer(this, 99, 6); - FCBottom.addBox(0F, 0F, 0F, 11, 1, 1); - FCBottom.setRotationPoint(-5.5F, 21F, -7F); - FCBottom.setTextureSize(128, 64); - FCBottom.mirror = true; - setRotation(FCBottom, 0F, 0F, 0F); - FCRight = new ModelRenderer(this, 61, 11); - FCRight.addBox(0F, 0F, 0F, 1, 4, 1); - FCRight.setRotationPoint(4.5F, 17F, -7F); - FCRight.setTextureSize(128, 64); - FCRight.mirror = true; - setRotation(FCRight, 0F, 0F, 0F); - FCLeft = new ModelRenderer(this, 61, 11); - FCLeft.addBox(0F, 0F, 0F, 1, 4, 1); - FCLeft.setRotationPoint(-5.5F, 17F, -7F); - FCLeft.setTextureSize(128, 64); - FCLeft.mirror = true; - setRotation(FCLeft, 0F, 0F, 0F); - FCDoor = new ModelRenderer(this, 99, 0); - FCDoor.addBox(0F, -2F, -0.5F, 9, 4, 1); - FCDoor.setRotationPoint(-4.5F, 19F, -7F); - FCDoor.setTextureSize(128, 64); - FCDoor.mirror = true; - setRotation(FCDoor, 0F, 0F, 0F); - Cable1 = new ModelRenderer(this, 105, 19); - Cable1.addBox(0F, 0F, 0F, 1, 1, 7); - Cable1.setRotationPoint(-4.5F, 19.5F, 0F); - Cable1.setTextureSize(128, 64); - Cable1.mirror = true; - setRotation(Cable1, 0F, 0.0174533F, 0F); - Cable3 = new ModelRenderer(this, 86, 19); - Cable3.addBox(0F, 0F, 0F, 2, 2, 7); - Cable3.setRotationPoint(3F, 18F, 0F); - Cable3.setTextureSize(128, 64); - Cable3.mirror = true; - setRotation(Cable3, 0F, 0.0174533F, 0F); - Cable5 = new ModelRenderer(this, 105, 19); - Cable5.addBox(0F, 0F, 0F, 1, 1, 7); - Cable5.setRotationPoint(3.5F, 19.5F, 0F); - Cable5.setTextureSize(128, 64); - Cable5.mirror = true; - setRotation(Cable5, 0F, 0.0174533F, 0F); - Cable2 = new ModelRenderer(this, 86, 19); - Cable2.addBox(0F, 0F, 0F, 2, 2, 7); - Cable2.setRotationPoint(-5F, 18F, 0F); - Cable2.setTextureSize(128, 64); - Cable2.mirror = true; - setRotation(Cable2, 0F, 0F, 0F); - Cable4 = new ModelRenderer(this, 105, 19); - Cable4.addBox(0F, 0F, 0F, 1, 1, 7); - Cable4.setRotationPoint(-4.5F, 17.5F, 0F); - Cable4.setTextureSize(128, 64); - Cable4.mirror = true; - setRotation(Cable4, 0F, 0.0174533F, 0F); - Cable6 = new ModelRenderer(this, 105, 19); - Cable6.addBox(0F, 0F, 0F, 1, 1, 7); - Cable6.setRotationPoint(3.5F, 17.5F, 0F); - Cable6.setTextureSize(128, 64); - Cable6.mirror = true; - setRotation(Cable6, 0F, 0.0174533F, 0F); - TopPanelDec = new ModelRenderer(this, 33, 28); - TopPanelDec.addBox(0F, 0F, 0F, 13, 1, 1); - TopPanelDec.setRotationPoint(-6.5F, 11.5F, 5.5F); - TopPanelDec.setTextureSize(128, 64); - TopPanelDec.mirror = true; - setRotation(TopPanelDec, 0F, 0F, 0F); - BackPlate = new ModelRenderer(this, 0, 19); - BackPlate.addBox(0F, 0F, 0F, 14, 12, 2); - BackPlate.setRotationPoint(-7F, 10F, 6F); - BackPlate.setTextureSize(128, 64); - BackPlate.mirror = true; - setRotation(BackPlate, 0F, 0F, 0F); - TopPanel = new ModelRenderer(this, 33, 19); - TopPanel.addBox(0F, 0F, 0F, 14, 2, 3); - TopPanel.setRotationPoint(-7F, 10F, 3F); - TopPanel.setTextureSize(128, 64); - TopPanel.mirror = true; - setRotation(TopPanel, 0F, 0F, 0F); - TopPanelExtr = new ModelRenderer(this, 33, 25); - TopPanelExtr.addBox(0F, 0F, 0F, 14, 1, 1); - TopPanelExtr.setRotationPoint(-7F, 10F, 2F); - TopPanelExtr.setTextureSize(128, 64); - TopPanelExtr.mirror = true; - setRotation(TopPanelExtr, 0F, 0F, 0F); - ConnectorRight = new ModelRenderer(this, 68, 19); - ConnectorRight.addBox(0F, 0F, 0F, 3, 1, 3); - ConnectorRight.setRotationPoint(1.5F, 14F, -5F); - ConnectorRight.setTextureSize(128, 64); - ConnectorRight.mirror = true; - setRotation(ConnectorRight, 0F, 0F, 0F); - ConnectorLeft = new ModelRenderer(this, 68, 19); - ConnectorLeft.addBox(0F, 0F, 0F, 3, 1, 3); - ConnectorLeft.setRotationPoint(-4.5F, 14F, -5F); - ConnectorLeft.setTextureSize(128, 64); - ConnectorLeft.mirror = true; - setRotation(ConnectorLeft, 0F, 0F, 0F); - ConnectorWireRight = new ModelRenderer(this, 68, 24); - ConnectorWireRight.addBox(0F, 0F, 0F, 1, 3, 1); - ConnectorWireRight.setRotationPoint(2.5F, 11F, -4F); - ConnectorWireRight.setTextureSize(128, 64); - ConnectorWireRight.mirror = true; - setRotation(ConnectorWireRight, 0F, 0F, 0F); - ConnectorWireLeft = new ModelRenderer(this, 68, 24); - ConnectorWireLeft.addBox(0F, 0F, 0F, 1, 3, 1); - ConnectorWireLeft.setRotationPoint(-3.5F, 11F, -4F); - ConnectorWireLeft.setTextureSize(128, 64); - ConnectorWireLeft.mirror = true; - setRotation(ConnectorWireLeft, 0F, 0F, 0F); - ConnectorWireTop = new ModelRenderer(this, 68, 29); - ConnectorWireTop.addBox(0F, 0F, 0F, 5, 1, 1); - ConnectorWireTop.setRotationPoint(-2.5F, 11F, -4F); - ConnectorWireTop.setTextureSize(128, 64); - ConnectorWireTop.mirror = true; - setRotation(ConnectorWireTop, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 4, 16); + base.setRotationPoint(-8F, 20F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + back = new ModelRenderer(this, 42, 20); + back.addBox(0F, 0F, 0F, 16, 12, 1); + back.setRotationPoint(-8F, 8F, 7F); + back.setTextureSize(128, 64); + back.mirror = true; + setRotation(back, 0F, 0F, 0F); + connector1 = new ModelRenderer(this, 0, 8); + connector1.addBox(0F, 0F, 0F, 1, 5, 3); + connector1.setRotationPoint(-4F, 8.5F, -3F); + connector1.setTextureSize(128, 64); + connector1.mirror = true; + setRotation(connector1, 0F, 0F, 0F); + connector2 = new ModelRenderer(this, 0, 8); + connector2.addBox(0F, 0F, 0F, 1, 5, 3); + connector2.setRotationPoint(3F, 8.5F, -3F); + connector2.setTextureSize(128, 64); + connector2.mirror = true; + setRotation(connector2, 0F, 0F, 0F); + sideRight = new ModelRenderer(this, 64, 0); + sideRight.mirror = true; + sideRight.addBox(0F, 0F, 0F, 1, 11, 7); + sideRight.setRotationPoint(7F, 9F, 0F); + sideRight.setTextureSize(128, 64); + setRotation(sideRight, 0F, 0F, 0F); + top = new ModelRenderer(this, 80, 0); + top.addBox(0F, 0F, 0F, 16, 1, 7); + top.setRotationPoint(-8F, 8F, 0F); + top.setTextureSize(128, 64); + top.mirror = true; + setRotation(top, 0F, 0F, 0F); + sideLeft = new ModelRenderer(this, 64, 0); + sideLeft.addBox(0F, 0F, 0F, 1, 11, 7); + sideLeft.setRotationPoint(-8F, 9F, 0F); + sideLeft.setTextureSize(128, 64); + sideLeft.mirror = true; + setRotation(sideLeft, 0F, 0F, 0F); + tap1 = new ModelRenderer(this, 80, 8); + tap1.addBox(0F, 0F, 0F, 2, 1, 11); + tap1.setRotationPoint(-4.5F, 11.5F, -4F); + tap1.setTextureSize(128, 64); + tap1.mirror = true; + setRotation(tap1, 0F, 0F, 0F); + tap2 = new ModelRenderer(this, 80, 8); + tap2.addBox(0F, 0F, 0F, 2, 1, 11); + tap2.setRotationPoint(2.5F, 11.5F, -4F); + tap2.setTextureSize(128, 64); + tap2.mirror = true; + setRotation(tap2, 0F, 0F, 0F); + tapBase1 = new ModelRenderer(this, 4, 0); + tapBase1.addBox(0F, 0F, 0F, 2, 1, 2); + tapBase1.setRotationPoint(-4.5F, 12.5F, 5F); + tapBase1.setTextureSize(128, 64); + tapBase1.mirror = true; + setRotation(tapBase1, 0F, 0F, 0F); + tapBase2 = new ModelRenderer(this, 4, 0); + tapBase2.addBox(0F, 0F, 0F, 2, 1, 2); + tapBase2.setRotationPoint(2.5F, 12.5F, 5F); + tapBase2.setTextureSize(128, 64); + tapBase2.mirror = true; + setRotation(tapBase2, 0F, 0F, 0F); + divider = new ModelRenderer(this, 66, 20); + divider.addBox(0F, 0F, 0F, 13, 1, 14); + divider.setRotationPoint(-6.5F, 16F, -6.5F); + divider.setTextureSize(128, 64); + divider.mirror = true; + setRotation(divider, 0F, 0F, 0F); + plate1 = new ModelRenderer(this, 0, 20); + plate1.addBox(0F, 0F, 0F, 14, 3, 14); + plate1.setRotationPoint(-7F, 9F, -7F); + plate1.setTextureSize(128, 64); + plate1.mirror = true; + setRotation(plate1, 0F, 0F, 0F); + plate2 = new ModelRenderer(this, 0, 37); + plate2.addBox(0F, 0F, 0F, 14, 3, 14); + plate2.setRotationPoint(-7F, 13F, -7F); + plate2.setTextureSize(128, 64); + plate2.mirror = true; + setRotation(plate2, 0F, 0F, 0F); + plate3 = new ModelRenderer(this, 0, 37); + plate3.addBox(0F, 0F, 0F, 14, 3, 14); + plate3.setRotationPoint(-7F, 17F, -7F); + plate3.setTextureSize(128, 64); + plate3.mirror = true; + setRotation(plate3, 0F, 0F, 0F); + bar1 = new ModelRenderer(this, 0, 0); + bar1.addBox(0F, 0F, 0F, 1, 1, 1); + bar1.setRotationPoint(-6.5F, 12F, -6.5F); + bar1.setTextureSize(128, 64); + bar1.mirror = true; + setRotation(bar1, 0F, 0F, 0F); + bar2 = new ModelRenderer(this, 0, 0); + bar2.addBox(0F, 0F, 0F, 1, 1, 1); + bar2.setRotationPoint(5.5F, 12F, -6.5F); + bar2.setTextureSize(128, 64); + bar2.mirror = true; + setRotation(bar2, 0F, 0F, 0F); } - public void render(float size) + public void render(float size) { - Base.render(size); - RightChamber.render(size); - TopChamber.render(size); - BackChamber.render(size); - LeftChamber.render(size); - FCTop.render(size); - FCBottom.render(size); - FCRight.render(size); - FCLeft.render(size); - FCDoor.render(size); - Cable1.render(size); - Cable3.render(size); - Cable5.render(size); - Cable2.render(size); - Cable4.render(size); - Cable6.render(size); - TopPanelDec.render(size); - BackPlate.render(size); - TopPanel.render(size); - TopPanelExtr.render(size); - ConnectorRight.render(size); - ConnectorLeft.render(size); - ConnectorWireRight.render(size); - ConnectorWireLeft.render(size); - ConnectorWireTop.render(size); + base.render(size); + back.render(size); + connector1.render(size); + connector2.render(size); + sideRight.render(size); + top.render(size); + sideLeft.render(size); + tap1.render(size); + tap2.render(size); + tapBase1.render(size); + tapBase2.render(size); + divider.render(size); + plate1.render(size); + plate2.render(size); + plate3.render(size); + bar1.render(size); + bar2.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java b/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java index 3432e7ee2..10f9cfd1e 100644 --- a/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java +++ b/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java @@ -8,168 +8,96 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelPressurizedReactionChamber extends ModelBase { - ModelRenderer Base; - ModelRenderer GasRight; - ModelRenderer GasLeft; - ModelRenderer GasConnector; - ModelRenderer FluidBack; - ModelRenderer CoreBase; - ModelRenderer Core; - ModelRenderer PoleRF; - ModelRenderer PoleFL; - ModelRenderer PoleLB; - ModelRenderer PoleBR; - ModelRenderer PoleR; - ModelRenderer PoleL; - ModelRenderer FrontPanel; - ModelRenderer TubeThing; - ModelRenderer CenterCore; - ModelRenderer BackConnector; - ModelRenderer BackCore; - ModelRenderer TopPanel; + ModelRenderer frontDivider1; + ModelRenderer base; + ModelRenderer front; + ModelRenderer bar1; + ModelRenderer body; + ModelRenderer bar5; + ModelRenderer bar4; + ModelRenderer bar3; + ModelRenderer bar2; + ModelRenderer frontDivider2; - public ModelPressurizedReactionChamber() + public ModelPressurizedReactionChamber() { textureWidth = 128; - textureHeight = 128; + textureHeight = 64; - Base = new ModelRenderer(this, 0, 0); - Base.addBox(0F, 0F, 0F, 16, 1, 16); - Base.setRotationPoint(-8F, 23F, -8F); - Base.setTextureSize(128, 128); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - GasRight = new ModelRenderer(this, 64, 12); - GasRight.addBox(0F, 0F, 0F, 1, 6, 6); - GasRight.setRotationPoint(-8F, 13F, -3F); - GasRight.setTextureSize(128, 128); - GasRight.mirror = true; - setRotation(GasRight, 0F, 0F, 0F); - GasLeft = new ModelRenderer(this, 64, 12); - GasLeft.addBox(0F, 0F, 0F, 1, 6, 6); - GasLeft.setRotationPoint(7F, 13F, -3F); - GasLeft.setTextureSize(128, 128); - GasLeft.mirror = true; - setRotation(GasLeft, 0F, 0F, 0F); - GasConnector = new ModelRenderer(this, 22, 38); - GasConnector.addBox(0F, 0F, 0F, 14, 2, 2); - GasConnector.setRotationPoint(-7F, 15F, -1F); - GasConnector.setTextureSize(128, 128); - GasConnector.mirror = true; - setRotation(GasConnector, 0F, 0F, 0F); - FluidBack = new ModelRenderer(this, 50, 24); - FluidBack.addBox(0F, 0F, 0F, 8, 8, 1); - FluidBack.setRotationPoint(-4F, 12F, 7F); - FluidBack.setTextureSize(128, 128); - FluidBack.mirror = true; - setRotation(FluidBack, 0F, 0F, 0F); - CoreBase = new ModelRenderer(this, 64, 0); - CoreBase.addBox(0F, 0F, 0F, 10, 1, 11); - CoreBase.setRotationPoint(-5F, 22F, -6F); - CoreBase.setTextureSize(128, 128); - CoreBase.mirror = true; - setRotation(CoreBase, 0F, 0F, 0F); - Core = new ModelRenderer(this, 0, 17); - Core.addBox(0F, 0F, 0F, 12, 8, 13); - Core.setRotationPoint(-6F, 14F, -7F); - Core.setTextureSize(128, 128); - Core.mirror = true; - setRotation(Core, 0F, 0F, 0F); - PoleRF = new ModelRenderer(this, 38, 42); - PoleRF.addBox(0F, 0F, 0F, 1, 6, 1); - PoleRF.setRotationPoint(-6F, 8F, -7F); - PoleRF.setTextureSize(128, 128); - PoleRF.mirror = true; - setRotation(PoleRF, 0F, 0F, 0F); - PoleFL = new ModelRenderer(this, 38, 42); - PoleFL.addBox(0F, 0F, 0F, 1, 6, 1); - PoleFL.setRotationPoint(5F, 8F, -7F); - PoleFL.setTextureSize(128, 128); - PoleFL.mirror = true; - setRotation(PoleFL, 0F, 0F, 0F); - PoleLB = new ModelRenderer(this, 38, 42); - PoleLB.addBox(0F, 0F, 0F, 1, 6, 1); - PoleLB.setRotationPoint(5F, 8F, 5F); - PoleLB.setTextureSize(128, 128); - PoleLB.mirror = true; - setRotation(PoleLB, 0F, 0F, 0F); - PoleBR = new ModelRenderer(this, 38, 42); - PoleBR.addBox(0F, -2F, 0F, 1, 6, 1); - PoleBR.setRotationPoint(-6F, 10F, 5F); - PoleBR.setTextureSize(128, 128); - PoleBR.mirror = true; - setRotation(PoleBR, 0F, 0F, 0F); - PoleR = new ModelRenderer(this, 0, 57); - PoleR.addBox(0F, 0F, 0F, 1, 1, 11); - PoleR.setRotationPoint(-6F, 8F, -6F); - PoleR.setTextureSize(128, 128); - PoleR.mirror = true; - setRotation(PoleR, 0F, 0F, 0F); - PoleL = new ModelRenderer(this, 0, 57); - PoleL.addBox(0F, 0F, 0F, 1, 1, 11); - PoleL.setRotationPoint(5F, 8F, -6F); - PoleL.setTextureSize(128, 128); - PoleL.mirror = true; - setRotation(PoleL, 0F, 0F, 0F); - FrontPanel = new ModelRenderer(this, 0, 38); - FrontPanel.addBox(0F, 0F, 0F, 10, 12, 1); - FrontPanel.setRotationPoint(-5F, 9F, -8F); - FrontPanel.setTextureSize(128, 128); - FrontPanel.mirror = true; - setRotation(FrontPanel, 0F, 0F, 0F); - TubeThing = new ModelRenderer(this, 22, 42); - TubeThing.addBox(0F, 0F, 0F, 2, 2, 6); - TubeThing.setRotationPoint(-1F, 12F, -7F); - TubeThing.setTextureSize(128, 128); - TubeThing.mirror = true; - setRotation(TubeThing, 0F, 0F, 0F); - CenterCore = new ModelRenderer(this, 84, 12); - CenterCore.addBox(0F, 0F, 0F, 4, 1, 4); - CenterCore.setRotationPoint(-2F, 13F, -3F); - CenterCore.setTextureSize(128, 128); - CenterCore.mirror = true; - setRotation(CenterCore, 0F, 0F, 0F); - BackConnector = new ModelRenderer(this, 78, 12); - BackConnector.addBox(0F, 0F, 0F, 2, 5, 1); - BackConnector.setRotationPoint(-1F, 13F, 6F); - BackConnector.setTextureSize(128, 128); - BackConnector.mirror = true; - setRotation(BackConnector, 0F, 0F, 0F); - BackCore = new ModelRenderer(this, 0, 51); - BackCore.addBox(0F, 0F, 0F, 2, 1, 5); - BackCore.setRotationPoint(-1F, 13F, 1F); - BackCore.setTextureSize(128, 128); - BackCore.mirror = true; - setRotation(BackCore, 0F, 0F, 0F); - TopPanel = new ModelRenderer(this, 0, 69); - TopPanel.addBox(0F, 0F, 0F, 10, 1, 13); - TopPanel.setRotationPoint(-5F, 8F, -7F); - TopPanel.setTextureSize(128, 128); - TopPanel.mirror = true; - setRotation(TopPanel, 0F, 0F, 0F); + frontDivider1 = new ModelRenderer(this, 52, 20); + frontDivider1.addBox(0F, 0F, 0F, 2, 12, 6); + frontDivider1.setRotationPoint(-7F, 8.5F, -7.5F); + frontDivider1.setTextureSize(128, 64); + frontDivider1.mirror = true; + setRotation(frontDivider1, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 4, 16); + base.setRotationPoint(-8F, 20F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + front = new ModelRenderer(this, 48, 0); + front.addBox(0F, 0F, 0F, 9, 11, 5); + front.setRotationPoint(-2F, 9F, -7F); + front.setTextureSize(128, 64); + front.mirror = true; + setRotation(front, 0F, 0F, 0F); + bar1 = new ModelRenderer(this, 0, 0); + bar1.addBox(0F, 0F, 0F, 1, 1, 5); + bar1.setRotationPoint(-5F, 18F, -7F); + bar1.setTextureSize(128, 64); + bar1.mirror = true; + setRotation(bar1, 0F, 0F, 0F); + body = new ModelRenderer(this, 0, 20); + body.addBox(0F, 0F, 0F, 16, 12, 10); + body.setRotationPoint(-8F, 8F, -2F); + body.setTextureSize(128, 64); + body.mirror = true; + setRotation(body, 0F, 0F, 0F); + bar5 = new ModelRenderer(this, 0, 0); + bar5.addBox(0F, 0F, 0F, 1, 1, 5); + bar5.setRotationPoint(-5F, 10F, -7F); + bar5.setTextureSize(128, 64); + bar5.mirror = true; + setRotation(bar5, 0F, 0F, 0F); + bar4 = new ModelRenderer(this, 0, 0); + bar4.addBox(0F, 0F, 0F, 1, 1, 5); + bar4.setRotationPoint(-5F, 12F, -7F); + bar4.setTextureSize(128, 64); + bar4.mirror = true; + setRotation(bar4, 0F, 0F, 0F); + bar3 = new ModelRenderer(this, 0, 0); + bar3.addBox(0F, 0F, 0F, 1, 1, 5); + bar3.setRotationPoint(-5F, 14F, -7F); + bar3.setTextureSize(128, 64); + bar3.mirror = true; + setRotation(bar3, 0F, 0F, 0F); + bar2 = new ModelRenderer(this, 0, 0); + bar2.addBox(0F, 0F, 0F, 1, 1, 5); + bar2.setRotationPoint(-5F, 16F, -7F); + bar2.setTextureSize(128, 64); + bar2.mirror = true; + setRotation(bar2, 0F, 0F, 0F); + frontDivider2 = new ModelRenderer(this, 52, 20); + frontDivider2.mirror = true; + frontDivider2.addBox(0F, 0F, 0F, 2, 12, 6); + frontDivider2.setRotationPoint(-4F, 8.5F, -7.5F); + frontDivider2.setTextureSize(128, 64); + setRotation(frontDivider2, 0F, 0F, 0F); } - public void render(float size) + public void render(float size) { - Base.render(size); - GasRight.render(size); - GasLeft.render(size); - GasConnector.render(size); - FluidBack.render(size); - CoreBase.render(size); - Core.render(size); - PoleRF.render(size); - PoleFL.render(size); - PoleLB.render(size); - PoleBR.render(size); - PoleR.render(size); - PoleL.render(size); - FrontPanel.render(size); - TubeThing.render(size); - CenterCore.render(size); - BackConnector.render(size); - BackCore.render(size); - TopPanel.render(size); + frontDivider1.render(size); + base.render(size); + front.render(size); + bar1.render(size); + body.render(size); + bar5.render(size); + bar4.render(size); + bar3.render(size); + bar2.render(size); + frontDivider2.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java b/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java new file mode 100644 index 000000000..4597cfeba --- /dev/null +++ b/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java @@ -0,0 +1,383 @@ +package mekanism.client.model; + +import mekanism.client.render.MekanismRenderer; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class ModelQuantumEntangloporter extends ModelBase +{ + public static ResourceLocation OVERLAY = MekanismUtils.getResource(ResourceType.RENDER, "QuantumEntangloporter_Overlay.png"); + + ModelRenderer portTop; + ModelRenderer portBottom; + ModelRenderer portLeft; + ModelRenderer portRight; + ModelRenderer portBack; + ModelRenderer portFront; + ModelRenderer energyCubeCore; + ModelRenderer frameEdge1; + ModelRenderer frameEdge2; + ModelRenderer frameEdge3; + ModelRenderer frameEdge4; + ModelRenderer frameEdge5; + ModelRenderer frameEdge6; + ModelRenderer frameEdge7; + ModelRenderer frameEdge8; + ModelRenderer frameEdge9; + ModelRenderer frameEdge10; + ModelRenderer frameEdge11; + ModelRenderer frameEdge12; + ModelRenderer frame1; + ModelRenderer frame2; + ModelRenderer frame3; + ModelRenderer frame4; + ModelRenderer frame5; + ModelRenderer frame6; + ModelRenderer frame7; + ModelRenderer frame8; + ModelRenderer frame9; + ModelRenderer frame10; + ModelRenderer frame11; + ModelRenderer frame12; + ModelRenderer corner1; + ModelRenderer corner2; + ModelRenderer corner3; + ModelRenderer corner4; + ModelRenderer corner5; + ModelRenderer corner6; + ModelRenderer corner7; + ModelRenderer corner8; + ModelRenderer portRightLarge; + ModelRenderer portLeftLarge; + + public ModelQuantumEntangloporter() + { + textureWidth = 128; + textureHeight = 64; + + portTop = new ModelRenderer(this, 36, 0); + portTop.addBox(0F, 0F, 0F, 8, 1, 8); + portTop.setRotationPoint(-4F, 8F, -4F); + portTop.setTextureSize(128, 64); + portTop.mirror = true; + setRotation(portTop, 0F, 0F, 0F); + portBottom = new ModelRenderer(this, 36, 9); + portBottom.addBox(0F, 0F, 0F, 8, 1, 8); + portBottom.setRotationPoint(-4F, 23F, -4F); + portBottom.setTextureSize(128, 64); + portBottom.mirror = true; + setRotation(portBottom, 0F, 0F, 0F); + portLeft = new ModelRenderer(this, 0, 0); + portLeft.addBox(0F, 0F, 0F, 1, 8, 8); + portLeft.setRotationPoint(-8F, 12F, -4F); + portLeft.setTextureSize(128, 64); + portLeft.mirror = true; + setRotation(portLeft, 0F, 0F, 0F); + portRight = new ModelRenderer(this, 0, 0); + portRight.mirror = true; + portRight.addBox(0F, 0F, 0F, 1, 8, 8); + portRight.setRotationPoint(7F, 12F, -4F); + portRight.setTextureSize(128, 64); + setRotation(portRight, 0F, 0F, 0F); + portBack = new ModelRenderer(this, 18, 9); + portBack.addBox(0F, 0F, 0F, 8, 8, 1); + portBack.setRotationPoint(-4F, 12F, 7F); + portBack.setTextureSize(128, 64); + portBack.mirror = true; + setRotation(portBack, 0F, 0F, 0F); + portFront = new ModelRenderer(this, 18, 0); + portFront.addBox(0F, 0F, 0F, 8, 8, 1); + portFront.setRotationPoint(-4F, 12F, -8F); + portFront.setTextureSize(128, 64); + portFront.mirror = true; + setRotation(portFront, 0F, 0F, 0F); + energyCubeCore = new ModelRenderer(this, 0, 41); + energyCubeCore.addBox(-2F, -2F, -2F, 4, 4, 4); + energyCubeCore.setRotationPoint(0F, 16F, 0F); + energyCubeCore.setTextureSize(128, 64); + energyCubeCore.mirror = true; + setRotation(energyCubeCore, 0.7132579F, 0.403365F, 0.645384F); + frameEdge1 = new ModelRenderer(this, 0, 16); + frameEdge1.addBox(0F, 0F, 0F, 1, 10, 1); + frameEdge1.setRotationPoint(-7.5F, 11F, -7.5F); + frameEdge1.setTextureSize(128, 64); + frameEdge1.mirror = true; + setRotation(frameEdge1, 0F, 0F, 0F); + frameEdge2 = new ModelRenderer(this, 0, 16); + frameEdge2.addBox(0F, 0F, 0F, 1, 10, 1); + frameEdge2.setRotationPoint(6.5F, 11F, -7.5F); + frameEdge2.setTextureSize(128, 64); + frameEdge2.mirror = true; + setRotation(frameEdge2, 0F, 0F, 0F); + frameEdge3 = new ModelRenderer(this, 0, 16); + frameEdge3.addBox(0F, 0F, 0F, 1, 10, 1); + frameEdge3.setRotationPoint(-7.5F, 11F, 6.5F); + frameEdge3.setTextureSize(128, 64); + frameEdge3.mirror = true; + setRotation(frameEdge3, 0F, 0F, 0F); + frameEdge4 = new ModelRenderer(this, 0, 16); + frameEdge4.addBox(0F, 0F, 0F, 1, 10, 1); + frameEdge4.setRotationPoint(6.5F, 11F, 6.5F); + frameEdge4.setTextureSize(128, 64); + frameEdge4.mirror = true; + setRotation(frameEdge4, 0F, 0F, 0F); + frameEdge5 = new ModelRenderer(this, 4, 27); + frameEdge5.addBox(0F, 0F, 0F, 10, 1, 1); + frameEdge5.setRotationPoint(-5F, 22.5F, -7.5F); + frameEdge5.setTextureSize(128, 64); + frameEdge5.mirror = true; + setRotation(frameEdge5, 0F, 0F, 0F); + frameEdge6 = new ModelRenderer(this, 4, 16); + frameEdge6.addBox(0F, 0F, 0F, 1, 1, 10); + frameEdge6.setRotationPoint(-7.5F, 22.5F, -5F); + frameEdge6.setTextureSize(128, 64); + frameEdge6.mirror = true; + setRotation(frameEdge6, 0F, 0F, 0F); + frameEdge7 = new ModelRenderer(this, 4, 16); + frameEdge7.addBox(0F, 0F, 0F, 1, 1, 10); + frameEdge7.setRotationPoint(6.5F, 22.5F, -5F); + frameEdge7.setTextureSize(128, 64); + frameEdge7.mirror = true; + setRotation(frameEdge7, 0F, 0F, 0F); + frameEdge8 = new ModelRenderer(this, 4, 27); + frameEdge8.addBox(0F, 0F, 0F, 10, 1, 1); + frameEdge8.setRotationPoint(-5F, 22.5F, 6.5F); + frameEdge8.setTextureSize(128, 64); + frameEdge8.mirror = true; + setRotation(frameEdge8, 0F, 0F, 0F); + frameEdge9 = new ModelRenderer(this, 4, 27); + frameEdge9.addBox(0F, 0F, 0F, 10, 1, 1); + frameEdge9.setRotationPoint(-5F, 8.5F, -7.5F); + frameEdge9.setTextureSize(128, 64); + frameEdge9.mirror = true; + setRotation(frameEdge9, 0F, 0F, 0F); + frameEdge10 = new ModelRenderer(this, 4, 16); + frameEdge10.addBox(0F, 0F, 0F, 1, 1, 10); + frameEdge10.setRotationPoint(-7.5F, 8.5F, -5F); + frameEdge10.setTextureSize(128, 64); + frameEdge10.mirror = true; + setRotation(frameEdge10, 0F, 0F, 0F); + frameEdge11 = new ModelRenderer(this, 4, 16); + frameEdge11.addBox(0F, 0F, 0F, 1, 1, 10); + frameEdge11.setRotationPoint(6.5F, 8.5F, -5F); + frameEdge11.setTextureSize(128, 64); + frameEdge11.mirror = true; + setRotation(frameEdge11, 0F, 0F, 0F); + frameEdge12 = new ModelRenderer(this, 4, 27); + frameEdge12.addBox(0F, 0F, 0F, 10, 1, 1); + frameEdge12.setRotationPoint(-5F, 8.5F, 6.5F); + frameEdge12.setTextureSize(128, 64); + frameEdge12.mirror = true; + setRotation(frameEdge12, 0F, 0F, 0F); + frame1 = new ModelRenderer(this, 0, 29); + frame1.addBox(0F, 0F, 0F, 2, 10, 2); + frame1.setRotationPoint(-7F, 11F, -7F); + frame1.setTextureSize(128, 64); + frame1.mirror = true; + setRotation(frame1, 0F, 0F, 0F); + frame2 = new ModelRenderer(this, 0, 29); + frame2.mirror = true; + frame2.addBox(0F, 0F, 0F, 2, 10, 2); + frame2.setRotationPoint(5F, 11F, -7F); + frame2.setTextureSize(128, 64); + setRotation(frame2, 0F, 0F, 0F); + frame3 = new ModelRenderer(this, 8, 29); + frame3.addBox(0F, 0F, 0F, 2, 10, 2); + frame3.setRotationPoint(-7F, 11F, 5F); + frame3.setTextureSize(128, 64); + frame3.mirror = true; + setRotation(frame3, 0F, 0F, 0F); + frame4 = new ModelRenderer(this, 8, 29); + frame4.mirror = true; + frame4.addBox(0F, 0F, 0F, 2, 10, 2); + frame4.setRotationPoint(5F, 11F, 5F); + frame4.setTextureSize(128, 64); + setRotation(frame4, 0F, 0F, 0F); + frame5 = new ModelRenderer(this, 16, 45); + frame5.addBox(0F, 0F, 0F, 10, 2, 2); + frame5.setRotationPoint(-5F, 21F, -7F); + frame5.setTextureSize(128, 64); + frame5.mirror = true; + setRotation(frame5, 0F, 0F, 0F); + frame6 = new ModelRenderer(this, 40, 29); + frame6.addBox(0F, 0F, 0F, 2, 2, 10); + frame6.setRotationPoint(-7F, 21F, -5F); + frame6.setTextureSize(128, 64); + frame6.mirror = true; + setRotation(frame6, 0F, 0F, 0F); + frame7 = new ModelRenderer(this, 40, 29); + frame7.mirror = true; + frame7.addBox(0F, 0F, 0F, 2, 2, 10); + frame7.setRotationPoint(5F, 21F, -5F); + frame7.setTextureSize(128, 64); + setRotation(frame7, 0F, 0F, 0F); + frame8 = new ModelRenderer(this, 16, 49); + frame8.addBox(0F, 0F, 0F, 10, 2, 2); + frame8.setRotationPoint(-5F, 21F, 5F); + frame8.setTextureSize(128, 64); + frame8.mirror = true; + setRotation(frame8, 0F, 0F, 0F); + frame9 = new ModelRenderer(this, 16, 41); + frame9.addBox(0F, 0F, 0F, 10, 2, 2); + frame9.setRotationPoint(-5F, 9F, -7F); + frame9.setTextureSize(128, 64); + frame9.mirror = true; + setRotation(frame9, 0F, 0F, 0F); + frame10 = new ModelRenderer(this, 16, 29); + frame10.addBox(0F, 0F, 0F, 2, 2, 10); + frame10.setRotationPoint(-7F, 9F, -5F); + frame10.setTextureSize(128, 64); + frame10.mirror = true; + setRotation(frame10, 0F, 0F, 0F); + frame11 = new ModelRenderer(this, 16, 29); + frame11.mirror = true; + frame11.addBox(0F, 0F, 0F, 2, 2, 10); + frame11.setRotationPoint(5F, 9F, -5F); + frame11.setTextureSize(128, 64); + setRotation(frame11, 0F, 0F, 0F); + frame12 = new ModelRenderer(this, 16, 53); + frame12.addBox(0F, 0F, 0F, 10, 2, 2); + frame12.setRotationPoint(-5F, 9F, 5F); + frame12.setTextureSize(128, 64); + frame12.mirror = true; + setRotation(frame12, 0F, 0F, 0F); + corner1 = new ModelRenderer(this, 0, 49); + corner1.addBox(0F, 0F, 0F, 3, 3, 3); + corner1.setRotationPoint(-8F, 8F, -8F); + corner1.setTextureSize(128, 64); + corner1.mirror = true; + setRotation(corner1, 0F, 0F, 0F); + corner2 = new ModelRenderer(this, 0, 49); + corner2.addBox(0F, 0F, 0F, 3, 3, 3); + corner2.setRotationPoint(5F, 8F, -8F); + corner2.setTextureSize(128, 64); + corner2.mirror = true; + setRotation(corner2, 0F, 0F, 0F); + corner3 = new ModelRenderer(this, 0, 49); + corner3.addBox(0F, 0F, 0F, 3, 3, 3); + corner3.setRotationPoint(-8F, 8F, 5F); + corner3.setTextureSize(128, 64); + corner3.mirror = true; + setRotation(corner3, 0F, 0F, 0F); + corner4 = new ModelRenderer(this, 0, 49); + corner4.addBox(0F, 0F, 0F, 3, 3, 3); + corner4.setRotationPoint(5F, 8F, 5F); + corner4.setTextureSize(128, 64); + corner4.mirror = true; + setRotation(corner4, 0F, 0F, 0F); + corner5 = new ModelRenderer(this, 0, 49); + corner5.addBox(0F, 0F, 0F, 3, 3, 3); + corner5.setRotationPoint(-8F, 21F, -8F); + corner5.setTextureSize(128, 64); + corner5.mirror = true; + setRotation(corner5, 0F, 0F, 0F); + corner6 = new ModelRenderer(this, 0, 49); + corner6.addBox(0F, 0F, 0F, 3, 3, 3); + corner6.setRotationPoint(5F, 21F, -8F); + corner6.setTextureSize(128, 64); + corner6.mirror = true; + setRotation(corner6, 0F, 0F, 0F); + corner7 = new ModelRenderer(this, 0, 49); + corner7.addBox(0F, 0F, 0F, 3, 3, 3); + corner7.setRotationPoint(-8F, 21F, 5F); + corner7.setTextureSize(128, 64); + corner7.mirror = true; + setRotation(corner7, 0F, 0F, 0F); + corner8 = new ModelRenderer(this, 0, 49); + corner8.addBox(0F, 0F, 0F, 3, 3, 3); + corner8.setRotationPoint(5F, 21F, 5F); + corner8.setTextureSize(128, 64); + corner8.mirror = true; + setRotation(corner8, 0F, 0F, 0F); + portRightLarge = new ModelRenderer(this, 68, 0); + portRightLarge.mirror = true; + portRightLarge.addBox(0F, 0F, 0F, 1, 10, 10); + portRightLarge.setRotationPoint(7F, 11F, -5F); + portRightLarge.setTextureSize(128, 64); + setRotation(portRightLarge, 0F, 0F, 0F); + portLeftLarge = new ModelRenderer(this, 68, 0); + portLeftLarge.addBox(0F, 0F, 0F, 1, 10, 10); + portLeftLarge.setRotationPoint(-8F, 11F, -5F); + portLeftLarge.setTextureSize(128, 64); + portLeftLarge.mirror = true; + setRotation(portLeftLarge, 0F, 0F, 0F); + } + + public void render(float size, TextureManager manager) + { + doRender(size); + + GL11.glPushMatrix(); + manager.bindTexture(OVERLAY); + GL11.glScalef(1.001F, 1.001F, 1.001F); + GL11.glTranslatef(0, -0.0011F, 0); + MekanismRenderer.glowOn(); + + doRender(size); + + MekanismRenderer.glowOff(); + GL11.glPopMatrix(); + } + + public void doRender(float size) + { + portTop.render(size); + portBottom.render(size); + portLeft.render(size); + portRight.render(size); + portBack.render(size); + portFront.render(size); + energyCubeCore.render(size); + frameEdge1.render(size); + frameEdge2.render(size); + frameEdge3.render(size); + frameEdge4.render(size); + frameEdge5.render(size); + frameEdge6.render(size); + frameEdge7.render(size); + frameEdge8.render(size); + frameEdge9.render(size); + frameEdge10.render(size); + frameEdge11.render(size); + frameEdge12.render(size); + frame1.render(size); + frame2.render(size); + frame3.render(size); + frame4.render(size); + frame5.render(size); + frame6.render(size); + frame7.render(size); + frame8.render(size); + frame9.render(size); + frame10.render(size); + frame11.render(size); + frame12.render(size); + corner1.render(size); + corner2.render(size); + corner3.render(size); + corner4.render(size); + corner5.render(size); + corner6.render(size); + corner7.render(size); + corner8.render(size); + //portRightLarge.render(size); + //portLeftLarge.render(size); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) + { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } +} diff --git a/src/main/java/mekanism/client/model/ModelResistiveHeater.java b/src/main/java/mekanism/client/model/ModelResistiveHeater.java new file mode 100644 index 000000000..d21e83eb5 --- /dev/null +++ b/src/main/java/mekanism/client/model/ModelResistiveHeater.java @@ -0,0 +1,215 @@ +package mekanism.client.model; + +import org.lwjgl.opengl.GL11; + +import mekanism.client.render.MekanismRenderer; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class ModelResistiveHeater extends ModelBase +{ + public static ResourceLocation OVERLAY_ON = MekanismUtils.getResource(ResourceType.RENDER, "ResistiveHeater_OverlayOn.png"); + public static ResourceLocation OVERLAY_OFF = MekanismUtils.getResource(ResourceType.RENDER, "ResistiveHeater_OverlayOff.png"); + + ModelRenderer wallLeft; + ModelRenderer base; + ModelRenderer fin10; + ModelRenderer portRight; + ModelRenderer fin9; + ModelRenderer fin2; + ModelRenderer bar2; + ModelRenderer fin4; + ModelRenderer fin3; + ModelRenderer fin6; + ModelRenderer center; + ModelRenderer fin8; + ModelRenderer fin7; + ModelRenderer fin5; + ModelRenderer fin1; + ModelRenderer bar1; + ModelRenderer bar4; + ModelRenderer bar3; + ModelRenderer wallRight; + ModelRenderer portLeft; + + public ModelResistiveHeater() + { + textureWidth = 128; + textureHeight = 64; + + wallLeft = new ModelRenderer(this, 0, 23); + wallLeft.mirror = true; + wallLeft.addBox(0F, 0F, 0F, 3, 9, 16); + wallLeft.setRotationPoint(5F, 8F, -8F); + wallLeft.setTextureSize(128, 64); + setRotation(wallLeft, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 7, 16); + base.setRotationPoint(-8F, 17F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + fin10 = new ModelRenderer(this, 38, 38); + fin10.mirror = true; + fin10.addBox(0F, 0F, 0F, 10, 9, 1); + fin10.setRotationPoint(-5F, 8.5F, 6.5F); + fin10.setTextureSize(128, 64); + setRotation(fin10, 0F, 0F, 0F); + portRight = new ModelRenderer(this, 48, 0); + portRight.addBox(0F, 0F, 0F, 1, 8, 8); + portRight.setRotationPoint(-8.01F, 12F, -4F); + portRight.setTextureSize(128, 64); + portRight.mirror = true; + setRotation(portRight, 0F, 0F, 0F); + fin9 = new ModelRenderer(this, 0, 48); + fin9.mirror = true; + fin9.addBox(0F, 0F, 0F, 10, 9, 1); + fin9.setRotationPoint(-5F, 8.5F, 5F); + fin9.setTextureSize(128, 64); + setRotation(fin9, 0F, 0F, 0F); + fin2 = new ModelRenderer(this, 0, 48); + fin2.addBox(0F, 0F, 0F, 10, 9, 1); + fin2.setRotationPoint(-5F, 8.5F, -6F); + fin2.setTextureSize(128, 64); + fin2.mirror = true; + setRotation(fin2, 0F, 0F, 0F); + bar2 = new ModelRenderer(this, 36, 23); + bar2.addBox(0F, 0F, 0F, 1, 1, 13); + bar2.setRotationPoint(-2F, 9.5F, -6.5F); + bar2.setTextureSize(128, 64); + bar2.mirror = true; + setRotation(bar2, 0F, 0F, 0F); + fin4 = new ModelRenderer(this, 0, 48); + fin4.addBox(0F, 0F, 0F, 10, 9, 1); + fin4.setRotationPoint(-5F, 8.5F, -3F); + fin4.setTextureSize(128, 64); + fin4.mirror = true; + setRotation(fin4, 0F, 0F, 0F); + fin3 = new ModelRenderer(this, 0, 48); + fin3.mirror = true; + fin3.addBox(0F, 0F, 0F, 10, 9, 1); + fin3.setRotationPoint(-5F, 8.5F, -4.5F); + fin3.setTextureSize(128, 64); + setRotation(fin3, 0F, 0F, 0F); + fin6 = new ModelRenderer(this, 0, 48); + fin6.addBox(0F, 0F, 0F, 10, 9, 1); + fin6.setRotationPoint(-5F, 8.5F, 0.5F); + fin6.setTextureSize(128, 64); + fin6.mirror = true; + setRotation(fin6, 0F, 0F, 0F); + center = new ModelRenderer(this, 0, 0); + center.addBox(0F, 0F, 0F, 6, 6, 1); + center.setRotationPoint(-3F, 11.5F, -0.5F); + center.setTextureSize(128, 64); + center.mirror = true; + setRotation(center, 0F, 0F, 0F); + fin8 = new ModelRenderer(this, 0, 48); + fin8.addBox(0F, 0F, 0F, 10, 9, 1); + fin8.setRotationPoint(-5F, 8.5F, 3.5F); + fin8.setTextureSize(128, 64); + fin8.mirror = true; + setRotation(fin8, 0F, 0F, 0F); + fin7 = new ModelRenderer(this, 0, 48); + fin7.mirror = true; + fin7.addBox(0F, 0F, 0F, 10, 9, 1); + fin7.setRotationPoint(-5F, 8.5F, 2F); + fin7.setTextureSize(128, 64); + setRotation(fin7, 0F, 0F, 0F); + fin5 = new ModelRenderer(this, 0, 48); + fin5.mirror = true; + fin5.addBox(0F, 0F, 0F, 10, 9, 1); + fin5.setRotationPoint(-5F, 8.5F, -1.5F); + fin5.setTextureSize(128, 64); + setRotation(fin5, 0F, 0F, 0F); + fin1 = new ModelRenderer(this, 22, 48); + fin1.addBox(0F, 0F, 0F, 10, 9, 1); + fin1.setRotationPoint(-5F, 8.5F, -7.5F); + fin1.setTextureSize(128, 64); + fin1.mirror = true; + setRotation(fin1, 0F, 0F, 0F); + bar1 = new ModelRenderer(this, 36, 23); + bar1.addBox(0F, 0F, 0F, 1, 1, 13); + bar1.setRotationPoint(-4F, 9.5F, -6.5F); + bar1.setTextureSize(128, 64); + bar1.mirror = true; + setRotation(bar1, 0F, 0F, 0F); + bar4 = new ModelRenderer(this, 36, 23); + bar4.addBox(0F, 0F, 0F, 1, 1, 13); + bar4.setRotationPoint(3F, 9.5F, -6.5F); + bar4.setTextureSize(128, 64); + bar4.mirror = true; + setRotation(bar4, 0F, 0F, 0F); + bar3 = new ModelRenderer(this, 36, 23); + bar3.addBox(0F, 0F, 0F, 1, 1, 13); + bar3.setRotationPoint(1F, 9.5F, -6.5F); + bar3.setTextureSize(128, 64); + bar3.mirror = true; + setRotation(bar3, 0F, 0F, 0F); + wallRight = new ModelRenderer(this, 0, 23); + wallRight.addBox(0F, 0F, 0F, 3, 9, 16); + wallRight.setRotationPoint(-8F, 8F, -8F); + wallRight.setTextureSize(128, 64); + wallRight.mirror = true; + setRotation(wallRight, 0F, 0F, 0F); + portLeft = new ModelRenderer(this, 48, 0); + portLeft.addBox(0F, 0F, 0F, 1, 8, 8); + portLeft.setRotationPoint(7.01F, 12F, -4F); + portLeft.setTextureSize(128, 64); + portLeft.mirror = true; + setRotation(portLeft, 0F, 0F, 0F); + } + + public void render(float size, boolean on, TextureManager manager) + { + doRender(size); + + GL11.glPushMatrix(); + manager.bindTexture(on ? OVERLAY_ON : OVERLAY_OFF); + GL11.glScalef(1.001F, 1.001F, 1.001F); + GL11.glTranslatef(0, -0.0011F, 0); + MekanismRenderer.glowOn(); + + doRender(size); + + MekanismRenderer.glowOff(); + GL11.glPopMatrix(); + } + + private void doRender(float size) + { + wallLeft.render(size); + base.render(size); + fin10.render(size); + portRight.render(size); + fin9.render(size); + fin2.render(size); + bar2.render(size); + fin4.render(size); + fin3.render(size); + fin6.render(size); + center.render(size); + fin8.render(size); + fin7.render(size); + fin5.render(size); + fin1.render(size); + bar1.render(size); + bar4.render(size); + bar3.render(size); + wallRight.render(size); + portLeft.render(size); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) + { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } +} diff --git a/src/main/java/mekanism/client/model/ModelRotaryCondensentrator.java b/src/main/java/mekanism/client/model/ModelRotaryCondensentrator.java index 5aae78256..e5d07a07d 100644 --- a/src/main/java/mekanism/client/model/ModelRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/model/ModelRotaryCondensentrator.java @@ -8,216 +8,192 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelRotaryCondensentrator extends ModelBase { - ModelRenderer GasBottleLid1; - ModelRenderer GasBottleLid2; - ModelRenderer GasBottleDecor1; - ModelRenderer GasBottleDecor2; - ModelRenderer GasBottleDecor3; - ModelRenderer GasBottleDecor4; - ModelRenderer GasBottle1; - ModelRenderer GasBottle2; - ModelRenderer GasBottleBot1; - ModelRenderer GasBottleBot2; - ModelRenderer LiqBottleLid1; - ModelRenderer LiqBottleLid2; - ModelRenderer LiqBottleBot1; - ModelRenderer LiqBottleBot2; - ModelRenderer LiqBottle2; - ModelRenderer LiqBottle1; - ModelRenderer LiqBottleDecor1; - ModelRenderer LiqBottleDecor2; - ModelRenderer LiqBottleDecor3; - ModelRenderer LiqBottleDecor4; - ModelRenderer GasInput; - ModelRenderer MidSection1; - ModelRenderer MidSection2; - ModelRenderer LiquidOutput; - ModelRenderer MidSection3; + ModelRenderer portRight; + ModelRenderer tankRight; + ModelRenderer base; + ModelRenderer pipe; + ModelRenderer middle; + ModelRenderer shaft; + ModelRenderer portLeft; + ModelRenderer tankLeft; + ModelRenderer support4; + ModelRenderer bridge; + ModelRenderer tube8; + ModelRenderer tube7; + ModelRenderer tube6; + ModelRenderer tube5; + ModelRenderer tube4; + ModelRenderer tube3; + ModelRenderer tube2; + ModelRenderer tube1; + ModelRenderer top; + ModelRenderer support3; + ModelRenderer support2; + ModelRenderer support1; - public ModelRotaryCondensentrator() + public ModelRotaryCondensentrator() { textureWidth = 128; - textureHeight = 128; + textureHeight = 64; - GasBottleLid1 = new ModelRenderer(this, 0, 40); - GasBottleLid1.addBox(0F, 0F, 0F, 6, 1, 6); - GasBottleLid1.setRotationPoint(-7F, 11F, 1F); - GasBottleLid1.setTextureSize(128, 128); - GasBottleLid1.mirror = true; - setRotation(GasBottleLid1, 0F, 0F, 0F); - GasBottleLid2 = new ModelRenderer(this, 0, 40); - GasBottleLid2.addBox(0F, 0F, 0F, 6, 1, 6); - GasBottleLid2.setRotationPoint(1F, 11F, 1F); - GasBottleLid2.setTextureSize(128, 128); - GasBottleLid2.mirror = true; - setRotation(GasBottleLid2, 0F, 0F, 0F); - GasBottleDecor1 = new ModelRenderer(this, 0, 33); - GasBottleDecor1.addBox(0F, 0F, 0F, 5, 1, 5); - GasBottleDecor1.setRotationPoint(1.5F, 21F, 1.5F); - GasBottleDecor1.setTextureSize(128, 128); - GasBottleDecor1.mirror = true; - setRotation(GasBottleDecor1, 0F, 0F, 0F); - GasBottleDecor2 = new ModelRenderer(this, 0, 33); - GasBottleDecor2.addBox(0F, 0F, 0F, 5, 1, 5); - GasBottleDecor2.setRotationPoint(1.5F, 13F, 1.5F); - GasBottleDecor2.setTextureSize(128, 128); - GasBottleDecor2.mirror = true; - setRotation(GasBottleDecor2, 0F, 0F, 0F); - GasBottleDecor3 = new ModelRenderer(this, 0, 33); - GasBottleDecor3.addBox(0F, 0F, 0F, 5, 1, 5); - GasBottleDecor3.setRotationPoint(-6.5F, 21F, 1.5F); - GasBottleDecor3.setTextureSize(128, 128); - GasBottleDecor3.mirror = true; - setRotation(GasBottleDecor3, 0F, 0F, 0F); - GasBottleDecor4 = new ModelRenderer(this, 0, 33); - GasBottleDecor4.addBox(0F, 0F, 0F, 5, 1, 5); - GasBottleDecor4.setRotationPoint(-6.5F, 13F, 1.5F); - GasBottleDecor4.setTextureSize(128, 128); - GasBottleDecor4.mirror = true; - setRotation(GasBottleDecor4, 0F, 0F, 0F); - GasBottle1 = new ModelRenderer(this, 0, 48); - GasBottle1.addBox(0F, 0F, 0F, 4, 11, 4); - GasBottle1.setRotationPoint(-6F, 12F, 2F); - GasBottle1.setTextureSize(128, 128); - GasBottle1.mirror = true; - setRotation(GasBottle1, 0F, 0F, 0F); - GasBottle2 = new ModelRenderer(this, 0, 48); - GasBottle2.addBox(0F, 0F, 0F, 4, 11, 4); - GasBottle2.setRotationPoint(2F, 12F, 2F); - GasBottle2.setTextureSize(128, 128); - GasBottle2.mirror = true; - setRotation(GasBottle2, 0F, 0F, 0F); - GasBottleBot1 = new ModelRenderer(this, 0, 40); - GasBottleBot1.addBox(0F, 0F, 0F, 6, 1, 6); - GasBottleBot1.setRotationPoint(-7F, 23F, 1F); - GasBottleBot1.setTextureSize(128, 128); - GasBottleBot1.mirror = true; - setRotation(GasBottleBot1, 0F, 0F, 0F); - GasBottleBot2 = new ModelRenderer(this, 0, 40); - GasBottleBot2.addBox(0F, 0F, 0F, 6, 1, 6); - GasBottleBot2.setRotationPoint(1F, 23F, 1F); - GasBottleBot2.setTextureSize(128, 128); - GasBottleBot2.mirror = true; - setRotation(GasBottleBot2, 0F, 0F, 0F); - LiqBottleLid1 = new ModelRenderer(this, 25, 40); - LiqBottleLid1.addBox(0F, 0F, 0F, 6, 1, 6); - LiqBottleLid1.setRotationPoint(-7F, 11F, -7F); - LiqBottleLid1.setTextureSize(128, 128); - LiqBottleLid1.mirror = true; - setRotation(LiqBottleLid1, 0F, 0F, 0F); - LiqBottleLid2 = new ModelRenderer(this, 25, 40); - LiqBottleLid2.addBox(0F, 0F, 0F, 6, 1, 6); - LiqBottleLid2.setRotationPoint(1F, 11F, -7F); - LiqBottleLid2.setTextureSize(128, 128); - LiqBottleLid2.mirror = true; - setRotation(LiqBottleLid2, 0F, 0F, 0F); - LiqBottleBot1 = new ModelRenderer(this, 25, 40); - LiqBottleBot1.addBox(0F, 0F, 0F, 6, 1, 6); - LiqBottleBot1.setRotationPoint(-7F, 23F, -7F); - LiqBottleBot1.setTextureSize(128, 128); - LiqBottleBot1.mirror = true; - setRotation(LiqBottleBot1, 0F, 0F, 0F); - LiqBottleBot2 = new ModelRenderer(this, 25, 40); - LiqBottleBot2.addBox(0F, 0F, 0F, 6, 1, 6); - LiqBottleBot2.setRotationPoint(1F, 23F, -7F); - LiqBottleBot2.setTextureSize(128, 128); - LiqBottleBot2.mirror = true; - setRotation(LiqBottleBot2, 0F, 0F, 0F); - LiqBottle2 = new ModelRenderer(this, 25, 48); - LiqBottle2.addBox(0F, 0F, 0F, 4, 11, 4); - LiqBottle2.setRotationPoint(2F, 12F, -6F); - LiqBottle2.setTextureSize(128, 128); - LiqBottle2.mirror = true; - setRotation(LiqBottle2, 0F, 0F, 0F); - LiqBottle1 = new ModelRenderer(this, 25, 48); - LiqBottle1.addBox(0F, 0F, 0F, 4, 11, 4); - LiqBottle1.setRotationPoint(-6F, 12F, -6F); - LiqBottle1.setTextureSize(128, 128); - LiqBottle1.mirror = true; - setRotation(LiqBottle1, 0F, 0F, 0F); - LiqBottleDecor1 = new ModelRenderer(this, 25, 33); - LiqBottleDecor1.addBox(0F, 0F, 0F, 5, 1, 5); - LiqBottleDecor1.setRotationPoint(1.5F, 21F, -6.5F); - LiqBottleDecor1.setTextureSize(128, 128); - LiqBottleDecor1.mirror = true; - setRotation(LiqBottleDecor1, 0F, 0F, 0F); - LiqBottleDecor2 = new ModelRenderer(this, 25, 33); - LiqBottleDecor2.addBox(0F, 0F, 0F, 5, 1, 5); - LiqBottleDecor2.setRotationPoint(1.5F, 13F, -6.5F); - LiqBottleDecor2.setTextureSize(128, 128); - LiqBottleDecor2.mirror = true; - setRotation(LiqBottleDecor2, 0F, 0F, 0F); - LiqBottleDecor3 = new ModelRenderer(this, 25, 33); - LiqBottleDecor3.addBox(0F, 0F, 0F, 5, 1, 5); - LiqBottleDecor3.setRotationPoint(-6.5F, 21F, -6.5F); - LiqBottleDecor3.setTextureSize(128, 128); - LiqBottleDecor3.mirror = true; - setRotation(LiqBottleDecor3, 0F, 0F, 0F); - LiqBottleDecor4 = new ModelRenderer(this, 25, 33); - LiqBottleDecor4.addBox(0F, 0F, 0F, 5, 1, 5); - LiqBottleDecor4.setRotationPoint(-6.5F, 13F, -6.5F); - LiqBottleDecor4.setTextureSize(128, 128); - LiqBottleDecor4.mirror = true; - setRotation(LiqBottleDecor4, 0F, 0F, 0F); - GasInput = new ModelRenderer(this, 0, 24); - GasInput.addBox(0F, 0F, 0F, 6, 6, 1); - GasInput.setRotationPoint(-3F, 13F, 7F); - GasInput.setTextureSize(128, 128); - GasInput.mirror = true; - setRotation(GasInput, 0F, 0F, 0F); - MidSection1 = new ModelRenderer(this, 15, 20); - MidSection1.addBox(0F, 0F, 0F, 4, 5, 6); - MidSection1.setRotationPoint(-2F, 18F, 1F); - MidSection1.setTextureSize(128, 128); - MidSection1.mirror = true; - setRotation(MidSection1, 0F, 0F, 0F); - MidSection2 = new ModelRenderer(this, 37, 0); - MidSection2.addBox(0F, 0F, 0F, 6, 7, 8); - MidSection2.setRotationPoint(-3F, 17F, -7F); - MidSection2.setTextureSize(128, 128); - MidSection2.mirror = true; - setRotation(MidSection2, 0F, 0F, 0F); - LiquidOutput = new ModelRenderer(this, 36, 22); - LiquidOutput.addBox(0F, 0F, 0F, 8, 8, 1); - LiquidOutput.setRotationPoint(-4F, 12F, -8F); - LiquidOutput.setTextureSize(128, 128); - LiquidOutput.mirror = true; - setRotation(LiquidOutput, 0F, 0F, 0F); - MidSection3 = new ModelRenderer(this, 0, 0); - MidSection3.addBox(0F, 0F, 0F, 4, 2, 14); - MidSection3.setRotationPoint(-2F, 15F, -7F); - MidSection3.setTextureSize(128, 128); - MidSection3.mirror = true; - setRotation(MidSection3, 0F, 0F, 0F); + portRight = new ModelRenderer(this, 82, 31); + portRight.addBox(0F, 0F, 0F, 1, 10, 10); + portRight.setRotationPoint(7.01F, 11F, -5F); + portRight.setTextureSize(128, 64); + portRight.mirror = true; + setRotation(portRight, 0F, 0F, 0F); + tankRight = new ModelRenderer(this, 64, 9); + tankRight.mirror = true; + tankRight.addBox(0F, 0F, 0F, 6, 8, 14); + tankRight.setRotationPoint(1F, 11F, -7F); + tankRight.setTextureSize(128, 64); + setRotation(tankRight, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 34); + base.addBox(0F, 0F, 0F, 16, 5, 16); + base.setRotationPoint(-8F, 19F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + pipe = new ModelRenderer(this, 0, 4); + pipe.addBox(0F, 0F, 0F, 2, 6, 6); + pipe.setRotationPoint(-1.01F, 13F, -3F); + pipe.setTextureSize(128, 64); + pipe.mirror = true; + setRotation(pipe, 0F, 0F, 0F); + middle = new ModelRenderer(this, 0, 17); + middle.addBox(0F, 0F, 0F, 16, 1, 16); + middle.setRotationPoint(-8F, 10F, -8F); + middle.setTextureSize(128, 64); + middle.mirror = true; + setRotation(middle, 0F, 0F, 0F); + shaft = new ModelRenderer(this, 12, 0); + shaft.addBox(0F, 0F, 0F, 1, 2, 1); + shaft.setRotationPoint(-0.5F, 11F, -0.5F); + shaft.setTextureSize(128, 64); + shaft.mirror = true; + setRotation(shaft, 0F, 0F, 0F); + portLeft = new ModelRenderer(this, 64, 31); + portLeft.addBox(0F, 0F, 0F, 1, 8, 8); + portLeft.setRotationPoint(-8.01F, 12F, -4F); + portLeft.setTextureSize(128, 64); + portLeft.mirror = true; + setRotation(portLeft, 0F, 0F, 0F); + tankLeft = new ModelRenderer(this, 64, 9); + tankLeft.addBox(0F, 0F, 0F, 6, 8, 14); + tankLeft.setRotationPoint(-7F, 11F, -7F); + tankLeft.setTextureSize(128, 64); + tankLeft.mirror = true; + setRotation(tankLeft, 0F, 0F, 0F); + support4 = new ModelRenderer(this, 7, 0); + support4.addBox(0F, 0F, 0F, 1, 1, 1); + support4.setRotationPoint(6F, 9F, 6F); + support4.setTextureSize(128, 64); + support4.mirror = true; + setRotation(support4, 0F, 0F, 0F); + bridge = new ModelRenderer(this, 64, 0); + bridge.addBox(0F, 0F, 0F, 8, 1, 8); + bridge.setRotationPoint(-4F, 9F, -4F); + bridge.setTextureSize(128, 64); + bridge.mirror = true; + setRotation(bridge, 0F, 0F, 0F); + tube8 = new ModelRenderer(this, 0, 0); + tube8.addBox(0F, 0F, 0F, 2, 1, 1); + tube8.setRotationPoint(-1F, 18F, 5F); + tube8.setTextureSize(128, 64); + tube8.mirror = true; + setRotation(tube8, 0F, 0F, 0F); + tube7 = new ModelRenderer(this, 0, 0); + tube7.addBox(0F, 0F, 0F, 2, 1, 1); + tube7.setRotationPoint(-1F, 12F, 5F); + tube7.setTextureSize(128, 64); + tube7.mirror = true; + setRotation(tube7, 0F, 0F, 0F); + tube6 = new ModelRenderer(this, 0, 0); + tube6.addBox(0F, 0F, 0F, 2, 1, 1); + tube6.setRotationPoint(-1F, 14F, 5F); + tube6.setTextureSize(128, 64); + tube6.mirror = true; + setRotation(tube6, 0F, 0F, 0F); + tube5 = new ModelRenderer(this, 0, 0); + tube5.addBox(0F, 0F, 0F, 2, 1, 1); + tube5.setRotationPoint(-1F, 16F, 5F); + tube5.setTextureSize(128, 64); + tube5.mirror = true; + setRotation(tube5, 0F, 0F, 0F); + tube4 = new ModelRenderer(this, 0, 0); + tube4.addBox(0F, 0F, 0F, 2, 1, 1); + tube4.setRotationPoint(-1F, 18F, -6F); + tube4.setTextureSize(128, 64); + tube4.mirror = true; + setRotation(tube4, 0F, 0F, 0F); + tube3 = new ModelRenderer(this, 0, 0); + tube3.addBox(0F, 0F, 0F, 2, 1, 1); + tube3.setRotationPoint(-1F, 16F, -6F); + tube3.setTextureSize(128, 64); + tube3.mirror = true; + setRotation(tube3, 0F, 0F, 0F); + tube2 = new ModelRenderer(this, 0, 0); + tube2.addBox(0F, 0F, 0F, 2, 1, 1); + tube2.setRotationPoint(-1F, 14F, -6F); + tube2.setTextureSize(128, 64); + tube2.mirror = true; + setRotation(tube2, 0F, 0F, 0F); + tube1 = new ModelRenderer(this, 0, 0); + tube1.addBox(0F, 0F, 0F, 2, 1, 1); + tube1.setRotationPoint(-1F, 12F, -6F); + tube1.setTextureSize(128, 64); + tube1.mirror = true; + setRotation(tube1, 0F, 0F, 0F); + top = new ModelRenderer(this, 0, 0); + top.addBox(0F, 0F, 0F, 16, 1, 16); + top.setRotationPoint(-8F, 8F, -8F); + top.setTextureSize(128, 64); + top.mirror = true; + setRotation(top, 0F, 0F, 0F); + support3 = new ModelRenderer(this, 7, 0); + support3.addBox(0F, 0F, 0F, 1, 1, 1); + support3.setRotationPoint(6F, 9F, -7F); + support3.setTextureSize(128, 64); + support3.mirror = true; + setRotation(support3, 0F, 0F, 0F); + support2 = new ModelRenderer(this, 7, 0); + support2.addBox(0F, 0F, 0F, 1, 1, 1); + support2.setRotationPoint(-7F, 9F, -7F); + support2.setTextureSize(128, 64); + support2.mirror = true; + setRotation(support2, 0F, 0F, 0F); + support1 = new ModelRenderer(this, 7, 0); + support1.addBox(0F, 0F, 0F, 1, 1, 1); + support1.setRotationPoint(-7F, 9F, 6F); + support1.setTextureSize(128, 64); + support1.mirror = true; + setRotation(support1, 0F, 0F, 0F); } public void render(float size) { - GasBottleLid1.render(size); - GasBottleLid2.render(size); - GasBottleDecor1.render(size); - GasBottleDecor2.render(size); - GasBottleDecor3.render(size); - GasBottleDecor4.render(size); - GasBottle1.render(size); - GasBottle2.render(size); - GasBottleBot1.render(size); - GasBottleBot2.render(size); - LiqBottleLid1.render(size); - LiqBottleLid2.render(size); - LiqBottleBot1.render(size); - LiqBottleBot2.render(size); - LiqBottle2.render(size); - LiqBottle1.render(size); - LiqBottleDecor1.render(size); - LiqBottleDecor2.render(size); - LiqBottleDecor3.render(size); - LiqBottleDecor4.render(size); - GasInput.render(size); - MidSection1.render(size); - MidSection2.render(size); - LiquidOutput.render(size); - MidSection3.render(size); + portRight.render(size); + tankRight.render(size); + base.render(size); + pipe.render(size); + middle.render(size); + shaft.render(size); + portLeft.render(size); + tankLeft.render(size); + support4.render(size); + bridge.render(size); + tube8.render(size); + tube7.render(size); + tube6.render(size); + tube5.render(size); + tube4.render(size); + tube3.render(size); + tube2.render(size); + tube1.render(size); + top.render(size); + support3.render(size); + support2.render(size); + support1.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelSecurityDesk.java b/src/main/java/mekanism/client/model/ModelSecurityDesk.java new file mode 100644 index 000000000..26fa88682 --- /dev/null +++ b/src/main/java/mekanism/client/model/ModelSecurityDesk.java @@ -0,0 +1,134 @@ +package mekanism.client.model; + +import org.lwjgl.opengl.GL11; + +import mekanism.client.render.MekanismRenderer; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class ModelSecurityDesk extends ModelBase +{ + public static ResourceLocation OVERLAY = MekanismUtils.getResource(ResourceType.RENDER, "SecurityDesk_Overlay.png"); + + ModelRenderer deskTop; + ModelRenderer deskBase; + ModelRenderer led; + ModelRenderer monitorBack; + ModelRenderer keyboard; + ModelRenderer monitor; + ModelRenderer standNeck; + ModelRenderer standBase; + ModelRenderer deskMiddle; + ModelRenderer monitorScreen; + + public ModelSecurityDesk() + { + textureWidth = 128; + textureHeight = 64; + + deskTop = new ModelRenderer(this, 0, 0); + deskTop.addBox(0F, 0F, 0F, 16, 7, 16); + deskTop.setRotationPoint(-8F, 11F, -8F); + deskTop.setTextureSize(128, 64); + deskTop.mirror = true; + setRotation(deskTop, 0F, 0F, 0F); + deskBase = new ModelRenderer(this, 0, 38); + deskBase.addBox(0F, 0F, 0F, 16, 5, 16); + deskBase.setRotationPoint(-8F, 19F, -8F); + deskBase.setTextureSize(128, 64); + deskBase.mirror = true; + setRotation(deskBase, 0F, 0F, 0F); + led = new ModelRenderer(this, 0, 0); + led.addBox(12F, 4.5F, -1.5F, 1, 1, 1); + led.setRotationPoint(-7F, 5F, 4F); + led.setTextureSize(128, 64); + led.mirror = true; + setRotation(led, -0.4712389F, 0F, 0F); + monitorBack = new ModelRenderer(this, 82, 0); + monitorBack.addBox(1F, -3F, 0F, 12, 6, 1); + monitorBack.setRotationPoint(-7F, 5F, 4F); + monitorBack.setTextureSize(128, 64); + monitorBack.mirror = true; + setRotation(monitorBack, -0.4712389F, 0F, 0F); + keyboard = new ModelRenderer(this, 64, 27); + keyboard.addBox(0F, 0F, 0F, 10, 1, 5); + keyboard.setRotationPoint(-5F, 10.5F, -6F); + keyboard.setTextureSize(128, 64); + keyboard.mirror = true; + setRotation(keyboard, 0.0872665F, 0F, 0F); + monitor = new ModelRenderer(this, 64, 10); + monitor.addBox(0F, -5F, -2F, 14, 10, 2); + monitor.setRotationPoint(-7F, 5F, 4F); + monitor.setTextureSize(128, 64); + monitor.mirror = true; + setRotation(monitor, -0.4712389F, 0F, 0F); + standNeck = new ModelRenderer(this, 96, 7); + standNeck.addBox(0F, -7F, -1F, 2, 7, 1); + standNeck.setRotationPoint(-1F, 10F, 6F); + standNeck.setTextureSize(128, 64); + standNeck.mirror = true; + setRotation(standNeck, 0.0698132F, 0F, 0F); + standBase = new ModelRenderer(this, 64, 22); + standBase.addBox(0F, 0F, -4F, 8, 1, 4); + standBase.setRotationPoint(-4F, 10F, 6F); + standBase.setTextureSize(128, 64); + standBase.mirror = true; + setRotation(standBase, 0.1047198F, 0F, 0F); + deskMiddle = new ModelRenderer(this, 0, 23); + deskMiddle.addBox(0F, 0F, 0F, 14, 1, 14); + deskMiddle.setRotationPoint(-7F, 18F, -7F); + deskMiddle.setTextureSize(128, 64); + deskMiddle.mirror = true; + setRotation(deskMiddle, 0F, 0F, 0F); + monitorScreen = new ModelRenderer(this, 64, 33); + monitorScreen.addBox(0.5F, -4.5F, -2.01F, 13, 9, 2); + monitorScreen.setRotationPoint(-7F, 5F, 4F); + monitorScreen.setTextureSize(128, 64); + monitorScreen.mirror = true; + setRotation(monitorScreen, -0.4712389F, 0F, 0F); + } + + public void render(float size, TextureManager manager) + { + doRender(size); + + GL11.glPushMatrix(); + manager.bindTexture(OVERLAY); + GL11.glScalef(1.001F, 1.001F, 1.001F); + GL11.glTranslatef(0, -0.0011F, 0); + MekanismRenderer.glowOn(); + + doRender(size); + + MekanismRenderer.glowOff(); + GL11.glPopMatrix(); + } + + private void doRender(float size) + { + deskTop.render(size); + deskBase.render(size); + led.render(size); + monitorBack.render(size); + keyboard.render(size); + monitor.render(size); + standNeck.render(size); + standBase.render(size); + deskMiddle.render(size); + monitorScreen.render(size); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) + { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } +} diff --git a/src/main/java/mekanism/client/model/ModelSeismicVibrator.java b/src/main/java/mekanism/client/model/ModelSeismicVibrator.java index d759c00f4..b6441c650 100644 --- a/src/main/java/mekanism/client/model/ModelSeismicVibrator.java +++ b/src/main/java/mekanism/client/model/ModelSeismicVibrator.java @@ -2,144 +2,390 @@ package mekanism.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelSeismicVibrator extends ModelBase { - ModelRenderer Base; - ModelRenderer Tower; - ModelRenderer TowerTop; - ModelRenderer TopPanel; - ModelRenderer Vibrator; - ModelRenderer PoleBR; - ModelRenderer PoleLB; - ModelRenderer PoleFL; - ModelRenderer PoleRF; - ModelRenderer PoleL; - ModelRenderer PoleR; - ModelRenderer Cable; - ModelRenderer ScreenFront; - ModelRenderer Keyboard; + ModelRenderer plate3; + ModelRenderer baseBack; + ModelRenderer motor; + ModelRenderer port; + ModelRenderer pole4; + ModelRenderer shaft2; + ModelRenderer shaft1; + ModelRenderer arm3; + ModelRenderer plate2; + ModelRenderer arm2; + ModelRenderer arm1; + ModelRenderer top; + ModelRenderer frameBack5; + ModelRenderer pole3; + ModelRenderer frameRight5; + ModelRenderer baseRight; + ModelRenderer baseFront; + ModelRenderer baseLeft; + ModelRenderer frameRight3; + ModelRenderer pole1; + ModelRenderer frameRight4; + ModelRenderer frameRight1; + ModelRenderer frameRight2; + ModelRenderer frameLeft5; + ModelRenderer frameLeft4; + ModelRenderer frameBack3; + ModelRenderer frameLeft2; + ModelRenderer frameLeft1; + ModelRenderer pole2; + ModelRenderer frameBack1; + ModelRenderer frameBack2; + ModelRenderer frameBack4; + ModelRenderer frameLeft3; + ModelRenderer conduit; + ModelRenderer plate1; + ModelRenderer rivet10; + ModelRenderer rivet5; + ModelRenderer rivet1; + ModelRenderer rivet6; + ModelRenderer rivet2; + ModelRenderer rivet7; + ModelRenderer rivet3; + ModelRenderer rivet8; + ModelRenderer rivet4; + ModelRenderer rivet9; public ModelSeismicVibrator() { textureWidth = 128; - textureHeight = 128; + textureHeight = 64; - Base = new ModelRenderer(this, 0, 0); - Base.addBox(0F, 0F, 0F, 16, 1, 16); - Base.setRotationPoint(-8F, 23F, -8F); - Base.setTextureSize(128, 128); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - Tower = new ModelRenderer(this, 64, 0); - Tower.addBox(0F, 0F, 0F, 4, 11, 4); - Tower.setRotationPoint(-2F, 12F, -2F); - Tower.setTextureSize(128, 128); - Tower.mirror = true; - setRotation(Tower, 0F, 0F, 0F); - TowerTop = new ModelRenderer(this, 80, 0); - TowerTop.addBox(0F, 0F, 0F, 2, 1, 2); - TowerTop.setRotationPoint(-1F, 10F, -1F); - TowerTop.setTextureSize(128, 128); - TowerTop.mirror = true; - setRotation(TowerTop, 0F, 0F, 0F); - TopPanel = new ModelRenderer(this, 0, 17); - TopPanel.addBox(0F, 0F, 0F, 8, 1, 8); - TopPanel.setRotationPoint(-4F, 11F, -4F); - TopPanel.setTextureSize(128, 128); - TopPanel.mirror = true; - setRotation(TopPanel, 0F, 0F, 0F); - Vibrator = new ModelRenderer(this, 32, 17); - Vibrator.addBox(0F, 0F, 0F, 8, 4, 8); - Vibrator.setRotationPoint(-4F, 19F, -4F); - Vibrator.setTextureSize(128, 128); - Vibrator.mirror = true; - setRotation(Vibrator, 0F, 0F, 0F); - PoleBR = new ModelRenderer(this, 0, 26); - PoleBR.addBox(0F, 0F, 0F, 1, 13, 1); - PoleBR.setRotationPoint(-5F, 10F, 4F); - PoleBR.setTextureSize(128, 128); - PoleBR.mirror = true; - setRotation(PoleBR, 0F, 0F, 0F); - PoleLB = new ModelRenderer(this, 0, 26); - PoleLB.addBox(0F, 0F, 0F, 1, 13, 1); - PoleLB.setRotationPoint(4F, 10F, 4F); - PoleLB.setTextureSize(128, 128); - PoleLB.mirror = true; - setRotation(PoleLB, 0F, 0F, 0F); - PoleFL = new ModelRenderer(this, 0, 26); - PoleFL.addBox(0F, 0F, 0F, 1, 13, 1); - PoleFL.setRotationPoint(4F, 10F, -5F); - PoleFL.setTextureSize(128, 128); - PoleFL.mirror = true; - setRotation(PoleFL, 0F, 0F, 0F); - PoleRF = new ModelRenderer(this, 0, 26); - PoleRF.addBox(0F, 0F, 0F, 1, 13, 1); - PoleRF.setRotationPoint(-5F, 10F, -5F); - PoleRF.setTextureSize(128, 128); - PoleRF.mirror = true; - setRotation(PoleRF, 0F, 0F, 0F); - PoleL = new ModelRenderer(this, 4, 26); - PoleL.addBox(0F, 0F, 0F, 1, 1, 8); - PoleL.setRotationPoint(4F, 10F, -4F); - PoleL.setTextureSize(128, 128); - PoleL.mirror = true; - setRotation(PoleL, 0F, 0F, 0F); - PoleR = new ModelRenderer(this, 4, 26); - PoleR.addBox(0F, 0F, 0F, 1, 1, 8); - PoleR.setRotationPoint(-5F, 10F, -4F); - PoleR.setTextureSize(128, 128); - PoleR.mirror = true; - setRotation(PoleR, 0F, 0F, 0F); - Cable = new ModelRenderer(this, 64, 15); - Cable.addBox(0F, 0F, 0F, 6, 2, 6); - Cable.setRotationPoint(-3F, 8F, -3F); - Cable.setTextureSize(128, 128); - Cable.mirror = true; - setRotation(Cable, 0F, 0F, 0F); - ScreenFront = new ModelRenderer(this, 0, 40); - ScreenFront.addBox(0F, 0F, 0F, 8, 6, 1); - ScreenFront.setRotationPoint(-4F, 11F, -6F); - ScreenFront.setTextureSize(128, 128); - ScreenFront.mirror = true; - setRotation(ScreenFront, 0F, 0F, 0F); - Keyboard = new ModelRenderer(this, 0, 47); - Keyboard.addBox(0F, 0F, 0F, 8, 1, 3); - Keyboard.setRotationPoint(-4F, 18F, -8F); - Keyboard.setTextureSize(128, 128); - Keyboard.mirror = true; - setRotation(Keyboard, 0.4363323F, 0F, 0F); + plate3 = new ModelRenderer(this, 36, 42); + plate3.addBox(0F, 0F, 0F, 8, 2, 8); + plate3.setRotationPoint(-4F, 22F, -4F); + plate3.setTextureSize(128, 64); + plate3.mirror = true; + setRotation(plate3, 0F, 0F, 0F); + baseBack = new ModelRenderer(this, 0, 26); + baseBack.addBox(0F, 0F, 0F, 16, 5, 3); + baseBack.setRotationPoint(-8F, 19F, 5F); + baseBack.setTextureSize(128, 64); + baseBack.mirror = true; + setRotation(baseBack, 0F, 0F, 0F); + motor = new ModelRenderer(this, 76, 13); + motor.addBox(0F, 0F, 0F, 6, 4, 10); + motor.setRotationPoint(-3F, -5F, -3F); + motor.setTextureSize(128, 64); + motor.mirror = true; + setRotation(motor, 0F, 0F, 0F); + port = new ModelRenderer(this, 38, 33); + port.addBox(0F, 0F, 0F, 8, 8, 1); + port.setRotationPoint(-4F, 12F, 7.01F); + port.setTextureSize(128, 64); + port.mirror = true; + setRotation(port, 0F, 0F, 0F); + pole4 = new ModelRenderer(this, 0, 34); + pole4.addBox(0F, 0F, 0F, 1, 25, 1); + pole4.setRotationPoint(6.5F, -6F, 6.5F); + pole4.setTextureSize(128, 64); + pole4.mirror = true; + setRotation(pole4, 0F, 0F, 0F); + shaft2 = new ModelRenderer(this, 16, 34); + shaft2.addBox(0F, 0F, 0F, 3, 11, 3); + shaft2.setRotationPoint(-1.5F, -5F, -1.5F); + shaft2.setTextureSize(128, 64); + shaft2.mirror = true; + setRotation(shaft2, 0F, 0F, 0F); + shaft1 = new ModelRenderer(this, 8, 34); + shaft1.addBox(0F, 0F, 0F, 2, 15, 2); + shaft1.setRotationPoint(-1F, 6F, -1F); + shaft1.setTextureSize(128, 64); + shaft1.mirror = true; + setRotation(shaft1, 0F, 0F, 0F); + arm3 = new ModelRenderer(this, 0, 6); + arm3.addBox(0F, 0F, 0F, 2, 2, 4); + arm3.setRotationPoint(-1F, 7F, 3F); + arm3.setTextureSize(128, 64); + arm3.mirror = true; + setRotation(arm3, -0.3665191F, 0F, 0F); + plate2 = new ModelRenderer(this, 48, 0); + plate2.addBox(0F, 0F, 0F, 4, 2, 4); + plate2.setRotationPoint(-2F, 21F, -2F); + plate2.setTextureSize(128, 64); + plate2.mirror = true; + setRotation(plate2, 0F, 0F, 0F); + arm2 = new ModelRenderer(this, 48, 6); + arm2.addBox(0F, 0F, 0F, 4, 2, 4); + arm2.setRotationPoint(-2F, 7F, -2F); + arm2.setTextureSize(128, 64); + arm2.mirror = true; + setRotation(arm2, 0F, 0F, 0F); + arm1 = new ModelRenderer(this, 56, 33); + arm1.addBox(0F, 0F, 0F, 3, 2, 4); + arm1.setRotationPoint(-1.5F, 7F, 2F); + arm1.setTextureSize(128, 64); + arm1.mirror = true; + setRotation(arm1, 0F, 0F, 0F); + top = new ModelRenderer(this, 0, 0); + top.addBox(0F, 0F, 0F, 16, 2, 16); + top.setRotationPoint(-8F, -8F, -8F); + top.setTextureSize(128, 64); + top.mirror = true; + setRotation(top, 0F, 0F, 0F); + frameBack5 = new ModelRenderer(this, 4, 34); + frameBack5.addBox(-1F, 0F, 0F, 1, 19, 1); + frameBack5.setRotationPoint(7.5F, 7F, 6.49F); + frameBack5.setTextureSize(128, 64); + frameBack5.mirror = true; + setRotation(frameBack5, 0F, 0F, 0.837758F); + pole3 = new ModelRenderer(this, 0, 34); + pole3.addBox(0F, 0F, 0F, 1, 25, 1); + pole3.setRotationPoint(6.5F, -6F, -7.5F); + pole3.setTextureSize(128, 64); + pole3.mirror = true; + setRotation(pole3, 0F, 0F, 0F); + frameRight5 = new ModelRenderer(this, 4, 34); + frameRight5.addBox(0F, 0F, 0F, 1, 19, 1); + frameRight5.setRotationPoint(6.485F, 7F, -7.5F); + frameRight5.setTextureSize(128, 64); + frameRight5.mirror = true; + setRotation(frameRight5, 0.837758F, 0F, 0F); + baseRight = new ModelRenderer(this, 38, 18); + baseRight.mirror = true; + baseRight.addBox(0F, 0F, 0F, 3, 5, 10); + baseRight.setRotationPoint(5F, 19F, -5F); + baseRight.setTextureSize(128, 64); + setRotation(baseRight, 0F, 0F, 0F); + baseFront = new ModelRenderer(this, 0, 18); + baseFront.addBox(0F, 0F, 0F, 16, 5, 3); + baseFront.setRotationPoint(-8F, 19F, -8F); + baseFront.setTextureSize(128, 64); + baseFront.mirror = true; + setRotation(baseFront, 0F, 0F, 0F); + baseLeft = new ModelRenderer(this, 38, 18); + baseLeft.addBox(0F, 0F, 0F, 3, 5, 10); + baseLeft.setRotationPoint(-8F, 19F, -5F); + baseLeft.setTextureSize(128, 64); + baseLeft.mirror = true; + setRotation(baseLeft, 0F, 0F, 0F); + frameRight3 = new ModelRenderer(this, 64, 27); + frameRight3.addBox(0F, 0F, 0F, 1, 1, 13); + frameRight3.setRotationPoint(6.5F, 6F, -6.5F); + frameRight3.setTextureSize(128, 64); + frameRight3.mirror = true; + setRotation(frameRight3, 0F, 0F, 0F); + pole1 = new ModelRenderer(this, 0, 34); + pole1.addBox(0F, 0F, 0F, 1, 25, 1); + pole1.setRotationPoint(-7.5F, -6F, -7.5F); + pole1.setTextureSize(128, 64); + pole1.mirror = true; + setRotation(pole1, 0F, 0F, 0F); + frameRight4 = new ModelRenderer(this, 4, 34); + frameRight4.addBox(0F, 0F, -1F, 1, 19, 1); + frameRight4.setRotationPoint(6.49F, 7F, 7.5F); + frameRight4.setTextureSize(128, 64); + frameRight4.mirror = true; + setRotation(frameRight4, -0.837758F, 0F, 0F); + frameRight1 = new ModelRenderer(this, 4, 34); + frameRight1.addBox(0F, 0F, 0F, 1, 19, 1); + frameRight1.setRotationPoint(6.485F, -6F, -7.5F); + frameRight1.setTextureSize(128, 64); + frameRight1.mirror = true; + setRotation(frameRight1, 0.837758F, 0F, 0F); + frameRight2 = new ModelRenderer(this, 4, 34); + frameRight2.addBox(0F, 0F, -1F, 1, 19, 1); + frameRight2.setRotationPoint(6.49F, -6F, 7.5F); + frameRight2.setTextureSize(128, 64); + frameRight2.mirror = true; + setRotation(frameRight2, -0.837758F, 0F, 0F); + frameLeft5 = new ModelRenderer(this, 4, 34); + frameLeft5.addBox(0F, 0F, 0F, 1, 19, 1); + frameLeft5.setRotationPoint(-7.485F, 7F, -7.5F); + frameLeft5.setTextureSize(128, 64); + frameLeft5.mirror = true; + setRotation(frameLeft5, 0.837758F, 0F, 0F); + frameLeft4 = new ModelRenderer(this, 4, 34); + frameLeft4.addBox(0F, 0F, -1F, 1, 19, 1); + frameLeft4.setRotationPoint(-7.49F, 7F, 7.5F); + frameLeft4.setTextureSize(128, 64); + frameLeft4.mirror = true; + setRotation(frameLeft4, -0.837758F, 0F, 0F); + frameBack3 = new ModelRenderer(this, 36, 52); + frameBack3.addBox(0F, 0F, 0F, 13, 1, 1); + frameBack3.setRotationPoint(-6.5F, 6F, 6.5F); + frameBack3.setTextureSize(128, 64); + frameBack3.mirror = true; + setRotation(frameBack3, 0F, 0F, 0F); + frameLeft2 = new ModelRenderer(this, 4, 34); + frameLeft2.addBox(0F, 0F, 0F, 1, 19, 1); + frameLeft2.setRotationPoint(-7.485F, -6F, -7.5F); + frameLeft2.setTextureSize(128, 64); + frameLeft2.mirror = true; + setRotation(frameLeft2, 0.837758F, 0F, 0F); + frameLeft1 = new ModelRenderer(this, 4, 34); + frameLeft1.addBox(0F, 0F, -1F, 1, 19, 1); + frameLeft1.setRotationPoint(-7.49F, -6F, 7.5F); + frameLeft1.setTextureSize(128, 64); + frameLeft1.mirror = true; + setRotation(frameLeft1, -0.837758F, 0F, 0F); + pole2 = new ModelRenderer(this, 0, 34); + pole2.addBox(0F, 0F, 0F, 1, 25, 1); + pole2.setRotationPoint(-7.5F, -6F, 6.5F); + pole2.setTextureSize(128, 64); + pole2.mirror = true; + setRotation(pole2, 0F, 0F, 0F); + frameBack1 = new ModelRenderer(this, 4, 34); + frameBack1.addBox(-1F, 0F, 0F, 1, 19, 1); + frameBack1.setRotationPoint(7.5F, -6F, 6.49F); + frameBack1.setTextureSize(128, 64); + frameBack1.mirror = true; + setRotation(frameBack1, 0F, 0F, 0.837758F); + frameBack2 = new ModelRenderer(this, 4, 34); + frameBack2.addBox(0F, 0F, 0F, 1, 19, 1); + frameBack2.setRotationPoint(-7.5F, -6F, 6.49F); + frameBack2.setTextureSize(128, 64); + frameBack2.mirror = true; + setRotation(frameBack2, 0F, 0F, -0.837758F); + frameBack4 = new ModelRenderer(this, 4, 34); + frameBack4.addBox(0F, 0F, 0F, 1, 19, 1); + frameBack4.setRotationPoint(-7.5F, 7F, 6.49F); + frameBack4.setTextureSize(128, 64); + frameBack4.mirror = true; + setRotation(frameBack4, 0F, 0F, -0.837758F); + frameLeft3 = new ModelRenderer(this, 64, 27); + frameLeft3.addBox(0F, 0F, 0F, 1, 1, 13); + frameLeft3.setRotationPoint(-7.5F, 6F, -6.5F); + frameLeft3.setTextureSize(128, 64); + frameLeft3.mirror = true; + setRotation(frameLeft3, 0F, 0F, 0F); + conduit = new ModelRenderer(this, 64, 0); + conduit.addBox(0F, 0F, 0F, 4, 25, 2); + conduit.setRotationPoint(-2F, -6F, 6F); + conduit.setTextureSize(128, 64); + conduit.mirror = true; + setRotation(conduit, 0F, 0F, 0F); + plate1 = new ModelRenderer(this, 76, 0); + plate1.addBox(0F, 0F, 0F, 10, 1, 12); + plate1.setRotationPoint(-5F, -6F, -5F); + plate1.setTextureSize(128, 64); + plate1.mirror = true; + setRotation(plate1, 0F, 0F, 0F); + rivet10 = new ModelRenderer(this, 0, 0); + rivet10.addBox(0F, 0F, 0F, 1, 1, 1); + rivet10.setRotationPoint(3.5F, -5.5F, 3.5F); + rivet10.setTextureSize(128, 64); + rivet10.mirror = true; + setRotation(rivet10, 0F, 0F, 0F); + rivet5 = new ModelRenderer(this, 0, 0); + rivet5.addBox(0F, 0F, 0F, 1, 1, 1); + rivet5.setRotationPoint(-4.5F, -5.5F, 3.5F); + rivet5.setTextureSize(128, 64); + rivet5.mirror = true; + setRotation(rivet5, 0F, 0F, 0F); + rivet1 = new ModelRenderer(this, 0, 0); + rivet1.addBox(0F, 0F, 0F, 1, 1, 1); + rivet1.setRotationPoint(-4.5F, -5.5F, -4.5F); + rivet1.setTextureSize(128, 64); + rivet1.mirror = true; + setRotation(rivet1, 0F, 0F, 0F); + rivet6 = new ModelRenderer(this, 0, 0); + rivet6.addBox(0F, 0F, 0F, 1, 1, 1); + rivet6.setRotationPoint(3.5F, -5.5F, -4.5F); + rivet6.setTextureSize(128, 64); + rivet6.mirror = true; + setRotation(rivet6, 0F, 0F, 0F); + rivet2 = new ModelRenderer(this, 0, 0); + rivet2.addBox(0F, 0F, 0F, 1, 1, 1); + rivet2.setRotationPoint(-4.5F, -5.5F, -2.5F); + rivet2.setTextureSize(128, 64); + rivet2.mirror = true; + setRotation(rivet2, 0F, 0F, 0F); + rivet7 = new ModelRenderer(this, 0, 0); + rivet7.addBox(0F, 0F, 0F, 1, 1, 1); + rivet7.setRotationPoint(3.5F, -5.5F, -2.5F); + rivet7.setTextureSize(128, 64); + rivet7.mirror = true; + setRotation(rivet7, 0F, 0F, 0F); + rivet3 = new ModelRenderer(this, 0, 0); + rivet3.addBox(0F, 0F, 0F, 1, 1, 1); + rivet3.setRotationPoint(-4.5F, -5.5F, -0.5F); + rivet3.setTextureSize(128, 64); + rivet3.mirror = true; + setRotation(rivet3, 0F, 0F, 0F); + rivet8 = new ModelRenderer(this, 0, 0); + rivet8.addBox(0F, 0F, 0F, 1, 1, 1); + rivet8.setRotationPoint(3.5F, -5.5F, -0.5F); + rivet8.setTextureSize(128, 64); + rivet8.mirror = true; + setRotation(rivet8, 0F, 0F, 0F); + rivet4 = new ModelRenderer(this, 0, 0); + rivet4.addBox(0F, 0F, 0F, 1, 1, 1); + rivet4.setRotationPoint(-4.5F, -5.5F, 1.5F); + rivet4.setTextureSize(128, 64); + rivet4.mirror = true; + setRotation(rivet4, 0F, 0F, 0F); + rivet9 = new ModelRenderer(this, 0, 0); + rivet9.addBox(0F, 0F, 0F, 1, 1, 1); + rivet9.setRotationPoint(3.5F, -5.5F, 1.5F); + rivet9.setTextureSize(128, 64); + rivet9.mirror = true; + setRotation(rivet9, 0F, 0F, 0F); } - public void render(float size) + public void render(float size) { - Base.render(size); - Tower.render(size); - TowerTop.render(size); - TopPanel.render(size); - Vibrator.render(size); - PoleBR.render(size); - PoleLB.render(size); - PoleFL.render(size); - PoleRF.render(size); - PoleL.render(size); - PoleR.render(size); - Cable.render(size); - ScreenFront.render(size); - - GL11.glScalef(1.01F, 1.01F, 1.01F); - Keyboard.render(size); + plate3.render(size); + baseBack.render(size); + motor.render(size); + port.render(size); + pole4.render(size); + shaft2.render(size); + shaft1.render(size); + arm3.render(size); + plate2.render(size); + arm2.render(size); + arm1.render(size); + top.render(size); + frameBack5.render(size); + pole3.render(size); + frameRight5.render(size); + baseRight.render(size); + baseFront.render(size); + baseLeft.render(size); + frameRight3.render(size); + pole1.render(size); + frameRight4.render(size); + frameRight1.render(size); + frameRight2.render(size); + frameLeft5.render(size); + frameLeft4.render(size); + frameBack3.render(size); + frameLeft2.render(size); + frameLeft1.render(size); + pole2.render(size); + frameBack1.render(size); + frameBack2.render(size); + frameBack4.render(size); + frameLeft3.render(size); + conduit.render(size); + plate1.render(size); + rivet10.render(size); + rivet5.render(size); + rivet1.render(size); + rivet6.render(size); + rivet2.render(size); + rivet7.render(size); + rivet3.render(size); + rivet8.render(size); + rivet4.render(size); + rivet9.render(size); } - + public void renderWithPiston(float piston, float size) { - Vibrator.rotationPointY = 19 - (piston*7); + shaft1.rotationPointY = 6 - (piston*12); + plate2.rotationPointY = 21 - (piston*12); + plate3.rotationPointY = 22 - (piston*12); + render(size); } diff --git a/src/main/java/mekanism/client/model/ModelSolarNeutronActivator.java b/src/main/java/mekanism/client/model/ModelSolarNeutronActivator.java new file mode 100644 index 000000000..7159c810d --- /dev/null +++ b/src/main/java/mekanism/client/model/ModelSolarNeutronActivator.java @@ -0,0 +1,405 @@ +package mekanism.client.model; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class ModelSolarNeutronActivator extends ModelBase +{ + ModelRenderer pole; + ModelRenderer panel3; + ModelRenderer port; + ModelRenderer panel1; + ModelRenderer panel2; + ModelRenderer panelBase; + ModelRenderer panelBraceLeft2; + ModelRenderer panelBraceRight2; + ModelRenderer panelBraceLeft1; + ModelRenderer panelBraceRight1; + ModelRenderer panelBrace; + ModelRenderer bridge; + ModelRenderer platform; + ModelRenderer hole2; + ModelRenderer hole4; + ModelRenderer hole1; + ModelRenderer hole3; + ModelRenderer brace2; + ModelRenderer tube2c; + ModelRenderer tube1b; + ModelRenderer tube1c; + ModelRenderer tube2b; + ModelRenderer tube2a; + ModelRenderer tube1a; + ModelRenderer conduit; + ModelRenderer brace1; + ModelRenderer tank; + ModelRenderer laser; + ModelRenderer base; + ModelRenderer support1; + ModelRenderer support2; + ModelRenderer support3; + ModelRenderer support4; + ModelRenderer support5; + ModelRenderer support6; + ModelRenderer support7; + ModelRenderer support8; + ModelRenderer support9; + ModelRenderer support10; + ModelRenderer support11; + ModelRenderer support12; + ModelRenderer support13; + ModelRenderer support14; + ModelRenderer support15; + ModelRenderer support16; + ModelRenderer portConnector; + ModelRenderer laserBeamToggle; + + public ModelSolarNeutronActivator() + { + textureWidth = 128; + textureHeight = 64; + + pole = new ModelRenderer(this, 116, 0); + pole.addBox(0F, 0F, 0F, 4, 15, 2); + pole.setRotationPoint(-2F, -5F, 6F); + pole.setTextureSize(128, 64); + pole.mirror = true; + setRotation(pole, 0F, 0F, 0F); + panel3 = new ModelRenderer(this, 84, 32); + panel3.addBox(-6F, 0F, -16F, 6, 1, 16); + panel3.setRotationPoint(-2.75F, -4.95F, 8F); + panel3.setTextureSize(128, 64); + panel3.mirror = true; + setRotation(panel3, -0.1082104F, 0.0279253F, 0.2617994F); + port = new ModelRenderer(this, 0, 45); + port.addBox(0F, 0F, 0F, 8, 8, 1); + port.setRotationPoint(-4F, 12F, -8.01F); + port.setTextureSize(128, 64); + port.mirror = true; + setRotation(port, 0F, 0F, 0F); + panel1 = new ModelRenderer(this, 84, 32); + panel1.mirror = true; + panel1.addBox(0F, 0F, -16F, 6, 1, 16); + panel1.setRotationPoint(2.75F, -4.95F, 8F); + panel1.setTextureSize(128, 64); + setRotation(panel1, -0.1082104F, -0.0279253F, -0.2617994F); + panel2 = new ModelRenderer(this, 84, 15); + panel2.addBox(0F, 0F, -16F, 6, 1, 16); + panel2.setRotationPoint(-3F, -5F, 8F); + panel2.setTextureSize(128, 64); + panel2.mirror = true; + setRotation(panel2, -0.1047198F, 0F, 0F); + panelBase = new ModelRenderer(this, 28, 45); + panelBase.addBox(0F, 1F, -16F, 6, 1, 14); + panelBase.setRotationPoint(-3F, -5F, 9F); + panelBase.setTextureSize(128, 64); + panelBase.mirror = true; + setRotation(panelBase, -0.1047198F, 0F, 0F); + panelBraceLeft2 = new ModelRenderer(this, 64, 15); + panelBraceLeft2.addBox(-4F, 0.5F, -5F, 5, 1, 2); + panelBraceLeft2.setRotationPoint(-3F, -5F, 9F); + panelBraceLeft2.setTextureSize(128, 64); + panelBraceLeft2.mirror = true; + setRotation(panelBraceLeft2, -0.1047198F, 0F, 0.2505517F); + panelBraceRight2 = new ModelRenderer(this, 64, 15); + panelBraceRight2.addBox(-1F, 0.5F, -5F, 5, 1, 2); + panelBraceRight2.setRotationPoint(3F, -5F, 9F); + panelBraceRight2.setTextureSize(128, 64); + panelBraceRight2.mirror = true; + setRotation(panelBraceRight2, -0.1047198F, 0F, -0.2555938F); + panelBraceLeft1 = new ModelRenderer(this, 64, 15); + panelBraceLeft1.addBox(-4F, 0.5F, -15F, 5, 1, 2); + panelBraceLeft1.setRotationPoint(-3F, -5F, 9F); + panelBraceLeft1.setTextureSize(128, 64); + panelBraceLeft1.mirror = true; + setRotation(panelBraceLeft1, -0.1047198F, 0F, 0.2505517F); + panelBraceRight1 = new ModelRenderer(this, 64, 15); + panelBraceRight1.addBox(-1F, 0.5F, -15F, 5, 1, 2); + panelBraceRight1.setRotationPoint(3F, -5F, 9F); + panelBraceRight1.setTextureSize(128, 64); + panelBraceRight1.mirror = true; + setRotation(panelBraceRight1, -0.1047198F, 0F, -0.2555938F); + panelBrace = new ModelRenderer(this, 56, 18); + panelBrace.addBox(0F, 1.2F, -10F, 2, 2, 9); + panelBrace.setRotationPoint(-1F, -5F, 8F); + panelBrace.setTextureSize(128, 64); + panelBrace.mirror = true; + setRotation(panelBrace, -0.1047198F, 0F, 0F); + bridge = new ModelRenderer(this, 65, 1); + bridge.addBox(0F, 0F, 0F, 12, 1, 13); + bridge.setRotationPoint(-6F, 19F, -6F); + bridge.setTextureSize(128, 64); + bridge.mirror = true; + setRotation(bridge, 0F, 0F, 0F); + platform = new ModelRenderer(this, 18, 45); + platform.addBox(-2.5F, 1F, -2.5F, 6, 3, 6); + platform.setRotationPoint(-0.5F, 8F, -2.5F); + platform.setTextureSize(128, 64); + platform.mirror = true; + setRotation(platform, -0.1047198F, 0F, 0F); + hole2 = new ModelRenderer(this, 0, 6); + hole2.addBox(1F, 0F, 0F, 1, 2, 1); + hole2.setRotationPoint(-0.5F, 8F, -2.5F); + hole2.setTextureSize(128, 64); + hole2.mirror = true; + setRotation(hole2, -0.1047198F, 0F, 0F); + hole4 = new ModelRenderer(this, 0, 3); + hole4.addBox(-1F, 0F, 1F, 3, 2, 1); + hole4.setRotationPoint(-0.5F, 8F, -2.5F); + hole4.setTextureSize(128, 64); + hole4.mirror = true; + setRotation(hole4, -0.1047198F, 0F, 0F); + hole1 = new ModelRenderer(this, 0, 3); + hole1.addBox(-1F, 0F, -1F, 3, 2, 1); + hole1.setRotationPoint(-0.5F, 8F, -2.5F); + hole1.setTextureSize(128, 64); + hole1.mirror = true; + setRotation(hole1, -0.1047198F, 0F, 0F); + hole3 = new ModelRenderer(this, 0, 6); + hole3.addBox(-1F, 0F, 0F, 1, 2, 1); + hole3.setRotationPoint(-0.5F, 8F, -2.5F); + hole3.setTextureSize(128, 64); + hole3.mirror = true; + setRotation(hole3, -0.1047198F, 0F, 0F); + brace2 = new ModelRenderer(this, 0, 11); + brace2.addBox(0F, 0F, 0F, 1, 1, 2); + brace2.setRotationPoint(1F, 9.5F, -7.1F); + brace2.setTextureSize(128, 64); + brace2.mirror = true; + setRotation(brace2, 0.1745329F, 0F, 0F); + tube2c = new ModelRenderer(this, 0, 9); + tube2c.addBox(0F, 0F, 0F, 1, 1, 1); + tube2c.setRotationPoint(2F, 9F, 4F); + tube2c.setTextureSize(128, 64); + tube2c.mirror = true; + setRotation(tube2c, 0F, 0F, 0F); + tube1b = new ModelRenderer(this, 0, 14); + tube1b.addBox(0F, 0F, 0F, 6, 1, 1); + tube1b.setRotationPoint(-3F, 8F, 2F); + tube1b.setTextureSize(128, 64); + tube1b.mirror = true; + setRotation(tube1b, 0F, 0F, 0F); + tube1c = new ModelRenderer(this, 0, 9); + tube1c.addBox(0F, 0F, 0F, 1, 1, 1); + tube1c.setRotationPoint(2F, 9F, 2F); + tube1c.setTextureSize(128, 64); + tube1c.mirror = true; + setRotation(tube1c, 0F, 0F, 0F); + tube2b = new ModelRenderer(this, 0, 14); + tube2b.addBox(0F, 0F, 0F, 6, 1, 1); + tube2b.setRotationPoint(-3F, 8F, 4F); + tube2b.setTextureSize(128, 64); + tube2b.mirror = true; + setRotation(tube2b, 0F, 0F, 0F); + tube2a = new ModelRenderer(this, 0, 9); + tube2a.addBox(0F, 0F, 0F, 1, 1, 1); + tube2a.setRotationPoint(-3F, 9F, 4F); + tube2a.setTextureSize(128, 64); + tube2a.mirror = true; + setRotation(tube2a, 0F, 0F, 0F); + tube1a = new ModelRenderer(this, 0, 9); + tube1a.addBox(0F, 0F, 0F, 1, 1, 1); + tube1a.setRotationPoint(-3F, 9F, 2F); + tube1a.setTextureSize(128, 64); + tube1a.mirror = true; + setRotation(tube1a, 0F, 0F, 0F); + conduit = new ModelRenderer(this, 48, 0); + conduit.addBox(0F, 0F, 0F, 2, 1, 7); + conduit.setRotationPoint(-1F, 9.5F, -1F); + conduit.setTextureSize(128, 64); + conduit.mirror = true; + setRotation(conduit, 0F, 0F, 0F); + brace1 = new ModelRenderer(this, 0, 11); + brace1.addBox(0F, 0F, 0F, 1, 1, 2); + brace1.setRotationPoint(-2F, 9.5F, -7.1F); + brace1.setTextureSize(128, 64); + brace1.mirror = true; + setRotation(brace1, 0.1745329F, 0F, 0F); + tank = new ModelRenderer(this, 0, 0); + tank.addBox(0F, 0F, 0F, 16, 9, 16); + tank.setRotationPoint(-8F, 10F, -8F); + tank.setTextureSize(128, 64); + tank.mirror = true; + setRotation(tank, 0F, 0F, 0F); + laser = new ModelRenderer(this, 4, 0); + laser.addBox(0.5F, 2.1F, -9F, 1, 2, 1); + laser.setRotationPoint(-1F, -5F, 8F); + laser.setTextureSize(128, 64); + laser.mirror = true; + setRotation(laser, -0.1117011F, 0F, 0F); + base = new ModelRenderer(this, 0, 25); + base.addBox(0F, 0F, 0F, 16, 4, 16); + base.setRotationPoint(-8F, 20F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + support1 = new ModelRenderer(this, 0, 0); + support1.addBox(0F, 0F, 0F, 1, 1, 1); + support1.setRotationPoint(6.5F, 19F, -7.5F); + support1.setTextureSize(128, 64); + support1.mirror = true; + setRotation(support1, 0F, 0F, 0F); + support2 = new ModelRenderer(this, 0, 0); + support2.addBox(0F, 0F, 0F, 1, 1, 1); + support2.setRotationPoint(6.5F, 19F, 6.5F); + support2.setTextureSize(128, 64); + support2.mirror = true; + setRotation(support2, 0F, 0F, 0F); + support3 = new ModelRenderer(this, 0, 0); + support3.addBox(0F, 0F, 0F, 1, 1, 1); + support3.setRotationPoint(6.5F, 19F, -5.5F); + support3.setTextureSize(128, 64); + support3.mirror = true; + setRotation(support3, 0F, 0F, 0F); + support4 = new ModelRenderer(this, 0, 0); + support4.addBox(0F, 0F, 0F, 1, 1, 1); + support4.setRotationPoint(6.5F, 19F, -3.5F); + support4.setTextureSize(128, 64); + support4.mirror = true; + setRotation(support4, 0F, 0F, 0F); + support5 = new ModelRenderer(this, 0, 0); + support5.addBox(0F, 0F, 0F, 1, 1, 1); + support5.setRotationPoint(6.5F, 19F, -1.5F); + support5.setTextureSize(128, 64); + support5.mirror = true; + setRotation(support5, 0F, 0F, 0F); + support6 = new ModelRenderer(this, 0, 0); + support6.addBox(0F, 0F, 0F, 1, 1, 1); + support6.setRotationPoint(6.5F, 19F, 0.5F); + support6.setTextureSize(128, 64); + support6.mirror = true; + setRotation(support6, 0F, 0F, 0F); + support7 = new ModelRenderer(this, 0, 0); + support7.addBox(0F, 0F, 0F, 1, 1, 1); + support7.setRotationPoint(6.5F, 19F, 2.5F); + support7.setTextureSize(128, 64); + support7.mirror = true; + setRotation(support7, 0F, 0F, 0F); + support8 = new ModelRenderer(this, 0, 0); + support8.addBox(0F, 0F, 0F, 1, 1, 1); + support8.setRotationPoint(6.5F, 19F, 4.5F); + support8.setTextureSize(128, 64); + support8.mirror = true; + setRotation(support8, 0F, 0F, 0F); + support9 = new ModelRenderer(this, 0, 0); + support9.addBox(0F, 0F, 0F, 1, 1, 1); + support9.setRotationPoint(-7.5F, 19F, 6.5F); + support9.setTextureSize(128, 64); + support9.mirror = true; + setRotation(support9, 0F, 0F, 0F); + support10 = new ModelRenderer(this, 0, 0); + support10.addBox(0F, 0F, 0F, 1, 1, 1); + support10.setRotationPoint(-7.5F, 19F, 4.5F); + support10.setTextureSize(128, 64); + support10.mirror = true; + setRotation(support10, 0F, 0F, 0F); + support11 = new ModelRenderer(this, 0, 0); + support11.addBox(0F, 0F, 0F, 1, 1, 1); + support11.setRotationPoint(-7.5F, 19F, 2.5F); + support11.setTextureSize(128, 64); + support11.mirror = true; + setRotation(support11, 0F, 0F, 0F); + support12 = new ModelRenderer(this, 0, 0); + support12.addBox(0F, 0F, 0F, 1, 1, 1); + support12.setRotationPoint(-7.5F, 19F, 0.5F); + support12.setTextureSize(128, 64); + support12.mirror = true; + setRotation(support12, 0F, 0F, 0F); + support13 = new ModelRenderer(this, 0, 0); + support13.addBox(0F, 0F, 0F, 1, 1, 1); + support13.setRotationPoint(-7.5F, 19F, -1.5F); + support13.setTextureSize(128, 64); + support13.mirror = true; + setRotation(support13, 0F, 0F, 0F); + support14 = new ModelRenderer(this, 0, 0); + support14.addBox(0F, 0F, 0F, 1, 1, 1); + support14.setRotationPoint(-7.5F, 19F, -3.5F); + support14.setTextureSize(128, 64); + support14.mirror = true; + setRotation(support14, 0F, 0F, 0F); + support15 = new ModelRenderer(this, 0, 0); + support15.addBox(0F, 0F, 0F, 1, 1, 1); + support15.setRotationPoint(-7.5F, 19F, -5.5F); + support15.setTextureSize(128, 64); + support15.mirror = true; + setRotation(support15, 0F, 0F, 0F); + support16 = new ModelRenderer(this, 0, 0); + support16.addBox(0F, 0F, 0F, 1, 1, 1); + support16.setRotationPoint(-7.5F, 19F, -7.5F); + support16.setTextureSize(128, 64); + support16.mirror = true; + setRotation(support16, 0F, 0F, 0F); + portConnector = new ModelRenderer(this, 0, 14); + portConnector.addBox(0F, 0F, 0F, 6, 1, 1); + portConnector.setRotationPoint(-3F, 19F, -7.01F); + portConnector.setTextureSize(128, 64); + portConnector.mirror = true; + setRotation(portConnector, 0F, 0F, 0F); + laserBeamToggle = new ModelRenderer(this, 12, 0); + laserBeamToggle.addBox(0.5F, 4.1F, -9F, 1, 11, 1); + laserBeamToggle.setRotationPoint(-1F, -5F, 8F); + laserBeamToggle.setTextureSize(128, 64); + laserBeamToggle.mirror = true; + setRotation(laserBeamToggle, -0.1117011F, 0F, 0F); + } + + public void render(float size) + { + pole.render(size); + panel3.render(size); + port.render(size); + panel1.render(size); + panel2.render(size); + panelBase.render(size); + panelBraceLeft2.render(size); + panelBraceRight2.render(size); + panelBraceLeft1.render(size); + panelBraceRight1.render(size); + panelBrace.render(size); + bridge.render(size); + platform.render(size); + hole2.render(size); + hole4.render(size); + hole1.render(size); + hole3.render(size); + brace2.render(size); + tube2c.render(size); + tube1b.render(size); + tube1c.render(size); + tube2b.render(size); + tube2a.render(size); + tube1a.render(size); + conduit.render(size); + brace1.render(size); + tank.render(size); + laser.render(size); + base.render(size); + support1.render(size); + support2.render(size); + support3.render(size); + support4.render(size); + support5.render(size); + support6.render(size); + support7.render(size); + support8.render(size); + support9.render(size); + support10.render(size); + support11.render(size); + support12.render(size); + support13.render(size); + support14.render(size); + support15.render(size); + support16.render(size); + portConnector.render(size); + laserBeamToggle.render(size); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) + { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } +} diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 7077c3b9d..0d56af04e 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -135,10 +135,10 @@ public class MekanismRenderer { if(gas.getUnlocalizedName().contains("clean")) { - gas.setIcon(event.map,"mekanism:blocks/LiquidCleanOre"); + gas.setIcon(event.map,"mekanism:liquid/LiquidCleanOre"); } else { - gas.setIcon(event.map,"mekanism:blocks/LiquidOre"); + gas.setIcon(event.map,"mekanism:liquid/LiquidOre"); } } } @@ -238,7 +238,7 @@ public class MekanismRenderer for(DefIcon def : defaults) { - if(def.icons.contains(side.ordinal()+6)) + if(def.icons.contains(side.ordinal()+6) && def.overridesInactive) { textures[side.ordinal()+6] = def.defIcon; found = true; @@ -274,6 +274,10 @@ public class MekanismRenderer public List icons = new ArrayList(); + /** If this DefIcon should be prioritized over a machine's side-specific off texture + * if no on texture is present. */ + public boolean overridesInactive = true; + public DefIcon(TextureAtlasSprite icon, int... is) { defIcon = icon; @@ -284,6 +288,13 @@ public class MekanismRenderer } } + public DefIcon setOverrides(boolean b) + { + overridesInactive = b; + + return this; + } + public static DefIcon getAll(TextureAtlasSprite icon) { return new DefIcon(icon, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11); @@ -570,6 +581,7 @@ public class MekanismRenderer GL11.glColor4f(red, green, blue, 1.0F); } + GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(-0.5F, -0.5F, -0.5F); } @@ -594,11 +606,11 @@ public class MekanismRenderer tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, custom.getIcon(stack, 2)); + renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, custom.getIcon(stack, 3)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, custom.getIcon(stack, 3)); + renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, custom.getIcon(stack, 2)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1.0F, 0.0F, 0.0F); @@ -639,11 +651,11 @@ public class MekanismRenderer tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, metadata)); + renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, metadata)); + renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, metadata)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1.0F, 0.0F, 0.0F); diff --git a/src/main/java/mekanism/client/render/RenderPartTransmitter.java b/src/main/java/mekanism/client/render/RenderPartTransmitter.java index a55a19360..23b44a306 100644 --- a/src/main/java/mekanism/client/render/RenderPartTransmitter.java +++ b/src/main/java/mekanism/client/render/RenderPartTransmitter.java @@ -97,16 +97,14 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister for(Map.Entry e : small_models.entrySet()) { - e.setValue(e.getValue().twoFacedCopy().apply(new Translation(Vector3.center)).shrinkUVs(0.0005)); - e.getValue().computeLighting(LightModel.standardLightModel); + e.setValue(e.getValue().computeLighting(LightModel.standardLightModel).twoFacedCopy().apply(new Translation(Vector3.center)).shrinkUVs(0.0005)); } large_models = CCModel.parseObjModels(MekanismUtils.getResource(ResourceType.MODEL, "transmitter_large.obj"), 7, null); for(Map.Entry e : large_models.entrySet()) { - e.setValue(e.getValue().twoFacedCopy().apply(new Translation(Vector3.center)).shrinkUVs(0.0005)); - e.getValue().computeLighting(LightModel.standardLightModel); + e.setValue(e.getValue().computeLighting(LightModel.standardLightModel).twoFacedCopy().apply(new Translation(Vector3.center)).shrinkUVs(0.0005)); } contents_models = CCModel.parseObjModels(MekanismUtils.getResource(ResourceType.MODEL, "transmitter_contents.obj"), 7, null); @@ -300,12 +298,12 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister public void renderContents(PartMechanicalPipe pipe, Vector3 pos) { float targetScale; + if(pipe.getTransmitter().hasTransmitterNetwork()) { targetScale = pipe.getTransmitter().getTransmitterNetwork().fluidScale; } - else - { + else { targetScale = (float)pipe.buffer.getFluidAmount() / (float)pipe.buffer.getCapacity(); } diff --git a/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java b/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java index 080d9f27d..1584e582c 100644 --- a/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java @@ -1,9 +1,14 @@ package mekanism.client.render.block; import mekanism.client.ClientProxy; +import mekanism.client.model.ModelSecurityDesk; import mekanism.client.render.MekanismRenderer; import mekanism.common.MekanismBlocks; +import mekanism.common.block.BlockBasic.BasicType; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; @@ -16,23 +21,39 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class BasicRenderingHandler implements ISimpleBlockRenderingHandler { + private Minecraft mc = Minecraft.getMinecraft(); + + public ModelSecurityDesk securityDesk = new ModelSecurityDesk(); + @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { GL11.glPushMatrix(); GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); - if(block == MekanismBlocks.BasicBlock || block == MekanismBlocks.BasicBlock2) + BasicType type = BasicType.get(block, metadata); + + if(type != null) { - if(block == MekanismBlocks.BasicBlock && metadata == 10) + if(type == BasicType.STRUCTURAL_GLASS) { MekanismRenderer.blendOn(); } - GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); - MekanismRenderer.renderItem(renderer, metadata, block); + if(type != BasicType.SECURITY_DESK) + { + GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); + MekanismRenderer.renderItem(renderer, metadata, block); + } + else { + GL11.glRotatef(180, 1.0F, 0.0F, 0.0F); + GL11.glScalef(0.8F, 0.8F, 0.8F); + GL11.glTranslatef(0.0F, -0.8F, 0.0F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SecurityDesk.png")); + securityDesk.render(0.0625F, mc.renderEngine); + } - if(block == MekanismBlocks.BasicBlock && metadata == 10) + if(type == BasicType.STRUCTURAL_GLASS) { MekanismRenderer.blendOff(); } diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index febae0e19..624387e88 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -16,8 +16,11 @@ import mekanism.client.model.ModelLaserAmplifier; import mekanism.client.model.ModelLogisticalSorter; import mekanism.client.model.ModelMetallurgicInfuser; import mekanism.client.model.ModelPressurizedReactionChamber; +import mekanism.client.model.ModelQuantumEntangloporter; +import mekanism.client.model.ModelResistiveHeater; import mekanism.client.model.ModelRotaryCondensentrator; import mekanism.client.model.ModelSeismicVibrator; +import mekanism.client.model.ModelSolarNeutronActivator; import mekanism.client.render.MekanismRenderer; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.util.MekanismUtils; @@ -25,10 +28,7 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; import org.lwjgl.opengl.GL11; @@ -39,6 +39,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class MachineRenderingHandler implements ISimpleBlockRenderingHandler { + private Minecraft mc = Minecraft.getMinecraft(); + public ModelElectricPump electricPump = new ModelElectricPump(); public ModelMetallurgicInfuser metallurgicInfuser = new ModelMetallurgicInfuser(); public ModelChargepad chargepad = new ModelChargepad(); @@ -56,8 +58,9 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler public ModelFluidicPlenisher fluidicPlenisher = new ModelFluidicPlenisher(); public ModelLaser laser = new ModelLaser(); public ModelLaserAmplifier laserAmplifier = new ModelLaserAmplifier(); - - public IModelCustom solarNeutronActivator = AdvancedModelLoader.loadModel(new ResourceLocation("mekanism:models/solar_tri.obj")); + public ModelSolarNeutronActivator solarNeutronActivator = new ModelSolarNeutronActivator(); + public ModelResistiveHeater resistiveHeater = new ModelResistiveHeater(); + public ModelQuantumEntangloporter quantumEntangloporter = new ModelQuantumEntangloporter(); @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) @@ -75,32 +78,31 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler if(type == MachineType.ELECTRIC_PUMP) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -0.85F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectricPump.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectricPump.png")); electricPump.render(0.0560F); } else if(type == MachineType.METALLURGIC_INFUSER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.0F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "MetallurgicInfuser.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "MetallurgicInfuser.png")); metallurgicInfuser.render(0.0625F); } else if(type == MachineType.CHARGEPAD) { GL11.glRotatef(180F, 1.0F, 0.0F, 0.0F); GL11.glTranslatef(0.0F, -1.1F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Chargepad.png")); - chargepad.render(0.0625F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Chargepad.png")); + chargepad.render(0.0625F, mc.renderEngine); } else if(type == MachineType.LOGISTICAL_SORTER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.85F, -0.15F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LogisticalSorter.png")); + GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(0.0F, -1.0F, 0.0F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LogisticalSorter.png")); logisticalSorter.render(0.0625F, false); } else if(type == MachineType.DIGITAL_MINER) @@ -108,88 +110,88 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(-180F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.35F, 0.1F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "DigitalMiner.png")); - digitalMiner.render(0.022F, false); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "DigitalMiner.png")); + digitalMiner.render(0.022F, false, mc.renderEngine); } else if(type == MachineType.ROTARY_CONDENSENTRATOR) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.06F, 0.05F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "RotaryCondensentrator.png")); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); + GL11.glTranslatef(0.05F, -0.96F, 0.05F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "RotaryCondensentrator.png")); rotaryCondensentrator.render(0.0625F); } else if(type == MachineType.CHEMICAL_OXIDIZER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.06F, 0.05F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalOxidizer.png")); + GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(0.0F, -1.00F, 0.05F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalOxidizer.png")); chemicalOxidizer.render(0.0625F); - chemicalOxidizer.renderGlass(0.0625F); } else if(type == MachineType.CHEMICAL_INFUSER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.06F, 0.05F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalInfuser.png")); + GL11.glRotatef(180f, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(0.0F, -0.96F, 0.05F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalInfuser.png")); chemicalInfuser.render(0.0625F); - chemicalInfuser.renderGlass(0.0625F); } else if(type == MachineType.ELECTROLYTIC_SEPARATOR) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectrolyticSeparator.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectrolyticSeparator.png")); electrolyticSeparator.render(0.0625F); } else if(type == MachineType.CHEMICAL_DISSOLUTION_CHAMBER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.06F, 0.05F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalDissolutionChamber.png")); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); + GL11.glTranslatef(0.05F, -0.96F, 0.05F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalDissolutionChamber.png")); chemicalDissolutionChamber.render(0.0625F); } else if(type == MachineType.CHEMICAL_WASHER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.06F, 0.05F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalWasher.png")); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); + GL11.glTranslatef(0.05F, -0.96F, 0.05F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalWasher.png")); chemicalWasher.render(0.0625F); } else if(type == MachineType.CHEMICAL_CRYSTALLIZER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.06F, 0.05F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalCrystallizer.png")); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); + GL11.glTranslatef(0.05F, -0.96F, 0.05F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalCrystallizer.png")); chemicalCrystallizer.render(0.0625F); } else if(type == MachineType.SEISMIC_VIBRATOR) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.06F, 0.05F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SeismicVibrator.png")); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); + GL11.glScalef(0.6F, 0.6F, 0.6F); + GL11.glTranslatef(0.0F, -0.55F, 0.0F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SeismicVibrator.png")); seismicVibrator.render(0.0625F); } else if(type == MachineType.PRESSURIZED_REACTION_CHAMBER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.06F, 0.05F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PressurizedReactionChamber.png")); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); + GL11.glTranslatef(0.05F, -0.96F, 0.05F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PressurizedReactionChamber.png")); pressurizedReactionChamber.render(0.0625F); } else if(type == MachineType.FLUIDIC_PLENISHER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -0.85F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FluidicPlenisher.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FluidicPlenisher.png")); fluidicPlenisher.render(0.0560F); } else if(type == MachineType.LASER) @@ -197,7 +199,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -0.85F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Laser.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Laser.png")); laser.render(0.0560F); } else if(type == MachineType.LASER_AMPLIFIER) @@ -205,7 +207,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -0.85F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LaserAmplifier.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LaserAmplifier.png")); laserAmplifier.render(0.0560F); } else if(type == MachineType.LASER_TRACTOR_BEAM) @@ -213,16 +215,33 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -0.85F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LaserTractorBeam.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LaserTractorBeam.png")); laserAmplifier.render(0.0560F); } + else if(type == MachineType.RESISTIVE_HEATER) + { + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); + GL11.glTranslatef(0.05F, -0.96F, 0.05F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ResistiveHeater.png")); + resistiveHeater.render(0.0625F, false, mc.renderEngine); + } else if(type == MachineType.SOLAR_NEUTRON_ACTIVATOR) { + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); - GL11.glScalef(0.45F, 0.45F, 0.45F); - GL11.glTranslatef(0.0F, -1.3F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarNeutronActivator.png")); - solarNeutronActivator.renderAll(); + GL11.glScalef(0.6F, 0.6F, 0.6F); + GL11.glTranslatef(0.0F, -0.55F, 0.0F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarNeutronActivator.png")); + solarNeutronActivator.render(0.0625F); + } + else if(type == MachineType.QUANTUM_ENTANGLOPORTER) + { + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); + GL11.glTranslatef(0.0F, -1.0F, 0.0F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "QuantumEntangloporter.png")); + quantumEntangloporter.render(0.0625F, mc.renderEngine); } else { GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); diff --git a/src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java b/src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java index 8b5676399..3f13ae1f5 100644 --- a/src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java @@ -24,6 +24,7 @@ public class PlasticRenderingHandler implements ISimpleBlockRenderingHandler public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { boolean flag = false; + if(block == MekanismBlocks.GlowPlasticBlock) { Tessellator tessellator = Tessellator.instance; @@ -73,8 +74,10 @@ public class PlasticRenderingHandler implements ISimpleBlockRenderingHandler return flag; } + flag = renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBoundsFromBlock(block); + return flag; } diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index 5846eff23..e9ae2f43f 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -7,8 +7,10 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemRenderingHandler// implements IItemRenderer { /* + private Minecraft mc = Minecraft.getMinecraft(); + public ModelRobit robit = new ModelRobit(); - public ModelChest electricChest = new ModelChest(); + public ModelChest personalChest = new ModelChest(); public ModelEnergyCube energyCube = new ModelEnergyCube(); public ModelEnergyCore energyCore = new ModelEnergyCore(); public ModelGasTank gasTank = new ModelGasTank(); @@ -57,17 +59,23 @@ public class ItemRenderingHandler// implements IItemRenderer { EnergyCubeTier tier = ((IEnergyCube)item.getItem()).getEnergyCubeTier(item); IEnergizedItem energized = (IEnergizedItem)item.getItem(); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "EnergyCube" + tier.getBaseTier().getName() + ".png")); + mc.renderEngine.bindTexture(RenderEnergyCube.baseTexture); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.0F, 0.0F); - energyCube.render(0.0625F); + energyCube.render(0.0625F, tier, mc.renderEngine); + + for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + { + mc.renderEngine.bindTexture(RenderEnergyCube.baseTexture); + energyCube.renderSide(0.0625F, side, side == ForgeDirection.NORTH ? IOState.OUTPUT : IOState.INPUT, tier, mc.renderEngine); + } GL11.glPushMatrix(); GL11.glTranslated(0.0, 1.0, 0.0); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "EnergyCore.png")); + mc.renderEngine.bindTexture(RenderEnergyCube.coreTexture); GL11.glShadeModel(GL11.GL_SMOOTH); GL11.glEnable(GL11.GL_BLEND); @@ -151,7 +159,7 @@ public class ItemRenderingHandler// implements IItemRenderer GL11.glScalef(scale*scaler, scale*scaler, 0); - TextureManager renderEngine = Minecraft.getMinecraft().renderEngine; + TextureManager renderEngine = mc.renderEngine; GL11.glDisable(GL11.GL_LIGHTING); @@ -225,18 +233,20 @@ public class ItemRenderingHandler// implements IItemRenderer else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.GasTank) { GL11.glPushMatrix(); + BaseTier tier = ((ItemBlockGasTank)item.getItem()).getBaseTier(item); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank" + tier.getName() + ".png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank" + tier.getName() + ".png")); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); + GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.0F, 0.0F); gasTank.render(0.0625F); + GL11.glPopMatrix(); } else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.ObsidianTNT) { GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ObsidianTNT.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ObsidianTNT.png")); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.0F, 0.0F); @@ -257,7 +267,7 @@ public class ItemRenderingHandler// implements IItemRenderer MekanismRenderer.glowOff(); } } - else if(MachineType.get(item) == MachineType.ELECTRIC_CHEST) + else if(MachineType.get(item) == MachineType.PERSONAL_CHEST) { GL11.glPushMatrix(); ItemBlockMachine chest = (ItemBlockMachine)item.getItem(); @@ -267,9 +277,9 @@ public class ItemRenderingHandler// implements IItemRenderer GL11.glTranslatef(0, 1.0F, 1.0F); GL11.glScalef(1.0F, -1F, -1F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectricChest.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PersonalChest.png")); - electricChest.renderAll(); + personalChest.renderAll(); GL11.glPopMatrix(); } else if(item.getItem() instanceof ItemRobit) @@ -278,7 +288,7 @@ public class ItemRenderingHandler// implements IItemRenderer GL11.glRotatef(180, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.5F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Robit.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Robit.png")); robit.render(0.08F); GL11.glPopMatrix(); } @@ -288,7 +298,7 @@ public class ItemRenderingHandler// implements IItemRenderer GL11.glRotatef(180, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.2F, -0.35F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Jetpack.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Jetpack.png")); jetpack.render(0.0625F); GL11.glPopMatrix(); } @@ -298,7 +308,7 @@ public class ItemRenderingHandler// implements IItemRenderer GL11.glRotatef(180, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.2F, -0.35F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Jetpack.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Jetpack.png")); armoredJetpack.render(0.0625F); GL11.glPopMatrix(); } @@ -308,7 +318,7 @@ public class ItemRenderingHandler// implements IItemRenderer GL11.glRotatef(180, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.1F, 0.2F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ScubaSet.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ScubaSet.png")); gasMask.render(0.0625F); GL11.glPopMatrix(); } @@ -319,7 +329,7 @@ public class ItemRenderingHandler// implements IItemRenderer GL11.glRotatef(90, 0.0F, -1.0F, 0.0F); GL11.glScalef(1.6F, 1.6F, 1.6F); GL11.glTranslatef(0.2F, -0.5F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ScubaSet.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ScubaSet.png")); scubaTank.render(0.0625F); GL11.glPopMatrix(); } @@ -330,7 +340,7 @@ public class ItemRenderingHandler// implements IItemRenderer GL11.glRotatef(90, 0.0F, -1.0F, 0.0F); GL11.glScalef(2.0F, 2.0F, 2.0F); GL11.glTranslatef(0.2F, -1.43F, 0.12F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FreeRunners.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FreeRunners.png")); freeRunners.render(0.0625F); GL11.glPopMatrix(); } @@ -376,7 +386,7 @@ public class ItemRenderingHandler// implements IItemRenderer GL11.glTranslatef(0.0F, -0.7F, 0.0F); } - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "AtomicDisassembler.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "AtomicDisassembler.png")); atomicDisassembler.render(0.0625F); GL11.glPopMatrix(); } @@ -411,7 +421,7 @@ public class ItemRenderingHandler// implements IItemRenderer { GL11.glPushMatrix(); GL11.glRotatef(160, 0.0F, 0.0F, 1.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Flamethrower.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Flamethrower.png")); GL11.glTranslatef(0.0F, -1.0F, 0.0F); GL11.glRotatef(135, 0.0F, 1.0F, 0.0F); @@ -443,7 +453,7 @@ public class ItemRenderingHandler// implements IItemRenderer { GL11.glPushMatrix(); GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FluidTank.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FluidTank.png")); ItemBlockMachine itemMachine = (ItemBlockMachine)item.getItem(); float targetScale = (float)(itemMachine.getFluidStack(item) != null ? itemMachine.getFluidStack(item).amount : 0)/itemMachine.getCapacity(item); FluidTankTier tier = FluidTankTier.values()[itemMachine.getBaseTier(item).ordinal()]; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java b/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java index b745f1019..564838afe 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java @@ -33,7 +33,7 @@ public class RenderChargepad extends TileEntitySpecialRenderer> cachedGasses = new HashMap>(); - @Override - public void renderTileEntityAt(TileEntityChemicalInfuser tileEntity, double x, double y, double z, float partialTick, int destroyStage) + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) { - render(false, x, y, z, tileEntity); - - if(tileEntity.leftTank.getGas() != null) - { - push(); - - GL11.glTranslatef((float)x, (float)y, (float)z); - GL11.glColor4f(1.0F, 1.0F, 1.0F, (float)tileEntity.leftTank.getStored()/tileEntity.leftTank.getMaxGas()); - bindTexture(MekanismRenderer.getBlocksTexture()); - getListAndRender(tileEntity.facing, tileEntity.leftTank.getGas().getGas()).render(); - GL11.glColor4f(1, 1, 1, 1); - - pop(); - } - - if(tileEntity.rightTank.getGas() != null) - { - push(); - - switch(tileEntity.facing) - { - case NORTH: - GL11.glTranslatef(-0.4375F, 0, 0); - break; - case SOUTH: - GL11.glTranslatef(0.4375F, 0, 0); - break; - case EAST: - GL11.glTranslatef(0, 0, -0.4375F); - break; - case WEST: - GL11.glTranslatef(0, 0, 0.4375F); - break; - } - - GL11.glTranslatef((float)x, (float)y, (float)z); - GL11.glColor4f(1.0F, 1.0F, 1.0F, (float)tileEntity.rightTank.getStored()/tileEntity.rightTank.getMaxGas()); - bindTexture(MekanismRenderer.getBlocksTexture()); - getListAndRender(tileEntity.facing, tileEntity.rightTank.getGas().getGas()).render(); - GL11.glColor4f(1, 1, 1, 1); - - pop(); - } - - render(true, x, y, z, tileEntity); + renderAModelAt((TileEntityChemicalInfuser)tileEntity, x, y, z, partialTick); } - /* - * 0: casing, 1: glass - */ - private void render(boolean glass, double x, double y, double z, TileEntityChemicalInfuser tileEntity) + private void renderAModelAt(TileEntityChemicalInfuser tileEntity, double x, double y, double z, float partialTick) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F); @@ -94,116 +37,8 @@ public class RenderChemicalInfuser extends TileEntitySpecialRenderer map = new HashMap(); - map.put(gas, display); - cachedGasses.put(side, map); - } - - switch(side) - { - case NORTH: - { - toReturn.minX = 0.625 + offset; - toReturn.minY = 0.0625 + offset; - toReturn.minZ = 0.625 + offset; - - toReturn.maxX = 0.8125 - offset; - toReturn.maxY = 0.9375 - offset; - toReturn.maxZ = 0.8125 - offset; - break; - } - case SOUTH: - { - toReturn.minX = 0.1875 + offset; - toReturn.minY = 0.0625 + offset; - toReturn.minZ = 0.1875 + offset; - - toReturn.maxX = 0.375 - offset; - toReturn.maxY = 0.9375 - offset; - toReturn.maxZ = 0.375 - offset; - break; - } - case WEST: - { - toReturn.minX = 0.625 + offset; - toReturn.minY = 0.0625 + offset; - toReturn.minZ = 0.1875 + offset; - - toReturn.maxX = 0.8125 - offset; - toReturn.maxY = 0.9375 - offset; - toReturn.maxZ = 0.375 - offset; - break; - } - case EAST: - { - toReturn.minX = 0.1875 + offset; - toReturn.minY = 0.0625 + offset; - toReturn.minZ = 0.625 + offset; - - toReturn.maxX = 0.375 - offset; - toReturn.maxY = 0.9375 - offset; - toReturn.maxZ = 0.8125 - offset; - break; - } - } - - MekanismRenderer.renderObject(toReturn); - display.endList(); - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - return display; - } - - private void pop() - { - GL11.glPopAttrib(); - GL11.glPopMatrix(); - } - - private void push() - { - GL11.glPushMatrix(); - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glEnable(GL11.GL_BLEND); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - } } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java index 31f056843..5f8445487 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java @@ -5,14 +5,11 @@ import java.util.Map; import mekanism.api.gas.Gas; import mekanism.client.model.ModelChemicalOxidizer; -import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; -import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.tile.TileEntityChemicalOxidizer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.init.Blocks; import net.minecraft.util.EnumFacing; import org.lwjgl.opengl.GL11; @@ -27,29 +24,6 @@ public class RenderChemicalOxidizer extends TileEntitySpecialRenderer map = new HashMap(); - map.put(gas, display); - cachedGasses.put(side, map); - } - - switch(side) - { - case NORTH: - { - toReturn.minX = 0.125 + offset; - toReturn.minY = 0.0625 + offset; - toReturn.minZ = 0.3125 + offset; - - toReturn.maxX = 0.5 - offset; - toReturn.maxY = 0.9375 - offset; - toReturn.maxZ = 0.6875 - offset; - break; - } - case SOUTH: - { - toReturn.minX = 0.5 + offset; - toReturn.minY = 0.0625 + offset; - toReturn.minZ = 0.3125 + offset; - - toReturn.maxX = 0.875 - offset; - toReturn.maxY = 0.9375 - offset; - toReturn.maxZ = 0.6875 - offset; - break; - } - case WEST: - { - toReturn.minX = 0.3125 + offset; - toReturn.minY = 0.0625 + offset; - toReturn.minZ = 0.5 + offset; - - toReturn.maxX = 0.6875 - offset; - toReturn.maxY = 0.9375 - offset; - toReturn.maxZ = 0.875 - offset; - break; - } - case EAST: - { - toReturn.minX = 0.3125 + offset; - toReturn.minY = 0.0625 + offset; - toReturn.minZ = 0.125 + offset; - - toReturn.maxX = 0.6875 - offset; - toReturn.maxY = 0.9375 - offset; - toReturn.maxZ = 0.5 - offset; - break; - } - } - - MekanismRenderer.renderObject(toReturn); - display.endList(); - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - return display; - } - - private void pop() - { - GL11.glPopAttrib(); - GL11.glPopMatrix(); - } - - private void push() - { - GL11.glPushMatrix(); - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glEnable(GL11.GL_BLEND); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - } } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java index 035c947f6..17bbeda61 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java @@ -2,13 +2,16 @@ package mekanism.client.render.tileentity; import java.util.HashMap; +import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.transmitters.TransmissionType; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; +import mekanism.common.SideData; import mekanism.common.base.ISideConfiguration; import mekanism.common.item.ItemConfigurator; +import mekanism.common.tile.component.TileComponentConfig; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -57,19 +60,22 @@ public class RenderConfigurableMachine resources = new HashMap(); + public static ResourceLocation baseTexture = MekanismUtils.getResource(ResourceType.RENDER, "EnergyCube.png"); + public static ResourceLocation coreTexture = MekanismUtils.getResource(ResourceType.RENDER, "EnergyCore.png"); + static { + if(resources.isEmpty()) + { + for(EnergyCubeTier tier : EnergyCubeTier.values()) + { + resources.put(tier, MekanismUtils.getResource(ResourceType.RENDER, "EnergyCube" + tier.getBaseTier().getName() + ".png")); + } + } + } + @Override public void renderTileEntityAt(TileEntityEnergyCube tileEntity, double x, double y, double z, float partialTick, int destroyStage) { @@ -29,20 +50,24 @@ public class RenderEnergyCube extends TileEntitySpecialRenderer +public class RenderPersonalChest extends TileEntitySpecialRenderer { private ModelChest model = new ModelChest(); @Override - public void renderTileEntityAt(TileEntityElectricChest tileEntity, double x, double y, double z, float partialTick, int destroyStage) + public void renderTileEntityAt(TileEntityPersonalChest tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x, (float)y + 1.0F, (float)z+1); GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectricChest.png")); + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PersonalChest.png")); switch(tileEntity.facing.ordinal()) { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderQuantumEntangloporter.java b/src/main/java/mekanism/client/render/tileentity/RenderQuantumEntangloporter.java new file mode 100644 index 000000000..1187767e5 --- /dev/null +++ b/src/main/java/mekanism/client/render/tileentity/RenderQuantumEntangloporter.java @@ -0,0 +1,48 @@ +package mekanism.client.render.tileentity; + +import mekanism.client.model.ModelQuantumEntangloporter; +import mekanism.client.render.MekanismRenderer; +import mekanism.common.tile.TileEntityQuantumEntangloporter; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class RenderQuantumEntangloporter extends TileEntitySpecialRenderer +{ + private ModelQuantumEntangloporter model = new ModelQuantumEntangloporter(); + + @Override + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) + { + renderAModelAt((TileEntityQuantumEntangloporter)tileEntity, x, y, z, partialTick); + } + + private void renderAModelAt(TileEntityQuantumEntangloporter tileEntity, double x, double y, double z, float partialTick) + { + GL11.glPushMatrix(); + GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); + + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "QuantumEntangloporter.png")); + + switch(tileEntity.facing) + { + case 2: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; + case 3: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; + case 4: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; + case 5: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; + } + + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + model.render(0.0625F, field_147501_a.field_147553_e); + GL11.glPopMatrix(); + + MekanismRenderer.machineRenderer.renderAModelAt(tileEntity, x, y, z, partialTick); + } +} diff --git a/src/main/java/mekanism/client/render/tileentity/RenderResistiveHeater.java b/src/main/java/mekanism/client/render/tileentity/RenderResistiveHeater.java new file mode 100644 index 000000000..df43ecd60 --- /dev/null +++ b/src/main/java/mekanism/client/render/tileentity/RenderResistiveHeater.java @@ -0,0 +1,44 @@ +package mekanism.client.render.tileentity; + +import mekanism.client.model.ModelResistiveHeater; +import mekanism.common.tile.TileEntityResistiveHeater; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class RenderResistiveHeater extends TileEntitySpecialRenderer +{ + private ModelResistiveHeater model = new ModelResistiveHeater(); + + @Override + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) + { + renderAModelAt((TileEntityResistiveHeater)tileEntity, x, y, z, partialTick); + } + + private void renderAModelAt(TileEntityResistiveHeater tileEntity, double x, double y, double z, float partialTick) + { + GL11.glPushMatrix(); + GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ResistiveHeater.png")); + + switch(tileEntity.facing) + { + case 2: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; + case 3: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; + case 4: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; + case 5: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; + } + + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + model.render(0.0625F, tileEntity.isActive, field_147501_a.field_147553_e); + GL11.glPopMatrix(); + } +} diff --git a/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java b/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java new file mode 100644 index 000000000..ac2892a04 --- /dev/null +++ b/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java @@ -0,0 +1,45 @@ +package mekanism.client.render.tileentity; + +import mekanism.client.model.ModelRotaryCondensentrator; +import mekanism.common.tile.TileEntityRotaryCondensentrator; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class RenderRotaryCondensentrator extends TileEntitySpecialRenderer +{ + private ModelRotaryCondensentrator model = new ModelRotaryCondensentrator(); + + @Override + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) + { + renderAModelAt((TileEntityRotaryCondensentrator)tileEntity, x, y, z, partialTick); + } + + private void renderAModelAt(TileEntityRotaryCondensentrator tileEntity, double x, double y, double z, float partialTick) + { + GL11.glPushMatrix(); + GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); + + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "RotaryCondensentrator.png")); + + switch(tileEntity.facing) + { + case 2: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; + case 3: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; + case 4: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; + case 5: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; + } + + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + model.render(0.0625F); + GL11.glPopMatrix(); + } +} diff --git a/src/main/java/mekanism/client/render/tileentity/RenderOredictionificator.java b/src/main/java/mekanism/client/render/tileentity/RenderSecurityDesk.java similarity index 57% rename from src/main/java/mekanism/client/render/tileentity/RenderOredictionificator.java rename to src/main/java/mekanism/client/render/tileentity/RenderSecurityDesk.java index 6b950eedd..07036f077 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderOredictionificator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSecurityDesk.java @@ -1,7 +1,7 @@ package mekanism.client.render.tileentity; -import mekanism.client.model.ModelMetallurgicInfuser; -import mekanism.common.tile.TileEntityOredictionificator; +import mekanism.client.model.ModelSecurityDesk; +import mekanism.common.tile.TileEntitySecurityDesk; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -13,17 +13,22 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class RenderOredictionificator extends TileEntitySpecialRenderer +public class RenderSecurityDesk extends TileEntitySpecialRenderer { - private ModelMetallurgicInfuser model = new ModelMetallurgicInfuser(); + private ModelSecurityDesk model = new ModelSecurityDesk(); @Override - public void renderTileEntityAt(TileEntityOredictionificator tileEntity, double x, double y, double z, float partialTick, int destroyStage) + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) + { + renderAModelAt((TileEntitySecurityDesk)tileEntity, x, y, z, partialTick); + } + + private void renderAModelAt(TileEntitySecurityDesk tileEntity, double x, double y, double z, float partialTick) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "MetallurgicInfuser.png")); + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SecurityDesk.png")); switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ { @@ -34,7 +39,7 @@ public class RenderOredictionificator extends TileEntitySpecialRenderer 0) - { - if(tileEntity.clientPiston < 1) - { - tileEntity.clientPiston = 1 + (1-tileEntity.clientPiston); - } - - tileEntity.clientPiston = Math.min(2, tileEntity.clientPiston+rate)%2; - } - else if(tileEntity.getActive()) - { - tileEntity.clientPiston = Math.min(2, tileEntity.clientPiston+rate)%2; - } - } - - float actualRate = tileEntity.clientPiston < 1 ? tileEntity.clientPiston : 2-tileEntity.clientPiston; + float actualRate = (float)Math.sin((tileEntity.clientPiston + (tileEntity.isActive ? partialTick : 0))/5F); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - model.renderWithPiston(actualRate, 0.0625F); + model.renderWithPiston(Math.max(0, actualRate), 0.0625F); GL11.glPopMatrix(); } } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java b/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java new file mode 100644 index 000000000..a02c3882a --- /dev/null +++ b/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java @@ -0,0 +1,46 @@ +package mekanism.client.render.tileentity; + +import mekanism.client.model.ModelSolarNeutronActivator; +import mekanism.common.tile.TileEntitySolarNeutronActivator; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class RenderSolarNeutronActivator extends TileEntitySpecialRenderer +{ + private ModelSolarNeutronActivator model = new ModelSolarNeutronActivator(); + + @Override + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) + { + renderAModelAt((TileEntitySolarNeutronActivator)tileEntity, x, y, z, partialTick); + } + + private void renderAModelAt(TileEntitySolarNeutronActivator tileEntity, double x, double y, double z, float partialTick) + { + GL11.glPushMatrix(); + GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); + + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarNeutronActivator.png")); + + switch(tileEntity.facing) + { + case 2: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; + case 3: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; + case 4: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; + case 5: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; + } + + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + + model.render(0.0625F); + GL11.glPopMatrix(); + } +} diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 556989964..6a4d25b06 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -36,6 +36,7 @@ import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.inventory.container.ContainerFluidTank; import mekanism.common.inventory.container.ContainerFluidicPlenisher; import mekanism.common.inventory.container.ContainerFormulaicAssemblicator; +import mekanism.common.inventory.container.ContainerFuelwoodHeater; import mekanism.common.inventory.container.ContainerGasTank; import mekanism.common.inventory.container.ContainerInductionMatrix; import mekanism.common.inventory.container.ContainerLaserAmplifier; @@ -52,6 +53,7 @@ import mekanism.common.inventory.container.ContainerRobitMain; import mekanism.common.inventory.container.ContainerRobitRepair; import mekanism.common.inventory.container.ContainerRobitSmelting; import mekanism.common.inventory.container.ContainerRotaryCondensentrator; +import mekanism.common.inventory.container.ContainerSecurityDesk; import mekanism.common.inventory.container.ContainerSeismicVibrator; import mekanism.common.inventory.container.ContainerSolarNeutronActivator; import mekanism.common.inventory.container.ContainerTeleporter; @@ -79,7 +81,6 @@ import mekanism.common.tile.TileEntityCrusher; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.tile.TileEntityDynamicValve; -import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.tile.TileEntityElectricMachine; import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.tile.TileEntityElectrolyticSeparator; @@ -91,6 +92,7 @@ import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.tile.TileEntityFormulaicAssemblicator; +import mekanism.common.tile.TileEntityFuelwoodHeater; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.tile.TileEntityInductionCasing; import mekanism.common.tile.TileEntityInductionCell; @@ -106,11 +108,13 @@ import mekanism.common.tile.TileEntityObsidianTNT; import mekanism.common.tile.TileEntityOredictionificator; import mekanism.common.tile.TileEntityOsmiumCompressor; import mekanism.common.tile.TileEntityPRC; +import mekanism.common.tile.TileEntityPersonalChest; import mekanism.common.tile.TileEntityPrecisionSawmill; import mekanism.common.tile.TileEntityPurificationChamber; import mekanism.common.tile.TileEntityQuantumEntangloporter; import mekanism.common.tile.TileEntityResistiveHeater; import mekanism.common.tile.TileEntityRotaryCondensentrator; +import mekanism.common.tile.TileEntitySecurityDesk; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.tile.TileEntitySolarNeutronActivator; import mekanism.common.tile.TileEntityStructuralGlass; @@ -170,7 +174,7 @@ public class CommonProxy implements IGuiProvider GameRegistry.registerTileEntity(TileEntityGasTank.class, "GasTank"); GameRegistry.registerTileEntity(TileEntityEnergyCube.class, "EnergyCube"); GameRegistry.registerTileEntity(TileEntityElectricPump.class, "ElectricPump"); - GameRegistry.registerTileEntity(TileEntityElectricChest.class, "ElectricChest"); + GameRegistry.registerTileEntity(TileEntityPersonalChest.class, "ElectricChest"); //TODO rename GameRegistry.registerTileEntity(TileEntityDynamicTank.class, "DynamicTank"); GameRegistry.registerTileEntity(TileEntityDynamicValve.class, "DynamicValve"); GameRegistry.registerTileEntity(TileEntityChargepad.class, "Chargepad"); @@ -204,22 +208,26 @@ public class CommonProxy implements IGuiProvider GameRegistry.registerTileEntity(TileEntityInductionProvider.class, "InductionProvider"); GameRegistry.registerTileEntity(TileEntityOredictionificator.class, "Oredictionificator"); GameRegistry.registerTileEntity(TileEntityStructuralGlass.class, "StructuralGlass"); + GameRegistry.registerTileEntity(TileEntityFormulaicAssemblicator.class, "FormulaicAssemblicator"); GameRegistry.registerTileEntity(TileEntityResistiveHeater.class, "ResistiveHeater"); GameRegistry.registerTileEntity(TileEntityBoilerCasing.class, "BoilerCasing"); GameRegistry.registerTileEntity(TileEntityBoilerValve.class, "BoilerValve"); + GameRegistry.registerTileEntity(TileEntitySecurityDesk.class, "SecurityDesk"); + GameRegistry.registerTileEntity(TileEntityQuantumEntangloporter.class, "QuantumEntangloporter"); + GameRegistry.registerTileEntity(TileEntityFuelwoodHeater.class, "FuelwoodHeater"); } public void handleTeleporterUpdate(PortableTeleporterMessage message) {} /** - * Handles an ELECTRIC_CHEST_CLIENT_OPEN packet via the proxy, not handled on the server-side. + * Handles an PERSONAL_CHEST_CLIENT_OPEN packet via the proxy, not handled on the server-side. * @param entityplayer - player the packet was sent from - * @param id - the electric chest gui ID to open + * @param id - the gui ID to open * @param windowId - the container-specific window ID * @param isBlock - if the chest is a block * @param pos - coordinates */ - public void openElectricChest(EntityPlayer entityplayer, int id, int windowId, boolean isBlock, BlockPos pos) {} + public void openPersonalChest(EntityPlayer entityplayer, int id, int windowId, boolean isBlock, BlockPos pos) {} /** * Register and load client-only render information. @@ -248,7 +256,6 @@ public class CommonProxy implements IGuiProvider general.voiceServerEnabled = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "VoiceServerEnabled", true).getBoolean(); general.cardboardSpawners = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AllowSpawnerBoxPickup", true).getBoolean(); general.enableWorldRegeneration = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnableWorldRegeneration", false).getBoolean(); - general.creativeOverrideElectricChest = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "CreativeOverrideElectricChest", true).getBoolean(); general.spawnBabySkeletons = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SpawnBabySkeletons", true).getBoolean(); general.obsidianTNTDelay = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ObsidianTNTDelay", 100).getInt(); general.obsidianTNTBlastRadius = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ObsidianTNTBlastRadius", 12).getInt(); @@ -289,6 +296,7 @@ public class CommonProxy implements IGuiProvider general.energyPerHeat = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyPerHeat", 1000D).getDouble(); general.maxEnergyPerSteam = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "MaxEnergyPerSteam", 100D).getDouble(); general.superheatingHeatTransfer = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SuperheatingHeatTransfer", 10000D).getDouble(); + general.heatPerFuelTick = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "HeatPerFuelTick", 1D).getDouble(); general.blacklistIC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistIC2Power", false).getBoolean(); general.blacklistRF = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistRFPower", false).getBoolean(); @@ -555,6 +563,10 @@ public class CommonProxy implements IGuiProvider return new ContainerNull(player, (TileEntityContainerBlock)tileEntity); case 56: return new ContainerFormulaicAssemblicator(player.inventory, (TileEntityFormulaicAssemblicator)tileEntity); + case 57: + return new ContainerSecurityDesk(player.inventory, (TileEntitySecurityDesk)tileEntity); + case 58: + return new ContainerFuelwoodHeater(player.inventory, (TileEntityFuelwoodHeater)tileEntity); } return null; diff --git a/src/main/java/mekanism/common/HashList.java b/src/main/java/mekanism/common/HashList.java index 603732633..ddc27993a 100644 --- a/src/main/java/mekanism/common/HashList.java +++ b/src/main/java/mekanism/common/HashList.java @@ -91,17 +91,17 @@ public class HashList implements Iterable return list.size(); } - public void swap( int source, int target ) + public void swap(int source, int target) { - // Make sure both source and target ar legal values - if( source == target ) return; - if( source < 0 || target < 0 ) return; - if( source >= list.size() || target >= list.size() ) return; + // Make sure both source and target are legal values + if(source == target) return; + if(source < 0 || target < 0) return; + if(source >= list.size() || target >= list.size()) return; // Perform swap - T temp = list.get( source ); - list.set( source, list.get( target ) ); - list.set( target, temp ); + T temp = list.get(source); + list.set(source, list.get( target)); + list.set(target, temp); } @Override diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 077e40324..4947321af 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -74,15 +74,14 @@ import mekanism.common.recipe.ShapelessMekanismRecipe; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.machines.SmeltingRecipe; import mekanism.common.recipe.outputs.ItemStackOutput; +import mekanism.common.security.SecurityFrequency; import mekanism.common.tile.TileEntityAdvancedBoundingBlock; import mekanism.common.tile.TileEntityBoundingBlock; import mekanism.common.tile.TileEntityCardboardBox; import mekanism.common.tile.TileEntityElectricBlock; -import mekanism.common.tile.TileEntityFormulaicAssemblicator; import mekanism.common.tile.TileEntityLaser; import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.tile.TileEntityPressureDisperser; -import mekanism.common.tile.TileEntityQuantumEntangloporter; import mekanism.common.tile.TileEntitySuperheatingElement; import mekanism.common.tile.TileEntityThermalEvaporationBlock; import mekanism.common.tile.TileEntityThermalEvaporationValve; @@ -186,12 +185,14 @@ public class Mekanism public static MultiblockManager boilerManager = new MultiblockManager("thermoelectricBoiler"); /** FrequencyManagers for various networks */ - public static FrequencyManager publicTeleporters = new FrequencyManager(Frequency.class, "Teleporter"); + public static FrequencyManager publicTeleporters = new FrequencyManager(Frequency.class, Frequency.TELEPORTER); public static Map privateTeleporters = new HashMap(); - public static FrequencyManager publicEntangloporters = new FrequencyManager(InventoryFrequency.class, "Entangloporter"); + public static FrequencyManager publicEntangloporters = new FrequencyManager(InventoryFrequency.class, InventoryFrequency.ENTANGLOPORTER); public static Map privateEntangloporters = new HashMap(); + public static FrequencyManager securityFrequencies = new FrequencyManager(SecurityFrequency.class, SecurityFrequency.SECURITY); + /** Mekanism creative tab */ public static CreativeTabMekanism tabMekanism = new CreativeTabMekanism(); @@ -358,7 +359,7 @@ public class Mekanism BlockStateMachine.MachineType.ELECTRIC_PUMP.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 12), " B ", "ECE", "OOO", Character.valueOf('B'), Items.bucket, Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('C'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('O'), "ingotOsmium" )); - BlockStateMachine.MachineType.ELECTRIC_CHEST.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 13), + BlockStateMachine.MachineType.PERSONAL_CHEST.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 13), "SGS", "CcC", "SSS", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), Blocks.chest, Character.valueOf('c'), MekanismUtils.getControlCircuit(BaseTier.BASIC) )); CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 4, 9), @@ -532,6 +533,13 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new ShapelessMekanismRecipe(new ItemStack(MekanismItems.CraftingFormula), new Object[] { Items.paper, MekanismUtils.getControlCircuit(BaseTier.BASIC) })); + CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 1, 9), new Object[] { + "SGS", "CIC", "STS", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), + Character.valueOf('T'), MekanismItems.TeleportationCore + })); + MachineType.FUELWOOD_HEATER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 6), new Object[] { + "SCS", "FHF", "SSS", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('F'), Blocks.furnace, Character.valueOf('H'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) + })); //Energy Cube recipes CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC), @@ -1169,10 +1177,8 @@ public class Mekanism GameRegistry.registerTileEntity(TileEntityCardboardBox.class, "CardboardBox"); GameRegistry.registerTileEntity(TileEntityThermalEvaporationValve.class, "SalinationValve"); //TODO rename GameRegistry.registerTileEntity(TileEntityThermalEvaporationBlock.class, "SalinationTank"); //TODO rename - GameRegistry.registerTileEntity(TileEntityQuantumEntangloporter.class, "QuantumEntangloporter"); GameRegistry.registerTileEntity(TileEntityPressureDisperser.class, "PressureDisperser"); GameRegistry.registerTileEntity(TileEntitySuperheatingElement.class, "SuperheatingElement"); - GameRegistry.registerTileEntity(TileEntityFormulaicAssemblicator.class, "FormulaicAssemblicator"); GameRegistry.registerTileEntity(TileEntityMetallurgicInfuser.class, "MetallurgicInfuser"); GameRegistry.registerTileEntity(TileEntityLaser.class, "Laser"); diff --git a/src/main/java/mekanism/common/PacketHandler.java b/src/main/java/mekanism/common/PacketHandler.java index a990ad36c..4226b72bc 100644 --- a/src/main/java/mekanism/common/PacketHandler.java +++ b/src/main/java/mekanism/common/PacketHandler.java @@ -27,8 +27,8 @@ import mekanism.common.network.PacketEditFilter; import mekanism.common.network.PacketEditFilter.EditFilterMessage; import mekanism.common.network.PacketElectricBowState; import mekanism.common.network.PacketElectricBowState.ElectricBowStateMessage; -import mekanism.common.network.PacketElectricChest; -import mekanism.common.network.PacketElectricChest.ElectricChestMessage; +import mekanism.common.network.PacketEntityMove; +import mekanism.common.network.PacketEntityMove.EntityMoveMessage; import mekanism.common.network.PacketFlamethrowerData; import mekanism.common.network.PacketFlamethrowerData.FlamethrowerDataMessage; import mekanism.common.network.PacketJetpackData; @@ -41,6 +41,8 @@ import mekanism.common.network.PacketNewFilter; import mekanism.common.network.PacketNewFilter.NewFilterMessage; import mekanism.common.network.PacketOredictionificatorGui; import mekanism.common.network.PacketOredictionificatorGui.OredictionificatorGuiMessage; +import mekanism.common.network.PacketPersonalChest; +import mekanism.common.network.PacketPersonalChest.PersonalChestMessage; import mekanism.common.network.PacketPortableTankState; import mekanism.common.network.PacketPortableTankState.PortableTankStateMessage; import mekanism.common.network.PacketPortableTeleporter; @@ -55,6 +57,8 @@ import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit.RobitMessage; import mekanism.common.network.PacketScubaTankData; import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage; +import mekanism.common.network.PacketSecurityMode; +import mekanism.common.network.PacketSecurityMode.SecurityModeMessage; import mekanism.common.network.PacketSimpleGui; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.network.PacketTileEntity; @@ -96,8 +100,8 @@ public class PacketHandler { netHandler.registerMessage(PacketRobit.class, RobitMessage.class, 0, Side.SERVER); netHandler.registerMessage(PacketTransmitterUpdate.class, TransmitterUpdateMessage.class, 1, Side.CLIENT); - netHandler.registerMessage(PacketElectricChest.class, ElectricChestMessage.class, 2, Side.CLIENT); - netHandler.registerMessage(PacketElectricChest.class, ElectricChestMessage.class, 2, Side.SERVER); + netHandler.registerMessage(PacketPersonalChest.class, PersonalChestMessage.class, 2, Side.CLIENT); + netHandler.registerMessage(PacketPersonalChest.class, PersonalChestMessage.class, 2, Side.SERVER); netHandler.registerMessage(PacketElectricBowState.class, ElectricBowStateMessage.class, 3, Side.SERVER); netHandler.registerMessage(PacketConfiguratorState.class, ConfiguratorStateMessage.class, 4, Side.SERVER); netHandler.registerMessage(PacketTileEntity.class, TileEntityMessage.class, 5, Side.CLIENT); @@ -106,7 +110,7 @@ public class PacketHandler netHandler.registerMessage(PacketDataRequest.class, DataRequestMessage.class, 7, Side.SERVER); netHandler.registerMessage(PacketOredictionificatorGui.class, OredictionificatorGuiMessage.class, 8, Side.CLIENT); netHandler.registerMessage(PacketOredictionificatorGui.class, OredictionificatorGuiMessage.class, 8, Side.SERVER); - //EMPTY SLOT 9 + netHandler.registerMessage(PacketSecurityMode.class, SecurityModeMessage.class, 9, Side.SERVER); netHandler.registerMessage(PacketPortableTeleporter.class, PortableTeleporterMessage.class, 10, Side.CLIENT); netHandler.registerMessage(PacketPortableTeleporter.class, PortableTeleporterMessage.class, 10, Side.SERVER); netHandler.registerMessage(PacketRemoveUpgrade.class, RemoveUpgradeMessage.class, 11, Side.SERVER); @@ -133,6 +137,7 @@ public class PacketHandler netHandler.registerMessage(PacketFlamethrowerData.class, FlamethrowerDataMessage.class, 27, Side.CLIENT); netHandler.registerMessage(PacketFlamethrowerData.class, FlamethrowerDataMessage.class, 27, Side.SERVER); netHandler.registerMessage(PacketDropperUse.class, DropperUseMessage.class, 28, Side.SERVER); + netHandler.registerMessage(PacketEntityMove.class, EntityMoveMessage.class, 29, Side.CLIENT); } /** diff --git a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java index 092ad8bf4..93c7929b6 100644 --- a/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java @@ -6,6 +6,7 @@ import mekanism.api.IConfigCardAccess.ISpecialConfigData; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.integration.IComputerIntegration; +import mekanism.common.security.ISecurityTile; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; @@ -16,13 +17,15 @@ import net.minecraftforge.fml.common.Optional.InterfaceList; @InterfaceList({ @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), }) -public interface IAdvancedBoundingBlock extends IBoundingBlock, ISidedInventory, IEnergySink, IStrictEnergyAcceptor, IStrictEnergyStorage, IEnergyHandler, IComputerIntegration, ISpecialConfigData +public interface IAdvancedBoundingBlock extends IBoundingBlock, ISidedInventory, IEnergySink, IStrictEnergyAcceptor, IStrictEnergyStorage, IEnergyHandler, IComputerIntegration, ISpecialConfigData, ISecurityTile { public int[] getBoundSlots(Coord4D location, EnumFacing side); public boolean canBoundInsert(Coord4D location, int i, ItemStack itemstack); public boolean canBoundExtract(Coord4D location, int i, ItemStack itemstack, EnumFacing side); + + public boolean canBoundReceiveEnergy(Coord4D location, ForgeDirection side); public void onPower(); diff --git a/src/main/java/mekanism/common/base/IElectricChest.java b/src/main/java/mekanism/common/base/IElectricChest.java deleted file mode 100644 index f1861fb52..000000000 --- a/src/main/java/mekanism/common/base/IElectricChest.java +++ /dev/null @@ -1,53 +0,0 @@ -package mekanism.common.base; - -import net.minecraft.item.ItemStack; - -/** - * Internal interface used for managing Electric Chests. - * @author aidancbrady - * - */ -public interface IElectricChest -{ - /** - * Sets the 'authenticated' value of this electric chest to a new value. - * @param itemStack - electric chest ItemStack - * @param auth - new value - */ - public void setAuthenticated(ItemStack itemStack, boolean auth); - - /** - * Retrieves the 'authenticated' value of this electric chest. - * @param itemStack - electric chest ItemStack - * @return authenticated value - */ - public boolean getAuthenticated(ItemStack itemStack); - - /** - * Sets the 'password' value of this electric chest to a new value. - * @param itemStack - electric chest ItemStack - * @param pass - new value - */ - public void setPassword(ItemStack itemStack, String pass); - - /** - * Retrieves the 'password' value of this electric chest. - * @param itemStack - electric chest ItemStack - * @return authenticated value - */ - public String getPassword(ItemStack itemStack); - - /** - * Sets the 'locked' value of this electric chest to a new value. - * @param itemStack - electric chest ItemStack - * @param locked - new value - */ - public void setLocked(ItemStack itemStack, boolean locked); - - /** - * Retrieves the 'locked' value of this electric chest. - * @param itemStack - electric chest ItemStack - * @return authenticated value - */ - public boolean getLocked(ItemStack itemStack); -} diff --git a/src/main/java/mekanism/common/base/IModule.java b/src/main/java/mekanism/common/base/IModule.java index 41c83c629..37a7a57e6 100644 --- a/src/main/java/mekanism/common/base/IModule.java +++ b/src/main/java/mekanism/common/base/IModule.java @@ -37,4 +37,9 @@ public interface IModule * @param dataStream - the incoming ByteBuf of the sync packet */ public void readConfig(ByteBuf dataStream) throws IOException; + + /** + * Called when the player returns to the main menu. + */ + public void resetClient(); } diff --git a/src/main/java/mekanism/common/base/ITileComponent.java b/src/main/java/mekanism/common/base/ITileComponent.java index af623bd7a..0e5a747a8 100644 --- a/src/main/java/mekanism/common/base/ITileComponent.java +++ b/src/main/java/mekanism/common/base/ITileComponent.java @@ -17,4 +17,6 @@ public interface ITileComponent public void write(NBTTagCompound nbtTags); public void write(ArrayList data); + + public void invalidate(); } diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 41236bed6..f518adacd 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -13,6 +13,7 @@ import mekanism.common.base.ITierItem; import mekanism.common.block.states.BlockStateBasic; import mekanism.common.block.states.BlockStateBasic.BasicBlock; import mekanism.common.block.states.BlockStateBasic.BasicBlockType; +import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.inventory.InventoryBin; import mekanism.common.item.ItemBlockBasic; @@ -26,13 +27,16 @@ import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.tile.TileEntityInductionCasing; import mekanism.common.tile.TileEntityInductionCell; import mekanism.common.tile.TileEntityInductionProvider; +import mekanism.common.tile.TileEntityMultiblock; import mekanism.common.tile.TileEntityPressureDisperser; +import mekanism.common.tile.TileEntitySecurityDesk; import mekanism.common.tile.TileEntityStructuralGlass; import mekanism.common.tile.TileEntitySuperheatingElement; import mekanism.common.tile.TileEntityThermalEvaporationController; import mekanism.common.tile.TileEntityThermalEvaporationValve; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; @@ -88,6 +92,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; * 1:6: Pressure Disperser * 1:7: Boiler Casing * 1:8: Boiler Valve + * 1:9: Security Desk * @author AidanBrady * */ @@ -212,14 +217,10 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus icons[5][0] = register.registerIcon("mekanism:SteelBlock"); icons[6][0] = register.registerIcon(ICON_BASE); - MekanismRenderer.loadDynamicTextures(register, "BinBasic", binIcons[0], DefIcon.getActivePair(register.registerIcon("mekanism:BinBasicSide"), 3, 4, 5), - new DefIcon(register.registerIcon("mekanism:BinBasicTop"), 0), new DefIcon(register.registerIcon("mekanism:BinBasicTopOn"), 6)); - MekanismRenderer.loadDynamicTextures(register, "BinAdvanced", binIcons[1], DefIcon.getActivePair(register.registerIcon("mekanism:BinAdvancedSide"), 3, 4, 5), - new DefIcon(register.registerIcon("mekanism:BinAdvancedTop"), 0), new DefIcon(register.registerIcon("mekanism:BinAdvancedTopOn"), 6)); - MekanismRenderer.loadDynamicTextures(register, "BinElite", binIcons[2], DefIcon.getActivePair(register.registerIcon("mekanism:BinEliteSide"), 3, 4, 5), - new DefIcon(register.registerIcon("mekanism:BinEliteTop"), 0), new DefIcon(register.registerIcon("mekanism:BinEliteTopOn"), 6)); - MekanismRenderer.loadDynamicTextures(register, "BinUltimate", binIcons[3], DefIcon.getActivePair(register.registerIcon("mekanism:BinUltimateSide"), 3, 4, 5), - new DefIcon(register.registerIcon("mekanism:BinUltimateTop"), 0), new DefIcon(register.registerIcon("mekanism:BinUltimateTopOn"), 6)); + MekanismRenderer.loadDynamicTextures(register, "bin/BinBasic", binIcons[0], new DefIcon(register.registerIcon("mekanism:bin/BinBasicTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinBasicTopOn"), 6)); + MekanismRenderer.loadDynamicTextures(register, "bin/BinAdvanced", binIcons[1], new DefIcon(register.registerIcon("mekanism:bin/BinAdvancedTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinAdvancedTopOn"), 6)); + MekanismRenderer.loadDynamicTextures(register, "bin/BinElite", binIcons[2], new DefIcon(register.registerIcon("mekanism:bin/BinEliteTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinEliteTopOn"), 6)); + MekanismRenderer.loadDynamicTextures(register, "bin/BinUltimate", binIcons[3], new DefIcon(register.registerIcon("mekanism:bin/BinUltimateTop"), 0), new DefIcon(register.registerIcon("mekanism:bin/BinUltimateTopOn"), 6)); icons[7][0] = ctms[7][0].mainTextureData.icon; icons[8][0] = register.registerIcon("mekanism:SteelCasing"); @@ -247,6 +248,7 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus ctms[4][2] = new CTMData("ctm/InductionProviderElite", this, Arrays.asList(3, 4)).registerIcons(register).setRenderConvexConnections(); ctms[4][3] = new CTMData("ctm/InductionProviderUltimate", this, Arrays.asList(3, 4)).registerIcons(register).setRenderConvexConnections(); ctms[5][0] = new CTMData("ctm/SuperheatingElement", this, Arrays.asList(5)).registerIcons(register).setRenderConvexConnections(); + ctms[5][1] = new CTMData("ctm/SuperheatingElementOn", this, Arrays.asList(5)).registerIcons(register).setRenderConvexConnections(); ctms[7][0] = new CTMData("ctm/BoilerCasing", this, Arrays.asList(7, 8)).registerIcons(register); ctms[8][0] = new CTMData("ctm/BoilerValve", this, Arrays.asList(7, 8)).registerIcons(register); @@ -265,9 +267,12 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus icons[4][2] = ctms[4][2].mainTextureData.icon; icons[4][3] = ctms[4][3].mainTextureData.icon; icons[5][0] = ctms[5][0].mainTextureData.icon; + icons[5][1] = ctms[5][1].mainTextureData.icon; icons[7][0] = ctms[7][0].mainTextureData.icon; icons[8][0] = ctms[8][0].mainTextureData.icon; + icons[9][0] = register.registerIcon(ICON_BASE); + break; } } @@ -313,6 +318,15 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus case 4: TileEntityInductionProvider tileEntity2 = (TileEntityInductionProvider)world.getTileEntity(pos); return icons[meta][tileEntity2.tier.ordinal()]; + case 5: + TileEntitySuperheatingElement element = (TileEntitySuperheatingElement)world.getTileEntity(x, y, z); + + if(element.multiblockUUID != null && SynchronizedBoilerData.clientHotMap.get(element.multiblockUUID) != null) + { + return icons[meta][SynchronizedBoilerData.clientHotMap.get(element.multiblockUUID) ? 1 : 0]; + } + + return icons[meta][0]; default: return getIcon(side, meta); } @@ -397,6 +411,8 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus case BASIC_BLOCK_1: switch(meta) { + case 10: + return false; case 9: case 11: TileEntityDynamicTank tileEntity = (TileEntityDynamicTank)world.getTileEntity(pos); @@ -425,7 +441,9 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus { case 1: case 2: - TileEntityInductionCasing tileEntity = (TileEntityInductionCasing)world.getTileEntity(pos); + case 7: + case 8: + TileEntityMultiblock tileEntity = (TileEntityMultiblock)world.getTileEntity(pos); if(tileEntity != null) { @@ -491,17 +509,36 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus return true; } } - - if(world.isRemote) - { - return true; - } if(tile instanceof TileEntityThermalEvaporationController) { if(!entityplayer.isSneaking()) { - entityplayer.openGui(Mekanism.instance, 33, world, pos.getX(), pos.getY(), pos.getZ()); + if(!world.isRemote) + { + entityplayer.openGui(Mekanism.instance, 33, world, , pos.getX(), pos.getY(), pos.getZ()); + } + + return true; + } + } + else if(tile instanceof TileEntitySecurityDesk) + { + String owner = ((TileEntitySecurityDesk)tile).owner; + + if(!entityplayer.isSneaking()) + { + if(!world.isRemote) + { + if(owner == null || entityplayer.getCommandSenderName().equals(owner)) + { + entityplayer.openGui(Mekanism.instance, 57, world, x, y, z); + } + else { + SecurityUtils.displayNoAccess(entityplayer); + } + } + return true; } } @@ -511,57 +548,63 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus if(entityplayer.getCurrentEquippedItem() != null && MekanismUtils.hasUsableWrench(entityplayer, pos)) { - Item tool = entityplayer.getCurrentEquippedItem().getItem(); - - if(entityplayer.isSneaking()) + if(!world.isRemote) { - dismantleBlock(world, pos, false); - return true; + Item tool = entityplayer.getCurrentEquippedItem().getItem(); + + if(entityplayer.isSneaking()) + { + dismantleBlock(world, x, y, z, false); + return true; + } + + if(MekanismUtils.isBCWrench(tool)) + { + ((IToolWrench)tool).wrenchUsed(entityplayer, x, y, z); + } + + int change = ForgeDirection.ROTATION_MATRIX[ForgeDirection.UP.ordinal()][bin.facing]; + + bin.setFacing((short)change); + world.notifyBlocksOfNeighborChange(x, y, z, this); } - - if(MekanismUtils.isBCWrench(tool)) - { - ((IToolWrench)tool).wrenchUsed(entityplayer, pos); - } - - int change = bin.facing.rotateY().ordinal(); - - bin.setFacing((short)change); - world.notifyNeighborsOfStateChange(pos, this); return true; } - if(bin.getItemCount() < bin.tier.storage) + if(!world.isRemote) { - if(bin.addTicks == 0 && entityplayer.getCurrentEquippedItem() != null) + if(bin.getItemCount() < bin.tier.storage) { - if(entityplayer.getCurrentEquippedItem() != null) + if(bin.addTicks == 0 && entityplayer.getCurrentEquippedItem() != null) { - ItemStack remain = bin.add(entityplayer.getCurrentEquippedItem()); - entityplayer.setCurrentItemOrArmor(0, remain); - bin.addTicks = 5; - } - } - else if(bin.addTicks > 0 && bin.getItemCount() > 0) - { - ItemStack[] inv = entityplayer.inventory.mainInventory; - - for(int i = 0; i < inv.length; i++) - { - if(bin.getItemCount() == bin.tier.storage) + if(entityplayer.getCurrentEquippedItem() != null) { - break; - } - - if(inv[i] != null) - { - ItemStack remain = bin.add(inv[i]); - inv[i] = remain; + ItemStack remain = bin.add(entityplayer.getCurrentEquippedItem()); + entityplayer.setCurrentItemOrArmor(0, remain); bin.addTicks = 5; } - - ((EntityPlayerMP)entityplayer).sendContainerToPlayer(entityplayer.openContainer); + } + else if(bin.addTicks > 0 && bin.getItemCount() > 0) + { + ItemStack[] inv = entityplayer.inventory.mainInventory; + + for(int i = 0; i < inv.length; i++) + { + if(bin.getItemCount() == bin.tier.storage) + { + break; + } + + if(inv[i] != null) + { + ItemStack remain = bin.add(inv[i]); + inv[i] = remain; + bin.addTicks = 5; + } + + ((EntityPlayerMP)entityplayer).sendContainerAndContentsToPlayer(entityplayer.openContainer, entityplayer.openContainer.getInventory()); + } } } } @@ -570,10 +613,20 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus } else if(tile instanceof IMultiblock) { + if(world.isRemote) + { + return true; + } + return ((IMultiblock)world.getTileEntity(pos)).onActivate(entityplayer); } else if(tile instanceof IStructuralMultiblock) { + if(world.isRemote) + { + return true; + } + return ((IStructuralMultiblock)world.getTileEntity(pos)).onActivate(entityplayer); } @@ -746,6 +799,20 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus return 12; } } + else if(blockType == BasicBlock.BASIC_BLOCK_2) + { + if(metadata == 5) + { + TileEntitySuperheatingElement element = (TileEntitySuperheatingElement)tileEntity; + + if(element.multiblockUUID != null && SynchronizedBoilerData.clientHotMap.get(element.multiblockUUID) != null) + { + return SynchronizedBoilerData.clientHotMap.get(element.multiblockUUID) ? 15 : 0; + } + + return 0; + } + } return 0; } @@ -818,6 +885,11 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus tileEntity.setFacing((short)change); tileEntity.redstone = world.isBlockIndirectlyGettingPowered(pos) > 0; + + if(tileEntity instanceof TileEntitySecurityDesk) + { + ((TileEntitySecurityDesk)tileEntity).owner = entityliving.getCommandSenderName(); + } if(tileEntity instanceof IBoundingBlock) { @@ -844,6 +916,21 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus } } } + + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int meta) + { + TileEntity tileEntity = world.getTileEntity(x, y, z); + + if(tileEntity instanceof IBoundingBlock) + { + ((IBoundingBlock)tileEntity).onBreak(); + } + + super.breakBlock(world, x, y, z, block, meta); + + world.removeTileEntity(x, y, z); + } @Override public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) @@ -1012,6 +1099,17 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus TileEntityInductionProvider tileEntity = (TileEntityInductionProvider)world.getTileEntity(pos); return ctms[meta][tileEntity.tier.ordinal()]; } + else if(type == BasicType.SUPERHEATING_ELEMENT) + { + TileEntitySuperheatingElement element = (TileEntitySuperheatingElement)world.getTileEntity(x, y, z); + + if(element.multiblockUUID != null && SynchronizedBoilerData.clientHotMap.get(element.multiblockUUID) != null) + { + return ctms[meta][SynchronizedBoilerData.clientHotMap.get(element.multiblockUUID) ? 1 : 0]; + } + + return ctms[meta][0]; + } return ctms[meta][0]; } diff --git a/src/main/java/mekanism/common/block/BlockBounding.java b/src/main/java/mekanism/common/block/BlockBounding.java index 3e2be1efa..777f5e43f 100644 --- a/src/main/java/mekanism/common/block/BlockBounding.java +++ b/src/main/java/mekanism/common/block/BlockBounding.java @@ -68,6 +68,14 @@ public class BlockBounding extends Block return false; } } + + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int meta) + { + super.breakBlock(world, x, y, z, block, meta); + + world.removeTileEntity(x, y, z); + } @Override public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) @@ -103,6 +111,17 @@ public class BlockBounding extends Block state1.getBlock().onNeighborBlockChange(world, tileEntity.mainPos, state1, this); } catch(Exception e) {} } + + @Override + public float getBlockHardness(World world, int x, int y, int z) + { + try { + TileEntityBoundingBlock tileEntity = (TileEntityBoundingBlock)world.getTileEntity(x, y, z); + return world.getBlock(tileEntity.mainX, tileEntity.mainY, tileEntity.mainZ).getBlockHardness(world, tileEntity.mainX, tileEntity.mainY, tileEntity.mainZ); + } catch(Exception e) { + return blockHardness; + } + } @Override public int quantityDropped(Random random) diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index fbd494a04..64d959dbc 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -12,9 +12,13 @@ import mekanism.common.base.ISustainedInventory; import mekanism.common.block.states.BlockStateEnergyCube; import mekanism.common.block.states.BlockStateFacing; import mekanism.common.item.ItemBlockEnergyCube; +import mekanism.common.security.ISecurityItem; +import mekanism.common.security.ISecurityTile; +import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -26,6 +30,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; @@ -178,6 +183,19 @@ public class BlockEnergyCube extends BlockContainer list.add(charged); } } + + @Override + public float getBlockHardness(World world, int x, int y, int z) + { + TileEntity tile = world.getTileEntity(x, y, z); + + if(tile instanceof ISecurityTile) + { + return SecurityUtils.getSecurity((ISecurityTile)tile) == SecurityMode.PUBLIC ? blockHardness : -1; + } + + return blockHardness; + } @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer entityplayer, EnumFacing side, float hitX, float hitY, float hitZ) @@ -195,24 +213,28 @@ public class BlockEnergyCube extends BlockContainer if(MekanismUtils.hasUsableWrench(entityplayer, pos)) { - if(entityplayer.isSneaking()) + if(SecurityUtils.canAccess(entityplayer, tileEntity)) { - dismantleBlock(world, pos, false); - return true; + if(entityplayer.isSneaking()) + { + dismantleBlock(world, x, y, z, false); + + return true; + } + + if(MekanismUtils.isBCWrench(tool)) + { + ((IToolWrench) tool).wrenchUsed(entityplayer, x, y, z); + } + + int change = ForgeDirection.ROTATION_MATRIX[side][tileEntity.facing]; + + tileEntity.setFacing((short)change); + world.notifyBlocksOfNeighborChange(x, y, z, this); + } + else { + SecurityUtils.displayNoAccess(entityplayer); } - - if(MekanismUtils.isBCWrench(tool)) - { - ((IToolWrench) tool).wrenchUsed(entityplayer, pos); - } - - EnumFacing rotated = tileEntity.facing.rotateAround(side.getAxis()); - rotated = side.getAxisDirection() == AxisDirection.POSITIVE ? rotated : rotated.getOpposite(); - - int change = rotated.ordinal(); - - tileEntity.setFacing((short)change); - world.notifyNeighborsOfStateChange(pos, this); return true; } @@ -222,7 +244,14 @@ public class BlockEnergyCube extends BlockContainer { if(!entityplayer.isSneaking()) { - entityplayer.openGui(Mekanism.instance, 8, world, pos.getX(), pos.getY(), pos.getZ()); + if(SecurityUtils.canAccess(entityplayer, tileEntity)) + { + entityplayer.openGui(Mekanism.instance, 8, world, x, y, z); + } + else { + SecurityUtils.displayNoAccess(entityplayer); + } + return true; } } @@ -270,6 +299,22 @@ public class BlockEnergyCube extends BlockContainer { TileEntityEnergyCube tileEntity = (TileEntityEnergyCube)world.getTileEntity(pos); ItemStack itemStack = new ItemStack(MekanismBlocks.EnergyCube); + + if(itemStack.stackTagCompound == null) + { + itemStack.setTagCompound(new NBTTagCompound()); + } + + if(tileEntity instanceof ISecurityTile) + { + ISecurityItem securityItem = (ISecurityItem)itemStack.getItem(); + + if(securityItem.hasSecurity(itemStack)) + { + securityItem.setOwner(itemStack, ((ISecurityTile)tileEntity).getSecurity().getOwner()); + securityItem.setSecurity(itemStack, ((ISecurityTile)tileEntity).getSecurity().getMode()); + } + } IEnergyCube energyCube = (IEnergyCube)itemStack.getItem(); energyCube.setEnergyCubeTier(itemStack, tileEntity.tier); diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index 5b2a9355e..e53735034 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -7,9 +7,13 @@ import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ITierItem; +import mekanism.common.security.ISecurityItem; +import mekanism.common.security.ISecurityTile; +import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -20,6 +24,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; @@ -81,6 +86,19 @@ public class BlockGasTank extends BlockContainer } } } + + @Override + public float getBlockHardness(World world, int x, int y, int z) + { + TileEntity tile = world.getTileEntity(x, y, z); + + if(tile instanceof ISecurityTile) + { + return SecurityUtils.getSecurity((ISecurityTile)tile) == SecurityMode.PUBLIC ? blockHardness : -1; + } + + return blockHardness; + } @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer entityplayer, EnumFacing side, float hitX, float hitY, float hitZ) @@ -98,21 +116,28 @@ public class BlockGasTank extends BlockContainer if(MekanismUtils.hasUsableWrench(entityplayer, pos)) { - if(entityplayer.isSneaking()) + if(SecurityUtils.canAccess(entityplayer, tileEntity)) { - dismantleBlock(world, pos, false); - return true; + if(entityplayer.isSneaking()) + { + dismantleBlock(world, pos, false); + + return true; + } + + if(MekanismUtils.isBCWrench(tool)) + { + ((IToolWrench)tool).wrenchUsed(entityplayer, pos); + } + + int change = tileEntity.facing.rotateY().ordinal(); + + tileEntity.setFacing((short)change); + world.notifyNeighborsOfStateChange(pos, this); } - - if(MekanismUtils.isBCWrench(tool)) - { - ((IToolWrench)tool).wrenchUsed(entityplayer, pos); + else { + SecurityUtils.displayNoAccess(entityplayer); } - - int change = tileEntity.facing.rotateY().ordinal(); - - tileEntity.setFacing((short)change); - world.notifyNeighborsOfStateChange(pos, this); return true; } @@ -122,7 +147,14 @@ public class BlockGasTank extends BlockContainer { if(!entityplayer.isSneaking()) { - entityplayer.openGui(Mekanism.instance, 10, world, pos.getX(), pos.getY(), pos.getZ()); + if(SecurityUtils.canAccess(entityplayer, tileEntity)) + { + entityplayer.openGui(Mekanism.instance, 10, world, x, y, z); + } + else { + SecurityUtils.displayNoAccess(entityplayer); + } + return true; } } @@ -205,6 +237,22 @@ public class BlockGasTank extends BlockContainer TileEntityGasTank tileEntity = (TileEntityGasTank)world.getTileEntity(pos); ItemStack itemStack = new ItemStack(MekanismBlocks.GasTank); + if(itemStack.stackTagCompound == null) + { + itemStack.setTagCompound(new NBTTagCompound()); + } + + if(tileEntity instanceof ISecurityTile) + { + ISecurityItem securityItem = (ISecurityItem)itemStack.getItem(); + + if(securityItem.hasSecurity(itemStack)) + { + securityItem.setOwner(itemStack, ((ISecurityTile)tileEntity).getSecurity().getOwner()); + securityItem.setSecurity(itemStack, ((ISecurityTile)tileEntity).getSecurity().getMode()); + } + } + ITierItem tierItem = (ITierItem)itemStack.getItem(); tierItem.setBaseTier(itemStack, tileEntity.tier.getBaseTier()); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 524ac08a3..e40180a06 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.Random; import mekanism.api.Coord4D; -import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.client; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; @@ -14,7 +13,6 @@ import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.FluidTankTier; import mekanism.common.base.IActiveState; 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; @@ -31,23 +29,56 @@ import mekanism.common.block.states.BlockStateMachine; import mekanism.common.block.states.BlockStateMachine.MachineBlock; import mekanism.common.block.states.BlockStateMachine.MachineType; 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.security.ISecurityItem; +import mekanism.common.security.ISecurityTile; +import mekanism.common.security.ISecurityTile.SecurityMode; +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.TileEntityElectricChest; +import mekanism.common.tile.TileEntityCrusher; +import mekanism.common.tile.TileEntityDigitalMiner; +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.TileEntityFactory; +import mekanism.common.tile.TileEntityFluidTank; +import mekanism.common.tile.TileEntityFluidicPlenisher; +import mekanism.common.tile.TileEntityFormulaicAssemblicator; +import mekanism.common.tile.TileEntityFuelwoodHeater; +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.TileEntityFluidTank; +import mekanism.common.tile.TileEntityOredictionificator; +import mekanism.common.tile.TileEntityOsmiumCompressor; +import mekanism.common.tile.TileEntityPRC; +import mekanism.common.tile.TileEntityPersonalChest; +import mekanism.common.tile.TileEntityPrecisionSawmill; +import mekanism.common.tile.TileEntityPurificationChamber; import mekanism.common.tile.TileEntityQuantumEntangloporter; +import mekanism.common.tile.TileEntityResistiveHeater; +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 mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -125,6 +156,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; * 2:3: Oredictionificator * 2:4: Resistive Heater * 2:5: Formulaic Assemblicator + * 2:6: Fuelwood Heater * * @author AidanBrady * @@ -209,44 +241,48 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou case MACHINE_BLOCK_1: ctms[11][0] = new CTMData("ctm/Teleporter", this, Arrays.asList(11)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock, Arrays.asList(7)).registerIcons(register); - MekanismRenderer.loadDynamicTextures(register, MachineType.ENRICHMENT_CHAMBER.name, icons[0], def); - MekanismRenderer.loadDynamicTextures(register, MachineType.OSMIUM_COMPRESSOR.name, icons[1], def); - MekanismRenderer.loadDynamicTextures(register, MachineType.COMBINER.name, icons[2], def); - MekanismRenderer.loadDynamicTextures(register, MachineType.CRUSHER.name, icons[3], def); + MekanismRenderer.loadDynamicTextures(register, "enrichment_chamber/" + MachineType.ENRICHMENT_CHAMBER.name, icons[0], def); + MekanismRenderer.loadDynamicTextures(register, "osmium_compressor/" + MachineType.OSMIUM_COMPRESSOR.name, icons[1], def); + MekanismRenderer.loadDynamicTextures(register, "combiner/" + MachineType.COMBINER.name, icons[2], def); + MekanismRenderer.loadDynamicTextures(register, "crusher/" + MachineType.CRUSHER.name, icons[3], def); for(RecipeType type : RecipeType.values()) { - MekanismRenderer.loadDynamicTextures(register, BaseTier.BASIC.getName() + type.getUnlocalizedName() + MachineType.BASIC_FACTORY.name, factoryIcons[0][type.ordinal()], - DefIcon.getActivePair(register.registerIcon("mekanism:BasicFactoryFront"), 2), - DefIcon.getActivePair(register.registerIcon("mekanism:BasicFactoryTop"), 1), - DefIcon.getActivePair(register.registerIcon("mekanism:BasicFactoryBottom"), 0), - DefIcon.getActivePair(register.registerIcon("mekanism:BasicFactorySide"), 3, 4, 5)); - MekanismRenderer.loadDynamicTextures(register, BaseTier.ADVANCED.getName() + type.getUnlocalizedName() + MachineType.ADVANCED_FACTORY.name, factoryIcons[1][type.ordinal()], - DefIcon.getActivePair(register.registerIcon("mekanism:AdvancedFactoryFront"), 2), - DefIcon.getActivePair(register.registerIcon("mekanism:AdvancedFactoryTop"), 1), - DefIcon.getActivePair(register.registerIcon("mekanism:AdvancedFactoryBottom"), 0), - DefIcon.getActivePair(register.registerIcon("mekanism:AdvancedFactorySide"), 3, 4, 5)); - MekanismRenderer.loadDynamicTextures(register, BaseTier.ELITE.getName() + type.getUnlocalizedName() + MachineType.ELITE_FACTORY.name, factoryIcons[2][type.ordinal()], - DefIcon.getActivePair(register.registerIcon("mekanism:EliteFactoryFront"), 2), - DefIcon.getActivePair(register.registerIcon("mekanism:EliteFactoryTop"), 1), - DefIcon.getActivePair(register.registerIcon("mekanism:EliteFactoryBottom"), 0), - DefIcon.getActivePair(register.registerIcon("mekanism:EliteFactorySide"), 3, 4, 5)); + MekanismRenderer.loadDynamicTextures(register, "factory/basic/" + type.getUnlocalizedName().toLowerCase() + "/" + BaseTier.BASIC.getName() + type.getUnlocalizedName() + MachineType.BASIC_FACTORY.name, factoryIcons[0][type.ordinal()], + DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactoryFront"), 2).setOverrides(false), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactoryTop"), 1).setOverrides(false), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactoryBottom"), 0).setOverrides(false), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/basic/BasicFactorySide"), 3, 4, 5).setOverrides(false)); + MekanismRenderer.loadDynamicTextures(register, "factory/advanced/" + type.getUnlocalizedName().toLowerCase() + "/" + BaseTier.ADVANCED.getName() + type.getUnlocalizedName() + MachineType.ADVANCED_FACTORY.name, factoryIcons[1][type.ordinal()], + DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactoryFront"), 2).setOverrides(false), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactoryTop"), 1).setOverrides(false), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactoryBottom"), 0).setOverrides(false), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/advanced/AdvancedFactorySide"), 3, 4, 5).setOverrides(false)); + MekanismRenderer.loadDynamicTextures(register, "factory/elite/" + type.getUnlocalizedName().toLowerCase() + "/" + BaseTier.ELITE.getName() + type.getUnlocalizedName() + MachineType.ELITE_FACTORY.name, factoryIcons[2][type.ordinal()], + DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactoryFront"), 2).setOverrides(false), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactoryTop"), 1).setOverrides(false), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactoryBottom"), 0).setOverrides(false), + DefIcon.getActivePair(register.registerIcon("mekanism:factory/elite/EliteFactorySide"), 3, 4, 5).setOverrides(false)); } - MekanismRenderer.loadDynamicTextures(register, MachineType.PURIFICATION_CHAMBER.name, icons[9], def); - MekanismRenderer.loadDynamicTextures(register, MachineType.ENERGIZED_SMELTER.name, icons[10], def); + MekanismRenderer.loadDynamicTextures(register, "purification_chamber/" + MachineType.PURIFICATION_CHAMBER.name, icons[9], def); + MekanismRenderer.loadDynamicTextures(register, "energized_smelter/" + MachineType.ENERGIZED_SMELTER.name, icons[10], def); icons[11][0] = ctms[11][0].mainTextureData.icon; + break; case MACHINE_BLOCK_2: - MekanismRenderer.loadDynamicTextures(register, MachineType.CHEMICAL_INJECTION_CHAMBER.name, icons[3], def); - MekanismRenderer.loadDynamicTextures(register, MachineType.PRECISION_SAWMILL.name, icons[5], def); + MekanismRenderer.loadDynamicTextures(register, "chemical_injection_chamber/" + MachineType.CHEMICAL_INJECTION_CHAMBER.name, icons[3], def); + MekanismRenderer.loadDynamicTextures(register, "precision_sawmill/" + MachineType.PRECISION_SAWMILL.name, icons[5], def); + break; case MACHINE_BLOCK_3: icons[0][0] = BASE_ICON; icons[2][0] = BASE_ICON; + MekanismRenderer.loadDynamicTextures(register, "oredictionificator/" + MachineType.OREDICTIONIFICATOR.name, icons[3]); icons[4][0] = BASE_ICON; - icons[5][0] = BASE_ICON; - MekanismRenderer.loadDynamicTextures(register, MachineType.OREDICTIONIFICATOR.name, icons[3], DefIcon.getAll(register.registerIcon("mekanism:OredictionificatorSide"))); + MekanismRenderer.loadDynamicTextures(register, "formulaic_assemblicator/" + MachineType.FORMULAIC_ASSEMBLICATOR.name, icons[5]); + MekanismRenderer.loadDynamicTextures(register, "fuelwood_heater/" + MachineType.FUELWOOD_HEATER.name, icons[6]); + break; } } @@ -331,16 +367,6 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou } } } - else if(tileEntity instanceof TileEntityTeleporter) - { - TileEntityTeleporter teleporter = (TileEntityTeleporter)tileEntity; - teleporter.owner = placer.getName(); - } - else if(tileEntity instanceof TileEntityQuantumEntangloporter) - { - TileEntityQuantumEntangloporter entangloporter = (TileEntityQuantumEntangloporter)tileEntity; - entangloporter.owner = placer.getName(); - } if(tileEntity instanceof IBoundingBlock) { @@ -456,6 +482,8 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou switch(meta) { case 3: + case 5: + case 6: return icons[meta][side]; default: return icons[meta][0] != null ? icons[meta][0] : BASE_ICON; @@ -509,6 +537,8 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou switch(meta) { case 3: + case 5: + case 6: boolean active = MekanismUtils.isActive(world, pos); return icons[meta][MekanismUtils.getBaseOrientation(side, tileEntity.facing)+(active ? 6 : 0)]; default: @@ -595,38 +625,46 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou if(MekanismUtils.hasUsableWrench(entityplayer, pos)) { - if(entityplayer.isSneaking() && BlockStateMachine.MachineType.get(getMachineBlock(), metadata) != BlockStateMachine.MachineType.ELECTRIC_CHEST) + if(SecurityUtils.canAccess(entityplayer, tileEntity)) { - dismantleBlock(world, pos, false); - return true; - } - - if(MekanismUtils.isBCWrench(tool)) - { - ((IToolWrench)tool).wrenchUsed(entityplayer, pos); - } - - int change = tileEntity.facing.rotateY().ordinal(); - - if(tileEntity instanceof TileEntityLogisticalSorter) - { - if(!((TileEntityLogisticalSorter)tileEntity).hasInventory()) + if(entityplayer.isSneaking()) { - for(EnumFacing dir : EnumFacing.VALUES) + dismantleBlock(world, x, y, z, false); + + return true; + } + + if(MekanismUtils.isBCWrench(tool)) + { + ((IToolWrench)tool).wrenchUsed(entityplayer, pos); + } + + int change = tileEntity.facing.rotateY().ordinal(); + + if(tileEntity instanceof TileEntityLogisticalSorter) + { + if(!((TileEntityLogisticalSorter)tileEntity).hasInventory()) { - TileEntity tile = Coord4D.get(tileEntity).offset(dir).getTileEntity(world); - - if(tile instanceof IInventory) + for(EnumFacing dir : EnumFacing.VALUES) { - change = dir.getOpposite().ordinal(); - break; + TileEntity tile = Coord4D.get(tileEntity).offset(dir).getTileEntity(world); + + if(tile instanceof IInventory) + { + change = dir.getOpposite().ordinal(); + break; + } } } } + + tileEntity.setFacing((short)change); + world.notifyBlocksOfNeighborChange(x, y, z, this); } - - tileEntity.setFacing((short)change); - world.notifyNeighborsOfStateChange(pos, this); + else { + SecurityUtils.displayNoAccess(entityplayer); + } + return true; } } @@ -637,91 +675,96 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou switch(type) { - case ELECTRIC_CHEST: - TileEntityElectricChest electricChest = (TileEntityElectricChest)tileEntity; - - if(!(entityplayer.isSneaking() || world.isSideSolid(pos.up(), EnumFacing.DOWN))) + case PERSONAL_CHEST: + if(!entityplayer.isSneaking() && !world.isSideSolid(x, y + 1, z, ForgeDirection.DOWN)) { - if(electricChest.canAccess() || MekanismUtils.isOp((EntityPlayerMP)entityplayer)) + TileEntityPersonalChest chest = (TileEntityPersonalChest)tileEntity; + + if(SecurityUtils.canAccess(entityplayer, tileEntity)) { - MekanismUtils.openElectricChestGui((EntityPlayerMP)entityplayer, electricChest, null, true); - } - else if(!electricChest.authenticated) - { - Mekanism.packetHandler.sendTo(new ElectricChestMessage(ElectricChestPacketType.CLIENT_OPEN, true, false, 2, 0, null, Coord4D.get(electricChest)), (EntityPlayerMP)entityplayer); - } + MekanismUtils.openPersonalChestGui((EntityPlayerMP)entityplayer, chest, null, true); + } else { - Mekanism.packetHandler.sendTo(new ElectricChestMessage(ElectricChestPacketType.CLIENT_OPEN, true, false, 1, 0, null, Coord4D.get(electricChest)), (EntityPlayerMP)entityplayer); + SecurityUtils.displayNoAccess(entityplayer); } - + return true; } - break; - case FLUID_TANK: - if(entityplayer.getCurrentEquippedItem() != null && FluidContainerRegistry.isContainer(entityplayer.getCurrentEquippedItem())) - { - if(manageInventory(entityplayer, (TileEntityFluidTank)tileEntity)) - { - entityplayer.inventory.markDirty(); - return true; - } - } - else { - entityplayer.openGui(Mekanism.instance, type.guiId, world, pos.getX(), pos.getY(), pos.getZ()); - } - return true; - case LOGISTICAL_SORTER: - LogisticalSorterGuiMessage.openServerGui(SorterGuiPacket.SERVER, 0, world, (EntityPlayerMP)entityplayer, Coord4D.get(tileEntity), -1); - return true; - case TELEPORTER: + break; + case FLUID_TANK: if(!entityplayer.isSneaking()) { - TileEntityTeleporter teleporter = (TileEntityTeleporter)tileEntity; - - if(teleporter.owner == null) + if(SecurityUtils.canAccess(entityplayer, tileEntity)) { - teleporter.owner = entityplayer.getName(); - } - - if(teleporter.owner.equals(entityplayer.getName()) || MekanismUtils.isOp((EntityPlayerMP)entityplayer)) - { - entityplayer.openGui(Mekanism.instance, type.guiId, world, pos.getX(), pos.getY(), pos.getZ()); + if(entityplayer.getCurrentEquippedItem() != null && FluidContainerRegistry.isContainer(entityplayer.getCurrentEquippedItem())) + { + if(manageInventory(entityplayer, (TileEntityFluidTank)tileEntity)) + { + entityplayer.inventory.markDirty(); + return true; + } + } + else { + entityplayer.openGui(Mekanism.instance, type.guiId, world, x, y, z); + } } else { - entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("gui.teleporter.noAccess"))); + SecurityUtils.displayNoAccess(entityplayer); } return true; } + + break; + case LOGISTICAL_SORTER: + if(!entityplayer.isSneaking()) + { + if(SecurityUtils.canAccess(entityplayer, tileEntity)) + { + LogisticalSorterGuiMessage.openServerGui(SorterGuiPacket.SERVER, 0, world, (EntityPlayerMP)entityplayer, Coord4D.get(tileEntity), -1); + } + else { + SecurityUtils.displayNoAccess(entityplayer); + } + + return true; + } + + break; + case TELEPORTER: case QUANTUM_ENTANGLOPORTER: if(!entityplayer.isSneaking()) { - TileEntityQuantumEntangloporter teleporter = (TileEntityQuantumEntangloporter)tileEntity; + String owner = ((ISecurityTile)tileEntity).getSecurity().getOwner(); - if(teleporter.owner == null) - { - teleporter.owner = entityplayer.getName(); - } - - if(teleporter.owner.equals(entityplayer.getName()) || MekanismUtils.isOp((EntityPlayerMP)entityplayer)) + if(owner == null || entityplayer.getCommandSenderName().equals(owner)) { entityplayer.openGui(Mekanism.instance, type.guiId, world, pos.getX(), pos.getY(), pos.getZ()); } else { - entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("gui.entangloporter.noAccess"))); + SecurityUtils.displayNoAccess(entityplayer); } return true; } + + break; default: if(!entityplayer.isSneaking() && type.guiId != -1) { - entityplayer.openGui(Mekanism.instance, type.guiId, world, pos.getX(), pos.getY(), pos.getZ()); + if(SecurityUtils.canAccess(entityplayer, tileEntity)) + { + entityplayer.openGui(Mekanism.instance, type.guiId, world, x, y, z); + } + else { + SecurityUtils.displayNoAccess(entityplayer); + } + return true; } - return false; + break; } } @@ -767,28 +810,26 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou @Override public float getBlockHardness(World world, BlockPos pos) { - IBlockState state = world.getBlockState(pos); - if(BlockStateMachine.MachineType.get(getMachineBlock(), state.getBlock().getMetaFromState(state)) != BlockStateMachine.MachineType.ELECTRIC_CHEST) + TileEntity tile = world.getTileEntity(pos); + + if(tile instanceof ISecurityTile) { - return blockHardness; - } - else { - TileEntityElectricChest tileEntity = (TileEntityElectricChest)world.getTileEntity(pos); - return tileEntity.canAccess() ? 3.5F : -1; + return SecurityUtils.getSecurity((ISecurityTile)tile) == SecurityMode.PUBLIC ? blockHardness : -1; } + + return blockHardness; } @Override public float getExplosionResistance(World world, BlockPos pos, Entity exploder, Explosion explosion) { IBlockState state = world.getBlockState(pos); - if(BlockStateMachine.MachineType.get(getMachineBlock(), state.getBlock().getMetaFromState(state)) != BlockStateMachine.MachineType.ELECTRIC_CHEST) + if(BlockStateMachine.MachineType.get(getMachineBlock(), state.getBlock().getMetaFromState(state)) != BlockStateMachine.MachineType.PERSONAL_CHEST) { return blockResistance; } else { - TileEntityElectricChest tileEntity = (TileEntityElectricChest)world.getTileEntity(pos); - return tileEntity.canAccess() ? 3.5F : -1; + return -1; } } @@ -933,7 +974,7 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou { ((TileEntityBasicBlock)tileEntity).onNeighborChange(neighborBlock); } - + if(tileEntity instanceof TileEntityLogisticalSorter) { TileEntityLogisticalSorter sorter = (TileEntityLogisticalSorter)tileEntity; @@ -972,6 +1013,17 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou ITierItem tierItem = (ITierItem)itemStack.getItem(); tierItem.setBaseTier(itemStack, ((TileEntityFluidTank)tileEntity).tier.getBaseTier()); } + + if(tileEntity instanceof ISecurityTile) + { + ISecurityItem securityItem = (ISecurityItem)itemStack.getItem(); + + if(securityItem.hasSecurity(itemStack)) + { + securityItem.setOwner(itemStack, ((ISecurityTile)tileEntity).getSecurity().getOwner()); + securityItem.setSecurity(itemStack, ((ISecurityTile)tileEntity).getSecurity().getMode()); + } + } if(tileEntity instanceof IUpgradeTile) { @@ -1019,14 +1071,6 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou } } - if(tileEntity instanceof TileEntityElectricChest) - { - IElectricChest electricChest = (IElectricChest)itemStack.getItem(); - electricChest.setAuthenticated(itemStack, ((TileEntityElectricChest)tileEntity).authenticated); - electricChest.setLocked(itemStack, ((TileEntityElectricChest)tileEntity).locked); - electricChest.setPassword(itemStack, ((TileEntityElectricChest)tileEntity).password); - } - if(tileEntity instanceof TileEntityFactory) { IFactory factoryItem = (IFactory)itemStack.getItem(); @@ -1128,7 +1172,7 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou switch(type) { case CHARGEPAD: - case ELECTRIC_CHEST: + case PERSONAL_CHEST: return false; case FLUID_TANK: return side == EnumFacing.UP || side == EnumFacing.DOWN; diff --git a/src/main/java/mekanism/common/block/BlockObsidianTNT.java b/src/main/java/mekanism/common/block/BlockObsidianTNT.java index ab067512a..d241a1235 100644 --- a/src/main/java/mekanism/common/block/BlockObsidianTNT.java +++ b/src/main/java/mekanism/common/block/BlockObsidianTNT.java @@ -27,6 +27,14 @@ public class BlockObsidianTNT extends Block setCreativeTab(Mekanism.tabMekanism); } + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int meta) + { + super.breakBlock(world, x, y, z, block, meta); + + world.removeTileEntity(x, y, z); + } + @Override public void onBlockAdded(World world, BlockPos pos, IBlockState state) { diff --git a/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java b/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java index 79b4a5278..3713ca9d1 100644 --- a/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java +++ b/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java @@ -14,17 +14,23 @@ public class RecipeFormula public ItemStack[] input = new ItemStack[9]; - public RecipeFormula(ItemStack[] inv) + public IRecipe recipe = null; + + public RecipeFormula(World world, ItemStack[] inv) { - this(inv, 0); + this(world, inv, 0); } - public RecipeFormula(ItemStack[] inv, int start) + public RecipeFormula(World world, ItemStack[] inv, int start) { for(int i = 0; i < 9; i++) { input[i] = StackUtils.size(inv[start+i], 1); } + + resetToRecipe(); + + recipe = RecipeUtils.getRecipeFromGrid(dummy, world); } private void resetToRecipe() @@ -35,46 +41,31 @@ public class RecipeFormula } } - public boolean matches(World world, ItemStack[] input, int start) + public boolean matches(World world, ItemStack[] newInput, int start) { - resetToRecipe(); - - IRecipe origRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); - for(int i = 0; i < 9; i++) { - dummy.setInventorySlotContents(i, input[start+i]); + dummy.setInventorySlotContents(i, newInput[start+i]); } - IRecipe newRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); - - return origRecipe == newRecipe; + return recipe.matches(dummy, world); } public boolean isIngredientInPos(World world, ItemStack stack, int i) { resetToRecipe(); - - IRecipe origRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); dummy.setInventorySlotContents(i, stack); - IRecipe newRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); - return origRecipe == newRecipe; + return recipe.matches(dummy, world); } public boolean isIngredient(World world, ItemStack stack) { - resetToRecipe(); - - IRecipe origRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); - for(int i = 0; i < 9; i++) { dummy.setInventorySlotContents(i, stack); - IRecipe newRecipe = RecipeUtils.getRecipeFromGrid(dummy, world); - - if(origRecipe == newRecipe) + if(recipe.matches(dummy, world)) { return true; } @@ -92,9 +83,7 @@ public class RecipeFormula public IRecipe getRecipe(World world) { - resetToRecipe(); - - return RecipeUtils.getRecipeFromGrid(dummy, world); + return recipe; } public boolean isFormulaEqual(World world, RecipeFormula formula) diff --git a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java index 5a72a2686..174aef92b 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java @@ -66,6 +66,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol } else if(tile instanceof TileEntitySuperheatingElement) { + structure.internalLocations.add(coord); elements.add(coord); } } @@ -225,6 +226,8 @@ public class BoilerUpdateProtocol extends UpdateProtocol @Override protected void onFormed() { + super.onFormed(); + if((structureFound).waterStored != null) { (structureFound).waterStored.amount = Math.min((structureFound).waterStored.amount, structureFound.waterVolume*WATER_PER_TANK); diff --git a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java index 4db66943e..0516dd5f6 100644 --- a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java +++ b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java @@ -1,6 +1,8 @@ package mekanism.common.content.boiler; +import java.util.HashMap; import java.util.HashSet; +import java.util.Map; import java.util.Set; import mekanism.api.Coord4D; @@ -16,6 +18,8 @@ import net.minecraftforge.fluids.FluidStack; public class SynchronizedBoilerData extends SynchronizedData implements IHeatTransfer { + public static Map clientHotMap = new HashMap(); + public static double CASING_INSULATION_COEFFICIENT = 1; public static double CASING_INVERSE_CONDUCTION_COEFFICIENT = 1; public static double BASE_BOIL_TEMP = 100-(TemperatureUnit.AMBIENT.zeroOffset-TemperatureUnit.CELSIUS.zeroOffset); @@ -29,6 +33,8 @@ public class SynchronizedBoilerData extends SynchronizedData @Override protected void onFormed() { + super.onFormed(); + if(structureFound.fluidStored != null) { structureFound.fluidStored.amount = Math.min(structureFound.fluidStored.amount, structureFound.volume*FLUID_PER_TANK); diff --git a/src/main/java/mekanism/common/frequency/Frequency.java b/src/main/java/mekanism/common/frequency/Frequency.java index 142bb7744..d4b6df755 100644 --- a/src/main/java/mekanism/common/frequency/Frequency.java +++ b/src/main/java/mekanism/common/frequency/Frequency.java @@ -12,6 +12,8 @@ import net.minecraft.nbt.NBTTagCompound; public class Frequency { + public static final String TELEPORTER = "Teleporter"; + public String name; public String owner; diff --git a/src/main/java/mekanism/common/frequency/FrequencyManager.java b/src/main/java/mekanism/common/frequency/FrequencyManager.java index d07a4fa75..4e809aa81 100644 --- a/src/main/java/mekanism/common/frequency/FrequencyManager.java +++ b/src/main/java/mekanism/common/frequency/FrequencyManager.java @@ -255,7 +255,7 @@ public class FrequencyManager iter.remove(); } else { - Frequency freq = ((IFrequencyHandler)tile).getFrequency(); + Frequency freq = ((IFrequencyHandler)tile).getFrequency(this); if(freq == null || !freq.equals(iterFreq)) { diff --git a/src/main/java/mekanism/common/frequency/IFrequencyHandler.java b/src/main/java/mekanism/common/frequency/IFrequencyHandler.java index 753e99d8f..4a760495c 100644 --- a/src/main/java/mekanism/common/frequency/IFrequencyHandler.java +++ b/src/main/java/mekanism/common/frequency/IFrequencyHandler.java @@ -2,5 +2,5 @@ package mekanism.common.frequency; public interface IFrequencyHandler { - public Frequency getFrequency(); + public Frequency getFrequency(FrequencyManager manager); } diff --git a/src/main/java/mekanism/common/inventory/InventoryElectricChest.java b/src/main/java/mekanism/common/inventory/InventoryPersonalChest.java similarity index 89% rename from src/main/java/mekanism/common/inventory/InventoryElectricChest.java rename to src/main/java/mekanism/common/inventory/InventoryPersonalChest.java index c09693f99..f6832fbe0 100644 --- a/src/main/java/mekanism/common/inventory/InventoryElectricChest.java +++ b/src/main/java/mekanism/common/inventory/InventoryPersonalChest.java @@ -7,24 +7,24 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -public class InventoryElectricChest extends InventoryBasic +public class InventoryPersonalChest extends InventoryBasic { public EntityPlayer entityPlayer; public ItemStack itemStack; public boolean reading; - public InventoryElectricChest(EntityPlayer player) + public InventoryPersonalChest(EntityPlayer player) { - super("Electric Chest", false, 55); + super("PersonalChest", false, 55); entityPlayer = player; read(); } - public InventoryElectricChest(ItemStack stack) + public InventoryPersonalChest(ItemStack stack) { - super("Electric Chest", false, 55); + super("PersonalChest", false, 55); itemStack = stack; read(); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFuelwoodHeater.java b/src/main/java/mekanism/common/inventory/container/ContainerFuelwoodHeater.java new file mode 100644 index 000000000..d22546b70 --- /dev/null +++ b/src/main/java/mekanism/common/inventory/container/ContainerFuelwoodHeater.java @@ -0,0 +1,123 @@ +package mekanism.common.inventory.container; + +import mekanism.common.tile.TileEntityFuelwoodHeater; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntityFurnace; + +public class ContainerFuelwoodHeater extends Container +{ + private TileEntityFuelwoodHeater tileEntity; + + public ContainerFuelwoodHeater(InventoryPlayer inventory, TileEntityFuelwoodHeater tentity) + { + tileEntity = tentity; + addSlotToContainer(new Slot(tentity, 0, 15, 29)); + + int slotY; + + for(slotY = 0; slotY < 3; slotY++) + { + for(int slotX = 0; slotX < 9; slotX++) + { + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 84 + slotY * 18)); + } + } + + for(slotY = 0; slotY < 9; slotY++) + { + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 142)); + } + + tileEntity.open(inventory.player); + tileEntity.openInventory(); + } + + @Override + public void onContainerClosed(EntityPlayer entityplayer) + { + super.onContainerClosed(entityplayer); + + tileEntity.close(entityplayer); + tileEntity.closeInventory(); + } + + @Override + public boolean canInteractWith(EntityPlayer entityplayer) + { + return tileEntity.isUseableByPlayer(entityplayer); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int slotID) + { + ItemStack stack = null; + Slot currentSlot = (Slot)inventorySlots.get(slotID); + + if(currentSlot != null && currentSlot.getHasStack()) + { + ItemStack slotStack = currentSlot.getStack(); + stack = slotStack.copy(); + + if(TileEntityFurnace.getItemBurnTime(slotStack) > 0) + { + if(slotID != 0) + { + if(!mergeItemStack(slotStack, 0, 1, false)) + { + return null; + } + } + else if(slotID == 0) + { + if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) + { + return null; + } + } + } + else { + if(slotID >= 1 && slotID <= 27) + { + if(!mergeItemStack(slotStack, 28, inventorySlots.size(), false)) + { + return null; + } + } + else if(slotID > 27) + { + if(!mergeItemStack(slotStack, 1, 27, false)) + { + return null; + } + } + else { + if(!mergeItemStack(slotStack, 1, inventorySlots.size(), true)) + { + return null; + } + } + } + + if(slotStack.stackSize == 0) + { + currentSlot.putStack((ItemStack)null); + } + else { + currentSlot.onSlotChanged(); + } + + if(slotStack.stackSize == stack.stackSize) + { + return null; + } + + currentSlot.onPickupFromSlot(player, slotStack); + } + + return stack; + } +} diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectricChest.java b/src/main/java/mekanism/common/inventory/container/ContainerPersonalChest.java similarity index 64% rename from src/main/java/mekanism/common/inventory/container/ContainerElectricChest.java rename to src/main/java/mekanism/common/inventory/container/ContainerPersonalChest.java index 1e593a531..62647f0cd 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectricChest.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerPersonalChest.java @@ -1,12 +1,9 @@ package mekanism.common.inventory.container; import invtweaks.api.container.ChestContainer; -import mekanism.common.base.IElectricChest; import mekanism.common.block.states.BlockStateMachine; -import mekanism.common.inventory.slot.SlotElectricChest; -import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; -import mekanism.common.tile.TileEntityElectricChest; -import mekanism.common.util.ChargeUtils; +import mekanism.common.inventory.slot.SlotPersonalChest; +import mekanism.common.tile.TileEntityPersonalChest; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -15,13 +12,13 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @ChestContainer(isLargeChest=true) -public class ContainerElectricChest extends Container +public class ContainerPersonalChest extends Container { - private TileEntityElectricChest tileEntity; + private TileEntityPersonalChest tileEntity; private IInventory itemInventory; private boolean isBlock; - public ContainerElectricChest(InventoryPlayer inventory, TileEntityElectricChest tentity, IInventory inv, boolean b) + public ContainerPersonalChest(InventoryPlayer inventory, TileEntityPersonalChest tentity, IInventory inv, boolean b) { tileEntity = tentity; itemInventory = inv; @@ -40,25 +37,23 @@ public class ContainerElectricChest extends Container { for(int slotX = 0; slotX < 9; slotX++) { - addSlotToContainer(new SlotElectricChest(getInv(), slotX + slotY * 9, 8 + slotX * 18, 26 + slotY * 18)); + addSlotToContainer(new SlotPersonalChest(getInv(), slotX + slotY * 9, 8 + slotX * 18, 26 + slotY * 18)); } } - addSlotToContainer(new SlotDischarge(getInv(), 54, 180, 11)); - int slotX; for(slotX = 0; slotX < 3; ++slotX) { for(int slotY = 0; slotY < 9; ++slotY) { - addSlotToContainer(new SlotElectricChest(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 148 + slotX * 18)); + addSlotToContainer(new SlotPersonalChest(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 148 + slotX * 18)); } } for(slotX = 0; slotX < 9; ++slotX) { - addSlotToContainer(new SlotElectricChest(inventory, slotX, 8 + slotX * 18, 206)); + addSlotToContainer(new SlotPersonalChest(inventory, slotX, 8 + slotX * 18, 206)); } } @@ -110,36 +105,17 @@ public class ContainerElectricChest extends Container ItemStack slotStack = currentSlot.getStack(); stack = slotStack.copy(); - if(ChargeUtils.canBeDischarged(slotStack)) + if(slotID < 54) { - if(slotID != 54) - { - if(!mergeItemStack(slotStack, 54, 55, false)) - { - return null; - } - } - else - { - if(!mergeItemStack(slotStack, 55, inventorySlots.size(), true)) - { - return null; - } - } - } - else { - if(slotID < 54) - { - if(!mergeItemStack(slotStack, 55, inventorySlots.size(), true)) - { - return null; - } - } - else if(!mergeItemStack(slotStack, 0, 54, false)) + if(!mergeItemStack(slotStack, 54, inventorySlots.size(), true)) { return null; } } + else if(!mergeItemStack(slotStack, 0, 54, false)) + { + return null; + } if(slotStack.stackSize == 0) { @@ -166,14 +142,11 @@ public class ContainerElectricChest extends Container if(modifier == 2 && destSlot >= 0 && destSlot < 9) { ItemStack itemStack = player.inventory.getStackInSlot(destSlot); - if(itemStack != null && itemStack.getItem() instanceof IElectricChest) + + if(MachineType.get(itemStack) == MachineType.PERSONAL_CHEST) { - if(BlockStateMachine.MachineType.get(itemStack) == BlockStateMachine.MachineType.ELECTRIC_CHEST) - { - return null; - } + return null; } - } return super.slotClick(slotNumber, destSlot, modifier, player); diff --git a/src/main/java/mekanism/common/inventory/container/ContainerSecurityDesk.java b/src/main/java/mekanism/common/inventory/container/ContainerSecurityDesk.java new file mode 100644 index 000000000..289a34f6c --- /dev/null +++ b/src/main/java/mekanism/common/inventory/container/ContainerSecurityDesk.java @@ -0,0 +1,124 @@ +package mekanism.common.inventory.container; + +import mekanism.common.security.ISecurityItem; +import mekanism.common.tile.TileEntitySecurityDesk; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class ContainerSecurityDesk extends Container +{ + private TileEntitySecurityDesk tileEntity; + + public ContainerSecurityDesk(InventoryPlayer inventory, TileEntitySecurityDesk tentity) + { + tileEntity = tentity; + + addSlotToContainer(new Slot(tentity, 0, 146, 18)); + addSlotToContainer(new Slot(tentity, 1, 146, 97)); + + int slotY; + + for(slotY = 0; slotY < 3; slotY++) + { + for(int slotX = 0; slotX < 9; slotX++) + { + addSlotToContainer(new Slot(inventory, slotX + slotY * 9 + 9, 8 + slotX * 18, 148 + slotY * 18)); + } + } + + for(slotY = 0; slotY < 9; slotY++) + { + addSlotToContainer(new Slot(inventory, slotY, 8 + slotY * 18, 206)); + } + + tileEntity.open(inventory.player); + tileEntity.openInventory(); + } + + @Override + public void onContainerClosed(EntityPlayer entityplayer) + { + super.onContainerClosed(entityplayer); + + tileEntity.close(entityplayer); + tileEntity.closeInventory(); + } + + @Override + public boolean canInteractWith(EntityPlayer entityplayer) + { + return tileEntity.isUseableByPlayer(entityplayer); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int slotID) + { + ItemStack stack = null; + Slot currentSlot = (Slot)inventorySlots.get(slotID); + + if(currentSlot != null && currentSlot.getHasStack()) + { + ItemStack slotStack = currentSlot.getStack(); + stack = slotStack.copy(); + + if(slotStack.getItem() instanceof ISecurityItem && ((ISecurityItem)slotStack.getItem()).hasSecurity(slotStack)) + { + if(slotID != 0 && slotID != 1) + { + if(!mergeItemStack(slotStack, 1, 2, false)) + { + return null; + } + } + else { + if(!mergeItemStack(slotStack, 29, inventorySlots.size(), false)) + { + return null; + } + } + } + else { + if(slotID >= 2 && slotID <= 28) + { + if(!mergeItemStack(slotStack, 29, inventorySlots.size(), false)) + { + return null; + } + } + else if(slotID > 28) + { + if(!mergeItemStack(slotStack, 2, 28, false)) + { + return null; + } + } + else { + if(!mergeItemStack(slotStack, 2, inventorySlots.size(), true)) + { + return null; + } + } + } + + if(slotStack.stackSize == 0) + { + currentSlot.putStack((ItemStack)null); + } + else { + currentSlot.onSlotChanged(); + } + + if(slotStack.stackSize == stack.stackSize) + { + return null; + } + + currentSlot.onPickupFromSlot(player, slotStack); + } + + return stack; + } +} diff --git a/src/main/java/mekanism/common/inventory/slot/SlotElectricChest.java b/src/main/java/mekanism/common/inventory/slot/SlotElectricChest.java deleted file mode 100644 index 6d210b45f..000000000 --- a/src/main/java/mekanism/common/inventory/slot/SlotElectricChest.java +++ /dev/null @@ -1,37 +0,0 @@ -package mekanism.common.inventory.slot; - -import mekanism.common.base.IElectricChest; -import mekanism.common.block.states.BlockStateMachine; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -public class SlotElectricChest extends Slot -{ - public SlotElectricChest(IInventory inventory, int index, int x, int y) - { - super(inventory, index, x, y); - } - - @Override - public boolean canTakeStack(EntityPlayer player) - { - ItemStack itemstack = inventory.getStackInSlot(getSlotIndex()); - - if(itemstack == null) - { - return true; - } - - if(itemstack.getItem() instanceof IElectricChest) - { - if(BlockStateMachine.MachineType.get(itemstack) == BlockStateMachine.MachineType.ELECTRIC_CHEST) - { - return false; - } - } - - return true; - } -} diff --git a/src/main/java/mekanism/common/inventory/slot/SlotPersonalChest.java b/src/main/java/mekanism/common/inventory/slot/SlotPersonalChest.java new file mode 100644 index 000000000..881c4fbc7 --- /dev/null +++ b/src/main/java/mekanism/common/inventory/slot/SlotPersonalChest.java @@ -0,0 +1,25 @@ +package mekanism.common.inventory.slot; + +import mekanism.common.block.BlockMachine.MachineType; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; + +public class SlotPersonalChest extends Slot +{ + public SlotPersonalChest(IInventory inventory, int index, int x, int y) + { + super(inventory, index, x, y); + } + + @Override + public boolean canTakeStack(EntityPlayer player) + { + if(inventory.getStackInSlot(getSlotIndex()) == null) + { + return false; + } + + return MachineType.get(inventory.getStackInSlot(getSlotIndex())) != MachineType.PERSONAL_CHEST; + } +} diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 32c5605f7..142f958dc 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -68,6 +68,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; * 1:6: Pressure Disperser * 1:7: Boiler Casing * 1:8: Boiler Valve + * 1:9: Security Desk * @author AidanBrady * */ @@ -236,12 +237,20 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt @Override public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState metadata) { - boolean place = super.placeBlockAt(stack, player, world, pos, side, hitX, hitY, hitZ, metadata); - - if(place) + boolean place = true; + + BasicBlockType type = BasicBlockType.get(stack); + + if(type == BasicType.SECURITY_DESK) { - BasicBlockType type = BasicBlockType.get(stack); + if(y+1 > 255 || !world.getBlock(x, y+1, z).isReplaceable(world, x, y+1, z)) + { + place = false; + } + } + if(place && super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) + { if(type == BasicBlockType.BIN && stack.getTagCompound() != null) { TileEntityBin tileEntity = (TileEntityBin)world.getTileEntity(pos); diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index c9a4d9fd9..df8371517 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -19,9 +19,13 @@ import mekanism.common.base.IEnergyCube; import mekanism.common.base.ISustainedInventory; import mekanism.common.integration.IC2ItemManager; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityItem; +import mekanism.common.security.ISecurityTile; +import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.settings.GameSettings; @@ -45,7 +49,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; @InterfaceList({ @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") }) -public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IEnergyCube, ISpecialElectricItem, ISustainedInventory, IEnergyContainerItem +public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IEnergyCube, ISpecialElectricItem, ISustainedInventory, IEnergyContainerItem, ISecurityItem { public Block metaBlock; @@ -63,12 +67,24 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE @SideOnly(Side.CLIENT) public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); + if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails") + "."); } else { - list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); + if(hasSecurity(itemstack)) + { + list.add(SecurityUtils.getOwnerDisplay(entityplayer.getCommandSenderName(), getOwner(itemstack))); + list.add(EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay(itemstack)); + + if(SecurityUtils.isOverridden(itemstack)) + { + list.add(EnumColor.RED + "(" + LangUtils.localize("gui.overridden") + ")"); + } + } + list.add(EnumColor.AQUA + LangUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + LangUtils.transYesNo(getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); } } @@ -98,6 +114,22 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE TileEntityEnergyCube tileEntity = (TileEntityEnergyCube)world.getTileEntity(pos); tileEntity.tier = ((IEnergyCube)stack.getItem()).getEnergyCubeTier(stack); tileEntity.electricityStored = getEnergy(stack); + + if(tileEntity instanceof ISecurityTile) + { + ISecurityTile security = (ISecurityTile)tileEntity; + security.getSecurity().setOwner(getOwner(stack)); + + if(hasSecurity(stack)) + { + security.getSecurity().setMode(getSecurity(stack)); + } + + if(getOwner(stack) == null) + { + security.getSecurity().setOwner(player.getCommandSenderName()); + } + } ((ISustainedInventory)tileEntity).setInventory(getInventory(stack)); @@ -333,4 +365,66 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE { return this; } + + @Override + public String getOwner(ItemStack stack) + { + if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("owner")) + { + return stack.stackTagCompound.getString("owner"); + } + + return null; + } + + @Override + public void setOwner(ItemStack stack, String owner) + { + if(stack.stackTagCompound == null) + { + stack.setTagCompound(new NBTTagCompound()); + } + + if(owner == null || owner.isEmpty()) + { + stack.stackTagCompound.removeTag("owner"); + return; + } + + stack.stackTagCompound.setString("owner", owner); + } + + @Override + public SecurityMode getSecurity(ItemStack stack) + { + if(stack.stackTagCompound == null) + { + return SecurityMode.PUBLIC; + } + + return SecurityMode.values()[stack.stackTagCompound.getInteger("security")]; + } + + @Override + public void setSecurity(ItemStack stack, SecurityMode mode) + { + if(stack.stackTagCompound == null) + { + stack.setTagCompound(new NBTTagCompound()); + } + + stack.stackTagCompound.setInteger("security", mode.ordinal()); + } + + @Override + public boolean hasSecurity(ItemStack stack) + { + return true; + } + + @Override + public boolean hasOwner(ItemStack stack) + { + return hasSecurity(stack); + } } diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index 21bafabff..c2bdd1d20 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -18,8 +18,12 @@ import mekanism.common.Tier.GasTankTier; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ITierItem; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityItem; +import mekanism.common.security.ISecurityTile; +import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.util.LangUtils; +import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.settings.GameSettings; @@ -35,7 +39,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants.NBT; -public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedInventory, ITierItem +public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedInventory, ITierItem, ISecurityItem { public Block metaBlock; @@ -77,6 +81,22 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI tileEntity.tier = GasTankTier.values()[getBaseTier(stack).ordinal()]; tileEntity.gasTank.setMaxGas(tileEntity.tier.storage); tileEntity.gasTank.setGas(getGas(stack)); + + if(tileEntity instanceof ISecurityTile) + { + ISecurityTile security = (ISecurityTile)tileEntity; + security.getSecurity().setOwner(getOwner(stack)); + + if(hasSecurity(stack)) + { + security.getSecurity().setMode(getSecurity(stack)); + } + + if(getOwner(stack) == null) + { + security.getSecurity().setOwner(player.getCommandSenderName()); + } + } ((ISustainedInventory)tileEntity).setInventory(getInventory(stack)); @@ -107,6 +127,17 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails") + "."); } else { + if(hasSecurity(itemstack)) + { + list.add(SecurityUtils.getOwnerDisplay(entityplayer.getCommandSenderName(), getOwner(itemstack))); + list.add(EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay(itemstack)); + + if(SecurityUtils.isOverridden(itemstack)) + { + list.add(EnumColor.RED + "(" + LangUtils.localize("gui.overridden") + ")"); + } + } + list.add(EnumColor.AQUA + LangUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + LangUtils.transYesNo(getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); } } @@ -300,4 +331,66 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI { return 1D-((getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)getMaxGas(stack)); } + + @Override + public String getOwner(ItemStack stack) + { + if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("owner")) + { + return stack.stackTagCompound.getString("owner"); + } + + return null; + } + + @Override + public void setOwner(ItemStack stack, String owner) + { + if(stack.stackTagCompound == null) + { + stack.setTagCompound(new NBTTagCompound()); + } + + if(owner == null || owner.isEmpty()) + { + stack.stackTagCompound.removeTag("owner"); + return; + } + + stack.stackTagCompound.setString("owner", owner); + } + + @Override + public SecurityMode getSecurity(ItemStack stack) + { + if(stack.stackTagCompound == null) + { + return SecurityMode.PUBLIC; + } + + return SecurityMode.values()[stack.stackTagCompound.getInteger("security")]; + } + + @Override + public void setSecurity(ItemStack stack, SecurityMode mode) + { + if(stack.stackTagCompound == null) + { + stack.setTagCompound(new NBTTagCompound()); + } + + stack.stackTagCompound.setInteger("security", mode.ordinal()); + } + + @Override + public boolean hasSecurity(ItemStack stack) + { + return true; + } + + @Override + public boolean hasOwner(ItemStack stack) + { + return hasSecurity(stack); + } } diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index b0403982c..91109d325 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -1,7 +1,5 @@ package mekanism.common.item; -import ic2.api.item.ElectricItem; -import ic2.api.item.IElectricItem; import ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; @@ -11,15 +9,12 @@ import java.util.Map; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.general; -import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.IEnergizedItem; import mekanism.client.MekKeyHandler; import mekanism.client.MekanismKeyHandler; -import mekanism.common.Mekanism; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.FluidTankTier; import mekanism.common.Upgrade; -import mekanism.common.base.IElectricChest; import mekanism.common.base.IFactory; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.IRedstoneControl.RedstoneControl; @@ -32,25 +27,23 @@ import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.integration.IC2ItemManager; -import mekanism.common.inventory.InventoryElectricChest; -import mekanism.common.network.PacketElectricChest.ElectricChestMessage; -import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; +import mekanism.common.inventory.InventoryPersonalChest; +import mekanism.common.security.ISecurityItem; +import mekanism.common.security.ISecurityTile; +import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricBlock; -import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.settings.GameSettings; -import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -89,7 +82,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; * 0:10: Energized Smelter * 0:11: Teleporter * 0:12: Electric Pump - * 0:13: Electric Chest + * 0:13: Personal Chest * 0:14: Chargepad * 0:15: Logistical Sorter * 1:0: Rotary Condensentrator @@ -114,13 +107,14 @@ import net.minecraftforge.fml.relauncher.SideOnly; * 2:3: Oredictionificator * 2:4: Resistive Heater * 2:5: Formulaic Assemblicator + * 2:6: Fuelwood Heater * @author AidanBrady * */ @InterfaceList({ @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") }) -public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, IFactory, ISustainedInventory, ISustainedTank, IElectricChest, IEnergyContainerItem, IFluidContainerItem, ITierItem +public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, IFactory, ISustainedInventory, ISustainedTank, IEnergyContainerItem, IFluidContainerItem, ITierItem, ISecurityItem { public Block metaBlock; @@ -197,16 +191,21 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } else if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.modeSwitchKey)) { + if(hasSecurity(itemstack)) + { + list.add(SecurityUtils.getOwnerDisplay(entityplayer.getCommandSenderName(), getOwner(itemstack))); + list.add(EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay(itemstack)); + + if(SecurityUtils.isOverridden(itemstack)) + { + list.add(EnumColor.RED + "(" + LangUtils.localize("gui.overridden") + ")"); + } + } + if(type == BlockStateMachine.MachineType.BASIC_FACTORY || type == BlockStateMachine.MachineType.ADVANCED_FACTORY || type == BlockStateMachine.MachineType.ELITE_FACTORY) { list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.recipeType") + ": " + EnumColor.GREY + RecipeType.values()[getRecipeType(itemstack)].getLocalizedName()); } - - if(type == BlockStateMachine.MachineType.ELECTRIC_CHEST) - { - list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.auth") + ": " + EnumColor.GREY + LangUtils.transYesNo(getAuthenticated(itemstack))); - list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.locked") + ": " + EnumColor.GREY + LangUtils.transYesNo(getLocked(itemstack))); - } if(type == BlockStateMachine.MachineType.FLUID_TANK) { @@ -287,7 +286,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } } } - else if(type == BlockStateMachine.MachineType.SOLAR_NEUTRON_ACTIVATOR) + else if(type == MachineType.SOLAR_NEUTRON_ACTIVATOR || type == MachineType.SEISMIC_VIBRATOR) { if(pos.getY()+1 > 255 || !world.getBlockState(pos.up()).getBlock().isReplaceable(world, pos.up())) { @@ -306,6 +305,22 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec tile.fluidTank.setCapacity(tile.tier.storage); } + if(tileEntity instanceof ISecurityTile) + { + ISecurityTile security = (ISecurityTile)tileEntity; + security.getSecurity().setOwner(getOwner(stack)); + + if(hasSecurity(stack)) + { + security.getSecurity().setMode(getSecurity(stack)); + } + + if(getOwner(stack) == null) + { + security.getSecurity().setOwner(player.getCommandSenderName()); + } + } + if(tileEntity instanceof IUpgradeTile) { if(stack.getTagCompound() != null && stack.getTagCompound().hasKey("upgrades")) @@ -358,13 +373,6 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } } - if(tileEntity instanceof TileEntityElectricChest) - { - ((TileEntityElectricChest)tileEntity).authenticated = getAuthenticated(stack); - ((TileEntityElectricChest)tileEntity).locked = getLocked(stack); - ((TileEntityElectricChest)tileEntity).password = getPassword(stack); - } - if(tileEntity instanceof ISustainedInventory) { ((ISustainedInventory)tileEntity).setInventory(getInventory(stack)); @@ -409,69 +417,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec return 0; } - @Override - public void onUpdate(ItemStack itemstack, World world, Entity entity, int i, boolean flag) - { - MachineType type = BlockStateMachine.MachineType.get(itemstack); - - if(type == BlockStateMachine.MachineType.ELECTRIC_CHEST) - { - if(world != null && !world.isRemote) - { - InventoryElectricChest inv = new InventoryElectricChest(itemstack); - - if(inv.getStackInSlot(54) != null && getEnergy(itemstack) < getMaxEnergy(itemstack)) - { - if(inv.getStackInSlot(54).getItem() instanceof IEnergizedItem) - { - setEnergy(itemstack, getEnergy(itemstack) + EnergizedItemManager.discharge(inv.getStackInSlot(54), getMaxEnergy(itemstack) - getEnergy(itemstack))); - } - else if(MekanismUtils.useIC2() && inv.getStackInSlot(54).getItem() instanceof IElectricItem) - { - IElectricItem item = (IElectricItem)inv.getStackInSlot(54).getItem(); - - if(item.canProvideEnergy(inv.getStackInSlot(54))) - { - double gain = ElectricItem.manager.discharge(inv.getStackInSlot(54), (int)((getMaxEnergy(itemstack) - getEnergy(itemstack))* general.TO_IC2), 3, false, true, false)* general.FROM_IC2; - setEnergy(itemstack, getEnergy(itemstack) + gain); - } - } - else if(MekanismUtils.useRF() && inv.getStackInSlot(54).getItem() instanceof IEnergyContainerItem) - { - ItemStack itemStack = inv.getStackInSlot(54); - IEnergyContainerItem item = (IEnergyContainerItem)inv.getStackInSlot(54).getItem(); - - int itemEnergy = (int)Math.round(Math.min(Math.sqrt(item.getMaxEnergyStored(itemStack)), item.getEnergyStored(itemStack))); - int toTransfer = (int)Math.round(Math.min(itemEnergy, ((getMaxEnergy(itemstack) - getEnergy(itemstack))* general.TO_TE))); - - setEnergy(itemstack, getEnergy(itemstack) + (item.extractEnergy(itemStack, toTransfer, false)* general.FROM_TE)); - } - else if(inv.getStackInSlot(54).getItem() == Items.redstone && getEnergy(itemstack)+ general.ENERGY_PER_REDSTONE <= getMaxEnergy(itemstack)) - { - setEnergy(itemstack, getEnergy(itemstack) + general.ENERGY_PER_REDSTONE); - inv.getStackInSlot(54).stackSize--; - - if(inv.getStackInSlot(54).stackSize <= 0) - { - inv.setInventorySlotContents(54, null); - } - } - - inv.write(); - } - } - } - } - - @Override - public boolean onEntityItemUpdate(EntityItem entityItem) - { - onUpdate(entityItem.getEntityItem(), null, entityItem, 0, false); - - return false; - } - - public boolean tryPlaceContainedLiquid(World world, ItemStack itemstack, BlockPos pos) + public boolean tryPlaceContainedLiquid(World world, ItemStack itemstack, int x, int y, int z) { if(getFluidStack(itemstack) == null || !getFluidStack(itemstack).getFluid().canBePlacedInWorld()) { @@ -514,100 +460,107 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { MachineType type = BlockStateMachine.MachineType.get(itemstack); - if(BlockStateMachine.MachineType.get(itemstack) == BlockStateMachine.MachineType.ELECTRIC_CHEST) + if(MachineType.get(itemstack) == MachineType.PERSONAL_CHEST) { if(!world.isRemote) { - if(!getAuthenticated(itemstack)) + if(getOwner(itemstack) == null) { - Mekanism.packetHandler.sendTo(new ElectricChestMessage(ElectricChestPacketType.CLIENT_OPEN, false, false, 2, 0, null, null), (EntityPlayerMP)entityplayer); + setOwner(itemstack, entityplayer.getCommandSenderName()); } - else if(getLocked(itemstack) && getEnergy(itemstack) > 0) + + if(SecurityUtils.canAccess(entityplayer, itemstack)) { - Mekanism.packetHandler.sendTo(new ElectricChestMessage(ElectricChestPacketType.CLIENT_OPEN, false, false, 1, 0, null, null), (EntityPlayerMP)entityplayer); + InventoryPersonalChest inventory = new InventoryPersonalChest(entityplayer); + MekanismUtils.openPersonalChestGui((EntityPlayerMP)entityplayer, null, inventory, false); } else { - InventoryElectricChest inventory = new InventoryElectricChest(entityplayer); - MekanismUtils.openElectricChestGui((EntityPlayerMP)entityplayer, null, inventory, false); + SecurityUtils.displayNoAccess(entityplayer); } } } else if(type == BlockStateMachine.MachineType.FLUID_TANK && getBucketMode(itemstack)) { - MovingObjectPosition pos = getMovingObjectPositionFromPlayer(world, entityplayer, !entityplayer.isSneaking()); - - if(pos == null) - { - return itemstack; - } - else { - if(pos.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) - { - Coord4D coord = new Coord4D(pos.getBlockPos(), world.provider.getDimensionId()); + if(SecurityUtils.canAccess(entityplayer, itemstack)) + { + MovingObjectPosition pos = getMovingObjectPositionFromPlayer(world, entityplayer, !entityplayer.isSneaking()); + + if(pos == null) + { + return itemstack; + } + else { + if(pos.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) + { + Coord4D coord = new Coord4D(pos.getBlockPos(), world.provider.getDimensionId()); - if(!world.provider.canMineBlock(entityplayer, coord)) - { - return itemstack; - } + if(!world.provider.canMineBlock(entityplayer, coord)) + { + return itemstack; + } - if(!entityplayer.isSneaking()) - { - if(!entityplayer.canPlayerEdit(coord, pos.sideHit, itemstack)) - { - return itemstack; - } - - FluidStack fluid = MekanismUtils.getFluid(world, coord, false); - - if(fluid != null && (getFluidStack(itemstack) == null || getFluidStack(itemstack).isFluidEqual(fluid))) - { - int needed = getCapacity(itemstack)-(getFluidStack(itemstack) != null ? getFluidStack(itemstack).amount : 0); - - if(fluid.amount > needed) - { - return itemstack; - } - - if(getFluidStack(itemstack) == null) - { - setFluidStack(fluid, itemstack); - } - else { - FluidStack newStack = getFluidStack(itemstack); - newStack.amount += fluid.amount; - setFluidStack(newStack, itemstack); - } - - world.setBlockToAir(coord); - } - } - else { - FluidStack stored = getFluidStack(itemstack); - - if(stored == null || stored.amount < FluidContainerRegistry.BUCKET_VOLUME) - { - return itemstack; - } - - Coord4D trans = coord.offset(pos.sideHit); + if(!entityplayer.isSneaking()) + { + if(!entityplayer.canPlayerEdit(coord, pos.sideHit, itemstack)) + { + return itemstack; + } + + FluidStack fluid = MekanismUtils.getFluid(world, coord, false); + + if(fluid != null && (getFluidStack(itemstack) == null || getFluidStack(itemstack).isFluidEqual(fluid))) + { + int needed = getCapacity(itemstack)-(getFluidStack(itemstack) != null ? getFluidStack(itemstack).amount : 0); + + if(fluid.amount > needed) + { + return itemstack; + } + + if(getFluidStack(itemstack) == null) + { + setFluidStack(fluid, itemstack); + } + else { + FluidStack newStack = getFluidStack(itemstack); + newStack.amount += fluid.amount; + setFluidStack(newStack, itemstack); + } + + world.setBlockToAir(coord); + } + } + else { + FluidStack stored = getFluidStack(itemstack); + + if(stored == null || stored.amount < FluidContainerRegistry.BUCKET_VOLUME) + { + return itemstack; + } + + Coord4D trans = coord.offset(pos.sideHit); - if(!entityplayer.canPlayerEdit(trans, pos.sideHit, itemstack)) - { - return itemstack; - } + if(!entityplayer.canPlayerEdit(trans, pos.sideHit, itemstack)) + { + return itemstack; + } - if(tryPlaceContainedLiquid(world, itemstack, trans) && !entityplayer.capabilities.isCreativeMode) - { - FluidStack newStack = stored.copy(); - newStack.amount -= FluidContainerRegistry.BUCKET_VOLUME; - - setFluidStack(newStack.amount > 0 ? newStack : null, itemstack); - } - } - } + if(tryPlaceContainedLiquid(world, itemstack, trans) && !entityplayer.capabilities.isCreativeMode) + { + FluidStack newStack = stored.copy(); + newStack.amount -= FluidContainerRegistry.BUCKET_VOLUME; + + setFluidStack(newStack.amount > 0 ? newStack : null, itemstack); + } + } + } - return itemstack; - } + return itemstack; + } + } + else { + SecurityUtils.displayNoAccess(entityplayer); + } } return itemstack; @@ -724,72 +677,6 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec return type == BlockStateMachine.MachineType.ELECTRIC_PUMP || type == BlockStateMachine.MachineType.FLUID_TANK || type == BlockStateMachine.MachineType.FLUIDIC_PLENISHER; } - - @Override - public void setAuthenticated(ItemStack itemStack, boolean auth) - { - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.getTagCompound().setBoolean("authenticated", auth); - } - - @Override - public boolean getAuthenticated(ItemStack itemStack) - { - if(itemStack.getTagCompound() == null) - { - return false; - } - - return itemStack.getTagCompound().getBoolean("authenticated"); - } - - @Override - public void setPassword(ItemStack itemStack, String pass) - { - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.getTagCompound().setString("password", pass); - } - - @Override - public String getPassword(ItemStack itemStack) - { - if(itemStack.getTagCompound() == null) - { - return ""; - } - - return itemStack.getTagCompound().getString("password"); - } - - @Override - public void setLocked(ItemStack itemStack, boolean locked) - { - if(itemStack.getTagCompound() == null) - { - itemStack.setTagCompound(new NBTTagCompound()); - } - - itemStack.getTagCompound().setBoolean("locked", locked); - } - - @Override - public boolean getLocked(ItemStack itemStack) - { - if(itemStack.getTagCompound() == null) - { - return false; - } - - return itemStack.getTagCompound().getBoolean("locked"); - } public void setBucketMode(ItemStack itemStack, boolean bucketMode) { @@ -1024,4 +911,73 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec itemstack.getTagCompound().setInteger("tier", tier.ordinal()); } + + @Override + public String getOwner(ItemStack stack) + { + if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("owner")) + { + return stack.stackTagCompound.getString("owner"); + } + + return null; + } + + @Override + public void setOwner(ItemStack stack, String owner) + { + if(stack.stackTagCompound == null) + { + stack.setTagCompound(new NBTTagCompound()); + } + + if(owner == null || owner.isEmpty()) + { + stack.stackTagCompound.removeTag("owner"); + return; + } + + stack.stackTagCompound.setString("owner", owner); + } + + @Override + public SecurityMode getSecurity(ItemStack stack) + { + if(stack.stackTagCompound == null) + { + return SecurityMode.PUBLIC; + } + + return SecurityMode.values()[stack.stackTagCompound.getInteger("security")]; + } + + @Override + public void setSecurity(ItemStack stack, SecurityMode mode) + { + if(stack.stackTagCompound == null) + { + stack.setTagCompound(new NBTTagCompound()); + } + + stack.stackTagCompound.setInteger("security", mode.ordinal()); + } + + @Override + public boolean hasSecurity(ItemStack stack) + { + MachineType type = MachineType.get(stack); + + if(type != MachineType.LASER && type != MachineType.CHARGEPAD && type != MachineType.TELEPORTER && type != MachineType.QUANTUM_ENTANGLOPORTER) + { + return true; + } + + return false; + } + + @Override + public boolean hasOwner(ItemStack stack) + { + return hasSecurity(stack); + } } diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index a3d22ca8d..5f7eedd77 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -17,9 +17,10 @@ import mekanism.common.base.ISideConfiguration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityContainerBlock; -import mekanism.common.tile.TileEntityElectricChest; +import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -74,41 +75,57 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool if(tile instanceof ISideConfiguration && ((ISideConfiguration)tile).getConfig().supports(getState(stack).getTransmission())) { ISideConfiguration config = (ISideConfiguration)tile; + SideData initial = config.getConfig().getOutput(getState(stack).getTransmission(), side, config.getOrientation()); - if(!player.isSneaking()) + if(initial != TileComponentConfig.EMPTY) { - SideData data = config.getConfig().getOutput(getState(stack).getTransmission(), side, config.getOrientation()); - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + getViewModeText(getState(stack).getTransmission()) + ": " + data.color + data.localize() + " (" + data.color.getName() + ")")); - return true; - } - else { - if(getEnergy(stack) >= ENERGY_PER_CONFIGURE) + if(!player.isSneaking()) { - setEnergy(stack, getEnergy(stack) - ENERGY_PER_CONFIGURE); - MekanismUtils.incrementOutput(config, getState(stack).getTransmission(), MekanismUtils.getBaseOrientation(side, config.getOrientation())); - SideData data = config.getConfig().getOutput(getState(stack).getTransmission(), side, config.getOrientation()); - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + getToggleModeText(getState(stack).getTransmission()) + ": " + data.color + data.localize() + " (" + data.color.getName() + ")")); - - if(config instanceof TileEntityBasicBlock) + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + getViewModeText(getState(stack).getTransmission()) + ": " + initial.color + initial.localize() + " (" + initial.color.getName() + ")")); + } + else { + if(getEnergy(stack) >= ENERGY_PER_CONFIGURE) { - TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)config; - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); + if(SecurityUtils.canAccess(player, tile)) + { + setEnergy(stack, getEnergy(stack) - ENERGY_PER_CONFIGURE); + MekanismUtils.incrementOutput(config, getState(stack).getTransmission(), MekanismUtils.getBaseOrientation(side, config.getOrientation())); + SideData data = config.getConfig().getOutput(getState(stack).getTransmission(), side, config.getOrientation()); + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + getToggleModeText(getState(stack).getTransmission()) + ": " + data.color + data.localize() + " (" + data.color.getName() + ")")); + + if(config instanceof TileEntityBasicBlock) + { + TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)config; + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity))); + } + } + else { + SecurityUtils.displayNoAccess(player); + } } - - return true; } } + + return true; } else if(tile instanceof IConfigurable) { IConfigurable config = (IConfigurable)tile; - if(player.isSneaking()) + if(SecurityUtils.canAccess(player, tile)) { - return config.onSneakRightClick(player, side); + if(player.isSneaking()) + { + return config.onSneakRightClick(player, side); + } + else { + return config.onRightClick(player, side); + } } else { - return config.onRightClick(player, side); + SecurityUtils.displayNoAccess(player); + + return true; } } } @@ -118,7 +135,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool { IInventory inv = (IInventory)tile; - if(!(inv instanceof TileEntityElectricChest) || (((TileEntityElectricChest)inv).canAccess())) + if(SecurityUtils.canAccess(player, tile)) { for(int i = 0; i < inv.getSizeInventory(); i++) { @@ -167,7 +184,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool return true; } else { - player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.configurator.unauth"))); + SecurityUtils.displayNoAccess(player); return true; } } diff --git a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java index ed47dfad5..c2b20aff4 100644 --- a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java +++ b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java @@ -1,25 +1,69 @@ package mekanism.common.item; +import java.util.List; + import mekanism.api.Coord4D; +import mekanism.api.EnumColor; +import mekanism.client.MekKeyHandler; +import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; +import mekanism.common.security.IOwnerItem; +import mekanism.common.util.LangUtils; +import mekanism.common.util.SecurityUtils; +import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; -public class ItemPortableTeleporter extends ItemEnergized +public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem { public ItemPortableTeleporter() { super(1000000); } + + @Override + public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) + { + list.add(SecurityUtils.getOwnerDisplay(entityplayer.getCommandSenderName(), getOwner(itemstack))); + + if(getFrequency(itemstack) != null) + { + list.add(EnumColor.INDIGO + LangUtils.localize("gui.frequency") + ": " + EnumColor.GREY + getFrequency(itemstack)); + list.add(EnumColor.INDIGO + LangUtils.localize("gui.mode") + ": " + EnumColor.GREY + LangUtils.localize("gui." + (isPrivateMode(itemstack) ? "private" : "public"))); + } + + if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) + { + list.add(LangUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + LangUtils.localize("tooltip.forDetails") + "."); + } + else { + super.addInformation(itemstack, entityplayer, list, flag); + } + } @Override public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { if(!world.isRemote) { - entityplayer.openGui(Mekanism.instance, 14, world, 0, 0, 0); + if(getOwner(itemstack) == null) + { + setOwner(itemstack, entityplayer.getCommandSenderName()); + entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("gui.nowOwn"))); + } + else { + if(SecurityUtils.canAccess(entityplayer, itemstack)) + { + entityplayer.openGui(Mekanism.instance, 14, world, 0, 0, 0); + } + else { + SecurityUtils.displayNoAccess(entityplayer); + } + } } return itemstack; @@ -51,4 +95,82 @@ public class ItemPortableTeleporter extends ItemEnergized { return false; } + + @Override + public String getOwner(ItemStack stack) + { + if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("owner")) + { + return stack.stackTagCompound.getString("owner"); + } + + return null; + } + + @Override + public void setOwner(ItemStack stack, String owner) + { + setFrequency(stack, null); + setPrivateMode(stack, false); + + if(owner == null || owner.isEmpty()) + { + stack.stackTagCompound.removeTag("owner"); + return; + } + + stack.stackTagCompound.setString("owner", owner); + } + + @Override + public boolean hasOwner(ItemStack stack) + { + return true; + } + + public boolean isPrivateMode(ItemStack stack) + { + if(stack.stackTagCompound != null) + { + return stack.stackTagCompound.getBoolean("private"); + } + + return false; + } + + public void setPrivateMode(ItemStack stack, boolean isPrivate) + { + if(stack.stackTagCompound == null) + { + stack.setTagCompound(new NBTTagCompound()); + } + + stack.stackTagCompound.setBoolean("private", isPrivate); + } + + public String getFrequency(ItemStack stack) + { + if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("frequency")) + { + return stack.stackTagCompound.getString("frequency"); + } + + return null; + } + + public void setFrequency(ItemStack stack, String frequency) + { + if(stack.stackTagCompound == null) + { + stack.setTagCompound(new NBTTagCompound()); + } + + if(frequency == null || frequency.isEmpty()) + { + stack.stackTagCompound.removeTag("frequency"); + return; + } + + stack.stackTagCompound.setString("frequency", frequency); + } } diff --git a/src/main/java/mekanism/common/multiblock/SynchronizedData.java b/src/main/java/mekanism/common/multiblock/SynchronizedData.java index 982f65575..17d6b3cb2 100644 --- a/src/main/java/mekanism/common/multiblock/SynchronizedData.java +++ b/src/main/java/mekanism/common/multiblock/SynchronizedData.java @@ -31,6 +31,8 @@ public abstract class SynchronizedData> public boolean destroyed; + public Set internalLocations = new HashSet(); + public ItemStack[] getInventory() { return null; diff --git a/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java b/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java new file mode 100644 index 000000000..737f2c2d7 --- /dev/null +++ b/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java @@ -0,0 +1,58 @@ +package mekanism.common.multiblock; + +import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + +import mekanism.common.PacketHandler; +import mekanism.common.tile.TileEntityBasicBlock; + +public class TileEntityInternalMultiblock extends TileEntityBasicBlock +{ + public String multiblockUUID; + + @Override + public void onUpdate() {} + + @Override + public boolean canUpdate() + { + return false; + } + + @Override + public void handlePacketData(ByteBuf dataStream) + { + super.handlePacketData(dataStream); + + if(dataStream.readBoolean()) + { + multiblockUUID = PacketHandler.readString(dataStream); + } + else { + multiblockUUID = null; + } + } + + @Override + public ArrayList getNetworkedData(ArrayList data) + { + super.getNetworkedData(data); + + if(multiblockUUID != null) + { + data.add(true); + data.add(multiblockUUID); + } + else { + data.add(false); + } + + return data; + } + + public void setMultiblock(String id) + { + multiblockUUID = id; + } +} diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index 4c45665e0..72e59bb47 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -184,7 +184,7 @@ public abstract class UpdateProtocol> volume += locations.size(); - if(volume >= 27 && volume <= 5832 && locations.size() >= 26) + if(Math.abs(xmax-xmin)+1 <= 18 && Math.abs(xmax-xmin)+1 <= 18 && Math.abs(zmax-zmin)+1 <= 18) { if(rightBlocks && rightFrame && isHollow && isCorner) { @@ -193,7 +193,7 @@ public abstract class UpdateProtocol> structure.volLength = Math.abs(xmax-xmin)+1; structure.volHeight = Math.abs(ymax-ymin)+1; structure.volWidth = Math.abs(zmax-zmin)+1; - structure.volume = volume; + structure.volume = structure.volLength*structure.volHeight*structure.volWidth; structure.renderLocation = Coord4D.get(tile).add(0, 1, 0); structure.minLocation = Coord4D.get(tile).add(xmin, ymin, zmin); structure.maxLocation = Coord4D.get(tile).add(xmax, ymax, zmax); @@ -415,13 +415,43 @@ public abstract class UpdateProtocol> protected abstract void mergeCaches(List rejectedItems, MultiblockCache cache, MultiblockCache merge); - protected void onFormed() {} + protected void onFormed() + { + for(Coord4D coord : structureFound.internalLocations) + { + TileEntity tile = coord.getTileEntity(pointer.getWorldObj()); + + if(tile instanceof TileEntityInternalMultiblock) + { + ((TileEntityInternalMultiblock)tile).setMultiblock(structureFound.inventoryID); + } + } + } protected void onStructureCreated(T structure, int origX, int origY, int origZ, int xmin, int xmax, int ymin, int ymax, int zmin, int zmax) {} - public void onStructureDestroyed(T structure) {} + public void onStructureDestroyed(T structure) + { + for(Coord4D coord : structure.internalLocations) + { + TileEntity tile = coord.getTileEntity(pointer.getWorldObj()); + + if(tile instanceof TileEntityInternalMultiblock) + { + ((TileEntityInternalMultiblock)tile).setMultiblock(null); + } + } + } - public void killInnerNode(Coord4D coord) {} + public void killInnerNode(Coord4D coord) + { + TileEntity tile = coord.getTileEntity(pointer.getWorldObj()); + + if(tile instanceof TileEntityInternalMultiblock) + { + ((TileEntityInternalMultiblock)tile).setMultiblock(null); + } + } /** * Runs the protocol and updates all nodes that make a part of the multiblock. diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 2325cf3ad..4618f08ff 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -35,7 +35,6 @@ public class PacketConfigSync implements IMessageHandler -{ - @Override - public IMessage onMessage(ElectricChestMessage message, MessageContext context) - { - EntityPlayer player = PacketHandler.getPlayer(context); - - if(message.packetType == ElectricChestPacketType.SERVER_OPEN) - { - try { - if(message.isBlock) - { - TileEntityElectricChest tileEntity = (TileEntityElectricChest)message.coord4D.getTileEntity(player.worldObj); - - if(message.useEnergy) - { - tileEntity.setEnergy(tileEntity.getEnergy() - 100); - } - - MekanismUtils.openElectricChestGui((EntityPlayerMP)player, tileEntity, null, true); - } - else { - ItemStack stack = player.getCurrentEquippedItem(); - - if(stack != null && stack.getItem() instanceof IElectricChest && BlockStateMachine.MachineType.get(stack) == BlockStateMachine.MachineType.ELECTRIC_CHEST) - { - if(message.useEnergy) - { - ((IEnergizedItem)stack.getItem()).setEnergy(stack, ((IEnergizedItem)stack.getItem()).getEnergy(stack) - 100); - } - - InventoryElectricChest inventory = new InventoryElectricChest(player); - MekanismUtils.openElectricChestGui((EntityPlayerMP)player, null, inventory, false); - } - } - } catch(Exception e) { - Mekanism.logger.error("Error while handling electric chest open packet."); - e.printStackTrace(); - } - } - else if(message.packetType == ElectricChestPacketType.CLIENT_OPEN) - { - try { - Mekanism.proxy.openElectricChest(player, message.guiType, message.windowId, message.isBlock, message.coord4D != null ? message.coord4D : BlockPos.ORIGIN); - } catch(Exception e) { - Mekanism.logger.error("Error while handling electric chest open packet."); - e.printStackTrace(); - } - } - else if(message.packetType == ElectricChestPacketType.PASSWORD) - { - try { - if(message.isBlock) - { - TileEntityElectricChest tileEntity = (TileEntityElectricChest)message.coord4D.getTileEntity(player.worldObj); - tileEntity.password = message.password; - tileEntity.authenticated = true; - } - else { - ItemStack stack = player.getCurrentEquippedItem(); - - if(stack != null && stack.getItem() instanceof IElectricChest && BlockStateMachine.MachineType.get(stack) == BlockStateMachine.MachineType.ELECTRIC_CHEST) - { - ((IElectricChest)stack.getItem()).setPassword(stack, message.password); - ((IElectricChest)stack.getItem()).setAuthenticated(stack, true); - } - } - } catch(Exception e) { - Mekanism.logger.error("Error while handling electric chest password packet."); - e.printStackTrace(); - } - } - else if(message.packetType == ElectricChestPacketType.LOCK) - { - try { - if(message.isBlock) - { - TileEntityElectricChest tileEntity = (TileEntityElectricChest)message.coord4D.getTileEntity(player.worldObj); - tileEntity.locked = message.locked; - player.worldObj.notifyNeighborsOfStateChange(message.coord4D, tileEntity.getBlockType()); - } - else { - ItemStack stack = player.getCurrentEquippedItem(); - - if(stack != null && stack.getItem() instanceof IElectricChest && BlockStateMachine.MachineType.get(stack) == BlockStateMachine.MachineType.ELECTRIC_CHEST) - { - ((IElectricChest)stack.getItem()).setLocked(stack, message.locked); - } - } - } catch(Exception e) { - Mekanism.logger.error("Error while handling electric chest password packet."); - e.printStackTrace(); - } - } - - return null; - } - - public static class ElectricChestMessage implements IMessage - { - public ElectricChestPacketType packetType; - - public boolean isBlock; - - public boolean locked; - - public String password; - - public int guiType; - public int windowId; - - public boolean useEnergy; - - public Coord4D coord4D; - - public ElectricChestMessage() {} - - //This is a really messy implementation... - public ElectricChestMessage(ElectricChestPacketType type, boolean b1, boolean b2, int i1, int i2, String s1, Coord4D c1) - { - packetType = type; - - switch(packetType) - { - case LOCK: - locked = b1; - isBlock = b2; - - if(isBlock) - { - coord4D = c1; - } - - break; - case PASSWORD: - password = s1; - isBlock = b1; - - if(isBlock) - { - coord4D = c1; - } - - break; - case CLIENT_OPEN: - guiType = i1; - windowId = i2; - isBlock = b1; - - if(isBlock) - { - coord4D = c1; - } - - break; - case SERVER_OPEN: - useEnergy = b1; - isBlock = b2; - - if(isBlock) - { - coord4D = c1; - } - - break; - } - } - - @Override - public void toBytes(ByteBuf dataStream) - { - dataStream.writeInt(packetType.ordinal()); - - switch(packetType) - { - case LOCK: - dataStream.writeBoolean(locked); - dataStream.writeBoolean(isBlock); - - if(isBlock) - { - coord4D.write(dataStream); - } - - break; - case PASSWORD: - PacketHandler.writeString(dataStream, password); - dataStream.writeBoolean(isBlock); - - if(isBlock) - { - coord4D.write(dataStream); - } - - break; - case CLIENT_OPEN: - dataStream.writeInt(guiType); - dataStream.writeInt(windowId); - dataStream.writeBoolean(isBlock); - - if(isBlock) - { - coord4D.write(dataStream); - } - - break; - case SERVER_OPEN: - dataStream.writeBoolean(useEnergy); - dataStream.writeBoolean(isBlock); - - if(isBlock) - { - coord4D.write(dataStream); - } - - break; - } - } - - @Override - public void fromBytes(ByteBuf dataStream) - { - packetType = ElectricChestPacketType.values()[dataStream.readInt()]; - - if(packetType == ElectricChestPacketType.SERVER_OPEN) - { - useEnergy = dataStream.readBoolean(); - isBlock = dataStream.readBoolean(); - - if(isBlock) - { - coord4D = Coord4D.read(dataStream); - } - } - else if(packetType == ElectricChestPacketType.CLIENT_OPEN) - { - guiType = dataStream.readInt(); - windowId = dataStream.readInt(); - isBlock = dataStream.readBoolean(); - - if(isBlock) - { - coord4D = Coord4D.read(dataStream); - } - } - else if(packetType == ElectricChestPacketType.PASSWORD) - { - password = PacketHandler.readString(dataStream); - isBlock = dataStream.readBoolean(); - - if(isBlock) - { - coord4D = Coord4D.read(dataStream); - } - } - else if(packetType == ElectricChestPacketType.LOCK) - { - locked = dataStream.readBoolean(); - isBlock = dataStream.readBoolean(); - - if(isBlock) - { - coord4D = Coord4D.read(dataStream); - } - } - } - } - - public static enum ElectricChestPacketType - { - LOCK, - PASSWORD, - CLIENT_OPEN, - SERVER_OPEN - } -} diff --git a/src/main/java/mekanism/common/network/PacketEntityMove.java b/src/main/java/mekanism/common/network/PacketEntityMove.java new file mode 100644 index 000000000..e26435b01 --- /dev/null +++ b/src/main/java/mekanism/common/network/PacketEntityMove.java @@ -0,0 +1,61 @@ +package mekanism.common.network; + +import io.netty.buffer.ByteBuf; +import mekanism.api.Pos3D; +import mekanism.common.PacketHandler; +import mekanism.common.network.PacketEntityMove.EntityMoveMessage; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; + +public class PacketEntityMove implements IMessageHandler +{ + @Override + public IMessage onMessage(EntityMoveMessage message, MessageContext context) + { + EntityPlayer player = PacketHandler.getPlayer(context); + Entity entity = player.worldObj.getEntityByID(message.entityId); + + if(entity != null) + { + entity.setLocationAndAngles(message.pos.xPos, message.pos.yPos, message.pos.zPos, entity.rotationYaw, entity.rotationPitch); + } + + return null; + } + + public static class EntityMoveMessage implements IMessage + { + public int entityId; + + public Pos3D pos; + + public EntityMoveMessage() {} + + public EntityMoveMessage(Entity e) + { + entityId = e.getEntityId(); + pos = new Pos3D(e); + } + + @Override + public void toBytes(ByteBuf dataStream) + { + dataStream.writeInt(entityId); + + dataStream.writeFloat((float)pos.xPos); + dataStream.writeFloat((float)pos.yPos); + dataStream.writeFloat((float)pos.zPos); + } + + @Override + public void fromBytes(ByteBuf dataStream) + { + entityId = dataStream.readInt(); + + pos = new Pos3D(dataStream.readFloat(), dataStream.readFloat(), dataStream.readFloat()); + } + } +} diff --git a/src/main/java/mekanism/common/network/PacketPersonalChest.java b/src/main/java/mekanism/common/network/PacketPersonalChest.java new file mode 100644 index 000000000..e75b01862 --- /dev/null +++ b/src/main/java/mekanism/common/network/PacketPersonalChest.java @@ -0,0 +1,177 @@ +package mekanism.common.network; + +import io.netty.buffer.ByteBuf; +import mekanism.api.Coord4D; +import mekanism.common.Mekanism; +import mekanism.common.PacketHandler; +import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.inventory.InventoryPersonalChest; +import mekanism.common.network.PacketPersonalChest.PersonalChestMessage; +import mekanism.common.tile.TileEntityPersonalChest; +import mekanism.common.util.MekanismUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; + +public class PacketPersonalChest implements IMessageHandler +{ + @Override + public IMessage onMessage(PersonalChestMessage message, MessageContext context) + { + EntityPlayer player = PacketHandler.getPlayer(context); + + if(message.packetType == PersonalChestPacketType.SERVER_OPEN) + { + try { + if(message.isBlock) + { + TileEntityPersonalChest tileEntity = (TileEntityPersonalChest)message.coord4D.getTileEntity(player.worldObj); + MekanismUtils.openPersonalChestGui((EntityPlayerMP)player, tileEntity, null, true); + } + else { + ItemStack stack = player.getCurrentEquippedItem(); + + if(MachineType.get(stack) == MachineType.PERSONAL_CHEST) + { + InventoryPersonalChest inventory = new InventoryPersonalChest(player); + MekanismUtils.openPersonalChestGui((EntityPlayerMP)player, null, inventory, false); + } + } + } catch(Exception e) { + Mekanism.logger.error("Error while handling electric chest open packet."); + e.printStackTrace(); + } + } + else if(message.packetType == PersonalChestPacketType.CLIENT_OPEN) + { + try { + int x = message.coord4D != null ? message.coord4D.xCoord : 0; + int y = message.coord4D != null ? message.coord4D.yCoord : 0; + int z = message.coord4D != null ? message.coord4D.zCoord : 0; + + Mekanism.proxy.openPersonalChest(player, message.guiType, message.windowId, message.isBlock, x, y, z); + } catch(Exception e) { + Mekanism.logger.error("Error while handling electric chest open packet."); + e.printStackTrace(); + } + } + + return null; + } + + public static class PersonalChestMessage implements IMessage + { + public PersonalChestPacketType packetType; + + public boolean isBlock; + + public int guiType; + public int windowId; + + public Coord4D coord4D; + + public PersonalChestMessage() {} + + //This is a really messy implementation... + public PersonalChestMessage(PersonalChestPacketType type, boolean b1, int i1, int i2, Coord4D c1) + { + packetType = type; + + switch(packetType) + { + case CLIENT_OPEN: + guiType = i1; + windowId = i2; + isBlock = b1; + + if(isBlock) + { + coord4D = c1; + } + + break; + case SERVER_OPEN: + isBlock = b1; + + if(isBlock) + { + coord4D = c1; + } + + break; + } + } + + @Override + public void toBytes(ByteBuf dataStream) + { + dataStream.writeInt(packetType.ordinal()); + + switch(packetType) + { + case CLIENT_OPEN: + dataStream.writeInt(guiType); + dataStream.writeInt(windowId); + dataStream.writeBoolean(isBlock); + + if(isBlock) + { + dataStream.writeInt(coord4D.xCoord); + dataStream.writeInt(coord4D.yCoord); + dataStream.writeInt(coord4D.zCoord); + dataStream.writeInt(coord4D.dimensionId); + } + + break; + case SERVER_OPEN: + dataStream.writeBoolean(isBlock); + + if(isBlock) + { + dataStream.writeInt(coord4D.xCoord); + dataStream.writeInt(coord4D.yCoord); + dataStream.writeInt(coord4D.zCoord); + dataStream.writeInt(coord4D.dimensionId); + } + + break; + } + } + + @Override + public void fromBytes(ByteBuf dataStream) + { + packetType = PersonalChestPacketType.values()[dataStream.readInt()]; + + if(packetType == PersonalChestPacketType.SERVER_OPEN) + { + isBlock = dataStream.readBoolean(); + + if(isBlock) + { + coord4D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); + } + } + else if(packetType == PersonalChestPacketType.CLIENT_OPEN) + { + guiType = dataStream.readInt(); + windowId = dataStream.readInt(); + isBlock = dataStream.readBoolean(); + + if(isBlock) + { + coord4D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); + } + } + } + } + + public static enum PersonalChestPacketType + { + CLIENT_OPEN, + SERVER_OPEN + } +} diff --git a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java index ac5094549..b86b91782 100644 --- a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java +++ b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java @@ -67,6 +67,9 @@ public class PacketPortableTeleporter implements IMessageHandler +{ + @Override + public IMessage onMessage(SecurityModeMessage message, MessageContext context) + { + EntityPlayer player = PacketHandler.getPlayer(context); + + if(message.packetType == SecurityPacketType.BLOCK) + { + TileEntity tileEntity = message.coord4D.getTileEntity(player.worldObj); + + if(tileEntity instanceof ISecurityTile) + { + String owner = ((ISecurityTile)tileEntity).getSecurity().getOwner(); + + if(owner != null && player.getCommandSenderName().equals(owner)) + { + ((ISecurityTile)tileEntity).getSecurity().setMode(message.value); + } + } + } + else { + ItemStack stack = player.getCurrentEquippedItem(); + + if(stack.getItem() instanceof ISecurityItem) + { + ((ISecurityItem)stack.getItem()).setSecurity(stack, message.value); + } + } + + return null; + } + + public static class SecurityModeMessage implements IMessage + { + public SecurityPacketType packetType; + public Coord4D coord4D; + public SecurityMode value; + + public SecurityModeMessage() {} + + public SecurityModeMessage(Coord4D coord, SecurityMode control) + { + packetType = SecurityPacketType.BLOCK; + + coord4D = coord; + value = control; + } + + public SecurityModeMessage(SecurityMode control) + { + packetType = SecurityPacketType.ITEM; + + value = control; + } + + @Override + public void toBytes(ByteBuf dataStream) + { + dataStream.writeInt(packetType.ordinal()); + + if(packetType == SecurityPacketType.BLOCK) + { + dataStream.writeInt(coord4D.xCoord); + dataStream.writeInt(coord4D.yCoord); + dataStream.writeInt(coord4D.zCoord); + dataStream.writeInt(coord4D.dimensionId); + } + + dataStream.writeInt(value.ordinal()); + } + + @Override + public void fromBytes(ByteBuf dataStream) + { + packetType = SecurityPacketType.values()[dataStream.readInt()]; + + if(packetType == SecurityPacketType.BLOCK) + { + coord4D = Coord4D.read(dataStream); + } + + value = SecurityMode.values()[dataStream.readInt()]; + } + } + + public static enum SecurityPacketType + { + BLOCK, + ITEM + } +} diff --git a/src/main/java/mekanism/common/security/IOwnerItem.java b/src/main/java/mekanism/common/security/IOwnerItem.java new file mode 100644 index 000000000..7dd4afb11 --- /dev/null +++ b/src/main/java/mekanism/common/security/IOwnerItem.java @@ -0,0 +1,12 @@ +package mekanism.common.security; + +import net.minecraft.item.ItemStack; + +public interface IOwnerItem +{ + public String getOwner(ItemStack stack); + + public void setOwner(ItemStack stack, String owner); + + public boolean hasOwner(ItemStack stack); +} diff --git a/src/main/java/mekanism/common/security/ISecurityItem.java b/src/main/java/mekanism/common/security/ISecurityItem.java new file mode 100644 index 000000000..d7bdde3d6 --- /dev/null +++ b/src/main/java/mekanism/common/security/ISecurityItem.java @@ -0,0 +1,13 @@ +package mekanism.common.security; + +import mekanism.common.security.ISecurityTile.SecurityMode; +import net.minecraft.item.ItemStack; + +public interface ISecurityItem extends IOwnerItem +{ + public SecurityMode getSecurity(ItemStack stack); + + public void setSecurity(ItemStack stack, SecurityMode mode); + + public boolean hasSecurity(ItemStack stack); +} diff --git a/src/main/java/mekanism/common/security/ISecurityTile.java b/src/main/java/mekanism/common/security/ISecurityTile.java new file mode 100644 index 000000000..3cbfb4e67 --- /dev/null +++ b/src/main/java/mekanism/common/security/ISecurityTile.java @@ -0,0 +1,31 @@ +package mekanism.common.security; + +import mekanism.api.EnumColor; +import mekanism.common.tile.component.TileComponentSecurity; +import mekanism.common.util.LangUtils; + +public interface ISecurityTile +{ + public TileComponentSecurity getSecurity(); + + public enum SecurityMode + { + PUBLIC("security.public", EnumColor.BRIGHT_GREEN), + PRIVATE("security.private", EnumColor.RED), + TRUSTED("security.trusted", EnumColor.ORANGE); + + private String display; + private EnumColor color; + + public String getDisplay() + { + return color + LangUtils.localize(display); + } + + private SecurityMode(String s, EnumColor c) + { + display = s; + color = c; + } + } +} diff --git a/src/main/java/mekanism/common/security/SecurityFrequency.java b/src/main/java/mekanism/common/security/SecurityFrequency.java new file mode 100644 index 000000000..33506de51 --- /dev/null +++ b/src/main/java/mekanism/common/security/SecurityFrequency.java @@ -0,0 +1,122 @@ +package mekanism.common.security; + +import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + +import mekanism.common.HashList; +import mekanism.common.PacketHandler; +import mekanism.common.frequency.Frequency; +import mekanism.common.security.ISecurityTile.SecurityMode; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.NBTTagString; +import net.minecraftforge.common.util.Constants.NBT; + +public class SecurityFrequency extends Frequency +{ + public static final String SECURITY = "Security"; + + public boolean override; + + public HashList trusted; + + public SecurityMode securityMode; + + public SecurityFrequency(String o) + { + super("Security", o); + + trusted = new HashList(); + securityMode = SecurityMode.PUBLIC; + } + + public SecurityFrequency(NBTTagCompound nbtTags) + { + super(nbtTags); + } + + public SecurityFrequency(ByteBuf dataStream) + { + super(dataStream); + } + + @Override + public void write(NBTTagCompound nbtTags) + { + super.write(nbtTags); + + nbtTags.setBoolean("override", override); + nbtTags.setInteger("securityMode", securityMode.ordinal()); + + if(!trusted.isEmpty()) + { + NBTTagList trustedList = new NBTTagList(); + + for(String s : trusted) + { + trustedList.appendTag(new NBTTagString(s)); + } + + nbtTags.setTag("trusted", trustedList); + } + } + + @Override + protected void read(NBTTagCompound nbtTags) + { + super.read(nbtTags); + + trusted = new HashList(); + securityMode = SecurityMode.PUBLIC; + + override = nbtTags.getBoolean("override"); + securityMode = SecurityMode.values()[nbtTags.getInteger("securityMode")]; + + if(nbtTags.hasKey("trusted")) + { + NBTTagList trustedList = nbtTags.getTagList("trusted", NBT.TAG_STRING); + + for(int i = 0; i < trustedList.tagCount(); i++) + { + trusted.add(trustedList.getStringTagAt(i)); + } + } + } + + @Override + public void write(ArrayList data) + { + super.write(data); + + data.add(override); + data.add(securityMode.ordinal()); + + data.add(trusted.size()); + + for(String s : trusted) + { + data.add(s); + } + } + + @Override + protected void read(ByteBuf dataStream) + { + super.read(dataStream); + + trusted = new HashList(); + securityMode = SecurityMode.PUBLIC; + + override = dataStream.readBoolean(); + securityMode = SecurityMode.values()[dataStream.readInt()]; + + trusted.clear(); + int size = dataStream.readInt(); + + for(int i = 0; i < size; i++) + { + trusted.add(PacketHandler.readString(dataStream)); + } + } +} diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java index 9d665b897..008f4d3bb 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java @@ -232,7 +232,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp @Override public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { - if(getInv() == null) + if(getInv() == null || !canReceiveEnergy(from)) { return 0; } @@ -259,7 +259,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp return false; } - return getInv().canConnectEnergy(from); + return canReceiveEnergy(from); } @Override @@ -320,7 +320,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp @Override public double transferEnergyToAcceptor(EnumFacing side, double amount) { - if(getInv() == null) + if(getInv() == null || !canReceiveEnergy(side)) { return 0; } @@ -336,7 +336,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp return false; } - return getInv().canReceiveEnergy(side); + return getInv().canBoundReceiveEnergy(Coord4D.get(this), side); } @Override @@ -355,7 +355,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp @Method(modid = "IC2") public double injectEnergy(EnumFacing directionFrom, double amount, double voltage) { - if(getInv() == null) + if(getInv() == null || !canReceiveEnergy(directionFrom)) { return amount; } diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java index 15fa5402a..f32ef9c17 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java @@ -123,6 +123,7 @@ public abstract class TileEntityAdvancedElectricMachine, OUTPUT extends MachineOutput, RECIPE extends MachineRecipe> extends TileEntityNoisyElectricBlock implements IElectricMachine, IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess +public abstract class TileEntityBasicMachine, OUTPUT extends MachineOutput, RECIPE extends MachineRecipe> extends TileEntityNoisyElectricBlock implements IElectricMachine, IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess, ISecurityTile { /** How much energy this machine uses per tick, un-upgraded. */ public double BASE_ENERGY_PER_TICK; @@ -69,6 +71,7 @@ public abstract class TileEntityBasicMachine, public TileComponentUpgrade upgradeComponent; public TileComponentEjector ejectorComponent; public TileComponentConfig configComponent; + public TileComponentSecurity securityComponent; /** * The foundation of all machines - a simple tile entity with a facing, active state, initialized state, sound effect, and animated texture. @@ -89,6 +92,8 @@ public abstract class TileEntityBasicMachine, ticksRequired = baseTicksRequired; guiLocation = location; isActive = false; + + securityComponent = new TileComponentSecurity(this); } @Override @@ -292,4 +297,10 @@ public abstract class TileEntityBasicMachine, { return ejectorComponent; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index 324dd2696..f3fc0730f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -42,7 +42,7 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock 0; } - if(needsValveUpdate || structure.needsRenderUpdate()) + boolean needsHotUpdate = false; + boolean newHot = structure.temperature >= SynchronizedBoilerData.BASE_BOIL_TEMP-0.01F; + + if(newHot != structure.clientHot) { - sendPacketToRenderer(); + needsHotUpdate = true; + structure.clientHot = newHot; } double[] d = structure.simulateHeat(); @@ -155,8 +159,13 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock toSend = new HashSet(); for(ValveData valveData : structure.valves) @@ -321,6 +332,9 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock getConsumingSides() + { + return EnumSet.of(MekanismUtils.getLeft(facing), MekanismUtils.getRight(facing), ForgeDirection.DOWN); + } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java index 63f7ee1de..6d29ef7f6 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java @@ -8,7 +8,6 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.Range4D; -import mekanism.api.util.StackUtils; import mekanism.common.Mekanism; import mekanism.common.base.IFluidContainerManager; import mekanism.common.block.BlockBasic; @@ -59,7 +58,7 @@ public class TileEntityDynamicTank extends TileEntityMultiblock 0.01) { prevScale = (9*prevScale + targetScale)/10; @@ -116,7 +115,7 @@ public class TileEntityDynamicTank extends TileEntityMultiblock())), new Range4D(Coord4D.get(this))); - } prevEnergy = getEnergy(); } - else { - if(clientDumpLeft) - { - spawnParticle(0); - } - - if(clientDumpRight) - { - spawnParticle(1); - } - } } public int getUpgradedUsage(SeparatorRecipe recipe) @@ -356,37 +326,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp && rightTank.canReceive(gases.rightGas.getGas()) && rightTank.getNeeded() >= gases.rightGas.amount); } - public void spawnParticle(int type) - { - if(type == 0) - { - EnumFacing side = facing; - - double x = getPos().getX() + (side.getAxis() != Axis.X ? 0.5 : Math.max(side.getFrontOffsetX(), 0)); - double z = getPos().getZ() + (side.getAxis() != Axis.Z ? 0.5 : Math.max(side.getFrontOffsetZ(), 0)); - - worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, x, getPos().getY() + 0.5, z, 0.0D, 0.0D, 0.0D); - } - else if(type == 1) - { - switch(facing) - { - case SOUTH: - worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, getPos().getX()+0.9, getPos().getY()+1, getPos().getZ()+0.75, 0.0D, 0.0D, 0.0D); - break; - case WEST: - worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, getPos().getX()+0.25, getPos().getY()+1, getPos().getZ()+0.9, 0.0D, 0.0D, 0.0D); - break; - case NORTH: - worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, getPos().getX()+0.1, getPos().getY()+1, getPos().getZ()+0.25, 0.0D, 0.0D, 0.0D); - break; - case EAST: - worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, getPos().getX()+0.75, getPos().getY()+1, getPos().getZ()+0.1, 0.0D, 0.0D, 0.0D); - break; - } - } - } - @Override public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) { @@ -493,8 +432,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp controlType = RedstoneControl.values()[dataStream.readInt()]; dumpLeft = GasMode.values()[dataStream.readInt()]; dumpRight = GasMode.values()[dataStream.readInt()]; - clientDumpLeft = dataStream.readBoolean(); - clientDumpRight = dataStream.readBoolean(); clientActive = dataStream.readBoolean(); clientEnergyUsed = dataStream.readDouble(); @@ -544,8 +481,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp data.add(controlType.ordinal()); data.add(dumpLeft.ordinal()); data.add(dumpRight.ordinal()); - data.add(clientDumpLeft); - data.add(clientDumpRight); data.add(isActive); data.add(clientEnergyUsed); @@ -821,6 +756,12 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp return upgradeComponent; } + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } + @Override public void recalculateUpgradables(Upgrade upgrade) { diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index 75235eb58..7b4febd71 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -16,8 +16,10 @@ import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.CableUtils; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; @@ -29,7 +31,7 @@ import net.minecraft.util.EnumFacing.Axis; import net.minecraft.util.MathHelper; import net.minecraft.util.EnumFacing; -public class TileEntityEnergyCube extends TileEntityElectricBlock implements IComputerIntegration, IRedstoneControl, ISideConfiguration +public class TileEntityEnergyCube extends TileEntityElectricBlock implements IComputerIntegration, IRedstoneControl, ISideConfiguration, ISecurityTile { /** This Energy Cube's tier. */ public EnergyCubeTier tier = EnergyCubeTier.BASIC; @@ -44,6 +46,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo public TileComponentEjector ejectorComponent; public TileComponentConfig configComponent; + public TileComponentSecurity securityComponent; /** * A block used to store and transfer electricity. @@ -67,6 +70,8 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo controlType = RedstoneControl.DISABLED; ejectorComponent = new TileComponentEjector(this); + + securityComponent = new TileComponentSecurity(this); } @Override @@ -295,4 +300,10 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo { return facing; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 48f10937c..1e2ad51b0 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -47,8 +47,10 @@ import mekanism.common.recipe.inputs.InfusionInput; import mekanism.common.recipe.machines.AdvancedMachineRecipe; import mekanism.common.recipe.machines.BasicMachineRecipe; import mekanism.common.recipe.machines.MetallurgicInfuserRecipe; +import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; @@ -61,7 +63,7 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class TileEntityFactory extends TileEntityNoisyElectricBlock implements IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IGasHandler, ITubeConnection, ISpecialConfigData +public class TileEntityFactory extends TileEntityNoisyElectricBlock implements IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IGasHandler, ITubeConnection, ISpecialConfigData, ISecurityTile { /** This Factory's tier. */ public FactoryTier tier; @@ -131,6 +133,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I public TileComponentUpgrade upgradeComponent; public TileComponentEjector ejectorComponent; public TileComponentConfig configComponent; + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); public TileEntityFactory() { @@ -215,6 +218,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I factory.ejectorComponent.setOutputData(TransmissionType.ITEM, factory.configComponent.getOutputs(TransmissionType.ITEM).get(4)); factory.recipeType = recipeType; factory.upgradeComponent.setSupported(Upgrade.GAS, recipeType.fuelEnergyUpgrades()); + factory.securityComponent.readFrom(securityComponent); for(int i = 0; i < tier.processes+5; i++) { @@ -1186,4 +1190,10 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I { return tier.getBaseTier().getLocalizedName() + " " + recipeType.getLocalizedName() + " " + super.getName(); } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } \ No newline at end of file diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java index 6c71c0dd1..d2158d58c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java @@ -15,6 +15,8 @@ import mekanism.common.base.IFluidContainerManager; import mekanism.common.base.ISustainedTank; import mekanism.common.base.ITankManager; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import mekanism.common.util.InventoryUtils; @@ -37,7 +39,7 @@ import net.minecraftforge.fml.common.network.ByteBufUtils; import java.util.ArrayList; -public class TileEntityFluidTank extends TileEntityContainerBlock implements IActiveState, IConfigurable, IFluidHandler, ISustainedTank, IFluidContainerManager, ITankManager +public class TileEntityFluidTank extends TileEntityContainerBlock implements IActiveState, IConfigurable, IFluidHandler, ISustainedTank, IFluidContainerManager, ITankManager, ISecurityTile { public boolean isActive; @@ -60,6 +62,8 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc public boolean needsPacket; + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); + public TileEntityFluidTank() { super("FluidTank"); @@ -574,4 +578,10 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc { return new Object[] {fluidTank}; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index 55a969f6f..08cdb31f9 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -19,6 +19,8 @@ import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.integration.IComputerIntegration; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; @@ -43,7 +45,7 @@ import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fml.common.network.ByteBufUtils; -public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implements IComputerIntegration, IConfigurable, IFluidHandler, ISustainedTank, IUpgradeTile, IRedstoneControl +public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implements IComputerIntegration, IConfigurable, IFluidHandler, ISustainedTank, IUpgradeTile, IRedstoneControl, ISecurityTile { public Set activeNodes = new HashSet(); public Set usedNodes = new HashSet(); @@ -70,6 +72,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen private static EnumSet dirs = EnumSet.complementOf(EnumSet.of(EnumFacing.UP)); public TileComponentUpgrade upgradeComponent = new TileComponentUpgrade(this, 3); + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); public TileEntityFluidicPlenisher() { @@ -108,7 +111,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen } } - if(MekanismUtils.canFunction(this) && getEnergy() >= energyPerTick && fluidTank.getFluid().getFluid().canBePlacedInWorld()) + if(MekanismUtils.canFunction(this) && getEnergy() >= energyPerTick && fluidTank.getFluid() != null && fluidTank.getFluid().getFluid().canBePlacedInWorld()) { if(!finishedCalc) { @@ -560,4 +563,10 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen { return false; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index cc6b909de..a2b79d8ea 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -18,8 +18,10 @@ import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.content.assemblicator.RecipeFormula; import mekanism.common.item.ItemCraftingFormula; +import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; @@ -29,7 +31,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock implements ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess +public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock implements ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess, ISecurityTile { public InventoryCrafting dummyInv = MekanismUtils.getDummyCraftingInv(); @@ -56,8 +58,12 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im public TileComponentUpgrade upgradeComponent; public TileComponentEjector ejectorComponent; public TileComponentConfig configComponent; + public TileComponentSecurity securityComponent; - public TileEntityFormulaicAssemblicator() + public ItemStack lastFormulaStack; + public boolean needsFormulaUpdate = false; + + public TileEntityFormulaicAssemblicator() { super("FormulaicAssemblicator", MachineType.FORMULAIC_ASSEMBLICATOR.baseEnergy); @@ -78,6 +84,8 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im ejectorComponent = new TileComponentEjector(this); ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(2)); + + securityComponent = new TileComponentSecurity(this); } @Override @@ -98,67 +106,38 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im pulseOperations++; } + RecipeFormula prev = formula; + if(inventory[2] != null && inventory[2].getItem() instanceof ItemCraftingFormula) { ItemCraftingFormula item = (ItemCraftingFormula)inventory[2].getItem(); - if(item.getInventory(inventory[2]) != null && !item.isInvalid(inventory[2])) + if(formula == null || lastFormulaStack != inventory[2]) { - RecipeFormula itemFormula = new RecipeFormula(item.getInventory(inventory[2])); - - if(itemFormula.isValidFormula(worldObj)) - { - if(formula != null && !formula.isFormulaEqual(worldObj, itemFormula)) - { - itemFormula = formula; - operatingTicks = 0; - } - else if(formula == null) - { - formula = itemFormula; - } - } - else { - formula = null; - item.setInvalid(inventory[2], true); - } - } - else { - formula = null; + loadFormula(); } } else { formula = null; } + if(prev != formula) + { + needsFormulaUpdate = true; + } + + lastFormulaStack = inventory[2]; + if(autoMode && formula == null) { toggleAutoMode(); } - if(formula == null) - { - if(autoMode) - { - toggleAutoMode(); - } - - for(int i = 0; i < 9; i++) - { - dummyInv.setInventorySlotContents(i, inventory[27+i]); - } - - isRecipe = MekanismUtils.findMatchingRecipe(dummyInv, worldObj) != null; - } - else { - isRecipe = formula.matches(worldObj, inventory, 27); - } - if(autoMode && formula != null && ((controlType == RedstoneControl.PULSE && pulseOperations > 0) || MekanismUtils.canFunction(this))) { boolean canOperate = true; - if(!formula.matches(worldObj, inventory, 27)) + if(!isRecipe) { canOperate = moveItemsToGrid(); } @@ -167,7 +146,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im { isRecipe = true; - if(operatingTicks == ticksRequired) + if(operatingTicks >= ticksRequired) { if(doSingleCraft()) { @@ -177,6 +156,8 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im { pulseOperations--; } + + ejectorComponent.outputItems(); } } else { @@ -197,6 +178,58 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im } } + public void loadFormula() + { + ItemCraftingFormula item = (ItemCraftingFormula)inventory[2].getItem(); + + if(item.getInventory(inventory[2]) != null && !item.isInvalid(inventory[2])) + { + RecipeFormula itemFormula = new RecipeFormula(worldObj, item.getInventory(inventory[2])); + + if(itemFormula.isValidFormula(worldObj)) + { + if(formula != null && !formula.isFormulaEqual(worldObj, itemFormula)) + { + formula = itemFormula; + operatingTicks = 0; + } + else if(formula == null) + { + formula = itemFormula; + } + } + else { + formula = null; + item.setInvalid(inventory[2], true); + } + } + else { + formula = null; + } + } + + @Override + public void markDirty() + { + super.markDirty(); + + if(worldObj != null && !worldObj.isRemote) + { + if(formula == null) + { + for(int i = 0; i < 9; i++) + { + dummyInv.setInventorySlotContents(i, inventory[27+i]); + } + + isRecipe = MekanismUtils.findMatchingRecipe(dummyInv, worldObj) != null; + } + else { + isRecipe = formula.matches(worldObj, inventory, 27); + } + } + } + private boolean doSingleCraft() { for(int i = 0; i < 9; i++) @@ -291,6 +324,8 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im private boolean moveItemsToGrid() { + boolean ret = true; + for(int i = 27; i <= 35; i++) { if(formula.isIngredientInPos(worldObj, inventory[i], i-27)) @@ -305,7 +340,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im if(inventory[i] != null) { - return false; + ret = false; } } else { @@ -332,12 +367,12 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im if(!found) { - return false; + ret = false; } } } - return true; + return ret; } private void craftAll() @@ -354,6 +389,8 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im inventory[i] = tryMoveToInput(inventory[i]); } } + + markDirty(); } private void toggleAutoMode() @@ -445,7 +482,7 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im if(item.getInventory(inventory[2]) == null) { - RecipeFormula formula = new RecipeFormula(inventory, 27); + RecipeFormula formula = new RecipeFormula(worldObj, inventory, 27); if(formula.isValidFormula(worldObj)) { @@ -571,20 +608,23 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im if(dataStream.readBoolean()) { - ItemStack[] inv = new ItemStack[9]; - - for(int i = 0; i < 9; i++) + if(dataStream.readBoolean()) { - if(dataStream.readBoolean()) + ItemStack[] inv = new ItemStack[9]; + + for(int i = 0; i < 9; i++) { - inv[i] = PacketHandler.readStack(dataStream); + if(dataStream.readBoolean()) + { + inv[i] = PacketHandler.readStack(dataStream); + } } + + formula = new RecipeFormula(worldObj, inv); + } + else { + formula = null; } - - formula = new RecipeFormula(inv); - } - else { - formula = null; } } @@ -598,26 +638,36 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im data.add(controlType.ordinal()); data.add(isRecipe); - if(formula != null) + if(needsFormulaUpdate) { data.add(true); - for(int i = 0; i < 9; i++) + if(formula != null) { - if(formula.input[i] != null) + data.add(true); + + for(int i = 0; i < 9; i++) { - data.add(true); - data.add(formula.input[i]); - } - else { - data.add(false); + if(formula.input[i] != null) + { + data.add(true); + data.add(formula.input[i]); + } + else { + data.add(false); + } } } + else { + data.add(false); + } } else { data.add(false); } + needsFormulaUpdate = false; + return data; } @@ -664,6 +714,12 @@ public class TileEntityFormulaicAssemblicator extends TileEntityElectricBlock im return ejectorComponent; } + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } + @Override public void recalculateUpgradables(Upgrade upgrade) { diff --git a/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java new file mode 100644 index 000000000..a78c170f0 --- /dev/null +++ b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java @@ -0,0 +1,279 @@ +package mekanism.common.tile; + +import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + +import mekanism.api.Coord4D; +import mekanism.api.IHeatTransfer; +import mekanism.api.MekanismConfig.general; +import mekanism.api.Range4D; +import mekanism.common.Mekanism; +import mekanism.common.base.IActiveState; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; +import mekanism.common.util.HeatUtils; +import mekanism.common.util.MekanismUtils; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityFurnace; +import net.minecraftforge.common.util.ForgeDirection; + +public class TileEntityFuelwoodHeater extends TileEntityContainerBlock implements IHeatTransfer, ISecurityTile, IActiveState +{ + public double temperature; + public double heatToAbsorb = 0; + + public int burnTime; + public int maxBurnTime; + + /** Whether or not this machine is in it's active state. */ + public boolean isActive; + + /** The client's current active state. */ + public boolean clientActive; + + /** How many ticks must pass until this block's active state can sync with the client. */ + public int updateDelay; + + public double lastTransferLoss; + public double lastEnvironmentLoss; + + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); + + public TileEntityFuelwoodHeater() + { + super("FuelwoodHeater"); + inventory = new ItemStack[1]; + } + + @Override + public void onUpdate() + { + if(worldObj.isRemote && updateDelay > 0) + { + updateDelay--; + + if(updateDelay == 0 && clientActive != isActive) + { + isActive = clientActive; + MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); + } + } + + if(!worldObj.isRemote) + { + if(updateDelay > 0) + { + updateDelay--; + + if(updateDelay == 0 && clientActive != isActive) + { + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + } + } + + boolean burning = false; + + if(burnTime > 0) + { + burnTime--; + burning = true; + } + else { + if(inventory[0] != null) + { + maxBurnTime = burnTime = TileEntityFurnace.getItemBurnTime(inventory[0])/2; + + if(burnTime > 0) + { + inventory[0].stackSize--; + + if(inventory[0].stackSize == 0) + { + inventory[0] = inventory[0].getItem().getContainerItem(inventory[0]); + } + + burning = true; + } + } + } + + if(burning) + { + heatToAbsorb += general.heatPerFuelTick; + } + + double[] loss = simulateHeat(); + applyTemperatureChange(); + + lastTransferLoss = loss[0]; + lastEnvironmentLoss = loss[1]; + + setActive(burning); + } + } + + @Override + public void readFromNBT(NBTTagCompound nbtTags) + { + super.readFromNBT(nbtTags); + + temperature = nbtTags.getDouble("temperature"); + clientActive = isActive = nbtTags.getBoolean("isActive"); + burnTime = nbtTags.getInteger("burnTime"); + maxBurnTime = nbtTags.getInteger("maxBurnTime"); + } + + @Override + public void writeToNBT(NBTTagCompound nbtTags) + { + super.writeToNBT(nbtTags); + + nbtTags.setDouble("temperature", temperature); + nbtTags.setBoolean("isActive", isActive); + nbtTags.setInteger("burnTime", burnTime); + nbtTags.setInteger("maxBurnTime", maxBurnTime); + } + + @Override + public void handlePacketData(ByteBuf dataStream) + { + super.handlePacketData(dataStream); + + temperature = dataStream.readDouble(); + clientActive = dataStream.readBoolean(); + burnTime = dataStream.readInt(); + maxBurnTime = dataStream.readInt(); + + lastTransferLoss = dataStream.readDouble(); + lastEnvironmentLoss = dataStream.readDouble(); + + if(updateDelay == 0 && clientActive != isActive) + { + updateDelay = general.UPDATE_DELAY; + isActive = clientActive; + MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); + } + } + + @Override + public ArrayList getNetworkedData(ArrayList data) + { + super.getNetworkedData(data); + + data.add(temperature); + data.add(isActive); + data.add(burnTime); + data.add(maxBurnTime); + + data.add(lastTransferLoss); + data.add(lastEnvironmentLoss); + + return data; + } + + @Override + public boolean canSetFacing(int side) + { + return side != 0 && side != 1; + } + + @Override + public void setActive(boolean active) + { + isActive = active; + + if(clientActive != active && updateDelay == 0) + { + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + + updateDelay = 10; + clientActive = active; + } + } + + @Override + public boolean getActive() + { + return isActive; + } + + @Override + public boolean renderUpdate() + { + return false; + } + + @Override + public boolean lightUpdate() + { + return true; + } + + @Override + public double getTemp() + { + return temperature; + } + + @Override + public double getInverseConductionCoefficient() + { + return 1; + } + + @Override + public double getInsulationCoefficient(ForgeDirection side) + { + return 1000; + } + + @Override + public void transferHeatTo(double heat) + { + heatToAbsorb += heat; + } + + @Override + public double[] simulateHeat() + { + return HeatUtils.simulate(this); + } + + @Override + public double applyTemperatureChange() + { + temperature += heatToAbsorb; + heatToAbsorb = 0; + + return temperature; + } + + @Override + public boolean canConnectHeat(ForgeDirection side) + { + return true; + } + + @Override + public IHeatTransfer getAdjacent(ForgeDirection side) + { + TileEntity adj = Coord4D.get(this).getFromSide(side).getTileEntity(worldObj); + + if(adj instanceof IHeatTransfer) + { + return (IHeatTransfer)adj; + } + + return null; + } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } +} diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index e80efb0dc..2b6ef6f38 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -21,8 +21,10 @@ import mekanism.common.Tier.GasTankTier; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.InventoryUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; @@ -33,7 +35,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraft.util.EnumFacing; -public class TileEntityGasTank extends TileEntityContainerBlock implements IGasHandler, ITubeConnection, IRedstoneControl, ISideConfiguration +public class TileEntityGasTank extends TileEntityContainerBlock implements IGasHandler, ITubeConnection, IRedstoneControl, ISideConfiguration, ISecurityTile { public enum GasMode { @@ -56,6 +58,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH public TileComponentEjector ejectorComponent; public TileComponentConfig configComponent; + public TileComponentSecurity securityComponent; public TileEntityGasTank() { @@ -78,6 +81,8 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH controlType = RedstoneControl.DISABLED; ejectorComponent = new TileComponentEjector(this); + + securityComponent = new TileComponentSecurity(this); } @Override @@ -348,4 +353,10 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH { return facing; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java index 7f7e309d5..b2fdbe793 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java @@ -15,6 +15,8 @@ import mekanism.common.Mekanism; import mekanism.common.base.IRedstoneControl; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; @@ -23,7 +25,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.EnumFacing; -public class TileEntityLaserAmplifier extends TileEntityContainerBlock implements ILaserReceptor, IRedstoneControl, ICableOutputter, IStrictEnergyStorage, IComputerIntegration +public class TileEntityLaserAmplifier extends TileEntityContainerBlock implements ILaserReceptor, IRedstoneControl, ICableOutputter, IStrictEnergyStorage, IComputerIntegration, ISecurityTile { public static final double MAX_ENERGY = 5E9; public double collectedEnergy = 0; @@ -43,6 +45,8 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement public boolean emittingRedstone; public boolean entityDetection; + + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); public TileEntityLaserAmplifier() { @@ -332,4 +336,10 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement throw new NoSuchMethodException(); } } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java index 89fc1222c..04be12ed4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java @@ -13,6 +13,8 @@ import mekanism.common.LaserManager; import mekanism.common.LaserManager.LaserInfo; import mekanism.common.Mekanism; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.InventoryUtils; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; @@ -21,7 +23,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.EnumFacing; -public class TileEntityLaserTractorBeam extends TileEntityContainerBlock implements ILaserReceptor +public class TileEntityLaserTractorBeam extends TileEntityContainerBlock implements ILaserReceptor, ISecurityTile { public static final double MAX_ENERGY = 5E9; public double collectedEnergy = 0; @@ -33,6 +35,8 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme public double diggingProgress; public static int[] availableSlotIDs = InventoryUtils.getIntRange(0, 26); + + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); public TileEntityLaserTractorBeam() { @@ -217,4 +221,10 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme lastFired = dataStream.readDouble(); } } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index abbf6d3e1..d45c925ee 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -24,6 +24,8 @@ import mekanism.common.content.transporter.TItemStackFilter; import mekanism.common.content.transporter.TransporterFilter; import mekanism.common.content.transporter.TransporterManager; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; @@ -37,7 +39,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.Constants.NBT; import net.minecraft.util.EnumFacing; -public class TileEntityLogisticalSorter extends TileEntityElectricBlock implements IRedstoneControl, IActiveState, ISpecialConfigData, ISustainedData +public class TileEntityLogisticalSorter extends TileEntityElectricBlock implements IRedstoneControl, IActiveState, ISpecialConfigData, ISustainedData, ISecurityTile { public HashList filters = new HashList(); @@ -60,6 +62,8 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen public boolean clientActive; public final double ENERGY_PER_ITEM = 5; + + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); public TileEntityLogisticalSorter() { @@ -587,6 +591,12 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen { return true; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } @Override public NBTTagCompound getConfigurationData(NBTTagCompound nbtTags) diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index 3cc953e58..2fb453d86 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -32,8 +32,10 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.inputs.InfusionInput; import mekanism.common.recipe.machines.MetallurgicInfuserRecipe; +import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; @@ -42,7 +44,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock implements IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess +public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock implements IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess, ISecurityTile { /** The maxiumum amount of infuse this machine can store. */ public int MAX_INFUSE = 1000; @@ -81,12 +83,13 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i public TileComponentUpgrade upgradeComponent; public TileComponentEjector ejectorComponent; public TileComponentConfig configComponent; + public TileComponentSecurity securityComponent; public TileEntityMetallurgicInfuser() { super("machine.metalinfuser", "MetallurgicInfuser", BlockStateMachine.MachineType.METALLURGIC_INFUSER.baseEnergy); - configComponent = new TileComponentConfig(this, TransmissionType.ITEM, TransmissionType.ENERGY); + configComponent = new TileComponentConfig(this, TransmissionType.ITEM); configComponent.addOutput(TransmissionType.ITEM, new SideData("None", EnumColor.GREY, InventoryUtils.EMPTY)); configComponent.addOutput(TransmissionType.ITEM, new SideData("Input", EnumColor.DARK_RED, new int[] {2})); @@ -95,7 +98,6 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i configComponent.addOutput(TransmissionType.ITEM, new SideData("Infuse", EnumColor.PURPLE, new int[] {1})); configComponent.setConfig(TransmissionType.ITEM, new byte[] {4, 0, 0, 3, 1, 2}); - configComponent.setInputConfig(TransmissionType.ENERGY); inventory = new ItemStack[5]; @@ -104,6 +106,8 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i ejectorComponent = new TileComponentEjector(this); ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(2)); + + securityComponent = new TileComponentSecurity(this); } @Override @@ -231,6 +235,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i factory.ejectorComponent.setOutputData(TransmissionType.ITEM, factory.configComponent.getOutputs(TransmissionType.ITEM).get(2)); factory.recipeType = type; factory.upgradeComponent.setSupported(Upgrade.GAS, type.fuelEnergyUpgrades()); + factory.securityComponent.readFrom(securityComponent); for(TransmissionType transmission : configComponent.transmissions) { @@ -261,7 +266,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i @Override public EnumSet getConsumingSides() { - return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); + return EnumSet.of(ForgeDirection.getOrientation(facing).getOpposite()); } @Override @@ -511,7 +516,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i @Override public boolean renderUpdate() { - return true; + return false; } @Override @@ -550,6 +555,12 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i { return ejectorComponent; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } @Override public void recalculateUpgradables(Upgrade upgrade) diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java index c29840bf3..23ee49412 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java +++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; +import mekanism.common.PacketHandler; import mekanism.common.multiblock.IMultiblock; import mekanism.common.multiblock.MultiblockCache; import mekanism.common.multiblock.MultiblockManager; @@ -192,6 +193,7 @@ public abstract class TileEntityMultiblock> extend data.add(getSynchronizedData().volLength); getSynchronizedData().renderLocation.write(data); + data.add(getSynchronizedData().inventoryID); } else { data.add(false); @@ -223,6 +225,7 @@ public abstract class TileEntityMultiblock> extend getSynchronizedData().volLength = dataStream.readInt(); getSynchronizedData().renderLocation = Coord4D.read(dataStream); + getSynchronizedData().inventoryID = PacketHandler.readString(dataStream); } } } diff --git a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java index f5696b9d6..e9b5a4342 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java +++ b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java @@ -17,6 +17,8 @@ import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; @@ -28,7 +30,7 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.oredict.OreDictionary; -public class TileEntityOredictionificator extends TileEntityContainerBlock implements IRedstoneControl, ISpecialConfigData, ISustainedData +public class TileEntityOredictionificator extends TileEntityContainerBlock implements IRedstoneControl, ISpecialConfigData, ISustainedData, ISecurityTile { public static final int MAX_LENGTH = 24; @@ -40,6 +42,8 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple public boolean didProcess; + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); + public TileEntityOredictionificator() { super(BlockStateMachine.MachineType.OREDICTIONIFICATOR.machineName); @@ -63,7 +67,7 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple didProcess = false; - if(inventory[0] != null && getValidName(inventory[0]) != null) + if(MekanismUtils.canFunction(this) && inventory[0] != null && getValidName(inventory[0]) != null) { ItemStack result = getResult(inventory[0]); @@ -407,6 +411,12 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple return true; } + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } + public static class OredictionificatorFilter { public String filter; diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricChest.java b/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java similarity index 50% rename from src/main/java/mekanism/common/tile/TileEntityElectricChest.java rename to src/main/java/mekanism/common/tile/TileEntityPersonalChest.java index f559517d0..e695fb913 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricChest.java +++ b/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java @@ -1,42 +1,34 @@ package mekanism.common.tile; -import io.netty.buffer.ByteBuf; - -import java.util.ArrayList; - -import mekanism.common.PacketHandler; -import mekanism.common.util.ChargeUtils; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.SecurityUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -public class TileEntityElectricChest extends TileEntityElectricBlock +public class TileEntityPersonalChest extends TileEntityContainerBlock implements ISecurityTile { public static int[] INV; - public String password = ""; - - public boolean authenticated = false; - - public boolean locked = false; - public float lidAngle; public float prevLidAngle; + + public TileComponentSecurity securityComponent; - public TileEntityElectricChest() + public TileEntityPersonalChest() { - super("ElectricChest", 12000); - inventory = new ItemStack[55]; + super("PersonalChest"); + inventory = new ItemStack[54]; + + securityComponent = new TileComponentSecurity(this); } @Override public void onUpdate() { - super.onUpdate(); - prevLidAngle = lidAngle; float increment = 0.1F; @@ -74,73 +66,18 @@ public class TileEntityElectricChest extends TileEntityElectricBlock lidAngle = 0.0F; } } - - ChargeUtils.discharge(54, this); - } - - @Override - public void readFromNBT(NBTTagCompound nbtTags) - { - super.readFromNBT(nbtTags); - - authenticated = nbtTags.getBoolean("authenticated"); - locked = nbtTags.getBoolean("locked"); - password = nbtTags.getString("password"); - } - - @Override - public void writeToNBT(NBTTagCompound nbtTags) - { - super.writeToNBT(nbtTags); - - nbtTags.setBoolean("authenticated", authenticated); - nbtTags.setBoolean("locked", locked); - nbtTags.setString("password", password); - } - - @Override - public void handlePacketData(ByteBuf dataStream) - { - super.handlePacketData(dataStream); - - authenticated = dataStream.readBoolean(); - locked = dataStream.readBoolean(); - password = PacketHandler.readString(dataStream); - } - - @Override - public ArrayList getNetworkedData(ArrayList data) - { - super.getNetworkedData(data); - - data.add(authenticated); - data.add(locked); - data.add(password); - - return data; - } - - public boolean canAccess() - { - return authenticated && (getEnergy() == 0 || !locked); } @Override public boolean isItemValidForSlot(int slotID, ItemStack itemstack) { - if(slotID == 54) - { - return ChargeUtils.canBeDischarged(itemstack); - } - else { - return true; - } + return true; } @Override public int[] getSlotsForFace(EnumFacing side) { - if(side == EnumFacing.DOWN || !canAccess()) + if(side == EnumFacing.DOWN || SecurityUtils.getSecurity(this) != SecurityMode.PUBLIC) { return InventoryUtils.EMPTY; } @@ -162,19 +99,13 @@ public class TileEntityElectricChest extends TileEntityElectricBlock @Override public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) { - if(slotID == 54) - { - return ChargeUtils.canBeOutputted(itemstack, false); - } - else { - return true; - } + return true; } @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) { - return false; + return SecurityUtils.canAccess(entityPlayer, this); } @Override @@ -182,4 +113,10 @@ public class TileEntityElectricChest extends TileEntityElectricBlock { return side != 0 && side != 1; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index f779d4225..4cf4f50e1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -23,8 +23,10 @@ import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; import mekanism.common.frequency.IFrequencyHandler; import mekanism.common.integration.IComputerIntegration; +import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.CableUtils; import mekanism.common.util.HeatUtils; import mekanism.common.util.InventoryUtils; @@ -39,10 +41,8 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock implements ISideConfiguration, ITankManager, IFluidHandler, IFrequencyHandler, IGasHandler, IHeatTransfer, ITubeConnection, IComputerIntegration +public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock implements ISideConfiguration, ITankManager, IFluidHandler, IFrequencyHandler, IGasHandler, IHeatTransfer, ITubeConnection, IComputerIntegration, ISecurityTile { - public String owner; - public InventoryFrequency frequency; public double heatToAbsorb = 0; @@ -57,6 +57,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp public TileComponentEjector ejectorComponent; public TileComponentConfig configComponent; + public TileComponentSecurity securityComponent; public TileEntityQuantumEntangloporter() { @@ -85,6 +86,8 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(2)); ejectorComponent.setOutputData(TransmissionType.FLUID, configComponent.getOutputs(TransmissionType.FLUID).get(2)); ejectorComponent.setOutputData(TransmissionType.GAS, configComponent.getOutputs(TransmissionType.GAS).get(2)); + + securityComponent = new TileComponentSecurity(this); } @Override @@ -112,13 +115,13 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp { if(frequency != null && !frequency.valid) { - frequency = (InventoryFrequency)manager.validateFrequency(owner, Coord4D.get(this), frequency); + frequency = (InventoryFrequency)manager.validateFrequency(getSecurity().getOwner(), Coord4D.get(this), frequency); markDirty(); } if(frequency != null) { - frequency = (InventoryFrequency)manager.update(owner, Coord4D.get(this), frequency); + frequency = (InventoryFrequency)manager.update(getSecurity().getOwner(), Coord4D.get(this), frequency); if(frequency == null) { @@ -162,14 +165,19 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } @Override - public Frequency getFrequency() + public Frequency getFrequency(FrequencyManager manager) { + if(manager == Mekanism.securityFrequencies) + { + return getSecurity().getFrequency(); + } + return frequency; } public FrequencyManager getManager(Frequency freq) { - if(owner == null || freq == null) + if(getSecurity().getOwner() == null || freq == null) { return null; } @@ -179,24 +187,19 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp return Mekanism.publicEntangloporters; } else { - if(!Mekanism.privateEntangloporters.containsKey(owner)) + if(!Mekanism.privateEntangloporters.containsKey(getSecurity().getOwner())) { - FrequencyManager manager = new FrequencyManager(InventoryFrequency.class, owner); - Mekanism.privateEntangloporters.put(owner, manager); + FrequencyManager manager = new FrequencyManager(InventoryFrequency.class, InventoryFrequency.ENTANGLOPORTER, getSecurity().getOwner()); + Mekanism.privateEntangloporters.put(getSecurity().getOwner(), manager); manager.createOrLoad(worldObj); } - return Mekanism.privateEntangloporters.get(owner); + return Mekanism.privateEntangloporters.get(getSecurity().getOwner()); } } public void setFrequency(String name, boolean publicFreq) { - if(name.equals(frequency)) - { - return; - } - FrequencyManager manager = getManager(new InventoryFrequency(name, null).setPublic(publicFreq)); manager.deactivate(Coord4D.get(this)); @@ -207,11 +210,13 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp frequency = (InventoryFrequency)freq; frequency.activeCoords.add(Coord4D.get(this)); + markDirty(); + return; } } - Frequency freq = new InventoryFrequency(name, owner).setPublic(publicFreq); + Frequency freq = new InventoryFrequency(name, getSecurity().getOwner()).setPublic(publicFreq); freq.activeCoords.add(Coord4D.get(this)); manager.addFrequency(freq); frequency = (InventoryFrequency)freq; @@ -225,11 +230,6 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp { super.readFromNBT(nbtTags); - if(nbtTags.hasKey("owner")) - { - owner = nbtTags.getString("owner"); - } - if(nbtTags.hasKey("frequency")) { frequency = new InventoryFrequency(nbtTags.getCompoundTag("frequency")); @@ -242,11 +242,6 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp { super.writeToNBT(nbtTags); - if(owner != null) - { - nbtTags.setString("owner", owner); - } - if(frequency != null) { NBTTagCompound frequencyTag = new NBTTagCompound(); @@ -278,7 +273,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp if(manager != null) { - manager.remove(freq, owner); + manager.remove(freq, getSecurity().getOwner()); } } @@ -290,14 +285,6 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp lastTransferLoss = dataStream.readDouble(); lastEnvironmentLoss = dataStream.readDouble(); - if(dataStream.readBoolean()) - { - owner = PacketHandler.readString(dataStream); - } - else { - owner = null; - } - if(dataStream.readBoolean()) { frequency = new InventoryFrequency(dataStream); @@ -332,15 +319,6 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp data.add(lastTransferLoss); data.add(lastEnvironmentLoss); - if(owner != null) - { - data.add(true); - data.add(owner); - } - else { - data.add(false); - } - if(frequency != null) { data.add(true); @@ -672,6 +650,12 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp { return ejectorComponent; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } @Override public boolean canTubeConnect(EnumFacing side) diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java index 4127ea065..e0fc75084 100644 --- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -3,6 +3,7 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; import java.util.ArrayList; +import java.util.EnumSet; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; @@ -13,6 +14,8 @@ import mekanism.common.base.IRedstoneControl; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.ChargeUtils; import mekanism.common.util.HeatUtils; import mekanism.common.util.MekanismUtils; @@ -21,7 +24,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock implements IHeatTransfer, IComputerIntegration, IRedstoneControl +public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock implements IHeatTransfer, IComputerIntegration, IRedstoneControl, ISecurityTile { public double energyUsage = 100; @@ -44,6 +47,8 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl public RedstoneControl controlType = RedstoneControl.DISABLED; + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); + public TileEntityResistiveHeater() { super("machine.resistiveheater", "ResistiveHeater", MachineType.RESISTIVE_HEATER.baseEnergy); @@ -115,6 +120,12 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl } } + @Override + public EnumSet getConsumingSides() + { + return EnumSet.of(MekanismUtils.getLeft(facing), MekanismUtils.getRight(facing)); + } + @Override public boolean canSetFacing(int side) { @@ -341,4 +352,10 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl { return false; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java index 2c9173592..3f307ac43 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -25,6 +25,8 @@ import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; @@ -46,7 +48,7 @@ import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fml.common.network.ByteBufUtils; -public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock implements IActiveState, ISustainedData, IFluidHandler, IGasHandler, ITubeConnection, IRedstoneControl, IUpgradeTile, IUpgradeInfoHandler, ITankManager +public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock implements IActiveState, ISustainedData, IFluidHandler, IGasHandler, ITubeConnection, IRedstoneControl, IUpgradeTile, IUpgradeInfoHandler, ITankManager, ISecurityTile { public GasTank gasTank = new GasTank(MAX_FLUID); @@ -74,6 +76,7 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp public double clientEnergyUsed; public TileComponentUpgrade upgradeComponent = new TileComponentUpgrade(this, 5); + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); /** This machine's current RedstoneControl type. */ public RedstoneControl controlType = RedstoneControl.DISABLED; @@ -567,4 +570,10 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp { return new Object[] {gasTank, fluidTank}; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java new file mode 100644 index 000000000..17e1d5fcc --- /dev/null +++ b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java @@ -0,0 +1,303 @@ +package mekanism.common.tile; + +import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + +import mekanism.api.Coord4D; +import mekanism.common.Mekanism; +import mekanism.common.PacketHandler; +import mekanism.common.base.IBoundingBlock; +import mekanism.common.frequency.Frequency; +import mekanism.common.frequency.FrequencyManager; +import mekanism.common.security.IOwnerItem; +import mekanism.common.security.ISecurityItem; +import mekanism.common.security.ISecurityTile.SecurityMode; +import mekanism.common.security.SecurityFrequency; +import mekanism.common.util.MekanismUtils; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; + +public class TileEntitySecurityDesk extends TileEntityContainerBlock implements IBoundingBlock +{ + public String owner; + + public SecurityFrequency frequency; + + public TileEntitySecurityDesk() + { + super("SecurityDesk"); + + inventory = new ItemStack[2]; + } + + @Override + public void onUpdate() + { + if(!worldObj.isRemote) + { + if(owner != null && frequency != null) + { + if(inventory[0] != null && inventory[0].getItem() instanceof IOwnerItem) + { + IOwnerItem item = (IOwnerItem)inventory[0].getItem(); + + if(item.hasOwner(inventory[0]) && item.getOwner(inventory[0]) != null) + { + if(item.getOwner(inventory[0]).equals(owner)) + { + item.setOwner(inventory[0], null); + + if(item instanceof ISecurityItem && ((ISecurityItem)item).hasSecurity(inventory[0])) + { + ((ISecurityItem)item).setSecurity(inventory[0], SecurityMode.PUBLIC); + } + } + } + } + + if(inventory[1] != null && inventory[1].getItem() instanceof IOwnerItem) + { + IOwnerItem item = (IOwnerItem)inventory[1].getItem(); + + if(item.hasOwner(inventory[1])) + { + if(item.getOwner(inventory[1]) == null) + { + item.setOwner(inventory[1], owner); + } + + if(item.getOwner(inventory[1]).equals(owner)) + { + if(item instanceof ISecurityItem && ((ISecurityItem)item).hasSecurity(inventory[1])) + { + ((ISecurityItem)item).setSecurity(inventory[1], frequency.securityMode); + } + } + } + } + } + + if(frequency == null && owner != null) + { + setFrequency(owner); + } + + FrequencyManager manager = getManager(frequency); + + if(manager != null) + { + if(frequency != null && !frequency.valid) + { + frequency = (SecurityFrequency)manager.validateFrequency(owner, Coord4D.get(this), frequency); + } + + if(frequency != null) + { + frequency = (SecurityFrequency)manager.update(owner, Coord4D.get(this), frequency); + } + } + else { + frequency = null; + } + } + } + + public FrequencyManager getManager(Frequency freq) + { + if(owner == null || freq == null) + { + return null; + } + + return Mekanism.securityFrequencies; + } + + public void setFrequency(String owner) + { + FrequencyManager manager = Mekanism.securityFrequencies; + manager.deactivate(Coord4D.get(this)); + + for(Frequency freq : manager.getFrequencies()) + { + if(freq.owner.equals(owner)) + { + frequency = (SecurityFrequency)freq; + frequency.activeCoords.add(Coord4D.get(this)); + + return; + } + } + + Frequency freq = new SecurityFrequency(owner).setPublic(true); + freq.activeCoords.add(Coord4D.get(this)); + manager.addFrequency(freq); + frequency = (SecurityFrequency)freq; + + MekanismUtils.saveChunk(this); + markDirty(); + } + + @Override + public void handlePacketData(ByteBuf dataStream) + { + if(!worldObj.isRemote) + { + int type = dataStream.readInt(); + + if(type == 0) + { + if(frequency != null) + { + frequency.trusted.add(PacketHandler.readString(dataStream)); + } + } + else if(type == 1) + { + if(frequency != null) + { + frequency.trusted.remove(PacketHandler.readString(dataStream)); + } + } + else if(type == 2) + { + if(frequency != null) + { + frequency.override = !frequency.override; + } + } + else if(type == 3) + { + if(frequency != null) + { + frequency.securityMode = SecurityMode.values()[dataStream.readInt()]; + } + } + + MekanismUtils.saveChunk(this); + + return; + } + + super.handlePacketData(dataStream); + + if(dataStream.readBoolean()) + { + owner = PacketHandler.readString(dataStream); + } + else { + owner = null; + } + + if(dataStream.readBoolean()) + { + frequency = new SecurityFrequency(dataStream); + } + else { + frequency = null; + } + } + + @Override + public void readFromNBT(NBTTagCompound nbtTags) + { + super.readFromNBT(nbtTags); + + if(nbtTags.hasKey("owner")) + { + owner = nbtTags.getString("owner"); + } + + if(nbtTags.hasKey("frequency")) + { + frequency = new SecurityFrequency(nbtTags.getCompoundTag("frequency")); + frequency.valid = false; + } + } + + @Override + public void writeToNBT(NBTTagCompound nbtTags) + { + super.writeToNBT(nbtTags); + + if(owner != null) + { + nbtTags.setString("owner", owner); + } + + if(frequency != null) + { + NBTTagCompound frequencyTag = new NBTTagCompound(); + frequency.write(frequencyTag); + nbtTags.setTag("frequency", frequencyTag); + } + } + + @Override + public ArrayList getNetworkedData(ArrayList data) + { + super.getNetworkedData(data); + + if(owner != null) + { + data.add(true); + data.add(owner); + } + else { + data.add(false); + } + + if(frequency != null) + { + data.add(true); + frequency.write(data); + } + else { + data.add(false); + } + + return data; + } + + @Override + public void invalidate() + { + if(!worldObj.isRemote) + { + if(frequency != null) + { + FrequencyManager manager = getManager(frequency); + + if(manager != null) + { + manager.deactivate(Coord4D.get(this)); + } + } + } + } + + @Override + public void onPlace() + { + MekanismUtils.makeBoundingBlock(worldObj, Coord4D.get(this).getFromSide(ForgeDirection.UP), Coord4D.get(this)); + } + + @Override + public void onBreak() + { + worldObj.setBlockToAir(xCoord, yCoord+1, zCoord); + worldObj.setBlockToAir(xCoord, yCoord, zCoord); + } + + @Override + public Frequency getFrequency(FrequencyManager manager) + { + if(manager == Mekanism.securityFrequencies) + { + return frequency; + } + + return null; + } +} diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index 30d50097c..75b2cabc5 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -11,16 +11,19 @@ import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; +import mekanism.common.base.IBoundingBlock; import mekanism.common.base.IRedstoneControl; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -public class TileEntitySeismicVibrator extends TileEntityElectricBlock implements IActiveState, IRedstoneControl +public class TileEntitySeismicVibrator extends TileEntityElectricBlock implements IActiveState, IRedstoneControl, ISecurityTile, IBoundingBlock { public boolean isActive; @@ -28,10 +31,12 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement public int updateDelay; - public float clientPiston; + public int clientPiston; public RedstoneControl controlType = RedstoneControl.DISABLED; + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); + public TileEntitySeismicVibrator() { super("SeismicVibrator", BlockStateMachine.MachineType.SEISMIC_VIBRATOR.baseEnergy); @@ -46,6 +51,11 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement if(worldObj.isRemote) { + if(isActive) + { + clientPiston++; + } + if(updateDelay > 0) { updateDelay--; @@ -189,7 +199,7 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement @Override public EnumSet getConsumingSides() { - return EnumSet.of(EnumFacing.UP); + return EnumSet.of(ForgeDirection.getOrientation(facing).getOpposite()); } @Override @@ -204,4 +214,23 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement { return false; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } + + @Override + public void onPlace() + { + MekanismUtils.makeBoundingBlock(worldObj, Coord4D.get(this).getFromSide(ForgeDirection.UP), Coord4D.get(this)); + } + + @Override + public void onBreak() + { + worldObj.setBlockToAir(xCoord, yCoord+1, zCoord); + worldObj.setBlockToAir(xCoord, yCoord, zCoord); + } } diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java index 1494c4014..d3006e9b7 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java @@ -23,6 +23,8 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.GasInput; import mekanism.common.recipe.machines.SolarNeutronRecipe; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -30,7 +32,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.biome.BiomeGenDesert; import net.minecraft.util.EnumFacing; -public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock implements IRedstoneControl, IBoundingBlock, IGasHandler, ITubeConnection, IActiveState, ISustainedData, ITankManager +public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock implements IRedstoneControl, IBoundingBlock, IGasHandler, ITubeConnection, IActiveState, ISustainedData, ITankManager, ISecurityTile { public GasTank inputTank = new GasTank(MAX_GAS); public GasTank outputTank = new GasTank(MAX_GAS); @@ -53,6 +55,8 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im /** This machine's current RedstoneControl type. */ public RedstoneControl controlType = RedstoneControl.DISABLED; + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); + public TileEntitySolarNeutronActivator() { super("SolarNeutronActivator"); @@ -400,4 +404,10 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im { return new Object[] {inputTank, outputTank}; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java b/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java index 900388293..65fd819b9 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java +++ b/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java @@ -1,7 +1,66 @@ package mekanism.common.tile; -public class TileEntitySuperheatingElement extends TileEntityBasicBlock +import java.util.ArrayList; + +import mekanism.api.Coord4D; +import mekanism.api.Range4D; +import mekanism.common.Mekanism; +import mekanism.common.content.boiler.SynchronizedBoilerData; +import mekanism.common.multiblock.TileEntityInternalMultiblock; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.util.MekanismUtils; + +public class TileEntitySuperheatingElement extends TileEntityInternalMultiblock { + public boolean prevHot; + @Override - public void onUpdate() {} + public void setMultiblock(String id) + { + boolean packet = false; + + if(id == null && multiblockUUID != null) + { + SynchronizedBoilerData.clientHotMap.remove(multiblockUUID); + packet = true; + } + else if(id != null && multiblockUUID == null) + { + packet = true; + } + + super.setMultiblock(id); + + if(packet && !worldObj.isRemote) + { + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + } + } + + @Override + public boolean canUpdate() + { + return true; + } + + @Override + public void onUpdate() + { + if(worldObj.isRemote) + { + boolean newHot = false; + + if(multiblockUUID != null && SynchronizedBoilerData.clientHotMap.get(multiblockUUID) != null) + { + newHot = SynchronizedBoilerData.clientHotMap.get(multiblockUUID); + } + + if(prevHot != newHot) + { + MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); + + prevHot = newHot; + } + } + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index 4c35be00a..e48f83e39 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -7,12 +7,15 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; +import java.util.UUID; import mekanism.api.Chunk3D; import mekanism.api.Coord4D; +import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.PacketHandler; +import mekanism.common.base.IRedstoneControl; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.chunkloading.IChunkLoader; @@ -20,8 +23,11 @@ import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; import mekanism.common.frequency.IFrequencyHandler; import mekanism.common.integration.IComputerIntegration; +import mekanism.common.network.PacketEntityMove.EntityMoveMessage; import mekanism.common.network.PacketPortalFX.PortalFXMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; @@ -48,13 +54,13 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class TileEntityTeleporter extends TileEntityElectricBlock implements IComputerIntegration, IChunkLoader, IFrequencyHandler +public class TileEntityTeleporter extends TileEntityElectricBlock implements IComputerIntegration, IChunkLoader, IFrequencyHandler, IRedstoneControl, ISecurityTile { private MinecraftServer server = MinecraftServer.getServer(); public AxisAlignedBB teleportBounds = null; - public Set didTeleport = new HashSet(); + public Set didTeleport = new HashSet(); public int teleDelay = 0; @@ -62,8 +68,6 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo public boolean prevShouldRender; - public String owner; - public Frequency frequency; public List publicCache = new ArrayList(); @@ -73,11 +77,17 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo /** This teleporter's current status. */ public byte status = 0; + + public RedstoneControl controlType = RedstoneControl.DISABLED; + + public TileComponentSecurity securityComponent; public TileEntityTeleporter() { super("Teleporter", BlockStateMachine.MachineType.TELEPORTER.baseEnergy); inventory = new ItemStack[1]; + + securityComponent = new TileComponentSecurity(this); } @Override @@ -112,12 +122,12 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo { if(frequency != null && !frequency.valid) { - frequency = manager.validateFrequency(owner, Coord4D.get(this), frequency); + frequency = manager.validateFrequency(getSecurity().getOwner(), Coord4D.get(this), frequency); } if(frequency != null) { - frequency = manager.update(owner, Coord4D.get(this), frequency); + frequency = manager.update(getSecurity().getOwner(), Coord4D.get(this), frequency); } } else { @@ -126,7 +136,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo status = canTeleport(); - if(status == 1 && teleDelay == 0) + if(MekanismUtils.canFunction(this) && status == 1 && teleDelay == 0) { teleport(); } @@ -152,8 +162,13 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo } @Override - public Frequency getFrequency() + public Frequency getFrequency(FrequencyManager manager) { + if(manager == Mekanism.securityFrequencies) + { + return getSecurity().getFrequency(); + } + return frequency; } @@ -169,11 +184,6 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo public void setFrequency(String name, boolean publicFreq) { - if(name.equals(frequency.name)) - { - return; - } - FrequencyManager manager = getManager(new Frequency(name, null).setPublic(publicFreq)); manager.deactivate(Coord4D.get(this)); @@ -188,7 +198,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo } } - Frequency freq = new Frequency(name, owner).setPublic(publicFreq); + Frequency freq = new Frequency(name, getSecurity().getOwner()).setPublic(publicFreq); freq.activeCoords.add(Coord4D.get(this)); manager.addFrequency(freq); frequency = freq; @@ -198,7 +208,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo public FrequencyManager getManager(Frequency freq) { - if(owner == null || freq == null) + if(getSecurity().getOwner() == null || freq == null) { return null; } @@ -208,14 +218,14 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo return Mekanism.publicTeleporters; } else { - if(!Mekanism.privateTeleporters.containsKey(owner)) + if(!Mekanism.privateTeleporters.containsKey(getSecurity().getOwner())) { - FrequencyManager manager = new FrequencyManager(Frequency.class, owner); - Mekanism.privateTeleporters.put(owner, manager); + FrequencyManager manager = new FrequencyManager(Frequency.class, Frequency.TELEPORTER, getSecurity().getOwner()); + Mekanism.privateTeleporters.put(getSecurity().getOwner(), manager); manager.createOrLoad(worldObj); } - return Mekanism.privateTeleporters.get(owner); + return Mekanism.privateTeleporters.get(getSecurity().getOwner()); } } @@ -268,14 +278,20 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo public void cleanTeleportCache() { - List list = worldObj.getEntitiesWithinAABB(Entity.class, teleportBounds); - Set teleportCopy = (Set)((HashSet)didTeleport).clone(); - - for(Entity entity : teleportCopy) + List list = new ArrayList(); + + for(Entity e : (List)worldObj.getEntitiesWithinAABB(Entity.class, teleportBounds)) { - if(!list.contains(entity)) + list.add(e.getPersistentID()); + } + + Set teleportCopy = (Set)((HashSet)didTeleport).clone(); + + for(UUID id : teleportCopy) + { + if(!list.contains(id)) { - didTeleport.remove(entity); + didTeleport.remove(id); } } } @@ -359,7 +375,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo if(teleporter != null) { - teleporter.didTeleport.add(entity); + teleporter.didTeleport.add(entity.getPersistentID()); teleporter.teleDelay = 5; if(entity instanceof EntityPlayerMP) @@ -444,11 +460,15 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo { e.copyDataFromOld(entity/*, true*/); world.spawnEntityInWorld(e); - teleporter.didTeleport.add(e); + teleporter.didTeleport.add(e.getPersistentID()); } entity.isDead = true; } + else { + entity.setLocationAndAngles(coord.xCoord+0.5, coord.yCoord+1, coord.zCoord+0.5, entity.rotationYaw, entity.rotationPitch); + Mekanism.packetHandler.sendToReceivers(new EntityMoveMessage(entity), new Range4D(new Coord4D(entity))); + } } public static void alignPlayer(EntityPlayerMP player, Coord4D coord) @@ -495,7 +515,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo for(Entity entity : entities) { - if(!didTeleport.contains(entity)) + if(!didTeleport.contains(entity.getPersistentID())) { ret.add(entity); } @@ -545,10 +565,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo { super.readFromNBT(nbtTags); - if(nbtTags.hasKey("owner")) - { - owner = nbtTags.getString("owner"); - } + controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")]; if(nbtTags.hasKey("frequency")) { @@ -562,10 +579,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo { super.writeToNBT(nbtTags); - if(owner != null) - { - nbtTags.setString("owner", owner); - } + nbtTags.setInteger("controlType", controlType.ordinal()); if(frequency != null) { @@ -598,7 +612,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo if(manager != null) { - manager.remove(freq, owner); + manager.remove(freq, getSecurity().getOwner()); } } @@ -607,14 +621,6 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo super.handlePacketData(dataStream); - if(dataStream.readBoolean()) - { - owner = PacketHandler.readString(dataStream); - } - else { - owner = null; - } - if(dataStream.readBoolean()) { frequency = new Frequency(dataStream); @@ -625,6 +631,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo status = dataStream.readByte(); shouldRender = dataStream.readBoolean(); + controlType = RedstoneControl.values()[dataStream.readInt()]; publicCache.clear(); privateCache.clear(); @@ -649,15 +656,6 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo { super.getNetworkedData(data); - if(owner != null) - { - data.add(true); - data.add(owner); - } - else { - data.add(false); - } - if(frequency != null) { data.add(true); @@ -669,6 +667,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo data.add(status); data.add(shouldRender); + data.add(controlType.ordinal()); data.add(Mekanism.publicTeleporters.getFrequencies().size()); @@ -764,4 +763,28 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo chunkTicket = null; } } + + @Override + public RedstoneControl getControlType() + { + return controlType; + } + + @Override + public void setControlType(RedstoneControl type) + { + controlType = type; + } + + @Override + public boolean canPulse() + { + return false; + } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationBlock.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationBlock.java index 180830008..13f998d23 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationBlock.java @@ -4,12 +4,13 @@ import java.util.HashSet; import java.util.Set; import mekanism.api.Coord4D; +import mekanism.common.integration.IComputerIntegration; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -public class TileEntityThermalEvaporationBlock extends TileEntityContainerBlock +public class TileEntityThermalEvaporationBlock extends TileEntityContainerBlock implements IComputerIntegration { public Coord4D master; @@ -154,4 +155,39 @@ public class TileEntityThermalEvaporationBlock extends TileEntityContainerBlock return found; } } + + private static final String[] methods = new String[] {"getTemperature", "getHeight", "isFormed", "getInput", "getOutput"}; + + @Override + public String[] getMethods() + { + return methods; + } + + @Override + public Object[] invoke(int method, Object[] args) throws Exception + { + TileEntityThermalEvaporationController controller = getController(); + + if(controller == null) + { + return new Object[] {"Unformed."}; + } + + switch(method) + { + case 0: + return new Object[] {controller.temperature}; + case 1: + return new Object[] {controller.height}; + case 2: + return new Object[] {controller.structured}; + case 3: + return new Object[] {controller.inputTank.getFluidAmount()}; + case 4: + return new Object[] {controller.outputTank.getFluidAmount()}; + default: + throw new NoSuchMethodException(); + } + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java index 4b49d9f31..51447e6c4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java @@ -7,7 +7,7 @@ import java.util.HashSet; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.api.ISalinationSolar; +import mekanism.api.IEvaporationSolar; import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; import mekanism.client.SparkleAnimation.INodeChecker; @@ -49,7 +49,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva public FluidTank outputTank = new FluidTank(MAX_OUTPUT); public Set tankParts = new HashSet(); - public ISalinationSolar[] solars = new ISalinationSolar[4]; + public IEvaporationSolar[] solars = new IEvaporationSolar[4]; public boolean temperatureSet = false; @@ -322,7 +322,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva int ret = 0; - for(ISalinationSolar solar : solars) + for(IEvaporationSolar solar : solars) { if(solar != null && solar.seesSun()) { @@ -531,9 +531,9 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva public boolean addSolarPanel(TileEntity tile, int i) { - if(tile instanceof ISalinationSolar && !tile.isInvalid()) + if(tile instanceof IEvaporationSolar && !tile.isInvalid()) { - solars[i] = (ISalinationSolar)tile; + solars[i] = (IEvaporationSolar)tile; return true; } else { @@ -700,7 +700,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva } tankParts.clear(); - solars = new ISalinationSolar[] {null, null, null, null}; + solars = new IEvaporationSolar[] {null, null, null, null}; } @Override diff --git a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java index 755ff0c33..24ba28e97 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java @@ -14,12 +14,15 @@ import mekanism.common.SideData; import mekanism.common.SideData.IOState; import mekanism.common.base.ITileComponent; import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; public class TileComponentConfig implements ITileComponent { + public static SideData EMPTY = new SideData("Empty", EnumColor.BLACK, InventoryUtils.EMPTY); + public TileEntityContainerBlock tileEntity; public Map sideConfigs = new HashMap(); @@ -133,12 +136,19 @@ public class TileComponentConfig implements ITileComponent public SideData getOutput(TransmissionType type, EnumFacing side, EnumFacing facing) { - return getOutputs(type).get(getConfig(type)[MekanismUtils.getBaseOrientation(side, facing).ordinal()]); + return getOutput(type, MekanismUtils.getBaseOrientation(side, facing)); } public SideData getOutput(TransmissionType type, EnumFacing side) { - return getOutputs(type).get(getConfig(type)[side.ordinal()]); + int index = getConfig(type)[side]; + + if(index == -1) + { + return EMPTY; + } + + return getOutputs(type).get(index); } public boolean supports(TransmissionType type) @@ -216,6 +226,9 @@ public class TileComponentConfig implements ITileComponent } } + @Override + public void invalidate() {} + public boolean isEjecting(TransmissionType type) { return ejecting.get(type.ordinal()); diff --git a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java index dc9735171..4a5e1032f 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java @@ -374,6 +374,9 @@ public class TileComponentEjector implements ITileComponent } } + @Override + public void invalidate() {} + private boolean getEjecting(TransmissionType type) { return ((ISideConfiguration)tileEntity).getConfig().isEjecting(type); diff --git a/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java b/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java new file mode 100644 index 000000000..27059b29e --- /dev/null +++ b/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java @@ -0,0 +1,231 @@ +package mekanism.common.tile.component; + +import io.netty.buffer.ByteBuf; + +import java.util.ArrayList; + +import mekanism.api.Coord4D; +import mekanism.common.Mekanism; +import mekanism.common.PacketHandler; +import mekanism.common.base.ITileComponent; +import mekanism.common.frequency.Frequency; +import mekanism.common.frequency.FrequencyManager; +import mekanism.common.security.ISecurityTile.SecurityMode; +import mekanism.common.security.SecurityFrequency; +import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.util.MekanismUtils; +import net.minecraft.nbt.NBTTagCompound; + +public class TileComponentSecurity implements ITileComponent +{ + /** TileEntity implementing this component. */ + public TileEntityContainerBlock tileEntity; + + private String owner; + + private SecurityMode securityMode = SecurityMode.PUBLIC; + + private SecurityFrequency frequency; + + public TileComponentSecurity(TileEntityContainerBlock tile) + { + tileEntity = tile; + + tile.components.add(this); + } + + public void readFrom(TileComponentSecurity security) + { + owner = security.owner; + securityMode = security.securityMode; + } + + public SecurityFrequency getFrequency() + { + return frequency; + } + + public String getOwner() + { + return owner; + } + + public void setOwner(String o) + { + frequency = null; + owner = o; + } + + public SecurityMode getMode() + { + return securityMode; + } + + public void setMode(SecurityMode mode) + { + securityMode = mode; + } + + public FrequencyManager getManager(Frequency freq) + { + if(owner == null || freq == null) + { + return null; + } + + return Mekanism.securityFrequencies; + } + + public void setFrequency(String owner) + { + FrequencyManager manager = Mekanism.securityFrequencies; + manager.deactivate(Coord4D.get(tileEntity)); + + for(Frequency freq : manager.getFrequencies()) + { + if(freq.owner.equals(owner)) + { + frequency = (SecurityFrequency)freq; + frequency.activeCoords.add(Coord4D.get(tileEntity)); + + return; + } + } + + Frequency freq = new SecurityFrequency(owner).setPublic(true); + freq.activeCoords.add(Coord4D.get(tileEntity)); + manager.addFrequency(freq); + frequency = (SecurityFrequency)freq; + + MekanismUtils.saveChunk(tileEntity); + tileEntity.markDirty(); + } + + @Override + public void tick() + { + if(!tileEntity.getWorldObj().isRemote) + { + if(frequency == null && owner != null) + { + setFrequency(owner); + } + + FrequencyManager manager = getManager(frequency); + + if(manager != null) + { + if(frequency != null && !frequency.valid) + { + frequency = (SecurityFrequency)manager.validateFrequency(owner, Coord4D.get(tileEntity), frequency); + } + + if(frequency != null) + { + frequency = (SecurityFrequency)manager.update(owner, Coord4D.get(tileEntity), frequency); + } + } + else { + frequency = null; + } + } + } + + @Override + public void read(NBTTagCompound nbtTags) + { + securityMode = SecurityMode.values()[nbtTags.getInteger("securityMode")]; + + if(nbtTags.hasKey("owner")) + { + owner = nbtTags.getString("owner"); + } + + if(nbtTags.hasKey("securityFreq")) + { + frequency = new SecurityFrequency(nbtTags.getCompoundTag("securityFreq")); + frequency.valid = false; + } + } + + @Override + public void read(ByteBuf dataStream) + { + securityMode = SecurityMode.values()[dataStream.readInt()]; + + if(dataStream.readBoolean()) + { + owner = PacketHandler.readString(dataStream); + } + else { + owner = null; + } + + if(dataStream.readBoolean()) + { + frequency = new SecurityFrequency(dataStream); + } + else { + frequency = null; + } + } + + @Override + public void write(NBTTagCompound nbtTags) + { + nbtTags.setInteger("securityMode", securityMode.ordinal()); + + if(owner != null) + { + nbtTags.setString("owner", owner); + } + + if(frequency != null) + { + NBTTagCompound frequencyTag = new NBTTagCompound(); + frequency.write(frequencyTag); + nbtTags.setTag("securityFreq", frequencyTag); + } + } + + @Override + public void write(ArrayList data) + { + data.add(securityMode.ordinal()); + + if(owner != null) + { + data.add(true); + data.add(owner); + } + else { + data.add(false); + } + + if(frequency != null) + { + data.add(true); + frequency.write(data); + } + else { + data.add(false); + } + } + + @Override + public void invalidate() + { + if(!tileEntity.getWorldObj().isRemote) + { + if(frequency != null) + { + FrequencyManager manager = getManager(frequency); + + if(manager != null) + { + manager.deactivate(Coord4D.get(tileEntity)); + } + } + } + } +} diff --git a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java index 6c15bfca5..23ae4e2f7 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java @@ -226,4 +226,7 @@ public class TileComponentUpgrade implements ITileComponent { Upgrade.saveMap(upgrades, nbtTags); } + + @Override + public void invalidate() {} } diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 3e19f6949..0a3025140 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -48,16 +48,16 @@ import mekanism.common.base.IModule; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; -import mekanism.common.inventory.container.ContainerElectricChest; +import mekanism.common.inventory.container.ContainerPersonalChest; import mekanism.common.item.ItemBlockBasic; import mekanism.common.item.ItemBlockEnergyCube; import mekanism.common.item.ItemBlockGasTank; import mekanism.common.item.ItemBlockMachine; -import mekanism.common.network.PacketElectricChest.ElectricChestMessage; -import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; +import mekanism.common.network.PacketPersonalChest.PersonalChestMessage; +import mekanism.common.network.PacketPersonalChest.PersonalChestPacketType; import mekanism.common.tile.TileEntityAdvancedBoundingBlock; import mekanism.common.tile.TileEntityBoundingBlock; -import mekanism.common.tile.TileEntityElectricChest; +import mekanism.common.tile.TileEntityPersonalChest; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; @@ -509,7 +509,39 @@ public final class MekanismUtils */ public static EnumFacing getBaseOrientation(EnumFacing side, EnumFacing blockFacing) { - if(blockFacing == EnumFacing.SOUTH || side.getAxis() == Axis.Y) + if(blockFacing == EnumFacing.DOWN) + { + switch(side) + { + case(DOWN): + return NORTH; + case(UP): + return SOUTH; + case(NORTH): + return UP; + case(SOUTH): + return DOWN; + default: + return side; + } + } + else if(blockFacing == EnumFacing.UP) + { + switch(side) + { + case(DOWN): + return SOUTH; + case(UP): + return NORTH; + case(NORTH): + return DOWN; + case(SOUTH): + return UP; + default: + return side; + } + } + else if(blockFacing == EnumFacing.SOUTH || side.getAxis() == Axis.Y) { if(side.getAxis() == Axis.Z) { @@ -939,7 +971,7 @@ public final class MekanismUtils * @param inventory - IInventory of the item, if it's not a block * @param isBlock - whether or not this electric chest is in it's block form */ - public static void openElectricChestGui(EntityPlayerMP player, TileEntityElectricChest tileEntity, IInventory inventory, boolean isBlock) + public static void openPersonalChestGui(EntityPlayerMP player, TileEntityPersonalChest tileEntity, IInventory inventory, boolean isBlock) { player.getNextWindowId(); player.closeContainer(); @@ -947,13 +979,13 @@ public final class MekanismUtils if(isBlock) { - Mekanism.packetHandler.sendTo(new ElectricChestMessage(ElectricChestPacketType.CLIENT_OPEN, true, false, 0, id, null, Coord4D.get(tileEntity)), player); + Mekanism.packetHandler.sendTo(new PersonalChestMessage(PersonalChestPacketType.CLIENT_OPEN, true, 0, id, Coord4D.get(tileEntity)), player); } else { - Mekanism.packetHandler.sendTo(new ElectricChestMessage(ElectricChestPacketType.CLIENT_OPEN, false, false, 0, id, null, null), player); + Mekanism.packetHandler.sendTo(new PersonalChestMessage(PersonalChestPacketType.CLIENT_OPEN, false, 0, id, null), player); } - player.openContainer = new ContainerElectricChest(player.inventory, tileEntity, inventory, isBlock); + player.openContainer = new ContainerPersonalChest(player.inventory, tileEntity, inventory, isBlock); player.openContainer.windowId = id; player.openContainer.onCraftGuiOpened(player); } diff --git a/src/main/java/mekanism/common/util/RecipeUtils.java b/src/main/java/mekanism/common/util/RecipeUtils.java index bae34e085..582f0610e 100644 --- a/src/main/java/mekanism/common/util/RecipeUtils.java +++ b/src/main/java/mekanism/common/util/RecipeUtils.java @@ -19,6 +19,7 @@ import mekanism.common.block.states.BlockStateMachine; import mekanism.common.inventory.InventoryBin; import mekanism.common.recipe.ShapedMekanismRecipe; import mekanism.common.recipe.ShapelessMekanismRecipe; +import mekanism.common.security.ISecurityItem; import net.minecraft.block.Block; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; @@ -151,6 +152,22 @@ public class RecipeUtils } } + if(toReturn.getItem() instanceof ISecurityItem) + { + for(int i = 0; i < 9; i++) + { + ItemStack itemstack = inv.getStackInSlot(i); + + if(itemstack.getItem() instanceof ISecurityItem) + { + ((ISecurityItem)toReturn.getItem()).setOwner(toReturn, ((ISecurityItem)itemstack.getItem()).getOwner(itemstack)); + ((ISecurityItem)toReturn.getItem()).setSecurity(toReturn, ((ISecurityItem)itemstack.getItem()).getSecurity(itemstack)); + + break; + } + } + } + if(toReturn.getItem() instanceof IFluidContainerItem) { FluidStack fluidFound = null; diff --git a/src/main/java/mekanism/common/util/SecurityUtils.java b/src/main/java/mekanism/common/util/SecurityUtils.java new file mode 100644 index 000000000..666ef797b --- /dev/null +++ b/src/main/java/mekanism/common/util/SecurityUtils.java @@ -0,0 +1,190 @@ +package mekanism.common.util; + +import mekanism.api.EnumColor; +import mekanism.common.Mekanism; +import mekanism.common.frequency.Frequency; +import mekanism.common.security.IOwnerItem; +import mekanism.common.security.ISecurityItem; +import mekanism.common.security.ISecurityTile; +import mekanism.common.security.ISecurityTile.SecurityMode; +import mekanism.common.security.SecurityFrequency; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatComponentText; + +public final class SecurityUtils +{ + public static boolean canAccess(EntityPlayer player, ItemStack stack) + { + if(!(stack.getItem() instanceof ISecurityItem) && stack.getItem() instanceof IOwnerItem) + { + String owner = ((IOwnerItem)stack.getItem()).getOwner(stack); + + return owner == null || owner.equals(player.getCommandSenderName()); + } + + if((!player.worldObj.isRemote && MekanismUtils.isOp((EntityPlayerMP)player)) || stack == null || !(stack.getItem() instanceof ISecurityItem)) + { + return true; + } + + ISecurityItem security = (ISecurityItem)stack.getItem(); + + return canAccess(security.getSecurity(stack), player.getCommandSenderName(), security.getOwner(stack)); + } + + public static boolean canAccess(EntityPlayer player, TileEntity tile) + { + if((!player.worldObj.isRemote && MekanismUtils.isOp((EntityPlayerMP)player)) || tile == null || !(tile instanceof ISecurityTile)) + { + return true; + } + + ISecurityTile security = (ISecurityTile)tile; + + return canAccess(security.getSecurity().getMode(), player.getCommandSenderName(), security.getSecurity().getOwner()); + } + + private static boolean canAccess(SecurityMode mode, String username, String owner) + { + if(owner == null || username.equals(owner)) + { + return true; + } + + SecurityFrequency freq = getFrequency(owner); + + if(freq == null) + { + return true; + } + + if(freq.override) + { + mode = freq.securityMode; + } + + if(mode == SecurityMode.PUBLIC) + { + return true; + } + else if(mode == SecurityMode.TRUSTED) + { + if(freq.trusted.contains(username)) + { + return true; + } + } + + return false; + } + + public static SecurityFrequency getFrequency(String owner) + { + if(owner != null) + { + for(Frequency f : Mekanism.securityFrequencies.getFrequencies()) + { + if(f instanceof SecurityFrequency && f.owner.equals(owner)) + { + return (SecurityFrequency)f; + } + } + } + + return null; + } + + public static String getOwnerDisplay(String user, String owner) + { + if(owner == null) + { + return EnumColor.RED + LangUtils.localize("gui.noOwner"); + } + + return EnumColor.GREY + LangUtils.localize("gui.owner") + ": " + (user.equals(owner) ? EnumColor.BRIGHT_GREEN : EnumColor.RED) + owner; + } + + public static void displayNoAccess(EntityPlayer player) + { + player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.RED + LangUtils.localize("gui.noAccessDesc"))); + } + + public static SecurityMode getSecurity(ISecurityTile security) + { + SecurityFrequency freq = security.getSecurity().getFrequency(); + + if(freq != null && freq.override) + { + return freq.securityMode; + } + + return security.getSecurity().getMode(); + } + + public static String getSecurityDisplay(ItemStack stack) + { + ISecurityItem security = (ISecurityItem)stack.getItem(); + SecurityMode mode = security.getSecurity(stack); + + if(security.getOwner(stack) != null) + { + SecurityFrequency freq = getFrequency(security.getOwner(stack)); + + if(freq != null && freq.override) + { + mode = freq.securityMode; + } + } + + return mode.getDisplay(); + } + + public static String getSecurityDisplay(TileEntity tile) + { + ISecurityTile security = (ISecurityTile)tile; + SecurityMode mode = security.getSecurity().getMode(); + + if(security.getSecurity().getOwner() != null) + { + SecurityFrequency freq = getFrequency(security.getSecurity().getOwner()); + + if(freq != null && freq.override) + { + mode = freq.securityMode; + } + } + + return mode.getDisplay(); + } + + public static boolean isOverridden(ItemStack stack) + { + ISecurityItem security = (ISecurityItem)stack.getItem(); + + if(security.getOwner(stack) == null) + { + return false; + } + + SecurityFrequency freq = getFrequency(security.getOwner(stack)); + + return freq != null && freq.override; + } + + public static boolean isOverridden(TileEntity tile) + { + ISecurityTile security = (ISecurityTile)tile; + + if(security.getSecurity().getOwner() == null) + { + return false; + } + + SecurityFrequency freq = getFrequency(security.getSecurity().getOwner()); + + return freq != null && freq.override; + } +} diff --git a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java index 7ba0725ad..e601af243 100644 --- a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java +++ b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java @@ -25,12 +25,14 @@ import net.minecraftforge.fml.relauncher.SideOnly; @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 hydrogenGenerator = new ModelGasGenerator(); - public ModelWindGenerator windTurbine = new ModelWindGenerator(); + public ModelGasGenerator gasGenerator = new ModelGasGenerator(); + public ModelWindGenerator windGenerator = new ModelWindGenerator(); @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) @@ -43,9 +45,8 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler if(metadata == GeneratorType.BIO_GENERATOR.meta) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "BioGenerator.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "BioGenerator.png")); bioGenerator.render(0.0625F); } else if(metadata == GeneratorType.ADVANCED_SOLAR_GENERATOR.meta) @@ -53,7 +54,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.0F, 0.2F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "AdvancedSolarGenerator.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "AdvancedSolarGenerator.png")); advancedSolarGenerator.render(0.022F); } else if(metadata == GeneratorType.SOLAR_GENERATOR.meta) @@ -61,32 +62,32 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarGenerator.png")); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarGenerator.png")); solarGenerator.render(0.0625F); } else if(metadata == GeneratorType.HEAT_GENERATOR.meta) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "HeatGenerator.png")); - heatGenerator.render(0.0625F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "HeatGenerator.png")); + heatGenerator.render(0.0625F, false, mc.renderEngine); } else if(metadata == GeneratorType.GAS_GENERATOR.meta) { GL11.glRotatef(180F, 0.0F, 1.0F, 1.0F); GL11.glRotatef(90F, -1.0F, 0.0F, 0.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasGenerator.png")); - hydrogenGenerator.render(0.0625F); + GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasGenerator.png")); + gasGenerator.render(0.0625F); } else if(metadata == GeneratorType.WIND_GENERATOR.meta) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.0F, 0.4F, 0.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "WindGenerator.png")); - windTurbine.render(0.016F, 0); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "WindGenerator.png")); + windGenerator.render(0.016F, 0); } else if(metadata != 2) { diff --git a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java index 713621917..27482a0da 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java @@ -9,6 +9,7 @@ import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -34,6 +35,7 @@ public class GuiBioGenerator extends GuiMekanism super(new ContainerBioGenerator(inventory, tentity)); tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBioGenerator.png"))); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBioGenerator.png"))); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { @Override diff --git a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java index 1df15c3d4..2eac5eef7 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java @@ -12,6 +12,7 @@ import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.element.GuiGauge.Type; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -37,12 +38,13 @@ public class GuiGasGenerator extends GuiMekanism super(new ContainerGasGenerator(inventory, tentity)); tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiGasGenerator.png"))); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiGasGenerator.png"))); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { @Override public List getInfo() { return ListUtils.asList( - LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.generationRate) + "/t", + LangUtils.localize("gui.producing") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.generationRate*tileEntity.clientUsed) + "/t", LangUtils.localize("gui.maxOutput") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiGasGenerator.png"))); @@ -65,6 +67,8 @@ public class GuiGasGenerator extends GuiMekanism fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 6, 0x404040); fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + String s = LangUtils.localize("gui.burnRate") + ": " + tileEntity.clientUsed; + fontRendererObj.drawString(s, xSize - 8 - fontRendererObj.getStringWidth(s), (ySize - 96) + 2, 0x404040); } @Override diff --git a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java index dfebfbab7..7ce3e58a6 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java @@ -14,6 +14,7 @@ import mekanism.client.gui.element.GuiGauge.Type; import mekanism.client.gui.element.GuiHeatInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -40,6 +41,7 @@ public class GuiHeatGenerator extends GuiMekanism super(new ContainerHeatGenerator(inventory, tentity)); tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png"))); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiHeatGenerator.png"))); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { @Override diff --git a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java index 442e112ac..0d5c8e7e8 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java @@ -8,6 +8,7 @@ import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -33,6 +34,7 @@ public class GuiSolarGenerator extends GuiMekanism super(new ContainerSolarGenerator(inventory, tentity)); tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiSolarGenerator.png"))); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiSolarGenerator.png"))); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { @Override diff --git a/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java index 163f18c18..08a354a64 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java @@ -11,6 +11,7 @@ import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRedstoneControl; +import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; @@ -38,6 +39,7 @@ public class GuiWindGenerator extends GuiMekanism super(new ContainerWindGenerator(inventory, tentity)); tileEntity = tentity; guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiWindTurbine.png"))); + guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiWindTurbine.png"))); guiElements.add(new GuiEnergyInfo(new IInfoHandler() { @Override diff --git a/src/main/java/mekanism/generators/client/model/ModelBioGenerator.java b/src/main/java/mekanism/generators/client/model/ModelBioGenerator.java index 019b2aa54..190381f51 100644 --- a/src/main/java/mekanism/generators/client/model/ModelBioGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelBioGenerator.java @@ -1,156 +1,72 @@ package mekanism.generators.client.model; +import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; public class ModelBioGenerator extends ModelBase { - ModelRenderer Base; - ModelRenderer Pipe1; - ModelRenderer Pipe2; - ModelRenderer ContainerLid; - ModelRenderer ContainerRight; - ModelRenderer ContainerBottom; - ModelRenderer ContainerFront; - ModelRenderer ContainerBack; - ModelRenderer ContainerLeft; - ModelRenderer Decor1; - ModelRenderer Decor2; - ModelRenderer BackTop; - ModelRenderer FrontPanel1; - ModelRenderer FrontPanel2; - ModelRenderer LeftPanel; - ModelRenderer RightPanel; - ModelRenderer BackPanel; - - public ModelBioGenerator() + ModelRenderer base; + ModelRenderer sideRight; + ModelRenderer back; + ModelRenderer bar; + ModelRenderer glass; + ModelRenderer sideLeft; + + public ModelBioGenerator() { textureWidth = 64; textureHeight = 64; - Base = new ModelRenderer(this, 0, 0); - Base.addBox(0F, 0F, 0F, 14, 1, 14); - Base.setRotationPoint(-7F, 23F, -7F); - Base.setTextureSize(64, 64); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - Pipe1 = new ModelRenderer(this, 0, 16); - Pipe1.addBox(0F, 0F, 0F, 2, 2, 2); - Pipe1.setRotationPoint(-1F, 13F, -3F); - Pipe1.setTextureSize(64, 64); - Pipe1.mirror = true; - setRotation(Pipe1, 0F, 0F, 0F); - Pipe2 = new ModelRenderer(this, 0, 21); - Pipe2.addBox(0F, 0F, 0F, 2, 2, 8); - Pipe2.setRotationPoint(-1F, 11F, -3F); - Pipe2.setTextureSize(64, 64); - Pipe2.mirror = true; - setRotation(Pipe2, 0F, 0F, 0F); - ContainerLid = new ModelRenderer(this, 0, 32); - ContainerLid.addBox(0F, 0F, 0F, 4, 1, 4); - ContainerLid.setRotationPoint(-2F, 15F, -5F); - ContainerLid.setTextureSize(64, 64); - ContainerLid.mirror = true; - setRotation(ContainerLid, 0F, 0F, 0F); - ContainerRight = new ModelRenderer(this, 0, 38); - ContainerRight.addBox(0F, 0F, 0F, 1, 6, 4); - ContainerRight.setRotationPoint(2F, 16F, -5F); - ContainerRight.setTextureSize(64, 64); - ContainerRight.mirror = true; - setRotation(ContainerRight, 0F, 0F, 0F); - ContainerBottom = new ModelRenderer(this, 0, 49); - ContainerBottom.addBox(0F, 0F, 0F, 6, 1, 6); - ContainerBottom.setRotationPoint(-3F, 22F, -6F); - ContainerBottom.setTextureSize(64, 64); - ContainerBottom.mirror = true; - setRotation(ContainerBottom, 0F, 0F, 0F); - ContainerFront = new ModelRenderer(this, 11, 41); - ContainerFront.addBox(0F, 0F, 0F, 6, 6, 1); - ContainerFront.setRotationPoint(-3F, 16F, -6F); - ContainerFront.setTextureSize(64, 64); - ContainerFront.mirror = true; - setRotation(ContainerFront, 0F, 0F, 0F); - ContainerBack = new ModelRenderer(this, 11, 41); - ContainerBack.addBox(0F, 0F, 0F, 6, 6, 1); - ContainerBack.setRotationPoint(-3F, 16F, -1F); - ContainerBack.setTextureSize(64, 64); - ContainerBack.mirror = true; - setRotation(ContainerBack, 0F, 0F, 0F); - ContainerLeft = new ModelRenderer(this, 0, 38); - ContainerLeft.addBox(0F, 0F, 0F, 1, 6, 4); - ContainerLeft.setRotationPoint(-3F, 16F, -5F); - ContainerLeft.setTextureSize(64, 64); - setRotation(ContainerLeft, 0F, 0F, 0F); - ContainerLeft.mirror = false; - Decor1 = new ModelRenderer(this, 21, 20); - Decor1.addBox(0F, 0F, 0F, 2, 2, 3); - Decor1.setRotationPoint(4.1F, 15F, 2F); - Decor1.setTextureSize(64, 64); - Decor1.mirror = true; - setRotation(Decor1, 0F, 0F, 0F); - Decor2 = new ModelRenderer(this, 21, 20); - Decor2.addBox(0F, 0F, 0F, 2, 2, 3); - Decor2.setRotationPoint(-6.1F, 15F, 2F); - Decor2.setTextureSize(64, 64); - Decor2.mirror = true; - setRotation(Decor2, 0F, 0F, 0F); - BackTop = new ModelRenderer(this, 21, 26); - BackTop.addBox(0F, 0F, 0F, 8, 1, 3); - BackTop.setRotationPoint(-4F, 10F, 5F); - BackTop.setTextureSize(64, 64); - BackTop.mirror = true; - setRotation(BackTop, 0F, 0F, 0F); - FrontPanel1 = new ModelRenderer(this, 17, 32); - FrontPanel1.addBox(0F, 0F, 0F, 3, 6, 2); - FrontPanel1.setRotationPoint(-7F, 17F, -6F); - FrontPanel1.setTextureSize(64, 64); - FrontPanel1.mirror = true; - setRotation(FrontPanel1, 0F, 0F, 0F); - FrontPanel2 = new ModelRenderer(this, 17, 32); - FrontPanel2.addBox(0F, 0F, 0F, 3, 6, 2); - FrontPanel2.setRotationPoint(4F, 17F, -6F); - FrontPanel2.setTextureSize(64, 64); - FrontPanel2.mirror = true; - setRotation(FrontPanel2, 0F, 0F, 0F); - LeftPanel = new ModelRenderer(this, 28, 31); - LeftPanel.addBox(0F, 0F, 0F, 3, 7, 10); - LeftPanel.setRotationPoint(-7F, 16F, -4F); - LeftPanel.setTextureSize(64, 64); - LeftPanel.mirror = true; - setRotation(LeftPanel, 0F, 0F, 0F); - RightPanel = new ModelRenderer(this, 28, 31); - RightPanel.addBox(0F, 0F, 0F, 3, 7, 10); - RightPanel.setRotationPoint(4F, 16F, -4F); - RightPanel.setTextureSize(64, 64); - RightPanel.mirror = true; - setRotation(RightPanel, 0F, 0F, 0F); - BackPanel = new ModelRenderer(this, 28, 49); - BackPanel.addBox(0F, 0F, 0F, 10, 12, 3); - BackPanel.setRotationPoint(-5F, 11F, 5F); - BackPanel.setTextureSize(64, 64); - BackPanel.mirror = true; - setRotation(BackPanel, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 7, 16); + base.setRotationPoint(-8F, 17F, -8F); + base.setTextureSize(64, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + sideRight = new ModelRenderer(this, 0, 40); + sideRight.mirror = true; + sideRight.addBox(0F, 0F, 0F, 3, 9, 8); + sideRight.setRotationPoint(5F, 8F, -8F); + sideRight.setTextureSize(64, 64); + setRotation(sideRight, 0F, 0F, 0F); + back = new ModelRenderer(this, 0, 23); + back.addBox(0F, 0F, 0F, 16, 9, 8); + back.setRotationPoint(-8F, 8F, 0F); + back.setTextureSize(64, 64); + back.mirror = true; + setRotation(back, 0F, 0F, 0F); + bar = new ModelRenderer(this, 0, 57); + bar.addBox(0F, 0F, 0F, 10, 1, 1); + bar.setRotationPoint(-5F, 8.5F, -7.5F); + bar.setTextureSize(64, 64); + bar.mirror = true; + setRotation(bar, 0F, 0F, 0F); + glass = new ModelRenderer(this, 22, 40); + glass.addBox(0F, 0F, 0F, 12, 8, 7); + glass.setRotationPoint(-6F, 9F, -7F); + glass.setTextureSize(64, 64); + glass.mirror = true; + setRotation(glass, 0F, 0F, 0F); + sideLeft = new ModelRenderer(this, 0, 40); + sideLeft.addBox(0F, 0F, 0F, 3, 9, 8); + sideLeft.setRotationPoint(-8F, 8F, -8F); + sideLeft.setTextureSize(64, 64); + sideLeft.mirror = true; + setRotation(sideLeft, 0F, 0F, 0F); } - public void render(float size) + public void render(float size) { - Base.render(size); - Pipe1.render(size); - Pipe2.render(size); - ContainerLid.render(size); - ContainerRight.render(size); - ContainerBottom.render(size); - ContainerFront.render(size); - ContainerBack.render(size); - ContainerLeft.render(size); - Decor1.render(size); - Decor2.render(size); - BackTop.render(size); - FrontPanel1.render(size); - FrontPanel2.render(size); - LeftPanel.render(size); - RightPanel.render(size); - BackPanel.render(size); + base.render(size); + sideRight.render(size); + sideLeft.render(size); + back.render(size); + bar.render(size); + + MekanismRenderer.blendOn(); + glass.render(size); + MekanismRenderer.blendOff(); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/generators/client/model/ModelGasGenerator.java b/src/main/java/mekanism/generators/client/model/ModelGasGenerator.java index fb3771b07..e44f72d23 100644 --- a/src/main/java/mekanism/generators/client/model/ModelGasGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelGasGenerator.java @@ -8,168 +8,168 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelGasGenerator extends ModelBase { - ModelRenderer A; - ModelRenderer B; - ModelRenderer C; - ModelRenderer D; - ModelRenderer E; - ModelRenderer F; - ModelRenderer G; - ModelRenderer H; - ModelRenderer I; - ModelRenderer J; - ModelRenderer K; - ModelRenderer L; - ModelRenderer M; - ModelRenderer N; - ModelRenderer O; - ModelRenderer P; - ModelRenderer Q; - ModelRenderer R; - ModelRenderer S; + ModelRenderer port4; + ModelRenderer baseStand; + ModelRenderer pillar4; + ModelRenderer port3; + ModelRenderer port2; + ModelRenderer connectorAngle1; + ModelRenderer pillar3; + ModelRenderer pillar2; + ModelRenderer pillar1; + ModelRenderer center; + ModelRenderer connector3; + ModelRenderer port1; + ModelRenderer connector4; + ModelRenderer connectorAngle4; + ModelRenderer base; + ModelRenderer connectorAngle3; + ModelRenderer connector2; + ModelRenderer connectorAngle2; + ModelRenderer connector1; - public ModelGasGenerator() + public ModelGasGenerator() { textureWidth = 128; - textureHeight = 128; + textureHeight = 64; - A = new ModelRenderer(this, 0, 0); - A.addBox(0F, 0F, 0F, 16, 1, 16); - A.setRotationPoint(-8F, 23F, -8F); - A.setTextureSize(128, 128); - A.mirror = true; - setRotation(A, 0F, 0F, 0F); - B = new ModelRenderer(this, 0, 45); - B.addBox(0F, 0F, 0F, 16, 12, 6); - B.setRotationPoint(-8F, 11F, -3F); - B.setTextureSize(128, 128); - B.mirror = true; - setRotation(B, 0F, 0F, 0F); - C = new ModelRenderer(this, 0, 64); - C.addBox(-3F, 0F, -8F, 6, 12, 12); - C.setRotationPoint(0F, 11F, 0F); - C.setTextureSize(128, 128); - C.mirror = true; - setRotation(C, 0F, 0F, 0F); - D = new ModelRenderer(this, 66, 0); - D.addBox(-3F, 0F, 0F, 6, 10, 4); - D.setRotationPoint(0F, 13F, 4F); - D.setTextureSize(128, 128); - D.mirror = true; - setRotation(D, 0F, 0F, 0F); - E = new ModelRenderer(this, 0, 20); - E.addBox(-5F, 0F, -3F, 10, 13, 6); - E.setRotationPoint(0F, 10F, 0F); - E.setTextureSize(128, 128); - E.mirror = true; - setRotation(E, 0F, 0.5235988F, 0F); - F = new ModelRenderer(this, 0, 20); - F.addBox(-5F, 0F, -3F, 10, 13, 6); - F.setRotationPoint(0F, 10F, 0F); - F.setTextureSize(128, 128); - F.mirror = true; - setRotation(F, 0F, -0.5235988F, 0F); - G = new ModelRenderer(this, 34, 20); - G.addBox(-3F, 0F, -5F, 6, 13, 10); - G.setRotationPoint(0F, 10F, 0F); - G.setTextureSize(128, 128); - G.mirror = true; - setRotation(G, 0F, 0F, 0F); - H = new ModelRenderer(this, 67, 20); - H.addBox(-2F, 0F, -1F, 4, 2, 2); - H.setRotationPoint(0F, 8F, 0F); - H.setTextureSize(128, 128); - H.mirror = true; - setRotation(H, 0F, -0.5235988F, 0F); - I = new ModelRenderer(this, 67, 20); - I.addBox(-2F, 0F, -1F, 4, 2, 2); - I.setRotationPoint(0F, 8F, 0F); - I.setTextureSize(128, 128); - I.mirror = true; - setRotation(I, 0F, 0.5235988F, 0F); - J = new ModelRenderer(this, 67, 26); - J.addBox(-1F, 0F, -2F, 2, 2, 4); - J.setRotationPoint(0F, 8F, 0F); - J.setTextureSize(128, 128); - J.mirror = true; - setRotation(J, 0F, 0F, 0F); - K = new ModelRenderer(this, 88, 0); - K.addBox(-3F, 0F, 0F, 6, 2, 5); - K.setRotationPoint(0F, 10F, 4F); - K.setTextureSize(128, 128); - K.mirror = true; - setRotation(K, -0.6457718F, 0F, 0F); - L = new ModelRenderer(this, 0, 97); - L.addBox(0F, 0F, 0F, 4, 10, 4); - L.setRotationPoint(2F, 13F, -5F); - L.setTextureSize(128, 128); - L.mirror = true; - setRotation(L, 0F, 0.7853982F, 0F); - M = new ModelRenderer(this, 0, 90); - M.addBox(0F, 0F, 0F, 3, 1, 2); - M.setRotationPoint(2F, 12F, -4F); - M.setTextureSize(128, 128); - M.mirror = true; - setRotation(M, 0F, 0.7853982F, 0F); - N = new ModelRenderer(this, 0, 97); - N.addBox(0F, 0F, 0F, 4, 10, 4); - N.setRotationPoint(-8F, 13F, -5F); - N.setTextureSize(128, 128); - N.mirror = true; - setRotation(N, 0F, 0.7853982F, 0F); - O = new ModelRenderer(this, 0, 90); - O.addBox(0F, 0F, 0F, 2, 1, 3); - O.setRotationPoint(-6F, 12F, -5F); - O.setTextureSize(128, 128); - O.mirror = true; - setRotation(O, 0F, 0.7853982F, 0F); - P = new ModelRenderer(this, 0, 118); - P.addBox(-5F, 0F, 0F, 10, 1, 1); - P.setRotationPoint(0F, 15F, -7F); - P.setTextureSize(128, 128); - P.mirror = true; - setRotation(P, 0F, 0F, 0F); - Q = new ModelRenderer(this, 0, 118); - Q.addBox(-5F, 0F, 0F, 10, 1, 1); - Q.setRotationPoint(0F, 19F, -7F); - Q.setTextureSize(128, 128); - Q.mirror = true; - setRotation(Q, 0F, 0F, 0F); - R = new ModelRenderer(this, 0, 112); - R.addBox(-7F, 0F, -3F, 14, 1, 3); - R.setRotationPoint(0F, 15F, -2F); - R.setTextureSize(128, 128); - R.mirror = true; - setRotation(R, 0F, 0F, 0F); - S = new ModelRenderer(this, 0, 112); - S.addBox(-7F, 0F, -3F, 14, 1, 3); - S.setRotationPoint(0F, 19F, -2F); - S.setTextureSize(128, 128); - S.mirror = true; - setRotation(S, 0F, 0F, 0F); + port4 = new ModelRenderer(this, 40, 34); + port4.addBox(0F, 0F, 0F, 1, 8, 8); + port4.setRotationPoint(7F, 12F, -4F); + port4.setTextureSize(128, 64); + port4.mirror = true; + setRotation(port4, 0F, 0F, 0F); + baseStand = new ModelRenderer(this, 0, 20); + baseStand.addBox(0F, 0F, 0F, 13, 1, 13); + baseStand.setRotationPoint(-6.5F, 19F, -6.5F); + baseStand.setTextureSize(128, 64); + baseStand.mirror = true; + setRotation(baseStand, 0F, 0F, 0F); + pillar4 = new ModelRenderer(this, 0, 0); + pillar4.addBox(0F, 0F, 0F, 3, 9, 3); + pillar4.setRotationPoint(4F, 10F, 4F); + pillar4.setTextureSize(128, 64); + pillar4.mirror = true; + setRotation(pillar4, 0F, 0F, 0F); + port3 = new ModelRenderer(this, 40, 50); + port3.addBox(0F, 0F, 0F, 8, 8, 1); + port3.setRotationPoint(-4F, 12F, 7F); + port3.setTextureSize(128, 64); + port3.mirror = true; + setRotation(port3, 0F, 0F, 0F); + port2 = new ModelRenderer(this, 40, 34); + port2.addBox(0F, 0F, 0F, 1, 8, 8); + port2.setRotationPoint(-8F, 12F, -4F); + port2.setTextureSize(128, 64); + port2.mirror = true; + setRotation(port2, 0F, 0F, 0F); + connectorAngle1 = new ModelRenderer(this, 48, 13); + connectorAngle1.addBox(0F, 0F, 0.5F, 8, 1, 2); + connectorAngle1.setRotationPoint(-4F, 13.5F, -6F); + connectorAngle1.setTextureSize(128, 64); + connectorAngle1.mirror = true; + setRotation(connectorAngle1, 0.986111F, 0F, 0F); + pillar3 = new ModelRenderer(this, 0, 0); + pillar3.addBox(0F, 0F, 0F, 3, 9, 3); + pillar3.setRotationPoint(-7F, 10F, 4F); + pillar3.setTextureSize(128, 64); + pillar3.mirror = true; + setRotation(pillar3, 0F, 0F, 0F); + pillar2 = new ModelRenderer(this, 0, 0); + pillar2.addBox(0F, 0F, 0F, 3, 9, 3); + pillar2.setRotationPoint(4F, 10F, -7F); + pillar2.setTextureSize(128, 64); + pillar2.mirror = true; + setRotation(pillar2, 0F, 0F, 0F); + pillar1 = new ModelRenderer(this, 0, 0); + pillar1.addBox(0F, 0F, 0F, 3, 9, 3); + pillar1.setRotationPoint(-7F, 10F, -7F); + pillar1.setTextureSize(128, 64); + pillar1.mirror = true; + setRotation(pillar1, 0F, 0F, 0F); + center = new ModelRenderer(this, 0, 34); + center.addBox(0F, 0F, 0F, 10, 12, 10); + center.setRotationPoint(-5F, 8F, -5F); + center.setTextureSize(128, 64); + center.mirror = true; + setRotation(center, 0F, 0F, 0F); + connector3 = new ModelRenderer(this, 39, 20); + connector3.addBox(0F, 0F, 0F, 1, 1, 8); + connector3.setRotationPoint(5F, 11F, -4F); + connector3.setTextureSize(128, 64); + connector3.mirror = true; + setRotation(connector3, 0F, 0F, 0F); + port1 = new ModelRenderer(this, 40, 50); + port1.addBox(0F, 0F, 0F, 8, 8, 1); + port1.setRotationPoint(-4F, 12F, -8F); + port1.setTextureSize(128, 64); + port1.mirror = true; + setRotation(port1, 0F, 0F, 0F); + connector4 = new ModelRenderer(this, 39, 29); + connector4.addBox(0F, 0F, 0F, 8, 1, 1); + connector4.setRotationPoint(-4F, 11F, 5F); + connector4.setTextureSize(128, 64); + connector4.mirror = true; + setRotation(connector4, 0F, 0F, 0F); + connectorAngle4 = new ModelRenderer(this, 48, 10); + connectorAngle4.addBox(0F, 0F, -1F, 8, 2, 1); + connectorAngle4.setRotationPoint(-4F, 11F, 6F); + connectorAngle4.setTextureSize(128, 64); + connectorAngle4.mirror = true; + setRotation(connectorAngle4, 0.7941248F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 4, 16); + base.setRotationPoint(-8F, 20F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + connectorAngle3 = new ModelRenderer(this, 48, 0); + connectorAngle3.addBox(-1F, 0F, 0F, 1, 2, 8); + connectorAngle3.setRotationPoint(6F, 11F, -4F); + connectorAngle3.setTextureSize(128, 64); + connectorAngle3.mirror = true; + setRotation(connectorAngle3, 0F, 0F, -0.7941248F); + connector2 = new ModelRenderer(this, 39, 20); + connector2.addBox(0F, 0F, 0F, 1, 1, 8); + connector2.setRotationPoint(-6F, 11F, -4F); + connector2.setTextureSize(128, 64); + connector2.mirror = true; + setRotation(connector2, 0F, 0F, 0F); + connectorAngle2 = new ModelRenderer(this, 48, 0); + connectorAngle2.addBox(0F, 0F, 0F, 1, 2, 8); + connectorAngle2.setRotationPoint(-6F, 11F, -4F); + connectorAngle2.setTextureSize(128, 64); + connectorAngle2.mirror = true; + setRotation(connectorAngle2, 0F, 0F, 0.7941248F); + connector1 = new ModelRenderer(this, 48, 13); + connector1.addBox(0F, 0F, 0F, 8, 1, 2); + connector1.setRotationPoint(-4F, 13F, -7.5F); + connector1.setTextureSize(128, 64); + connector1.mirror = true; + setRotation(connector1, 0F, 0F, 0F); } - public void render(float size) + public void render(float size) { - A.render(size); - B.render(size); - C.render(size); - D.render(size); - E.render(size); - F.render(size); - G.render(size); - H.render(size); - I.render(size); - J.render(size); - K.render(size); - L.render(size); - M.render(size); - N.render(size); - O.render(size); - P.render(size); - Q.render(size); - R.render(size); - S.render(size); + port4.render(size); + baseStand.render(size); + pillar4.render(size); + port3.render(size); + port2.render(size); + connectorAngle1.render(size); + pillar3.render(size); + pillar2.render(size); + pillar1.render(size); + center.render(size); + connector3.render(size); + port1.render(size); + connector4.render(size); + connectorAngle4.render(size); + base.render(size); + connectorAngle3.render(size); + connector2.render(size); + connectorAngle2.render(size); + connector1.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java b/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java index 4aac9f782..33d299cba 100644 --- a/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java @@ -1,143 +1,181 @@ package mekanism.generators.client.model; +import mekanism.client.render.MekanismRenderer; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelHeatGenerator extends ModelBase { - ModelRenderer A; - ModelRenderer B; - ModelRenderer C; - ModelRenderer D; - ModelRenderer E; - ModelRenderer F; - ModelRenderer G; - ModelRenderer H; - ModelRenderer I; - ModelRenderer J; - ModelRenderer K; - ModelRenderer L; - ModelRenderer M; - ModelRenderer N; - ModelRenderer O; + public static ResourceLocation OVERLAY_ON = MekanismUtils.getResource(ResourceType.RENDER, "HeatGenerator_OverlayOn.png"); + public static ResourceLocation OVERLAY_OFF = MekanismUtils.getResource(ResourceType.RENDER, "HeatGenerator_OverlayOff.png"); + + ModelRenderer drum; + ModelRenderer ring1; + ModelRenderer ring2; + ModelRenderer back; + ModelRenderer bar1; + ModelRenderer bar2; + ModelRenderer plate; + ModelRenderer fin8; + ModelRenderer fin7; + ModelRenderer fin1; + ModelRenderer fin2; + ModelRenderer fin3; + ModelRenderer fin4; + ModelRenderer fin5; + ModelRenderer fin6; + ModelRenderer base; - public ModelHeatGenerator() + public ModelHeatGenerator() { textureWidth = 128; - textureHeight = 128; + textureHeight = 64; - A = new ModelRenderer(this, 0, 0); - A.addBox(-8F, 0F, -8F, 16, 1, 16); - A.setRotationPoint(0F, 23F, 0F); - A.setTextureSize(128, 128); - A.mirror = true; - setRotation(A, 0F, 0F, 0F); - B = new ModelRenderer(this, 0, 85); - B.addBox(0F, 0F, 0F, 8, 6, 10); - B.setRotationPoint(-8F, 17F, -5F); - B.setTextureSize(128, 128); - B.mirror = true; - setRotation(B, 0F, 0F, 0F); - C = new ModelRenderer(this, 0, 67); - C.addBox(-1F, -2F, 0F, 2, 4, 12); - C.setRotationPoint(-5F, 20F, -6F); - C.setTextureSize(128, 128); - C.mirror = true; - setRotation(C, 0F, 0F, 1.570796F); - D = new ModelRenderer(this, 0, 67); - D.addBox(-1F, -2F, 0F, 2, 4, 12); - D.setRotationPoint(-5F, 20F, -6F); - D.setTextureSize(128, 128); - D.mirror = true; - setRotation(D, 0F, 0F, 0.5235988F); - E = new ModelRenderer(this, 0, 67); - E.addBox(-1F, -2F, 0F, 2, 4, 12); - E.setRotationPoint(-5F, 20F, -6F); - E.setTextureSize(128, 128); - E.mirror = true; - setRotation(E, 0F, 0F, -0.5235988F); - F = new ModelRenderer(this, 68, 0); - F.addBox(-2F, -4F, 0F, 4, 8, 10); - F.setRotationPoint(-4F, 13F, -5F); - F.setTextureSize(128, 128); - F.mirror = true; - setRotation(F, 0F, 0F, 0.5235988F); - G = new ModelRenderer(this, 68, 0); - G.addBox(-2F, -4F, 0F, 4, 8, 10); - G.setRotationPoint(-4F, 13F, -5F); - G.setTextureSize(128, 128); - G.mirror = true; - setRotation(G, 0F, 0F, -0.5235988F); - H = new ModelRenderer(this, 68, 0); - H.addBox(-2F, -4F, 0F, 4, 8, 10); - H.setRotationPoint(-4F, 13F, -5F); - H.setTextureSize(128, 128); - H.mirror = true; - setRotation(H, 0F, 0F, 1.570796F); - I = new ModelRenderer(this, 0, 18); - I.addBox(0F, 0F, 0F, 8, 13, 14); - I.setRotationPoint(0F, 10F, -6F); - I.setTextureSize(128, 128); - I.mirror = true; - setRotation(I, 0F, 0F, 0F); - J = new ModelRenderer(this, 0, 47); - J.addBox(0F, 0F, 0F, 6, 11, 1); - J.setRotationPoint(1F, 11F, -7F); - J.setTextureSize(128, 128); - J.mirror = true; - setRotation(J, 0F, 0F, 0F); - K = new ModelRenderer(this, 51, 21); - K.addBox(0F, 0F, 0F, 10, 4, 1); - K.setRotationPoint(-8F, 13F, -4F); - K.setTextureSize(128, 128); - K.mirror = true; - setRotation(K, 0F, 0F, 0F); - L = new ModelRenderer(this, 51, 21); - L.addBox(0F, 0F, 0F, 10, 4, 1); - L.setRotationPoint(-8F, 13F, 3F); - L.setTextureSize(128, 128); - L.mirror = true; - setRotation(L, 0F, 0F, 0F); - M = new ModelRenderer(this, 0, 103); - M.addBox(0F, 0F, 0F, 2, 4, 2); - M.setRotationPoint(-2F, 19F, -7F); - M.setTextureSize(128, 128); - M.mirror = true; - setRotation(M, 0F, 0F, 0F); - N = new ModelRenderer(this, 51, 0); - N.addBox(0F, 0F, 0F, 6, 1, 1); - N.setRotationPoint(-3F, 9F, 0F); - N.setTextureSize(128, 128); - N.mirror = true; - setRotation(N, 0F, 0F, 0F); - O = new ModelRenderer(this, 51, 0); - O.addBox(0F, 0F, 0F, 6, 1, 1); - O.setRotationPoint(-3F, 9F, 2F); - O.setTextureSize(128, 128); - O.mirror = true; - setRotation(O, 0F, 0F, 0F); + drum = new ModelRenderer(this, 0, 22); + drum.addBox(0F, 0F, 0F, 16, 9, 9); + drum.setRotationPoint(-8F, 8.5F, -7.5F); + drum.setTextureSize(128, 64); + drum.mirror = true; + setRotation(drum, 0F, 0F, 0F); + ring1 = new ModelRenderer(this, 88, 0); + ring1.addBox(0F, 0F, 0F, 2, 10, 10); + ring1.setRotationPoint(3F, 8F, -8F); + ring1.setTextureSize(128, 64); + ring1.mirror = true; + setRotation(ring1, 0F, 0F, 0F); + ring2 = new ModelRenderer(this, 88, 0); + ring2.addBox(0F, 0F, 0F, 2, 10, 10); + ring2.setRotationPoint(-5F, 8F, -8F); + ring2.setTextureSize(128, 64); + ring2.mirror = true; + setRotation(ring2, 0F, 0F, 0F); + back = new ModelRenderer(this, 48, 0); + back.addBox(0F, 0F, 0F, 16, 10, 4); + back.setRotationPoint(-8F, 8F, 2F); + back.setTextureSize(128, 64); + back.mirror = true; + setRotation(back, 0F, 0F, 0F); + bar1 = new ModelRenderer(this, 88, 0); + bar1.addBox(0F, 0F, 0F, 2, 9, 1); + bar1.setRotationPoint(3F, 9F, 6F); + bar1.setTextureSize(128, 64); + bar1.mirror = true; + setRotation(bar1, 0F, 0F, 0F); + bar2 = new ModelRenderer(this, 88, 0); + bar2.addBox(0F, 0F, 0F, 2, 9, 1); + bar2.setRotationPoint(-5F, 9F, 6F); + bar2.setTextureSize(128, 64); + bar2.mirror = true; + setRotation(bar2, 0F, 0F, 0F); + plate = new ModelRenderer(this, 41, 22); + plate.addBox(0F, 0F, 0F, 8, 6, 2); + plate.setRotationPoint(-4F, 12F, 6F); + plate.setTextureSize(128, 64); + plate.mirror = true; + setRotation(plate, 0F, 0F, 0F); + fin8 = new ModelRenderer(this, 14, 40); + fin8.addBox(0F, 0F, 0F, 16, 1, 2); + fin8.setRotationPoint(-8F, 8F, 6F); + fin8.setTextureSize(128, 64); + fin8.mirror = true; + setRotation(fin8, 0F, 0F, 0F); + fin7 = new ModelRenderer(this, 14, 40); + fin7.addBox(0F, 0F, 0F, 16, 1, 2); + fin7.setRotationPoint(-8F, 10F, 6F); + fin7.setTextureSize(128, 64); + fin7.mirror = true; + setRotation(fin7, 0F, 0F, 0F); + fin1 = new ModelRenderer(this, 0, 40); + fin1.addBox(0F, 0F, 0F, 4, 1, 2); + fin1.setRotationPoint(4F, 12F, 6F); + fin1.setTextureSize(128, 64); + fin1.mirror = true; + setRotation(fin1, 0F, 0F, 0F); + fin1.mirror = false; + fin2 = new ModelRenderer(this, 0, 40); + fin2.addBox(0F, 0F, 0F, 4, 1, 2); + fin2.setRotationPoint(4F, 14F, 6F); + fin2.setTextureSize(128, 64); + fin2.mirror = true; + setRotation(fin2, 0F, 0F, 0F); + fin2.mirror = false; + fin3 = new ModelRenderer(this, 0, 40); + fin3.addBox(0F, 0F, 0F, 4, 1, 2); + fin3.setRotationPoint(4F, 16F, 6F); + fin3.setTextureSize(128, 64); + fin3.mirror = true; + setRotation(fin3, 0F, 0F, 0F); + fin3.mirror = false; + fin4 = new ModelRenderer(this, 0, 40); + fin4.addBox(0F, 0F, 0F, 4, 1, 2); + fin4.setRotationPoint(-8F, 12F, 6F); + fin4.setTextureSize(128, 64); + fin4.mirror = true; + setRotation(fin4, 0F, 0F, 0F); + fin5 = new ModelRenderer(this, 0, 40); + fin5.addBox(0F, 0F, 0F, 4, 1, 2); + fin5.setRotationPoint(-8F, 14F, 6F); + fin5.setTextureSize(128, 64); + fin5.mirror = true; + setRotation(fin5, 0F, 0F, 0F); + fin6 = new ModelRenderer(this, 0, 40); + fin6.addBox(0F, 0F, 0F, 4, 1, 2); + fin6.setRotationPoint(-8F, 16F, 6F); + fin6.setTextureSize(128, 64); + fin6.mirror = true; + setRotation(fin6, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 6, 16); + base.setRotationPoint(-8F, 18F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + } + + public void render(float size, boolean on, TextureManager manager) + { + doRender(size); + + GL11.glPushMatrix(); + manager.bindTexture(on ? OVERLAY_ON : OVERLAY_OFF); + GL11.glScalef(1.001F, 1.001F, 1.001F); + GL11.glTranslatef(0, -0.0011F, 0); + MekanismRenderer.glowOn(); + + doRender(size); + + MekanismRenderer.glowOff(); + GL11.glPopMatrix(); } - public void render(float size) + private void doRender(float size) { - A.render(size); - B.render(size); - C.render(size); - D.render(size); - E.render(size); - F.render(size); - G.render(size); - H.render(size); - I.render(size); - J.render(size); - K.render(size); - L.render(size); - M.render(size); - N.render(size); - O.render(size); + drum.render(size); + ring1.render(size); + ring2.render(size); + back.render(size); + bar1.render(size); + bar2.render(size); + plate.render(size); + fin8.render(size); + fin7.render(size); + fin1.render(size); + fin2.render(size); + fin3.render(size); + fin4.render(size); + fin5.render(size); + fin6.render(size); + base.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/generators/client/model/ModelSolarGenerator.java b/src/main/java/mekanism/generators/client/model/ModelSolarGenerator.java index 843f778e5..ff5bde0b5 100644 --- a/src/main/java/mekanism/generators/client/model/ModelSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelSolarGenerator.java @@ -5,26 +5,20 @@ import net.minecraft.client.model.ModelRenderer; public class ModelSolarGenerator extends ModelBase { - ModelRenderer solarPanelPipeBase; ModelRenderer solarPanel; ModelRenderer solarPanelBottom; ModelRenderer solarPanelConnector; - ModelRenderer solarPanelPipeU; + ModelRenderer solarPanelRod2; ModelRenderer solarPanelPipeConnector; - ModelRenderer solarPanelPipeBase1; - ModelRenderer solarPanelPipeU1; + ModelRenderer solarPanelPort; + ModelRenderer solarPanelRod1; + ModelRenderer solarPanelPipeBase; public ModelSolarGenerator() { textureWidth = 64; textureHeight = 64; - solarPanelPipeBase = new ModelRenderer(this, 48, 33); - solarPanelPipeBase.addBox(0F, 0F, 0F, 1, 6, 6); - solarPanelPipeBase.setRotationPoint(3F, 23F, -3F); - solarPanelPipeBase.setTextureSize(64, 64); - solarPanelPipeBase.mirror = true; - setRotation(solarPanelPipeBase, 0F, 0F, 1.570796F); solarPanel = new ModelRenderer(this, 0, 0); solarPanel.addBox(0F, 0F, 0F, 16, 2, 16); solarPanel.setRotationPoint(-8F, 13F, -8F); @@ -43,42 +37,48 @@ public class ModelSolarGenerator extends ModelBase solarPanelConnector.setTextureSize(64, 64); solarPanelConnector.mirror = true; setRotation(solarPanelConnector, 0F, 0F, 0F); - solarPanelPipeU = new ModelRenderer(this, 16, 33); - solarPanelPipeU.addBox(0F, 0F, 0F, 2, 3, 2); - solarPanelPipeU.setRotationPoint(-1F, 19F, -1F); - solarPanelPipeU.setTextureSize(64, 64); - solarPanelPipeU.mirror = true; - setRotation(solarPanelPipeU, 0F, 0F, 0F); + solarPanelRod2 = new ModelRenderer(this, 16, 33); + solarPanelRod2.addBox(0F, 0F, 0F, 2, 3, 2); + solarPanelRod2.setRotationPoint(-1F, 19F, -1F); + solarPanelRod2.setTextureSize(64, 64); + solarPanelRod2.mirror = true; + setRotation(solarPanelRod2, 0F, 0F, 0F); solarPanelPipeConnector = new ModelRenderer(this, 24, 33); solarPanelPipeConnector.addBox(0F, 0F, 0F, 3, 3, 3); solarPanelPipeConnector.setRotationPoint(-1.5F, 18F, -1.5F); solarPanelPipeConnector.setTextureSize(64, 64); solarPanelPipeConnector.mirror = true; setRotation(solarPanelPipeConnector, 0F, 0F, 0F); - solarPanelPipeBase1 = new ModelRenderer(this, 36, 33); - solarPanelPipeBase1.addBox(0F, 0F, 0F, 2, 4, 4); - solarPanelPipeBase1.setRotationPoint(2F, 22F, -2F); - solarPanelPipeBase1.setTextureSize(64, 64); - solarPanelPipeBase1.mirror = true; - setRotation(solarPanelPipeBase1, 0F, 0F, 1.570796F); - solarPanelPipeU1 = new ModelRenderer(this, 16, 33); - solarPanelPipeU1.addBox(0F, 0F, 0F, 2, 3, 2); - solarPanelPipeU1.setRotationPoint(-1F, 16F, -1F); - solarPanelPipeU1.setTextureSize(64, 64); - solarPanelPipeU1.mirror = true; - setRotation(solarPanelPipeU1, 0F, 0F, 0F); + solarPanelPort = new ModelRenderer(this, 0, 44); + solarPanelPort.addBox(0F, 0F, 0F, 8, 1, 8); + solarPanelPort.setRotationPoint(-4F, 23F, -4F); + solarPanelPort.setTextureSize(64, 64); + solarPanelPort.mirror = true; + setRotation(solarPanelPort, 0F, 0F, 0F); + solarPanelRod1 = new ModelRenderer(this, 16, 33); + solarPanelRod1.addBox(0F, 0F, 0F, 2, 3, 2); + solarPanelRod1.setRotationPoint(-1F, 16F, -1F); + solarPanelRod1.setTextureSize(64, 64); + solarPanelRod1.mirror = true; + setRotation(solarPanelRod1, 0F, 0F, 0F); + solarPanelPipeBase = new ModelRenderer(this, 0, 39); + solarPanelPipeBase.addBox(0F, 0F, 0F, 4, 1, 4); + solarPanelPipeBase.setRotationPoint(-2F, 22F, -2F); + solarPanelPipeBase.setTextureSize(64, 64); + solarPanelPipeBase.mirror = true; + setRotation(solarPanelPipeBase, 0F, 0F, 0F); } public void render(float size) { - solarPanelPipeBase.render(size); solarPanel.render(size); solarPanelBottom.render(size); solarPanelConnector.render(size); - solarPanelPipeU.render(size); + solarPanelRod2.render(size); solarPanelPipeConnector.render(size); - solarPanelPipeBase1.render(size); - solarPanelPipeU1.render(size); + solarPanelPort.render(size); + solarPanelRod1.render(size); + solarPanelPipeBase.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/generators/client/model/ModelWindGenerator.java b/src/main/java/mekanism/generators/client/model/ModelWindGenerator.java index 81cbeec65..8cf1992f7 100644 --- a/src/main/java/mekanism/generators/client/model/ModelWindGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelWindGenerator.java @@ -166,8 +166,6 @@ public class ModelWindGenerator extends ModelBase plateConnector2.render(size); plateConnector.render(size); plate.render(size); - bladeCap.render(size); - bladeCenter.render(size); baseRim.render(size); base.render(size); wire.render(size); @@ -187,12 +185,18 @@ public class ModelWindGenerator extends ModelBase setRotation(blade3a, 0F, 0F, getRotation(getAbsoluteAngle(angle + 60))); setRotation(blade3b, 0F, 0F, 0.0349066F + getRotation(getAbsoluteAngle(angle + 60))); + setRotation(bladeCap, 0F, 0F, getRotation(getAbsoluteAngle(angle))); + setRotation(bladeCenter, 0F, 0F, getRotation(getAbsoluteAngle(angle))); + blade1a.render(size); blade2a.render(size); blade3a.render(size); blade1b.render(size); blade2b.render(size); blade3b.render(size); + + bladeCap.render(size); + bladeCenter.render(size); } public float getRotation(double angle) diff --git a/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java b/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java index ab078cda3..54745df4e 100644 --- a/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java @@ -32,22 +32,6 @@ public class RenderBioGenerator extends TileEntitySpecialRenderer 0) { push(); @@ -60,6 +44,22 @@ public class RenderBioGenerator extends TileEntitySpecialRenderer { + public static Map clientRotationMap = new HashMap(); + + public static final float ROTATION_THRESHOLD = 0.001F; + public FluidStack fluidStored; public FluidStack prevFluid; @@ -25,6 +32,7 @@ public class SynchronizedTurbineData extends SynchronizedData getOutputtingSides() - { - return EnumSet.of(EnumFacing.getFront(facing).getOpposite()); - } - private static final String[] methods = new String[] {"getEnergy", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getBioFuel", "getBioFuelNeeded"}; @Override diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index d3322ab18..958401b7d 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -31,7 +31,10 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH public GasTank fuelTank; public int burnTicks = 0; + public int maxBurnTicks; public double generationRate = 0; + + public int clientUsed; public TileEntityGasGenerator() { @@ -82,34 +85,62 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH if(canOperate()) { setActive(true); - - if(burnTicks > 0) + + FuelGas fuel = null; + + if(fuelTank.getStored() != 0) { - burnTicks--; - setEnergy(electricityStored + generationRate); + fuel = FuelHandler.getFuel(fuelTank.getGas().getGas()); + maxBurnTicks = fuel.burnTicks; + generationRate = fuel.energyPerTick; } - else if(fuelTank.getStored() > 0) + + int toUse = getToUse(); + + output = generationRate*getToUse()*2; + + int total = burnTicks + fuelTank.getStored()*maxBurnTicks; + total -= toUse; + + setEnergy(getEnergy() + generationRate*toUse); + + if(fuelTank.getStored() > 0) { - FuelGas fuel = FuelHandler.getFuel(fuelTank.getGas().getGas()); - - if(fuel != null) - { - burnTicks = fuel.burnTicks - 1; - generationRate = fuel.energyPerTick; - fuelTank.draw(1, true); - setEnergy(getEnergy() + generationRate); - } - } - else { - burnTicks = 0; - generationRate = 0; + fuelTank.setGas(new GasStack(fuelTank.getGasType(), total/maxBurnTicks)); } + + burnTicks = total % maxBurnTicks; + clientUsed = toUse; } else { + reset(); setActive(false); } } } + + public void reset() + { + burnTicks = 0; + maxBurnTicks = 0; + generationRate = 0; + output = general.FROM_H2*2; + clientUsed = 0; + } + + public int getToUse() + { + if(generationRate == 0 || fuelTank.getGas() == null) + { + return 0; + } + + int max = (int)Math.ceil(((float)fuelTank.getStored()/(float)fuelTank.getMaxGas())*256F); + max = Math.min((fuelTank.getStored()*maxBurnTicks) + burnTicks, max); + max = (int)Math.min((getMaxEnergy()-getEnergy())/generationRate, max); + + return max; + } @Override public boolean canExtractItem(int slotID, ItemStack itemstack, int side) @@ -151,7 +182,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH @Override public boolean canOperate() { - return getEnergy() < getMaxEnergy() && fuelTank.getStored() > 0 && MekanismUtils.canFunction(this); + return getEnergy() < getMaxEnergy() && (fuelTank.getStored() > 0 || burnTicks > 0) && MekanismUtils.canFunction(this); } /** @@ -209,6 +240,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH generationRate = dataStream.readDouble(); output = dataStream.readDouble(); + clientUsed = dataStream.readInt(); } @Override @@ -228,6 +260,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH data.add(generationRate); data.add(output); + data.add(clientUsed); return data; } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index 1f3deda65..93ac5d0d7 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -15,7 +15,9 @@ import mekanism.common.base.IHasSound; import mekanism.common.base.IRedstoneControl; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.security.ISecurityTile; import mekanism.common.tile.TileEntityNoisyElectricBlock; +import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.CableUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; @@ -24,7 +26,7 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public abstract class TileEntityGenerator extends TileEntityNoisyElectricBlock implements IComputerIntegration, IActiveState, IHasSound, ISoundSource, IRedstoneControl +public abstract class TileEntityGenerator extends TileEntityNoisyElectricBlock implements IComputerIntegration, IActiveState, IHasSound, ISoundSource, IRedstoneControl, ISecurityTile { /** Output per tick this generator can transfer. */ public double output; @@ -40,6 +42,8 @@ public abstract class TileEntityGenerator extends TileEntityNoisyElectricBlock i /** This machine's current RedstoneControl type. */ public RedstoneControl controlType; + + public TileComponentSecurity securityComponent = new TileComponentSecurity(this); /** * Generator -- a block that produces energy. It has a certain amount of fuel it can store as well as an output rate. @@ -223,4 +227,10 @@ public abstract class TileEntityGenerator extends TileEntityNoisyElectricBlock i { return false; } + + @Override + public TileComponentSecurity getSecurity() + { + return securityComponent; + } } diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java index e18e22277..2d51badcb 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java @@ -35,8 +35,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityReactorController extends TileEntityReactorBlock implements IActiveState, IHasSound, ISoundSource { public static final int MAX_WATER = 100 * FluidContainerRegistry.BUCKET_VOLUME; - public static final int MAX_STEAM = MAX_WATER * 1000; - + public static final int MAX_STEAM = MAX_WATER * 100; public static final int MAX_FUEL = 1 * FluidContainerRegistry.BUCKET_VOLUME; public FluidTank waterTank = new FluidTank(MAX_WATER); diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityRotationalComplex.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityRotationalComplex.java index 886d505ec..b45b7de04 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityRotationalComplex.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityRotationalComplex.java @@ -1,77 +1,22 @@ package mekanism.generators.common.tile.turbine; -import io.netty.buffer.ByteBuf; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - import mekanism.api.Coord4D; -import mekanism.api.Range4D; -import mekanism.common.Mekanism; -import mekanism.common.PacketHandler; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; -import mekanism.common.tile.TileEntityBasicBlock; +import mekanism.common.multiblock.TileEntityInternalMultiblock; +import mekanism.generators.common.content.turbine.SynchronizedTurbineData; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -public class TileEntityRotationalComplex extends TileEntityBasicBlock -{ - public static Map clientRotationMap = new HashMap(); - - public static final float ROTATION_THRESHOLD = 0.001F; - - public String multiblockUUID; - public float rotation; - +public class TileEntityRotationalComplex extends TileEntityInternalMultiblock +{ @Override - public void onUpdate() {} - - @Override - public boolean canUpdate() - { - return false; - } - - @Override - public void handlePacketData(ByteBuf dataStream) - { - super.handlePacketData(dataStream); - - rotation = dataStream.readFloat(); - - if(dataStream.readBoolean()) - { - multiblockUUID = PacketHandler.readString(dataStream); - clientRotationMap.put(multiblockUUID, rotation); - } - else { - multiblockUUID = null; - } - } - - @Override - public ArrayList getNetworkedData(ArrayList data) - { - super.getNetworkedData(data); - - data.add(rotation); - - if(multiblockUUID != null) - { - data.add(true); - data.add(multiblockUUID); - } - else { - data.add(false); - } - - return data; - } - public void setMultiblock(String id) { - multiblockUUID = id; + if(id == null && multiblockUUID != null) + { + SynchronizedTurbineData.clientRotationMap.remove(multiblockUUID); + } + + super.setMultiblock(id); Coord4D coord = Coord4D.get(this).getFromSide(EnumFacing.DOWN); TileEntity tile = coord.getTileEntity(worldObj); @@ -81,13 +26,4 @@ public class TileEntityRotationalComplex extends TileEntityBasicBlock ((TileEntityTurbineRotor)tile).updateRotors(); } } - - public void setRotation(float newRotation) - { - if(Math.abs(newRotation-rotation) > ROTATION_THRESHOLD) - { - rotation = newRotation; - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); - } - } } diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java index 39879c3e8..43ae0b29d 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java @@ -22,12 +22,11 @@ import mekanism.generators.common.content.turbine.SynchronizedTurbineData; import mekanism.generators.common.content.turbine.TurbineCache; import mekanism.generators.common.content.turbine.TurbineUpdateProtocol; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; public class TileEntityTurbineCasing extends TileEntityMultiblock implements IStrictEnergyStorage -{ +{ public TileEntityTurbineCasing() { this("TurbineCasing"); @@ -87,19 +86,21 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock SynchronizedTurbineData.ROTATION_THRESHOLD) { - ((TileEntityRotationalComplex)tile).setRotation((float)flowRate); + structure.clientRotation = newRotation; + needsRotationUpdate = true; } - if(structure.needsRenderUpdate()) + if(structure.needsRenderUpdate() || needsRotationUpdate) { sendPacketToRenderer(); } - structure.prevFluid = structure.fluidStored; + structure.prevFluid = structure.fluidStored != null ? structure.fluidStored.copy() : null; } } } @@ -187,6 +188,7 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock 2 gui.teleporter.needsEnergy=Requer Energia +gui.teleporter.noAccess=Você não tem acesso a este teletransportador. +gui.teleporter.noFreq=Sem frequência gui.digitalMinerConfig=Config Minerador Digital -gui.digitalMiner.autoPull=Auto-puxar +gui.digitalMiner.autoPull=Autopuxar gui.digitalMiner.replaceBlock=Substituir bloco -gui.digitalMiner.reset=Resetar +gui.digitalMiner.reset=Reiniciar gui.digitalMiner.silkTouch=Toque Suave gui.digitalMiner.pull=Puxar gui.digitalMiner.silk=Suave -gui.digitalMiner.toMine=Para Minerar +gui.digitalMiner.toMine=Minerar gui.digitalMiner.running=Rodando gui.digitalMiner.inverse=Modo Inverso gui.digitalMiner.requireReplace=Requer substituição @@ -507,22 +598,26 @@ gui.digitalMiner.missingBlock=Falta de Bloco //Recipe names recipe.mekanismShaped=Em Formato de +recipe.mekanismShapeless=Sem Formato //Item and block tooltip text tooltip.configurator.configurate=Configurar tooltip.configurator.empty=Vazio tooltip.configurator.rotate=Girar tooltip.configurator.wrench=Chave Inglesa -tooltip.configurator.pumpReset=Resetar cálculo da Bomba Elétrica -tooltip.configurator.toggleDiverter=Modo do Diversor alterado para -tooltip.configurator.toggleColor=Cor passada para -tooltip.configurator.viewColor=Cor atual +tooltip.configurator.pumpReset=Reiniciar cálculo da Bomba Elétrica +tooltip.configurator.toggleDiverter=Modo do Redirecionador alterado para +tooltip.configurator.toggleMode=Comportamento de %s mudado para +tooltip.configurator.viewMode=Comportamento de %s atual tooltip.configurator.unauth=Este baú está trancado tooltip.configurator.noLink=Sem ligação tooltip.configurator.linkMsg=Ligado a tooltip.configurator.dim=dimensão tooltip.configurator.setLink=Defina ligação ao bloco de -tooltip.configurator.plenisherReset=Redefinição de Cálculo de Fluído +tooltip.configurator.plenisherReset=Cálculo de Abastecedor Fluídico reiniciado +tooltip.configurator.inductionPortMode=Modo de transferência de Porta de Indução alternado para +tooltip.configurator.toggleColor=Cor mudada para +tooltip.configurator.viewColor=Cor atual tooltip.upgrade.speed=Velocidade tooltip.upgrade.energy=Energia @@ -564,13 +659,18 @@ tooltip.keysFound=Chave(s) encontradas tooltip.noKey=Sem chave tooltip.hp=HP tooltip.configureState=Configurar Estado +tooltip.outputRate=Taxa de Emissão +tooltip.insufficientFuel=Pouco Combustível +tooltip.readyForReaction=Pronto para Reação +tooltip.speed=Velocidade +tooltip.and=e tooltip.portableTank.bucketMode=Modo Balde tooltip.disassembler.normal=normal tooltip.disassembler.slow=lento tooltip.disassembler.fast=rápido -tooltip.disassembler.vein=vein +tooltip.disassembler.vein=veio tooltip.disassembler.off=desligado tooltip.filterCard.got=Filtrar dados recuperados de %s @@ -578,6 +678,7 @@ tooltip.filterCard.set=Filtrar dados injetados do tipo %s tooltip.filterCard.unequal=Formatos de dados do filtro desiguais tooltip.filterCard.logisticalSorter=Classificador Logístico tooltip.filterCard.digitalMiner=Minerador Digital +tooltip.filterCard.oredictionificator=Oredictionificador tooltip.balloon=Balão @@ -585,14 +686,19 @@ tooltip.jetpack.regular=Normal tooltip.jetpack.hover=Pairar tooltip.jetpack.disabled=Desativado +tooltip.flamethrower.combat=Combate +tooltip.flamethrower.heat=Calor +tooltip.flamethrower.inferno=Inferno +tooltip.flamethrower.modeBump=Modo do Lança-Chamas mudado para + tooltip.seismicReader.needsEnergy=Energia não suficiente para interpretar a vibração tooltip.seismicReader.noVibrations=Incapaz de descobrir quaisquer vibrações -tooltip.EnrichmentChamber=Uma máquina simples usada para enriquecer minérios em !nduas de suas partes em pó, como também !nperformar diversas outras operações. -tooltip.OsmiumCompressor=Uma máquina um tanto avançada usado para comprimir !nósmio em vários pós em ordem para poder criar !nsuas partes em barras. -tooltip.Combiner=Uma máquina usada para combinar pós e pedregulho para !nformar suas partes em minério. -tooltip.Crusher=Uma máquina em pó usada para triturar barras em suas partes em pó, !ncomo também fazer várias outtas operações. -tooltip.DigitalMiner=Uma auto-mineradora altamente avançada com filtros que pode !nminerar qualquer bloco que quiser em !numa área (máxima) de 32 blocos. +tooltip.EnrichmentChamber=Uma máquina simples usada para enriquecer minérios !ntornando-os em duas porções de pó, como também !nrealizar muitas outras operações. +tooltip.OsmiumCompressor=Uma máquina um tanto avançada usada para comprimir !nósmio com pós de outros materiais parar convertê-los !nem lingotes. +tooltip.Combiner=Uma máquina usada para combinar pedregulho com pós de outros !nmateriais para convertê-los em minério. +tooltip.Crusher=Uma máquina usada para triturar lingotes em pó, !ncomo também fazer várias outtas operações. +tooltip.DigitalMiner=Uma automineradora altamente avançada com filtros que pode !nminerar qualquer bloco que ordenar !nnum raio de 32 blocos (máx.). tooltip.BasicFactory=O menor nível da linha de Fábricas, que pode !nser usada para processar múltiplas operações de máquinas !nde uma vez. tooltip.AdvancedFactory=O nível intermediário da linha de Fábricas, que pode !nser usada para processar múltiplas operações de máquinas !nde uma vez. tooltip.EliteFactory=O maior nível da linha de Fábricas, que pode !nser usada para processar múltiplas operações de máquinas !nde uma vez. @@ -603,23 +709,25 @@ tooltip.Teleporter=Uma máquina capaz de teletransportar jogadores pra vários ! tooltip.ElectricPump=Uma bomba capaz de bombear um lago de !nlava inteiro. tooltip.ElectricChest=Um baú portátil de 54 slots que usa energia para se !ntrancar de outros por meios de proteção por senha. tooltip.Chargepad=Uma plataforma recarregadora capaz de carregar qualquer item energizado de !nqualquer mod. -tooltip.LogisticalSorter=Uma máquina de triagem avançada com filtros que !npode auto-ejetar itens especificados pra dentro e pra fora de !ninventários adjacentes e Transportadores Logísticos. +tooltip.LogisticalSorter=Uma máquina de triagem avançada com filtros que !npode autoejetar itens especificados para dentro e para fora de !ninventários adjacentes e Transportadores Logísticos. tooltip.RotaryCondensentrator=Uma máquina capaz de converter gases em !nsuas formas líquidas e vice-versa. -tooltip.ChemicalInjectionChamber=Uma máquina de elite capaz de processar !nminérios em cacos, servindo como o estágio !ninicial de processamento de minérios 400%. -tooltip.ElectrolyticSeparator=Uma máquina que usa o processo de !neletrólise para separar um certo !gás em dois gases diferentes. -tooltip.PrecisionSawmill=Uma máquina usada para processar lenha e outros itens !de madeira mais eficientemente, como também !n obter serragem. -tooltip.ChemicalDissolutionChamber=Uma máquina definitiva usada para !nquimicamente dissolver quaisquer impurezas de um !nminério, deixando um lodo!nnão-processado atrás. -tooltip.ChemicalWasher=Uma máquina definitiva que limpar lodo !nnão-processado e o prepara para cristalização. +tooltip.ChemicalInjectionChamber=Uma máquina elite capaz de processar !nminérios em estilhaços, servindo como estágio !ninicial do processamento de minérios a 400%. +tooltip.ElectrolyticSeparator=Uma máquina que usa o processo de !neletrólise para quebrar um !ngás em dois gases diferentes. +tooltip.PrecisionSawmill=Uma máquina usada para processar lenha e outros itens !nde madeira mais eficientemente, como também !nobter serragem. +tooltip.ChemicalDissolutionChamber=Uma máquina definitiva usada para !ndissolver quimicamente todas impurezas de um !nminério, deixando um lodo!nnão-processado atrás. +tooltip.ChemicalWasher=Uma máquina definitiva que limpa lodo !nnão-processado e o prepara para cristalização. tooltip.ChemicalCrystallizer=Uma máquina definitiva usada para cristalizar lodo !nde minério purificado em cristais de minério. tooltip.ChemicalOxidizer=Uma máquina capaz de oxidar !nmateriais sólidos em fase gasosa. tooltip.ChemicalInfuser=Uma máquina que produz um novo tipo de !ngás por infusão de dois outros. -tooltip.SeismicVibrator=Uma máquina que usa vibrações sísmicas para !nprovideciar informações de diversas camadas !ndo mundo. -tooltip.PressurizedReactionChamber=Uma máquina avançada que processa uma mistura líquida, gasosa e sólida e cria ambos um produto gasoso e um sólido. -tooltip.PortableTank=Um tanque portátil útil que te deixa carregar 14 !nbaldes de fluido para onde !nquiser. Também serve como balde! +tooltip.SeismicVibrator=Uma máquina que usa vibrações sísmicas para !nfornecer informações sobre diversas camadas !ndo mundo. +tooltip.PressurizedReactionChamber=Uma máquina avançada que processa uma mistura líquida, gasosa e sólida e cria um produto gasoso e um sólido. +tooltip.PortableTank=Um tanque portátil útil que lhe permite carregar 14 !nbaldes de fluido para onde !nquiser. Também serve como balde! tooltip.FluidicPlenisher=Uma máquina que é capaz de criar lagos !ninteiros enchendo ravinas com fluidos. -tooltip.Laser=An advanced form of linear energy!ntransfer that utilizes an extremely!ncollimated beam of light. -tooltip.LaserAmplifier=A block that can be used to merge,!nredirect and amplify laser beams,!nwith fine controls over when to fire -tooltip.LaserTractorBeam=A block used to merge and!nredirect laser beams. Collects!ndrops from blocks it has broken. +tooltip.Laser=Uma forma avançada de transferência !nlinear de energia que utiliza um feixe extremamente !nalinhado de luz. +tooltip.LaserAmplifier=Um bloco que pode ser usado !npara fundir, redirecionar e ampliar raios laser, com !ncontroles finos sobre quando disparar. +tooltip.LaserTractorBeam=Um bloco usado para mesclar !ne redirecionar os raios laser. Recolhe itens de blocos !nque foram quebrados. +tooltip.SolarNeutronActivator=Uma máquina que direciona a radiação de !nnêutrons do sol para seu armazenamento interno, !npermitindo a criação lenta de vários isótopos. +tooltip.Oredictionificator=A máquina usada para unificar e traduzir vários itens !nblocos usando o Ore Dictionary. tooltip.HeatGenerator=Um gerador que usa o calor da lava ou !noutros recursos combustíveis para produzir energia. tooltip.SolarGenerator=Um gerador que usa o poder do !nsol para produzir energia. @@ -628,16 +736,27 @@ tooltip.BioGenerator=Um gerador que queima materiais orgânicos do !nmundo para tooltip.AdvancedSolarGenerator=Um gerador que diretamente !nabsorve os raios solares com pequena perda !npara produzir energia tooltip.WindTurbine=Um gerador que usa a força do vento !npara produzir energia, com maior eficiência !nem camadas mais altas. -tooltip.ReactorGlass=Reinforced glass that can be used in !nthe Fusion Reactor multiblock. -tooltip.ReactorLaserFocusMatrix=A panel of Reactor Glass that !n is capable of absorbing optical energy and !nthereby heating up the Fusion Reactor. -tooltip.ReactorController=The controlling block for the entire !nFusion Reactor structure. -tooltip.ReactorFrame=Reinforced framing that can be used in !nthe Fusion Reactor multiblock. -tooltip.ReactorNeutronCapturePlate=A block that can be used to !nboth block Fusion Reactor radiation and assist !nin the production of Tritium. -tooltip.ReactorPort=A block of reinforced framing that is capable !nof managing both the gas and energy transfer !nof the Fusion Reactor. +tooltip.ReactorGlass=Vidro Reforçado que pode ser utilizado !nno multibloco do Reator de Fusão. +tooltip.ReactorLaserFocusMatrix=Um painel do Vidro do Reator !nque é capaz de absorver energia óptica e !ndessa forma aquecendo o Reator de Fusão. +tooltip.ReactorController=O bloco controlador para a !nEstrutura Reator de Fusão toda. +tooltip.ReactorFrame=Armação reforçada que pode ser utilizada no !nmultibloco do Reator de Fusão. +tooltip.ReactorNeutronCapturePlate=Um bloco que pode ser usado para !nbloquear a radiação do Reator de Fusão e para !najudar na produção de Trítio. +tooltip.ReactorPort=Um bloco de armação reforçada que é capaz de !ngerenciar a transferência de gás e de energia !ndo Reator de Fusão. +tooltip.ReactorLogicAdapter=Um bloco que pode ser usado para !npermitir monitoramento básico de um reactor usando redstone. tooltip.OsmiumOre=Um mineral forte que pode ser achado !nem quase qualquer altura do mundo. !nÉ conhecido por ter muitos usos na !nconstrução de maquinaria. tooltip.CopperOre=Um material condutivo e comum que !npode ser usado na produção de !nfios. Sua habilidade de suportar !naltas temperaturas também o faz importante !nem maquinaria avançada. -tooltip.TinOre=Um material condutivo leve, porém resistente !nque é encontrado com um pouco menos !nfrequência que Cobre. +tooltip.TinOre=Um material condutivo leve, porém resistente, !nque é encontrado com um pouco menos de !nfrequência que Cobre. + +//Side data +sideData.None=Nada +sideData.Input=Entrada +sideData.Output=Saída +sideData.Energy=Energia +sideData.Gas=Gás +sideData.Extra=Extra +sideData.Infuse=Infusão +sideData.Fluid=Fluido //Redstone control control.disabled=Desativado @@ -694,6 +813,16 @@ dye.pink=Magenta dye.yellow=Amarelo dye.white=Branco +//Reactor Logic modes +reactor.disabled=Desativado +reactor.disabled.desc=Não irá emitir sinal de redstone +reactor.ready=Pronto para ignição +reactor.ready.desc=Reactor atingiu o nível necessário de calor para ignição +reactor.capacity=Capacidade de calor atendida +reactor.capacity.desc=A capacidade de calor do núcleo do reator foi atendida +reactor.depleted=Pouco Combustível +reactor.depleted.desc=O reactor tem combustível insuficiente para manter uma reação + //Creative tab itemGroup.tabMekanism=Mekanism @@ -706,27 +835,25 @@ nei.rotaryCondensentrator=Condensentrador Rot. //**********// //Items -item.BioFuel.name=Biocombustível item.SolarPanel.name=Painel Solar - -//Infuse types -infuse.bio=Biomassa +item.Hohlraum.name=Hohlraum //Generators -tile.Generator.HeatGenerator.name=Gerador à Calor -tile.Generator.SolarGenerator.name=Gerador à Energia Solar -tile.Generator.GasGenerator.name=Gerador à Queima de Gás -tile.Generator.BioGenerator.name=Bio-Gerador -tile.Generator.AdvancedSolarGenerator.name=Gerador à Energia Solar Avançado +tile.Generator.HeatGenerator.name=Gerador a Calor +tile.Generator.SolarGenerator.name=Gerador a Energia Solar +tile.Generator.GasGenerator.name=Gerador a Queima de Gás +tile.Generator.BioGenerator.name=Biogerador +tile.Generator.AdvancedSolarGenerator.name=Gerador a Energia Solar Avançado tile.Generator.WindTurbine.name=Turbina Eólica tile.Reactor.ReactorController.name=Controlador do Reator -tile.Reactor.ReactorFrame.name=Quadro do Reator +tile.Reactor.ReactorFrame.name=Armação do Reator tile.Reactor.ReactorNeutronCapturePlate.name=Placa de Captura de Nêutrons -tile.Reactor.ReactorInOutPort.name=Porta do Reator +tile.Reactor.ReactorPort.name=Porta do Reator +tile.Reactor.ReactorLogicAdapter.name=Adaptador Lógica do Reator tile.ReactorGlass.ReactorGlass.name=Vidro do Reator -tile.ReactorGlass.ReactorLaserFocusMatrix.name=Foco Matrix do Laser +tile.ReactorGlass.ReactorLaserFocusMatrix.name=Matriz Focal do Laser //Gui text gui.heatGenerator.fuel=Combustível @@ -734,15 +861,15 @@ gui.solarGenerator.sun=Sol gui.bioGenerator.bioFuel=Biocombustível gui.electrolyticSeparator.dump=Despejar -gui.passive=Passivo -gui.active=Ativo +gui.passive=Refrigerado a Ar +gui.active=Refrigerado a Água gui.minInject=Taxa Min. de Injeção gui.ignition=Temp de Ignição -gui.maxPlasma=Temp Máx. do Plasma -gui.maxCasing=Temp Máx. da Carcaça +gui.maxPlasma=Temp. Máx. do Plasma +gui.maxCasing=Temp. Máx. da Carcaça gui.passiveGeneration=Geração Passiva -gui.steamProduction=Produção a vapor +gui.steamProduction=Produção de Vapor //*****// //TOOLS// @@ -833,6 +960,6 @@ mekanism.configgui.ctgy.tools.armor=Balanceamento de Armadura mekanism.configgui.ctgy.tools.tools=Balanceamento de Ferramentas //Config Tooltips -mekanism.configgui.ctgy.tools.general.tooltip=Definições sobre a configuração geral do MekanismTools -mekanism.configgui.ctgy.tools.armor.tooltip=Configurações em relação aos valores de proteção e equilíbrio de equipamentos protetores do MekanismTools -mekanism.configgui.ctgy.tools.tools.tooltip=Configurações em relação aos valores de eficiência e equilíbrio de conjuntos de ferramentas do MekanismTools +mekanism.configgui.ctgy.tools.general.tooltip=Definições relativas a configuração geral do MekanismTools +mekanism.configgui.ctgy.tools.armor.tooltip=Configurações relativas aos valores de proteção e balanço de armaduras do MekanismTools +mekanism.configgui.ctgy.tools.tools.tooltip=Configurações relativas aos valores de eficiência e balanço de ferramentas do MekanismTools diff --git a/src/main/resources/assets/mekanism/models/solar_tri.obj b/src/main/resources/assets/mekanism/models/solar_tri.obj deleted file mode 100644 index 094ade5c2..000000000 --- a/src/main/resources/assets/mekanism/models/solar_tri.obj +++ /dev/null @@ -1,513 +0,0 @@ -# Blender v2.70 (sub 0) OBJ File: 'untitled.blend' -# www.blender.org -o Cube -v 0.775751 0.000000 -0.775751 -v 0.775751 0.000000 0.775751 -v -0.775751 0.000000 0.775751 -v 0.600098 1.245471 -0.600098 -v 0.600098 1.245471 0.600099 -v -0.600098 1.245471 0.600098 -v -0.600098 1.245471 -0.600098 -v -0.775751 0.000000 -0.775751 -v -1.000000 2.000000 -1.000000 -v -0.400000 0.003810 -0.200000 -v -0.597037 0.003810 -1.000000 -v 0.597037 0.003810 -1.000000 -v 0.400000 0.003810 -0.200000 -v -0.210455 1.400000 -0.200000 -v -0.400000 1.400000 -1.000000 -v 0.400000 1.400000 -1.000000 -v 0.210455 1.400000 -0.200000 -v -0.163734 0.001860 0.929790 -v -0.163734 0.001860 0.602323 -v 0.163734 0.001860 0.602323 -v 0.163734 0.001860 0.929790 -v -0.163734 1.681595 0.929790 -v -0.163734 1.681595 0.602323 -v 0.163734 1.681595 0.602323 -v 0.163734 1.681595 0.929790 -v -0.163734 2.317753 0.908083 -v -0.163734 2.154813 0.624031 -v 0.163734 2.154813 0.624031 -v 0.163734 2.317753 0.908083 -v -0.163734 2.494844 0.723671 -v -0.163734 2.332132 0.542139 -v 0.163734 2.332132 0.542139 -v 0.163734 2.494844 0.723671 -v -0.163734 2.557197 0.442637 -v -0.163734 2.438710 0.421698 -v 0.163734 2.438710 0.421698 -v 0.163734 2.557197 0.442637 -v -0.163734 2.705466 -0.790486 -v -0.163734 2.586978 -0.811424 -v 0.163734 2.586978 -0.811424 -v 0.163734 2.705466 -0.790486 -v -0.724969 2.724604 0.442637 -v -0.724969 2.606117 0.421698 -v 0.724969 2.606117 0.421698 -v 0.724969 2.724604 0.442637 -v -0.724969 2.872873 -0.790486 -v -0.724969 2.754385 -0.811424 -v 0.724969 2.754385 -0.811424 -v 0.724969 2.872873 -0.790486 -v -0.208086 1.400000 -0.391914 -v -0.208086 1.400000 -0.808086 -v 0.208086 1.400000 -0.808086 -v 0.208086 1.400000 -0.391914 -v -0.150252 1.687980 -0.469609 -v -0.150252 1.837299 -0.730391 -v 0.150252 1.837299 -0.730391 -v 0.150252 1.687980 -0.469609 -v -0.079605 1.697107 -0.540204 -v -0.079605 1.776218 -0.678369 -v 0.079605 1.776218 -0.678369 -v 0.079605 1.697107 -0.540204 -v 0.444352 2.499090 0.421698 -v 0.444352 2.647359 -0.811424 -v 0.444352 2.765847 -0.790486 -v 0.444352 2.617578 0.442637 -v -0.444352 2.647359 -0.811424 -v -0.444352 2.499090 0.421698 -v -0.444352 2.617578 0.442637 -v -0.444352 2.765847 -0.790486 -v -0.163734 2.599183 -0.359366 -v 0.163734 2.599183 -0.359366 -v 0.163734 2.480696 -0.380305 -v -0.163734 2.480696 -0.380305 -v -0.724969 2.766590 -0.359366 -v 0.724969 2.766590 -0.359366 -v 0.724969 2.648103 -0.380305 -v -0.724969 2.648103 -0.380305 -v 0.444352 2.541076 -0.380305 -v 0.444352 2.659564 -0.359366 -v -0.444352 2.541076 -0.380305 -v -0.444352 2.659564 -0.359366 -vt 0.250000 0.851562 -vt 0.250000 0.656250 -vt 0.437500 0.656250 -vt 0.695312 0.046875 -vt 0.656250 0.250000 -vt 0.460938 0.250000 -vt 0.445312 0.453125 -vt 0.406250 0.656250 -vt 0.218750 0.656250 -vt 0.195312 0.250000 -vt 0.195312 0.000000 -vt 0.445312 0.000000 -vt 0.468750 0.250000 -vt 0.664062 0.250000 -vt 0.695312 0.453125 -vt 0.828125 0.250000 -vt 0.695312 0.250000 -vt 0.695312 0.015625 -vt 0.031250 0.226562 -vt 0.000000 0.000000 -vt 0.187500 0.000000 -vt 0.554688 0.890625 -vt 0.554688 0.664062 -vt 0.687500 0.664062 -vt 0.718750 0.921875 -vt 0.687500 0.703125 -vt 0.820312 0.703125 -vt 0.695312 0.328125 -vt 0.882812 0.328125 -vt 0.851562 0.453125 -vt 0.054688 0.351562 -vt 0.062500 0.312500 -vt 0.132812 0.312500 -vt 0.140625 0.625000 -vt 0.132812 0.359375 -vt 0.179688 0.359375 -vt 0.945312 0.781250 -vt 0.945312 0.507812 -vt 1.000000 0.507812 -vt 0.007812 0.625000 -vt 0.023438 0.359375 -vt 0.078125 0.359375 -vt 0.890625 0.726562 -vt 0.890625 0.453125 -vt 0.945312 0.453125 -vt 1.000000 0.453125 -vt 0.945312 0.726562 -vt 0.945312 0.828125 -vt 0.890625 0.828125 -vt 0.945312 0.867188 -vt 0.890625 0.867188 -vt 0.054688 0.632812 -vt 0.046875 0.703125 -vt 0.000000 0.726562 -vt 1.000000 0.781250 -vt 1.000000 0.851562 -vt 0.945312 0.851562 -vt 0.187500 0.625000 -vt 0.187500 0.726562 -vt 0.945312 0.914062 -vt 0.890625 0.914062 -vt 0.062500 0.734375 -vt 0.031250 0.757812 -vt 1.000000 0.882812 -vt 0.945312 0.882812 -vt 0.140625 0.703125 -vt 0.164062 0.757812 -vt 0.593750 0.585938 -vt 0.593750 0.656250 -vt 0.539062 0.656250 -vt 0.078125 0.750000 -vt 1.000000 0.914062 -vt 0.117188 0.773438 -vt 0.117188 0.750000 -vt 0.585938 0.046875 -vt 0.531250 0.046875 -vt 0.531250 0.031250 -vt 0.820312 0.648438 -vt 0.890625 0.648438 -vt 0.890625 0.695312 -vt 0.820312 0.546875 -vt 0.890625 0.546875 -vt 0.890625 0.601562 -vt 0.687500 0.500000 -vt 0.687500 0.453125 -vt 0.820312 0.453125 -vt 0.132812 0.820312 -vt 0.203125 0.828125 -vt 0.203125 0.851562 -vt 0.125000 0.820312 -vt 0.125000 0.796875 -vt 0.203125 0.796875 -vt 0.640625 0.453125 -vt 0.687500 0.460938 -vt 0.687500 0.585938 -vt 0.492188 0.585938 -vt 0.492188 0.656250 -vt 0.445312 0.656250 -vt 0.632812 0.039062 -vt 0.632812 0.015625 -vt 0.679688 0.000000 -vt 0.484375 0.039062 -vt 0.445312 0.023438 -vt 0.820312 0.296875 -vt 0.867188 0.296875 -vt 0.867188 0.320312 -vt 0.507812 0.828125 -vt 0.500000 0.851562 -vt 0.453125 0.851562 -vt 0.546875 0.710938 -vt 0.492188 0.710938 -vt 0.062500 0.257812 -vt 0.156250 0.226562 -vt 0.132812 0.257812 -vt 0.132812 0.351562 -vt 0.531250 0.718750 -vt 0.507812 0.718750 -vt 0.882812 0.703125 -vt 0.875000 0.773438 -vt 0.554688 0.750000 -vt 0.546875 0.820312 -vt 0.492188 0.820312 -vt 0.742188 0.265625 -vt 0.765625 0.304688 -vt 0.531250 0.742188 -vt 0.507812 0.742188 -vt 0.859375 0.773438 -vt 0.835938 0.765625 -vt 0.531250 0.828125 -vt 0.757812 0.265625 -vt 0.820312 0.601562 -vt 0.593750 0.453125 -vt 0.640625 0.585938 -vt 0.585938 0.031250 -vt 0.773438 0.296875 -vt 0.820312 0.312500 -vt 0.687500 0.546875 -vt 0.820312 0.500000 -vt 0.539062 0.585938 -vt 0.484375 0.015625 -vt 0.554688 0.835938 -vt 0.546875 0.859375 -vt 0.539062 0.453125 -vt 0.687500 0.648438 -vt 0.820312 0.695312 -vt 0.000000 0.835938 -vt 0.000000 0.820312 -vt 0.000000 0.773438 -vt 0.687500 0.656250 -vt 0.492188 0.453125 -vt 0.445312 0.585938 -vt 0.687500 0.601562 -vt 0.640625 0.656250 -vt 0.890625 0.500000 -vt 0.406250 0.250000 -vt 0.195312 0.453125 -vt 0.437500 0.851562 -vt 0.445312 0.046875 -vt 0.445312 0.250000 -vt 0.828125 0.023438 -vt 0.687500 0.890625 -vt 0.789062 0.921875 -vt 0.726562 0.453125 -vt 0.132812 0.734375 -vt 0.070312 0.773438 -vt 0.132812 0.835938 -vt 0.195312 0.820312 -vt 0.679688 0.023438 -vt 0.460938 0.828125 -vt 0.484375 0.664062 -vt 0.828125 0.750000 -vt 0.484375 0.750000 -vt 0.695312 0.320312 -vt 0.765625 0.289062 -vt 0.773438 0.320312 -vt 0.687500 0.695312 -vt 0.000000 0.789062 -vt 0.445312 0.460938 -vt 0.218750 0.250000 -vn 0.000000 1.000000 0.000000 -vn 0.990201 0.139651 0.000001 -vn -0.000001 0.139651 0.990201 -vn 0.000000 -1.000000 0.000000 -vn -0.990201 0.139651 -0.000000 -vn -0.964014 0.136046 0.228405 -vn 0.000000 0.000000 -1.000000 -vn 0.962655 0.130689 0.237099 -vn 0.000000 0.000000 1.000000 -vn 0.000000 1.000000 -0.000001 -vn -1.000000 0.000000 0.000000 -vn 1.000000 0.000000 0.000000 -vn 0.000000 0.034103 0.999418 -vn 0.000000 0.721277 0.692647 -vn 0.000000 0.045825 -0.998949 -vn 0.000000 0.976260 0.216604 -vn 0.000000 -0.419278 -0.907858 -vn 0.000000 0.970931 0.239361 -vn 0.000000 -0.748892 -0.662692 -vn 0.000000 0.174022 -0.984742 -vn 0.347263 -0.910507 -0.224466 -vn 0.000000 -0.970931 -0.239361 -vn -0.355931 -0.933234 -0.048855 -vn -0.355931 0.933234 0.048857 -vn 0.347263 0.910508 0.224464 -vn -0.066225 0.173640 -0.982580 -vn 0.066226 0.173641 -0.982580 -vn 0.066226 -0.173641 0.982580 -vn -0.066225 -0.173640 0.982580 -vn 0.000000 0.260479 0.965479 -vn 0.000000 1.000000 0.000001 -vn 0.000000 0.991746 0.128214 -vn 0.991368 0.131110 0.000000 -vn 0.000000 0.174930 -0.984581 -vn -0.964527 0.229089 0.131172 -vn 0.000000 0.867811 0.496894 -vn -0.358815 0.810023 0.463805 -vn 0.000000 0.648393 0.761306 -vn 0.358814 0.810023 0.463804 -vn 0.204500 -0.950411 -0.234303 -vn -0.210081 0.976347 0.051114 -vn -0.037418 0.173900 -0.984052 -vn 0.037418 -0.173901 0.984052 -vn -0.210081 -0.976347 -0.051112 -vn 0.204501 0.950412 0.234302 -vn 0.037419 0.173901 -0.984052 -vn -0.037418 -0.173900 0.984052 -vn 0.000000 0.998632 0.052280 -vn 0.355931 -0.933234 -0.048857 -vn 0.000000 -0.998632 -0.052280 -vn -0.347263 -0.910508 -0.224464 -vn -0.347263 0.910507 0.224466 -vn 0.355931 0.933234 0.048855 -vn 0.210081 -0.976347 -0.051114 -vn -0.204500 0.950411 0.234303 -vn -0.204501 -0.950412 -0.234302 -vn 0.210081 0.976347 0.051112 -vn 0.000000 0.139652 -0.990201 -vn 0.990201 0.139652 0.000000 -vn 0.000000 0.139651 0.990201 -vn -0.962655 0.130689 0.237099 -vn 0.964014 0.136046 0.228405 -vn 0.000000 0.721278 0.692646 -vn 0.000000 0.045824 -0.998950 -vn 0.000000 0.976260 0.216603 -vn 0.000000 0.970931 0.239362 -vn 0.000000 0.174021 -0.984742 -vn 0.347263 -0.910507 -0.224464 -vn 0.000000 -0.970930 -0.239362 -vn -0.355931 -0.933234 -0.048857 -vn -0.355931 0.933234 0.048855 -vn 0.347263 0.910507 0.224466 -vn -0.066226 0.173641 -0.982580 -vn 0.066225 0.173640 -0.982580 -vn 0.066225 -0.173640 0.982580 -vn -0.066226 -0.173641 0.982580 -vn 0.000000 0.260479 0.965480 -vn 0.000000 0.991746 0.128218 -vn 0.964527 0.229089 0.131172 -vn -0.991368 0.131110 0.000000 -vn 0.000000 0.867812 0.496892 -vn -0.358814 0.810023 0.463804 -vn 0.000000 0.648392 0.761307 -vn 0.358814 0.810023 0.463805 -vn 0.204501 -0.950412 -0.234302 -vn -0.210081 0.976347 0.051112 -vn -0.037418 0.173901 -0.984052 -vn 0.037418 -0.173900 0.984052 -vn -0.210081 -0.976347 -0.051114 -vn 0.204501 0.950411 0.234303 -vn 0.037418 0.173900 -0.984052 -vn -0.037419 -0.173901 0.984052 -vn 0.355931 -0.933234 -0.048855 -vn -0.347263 -0.910507 -0.224466 -vn -0.347263 0.910508 0.224464 -vn 0.355931 0.933234 0.048857 -vn 0.210081 -0.976347 -0.051112 -vn -0.204501 0.950412 0.234302 -vn -0.204500 -0.950411 -0.234304 -vn 0.210081 0.976347 0.051114 -vn 0.000000 0.139651 -0.990201 -s off -f 7/1/1 6/2/1 5/3/1 -f 1/4/2 4/5/2 5/6/2 -f 2/7/3 5/8/3 6/9/3 -f 2/10/4 3/11/4 8/12/4 -f 6/13/5 7/14/5 8/15/5 -f 14/16/6 15/17/6 11/18/6 -f 16/19/7 12/20/7 11/21/7 -f 17/22/8 13/23/8 12/24/8 -f 14/25/9 10/26/9 13/27/9 -f 11/28/4 12/29/4 13/30/4 -f 17/31/10 53/32/10 50/33/10 -f 23/34/11 19/35/11 18/36/11 -f 24/37/7 20/38/7 19/39/7 -f 25/40/12 21/41/12 20/42/12 -f 22/43/9 18/44/9 21/45/9 -f 18/46/4 19/39/4 20/38/4 -f 25/47/13 29/48/13 26/49/13 -f 29/48/14 33/50/14 30/51/14 -f 24/52/12 28/53/12 29/54/12 -f 23/55/15 27/56/15 28/57/15 -f 23/34/11 22/58/11 26/59/11 -f 33/50/16 37/60/16 34/61/16 -f 28/53/12 32/62/12 33/63/12 -f 27/56/17 31/64/17 32/65/17 -f 27/66/11 26/59/11 30/67/11 -f 71/68/18 41/69/18 38/70/18 -f 33/63/12 32/62/12 36/71/12 -f 31/64/19 35/72/19 36/60/19 -f 30/67/11 34/73/11 35/74/11 -f 40/75/20 39/76/20 38/77/20 -f 78/78/21 63/79/21 48/80/21 -f 73/81/22 39/82/22 40/83/22 -f 67/84/23 43/85/23 77/86/23 -f 76/87/12 48/88/12 49/89/12 -f 77/90/11 74/91/11 46/92/11 -f 65/93/24 45/94/24 75/95/24 -f 81/96/25 69/97/25 46/98/25 -f 63/99/26 64/100/26 49/101/26 -f 66/102/27 47/103/27 46/12/27 -f 62/104/28 44/105/28 45/106/28 -f 67/107/29 68/108/29 42/109/29 -f 53/23/30 57/110/30 54/111/30 -f 17/31/1 16/19/1 52/112/1 -f 15/113/31 51/114/31 52/112/31 -f 14/115/1 50/33/1 51/114/1 -f 57/110/32 61/116/32 58/117/32 -f 53/27/33 52/118/33 56/119/33 -f 51/120/34 55/121/34 56/122/34 -f 50/17/35 54/123/35 55/124/35 -f 60/125/36 59/126/36 58/117/36 -f 56/119/37 60/127/37 61/128/37 -f 55/121/38 59/129/38 60/107/38 -f 55/124/39 54/123/39 58/130/39 -f 72/131/40 40/83/40 63/79/40 -f 37/132/41 65/93/41 79/133/41 -f 40/75/42 41/134/42 64/100/42 -f 36/135/43 62/104/43 65/136/43 -f 35/137/44 67/84/44 80/138/44 -f 70/139/45 38/70/45 69/97/45 -f 39/76/46 66/102/46 69/140/46 -f 35/141/47 34/142/47 68/108/47 -f 34/143/48 37/132/48 71/68/48 -f 62/144/49 78/78/49 76/145/49 -f 35/137/50 73/81/50 72/131/50 -f 80/138/51 77/86/51 47/44/51 -f 45/146/12 44/147/12 76/87/12 -f 42/148/11 74/91/11 77/90/11 -f 79/133/52 75/95/52 49/149/52 -f 68/150/53 81/96/53 74/151/53 -f 36/152/54 72/131/54 78/78/54 -f 71/68/55 79/133/55 64/153/55 -f 73/81/56 80/138/56 66/154/56 -f 34/143/57 70/139/57 81/96/57 -f 4/155/58 1/7/58 8/156/58 -f 4/157/1 7/1/1 5/3/1 -f 2/158/59 1/4/59 5/6/59 -f 3/156/60 2/7/60 6/9/60 -f 1/159/4 2/10/4 8/12/4 -f 3/7/5 6/13/5 8/15/5 -f 10/160/61 14/16/61 11/18/61 -f 15/113/7 16/19/7 11/21/7 -f 16/161/62 17/22/62 12/24/62 -f 17/162/9 14/25/9 13/27/9 -f 10/163/4 11/28/4 13/30/4 -f 14/115/1 17/31/1 50/33/1 -f 22/58/11 23/34/11 18/36/11 -f 23/55/7 24/37/7 19/39/7 -f 24/52/12 25/40/12 20/42/12 -f 25/47/9 22/43/9 21/45/9 -f 21/45/4 18/46/4 20/38/4 -f 22/43/13 25/47/13 26/49/13 -f 26/49/63 29/48/63 30/51/63 -f 25/40/12 24/52/12 29/54/12 -f 24/37/64 23/55/64 28/57/64 -f 27/66/11 23/34/11 26/59/11 -f 30/51/65 33/50/65 34/61/65 -f 29/54/12 28/53/12 33/63/12 -f 28/57/17 27/56/17 32/65/17 -f 31/164/11 27/66/11 30/67/11 -f 70/139/66 71/68/66 38/70/66 -f 37/165/12 33/63/12 36/71/12 -f 32/65/19 31/64/19 36/60/19 -f 31/164/11 30/67/11 35/74/11 -f 41/134/67 40/75/67 38/77/67 -f 76/145/68 78/78/68 48/80/68 -f 72/131/69 73/81/69 40/83/69 -f 80/138/70 67/84/70 77/86/70 -f 75/166/12 76/87/12 49/89/12 -f 47/167/11 77/90/11 46/92/11 -f 79/133/71 65/93/71 75/95/71 -f 74/151/72 81/96/72 46/98/72 -f 48/168/73 63/99/73 49/101/73 -f 69/140/74 66/102/74 46/12/74 -f 65/136/75 62/104/75 45/106/75 -f 43/169/76 67/107/76 42/109/76 -f 50/170/77 53/23/77 54/111/77 -f 53/32/1 17/31/1 52/112/1 -f 16/19/1 15/113/1 52/112/1 -f 15/113/1 14/115/1 51/114/1 -f 54/111/78 57/110/78 58/117/78 -f 57/171/79 53/27/79 56/119/79 -f 52/172/34 51/120/34 56/122/34 -f 51/173/80 50/17/80 55/124/80 -f 61/116/81 60/125/81 58/117/81 -f 57/171/82 56/119/82 61/128/82 -f 56/122/83 55/121/83 60/107/83 -f 59/174/84 55/124/84 58/130/84 -f 78/78/85 72/131/85 63/79/85 -f 71/68/86 37/132/86 79/133/86 -f 63/99/87 40/75/87 64/100/87 -f 37/175/88 36/135/88 65/136/88 -f 73/81/89 35/137/89 80/138/89 -f 81/96/90 70/139/90 69/97/90 -f 38/77/91 39/76/91 69/140/91 -f 67/107/92 35/141/92 68/108/92 -f 70/139/48 34/143/48 71/68/48 -f 44/176/93 62/144/93 76/145/93 -f 36/152/50 35/137/50 72/131/50 -f 66/154/94 80/138/94 47/44/94 -f 75/166/12 45/146/12 76/87/12 -f 43/177/11 42/148/11 77/90/11 -f 64/153/95 79/133/95 49/149/95 -f 42/178/96 68/150/96 74/151/96 -f 62/144/97 36/152/97 78/78/97 -f 41/69/98 71/68/98 64/153/98 -f 39/82/99 73/81/99 66/154/99 -f 68/150/100 34/143/100 81/96/100 -f 7/179/101 4/155/101 8/156/101 diff --git a/src/main/resources/assets/mekanism/render/BioGenerator.png b/src/main/resources/assets/mekanism/render/BioGenerator.png index 40d391964..7e557bee8 100644 Binary files a/src/main/resources/assets/mekanism/render/BioGenerator.png and b/src/main/resources/assets/mekanism/render/BioGenerator.png differ diff --git a/src/main/resources/assets/mekanism/render/Chargepad.png b/src/main/resources/assets/mekanism/render/Chargepad.png index 4e096ad43..8da4e6ca0 100644 Binary files a/src/main/resources/assets/mekanism/render/Chargepad.png and b/src/main/resources/assets/mekanism/render/Chargepad.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedFront.png b/src/main/resources/assets/mekanism/render/Chargepad_Overlay.png similarity index 56% rename from src/main/resources/assets/mekanism/textures/blocks/BinAdvancedFront.png rename to src/main/resources/assets/mekanism/render/Chargepad_Overlay.png index 1d37f514c..b964be490 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedFront.png and b/src/main/resources/assets/mekanism/render/Chargepad_Overlay.png differ diff --git a/src/main/resources/assets/mekanism/render/ChemicalCrystallizer.png b/src/main/resources/assets/mekanism/render/ChemicalCrystallizer.png index c4d0ff88e..cbc507630 100644 Binary files a/src/main/resources/assets/mekanism/render/ChemicalCrystallizer.png and b/src/main/resources/assets/mekanism/render/ChemicalCrystallizer.png differ diff --git a/src/main/resources/assets/mekanism/render/ChemicalDissolutionChamber.png b/src/main/resources/assets/mekanism/render/ChemicalDissolutionChamber.png index 7b1e34027..fc2d5bc3c 100644 Binary files a/src/main/resources/assets/mekanism/render/ChemicalDissolutionChamber.png and b/src/main/resources/assets/mekanism/render/ChemicalDissolutionChamber.png differ diff --git a/src/main/resources/assets/mekanism/render/ChemicalInfuser.png b/src/main/resources/assets/mekanism/render/ChemicalInfuser.png old mode 100755 new mode 100644 index 44cc40639..e29f5b674 Binary files a/src/main/resources/assets/mekanism/render/ChemicalInfuser.png and b/src/main/resources/assets/mekanism/render/ChemicalInfuser.png differ diff --git a/src/main/resources/assets/mekanism/render/ChemicalOxidizer.png b/src/main/resources/assets/mekanism/render/ChemicalOxidizer.png index 95172c1db..b33cddde2 100644 Binary files a/src/main/resources/assets/mekanism/render/ChemicalOxidizer.png and b/src/main/resources/assets/mekanism/render/ChemicalOxidizer.png differ diff --git a/src/main/resources/assets/mekanism/render/ChemicalWasher.png b/src/main/resources/assets/mekanism/render/ChemicalWasher.png index 34e4e5cb1..ede657f79 100644 Binary files a/src/main/resources/assets/mekanism/render/ChemicalWasher.png and b/src/main/resources/assets/mekanism/render/ChemicalWasher.png differ diff --git a/src/main/resources/assets/mekanism/render/DigitalMiner_OverlayOff.png b/src/main/resources/assets/mekanism/render/DigitalMiner_OverlayOff.png new file mode 100644 index 000000000..066761bcb Binary files /dev/null and b/src/main/resources/assets/mekanism/render/DigitalMiner_OverlayOff.png differ diff --git a/src/main/resources/assets/mekanism/render/DigitalMiner_OverlayOn.png b/src/main/resources/assets/mekanism/render/DigitalMiner_OverlayOn.png new file mode 100644 index 000000000..a9cb86786 Binary files /dev/null and b/src/main/resources/assets/mekanism/render/DigitalMiner_OverlayOn.png differ diff --git a/src/main/resources/assets/mekanism/render/ElectricChest.png b/src/main/resources/assets/mekanism/render/ElectricChest.png deleted file mode 100644 index ccd10a649..000000000 Binary files a/src/main/resources/assets/mekanism/render/ElectricChest.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/render/ElectricPump.png b/src/main/resources/assets/mekanism/render/ElectricPump.png index f881af1fe..eb8209e46 100644 Binary files a/src/main/resources/assets/mekanism/render/ElectricPump.png and b/src/main/resources/assets/mekanism/render/ElectricPump.png differ diff --git a/src/main/resources/assets/mekanism/render/ElectrolyticSeparator.png b/src/main/resources/assets/mekanism/render/ElectrolyticSeparator.png index 1e369ee9a..2a7dc215b 100644 Binary files a/src/main/resources/assets/mekanism/render/ElectrolyticSeparator.png and b/src/main/resources/assets/mekanism/render/ElectrolyticSeparator.png differ diff --git a/src/main/resources/assets/mekanism/render/EnergyCube.png b/src/main/resources/assets/mekanism/render/EnergyCube.png new file mode 100644 index 000000000..558ed0bc1 Binary files /dev/null and b/src/main/resources/assets/mekanism/render/EnergyCube.png differ diff --git a/src/main/resources/assets/mekanism/render/EnergyCube_OverlayOff.png b/src/main/resources/assets/mekanism/render/EnergyCube_OverlayOff.png new file mode 100644 index 000000000..946c86d09 Binary files /dev/null and b/src/main/resources/assets/mekanism/render/EnergyCube_OverlayOff.png differ diff --git a/src/main/resources/assets/mekanism/render/EnergyCube_OverlayOn.png b/src/main/resources/assets/mekanism/render/EnergyCube_OverlayOn.png new file mode 100644 index 000000000..e8b82f291 Binary files /dev/null and b/src/main/resources/assets/mekanism/render/EnergyCube_OverlayOn.png differ diff --git a/src/main/resources/assets/mekanism/render/FluidTank.png b/src/main/resources/assets/mekanism/render/FluidTank.png old mode 100755 new mode 100644 index b1dc430e9..1a44fa00b Binary files a/src/main/resources/assets/mekanism/render/FluidTank.png and b/src/main/resources/assets/mekanism/render/FluidTank.png differ diff --git a/src/main/resources/assets/mekanism/render/FluidTankOn.png b/src/main/resources/assets/mekanism/render/FluidTankOn.png index e3d6c514c..a7cc9c2a3 100644 Binary files a/src/main/resources/assets/mekanism/render/FluidTankOn.png and b/src/main/resources/assets/mekanism/render/FluidTankOn.png differ diff --git a/src/main/resources/assets/mekanism/render/FluidicPlenisher.png b/src/main/resources/assets/mekanism/render/FluidicPlenisher.png old mode 100755 new mode 100644 index c0ca62ab8..5af7e3d92 Binary files a/src/main/resources/assets/mekanism/render/FluidicPlenisher.png and b/src/main/resources/assets/mekanism/render/FluidicPlenisher.png differ diff --git a/src/main/resources/assets/mekanism/render/GasGenerator.png b/src/main/resources/assets/mekanism/render/GasGenerator.png index 6ce2bbc7b..221ff4985 100644 Binary files a/src/main/resources/assets/mekanism/render/GasGenerator.png and b/src/main/resources/assets/mekanism/render/GasGenerator.png differ diff --git a/src/main/resources/assets/mekanism/render/GasTankAdvanced.png b/src/main/resources/assets/mekanism/render/GasTankAdvanced.png index 98c797b73..e98d268b7 100644 Binary files a/src/main/resources/assets/mekanism/render/GasTankAdvanced.png and b/src/main/resources/assets/mekanism/render/GasTankAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/render/GasTankBasic.png b/src/main/resources/assets/mekanism/render/GasTankBasic.png index 7d7dd42dd..bb4ab7a12 100644 Binary files a/src/main/resources/assets/mekanism/render/GasTankBasic.png and b/src/main/resources/assets/mekanism/render/GasTankBasic.png differ diff --git a/src/main/resources/assets/mekanism/render/GasTankElite.png b/src/main/resources/assets/mekanism/render/GasTankElite.png index ecb928ddf..38c89e00c 100644 Binary files a/src/main/resources/assets/mekanism/render/GasTankElite.png and b/src/main/resources/assets/mekanism/render/GasTankElite.png differ diff --git a/src/main/resources/assets/mekanism/render/GasTankUltimate.png b/src/main/resources/assets/mekanism/render/GasTankUltimate.png index 3b7ad2ab2..9fb692fc9 100644 Binary files a/src/main/resources/assets/mekanism/render/GasTankUltimate.png and b/src/main/resources/assets/mekanism/render/GasTankUltimate.png differ diff --git a/src/main/resources/assets/mekanism/render/HeatGenerator.png b/src/main/resources/assets/mekanism/render/HeatGenerator.png index acc8fb64e..9bbcdedcf 100644 Binary files a/src/main/resources/assets/mekanism/render/HeatGenerator.png and b/src/main/resources/assets/mekanism/render/HeatGenerator.png differ diff --git a/src/main/resources/assets/mekanism/render/HeatGeneratorOn.png b/src/main/resources/assets/mekanism/render/HeatGeneratorOn.png deleted file mode 100644 index 9bda77b28..000000000 Binary files a/src/main/resources/assets/mekanism/render/HeatGeneratorOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/render/HeatGenerator_OverlayOff.png b/src/main/resources/assets/mekanism/render/HeatGenerator_OverlayOff.png new file mode 100644 index 000000000..36ce3c562 Binary files /dev/null and b/src/main/resources/assets/mekanism/render/HeatGenerator_OverlayOff.png differ diff --git a/src/main/resources/assets/mekanism/render/HeatGenerator_OverlayOn.png b/src/main/resources/assets/mekanism/render/HeatGenerator_OverlayOn.png new file mode 100644 index 000000000..4d4e36e88 Binary files /dev/null and b/src/main/resources/assets/mekanism/render/HeatGenerator_OverlayOn.png differ diff --git a/src/main/resources/assets/mekanism/render/Laser.png b/src/main/resources/assets/mekanism/render/Laser.png index 161cd258d..a7326559b 100644 Binary files a/src/main/resources/assets/mekanism/render/Laser.png and b/src/main/resources/assets/mekanism/render/Laser.png differ diff --git a/src/main/resources/assets/mekanism/render/LaserAmplifier.png b/src/main/resources/assets/mekanism/render/LaserAmplifier.png index 144354396..5be9e22b2 100644 Binary files a/src/main/resources/assets/mekanism/render/LaserAmplifier.png and b/src/main/resources/assets/mekanism/render/LaserAmplifier.png differ diff --git a/src/main/resources/assets/mekanism/render/LaserTractorBeam.png b/src/main/resources/assets/mekanism/render/LaserTractorBeam.png index 92350a98d..6afd07f26 100644 Binary files a/src/main/resources/assets/mekanism/render/LaserTractorBeam.png and b/src/main/resources/assets/mekanism/render/LaserTractorBeam.png differ diff --git a/src/main/resources/assets/mekanism/render/LogisticalSorter.png b/src/main/resources/assets/mekanism/render/LogisticalSorter.png index e784fcf3a..71afc41c4 100644 Binary files a/src/main/resources/assets/mekanism/render/LogisticalSorter.png and b/src/main/resources/assets/mekanism/render/LogisticalSorter.png differ diff --git a/src/main/resources/assets/mekanism/render/LogisticalSorterOn.png b/src/main/resources/assets/mekanism/render/LogisticalSorterOn.png index 039c46ecb..eff1682b7 100644 Binary files a/src/main/resources/assets/mekanism/render/LogisticalSorterOn.png and b/src/main/resources/assets/mekanism/render/LogisticalSorterOn.png differ diff --git a/src/main/resources/assets/mekanism/render/MetallurgicInfuser.png b/src/main/resources/assets/mekanism/render/MetallurgicInfuser.png index bd59c7541..57c1b70ec 100644 Binary files a/src/main/resources/assets/mekanism/render/MetallurgicInfuser.png and b/src/main/resources/assets/mekanism/render/MetallurgicInfuser.png differ diff --git a/src/main/resources/assets/mekanism/render/PersonalChest.png b/src/main/resources/assets/mekanism/render/PersonalChest.png new file mode 100644 index 000000000..3a258ec96 Binary files /dev/null and b/src/main/resources/assets/mekanism/render/PersonalChest.png differ diff --git a/src/main/resources/assets/mekanism/render/PressurizedReactionChamber.png b/src/main/resources/assets/mekanism/render/PressurizedReactionChamber.png old mode 100755 new mode 100644 index bb09dc60e..012243337 Binary files a/src/main/resources/assets/mekanism/render/PressurizedReactionChamber.png and b/src/main/resources/assets/mekanism/render/PressurizedReactionChamber.png differ diff --git a/src/main/resources/assets/mekanism/render/QuantumEntangloporter.png b/src/main/resources/assets/mekanism/render/QuantumEntangloporter.png new file mode 100644 index 000000000..a1e1d5ecf Binary files /dev/null and b/src/main/resources/assets/mekanism/render/QuantumEntangloporter.png differ diff --git a/src/main/resources/assets/mekanism/render/QuantumEntangloporter_Overlay.png b/src/main/resources/assets/mekanism/render/QuantumEntangloporter_Overlay.png new file mode 100644 index 000000000..b4fce7ad9 Binary files /dev/null and b/src/main/resources/assets/mekanism/render/QuantumEntangloporter_Overlay.png differ diff --git a/src/main/resources/assets/mekanism/render/ResistiveHeater.png b/src/main/resources/assets/mekanism/render/ResistiveHeater.png new file mode 100644 index 000000000..3005d0b74 Binary files /dev/null and b/src/main/resources/assets/mekanism/render/ResistiveHeater.png differ diff --git a/src/main/resources/assets/mekanism/render/ResistiveHeater_OverlayOff.png b/src/main/resources/assets/mekanism/render/ResistiveHeater_OverlayOff.png new file mode 100644 index 000000000..b66a31c24 Binary files /dev/null and b/src/main/resources/assets/mekanism/render/ResistiveHeater_OverlayOff.png differ diff --git a/src/main/resources/assets/mekanism/render/ResistiveHeater_OverlayOn.png b/src/main/resources/assets/mekanism/render/ResistiveHeater_OverlayOn.png new file mode 100644 index 000000000..f84d08696 Binary files /dev/null and b/src/main/resources/assets/mekanism/render/ResistiveHeater_OverlayOn.png differ diff --git a/src/main/resources/assets/mekanism/render/RotaryCondensentrator.png b/src/main/resources/assets/mekanism/render/RotaryCondensentrator.png index f0f8e3574..0a1e54084 100644 Binary files a/src/main/resources/assets/mekanism/render/RotaryCondensentrator.png and b/src/main/resources/assets/mekanism/render/RotaryCondensentrator.png differ diff --git a/src/main/resources/assets/mekanism/render/SecurityDesk.png b/src/main/resources/assets/mekanism/render/SecurityDesk.png new file mode 100644 index 000000000..8dbcd403d Binary files /dev/null and b/src/main/resources/assets/mekanism/render/SecurityDesk.png differ diff --git a/src/main/resources/assets/mekanism/render/SecurityDesk_Overlay.png b/src/main/resources/assets/mekanism/render/SecurityDesk_Overlay.png new file mode 100644 index 000000000..ff8569d2c Binary files /dev/null and b/src/main/resources/assets/mekanism/render/SecurityDesk_Overlay.png differ diff --git a/src/main/resources/assets/mekanism/render/SeismicVibrator.png b/src/main/resources/assets/mekanism/render/SeismicVibrator.png old mode 100755 new mode 100644 index 96a9bd83b..3a7266c10 Binary files a/src/main/resources/assets/mekanism/render/SeismicVibrator.png and b/src/main/resources/assets/mekanism/render/SeismicVibrator.png differ diff --git a/src/main/resources/assets/mekanism/render/SolarGenerator.png b/src/main/resources/assets/mekanism/render/SolarGenerator.png index 1dcf1a0cf..6ecabdb24 100644 Binary files a/src/main/resources/assets/mekanism/render/SolarGenerator.png and b/src/main/resources/assets/mekanism/render/SolarGenerator.png differ diff --git a/src/main/resources/assets/mekanism/render/SolarNeutronActivator.png b/src/main/resources/assets/mekanism/render/SolarNeutronActivator.png index a2920912f..b73a2cf34 100644 Binary files a/src/main/resources/assets/mekanism/render/SolarNeutronActivator.png and b/src/main/resources/assets/mekanism/render/SolarNeutronActivator.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCombiningFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/AdvancedCombiningFactoryFront.png deleted file mode 100755 index 3d06798ae..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCombiningFactoryFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCombiningFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/AdvancedCombiningFactoryFrontOn.png deleted file mode 100755 index e443d0a7e..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCombiningFactoryFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCompressingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/AdvancedCompressingFactoryFront.png deleted file mode 100755 index 69f099854..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCompressingFactoryFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCompressingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/AdvancedCompressingFactoryFrontOn.png deleted file mode 100755 index 3020df978..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCompressingFactoryFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCrushingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/AdvancedCrushingFactoryFront.png deleted file mode 100755 index 351e82048..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCrushingFactoryFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCrushingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/AdvancedCrushingFactoryFrontOn.png deleted file mode 100755 index 657b6229b..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCrushingFactoryFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedEnrichingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/AdvancedEnrichingFactoryFront.png deleted file mode 100755 index 7407ed96b..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/AdvancedEnrichingFactoryFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedEnrichingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/AdvancedEnrichingFactoryFrontOn.png deleted file mode 100755 index a20afd93e..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/AdvancedEnrichingFactoryFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/AdvancedFactoryBottom.png deleted file mode 100755 index 18e2eb83d..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/AdvancedFactoryBottom.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedInjectingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/AdvancedInjectingFactoryFront.png deleted file mode 100755 index 25224391c..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/AdvancedInjectingFactoryFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedInjectingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/AdvancedInjectingFactoryFrontOn.png deleted file mode 100755 index 1f292d2bd..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/AdvancedInjectingFactoryFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedPurifyingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/AdvancedPurifyingFactoryFront.png deleted file mode 100755 index c89e79777..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/AdvancedPurifyingFactoryFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedPurifyingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/AdvancedPurifyingFactoryFrontOn.png deleted file mode 100755 index 642303697..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/AdvancedPurifyingFactoryFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedSmeltingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/AdvancedSmeltingFactoryFront.png deleted file mode 100755 index 4b9ec711a..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/AdvancedSmeltingFactoryFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedSmeltingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/AdvancedSmeltingFactoryFrontOn.png deleted file mode 100755 index f537a6512..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/AdvancedSmeltingFactoryFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCombiningFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/BasicCombiningFactoryFront.png deleted file mode 100755 index 70de7f6f7..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BasicCombiningFactoryFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCombiningFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/BasicCombiningFactoryFrontOn.png deleted file mode 100755 index b37141091..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BasicCombiningFactoryFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCompressingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/BasicCompressingFactoryFront.png deleted file mode 100755 index dd777354b..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BasicCompressingFactoryFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCompressingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/BasicCompressingFactoryFrontOn.png deleted file mode 100755 index a8a266e98..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BasicCompressingFactoryFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCrushingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/BasicCrushingFactoryFront.png deleted file mode 100755 index da5872802..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BasicCrushingFactoryFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCrushingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/BasicCrushingFactoryFrontOn.png deleted file mode 100755 index b26f7930f..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BasicCrushingFactoryFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicEnrichingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/BasicEnrichingFactoryFront.png deleted file mode 100755 index 3c4dbe028..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BasicEnrichingFactoryFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicEnrichingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/BasicEnrichingFactoryFrontOn.png deleted file mode 100755 index 930698a8e..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BasicEnrichingFactoryFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/BasicFactoryBottom.png deleted file mode 100755 index cdf498a6d..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BasicFactoryBottom.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicInjectingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/BasicInjectingFactoryFront.png deleted file mode 100755 index f46a5d9c2..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BasicInjectingFactoryFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicInjectingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/BasicInjectingFactoryFrontOn.png deleted file mode 100755 index d10ad9a12..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BasicInjectingFactoryFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicPurifyingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/BasicPurifyingFactoryFront.png deleted file mode 100755 index 2f22aab93..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BasicPurifyingFactoryFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicPurifyingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/BasicPurifyingFactoryFrontOn.png deleted file mode 100755 index e9b8168cb..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BasicPurifyingFactoryFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicSmeltingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/BasicSmeltingFactoryFront.png deleted file mode 100755 index c6cd7e238..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BasicSmeltingFactoryFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicSmeltingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/BasicSmeltingFactoryFrontOn.png deleted file mode 100755 index aedfacc76..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BasicSmeltingFactoryFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedSide.png b/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedSide.png deleted file mode 100644 index 55fd07f98..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedSide.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedTop.png b/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedTop.png deleted file mode 100644 index aa394fd75..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedTop.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinBasicFront.png b/src/main/resources/assets/mekanism/textures/blocks/BinBasicFront.png deleted file mode 100644 index 19b8520b7..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BinBasicFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinBasicFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/BinBasicFrontOn.png deleted file mode 100644 index 32642dd8e..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BinBasicFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinBasicSide.png b/src/main/resources/assets/mekanism/textures/blocks/BinBasicSide.png deleted file mode 100644 index 4ee5cf6b6..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BinBasicSide.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinBasicTop.png b/src/main/resources/assets/mekanism/textures/blocks/BinBasicTop.png deleted file mode 100644 index dc5a1fffd..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BinBasicTop.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinBasicTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/BinBasicTopOn.png deleted file mode 100644 index f10595555..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BinBasicTopOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinEliteFront.png b/src/main/resources/assets/mekanism/textures/blocks/BinEliteFront.png deleted file mode 100644 index 318ddd90d..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BinEliteFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinEliteFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/BinEliteFrontOn.png deleted file mode 100644 index 9425e35f7..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BinEliteFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinEliteSide.png b/src/main/resources/assets/mekanism/textures/blocks/BinEliteSide.png deleted file mode 100644 index 5faafe1a9..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BinEliteSide.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinEliteTop.png b/src/main/resources/assets/mekanism/textures/blocks/BinEliteTop.png deleted file mode 100644 index b0ae8d075..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BinEliteTop.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinEliteTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/BinEliteTopOn.png deleted file mode 100644 index 9ae7fe5bb..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BinEliteTopOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateFront.png b/src/main/resources/assets/mekanism/textures/blocks/BinUltimateFront.png deleted file mode 100644 index 76e4f5f23..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/BinUltimateFrontOn.png deleted file mode 100644 index 1a2584411..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateSide.png b/src/main/resources/assets/mekanism/textures/blocks/BinUltimateSide.png deleted file mode 100644 index 19b58516f..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateSide.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateTop.png b/src/main/resources/assets/mekanism/textures/blocks/BinUltimateTop.png deleted file mode 100644 index 8c1b3c8eb..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateTop.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/BinUltimateTopOn.png deleted file mode 100644 index c24e0bc35..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BinUltimateTopOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BronzeBlock.png b/src/main/resources/assets/mekanism/textures/blocks/BronzeBlock.png index edc72e637..1c5c59c4b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BronzeBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/BronzeBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/CardboardBoxSide.png b/src/main/resources/assets/mekanism/textures/blocks/CardboardBoxSide.png index 77455b951..3f13b5bc5 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/CardboardBoxSide.png and b/src/main/resources/assets/mekanism/textures/blocks/CardboardBoxSide.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/CardboardBoxSideStorage.png b/src/main/resources/assets/mekanism/textures/blocks/CardboardBoxSideStorage.png index 57e8b4cef..1b274c57b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/CardboardBoxSideStorage.png and b/src/main/resources/assets/mekanism/textures/blocks/CardboardBoxSideStorage.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/CardboardBoxTop.png b/src/main/resources/assets/mekanism/textures/blocks/CardboardBoxTop.png index 4e7e6e6b6..869115782 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/CardboardBoxTop.png and b/src/main/resources/assets/mekanism/textures/blocks/CardboardBoxTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ChemicalInjectionChamberFront.png b/src/main/resources/assets/mekanism/textures/blocks/ChemicalInjectionChamberFront.png deleted file mode 100644 index 2b3866889..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ChemicalInjectionChamberFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ChemicalInjectionChamberFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/ChemicalInjectionChamberFrontOn.png deleted file mode 100644 index ad6cfc582..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ChemicalInjectionChamberFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/Chlorine.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/Chlorine.png.mcmeta deleted file mode 100644 index 4b721e09a..000000000 --- a/src/main/resources/assets/mekanism/textures/blocks/Chlorine.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 2 - } -} diff --git a/src/main/resources/assets/mekanism/textures/blocks/CoalBlock.png b/src/main/resources/assets/mekanism/textures/blocks/CoalBlock.png index 69bb8eb12..297e93a15 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/CoalBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/CoalBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/CombinerFront.png b/src/main/resources/assets/mekanism/textures/blocks/CombinerFront.png deleted file mode 100644 index 6c5f0ea73..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/CombinerFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/CopperBlock.png b/src/main/resources/assets/mekanism/textures/blocks/CopperBlock.png index 069f48d32..a00120301 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/CopperBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/CopperBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/CopperOre.png b/src/main/resources/assets/mekanism/textures/blocks/CopperOre.png index c49ac6a65..78fc61e05 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/CopperOre.png and b/src/main/resources/assets/mekanism/textures/blocks/CopperOre.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/CrusherFront.png b/src/main/resources/assets/mekanism/textures/blocks/CrusherFront.png deleted file mode 100644 index 2c2e6ac84..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/CrusherFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/CrusherFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/CrusherFrontOn.png deleted file mode 100644 index c00dee83c..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/CrusherFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/CrusherFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/CrusherFrontOn.png.mcmeta deleted file mode 100644 index 24f9c2fae..000000000 --- a/src/main/resources/assets/mekanism/textures/blocks/CrusherFrontOn.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 1 - } -} diff --git a/src/main/resources/assets/mekanism/textures/blocks/DynamicGlass.png b/src/main/resources/assets/mekanism/textures/blocks/DynamicGlass.png new file mode 100644 index 000000000..ef433d55c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/DynamicGlass.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/DynamicTank.png b/src/main/resources/assets/mekanism/textures/blocks/DynamicTank.png new file mode 100644 index 000000000..e6b2a90ec Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/DynamicTank.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/DynamicValve.png b/src/main/resources/assets/mekanism/textures/blocks/DynamicValve.png new file mode 100644 index 000000000..87bb9aec2 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/DynamicValve.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCombiningFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/EliteCombiningFactoryFront.png deleted file mode 100755 index 01fadc417..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/EliteCombiningFactoryFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCombiningFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/EliteCombiningFactoryFrontOn.png deleted file mode 100755 index 9940312a1..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/EliteCombiningFactoryFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCompressingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/EliteCompressingFactoryFront.png deleted file mode 100755 index 23dc2f5f8..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/EliteCompressingFactoryFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCompressingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/EliteCompressingFactoryFrontOn.png deleted file mode 100755 index 393782231..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/EliteCompressingFactoryFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCrushingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/EliteCrushingFactoryFront.png deleted file mode 100755 index f7aec3730..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/EliteCrushingFactoryFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCrushingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/EliteCrushingFactoryFrontOn.png deleted file mode 100755 index d8d39e221..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/EliteCrushingFactoryFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCrushingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/EliteCrushingFactoryFrontOn.png.mcmeta deleted file mode 100755 index 24f9c2fae..000000000 --- a/src/main/resources/assets/mekanism/textures/blocks/EliteCrushingFactoryFrontOn.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 1 - } -} diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteEnrichingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/EliteEnrichingFactoryFront.png deleted file mode 100755 index fcce7ffd4..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/EliteEnrichingFactoryFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteEnrichingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/EliteEnrichingFactoryFrontOn.png deleted file mode 100755 index 949f65acd..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/EliteEnrichingFactoryFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/EliteFactoryBottom.png deleted file mode 100755 index 491eda5ec..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/EliteFactoryBottom.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteInjectingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/EliteInjectingFactoryFront.png deleted file mode 100755 index c9318fc7a..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/EliteInjectingFactoryFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteInjectingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/EliteInjectingFactoryFrontOn.png deleted file mode 100755 index 14b8620e3..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/EliteInjectingFactoryFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ElitePurifyingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/ElitePurifyingFactoryFront.png deleted file mode 100755 index a398bed5d..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ElitePurifyingFactoryFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ElitePurifyingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/ElitePurifyingFactoryFrontOn.png deleted file mode 100755 index 699dfba9f..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ElitePurifyingFactoryFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteSmeltingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/EliteSmeltingFactoryFront.png deleted file mode 100755 index 79a3e269c..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/EliteSmeltingFactoryFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteSmeltingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/EliteSmeltingFactoryFrontOn.png deleted file mode 100755 index ce0f626c2..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/EliteSmeltingFactoryFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/EnergizedSmelterFront.png b/src/main/resources/assets/mekanism/textures/blocks/EnergizedSmelterFront.png deleted file mode 100644 index 187823574..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/EnergizedSmelterFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/EnergizedSmelterFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/EnergizedSmelterFrontOn.png deleted file mode 100644 index 43daa3fc4..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/EnergizedSmelterFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/EnergizedSmelterFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/EnergizedSmelterFrontOn.png.mcmeta deleted file mode 100644 index 24f9c2fae..000000000 --- a/src/main/resources/assets/mekanism/textures/blocks/EnergizedSmelterFrontOn.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 1 - } -} diff --git a/src/main/resources/assets/mekanism/textures/blocks/EnrichmentChamberFront.png b/src/main/resources/assets/mekanism/textures/blocks/EnrichmentChamberFront.png deleted file mode 100644 index 52399c73c..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/EnrichmentChamberFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/GlowPlasticBlock.png b/src/main/resources/assets/mekanism/textures/blocks/GlowPlasticBlock.png old mode 100755 new mode 100644 index 94aac7ed1..c0466e0f7 Binary files a/src/main/resources/assets/mekanism/textures/blocks/GlowPlasticBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/GlowPlasticBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionCasing.png b/src/main/resources/assets/mekanism/textures/blocks/InductionCasing.png deleted file mode 100644 index 0c77c3352..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/InductionCasing.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionCellAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/InductionCellAdvanced.png deleted file mode 100644 index b6f941b70..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/InductionCellAdvanced.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionCellBasic.png b/src/main/resources/assets/mekanism/textures/blocks/InductionCellBasic.png deleted file mode 100644 index 276f98c14..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/InductionCellBasic.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionCellElite.png b/src/main/resources/assets/mekanism/textures/blocks/InductionCellElite.png deleted file mode 100644 index de8df433f..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/InductionCellElite.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionCellUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/InductionCellUltimate.png deleted file mode 100644 index b8dabeda9..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/InductionCellUltimate.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionPortInput.png b/src/main/resources/assets/mekanism/textures/blocks/InductionPortInput.png deleted file mode 100644 index 33d963e11..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/InductionPortInput.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionPortOutput.png b/src/main/resources/assets/mekanism/textures/blocks/InductionPortOutput.png deleted file mode 100644 index ec37dfbca..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/InductionPortOutput.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionProviderAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/InductionProviderAdvanced.png deleted file mode 100644 index 26e530be1..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/InductionProviderAdvanced.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionProviderBasic.png b/src/main/resources/assets/mekanism/textures/blocks/InductionProviderBasic.png deleted file mode 100644 index 9f5581eb0..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/InductionProviderBasic.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionProviderElite.png b/src/main/resources/assets/mekanism/textures/blocks/InductionProviderElite.png deleted file mode 100644 index c393d338f..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/InductionProviderElite.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/InductionProviderUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/InductionProviderUltimate.png deleted file mode 100644 index 998d7ac71..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/InductionProviderUltimate.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/OredictionificatorBack.png b/src/main/resources/assets/mekanism/textures/blocks/OredictionificatorBack.png deleted file mode 100644 index c00b014d8..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/OredictionificatorBack.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/OredictionificatorFront.png b/src/main/resources/assets/mekanism/textures/blocks/OredictionificatorFront.png deleted file mode 100644 index 54b7378ce..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/OredictionificatorFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/OredictionificatorLeft.png b/src/main/resources/assets/mekanism/textures/blocks/OredictionificatorLeft.png deleted file mode 100644 index 7331844d7..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/OredictionificatorLeft.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/OredictionificatorRight.png b/src/main/resources/assets/mekanism/textures/blocks/OredictionificatorRight.png deleted file mode 100644 index 7331844d7..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/OredictionificatorRight.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/OredictionificatorSide.png b/src/main/resources/assets/mekanism/textures/blocks/OredictionificatorSide.png deleted file mode 100644 index 0e8e8c16a..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/OredictionificatorSide.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/OsmiumBlock.png b/src/main/resources/assets/mekanism/textures/blocks/OsmiumBlock.png index bab6ea716..8d9079f85 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/OsmiumBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/OsmiumBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/OsmiumCompressorFront.png b/src/main/resources/assets/mekanism/textures/blocks/OsmiumCompressorFront.png deleted file mode 100644 index 2f52c4143..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/OsmiumCompressorFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/OsmiumCompressorFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/OsmiumCompressorFrontOn.png deleted file mode 100644 index b99d00592..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/OsmiumCompressorFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/OsmiumOre.png b/src/main/resources/assets/mekanism/textures/blocks/OsmiumOre.png index f34b65ccf..000da2834 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/OsmiumOre.png and b/src/main/resources/assets/mekanism/textures/blocks/OsmiumOre.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/PlasticBlock.png b/src/main/resources/assets/mekanism/textures/blocks/PlasticBlock.png old mode 100755 new mode 100644 index 4697f350f..d069e12ba Binary files a/src/main/resources/assets/mekanism/textures/blocks/PlasticBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/PlasticBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/PlasticFence.png b/src/main/resources/assets/mekanism/textures/blocks/PlasticFence.png old mode 100755 new mode 100644 index b339997f5..98eb5cba8 Binary files a/src/main/resources/assets/mekanism/textures/blocks/PlasticFence.png and b/src/main/resources/assets/mekanism/textures/blocks/PlasticFence.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/PrecisionSawmillFront.png b/src/main/resources/assets/mekanism/textures/blocks/PrecisionSawmillFront.png deleted file mode 100644 index bf970210c..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/PrecisionSawmillFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/PrecisionSawmillFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/PrecisionSawmillFrontOn.png deleted file mode 100644 index a3b6dff12..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/PrecisionSawmillFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/PressureDisperser.png b/src/main/resources/assets/mekanism/textures/blocks/PressureDisperser.png index 52cbb4190..76cc38c33 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/PressureDisperser.png and b/src/main/resources/assets/mekanism/textures/blocks/PressureDisperser.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/PurificationChamberFront.png b/src/main/resources/assets/mekanism/textures/blocks/PurificationChamberFront.png deleted file mode 100644 index ce5b7f36b..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/PurificationChamberFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/PurificationChamberFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/PurificationChamberFrontOn.png deleted file mode 100644 index 4e074459b..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/PurificationChamberFrontOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/RefinedGlowstone.png b/src/main/resources/assets/mekanism/textures/blocks/RefinedGlowstone.png index 3e0f657d9..5f6c6fbfa 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/RefinedGlowstone.png and b/src/main/resources/assets/mekanism/textures/blocks/RefinedGlowstone.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/RefinedObsidian.png b/src/main/resources/assets/mekanism/textures/blocks/RefinedObsidian.png index 6bdd7e21b..c83db38f8 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/RefinedObsidian.png and b/src/main/resources/assets/mekanism/textures/blocks/RefinedObsidian.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ReinforcedPlasticBlock.png b/src/main/resources/assets/mekanism/textures/blocks/ReinforcedPlasticBlock.png old mode 100755 new mode 100644 index 1cf648c8c..6b1ca30b0 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ReinforcedPlasticBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/ReinforcedPlasticBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/RoadPlasticBlock.png b/src/main/resources/assets/mekanism/textures/blocks/RoadPlasticBlock.png old mode 100755 new mode 100644 index 3e2207a71..db41e5bd9 Binary files a/src/main/resources/assets/mekanism/textures/blocks/RoadPlasticBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/RoadPlasticBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexSide.png b/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexSide.png index 61b18bac1..21396b781 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexSide.png and b/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexSide.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexTop.png b/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexTop.png index 5b0da1193..066f25a46 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexTop.png and b/src/main/resources/assets/mekanism/textures/blocks/RotationalComplexTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/SalinationBlock.png b/src/main/resources/assets/mekanism/textures/blocks/SalinationBlock.png new file mode 100644 index 000000000..7023484ed Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/SalinationBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/SalinationController.png b/src/main/resources/assets/mekanism/textures/blocks/SalinationController.png new file mode 100644 index 000000000..b0d3b7707 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/SalinationController.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png b/src/main/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png new file mode 100644 index 000000000..aee804efd Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCrushingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png.mcmeta old mode 100755 new mode 100644 similarity index 55% rename from src/main/resources/assets/mekanism/textures/blocks/BasicCrushingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png.mcmeta index 24f9c2fae..efc331201 --- a/src/main/resources/assets/mekanism/textures/blocks/BasicCrushingFactoryFrontOn.png.mcmeta +++ b/src/main/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png.mcmeta @@ -1,5 +1,5 @@ { "animation": { - "frametime": 1 + "frametime": 10 } } diff --git a/src/main/resources/assets/mekanism/textures/blocks/SalinationValve.png b/src/main/resources/assets/mekanism/textures/blocks/SalinationValve.png new file mode 100644 index 000000000..3fd06552d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/SalinationValve.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/SlickPlasticBlock.png b/src/main/resources/assets/mekanism/textures/blocks/SlickPlasticBlock.png old mode 100755 new mode 100644 index 5ae84ba41..0dc7e1d78 Binary files a/src/main/resources/assets/mekanism/textures/blocks/SlickPlasticBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/SlickPlasticBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/SteelBlock.png b/src/main/resources/assets/mekanism/textures/blocks/SteelBlock.png index 0c5f6332d..efa22b797 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/SteelBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/SteelBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/SteelBlock_Oxidized.png b/src/main/resources/assets/mekanism/textures/blocks/SteelBlock_Oxidized.png new file mode 100644 index 000000000..06621f301 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/SteelBlock_Oxidized.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/SteelCasing.png b/src/main/resources/assets/mekanism/textures/blocks/SteelCasing.png index 9e8131df4..c06aba640 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/SteelCasing.png and b/src/main/resources/assets/mekanism/textures/blocks/SteelCasing.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/Teleporter.png b/src/main/resources/assets/mekanism/textures/blocks/Teleporter.png new file mode 100644 index 000000000..46b046fff Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/Teleporter.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/TeleporterFrame.png b/src/main/resources/assets/mekanism/textures/blocks/TeleporterFrame.png new file mode 100644 index 000000000..702e2a971 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/TeleporterFrame.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/TeleporterFront.png b/src/main/resources/assets/mekanism/textures/blocks/TeleporterFront.png new file mode 100644 index 000000000..66e5f8391 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/TeleporterFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/TinBlock.png b/src/main/resources/assets/mekanism/textures/blocks/TinBlock.png index 6fb0c94b5..9f448166b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/TinBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/TinBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/TinOre.png b/src/main/resources/assets/mekanism/textures/blocks/TinOre.png index b8c1c40c8..9afcb4e8f 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/TinOre.png and b/src/main/resources/assets/mekanism/textures/blocks/TinOre.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/TurbineRod.png b/src/main/resources/assets/mekanism/textures/blocks/TurbineRod.png index d9dace097..6aa673b21 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/TurbineRod.png and b/src/main/resources/assets/mekanism/textures/blocks/TurbineRod.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedBack.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedBack.png new file mode 100644 index 000000000..ccb600467 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedBackOn.png new file mode 100644 index 000000000..2d6754afb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedFront.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedFront.png new file mode 100644 index 000000000..01c437258 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedFrontOn.png new file mode 100644 index 000000000..c7b409b9b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedLeft.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedLeft.png new file mode 100644 index 000000000..c8c18fbea Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedLeftOn.png new file mode 100644 index 000000000..8c5afa156 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedRight.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedRight.png new file mode 100644 index 000000000..c8c18fbea Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedRightOn.png new file mode 100644 index 000000000..8c5afa156 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedTop.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedTop.png new file mode 100644 index 000000000..fd9404728 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedTopOn.png new file mode 100644 index 000000000..21f4fd68a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicBack.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicBack.png new file mode 100644 index 000000000..0d03afc27 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicBackOn.png new file mode 100644 index 000000000..15afb0c15 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicBottom.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicBottom.png new file mode 100644 index 000000000..68212fedd Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicFront.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicFront.png new file mode 100644 index 000000000..376899adf Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicFrontOn.png new file mode 100644 index 000000000..ac0facd55 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicLeft.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicLeft.png new file mode 100644 index 000000000..0d56015a3 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicLeftOn.png new file mode 100644 index 000000000..03befa252 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicRight.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicRight.png new file mode 100644 index 000000000..c6e3ba0ad Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicRightOn.png new file mode 100644 index 000000000..5bf26472b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicTop.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicTop.png new file mode 100644 index 000000000..cb06e8fc8 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicTopOn.png new file mode 100644 index 000000000..8edd5ed56 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBasicTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinBottom.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBottom.png new file mode 100644 index 000000000..4efe93153 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteBack.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteBack.png new file mode 100644 index 000000000..5bd02d7f9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteBackOn.png new file mode 100644 index 000000000..098168d61 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteBottom.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteBottom.png new file mode 100644 index 000000000..d8ea11aae Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteFront.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteFront.png new file mode 100644 index 000000000..522bffcad Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteFrontOn.png new file mode 100644 index 000000000..a35622c66 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteLeft.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteLeft.png new file mode 100644 index 000000000..b16df590f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteLeftOn.png new file mode 100644 index 000000000..21c4620b2 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteRight.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteRight.png new file mode 100644 index 000000000..365f0282f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteRightOn.png new file mode 100644 index 000000000..eb4dda1aa Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteTop.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteTop.png new file mode 100644 index 000000000..865418013 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteTopOn.png new file mode 100644 index 000000000..2c1872785 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinEliteTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinFront.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinFront.png new file mode 100644 index 000000000..b5cd970de Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinFrontOn.png new file mode 100644 index 000000000..2b0954a4b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinSide.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinSide.png new file mode 100644 index 000000000..efae5e87b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinSide.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinSideOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinSideOn.png new file mode 100644 index 000000000..74ad4c7c2 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinSideOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinTop.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinTop.png new file mode 100644 index 000000000..e2e169c64 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinTopOn.png new file mode 100644 index 000000000..336856eb4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateBack.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateBack.png new file mode 100644 index 000000000..15de08102 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateBackOn.png new file mode 100644 index 000000000..710762e9c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateBottom.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateBottom.png new file mode 100644 index 000000000..9e60da107 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateFront.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateFront.png new file mode 100644 index 000000000..d8159e9a9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateFrontOn.png new file mode 100644 index 000000000..6ea785b1c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateLeft.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateLeft.png new file mode 100644 index 000000000..7aff84f02 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateLeftOn.png new file mode 100644 index 000000000..b3145ad9b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateRight.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateRight.png new file mode 100644 index 000000000..8ad8c32c9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateRightOn.png new file mode 100644 index 000000000..fb80dadd4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateTop.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateTop.png new file mode 100644 index 000000000..e8407488f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateTopOn.png new file mode 100644 index 000000000..7d30ada21 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/bin/BinUltimateTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberBack.png b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberBack.png new file mode 100644 index 000000000..c1384cfdf Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberBackOn.png new file mode 100644 index 000000000..43ddfdde2 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberBottom.png b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberBottom.png new file mode 100644 index 000000000..b0d6a0785 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFront.png b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFront.png new file mode 100644 index 000000000..1f9c64cc8 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFrontOn.png new file mode 100644 index 000000000..7e48f708d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ChemicalInjectionChamberFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ChemicalInjectionChamberFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberLeft.png b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberLeft.png new file mode 100644 index 000000000..8e5622b69 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberLeftOn.png new file mode 100644 index 000000000..f27a1fc2d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberRight.png b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberRight.png new file mode 100644 index 000000000..7c6fb4f16 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberRightOn.png new file mode 100644 index 000000000..7faf82984 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberTop.png b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberTop.png new file mode 100644 index 000000000..adcdb406d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberTopOn.png new file mode 100644 index 000000000..1f1cca056 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/chemical_injection_chamber/ChemicalInjectionChamberTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerBack.png b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerBack.png new file mode 100644 index 000000000..90acd0d53 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerBack_alt.png b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerBack_alt.png new file mode 100644 index 000000000..408ea8bbe Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerBack_alt.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerBottom.png b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerBottom.png new file mode 100644 index 000000000..6c7dd2f79 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerFront.png b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerFront.png new file mode 100644 index 000000000..d2796d325 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/CombinerFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/CombinerFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/CombinerFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/CombinerFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerLeft.png b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerLeft.png new file mode 100644 index 000000000..72e256b56 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerRight.png b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerRight.png new file mode 100644 index 000000000..a2a584b11 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerTop.png b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerTop.png new file mode 100644 index 000000000..647b2369a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/combiner/CombinerTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherBack.png b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherBack.png new file mode 100644 index 000000000..0b09c353c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherBackOn.png new file mode 100644 index 000000000..52614740b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFront.png b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFront.png new file mode 100644 index 000000000..228cd7b66 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFrontOn.png new file mode 100644 index 000000000..83899b29b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFrontOn.png.mcmeta new file mode 100644 index 000000000..1a6cca1a1 --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherFrontOn.png.mcmeta @@ -0,0 +1,25 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 10, + 7, + 4, + 1, + 0, + 0 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherLeft.png b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherLeft.png new file mode 100644 index 000000000..fbf95c891 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherLeftOn.png new file mode 100644 index 000000000..26ee67e97 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherLeftOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherLeftOn.png.mcmeta new file mode 100644 index 000000000..1a6cca1a1 --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherLeftOn.png.mcmeta @@ -0,0 +1,25 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 10, + 7, + 4, + 1, + 0, + 0 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherRight.png b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherRight.png new file mode 100644 index 000000000..783ce363d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherRightOn.png new file mode 100644 index 000000000..2f93956d4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherRightOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherRightOn.png.mcmeta new file mode 100644 index 000000000..1a6cca1a1 --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherRightOn.png.mcmeta @@ -0,0 +1,25 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 10, + 7, + 4, + 1, + 0, + 0 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherTop.png b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherTop.png new file mode 100644 index 000000000..df9e53700 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherTopOn.png new file mode 100644 index 000000000..d5001a8b3 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/crusher/CrusherTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerCasing-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerCasing-ctm.png index 352d7b87b..3c320e931 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerCasing-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerCasing-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerCasing.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerCasing.png index a341a84e9..22813942f 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerCasing.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerCasing.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerValve-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerValve-ctm.png index 51847a899..0e87bfe6b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerValve-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerValve-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerValve.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerValve.png index f60ee83dd..36887dcdd 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerValve.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerValve.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicGlass-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicGlass-ctm.png new file mode 100644 index 000000000..eff82ab17 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicGlass-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicGlass.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicGlass.png new file mode 100644 index 000000000..ef433d55c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicGlass.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicTank-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicTank-ctm.png index af7e4bd8c..c48db523d 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicTank-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicTank-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicTank.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicTank.png index ca24627d3..e6b2a90ec 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicTank.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicTank.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicValve-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicValve-ctm.png index 4a0a66be7..b95385a31 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicValve-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicValve-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicValve.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicValve.png index b053a882c..87bb9aec2 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicValve.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicValve.png differ 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 index 47ce61b38..173bbd33a 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ElectromagneticCoil-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ElectromagneticCoil-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ElectromagneticCoil.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ElectromagneticCoil.png index 891d9d03d..4bbdd474c 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ElectromagneticCoil.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ElectromagneticCoil.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCasing-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCasing-ctm.png index 186329393..c1340397b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCasing-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCasing-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCasing.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCasing.png index 0c77c3352..63e00e420 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCasing.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCasing.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellAdvanced-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellAdvanced-ctm.png index a0e1e680c..d373f107c 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellAdvanced-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellAdvanced-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellAdvanced.png index 08fc0f970..fc6df4d0a 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellAdvanced.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellBasic-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellBasic-ctm.png index 478fc81e8..622304ac0 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellBasic-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellBasic-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellBasic.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellBasic.png index bf4768016..7f791ad37 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellBasic.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellElite-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellElite-ctm.png index fd7c9bfd7..69a386b4d 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellElite-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellElite-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellElite.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellElite.png index bd200172f..d3c9bf197 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellElite.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellUltimate-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellUltimate-ctm.png index 2bcd2cca0..ecf471073 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellUltimate-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellUltimate-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellUltimate.png index 0c94b1765..f40e8809b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellUltimate.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortInput-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortInput-ctm.png index 95bde973d..baed4d2b3 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortInput-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortInput-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortInput.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortInput.png index 33d963e11..0bf461e7a 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortInput.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortInput.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortOutput-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortOutput-ctm.png index a4a60289d..5fd63b20b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortOutput-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortOutput-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortOutput.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortOutput.png index ec37dfbca..6fcd4e85a 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortOutput.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortOutput.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderAdvanced-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderAdvanced-ctm.png index a12f4de73..7dafbec5d 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderAdvanced-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderAdvanced-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderAdvanced.png index 5efc46f89..933486817 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderAdvanced.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderBasic-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderBasic-ctm.png index 4b9941e52..7d2dccfee 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderBasic-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderBasic-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderBasic.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderBasic.png index ff67ea7d3..071c3210b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderBasic.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderElite-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderElite-ctm.png index ca5964252..40f7c4400 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderElite-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderElite-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderElite.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderElite.png index 24809cb5b..cdb676869 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderElite.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderUltimate-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderUltimate-ctm.png index 73716350e..8b72a1718 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderUltimate-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderUltimate-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderUltimate.png index 10ba4afda..c637d6d44 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderUltimate.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff-ctm.png index 88d2e4769..2b0a07139 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff-ctm_Alt.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff-ctm_Alt.png new file mode 100644 index 000000000..4c7fd5d53 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff-ctm_Alt.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff.png index 2aa4295d1..853e63053 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn-ctm.png index e628b87f7..06e6ac08d 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn-ctm_Alt.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn-ctm_Alt.png new file mode 100644 index 000000000..2e3f80eaa Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn-ctm_Alt.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn.png index 21274e180..955a0feac 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn_Alt.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn_Alt.png new file mode 100644 index 000000000..64591b932 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn_Alt.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorFrame-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorFrame-ctm.png index ae572cfda..b20bf91c0 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorFrame-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorFrame-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorFrame.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorFrame.png index aa259c269..e297510bc 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorFrame.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorFrame.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorGlass-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorGlass-ctm.png index cd001c80c..1c15e5fe6 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorGlass-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorGlass-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorGlass.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorGlass.png index 5f1c34c34..41cbacb46 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorGlass.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorGlass.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLaserFocus-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLaserFocus-ctm.png index c709af2d5..ae69bdd3b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLaserFocus-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLaserFocus-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLaserFocus.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLaserFocus.png index 588343a8d..d999e8f6e 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLaserFocus.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLaserFocus.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLogicAdapter-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLogicAdapter-ctm.png index aba84ffe8..967b527f7 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLogicAdapter-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLogicAdapter-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLogicAdapter.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLogicAdapter.png index d230f9811..1ed63f580 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLogicAdapter.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLogicAdapter.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorNeutronCapture-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorNeutronCapture-ctm.png index a6bdb0556..db6450a23 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorNeutronCapture-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorNeutronCapture-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorNeutronCapture.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorNeutronCapture.png index addde92a3..5236dc6fe 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorNeutronCapture.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorNeutronCapture.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort-ctm.png index dd24a1ce3..128faeb3e 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort.png index cc6294ea3..373b8c12a 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/StructuralGlass-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/StructuralGlass-ctm.png index 2af4a6fdc..eff82ab17 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/StructuralGlass-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/StructuralGlass-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/StructuralGlass.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/StructuralGlass.png index 938ca1ee7..ef433d55c 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/StructuralGlass.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/StructuralGlass.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElement-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElement-ctm.png index bf1b62c73..eac413c4a 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElement-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElement-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElement.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElement.png index 1c629e326..0831aa3a4 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElement.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElement.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElementOn-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElementOn-ctm.png new file mode 100644 index 000000000..4a24dd788 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElementOn-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElementOn.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElementOn.png new file mode 100644 index 000000000..2fe59941b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElementOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/Teleporter-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/Teleporter-ctm.png index a566d58bd..365fac6f4 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/Teleporter-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/Teleporter-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/Teleporter.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/Teleporter.png index df6735bd6..f5d08dd55 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/Teleporter.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/Teleporter.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TeleporterFrame-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/TeleporterFrame-ctm.png index 32ccddb08..2eada217b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/TeleporterFrame-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/TeleporterFrame-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TeleporterFrame.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/TeleporterFrame.png index f9a21f566..fac94b34c 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/TeleporterFrame.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/TeleporterFrame.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationBlock-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationBlock-ctm.png index 91611254d..957773472 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationBlock-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationBlock-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationBlock.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationBlock.png index a878432cc..f6d3ed137 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationBlock.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationBlock.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationController-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationController-ctm.png index 656d7b08e..c6b92e3ac 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationController-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationController-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationController.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationController.png index fe0d60a55..131a9d895 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationController.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationController.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationControllerOn-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationControllerOn-ctm.png index dcac3a98a..a3a1c8a38 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationControllerOn-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationControllerOn-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationControllerOn.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationControllerOn.png index c37aea836..618b975c3 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationControllerOn.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationControllerOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationValve-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationValve-ctm.png index 63d14d953..3d13b7f14 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationValve-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationValve-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationValve.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationValve.png index b4a22621a..f1157d106 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationValve.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationValve.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing-ctm.png index 58a8410be..f9da48d96 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing.png index be7474646..06215c275 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve-ctm.png index 53999ae47..406b2a822 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve.png index f7f956737..09d1ae1a8 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent-ctm.png index 358dee714..241d8645a 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent-ctm.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent-ctm.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent.png index e522259ef..664a34cc9 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent.png and b/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBack.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBack.png new file mode 100644 index 000000000..379977b21 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBackOn.png new file mode 100644 index 000000000..90e8ebf3c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBottom.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBottom.png new file mode 100644 index 000000000..d11f241b5 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBottomOn.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBottomOn.png new file mode 100644 index 000000000..19bfac300 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterBottomOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFront.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFront.png new file mode 100644 index 000000000..634e80810 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFrontOn.png new file mode 100644 index 000000000..ac958981e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFrontOn.png.mcmeta new file mode 100644 index 000000000..9521044fa --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterFrontOn.png.mcmeta @@ -0,0 +1,17 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 3, + 4, + 6, + 5, + 2, + 3, + 1, + 2 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterLeft.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterLeft.png new file mode 100644 index 000000000..0e61f010b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterLeftOn.png new file mode 100644 index 000000000..a8cf0d7d9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterRight.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterRight.png new file mode 100644 index 000000000..0bf673d2b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterRightOn.png new file mode 100644 index 000000000..e43f5f548 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterTop.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterTop.png new file mode 100644 index 000000000..7a9cf711e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterTopOn.png new file mode 100644 index 000000000..0091f9a0f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/energized_smelter/EnergizedSmelterTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberBack.png b/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberBack.png new file mode 100644 index 000000000..497569ae0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberFront.png b/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberFront.png new file mode 100644 index 000000000..1fcb331b0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/EnrichmentChamberFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberFrontOn.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EnrichmentChamberFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberFrontOn.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberLeft.png b/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberLeft.png new file mode 100644 index 000000000..2d3c33fd4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberRight.png b/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberRight.png new file mode 100644 index 000000000..07f57751c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberTop.png b/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberTop.png new file mode 100644 index 000000000..1db9426c6 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/enrichment_chamber/EnrichmentChamberTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryBottom.png new file mode 100644 index 000000000..5e75b07d0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedFactorySide.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactorySide.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedFactorySide.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactorySide.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryTop.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedFactoryTop.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/AdvancedFactoryTop.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryBack.png new file mode 100644 index 000000000..1c1781b82 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryBackOn.png new file mode 100644 index 000000000..5b948574d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFront.png new file mode 100644 index 000000000..4cb1136ba Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFrontOn.png new file mode 100644 index 000000000..db1a5b9b4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCombiningFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFrontOn.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedCombiningFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryLeft.png new file mode 100644 index 000000000..0688d4320 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryLeftOn.png new file mode 100644 index 000000000..69ce87a37 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryRight.png new file mode 100644 index 000000000..b02e0ab96 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryRightOn.png new file mode 100644 index 000000000..3e164fee0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryTop.png new file mode 100644 index 000000000..a5202047d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryTopOn.png new file mode 100644 index 000000000..af7954833 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/combining/AdvancedCombiningFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryBack.png new file mode 100644 index 000000000..a7367b519 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryBackOn.png new file mode 100644 index 000000000..4fd1bcf5a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFront.png new file mode 100644 index 000000000..d11930ac7 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFrontOn.png new file mode 100644 index 000000000..c82c39841 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCompressingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFrontOn.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedCompressingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryLeft.png new file mode 100644 index 000000000..7133b36aa Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryLeftOn.png new file mode 100644 index 000000000..953f07aa9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryRight.png new file mode 100644 index 000000000..2b0eabfd0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryRightOn.png new file mode 100644 index 000000000..e83f1a7e1 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryTop.png new file mode 100644 index 000000000..408502297 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryTopOn.png new file mode 100644 index 000000000..82186ede8 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/compressing/AdvancedCompressingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryBack.png new file mode 100644 index 000000000..bf0fdc41c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryBackOn.png new file mode 100644 index 000000000..c3cf8eb8d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFront.png new file mode 100644 index 000000000..4025cd6a6 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFrontOn.png new file mode 100644 index 000000000..3cbd3b35d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFrontOn.png.mcmeta new file mode 100644 index 000000000..1a6cca1a1 --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryFrontOn.png.mcmeta @@ -0,0 +1,25 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 10, + 7, + 4, + 1, + 0, + 0 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryLeft.png new file mode 100644 index 000000000..4c6adcf88 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryLeftOn.png new file mode 100644 index 000000000..3ed6e4094 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryLeftOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryLeftOn.png.mcmeta new file mode 100644 index 000000000..1a6cca1a1 --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryLeftOn.png.mcmeta @@ -0,0 +1,25 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 10, + 7, + 4, + 1, + 0, + 0 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryRight.png new file mode 100644 index 000000000..15c65911f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryRightOn.png new file mode 100644 index 000000000..55d7c64ee Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryRightOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryRightOn.png.mcmeta new file mode 100644 index 000000000..1a6cca1a1 --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryRightOn.png.mcmeta @@ -0,0 +1,25 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 10, + 7, + 4, + 1, + 0, + 0 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryTop.png new file mode 100644 index 000000000..2402cf1a6 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryTopOn.png new file mode 100644 index 000000000..789f27e58 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/crushing/AdvancedCrushingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryBack.png new file mode 100644 index 000000000..fc1287abb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryBackOn.png new file mode 100644 index 000000000..eb09555d0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFront.png new file mode 100644 index 000000000..c0dca5ad3 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFrontOn.png new file mode 100644 index 000000000..4ce0599aa Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryLeft.png new file mode 100644 index 000000000..0456f2b19 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryLeftOn.png new file mode 100644 index 000000000..778ef33ca Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryRight.png new file mode 100644 index 000000000..dade2ec6a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryRightOn.png new file mode 100644 index 000000000..e796902fb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryTop.png new file mode 100644 index 000000000..3f1dde5d0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryTopOn.png new file mode 100644 index 000000000..489098b78 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/enriching/AdvancedEnrichingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBack.png new file mode 100644 index 000000000..be9726255 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBackOn.png new file mode 100644 index 000000000..3ff955db2 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBottom.png new file mode 100644 index 000000000..5b83ac09f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryFront.png new file mode 100644 index 000000000..25ce72df5 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryFrontOn.png new file mode 100644 index 000000000..a5476b612 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryLeft.png new file mode 100644 index 000000000..61b1d7a0d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryLeftOn.png new file mode 100644 index 000000000..03df32446 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryRight.png new file mode 100644 index 000000000..515c883f6 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryRightOn.png new file mode 100644 index 000000000..6f871a706 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryTop.png new file mode 100644 index 000000000..9f04b0b0f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryTopOn.png new file mode 100644 index 000000000..6f7cbd02a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/infusing/AdvancedInfusingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryBack.png new file mode 100644 index 000000000..5983b66a2 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryBackOn.png new file mode 100644 index 000000000..ed8a8438f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryFront.png new file mode 100644 index 000000000..c8a726411 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryFrontOn.png new file mode 100644 index 000000000..8e34732b3 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryLeft.png new file mode 100644 index 000000000..8f08b1999 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryLeftOn.png new file mode 100644 index 000000000..9ef9e847b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryRight.png new file mode 100644 index 000000000..0c162ff5e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryRightOn.png new file mode 100644 index 000000000..83ff48c4f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryTop.png new file mode 100644 index 000000000..df549383c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryTopOn.png new file mode 100644 index 000000000..92e9014bd Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/injecting/AdvancedInjectingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryBack.png new file mode 100644 index 000000000..eaaa0afc1 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryBackOn.png new file mode 100644 index 000000000..20d26dc02 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryFront.png new file mode 100644 index 000000000..c48a5af2c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryFrontOn.png new file mode 100644 index 000000000..8739a94e0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryLeft.png new file mode 100644 index 000000000..b9e2a0eea Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryLeftOn.png new file mode 100644 index 000000000..64615556c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryRight.png new file mode 100644 index 000000000..03f9ff2bc Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryRightOn.png new file mode 100644 index 000000000..9fa82c0d1 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryTop.png new file mode 100644 index 000000000..57b7cbd39 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryTopOn.png new file mode 100644 index 000000000..2ab44a59c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/purifying/AdvancedPurifyingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryBack.png new file mode 100644 index 000000000..32aa039cc Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryBackOn.png new file mode 100644 index 000000000..864b081c5 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFront.png new file mode 100644 index 000000000..1aa2b828a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFrontOn.png new file mode 100644 index 000000000..7d5402378 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedSmeltingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFrontOn.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedSmeltingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryLeft.png new file mode 100644 index 000000000..03871d142 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryLeftOn.png new file mode 100644 index 000000000..fbb4dda78 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryRight.png new file mode 100644 index 000000000..3530d118d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryRightOn.png new file mode 100644 index 000000000..9c69ea1e9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryTop.png new file mode 100644 index 000000000..b6c582b76 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryTopOn.png new file mode 100644 index 000000000..515c3effd Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/advanced/smelting/AdvancedSmeltingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryBottom.png new file mode 100644 index 000000000..5e75b07d0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicFactorySide.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactorySide.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicFactorySide.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactorySide.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryTop.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicFactoryTop.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/BasicFactoryTop.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryBack.png new file mode 100644 index 000000000..fdd782204 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryBackOn.png new file mode 100644 index 000000000..2dd75fbea Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFront.png new file mode 100644 index 000000000..417d6ae5d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFrontOn.png new file mode 100644 index 000000000..96fbe1520 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCombiningFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFrontOn.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicCombiningFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryLeft.png new file mode 100644 index 000000000..cbb946b73 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryLeftOn.png new file mode 100644 index 000000000..e938a93da Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryRight.png new file mode 100644 index 000000000..773e79e96 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryRightOn.png new file mode 100644 index 000000000..1fe335ebd Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryTop.png new file mode 100644 index 000000000..88cc06aef Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryTopOn.png new file mode 100644 index 000000000..4ec82faef Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/combining/BasicCombiningFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryBack.png new file mode 100644 index 000000000..757cc7c6d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryBackOn.png new file mode 100644 index 000000000..4599ecae2 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFront.png new file mode 100644 index 000000000..13049268a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFrontOn.png new file mode 100644 index 000000000..ce420b655 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicCompressingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFrontOn.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicCompressingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryLeft.png new file mode 100644 index 000000000..de0295891 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryLeftOn.png new file mode 100644 index 000000000..727999114 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryRight.png new file mode 100644 index 000000000..8a3e26ddb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryRightOn.png new file mode 100644 index 000000000..a0671c12e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryTop.png new file mode 100644 index 000000000..2a6a8a04b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryTopOn.png new file mode 100644 index 000000000..5051451a4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/compressing/BasicCompressingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryBack.png new file mode 100644 index 000000000..6b16e65bb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryBackOn.png new file mode 100644 index 000000000..24a1c552b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFront.png new file mode 100644 index 000000000..78fe9ed21 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFrontOn.png new file mode 100644 index 000000000..4e7e7a2f1 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFrontOn.png.mcmeta new file mode 100644 index 000000000..1a6cca1a1 --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryFrontOn.png.mcmeta @@ -0,0 +1,25 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 10, + 7, + 4, + 1, + 0, + 0 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryLeft.png new file mode 100644 index 000000000..e318b7ce8 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryLeftOn.png new file mode 100644 index 000000000..1277ae928 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryLeftOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryLeftOn.png.mcmeta new file mode 100644 index 000000000..1a6cca1a1 --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryLeftOn.png.mcmeta @@ -0,0 +1,25 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 10, + 7, + 4, + 1, + 0, + 0 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryRight.png new file mode 100644 index 000000000..633ffb727 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryRightOn.png new file mode 100644 index 000000000..efe053ac1 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryRightOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryRightOn.png.mcmeta new file mode 100644 index 000000000..1a6cca1a1 --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryRightOn.png.mcmeta @@ -0,0 +1,25 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 10, + 7, + 4, + 1, + 0, + 0 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryTop.png new file mode 100644 index 000000000..f0ec6afa3 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryTopOn.png new file mode 100644 index 000000000..1ed032c25 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/crushing/BasicCrushingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryBack.png new file mode 100644 index 000000000..600d535f4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryBackOn.png new file mode 100644 index 000000000..81dfcd81c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryFront.png new file mode 100644 index 000000000..b65ca5ecb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryFrontOn.png new file mode 100644 index 000000000..952cf76d0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryLeft.png new file mode 100644 index 000000000..a96baa566 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryLeftOn.png new file mode 100644 index 000000000..b5874a258 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryRight.png new file mode 100644 index 000000000..66d460e80 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryRightOn.png new file mode 100644 index 000000000..b22146e8f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryTop.png new file mode 100644 index 000000000..3fd2d0f4f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryTopOn.png new file mode 100644 index 000000000..5af24e0d4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/enriching/BasicEnrichingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBack.png new file mode 100644 index 000000000..cdc26a1b1 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBackOn.png new file mode 100644 index 000000000..41489c143 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBottom.png new file mode 100644 index 000000000..90b8520fc Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryFront.png new file mode 100644 index 000000000..fe77845fa Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryFrontOn.png new file mode 100644 index 000000000..4b7889031 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryLeft.png new file mode 100644 index 000000000..4e38bd3dd Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryLeftOn.png new file mode 100644 index 000000000..21daebf3e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryRight.png new file mode 100644 index 000000000..dfe0c0bfa Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryRightOn.png new file mode 100644 index 000000000..f5ed9f3ba Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryTop.png new file mode 100644 index 000000000..d6859dc7d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryTopOn.png new file mode 100644 index 000000000..b7e81c79d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/infusing/BasicInfusingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryBack.png new file mode 100644 index 000000000..8d6741a58 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryBackOn.png new file mode 100644 index 000000000..d00dbd62e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryBottom.png new file mode 100644 index 000000000..4a1079806 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryFront.png new file mode 100644 index 000000000..0e05757b1 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryFrontOn.png new file mode 100644 index 000000000..dbf628bc3 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryLeft.png new file mode 100644 index 000000000..7c1635164 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryLeftOn.png new file mode 100644 index 000000000..9287374e6 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryRight.png new file mode 100644 index 000000000..53f47ef79 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryRightOn.png new file mode 100644 index 000000000..0920121f3 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryTop.png new file mode 100644 index 000000000..cb2a18605 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryTopOn.png new file mode 100644 index 000000000..561d76b92 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/injecting/BasicInjectingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryBack.png new file mode 100644 index 000000000..bd2b058ed Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryBackOn.png new file mode 100644 index 000000000..39e5a0908 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryFront.png new file mode 100644 index 000000000..fc4c1a5ad Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryFrontOn.png new file mode 100644 index 000000000..7a7238487 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryLeft.png new file mode 100644 index 000000000..dad7361bf Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryLeftOn.png new file mode 100644 index 000000000..4d15a0f89 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryRight.png new file mode 100644 index 000000000..dd2c9645b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryRightOn.png new file mode 100644 index 000000000..4bd383294 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryTop.png new file mode 100644 index 000000000..e474812a1 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryTopOn.png new file mode 100644 index 000000000..78c6795d0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/purifying/BasicPurifyingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryBack.png new file mode 100644 index 000000000..84e064fb3 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryBackOn.png new file mode 100644 index 000000000..b90a2b5d3 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFront.png new file mode 100644 index 000000000..ffd049709 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFrontOn.png new file mode 100644 index 000000000..35ce245a8 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicSmeltingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFrontOn.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/BasicSmeltingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryLeft.png new file mode 100644 index 000000000..8137ff34d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryLeftOn.png new file mode 100644 index 000000000..48a083fcc Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryRight.png new file mode 100644 index 000000000..c2276bb2c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryRightOn.png new file mode 100644 index 000000000..f888fa57f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryTop.png new file mode 100644 index 000000000..95b9a7bb6 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryTopOn.png new file mode 100644 index 000000000..c2385d08f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/basic/smelting/BasicSmeltingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryBottom.png new file mode 100644 index 000000000..5e75b07d0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryFront.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteFactoryFront.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryFront.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteFactorySide.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactorySide.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteFactorySide.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactorySide.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryTop.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteFactoryTop.png rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/EliteFactoryTop.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryBack.png new file mode 100644 index 000000000..ad5b42e92 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryBackOn.png new file mode 100644 index 000000000..dd1517e1f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFront.png new file mode 100644 index 000000000..dc105a83b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFrontOn.png new file mode 100644 index 000000000..058e483bb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCombiningFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFrontOn.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteCombiningFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryLeft.png new file mode 100644 index 000000000..352b9f648 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryLeftOn.png new file mode 100644 index 000000000..176b43459 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryRight.png new file mode 100644 index 000000000..61601fd49 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryRightOn.png new file mode 100644 index 000000000..0245d32a1 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryTop.png new file mode 100644 index 000000000..4ecafc799 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryTopOn.png new file mode 100644 index 000000000..8914dd001 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/combining/EliteCombiningFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryBack.png new file mode 100644 index 000000000..362a6bb0e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryBackOn.png new file mode 100644 index 000000000..86d08910b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFront.png new file mode 100644 index 000000000..c0747008e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFrontOn.png new file mode 100644 index 000000000..88e66499c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteCompressingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFrontOn.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteCompressingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryLeft.png new file mode 100644 index 000000000..89b9afd2e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryLeftOn.png new file mode 100644 index 000000000..81b14b09d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryRight.png new file mode 100644 index 000000000..1bf559129 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryRightOn.png new file mode 100644 index 000000000..4b21aabad Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryTop.png new file mode 100644 index 000000000..d444e147e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryTopOn.png new file mode 100644 index 000000000..e887d101d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/compressing/EliteCompressingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryBack.png new file mode 100644 index 000000000..c2bb8ff7e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryBackOn.png new file mode 100644 index 000000000..ebf8057ec Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFront.png new file mode 100644 index 000000000..dcada5c61 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFrontOn.png new file mode 100644 index 000000000..601753b4d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFrontOn.png.mcmeta new file mode 100644 index 000000000..1a6cca1a1 --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryFrontOn.png.mcmeta @@ -0,0 +1,25 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 10, + 7, + 4, + 1, + 0, + 0 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryLeft.png new file mode 100644 index 000000000..0a125e738 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryLeftOn.png new file mode 100644 index 000000000..1f96e3e3b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryLeftOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryLeftOn.png.mcmeta new file mode 100644 index 000000000..1a6cca1a1 --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryLeftOn.png.mcmeta @@ -0,0 +1,25 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 10, + 7, + 4, + 1, + 0, + 0 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryRight.png new file mode 100644 index 000000000..6f9a6af84 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryRightOn.png new file mode 100644 index 000000000..733bbab69 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryRightOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryRightOn.png.mcmeta new file mode 100644 index 000000000..1a6cca1a1 --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryRightOn.png.mcmeta @@ -0,0 +1,25 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 10, + 7, + 4, + 1, + 0, + 0 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryTop.png new file mode 100644 index 000000000..e989c1109 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryTopOn.png new file mode 100644 index 000000000..92065865d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/crushing/EliteCrushingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryBack.png new file mode 100644 index 000000000..36e2685e9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryBackOn.png new file mode 100644 index 000000000..b05e68876 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryFront.png new file mode 100644 index 000000000..cc6862231 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryFrontOn.png new file mode 100644 index 000000000..abdc774f1 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryLeft.png new file mode 100644 index 000000000..dcf1c5bed Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryLeftOn.png new file mode 100644 index 000000000..e148591e4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryRight.png new file mode 100644 index 000000000..277099a35 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryRightOn.png new file mode 100644 index 000000000..8b53f1479 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryTop.png new file mode 100644 index 000000000..4ed9e8bb9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryTopOn.png new file mode 100644 index 000000000..848934d6a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/enriching/EliteEnrichingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryBack.png new file mode 100644 index 000000000..68e9dbddb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryBackOn.png new file mode 100644 index 000000000..e61123ceb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryFront.png new file mode 100644 index 000000000..68631438a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryFrontOn.png new file mode 100644 index 000000000..43603331e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryLeft.png new file mode 100644 index 000000000..980fb263b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryLeftOn.png new file mode 100644 index 000000000..874ac9020 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryRight.png new file mode 100644 index 000000000..126a658b9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryRightOn.png new file mode 100644 index 000000000..fc5167429 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryTop.png new file mode 100644 index 000000000..567883b07 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryTopOn.png new file mode 100644 index 000000000..9a140950d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/infusing/EliteInfusingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryBack.png new file mode 100644 index 000000000..171f36fe4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryBackOn.png new file mode 100644 index 000000000..6a6d9ea6a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryFront.png new file mode 100644 index 000000000..01ad9a198 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryFrontOn.png new file mode 100644 index 000000000..c4d1b48f9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryLeft.png new file mode 100644 index 000000000..480468466 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryLeftOn.png new file mode 100644 index 000000000..80675327e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryRight.png new file mode 100644 index 000000000..92043ce27 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryRightOn.png new file mode 100644 index 000000000..f7a5739fa Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryTop.png new file mode 100644 index 000000000..b153fbd9b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryTopOn.png new file mode 100644 index 000000000..4c97664ea Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/injecting/EliteInjectingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryBack.png new file mode 100644 index 000000000..12f36c044 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryBackOn.png new file mode 100644 index 000000000..ce7304ecb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryFront.png new file mode 100644 index 000000000..4f707c429 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryFrontOn.png new file mode 100644 index 000000000..770505067 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryLeft.png new file mode 100644 index 000000000..b0ca863f2 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryLeftOn.png new file mode 100644 index 000000000..28d1f63fc Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryRight.png new file mode 100644 index 000000000..6275341ce Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryRightOn.png new file mode 100644 index 000000000..0be95632e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryTop.png new file mode 100644 index 000000000..89022eb38 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryTopOn.png new file mode 100644 index 000000000..fa2ffe7a0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/purifying/ElitePurifyingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryBack.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryBack.png new file mode 100644 index 000000000..626e3a7de Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryBackOn.png new file mode 100644 index 000000000..3c35deced Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFront.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFront.png new file mode 100644 index 000000000..3946c1147 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFrontOn.png new file mode 100644 index 000000000..b21eb883c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteSmeltingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFrontOn.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/EliteSmeltingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryLeft.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryLeft.png new file mode 100644 index 000000000..b58ddb09d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryLeftOn.png new file mode 100644 index 000000000..8ec168e0d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryRight.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryRight.png new file mode 100644 index 000000000..ad0362eaa Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryRightOn.png new file mode 100644 index 000000000..c746b33bb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryTop.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryTop.png new file mode 100644 index 000000000..0e40eb9f0 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryTopOn.png new file mode 100644 index 000000000..b21f7003c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/factory/elite/smelting/EliteSmeltingFactoryTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorBack.png b/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorBack.png new file mode 100644 index 000000000..3e773c5ff Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorBottom.png b/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorBottom.png new file mode 100644 index 000000000..09c3ae6e5 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorFront.png b/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorFront.png new file mode 100644 index 000000000..bcd24ccbc Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorLeft.png b/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorLeft.png new file mode 100644 index 000000000..d9153af6e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorRight.png b/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorRight.png new file mode 100644 index 000000000..4da4a8e2d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorTop.png b/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorTop.png new file mode 100644 index 000000000..963221376 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/formulaic_assemblicator/FormulaicAssemblicatorTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterBack.png similarity index 57% rename from src/main/resources/assets/mekanism/textures/blocks/BinAdvancedTopOn.png rename to src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterBack.png index 3cd450e72..b79321573 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedTopOn.png and b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterBackOn.png new file mode 100644 index 000000000..03a47c31c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterBottom.png b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterBottom.png new file mode 100644 index 000000000..0b708352e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterBottomOn.png b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterBottomOn.png new file mode 100644 index 000000000..6c2b0ee86 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterBottomOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterFront.png similarity index 57% rename from src/main/resources/assets/mekanism/textures/blocks/BinAdvancedFrontOn.png rename to src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterFront.png index a776eab8b..b79321573 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/BinAdvancedFrontOn.png and b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterFrontOn.png new file mode 100644 index 000000000..03a47c31c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterLeft.png b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterLeft.png new file mode 100644 index 000000000..c7ecfd568 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterLeftOn.png new file mode 100644 index 000000000..4c5449809 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterRight.png b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterRight.png new file mode 100644 index 000000000..d3df11551 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterRightOn.png new file mode 100644 index 000000000..50a6df496 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterTop.png b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterTop.png new file mode 100644 index 000000000..f9ecff1ba Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterTopOn.png new file mode 100644 index 000000000..4106bd614 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/fuelwood_heater/FuelwoodHeaterTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidBrine.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidBrine.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidBrine.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidBrine.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidBrine.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidBrine.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidBrine.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidBrine.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidChlorine.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidChlorine.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidChlorine.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidChlorine.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidChlorine.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidChlorine.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidChlorine.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidChlorine.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidCleanOre.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidCleanOre.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidCleanOre.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidCleanOre.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidCleanOre.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidCleanOre.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidCleanOre.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidCleanOre.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidDT.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidDT.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidDT.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidDT.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidDT.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidDT.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidDT.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidDT.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidDeuterium.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidDeuterium.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidDeuterium.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidDeuterium.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidDeuterium.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidDeuterium.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidDeuterium.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidDeuterium.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidEnergy.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEnergy.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidEnergy.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEnergy.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidEnergy.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEnergy.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidEnergy.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEnergy.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidEnergyStatic.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEnergyStatic.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidEnergyStatic.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEnergyStatic.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidEthene.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEthene.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidEthene.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEthene.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidEthene.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEthene.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidEthene.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidEthene.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidHeat.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHeat.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidHeat.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHeat.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidHeat.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHeat.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidHeat.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHeat.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidHeavyWater.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHeavyWater.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidHeavyWater.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHeavyWater.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidHeavyWater.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHeavyWater.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidHeavyWater.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHeavyWater.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidHydrogen.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHydrogen.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidHydrogen.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHydrogen.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidHydrogen.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHydrogen.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidHydrogen.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHydrogen.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidHydrogenChloride.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHydrogenChloride.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidHydrogenChloride.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHydrogenChloride.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidHydrogenChloride.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHydrogenChloride.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidHydrogenChloride.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidHydrogenChloride.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidLithium.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidLithium.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidLithium.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidLithium.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidLithium.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidLithium.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidLithium.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidLithium.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidOre.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOre.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidOre.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOre.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidOre.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOre.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidOre.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOre.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidOsmium.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOsmium.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidOsmium.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOsmium.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidOsmium.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOsmium.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidOsmium.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOsmium.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidOxygen.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOxygen.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidOxygen.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOxygen.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidOxygen.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOxygen.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidOxygen.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidOxygen.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSodium.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSodium.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSodium.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSodium.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSodium.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSodium.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSodium.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSodium.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSteam.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSteam.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSteam.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSteam.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSteam.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSteam.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSteam.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSteam.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidStone.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidStone.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidStone.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidStone.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidStone.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidStone.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidStone.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidStone.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSulfurDioxide.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfurDioxide.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSulfurDioxide.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfurDioxide.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSulfurDioxide.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfurDioxide.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSulfurDioxide.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfurDioxide.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSulfurTrioxide.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfurTrioxide.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSulfurTrioxide.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfurTrioxide.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSulfurTrioxide.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfurTrioxide.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSulfurTrioxide.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfurTrioxide.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSulfuricAcid.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfuricAcid.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSulfuricAcid.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfuricAcid.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidSulfuricAcid.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfuricAcid.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidSulfuricAcid.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidSulfuricAcid.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidTritium.png b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidTritium.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidTritium.png rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidTritium.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/LiquidTritium.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidTritium.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/LiquidTritium.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/liquid/LiquidTritium.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/RestrictiveTransporterSide.png b/src/main/resources/assets/mekanism/textures/blocks/models/RestrictiveTransporterSide.png new file mode 100644 index 000000000..862823301 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/RestrictiveTransporterSide.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_advanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_advanced.png index 2710aae5b..f928fd6d1 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_advanced.png and b/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_advanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_basic.png b/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_basic.png index fafa51be2..d96c1d6cc 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_basic.png and b/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_basic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_creative.png b/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_creative.png index 6379c7ebc..c90b05671 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_creative.png and b/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_creative.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_elite.png b/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_elite.png index 7c4b20910..7c993a8e6 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_elite.png and b/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_elite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_ultimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_ultimate.png index b4f2a805c..917e17d57 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_ultimate.png and b/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_ultimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/DiversionTransporter.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/DiversionTransporter.png index 670c90605..0d3cdb7f5 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/DiversionTransporter.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/DiversionTransporter.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/DiversionTransporterHorizontal.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/DiversionTransporterHorizontal.png index fa6c14c75..44d15cf18 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/DiversionTransporterHorizontal.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/DiversionTransporterHorizontal.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/DiversionTransporterVertical.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/DiversionTransporterVertical.png index 972ff77df..d443bd607 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/DiversionTransporterVertical.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/DiversionTransporterVertical.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterAdvanced.png index 76a3eb935..fc151f0e8 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterAdvanced.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterBasic.png index 21ce6ed93..0db4a2a15 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterBasic.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterElite.png index cf860b4f9..ca7f61796 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterElite.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterGlass.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterGlass.png index 6889a646a..7d24d36fb 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterGlass.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterGlass.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterGlassColored.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterGlassColored.png index f96b610e9..e51f87be5 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterGlassColored.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterGlassColored.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalAdvanced.png index 679ae9974..22045422c 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalAdvanced.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalBasic.png index 7013df76c..e8fcee048 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalBasic.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalElite.png index 9f7fcec55..1f74a36fe 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalElite.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalGlass.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalGlass.png index e6d483f36..c34ea126b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalGlass.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalGlass.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalGlassColored.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalGlassColored.png index 47b5bf555..1f1621cc5 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalGlassColored.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalGlassColored.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalUltimate.png index 01b31961a..ae18668ae 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalUltimate.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterHorizontalUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterUltimate.png index f64daddbc..b1e10324f 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterUltimate.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterVerticalAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterVerticalAdvanced.png index 2ecca65e7..0fce09d26 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterVerticalAdvanced.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterVerticalAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterVerticalBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterVerticalBasic.png index 9d9ec8423..595864edb 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterVerticalBasic.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterVerticalBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterVerticalElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterVerticalElite.png index 728b952fb..67c36a060 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterVerticalElite.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterVerticalElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterVerticalGlass.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterVerticalGlass.png index 6d2f8254d..90ea0180b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterVerticalGlass.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterVerticalGlass.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterVerticalGlassColored.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterVerticalGlassColored.png index 02192743b..28fa7ec77 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterVerticalGlassColored.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterVerticalGlassColored.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterVerticalUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterVerticalUltimate.png index 5feaafabc..33c0bd564 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterVerticalUltimate.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/LogisticalTransporterVerticalUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeAdvanced.png index 6df474e5c..ffc141b97 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeAdvanced.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeBasic.png index c60cb4bd2..fa9415ea7 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeBasic.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeElite.png index 2a6d91f0e..13f991f07 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeElite.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeHorizontalAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeHorizontalAdvanced.png index a95859b50..dca02bb7c 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeHorizontalAdvanced.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeHorizontalAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeHorizontalBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeHorizontalBasic.png index 78b0d9f7c..40f25cfa0 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeHorizontalBasic.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeHorizontalBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeHorizontalElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeHorizontalElite.png index 9e4f9f475..8c48c35f4 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeHorizontalElite.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeHorizontalElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeHorizontalUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeHorizontalUltimate.png index cb9bcb551..f4a3a859e 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeHorizontalUltimate.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeHorizontalUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeUltimate.png index d3081b5a3..61754ff9a 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeUltimate.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeVerticalAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeVerticalAdvanced.png index b6ee819dc..532fb32be 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeVerticalAdvanced.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeVerticalAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeVerticalBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeVerticalBasic.png index ba6f1bc37..c7d020dec 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeVerticalBasic.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeVerticalBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeVerticalElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeVerticalElite.png index 3771aebbf..00dde5ef1 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeVerticalElite.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeVerticalElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeVerticalUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeVerticalUltimate.png index 3c016befe..0aadda73b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeVerticalUltimate.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/MechanicalPipeVerticalUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/PressurizedTubeAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/PressurizedTubeAdvanced.png index f3af5a846..1a11715a4 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/PressurizedTubeAdvanced.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/PressurizedTubeAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/PressurizedTubeBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/PressurizedTubeBasic.png index b6eceb157..8bf698c9b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/PressurizedTubeBasic.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/PressurizedTubeBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/PressurizedTubeElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/PressurizedTubeElite.png index 0c72971f5..5fc1b2b8b 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/PressurizedTubeElite.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/PressurizedTubeElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/PressurizedTubeUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/PressurizedTubeUltimate.png index 5b5ef0451..6c5a8b3b1 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/PressurizedTubeUltimate.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/PressurizedTubeUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/RestrictiveTransporter.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/RestrictiveTransporter.png index dc50423eb..8994bb6dd 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/RestrictiveTransporter.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/RestrictiveTransporter.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/RestrictiveTransporterHorizontal.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/RestrictiveTransporterHorizontal.png index 536021b19..a130fcf71 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/RestrictiveTransporterHorizontal.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/RestrictiveTransporterHorizontal.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/RestrictiveTransporterVertical.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/RestrictiveTransporterVertical.png index 2badef84e..9647b90ea 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/RestrictiveTransporterVertical.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/RestrictiveTransporterVertical.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterHorizontalAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterHorizontalAdvanced.png index 477f51ab2..b4f392dbf 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterHorizontalAdvanced.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterHorizontalAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterHorizontalBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterHorizontalBasic.png index 3a0393837..89a8395de 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterHorizontalBasic.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterHorizontalBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterHorizontalElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterHorizontalElite.png index 5e88732bf..b5e295308 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterHorizontalElite.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterHorizontalElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterHorizontalUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterHorizontalUltimate.png index e7b36364a..edf1ca6a2 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterHorizontalUltimate.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterHorizontalUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterVerticalAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterVerticalAdvanced.png index a0bbf662a..b5c540838 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterVerticalAdvanced.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterVerticalAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterVerticalBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterVerticalBasic.png index 4b0b0c131..96a66c139 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterVerticalBasic.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterVerticalBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterVerticalElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterVerticalElite.png index be049af01..9e6943228 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterVerticalElite.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterVerticalElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterVerticalUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterVerticalUltimate.png index 24352b084..e27fd30ee 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterVerticalUltimate.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterVerticalUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/ThermodynamicConductorAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/ThermodynamicConductorAdvanced.png index a9b5da27f..273395e66 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/ThermodynamicConductorAdvanced.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/ThermodynamicConductorAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/ThermodynamicConductorBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/ThermodynamicConductorBasic.png index 357fa8a9f..82f227b72 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/ThermodynamicConductorBasic.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/ThermodynamicConductorBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/ThermodynamicConductorElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/ThermodynamicConductorElite.png index cbc8656a9..f84259065 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/ThermodynamicConductorElite.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/ThermodynamicConductorElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/ThermodynamicConductorUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/ThermodynamicConductorUltimate.png index b6d1157e7..58d9b1761 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/ThermodynamicConductorUltimate.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/ThermodynamicConductorUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/UniversalCableAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/UniversalCableAdvanced.png index 6a5287e15..2ceb8a748 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/UniversalCableAdvanced.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/UniversalCableAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/UniversalCableBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/UniversalCableBasic.png index 0c4c23a16..a987ea0be 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/UniversalCableBasic.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/UniversalCableBasic.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/UniversalCableElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/UniversalCableElite.png index e78f47756..2c8d7f89a 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/UniversalCableElite.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/UniversalCableElite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/UniversalCableUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/UniversalCableUltimate.png index ad77389c4..0966eb006 100644 Binary files a/src/main/resources/assets/mekanism/textures/blocks/models/multipart/UniversalCableUltimate.png and b/src/main/resources/assets/mekanism/textures/blocks/models/multipart/UniversalCableUltimate.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorBack.png b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorBack.png new file mode 100644 index 000000000..d213a8f32 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorBottom.png b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorBottom.png new file mode 100644 index 000000000..a17136032 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorFront.png b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorFront.png new file mode 100644 index 000000000..b2524d847 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorLeft.png b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorLeft.png new file mode 100644 index 000000000..871e5b9d4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorRight.png b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorRight.png new file mode 100644 index 000000000..4ac3ef054 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorTop.png b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorTop.png new file mode 100644 index 000000000..b5bb7e66e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/oredictionificator/OredictionificatorTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorBack.png b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorBack.png new file mode 100644 index 000000000..3c5105deb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorBackOn.png new file mode 100644 index 000000000..19377ad57 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorBottom.png b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorBottom.png new file mode 100644 index 000000000..69b57d9dd Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFront.png b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFront.png new file mode 100644 index 000000000..c953b8b63 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFrontOn.png new file mode 100644 index 000000000..a95e69bad Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/OsmiumCompressorFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/OsmiumCompressorFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorLeft.png b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorLeft.png new file mode 100644 index 000000000..dc7909bb2 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorLeftOn.png new file mode 100644 index 000000000..90dbfa03d Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorRight.png b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorRight.png new file mode 100644 index 000000000..6b4df53ba Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorRightOn.png new file mode 100644 index 000000000..391b509df Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorTop.png b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorTop.png new file mode 100644 index 000000000..4193ef106 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorTopOn.png new file mode 100644 index 000000000..4ad673dd7 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayAqua.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayAqua.png new file mode 100644 index 000000000..7e9aac3d6 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayAqua.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBlack.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBlack.png new file mode 100644 index 000000000..e7727360f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBlack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrightGreen.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrightGreen.png new file mode 100644 index 000000000..6925b85aa Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrightGreen.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrightPink.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrightPink.png new file mode 100644 index 000000000..7588349f3 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrightPink.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrown.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrown.png new file mode 100644 index 000000000..a346b1d41 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayBrown.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkAqua.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkAqua.png new file mode 100644 index 000000000..54b025962 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkAqua.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkBlue.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkBlue.png new file mode 100644 index 000000000..8cce9d4b9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkBlue.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkGreen.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkGreen.png new file mode 100644 index 000000000..ff58d83d8 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkGreen.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkGrey.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkGrey.png new file mode 100644 index 000000000..1836d4f26 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkGrey.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkRed.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkRed.png new file mode 100644 index 000000000..82fc0ec94 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayDarkRed.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayGrey.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayGrey.png new file mode 100644 index 000000000..1567e0dfa Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayGrey.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayIndigo.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayIndigo.png new file mode 100644 index 000000000..474a79490 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayIndigo.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayOrange.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayOrange.png new file mode 100644 index 000000000..f45c3d738 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayOrange.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayPink.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayPink.png new file mode 100644 index 000000000..75eb19c5e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayPink.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayPurple.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayPurple.png new file mode 100644 index 000000000..10bf8b883 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayPurple.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayRed.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayRed.png new file mode 100644 index 000000000..5d5c84332 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayRed.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayWhite.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayWhite.png new file mode 100644 index 000000000..044809b2c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayWhite.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayYellow.png b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayYellow.png new file mode 100644 index 000000000..414ce4827 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/overlay/OverlayYellow.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBack.png b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBack.png new file mode 100644 index 000000000..545c0cc6c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBackOn.png new file mode 100644 index 000000000..261988fe5 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBackOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBackOn.png.mcmeta new file mode 100644 index 000000000..4ac3fbebb --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBackOn.png.mcmeta @@ -0,0 +1,10 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBottom.png b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBottom.png new file mode 100644 index 000000000..91740af27 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFront.png b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFront.png new file mode 100644 index 000000000..7e1993c0e Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFrontOn.png new file mode 100644 index 000000000..22385253f Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/PrecisionSawmillFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/PrecisionSawmillFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillLeft.png b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillLeft.png new file mode 100644 index 000000000..7a4f69a17 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillLeftOn.png new file mode 100644 index 000000000..b546f7a8a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedCrushingFactoryFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillLeftOn.png.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/AdvancedCrushingFactoryFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillLeftOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillRight.png b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillRight.png new file mode 100644 index 000000000..27ba87217 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillRightOn.png new file mode 100644 index 000000000..dd441ac27 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillRightOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillRightOn.png.mcmeta new file mode 100644 index 000000000..4ac3fbebb --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillRightOn.png.mcmeta @@ -0,0 +1,10 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillTop.png b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillTop.png new file mode 100644 index 000000000..3b23724a3 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillTopOn.png new file mode 100644 index 000000000..136f3b4a4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillTopOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillTopOn.png.mcmeta new file mode 100644 index 000000000..99a1d4967 --- /dev/null +++ b/src/main/resources/assets/mekanism/textures/blocks/precision_sawmill/PrecisionSawmillTopOn.png.mcmeta @@ -0,0 +1,11 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberBack.png b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberBack.png new file mode 100644 index 000000000..5386df502 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberBack.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberBackOn.png b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberBackOn.png new file mode 100644 index 000000000..ad3eaee27 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberBackOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberBottom.png b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberBottom.png new file mode 100644 index 000000000..f79899dbb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberBottom.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFront.png b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFront.png new file mode 100644 index 000000000..6d919e940 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFront.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFrontOn.png b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFrontOn.png new file mode 100644 index 000000000..ab546308b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFrontOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/PurificationChamberFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFrontOn.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/PurificationChamberFrontOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberFrontOn.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberLeft.png b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberLeft.png new file mode 100644 index 000000000..905051282 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberLeft.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberLeftOn.png b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberLeftOn.png new file mode 100644 index 000000000..119b55aba Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberLeftOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberRight.png b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberRight.png new file mode 100644 index 000000000..6491c41f3 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberRight.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberRightOn.png b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberRightOn.png new file mode 100644 index 000000000..02bdbd032 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberRightOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberTop.png b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberTop.png new file mode 100644 index 000000000..fa5628750 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberTop.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberTopOn.png b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberTopOn.png new file mode 100644 index 000000000..a85ee3e8a Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/purification_chamber/PurificationChamberTopOn.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/AdvancedControlCircuit.png b/src/main/resources/assets/mekanism/textures/items/AdvancedControlCircuit.png index d9aedf653..db575ea2e 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/AdvancedControlCircuit.png and b/src/main/resources/assets/mekanism/textures/items/AdvancedControlCircuit.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/AdvancedFactoryInstaller.png b/src/main/resources/assets/mekanism/textures/items/AdvancedFactoryInstaller.png index 27a40e995..4920bd792 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/AdvancedFactoryInstaller.png and b/src/main/resources/assets/mekanism/textures/items/AdvancedFactoryInstaller.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/AtomicAlloy.png b/src/main/resources/assets/mekanism/textures/items/AtomicAlloy.png index 6a9daad49..ad65e1b5f 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/AtomicAlloy.png and b/src/main/resources/assets/mekanism/textures/items/AtomicAlloy.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BasicControlCircuit.png b/src/main/resources/assets/mekanism/textures/items/BasicControlCircuit.png index 781448bdb..8fd67b58b 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BasicControlCircuit.png and b/src/main/resources/assets/mekanism/textures/items/BasicControlCircuit.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BasicFactoryInstaller.png b/src/main/resources/assets/mekanism/textures/items/BasicFactoryInstaller.png index 66954141a..800376d4f 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BasicFactoryInstaller.png and b/src/main/resources/assets/mekanism/textures/items/BasicFactoryInstaller.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BioFuel.png b/src/main/resources/assets/mekanism/textures/items/BioFuel.png index d8ed495eb..c5f7b8264 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BioFuel.png and b/src/main/resources/assets/mekanism/textures/items/BioFuel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BronzeAxe.png b/src/main/resources/assets/mekanism/textures/items/BronzeAxe.png index f21740c69..1ac7fce51 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BronzeAxe.png and b/src/main/resources/assets/mekanism/textures/items/BronzeAxe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BronzeBoots.png b/src/main/resources/assets/mekanism/textures/items/BronzeBoots.png index d7f8b97c9..ede734e82 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BronzeBoots.png and b/src/main/resources/assets/mekanism/textures/items/BronzeBoots.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BronzeChestplate.png b/src/main/resources/assets/mekanism/textures/items/BronzeChestplate.png index 13cdafa67..d9bff9325 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BronzeChestplate.png and b/src/main/resources/assets/mekanism/textures/items/BronzeChestplate.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BronzeHelmet.png b/src/main/resources/assets/mekanism/textures/items/BronzeHelmet.png index 150053edc..9749faf7d 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BronzeHelmet.png and b/src/main/resources/assets/mekanism/textures/items/BronzeHelmet.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BronzeHoe.png b/src/main/resources/assets/mekanism/textures/items/BronzeHoe.png index f8b60673e..b89068a0a 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BronzeHoe.png and b/src/main/resources/assets/mekanism/textures/items/BronzeHoe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BronzeIngot.png b/src/main/resources/assets/mekanism/textures/items/BronzeIngot.png index 220bff74a..6e2545df3 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BronzeIngot.png and b/src/main/resources/assets/mekanism/textures/items/BronzeIngot.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BronzeLeggings.png b/src/main/resources/assets/mekanism/textures/items/BronzeLeggings.png index 958849dcc..2ac8b853b 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BronzeLeggings.png and b/src/main/resources/assets/mekanism/textures/items/BronzeLeggings.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BronzePaxel.png b/src/main/resources/assets/mekanism/textures/items/BronzePaxel.png index 39e5cc216..03b5b5bd5 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BronzePaxel.png and b/src/main/resources/assets/mekanism/textures/items/BronzePaxel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BronzePickaxe.png b/src/main/resources/assets/mekanism/textures/items/BronzePickaxe.png index 025d09fec..cc931f124 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BronzePickaxe.png and b/src/main/resources/assets/mekanism/textures/items/BronzePickaxe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BronzeShovel.png b/src/main/resources/assets/mekanism/textures/items/BronzeShovel.png index d368cccb7..e1c361e88 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BronzeShovel.png and b/src/main/resources/assets/mekanism/textures/items/BronzeShovel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/BronzeSword.png b/src/main/resources/assets/mekanism/textures/items/BronzeSword.png index fd37539ec..6ad9ae74c 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/BronzeSword.png and b/src/main/resources/assets/mekanism/textures/items/BronzeSword.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/CompressedCarbon.png b/src/main/resources/assets/mekanism/textures/items/CompressedCarbon.png index b26af0d26..36644b5d4 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/CompressedCarbon.png and b/src/main/resources/assets/mekanism/textures/items/CompressedCarbon.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/CompressedDiamond.png b/src/main/resources/assets/mekanism/textures/items/CompressedDiamond.png index d8274fef2..9d2e009b9 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/CompressedDiamond.png and b/src/main/resources/assets/mekanism/textures/items/CompressedDiamond.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/CompressedObsidian.png b/src/main/resources/assets/mekanism/textures/items/CompressedObsidian.png index 90d4e97eb..3e18a2245 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/CompressedObsidian.png and b/src/main/resources/assets/mekanism/textures/items/CompressedObsidian.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/CompressedRedstone.png b/src/main/resources/assets/mekanism/textures/items/CompressedRedstone.png index f2f640b5e..246cec43d 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/CompressedRedstone.png and b/src/main/resources/assets/mekanism/textures/items/CompressedRedstone.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ConfigurationCard.png b/src/main/resources/assets/mekanism/textures/items/ConfigurationCard.png index 5370ea6e9..40999e7d0 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ConfigurationCard.png and b/src/main/resources/assets/mekanism/textures/items/ConfigurationCard.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/Configurator.png b/src/main/resources/assets/mekanism/textures/items/Configurator.png index 66029cdf4..60fdb013c 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/Configurator.png and b/src/main/resources/assets/mekanism/textures/items/Configurator.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/CopperClump.png b/src/main/resources/assets/mekanism/textures/items/CopperClump.png index 91b62056a..c8fad5ce9 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/CopperClump.png and b/src/main/resources/assets/mekanism/textures/items/CopperClump.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/CopperCrystal.png b/src/main/resources/assets/mekanism/textures/items/CopperCrystal.png index e67b3c7bc..8a6b56d32 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/CopperCrystal.png and b/src/main/resources/assets/mekanism/textures/items/CopperCrystal.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/CopperDust.png b/src/main/resources/assets/mekanism/textures/items/CopperDust.png index 45c19c1ee..c5ccdb1d8 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/CopperDust.png and b/src/main/resources/assets/mekanism/textures/items/CopperDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/CopperIngot.png b/src/main/resources/assets/mekanism/textures/items/CopperIngot.png index a482c4d99..da7e582b6 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/CopperIngot.png and b/src/main/resources/assets/mekanism/textures/items/CopperIngot.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/CopperShard.png b/src/main/resources/assets/mekanism/textures/items/CopperShard.png index b49199961..3a04c3873 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/CopperShard.png and b/src/main/resources/assets/mekanism/textures/items/CopperShard.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/CraftingFormula.png b/src/main/resources/assets/mekanism/textures/items/CraftingFormula.png index 779e0d2e0..4efcc4894 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/CraftingFormula.png and b/src/main/resources/assets/mekanism/textures/items/CraftingFormula.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/CraftingFormulaEncoded.png b/src/main/resources/assets/mekanism/textures/items/CraftingFormulaEncoded.png index ca802ce64..86f96ea02 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/CraftingFormulaEncoded.png and b/src/main/resources/assets/mekanism/textures/items/CraftingFormulaEncoded.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/CraftingFormulaInvalid.png b/src/main/resources/assets/mekanism/textures/items/CraftingFormulaInvalid.png index ae37f53d8..1f38d119a 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/CraftingFormulaInvalid.png and b/src/main/resources/assets/mekanism/textures/items/CraftingFormulaInvalid.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/DiamondDust.png b/src/main/resources/assets/mekanism/textures/items/DiamondDust.png index 03d90195b..c845810bb 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/DiamondDust.png and b/src/main/resources/assets/mekanism/textures/items/DiamondDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/DiamondPaxel.png b/src/main/resources/assets/mekanism/textures/items/DiamondPaxel.png index 1fb848dcd..7131d0c39 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/DiamondPaxel.png and b/src/main/resources/assets/mekanism/textures/items/DiamondPaxel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/Dictionary.png b/src/main/resources/assets/mekanism/textures/items/Dictionary.png index 3b4a09c35..fc398d4d3 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/Dictionary.png and b/src/main/resources/assets/mekanism/textures/items/Dictionary.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/DirtyCopperDust.png b/src/main/resources/assets/mekanism/textures/items/DirtyCopperDust.png index ad4f6c10c..3199f30c2 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/DirtyCopperDust.png and b/src/main/resources/assets/mekanism/textures/items/DirtyCopperDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/DirtyGoldDust.png b/src/main/resources/assets/mekanism/textures/items/DirtyGoldDust.png index 061b236b3..373c20b99 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/DirtyGoldDust.png and b/src/main/resources/assets/mekanism/textures/items/DirtyGoldDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/DirtyIronDust.png b/src/main/resources/assets/mekanism/textures/items/DirtyIronDust.png index debc9df53..9e1631efc 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/DirtyIronDust.png and b/src/main/resources/assets/mekanism/textures/items/DirtyIronDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/DirtyLeadDust.png b/src/main/resources/assets/mekanism/textures/items/DirtyLeadDust.png index 40e31ce1c..8cdfb1065 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/DirtyLeadDust.png and b/src/main/resources/assets/mekanism/textures/items/DirtyLeadDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/DirtyObsidianDust.png b/src/main/resources/assets/mekanism/textures/items/DirtyObsidianDust.png new file mode 100644 index 000000000..79018e1a9 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/items/DirtyObsidianDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/DirtyOsmiumDust.png b/src/main/resources/assets/mekanism/textures/items/DirtyOsmiumDust.png index e44fb488f..8e7885fd7 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/DirtyOsmiumDust.png and b/src/main/resources/assets/mekanism/textures/items/DirtyOsmiumDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/DirtySilverDust.png b/src/main/resources/assets/mekanism/textures/items/DirtySilverDust.png index e129be66e..2e14ad099 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/DirtySilverDust.png and b/src/main/resources/assets/mekanism/textures/items/DirtySilverDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/DirtyTinDust.png b/src/main/resources/assets/mekanism/textures/items/DirtyTinDust.png index 85ee2f06e..f01fbee4d 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/DirtyTinDust.png and b/src/main/resources/assets/mekanism/textures/items/DirtyTinDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ElectricBow.png b/src/main/resources/assets/mekanism/textures/items/ElectricBow.png index 65b364811..7374cd148 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ElectricBow.png and b/src/main/resources/assets/mekanism/textures/items/ElectricBow.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ElectrolyticCore.png b/src/main/resources/assets/mekanism/textures/items/ElectrolyticCore.png index e3f75462e..e2a47b18e 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ElectrolyticCore.png and b/src/main/resources/assets/mekanism/textures/items/ElectrolyticCore.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/EliteControlCircuit.png b/src/main/resources/assets/mekanism/textures/items/EliteControlCircuit.png index 720c16464..02943787c 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/EliteControlCircuit.png and b/src/main/resources/assets/mekanism/textures/items/EliteControlCircuit.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/EliteFactoryInstaller.png b/src/main/resources/assets/mekanism/textures/items/EliteFactoryInstaller.png index 0ba1b50ad..ea0f39edf 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/EliteFactoryInstaller.png and b/src/main/resources/assets/mekanism/textures/items/EliteFactoryInstaller.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/EnergyTablet.png b/src/main/resources/assets/mekanism/textures/items/EnergyTablet.png index 4f47026d7..63a934e3c 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/EnergyTablet.png and b/src/main/resources/assets/mekanism/textures/items/EnergyTablet.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/EnergyUpgrade.png b/src/main/resources/assets/mekanism/textures/items/EnergyUpgrade.png index f1f8acdb5..5ef8e2bf0 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/EnergyUpgrade.png and b/src/main/resources/assets/mekanism/textures/items/EnergyUpgrade.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/EnrichedAlloy.png b/src/main/resources/assets/mekanism/textures/items/EnrichedAlloy.png index 1503625dd..64eb59522 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/EnrichedAlloy.png and b/src/main/resources/assets/mekanism/textures/items/EnrichedAlloy.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/EnrichedIron.png b/src/main/resources/assets/mekanism/textures/items/EnrichedIron.png index 528b9f69b..183478312 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/EnrichedIron.png and b/src/main/resources/assets/mekanism/textures/items/EnrichedIron.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/EnrichedIron_alt.png b/src/main/resources/assets/mekanism/textures/items/EnrichedIron_alt.png new file mode 100644 index 000000000..162b843b7 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/items/EnrichedIron_alt.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/FilterUpgrade.png b/src/main/resources/assets/mekanism/textures/items/FilterUpgrade.png index 74f69f181..28b8a83b3 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/FilterUpgrade.png and b/src/main/resources/assets/mekanism/textures/items/FilterUpgrade.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GasUpgrade.png b/src/main/resources/assets/mekanism/textures/items/GasUpgrade.png index be83d4918..0df142dd6 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GasUpgrade.png and b/src/main/resources/assets/mekanism/textures/items/GasUpgrade.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GaugeDropper.png b/src/main/resources/assets/mekanism/textures/items/GaugeDropper.png index ba0f4e422..dc074d776 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GaugeDropper.png and b/src/main/resources/assets/mekanism/textures/items/GaugeDropper.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GlowstoneAxe.png b/src/main/resources/assets/mekanism/textures/items/GlowstoneAxe.png index 9a7ec8623..4bcfe4d8a 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GlowstoneAxe.png and b/src/main/resources/assets/mekanism/textures/items/GlowstoneAxe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GlowstoneBoots.png b/src/main/resources/assets/mekanism/textures/items/GlowstoneBoots.png index 6531cf573..5eb2ec711 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GlowstoneBoots.png and b/src/main/resources/assets/mekanism/textures/items/GlowstoneBoots.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GlowstoneChestplate.png b/src/main/resources/assets/mekanism/textures/items/GlowstoneChestplate.png index 9166800c5..1ab7b7b6d 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GlowstoneChestplate.png and b/src/main/resources/assets/mekanism/textures/items/GlowstoneChestplate.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GlowstoneHelmet.png b/src/main/resources/assets/mekanism/textures/items/GlowstoneHelmet.png index a61d441ff..1050dfcd5 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GlowstoneHelmet.png and b/src/main/resources/assets/mekanism/textures/items/GlowstoneHelmet.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GlowstoneHoe.png b/src/main/resources/assets/mekanism/textures/items/GlowstoneHoe.png index cadc8920c..c205faab9 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GlowstoneHoe.png and b/src/main/resources/assets/mekanism/textures/items/GlowstoneHoe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GlowstoneIngot.png b/src/main/resources/assets/mekanism/textures/items/GlowstoneIngot.png index fa901456c..fdd05ef6c 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GlowstoneIngot.png and b/src/main/resources/assets/mekanism/textures/items/GlowstoneIngot.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GlowstoneLeggings.png b/src/main/resources/assets/mekanism/textures/items/GlowstoneLeggings.png index 1033c017e..695f0e5c6 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GlowstoneLeggings.png and b/src/main/resources/assets/mekanism/textures/items/GlowstoneLeggings.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GlowstonePaxel.png b/src/main/resources/assets/mekanism/textures/items/GlowstonePaxel.png index aa80ef86d..ca3bd644e 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GlowstonePaxel.png and b/src/main/resources/assets/mekanism/textures/items/GlowstonePaxel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GlowstonePickaxe.png b/src/main/resources/assets/mekanism/textures/items/GlowstonePickaxe.png index 95415a552..3329811d0 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GlowstonePickaxe.png and b/src/main/resources/assets/mekanism/textures/items/GlowstonePickaxe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GlowstoneShovel.png b/src/main/resources/assets/mekanism/textures/items/GlowstoneShovel.png index b20c25e84..5dec303e5 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GlowstoneShovel.png and b/src/main/resources/assets/mekanism/textures/items/GlowstoneShovel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GlowstoneSword.png b/src/main/resources/assets/mekanism/textures/items/GlowstoneSword.png index b22d64022..4b96a767b 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GlowstoneSword.png and b/src/main/resources/assets/mekanism/textures/items/GlowstoneSword.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GoldClump.png b/src/main/resources/assets/mekanism/textures/items/GoldClump.png index 636c9f207..7ddec43ff 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GoldClump.png and b/src/main/resources/assets/mekanism/textures/items/GoldClump.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GoldCrystal.png b/src/main/resources/assets/mekanism/textures/items/GoldCrystal.png index 3e5e2a1ee..8b6c49c85 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GoldCrystal.png and b/src/main/resources/assets/mekanism/textures/items/GoldCrystal.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GoldDust.png b/src/main/resources/assets/mekanism/textures/items/GoldDust.png index 60ad8d122..d4a3dd740 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GoldDust.png and b/src/main/resources/assets/mekanism/textures/items/GoldDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GoldPaxel.png b/src/main/resources/assets/mekanism/textures/items/GoldPaxel.png index 032f86691..a602973dc 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GoldPaxel.png and b/src/main/resources/assets/mekanism/textures/items/GoldPaxel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/GoldShard.png b/src/main/resources/assets/mekanism/textures/items/GoldShard.png index 46e009774..9a5727727 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/GoldShard.png and b/src/main/resources/assets/mekanism/textures/items/GoldShard.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/HDPEPellet.png b/src/main/resources/assets/mekanism/textures/items/HDPEPellet.png index 126c0ff88..368fc7bbe 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/HDPEPellet.png and b/src/main/resources/assets/mekanism/textures/items/HDPEPellet.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/HDPERod.png b/src/main/resources/assets/mekanism/textures/items/HDPERod.png index 59957229c..fd919c2b3 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/HDPERod.png and b/src/main/resources/assets/mekanism/textures/items/HDPERod.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/HDPESheet.png b/src/main/resources/assets/mekanism/textures/items/HDPESheet.png index fba24d766..8122679f1 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/HDPESheet.png and b/src/main/resources/assets/mekanism/textures/items/HDPESheet.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/Hohlraum.png b/src/main/resources/assets/mekanism/textures/items/Hohlraum.png index 954b503dc..c2f00487b 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/Hohlraum.png and b/src/main/resources/assets/mekanism/textures/items/Hohlraum.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/IronClump.png b/src/main/resources/assets/mekanism/textures/items/IronClump.png index d8cc35291..7a4808821 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/IronClump.png and b/src/main/resources/assets/mekanism/textures/items/IronClump.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/IronCrystal.png b/src/main/resources/assets/mekanism/textures/items/IronCrystal.png index b5c54634b..93ee21180 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/IronCrystal.png and b/src/main/resources/assets/mekanism/textures/items/IronCrystal.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/IronDust.png b/src/main/resources/assets/mekanism/textures/items/IronDust.png index 51067a44c..cf594c7df 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/IronDust.png and b/src/main/resources/assets/mekanism/textures/items/IronDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/IronPaxel.png b/src/main/resources/assets/mekanism/textures/items/IronPaxel.png index 53eac923d..63aee7b85 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/IronPaxel.png and b/src/main/resources/assets/mekanism/textures/items/IronPaxel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/IronShard.png b/src/main/resources/assets/mekanism/textures/items/IronShard.png index 0b0d5853e..417778eb8 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/IronShard.png and b/src/main/resources/assets/mekanism/textures/items/IronShard.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliAxe.png b/src/main/resources/assets/mekanism/textures/items/LazuliAxe.png index 2ed32ff19..61d69be57 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LazuliAxe.png and b/src/main/resources/assets/mekanism/textures/items/LazuliAxe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliBoots.png b/src/main/resources/assets/mekanism/textures/items/LazuliBoots.png index 95bbaf300..4048738e3 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LazuliBoots.png and b/src/main/resources/assets/mekanism/textures/items/LazuliBoots.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliChestplate.png b/src/main/resources/assets/mekanism/textures/items/LazuliChestplate.png index 85042a408..0ea8b9bcc 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LazuliChestplate.png and b/src/main/resources/assets/mekanism/textures/items/LazuliChestplate.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliHelmet.png b/src/main/resources/assets/mekanism/textures/items/LazuliHelmet.png index 1cfbf231f..2d619d802 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LazuliHelmet.png and b/src/main/resources/assets/mekanism/textures/items/LazuliHelmet.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliHoe.png b/src/main/resources/assets/mekanism/textures/items/LazuliHoe.png index 20c8e0e8f..cb36b363e 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LazuliHoe.png and b/src/main/resources/assets/mekanism/textures/items/LazuliHoe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliLeggings.png b/src/main/resources/assets/mekanism/textures/items/LazuliLeggings.png index 945f33376..8640b2f00 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LazuliLeggings.png and b/src/main/resources/assets/mekanism/textures/items/LazuliLeggings.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliPaxel.png b/src/main/resources/assets/mekanism/textures/items/LazuliPaxel.png index 993189079..912f45497 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LazuliPaxel.png and b/src/main/resources/assets/mekanism/textures/items/LazuliPaxel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliPickaxe.png b/src/main/resources/assets/mekanism/textures/items/LazuliPickaxe.png index 10d7311a1..e4764f0d2 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LazuliPickaxe.png and b/src/main/resources/assets/mekanism/textures/items/LazuliPickaxe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliShovel.png b/src/main/resources/assets/mekanism/textures/items/LazuliShovel.png index 3c2fc7a6f..a9afb2908 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LazuliShovel.png and b/src/main/resources/assets/mekanism/textures/items/LazuliShovel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LazuliSword.png b/src/main/resources/assets/mekanism/textures/items/LazuliSword.png index 78246d88c..3a66d0bc0 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LazuliSword.png and b/src/main/resources/assets/mekanism/textures/items/LazuliSword.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LeadClump.png b/src/main/resources/assets/mekanism/textures/items/LeadClump.png index 77ac97add..7d3e6b98c 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LeadClump.png and b/src/main/resources/assets/mekanism/textures/items/LeadClump.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LeadCrystal.png b/src/main/resources/assets/mekanism/textures/items/LeadCrystal.png index 07491ca90..b4eec10e0 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LeadCrystal.png and b/src/main/resources/assets/mekanism/textures/items/LeadCrystal.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LeadDust.png b/src/main/resources/assets/mekanism/textures/items/LeadDust.png index ec2eaec0b..65ad2bc5d 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LeadDust.png and b/src/main/resources/assets/mekanism/textures/items/LeadDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LeadShard.png b/src/main/resources/assets/mekanism/textures/items/LeadShard.png index 5f9d1e060..7e1ee4363 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LeadShard.png and b/src/main/resources/assets/mekanism/textures/items/LeadShard.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LithiumBucket.png b/src/main/resources/assets/mekanism/textures/items/LithiumBucket.png index e26131341..aee996593 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LithiumBucket.png and b/src/main/resources/assets/mekanism/textures/items/LithiumBucket.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/LithiumDust.png b/src/main/resources/assets/mekanism/textures/items/LithiumDust.png index 41778ab61..54f23ed19 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/LithiumDust.png and b/src/main/resources/assets/mekanism/textures/items/LithiumDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/MufflingUpgrade.png b/src/main/resources/assets/mekanism/textures/items/MufflingUpgrade.png index f3a5037d0..9e8e31f96 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/MufflingUpgrade.png and b/src/main/resources/assets/mekanism/textures/items/MufflingUpgrade.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/NetworkReader.png b/src/main/resources/assets/mekanism/textures/items/NetworkReader.png index 0ddc0aceb..673f8e8d6 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/NetworkReader.png and b/src/main/resources/assets/mekanism/textures/items/NetworkReader.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianAxe.png b/src/main/resources/assets/mekanism/textures/items/ObsidianAxe.png index 57e45fc01..c95e059b8 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ObsidianAxe.png and b/src/main/resources/assets/mekanism/textures/items/ObsidianAxe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianBoots.png b/src/main/resources/assets/mekanism/textures/items/ObsidianBoots.png index fdcab2f7a..6ecee92f0 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ObsidianBoots.png and b/src/main/resources/assets/mekanism/textures/items/ObsidianBoots.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianChestplate.png b/src/main/resources/assets/mekanism/textures/items/ObsidianChestplate.png index 2daa7e181..ab318e64c 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ObsidianChestplate.png and b/src/main/resources/assets/mekanism/textures/items/ObsidianChestplate.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianClump.png b/src/main/resources/assets/mekanism/textures/items/ObsidianClump.png new file mode 100644 index 000000000..5690541f4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/items/ObsidianClump.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianCrystal.png b/src/main/resources/assets/mekanism/textures/items/ObsidianCrystal.png new file mode 100644 index 000000000..20769df74 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/items/ObsidianCrystal.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianDust.png b/src/main/resources/assets/mekanism/textures/items/ObsidianDust.png index 5ce8e60ea..385f447c9 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ObsidianDust.png and b/src/main/resources/assets/mekanism/textures/items/ObsidianDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianHelmet.png b/src/main/resources/assets/mekanism/textures/items/ObsidianHelmet.png index c5d29f0b0..d34c7b59b 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ObsidianHelmet.png and b/src/main/resources/assets/mekanism/textures/items/ObsidianHelmet.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianHoe.png b/src/main/resources/assets/mekanism/textures/items/ObsidianHoe.png index ab25f754d..1b8c9cddd 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ObsidianHoe.png and b/src/main/resources/assets/mekanism/textures/items/ObsidianHoe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianIngot.png b/src/main/resources/assets/mekanism/textures/items/ObsidianIngot.png index 7d7d476f0..1359f78cc 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ObsidianIngot.png and b/src/main/resources/assets/mekanism/textures/items/ObsidianIngot.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianLeggings.png b/src/main/resources/assets/mekanism/textures/items/ObsidianLeggings.png index 1807a4103..0c39a45e1 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ObsidianLeggings.png and b/src/main/resources/assets/mekanism/textures/items/ObsidianLeggings.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianPaxel.png b/src/main/resources/assets/mekanism/textures/items/ObsidianPaxel.png index 38ad7a67b..837549b5e 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ObsidianPaxel.png and b/src/main/resources/assets/mekanism/textures/items/ObsidianPaxel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianPickaxe.png b/src/main/resources/assets/mekanism/textures/items/ObsidianPickaxe.png index 9c3055c61..0395a6548 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ObsidianPickaxe.png and b/src/main/resources/assets/mekanism/textures/items/ObsidianPickaxe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianShard.png b/src/main/resources/assets/mekanism/textures/items/ObsidianShard.png new file mode 100644 index 000000000..759c87202 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/items/ObsidianShard.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianShovel.png b/src/main/resources/assets/mekanism/textures/items/ObsidianShovel.png index 38c952ee1..9c09bfdb2 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ObsidianShovel.png and b/src/main/resources/assets/mekanism/textures/items/ObsidianShovel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ObsidianSword.png b/src/main/resources/assets/mekanism/textures/items/ObsidianSword.png index 756e8c400..fb12fe8d0 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ObsidianSword.png and b/src/main/resources/assets/mekanism/textures/items/ObsidianSword.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumAxe.png b/src/main/resources/assets/mekanism/textures/items/OsmiumAxe.png index 6b3214311..ca0b577c5 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumAxe.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumAxe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumBoots.png b/src/main/resources/assets/mekanism/textures/items/OsmiumBoots.png index 6b5710130..ef321b779 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumBoots.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumBoots.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumChestplate.png b/src/main/resources/assets/mekanism/textures/items/OsmiumChestplate.png index f8e968a4f..f85cc5ad6 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumChestplate.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumChestplate.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumClump.png b/src/main/resources/assets/mekanism/textures/items/OsmiumClump.png index 31af05694..33f2b0a3d 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumClump.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumClump.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumCrystal.png b/src/main/resources/assets/mekanism/textures/items/OsmiumCrystal.png index 9d9262264..a5bd18ac9 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumCrystal.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumCrystal.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumDust.png b/src/main/resources/assets/mekanism/textures/items/OsmiumDust.png index 415ae11a3..54f4d4fa7 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumDust.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumHelmet.png b/src/main/resources/assets/mekanism/textures/items/OsmiumHelmet.png index 071b856d1..18c1177c0 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumHelmet.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumHelmet.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumHoe.png b/src/main/resources/assets/mekanism/textures/items/OsmiumHoe.png index bc5521495..a905163f7 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumHoe.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumHoe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumIngot.png b/src/main/resources/assets/mekanism/textures/items/OsmiumIngot.png index cb15a91c7..48cb32ebb 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumIngot.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumIngot.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumLeggings.png b/src/main/resources/assets/mekanism/textures/items/OsmiumLeggings.png index 7ded5f26a..18e6b2ab2 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumLeggings.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumLeggings.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumPaxel.png b/src/main/resources/assets/mekanism/textures/items/OsmiumPaxel.png index 0e70ec6bd..fb2ac4be1 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumPaxel.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumPaxel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumPickaxe.png b/src/main/resources/assets/mekanism/textures/items/OsmiumPickaxe.png index 4d5786261..b9fb39e4f 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumPickaxe.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumPickaxe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumShard.png b/src/main/resources/assets/mekanism/textures/items/OsmiumShard.png index 6a8fb65a5..ec07600e5 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumShard.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumShard.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumShovel.png b/src/main/resources/assets/mekanism/textures/items/OsmiumShovel.png index 340371aba..ea1624d48 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumShovel.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumShovel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/OsmiumSword.png b/src/main/resources/assets/mekanism/textures/items/OsmiumSword.png index 9d8f26155..54aeb4d35 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/OsmiumSword.png and b/src/main/resources/assets/mekanism/textures/items/OsmiumSword.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/PortableTeleporter.png b/src/main/resources/assets/mekanism/textures/items/PortableTeleporter.png index 466d1bb8d..0dfc5eaa5 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/PortableTeleporter.png and b/src/main/resources/assets/mekanism/textures/items/PortableTeleporter.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/RefinedObsidianDust.png b/src/main/resources/assets/mekanism/textures/items/RefinedObsidianDust.png index c907bc0f6..fe9a2e635 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/RefinedObsidianDust.png and b/src/main/resources/assets/mekanism/textures/items/RefinedObsidianDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/ReinforcedAlloy.png b/src/main/resources/assets/mekanism/textures/items/ReinforcedAlloy.png index 6330d71aa..93cb28826 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/ReinforcedAlloy.png and b/src/main/resources/assets/mekanism/textures/items/ReinforcedAlloy.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/Salt.png b/src/main/resources/assets/mekanism/textures/items/Salt.png index 6e0e4a7d1..75fda32ed 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/Salt.png and b/src/main/resources/assets/mekanism/textures/items/Salt.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/Sawdust.png b/src/main/resources/assets/mekanism/textures/items/Sawdust.png index f2759218c..dcac1843c 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/Sawdust.png and b/src/main/resources/assets/mekanism/textures/items/Sawdust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SeismicReader.png b/src/main/resources/assets/mekanism/textures/items/SeismicReader.png index 115b8d472..355754405 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SeismicReader.png and b/src/main/resources/assets/mekanism/textures/items/SeismicReader.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SilverClump.png b/src/main/resources/assets/mekanism/textures/items/SilverClump.png index 083e672dc..7ddaef287 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SilverClump.png and b/src/main/resources/assets/mekanism/textures/items/SilverClump.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SilverCrystal.png b/src/main/resources/assets/mekanism/textures/items/SilverCrystal.png index 993aa0ab5..5806c0ba2 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SilverCrystal.png and b/src/main/resources/assets/mekanism/textures/items/SilverCrystal.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SilverDust.png b/src/main/resources/assets/mekanism/textures/items/SilverDust.png index 7fa85e284..11a1ffab6 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SilverDust.png and b/src/main/resources/assets/mekanism/textures/items/SilverDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SilverShard.png b/src/main/resources/assets/mekanism/textures/items/SilverShard.png index 5d065ff32..c60a32bca 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SilverShard.png and b/src/main/resources/assets/mekanism/textures/items/SilverShard.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SolarPanel.png b/src/main/resources/assets/mekanism/textures/items/SolarPanel.png index 1c31873e2..91884dcb0 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SolarPanel.png and b/src/main/resources/assets/mekanism/textures/items/SolarPanel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SpeedUpgrade.png b/src/main/resources/assets/mekanism/textures/items/SpeedUpgrade.png index c79774f89..153d53cf9 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SpeedUpgrade.png and b/src/main/resources/assets/mekanism/textures/items/SpeedUpgrade.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SteelAxe.png b/src/main/resources/assets/mekanism/textures/items/SteelAxe.png index 9fe7dfa58..f24686fab 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SteelAxe.png and b/src/main/resources/assets/mekanism/textures/items/SteelAxe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SteelBoots.png b/src/main/resources/assets/mekanism/textures/items/SteelBoots.png index 82640e749..9234f1487 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SteelBoots.png and b/src/main/resources/assets/mekanism/textures/items/SteelBoots.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SteelChestplate.png b/src/main/resources/assets/mekanism/textures/items/SteelChestplate.png index 8f79824cd..ab0be11f3 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SteelChestplate.png and b/src/main/resources/assets/mekanism/textures/items/SteelChestplate.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SteelDust.png b/src/main/resources/assets/mekanism/textures/items/SteelDust.png index cdac9358a..01675de41 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SteelDust.png and b/src/main/resources/assets/mekanism/textures/items/SteelDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SteelHelmet.png b/src/main/resources/assets/mekanism/textures/items/SteelHelmet.png index a0412d573..4172b706b 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SteelHelmet.png and b/src/main/resources/assets/mekanism/textures/items/SteelHelmet.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SteelHoe.png b/src/main/resources/assets/mekanism/textures/items/SteelHoe.png index de0c9b43c..018fe9245 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SteelHoe.png and b/src/main/resources/assets/mekanism/textures/items/SteelHoe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SteelIngot.png b/src/main/resources/assets/mekanism/textures/items/SteelIngot.png index b29341edc..e4bed3321 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SteelIngot.png and b/src/main/resources/assets/mekanism/textures/items/SteelIngot.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SteelLeggings.png b/src/main/resources/assets/mekanism/textures/items/SteelLeggings.png index b4781df9a..272611613 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SteelLeggings.png and b/src/main/resources/assets/mekanism/textures/items/SteelLeggings.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SteelPaxel.png b/src/main/resources/assets/mekanism/textures/items/SteelPaxel.png index 1e0f0c4fe..d22951209 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SteelPaxel.png and b/src/main/resources/assets/mekanism/textures/items/SteelPaxel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SteelPickaxe.png b/src/main/resources/assets/mekanism/textures/items/SteelPickaxe.png index 096f170b0..9b96bbdda 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SteelPickaxe.png and b/src/main/resources/assets/mekanism/textures/items/SteelPickaxe.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SteelShovel.png b/src/main/resources/assets/mekanism/textures/items/SteelShovel.png index 779c78201..fcb9c93d4 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SteelShovel.png and b/src/main/resources/assets/mekanism/textures/items/SteelShovel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SteelSword.png b/src/main/resources/assets/mekanism/textures/items/SteelSword.png index 3ea9f6961..ee892b377 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SteelSword.png and b/src/main/resources/assets/mekanism/textures/items/SteelSword.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/StonePaxel.png b/src/main/resources/assets/mekanism/textures/items/StonePaxel.png index daeb99288..b82cdaa0d 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/StonePaxel.png and b/src/main/resources/assets/mekanism/textures/items/StonePaxel.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/StorageTank.png b/src/main/resources/assets/mekanism/textures/items/StorageTank.png deleted file mode 100644 index fe996df43..000000000 Binary files a/src/main/resources/assets/mekanism/textures/items/StorageTank.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/items/Substrate.png b/src/main/resources/assets/mekanism/textures/items/Substrate.png index 44074f562..d95ae1913 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/Substrate.png and b/src/main/resources/assets/mekanism/textures/items/Substrate.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/Substrate_Alt.png b/src/main/resources/assets/mekanism/textures/items/Substrate_Alt.png new file mode 100644 index 000000000..80b0b17bb Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/items/Substrate_Alt.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/SulfurDust.png b/src/main/resources/assets/mekanism/textures/items/SulfurDust.png index 05e229616..12e6db275 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/SulfurDust.png and b/src/main/resources/assets/mekanism/textures/items/SulfurDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/TeleportationCore.png b/src/main/resources/assets/mekanism/textures/items/TeleportationCore.png index 0cc31d66a..21df5c884 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/TeleportationCore.png and b/src/main/resources/assets/mekanism/textures/items/TeleportationCore.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/TinClump.png b/src/main/resources/assets/mekanism/textures/items/TinClump.png index 33b66866b..dc5de63ef 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/TinClump.png and b/src/main/resources/assets/mekanism/textures/items/TinClump.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/TinCrystal.png b/src/main/resources/assets/mekanism/textures/items/TinCrystal.png index 80cc2bc51..6a469e963 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/TinCrystal.png and b/src/main/resources/assets/mekanism/textures/items/TinCrystal.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/TinDust.png b/src/main/resources/assets/mekanism/textures/items/TinDust.png index 56708f508..db7131ffe 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/TinDust.png and b/src/main/resources/assets/mekanism/textures/items/TinDust.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/TinIngot.png b/src/main/resources/assets/mekanism/textures/items/TinIngot.png index 44e1ecb66..1fbe33954 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/TinIngot.png and b/src/main/resources/assets/mekanism/textures/items/TinIngot.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/TinShard.png b/src/main/resources/assets/mekanism/textures/items/TinShard.png index 5e7e766d6..aef971100 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/TinShard.png and b/src/main/resources/assets/mekanism/textures/items/TinShard.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/TurbineBlade.png b/src/main/resources/assets/mekanism/textures/items/TurbineBlade.png index 9abdd384d..8d1b57b74 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/TurbineBlade.png and b/src/main/resources/assets/mekanism/textures/items/TurbineBlade.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/UltimateControlCircuit.png b/src/main/resources/assets/mekanism/textures/items/UltimateControlCircuit.png index a5a552092..3f7c39b38 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/UltimateControlCircuit.png and b/src/main/resources/assets/mekanism/textures/items/UltimateControlCircuit.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/WalkieTalkieOff.png b/src/main/resources/assets/mekanism/textures/items/WalkieTalkieOff.png index ec5acf2d3..86567c214 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/WalkieTalkieOff.png and b/src/main/resources/assets/mekanism/textures/items/WalkieTalkieOff.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch1.png b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch1.png index b43344e64..df7df3c40 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch1.png and b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch1.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch2.png b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch2.png index c6eb01434..3f33ff28a 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch2.png and b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch2.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch3.png b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch3.png index c2caf91be..d907aec10 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch3.png and b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch3.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch4.png b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch4.png index 52f9f36c1..c436a7ca0 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch4.png and b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch4.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch5.png b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch5.png index b719948aa..e945bd339 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch5.png and b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch5.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch6.png b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch6.png index 6bb036b3b..e066490f7 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch6.png and b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch6.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch7.png b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch7.png index 87d9a0c20..2808e0951 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch7.png and b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch7.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch8.png b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch8.png index f1118da87..be6d00d2b 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch8.png and b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch8.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch9.png b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch9.png index 3b7becf73..fa0bcd9e8 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch9.png and b/src/main/resources/assets/mekanism/textures/items/WalkieTalkie_ch9.png differ diff --git a/src/main/resources/assets/mekanism/textures/items/WoodPaxel.png b/src/main/resources/assets/mekanism/textures/items/WoodPaxel.png index 3e318f108..52349d7b3 100644 Binary files a/src/main/resources/assets/mekanism/textures/items/WoodPaxel.png and b/src/main/resources/assets/mekanism/textures/items/WoodPaxel.png differ