From 3b75d9ff1e321fd2a3a2c8b8467caf4a70c5bcff Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Mon, 9 May 2016 00:10:54 -0400 Subject: [PATCH 01/22] Loads of work on CTM, work on fixing multi blocks --- src/main/java/mekanism/api/Coord4D.java | 20 +- .../java/mekanism/client/ClientProxy.java | 4 +- .../java/mekanism/client/render/ctm/CTM.java | 39 ++-- .../render/ctm/CTMBlockRenderContext.java | 16 +- .../mekanism/client/render/ctm/CTMData.java | 60 ++++++ ...{TextureStitcher.java => CTMRegistry.java} | 30 ++- .../client/render/ctm/ChiselTextureCTM.java | 34 +-- .../mekanism/client/render/ctm/ICTMBlock.java | 11 +- .../client/render/ctm/ModelChisel.java | 50 ++--- .../client/render/ctm/ModelChiselBlock.java | 97 ++++++--- .../render/ctm/PropertyCTMRenderContext.java | 16 +- .../java/mekanism/client/render/ctm/Quad.java | 88 ++++---- .../mekanism/client/render/ctm/Submap.java | 51 ++++- .../render/ctm/TextureSpriteCallback.java | 14 +- .../java/mekanism/common/CommonProxy.java | 2 - .../java/mekanism/common/MekanismBlocks.java | 34 ++- .../java/mekanism/common/PacketHandler.java | 12 +- .../mekanism/common/block/BlockBasic.java | 196 ++++++++++-------- .../common/block/states/BlockStateBasic.java | 6 +- .../content/boiler/BoilerUpdateProtocol.java | 4 +- .../common/multiblock/IMultiblock.java | 2 +- .../multiblock/IStructuralMultiblock.java | 2 +- .../common/multiblock/UpdateProtocol.java | 16 +- .../common/tile/TileEntityBasicBlock.java | 3 +- .../common/tile/TileEntityElectricPump.java | 5 +- .../common/tile/TileEntityMultiblock.java | 8 +- .../tile/TileEntityStructuralGlass.java | 6 +- .../mekanism/blockstates/dynamic_tank.json | 2 +- .../mekanism/blockstates/dynamic_valve.json | 2 +- .../blockstates/induction_casing.json | 2 +- .../blockstates/structural_glass.json | 2 +- .../mekanism/blockstates/teleporter.json | 2 +- .../blockstates/teleporter_frame.json | 2 +- .../mekanism/textures/blocks/DynamicTank.png | Bin 1208 -> 0 bytes .../textures/blocks/ctm/DynamicValve.png | Bin 1253 -> 0 bytes .../ctm/ReactorControllerOff-ctm_Alt.png | Bin 1718 -> 0 bytes .../ctm/ReactorControllerOn-ctm_Alt.png | Bin 1829 -> 0 bytes .../blocks/ctm/ReactorControllerOn_Alt.png | Bin 1581 -> 0 bytes .../textures/blocks/ctm/StructuralGlass.png | Bin 1225 -> 0 bytes ...erCasing-ctm.png => boiler_casing-ctm.png} | Bin .../{BoilerCasing.png => boiler_casing.png} | Bin ...ilerValve-ctm.png => boiler_valve-ctm.png} | Bin .../ctm/{BoilerValve.png => boiler_valve.png} | Bin ...micGlass-ctm.png => dynamic_glass-ctm.png} | Bin .../dynamic_glass.png} | Bin ...micValve-ctm.png => dynamic_valve-ctm.png} | Bin .../dynamic_valve.png} | Bin ...l-ctm.png => electromagnetic_coil-ctm.png} | Bin ...neticCoil.png => electromagnetic_coil.png} | Bin ...asing-ctm.png => induction_casing-ctm.png} | Bin ...ductionCasing.png => induction_casing.png} | Bin ...tm.png => induction_cell_advanced-ctm.png} | Bin ...vanced.png => induction_cell_advanced.png} | Bin ...c-ctm.png => induction_cell_basic-ctm.png} | Bin ...CellBasic.png => induction_cell_basic.png} | Bin ...e-ctm.png => induction_cell_elite-ctm.png} | Bin ...CellElite.png => induction_cell_elite.png} | Bin ...tm.png => induction_cell_ultimate-ctm.png} | Bin ...timate.png => induction_cell_ultimate.png} | Bin ...t-ctm.png => induction_port_input-ctm.png} | Bin ...PortInput.png => induction_port_input.png} | Bin ...-ctm.png => induction_port_output-ctm.png} | Bin ...rtOutput.png => induction_port_output.png} | Bin ...ng => induction_provider_advanced-ctm.png} | Bin ...ed.png => induction_provider_advanced.png} | Bin ...m.png => induction_provider_basic-ctm.png} | Bin ...Basic.png => induction_provider_basic.png} | Bin ...m.png => induction_provider_elite-ctm.png} | Bin ...Elite.png => induction_provider_elite.png} | Bin ...ng => induction_provider_ultimate-ctm.png} | Bin ...te.png => induction_provider_ultimate.png} | Bin ...ctm.png => reactor_controller_off-ctm.png} | Bin ...llerOff.png => reactor_controller_off.png} | Bin ...-ctm.png => reactor_controller_on-ctm.png} | Bin ...rollerOn.png => reactor_controller_on.png} | Bin ...torFrame-ctm.png => reactor_frame-ctm.png} | Bin .../{ReactorFrame.png => reactor_frame.png} | Bin ...torGlass-ctm.png => reactor_glass-ctm.png} | Bin .../{ReactorGlass.png => reactor_glass.png} | Bin ...us-ctm.png => reactor_laser_focus-ctm.png} | Bin ...LaserFocus.png => reactor_laser_focus.png} | Bin ...-ctm.png => reactor_logic_adapter-ctm.png} | Bin ...cAdapter.png => reactor_logic_adapter.png} | Bin ...tm.png => reactor_neutron_capture-ctm.png} | Bin ...apture.png => reactor_neutron_capture.png} | Bin ...actorPort-ctm.png => reactor_port-ctm.png} | Bin .../ctm/{ReactorPort.png => reactor_port.png} | Bin ...Glass-ctm.png => structural_glass-ctm.png} | Bin ...{DynamicGlass.png => structural_glass.png} | Bin ...t-ctm.png => superheating_element-ctm.png} | Bin ...ngElement.png => superheating_element.png} | Bin ...tm.png => superheating_element_on-ctm.png} | Bin ...mentOn.png => superheating_element_on.png} | Bin ...Frame-ctm.png => teleporter_frame-ctm.png} | Bin ...leporterFrame.png => teleporter_frame.png} | Bin ....png => thermal_evaporation_block-ctm.png} | Bin ...lock.png => thermal_evaporation_block.png} | Bin ...=> thermal_evaporation_controller-ctm.png} | Bin ...png => thermal_evaporation_controller.png} | Bin ...thermal_evaporation_controller_on-ctm.png} | Bin ..._evaporation_controller_on-ctm.png.mcmeta} | 0 ... => thermal_evaporation_controller_on.png} | Bin ...rmal_evaporation_controller_on.png.mcmeta} | 0 ....png => thermal_evaporation_valve-ctm.png} | Bin ...alve.png => thermal_evaporation_valve.png} | Bin ...eCasing-ctm.png => turbine_casing-ctm.png} | Bin .../{TurbineCasing.png => turbine_casing.png} | Bin ...ineValve-ctm.png => turbine_valve-ctm.png} | Bin .../{TurbineValve.png => turbine_valve.png} | Bin ...rbineVent-ctm.png => turbine_vent-ctm.png} | Bin .../ctm/{TurbineVent.png => turbine_vent.png} | Bin 111 files changed, 526 insertions(+), 312 deletions(-) create mode 100644 src/main/java/mekanism/client/render/ctm/CTMData.java rename src/main/java/mekanism/client/render/ctm/{TextureStitcher.java => CTMRegistry.java} (69%) delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/DynamicTank.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicValve.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff-ctm_Alt.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn-ctm_Alt.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn_Alt.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/StructuralGlass.png rename src/main/resources/assets/mekanism/textures/blocks/ctm/{BoilerCasing-ctm.png => boiler_casing-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{BoilerCasing.png => boiler_casing.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{BoilerValve-ctm.png => boiler_valve-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{BoilerValve.png => boiler_valve.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{DynamicGlass-ctm.png => dynamic_glass-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/{DynamicGlass.png => ctm/dynamic_glass.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{DynamicValve-ctm.png => dynamic_valve-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/{DynamicValve.png => ctm/dynamic_valve.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ElectromagneticCoil-ctm.png => electromagnetic_coil-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ElectromagneticCoil.png => electromagnetic_coil.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{InductionCasing-ctm.png => induction_casing-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{InductionCasing.png => induction_casing.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{InductionCellAdvanced-ctm.png => induction_cell_advanced-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{InductionCellAdvanced.png => induction_cell_advanced.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{InductionCellBasic-ctm.png => induction_cell_basic-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{InductionCellBasic.png => induction_cell_basic.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{InductionCellElite-ctm.png => induction_cell_elite-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{InductionCellElite.png => induction_cell_elite.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{InductionCellUltimate-ctm.png => induction_cell_ultimate-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{InductionCellUltimate.png => induction_cell_ultimate.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{InductionPortInput-ctm.png => induction_port_input-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{InductionPortInput.png => induction_port_input.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{InductionPortOutput-ctm.png => induction_port_output-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{InductionPortOutput.png => induction_port_output.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{InductionProviderAdvanced-ctm.png => induction_provider_advanced-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{InductionProviderAdvanced.png => induction_provider_advanced.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{InductionProviderBasic-ctm.png => induction_provider_basic-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{InductionProviderBasic.png => induction_provider_basic.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{InductionProviderElite-ctm.png => induction_provider_elite-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{InductionProviderElite.png => induction_provider_elite.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{InductionProviderUltimate-ctm.png => induction_provider_ultimate-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{InductionProviderUltimate.png => induction_provider_ultimate.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ReactorControllerOff-ctm.png => reactor_controller_off-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ReactorControllerOff.png => reactor_controller_off.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ReactorControllerOn-ctm.png => reactor_controller_on-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ReactorControllerOn.png => reactor_controller_on.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ReactorFrame-ctm.png => reactor_frame-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ReactorFrame.png => reactor_frame.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ReactorGlass-ctm.png => reactor_glass-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ReactorGlass.png => reactor_glass.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ReactorLaserFocus-ctm.png => reactor_laser_focus-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ReactorLaserFocus.png => reactor_laser_focus.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ReactorLogicAdapter-ctm.png => reactor_logic_adapter-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ReactorLogicAdapter.png => reactor_logic_adapter.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ReactorNeutronCapture-ctm.png => reactor_neutron_capture-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ReactorNeutronCapture.png => reactor_neutron_capture.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ReactorPort-ctm.png => reactor_port-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ReactorPort.png => reactor_port.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{StructuralGlass-ctm.png => structural_glass-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{DynamicGlass.png => structural_glass.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{SuperheatingElement-ctm.png => superheating_element-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{SuperheatingElement.png => superheating_element.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{SuperheatingElementOn-ctm.png => superheating_element_on-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{SuperheatingElementOn.png => superheating_element_on.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{TeleporterFrame-ctm.png => teleporter_frame-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{TeleporterFrame.png => teleporter_frame.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ThermalEvaporationBlock-ctm.png => thermal_evaporation_block-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ThermalEvaporationBlock.png => thermal_evaporation_block.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ThermalEvaporationController-ctm.png => thermal_evaporation_controller-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ThermalEvaporationController.png => thermal_evaporation_controller.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ThermalEvaporationControllerOn-ctm.png => thermal_evaporation_controller_on-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ThermalEvaporationControllerOn-ctm.png.mcmeta => thermal_evaporation_controller_on-ctm.png.mcmeta} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ThermalEvaporationControllerOn.png => thermal_evaporation_controller_on.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ThermalEvaporationControllerOn.png.mcmeta => thermal_evaporation_controller_on.png.mcmeta} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ThermalEvaporationValve-ctm.png => thermal_evaporation_valve-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{ThermalEvaporationValve.png => thermal_evaporation_valve.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{TurbineCasing-ctm.png => turbine_casing-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{TurbineCasing.png => turbine_casing.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{TurbineValve-ctm.png => turbine_valve-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{TurbineValve.png => turbine_valve.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{TurbineVent-ctm.png => turbine_vent-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{TurbineVent.png => turbine_vent.png} (100%) diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index e81c3d74d..a9d51b79b 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -30,7 +30,6 @@ import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint; */ public class Coord4D extends BlockPos { - public int dimensionId; /** @@ -127,7 +126,9 @@ public class Coord4D extends BlockPos return null; } - return world.getTileEntity(this); + TileEntity tile = world.getTileEntity(this); + + return (tile != null && tile.hasWorldObj()) ? tile : null; } /** @@ -172,9 +173,7 @@ public class Coord4D extends BlockPos */ public void write(ArrayList data) { - data.add(getX()); - data.add(getY()); - data.add(getZ()); + data.add(toLong()); data.add(dimensionId); } @@ -281,7 +280,8 @@ public class Coord4D extends BlockPos */ public Coord4D difference(Vec3i vec) { - return vec.getX() == 0 && vec.getY() == 0 && vec.getZ() == 0 ? this : new Coord4D(this.getX() - vec.getX(), this.getY() - vec.getY(), this.getZ() - vec.getZ()); } + return vec.getX() == 0 && vec.getY() == 0 && vec.getZ() == 0 ? this : new Coord4D(this.getX() - vec.getX(), this.getY() - vec.getY(), this.getZ() - vec.getZ()); + } /** * A method used to find the EnumFacing represented by the distance of the defined Coord4D. Most likely won't have many @@ -396,12 +396,6 @@ public class Coord4D extends BlockPos return new AxisAlignedBB(this, add(1,1,1)); } - @Override - public Coord4D clone() - { - return new Coord4D(getX(), getY(), getZ(), dimensionId); - } - @Override public String toString() { @@ -419,7 +413,6 @@ public class Coord4D extends BlockPos ) && !(obj instanceof Coord4D && ((Coord4D)obj).dimensionId != dimensionId); } -/* @Override public int hashCode() { @@ -430,5 +423,4 @@ public class Coord4D extends BlockPos code = 31 * code + dimensionId; return code; } -*/ } \ No newline at end of file diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index fae65f366..def470266 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -66,7 +66,7 @@ import mekanism.client.gui.GuiTransporterConfig; import mekanism.client.gui.GuiUpgradeManagement; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.RenderTickHandler; -import mekanism.client.render.ctm.TextureStitcher; +import mekanism.client.render.ctm.CTMRegistry; import mekanism.client.render.entity.RenderBalloon; import mekanism.client.render.entity.RenderFlame; import mekanism.client.render.entity.RenderObsidianTNTPrimed; @@ -648,7 +648,7 @@ public class ClientProxy extends CommonProxy { MekanismRenderer.init(); - MinecraftForge.EVENT_BUS.register(new TextureStitcher()); + MinecraftForge.EVENT_BUS.register(new CTMRegistry()); //Register entity rendering handlers RenderingRegistry.registerEntityRenderingHandler(EntityObsidianTNT.class, new IRenderFactory() { diff --git a/src/main/java/mekanism/client/render/ctm/CTM.java b/src/main/java/mekanism/client/render/ctm/CTM.java index 688df9230..862aa322c 100644 --- a/src/main/java/mekanism/client/render/ctm/CTM.java +++ b/src/main/java/mekanism/client/render/ctm/CTM.java @@ -1,5 +1,13 @@ package mekanism.client.render.ctm; +import static mekanism.client.render.ctm.Dir.BOTTOM; +import static mekanism.client.render.ctm.Dir.BOTTOM_LEFT; +import static mekanism.client.render.ctm.Dir.BOTTOM_RIGHT; +import static mekanism.client.render.ctm.Dir.LEFT; +import static mekanism.client.render.ctm.Dir.RIGHT; +import static mekanism.client.render.ctm.Dir.TOP; +import static mekanism.client.render.ctm.Dir.TOP_LEFT; +import static mekanism.client.render.ctm.Dir.TOP_RIGHT; import gnu.trove.map.TIntObjectMap; import gnu.trove.map.hash.TIntObjectHashMap; @@ -8,13 +16,12 @@ import java.util.EnumMap; import net.minecraft.block.state.IBlockState; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.IStringSerializable; import net.minecraft.world.IBlockAccess; import com.google.common.base.Optional; import com.google.common.collect.Maps; -import static mekanism.client.render.ctm.Dir.*; - // @formatter:off /** * The CTM renderer will draw the block's FACE using by assembling 4 quadrants from the 5 available block @@ -254,26 +261,30 @@ public class CTM { * The state to check against for connection. * @return True if the given block can connect to the given location on the given side. */ - public boolean isConnected(IBlockAccess world, BlockPos current, BlockPos connection, EnumFacing dir, IBlockState state) { - -// if (CTMLib.chiselLoaded() && connectionBlocked(world, x, y, z, dir.ordinal())) { -// return false; -// } - + public boolean isConnected(IBlockAccess world, BlockPos current, BlockPos connection, EnumFacing dir, IBlockState state) + { BlockPos pos2 = connection.add(dir.getDirectionVec()); boolean disableObscured = disableObscuredFaceCheck.or(disableObscuredFaceCheckConfig); IBlockState con = getBlockOrFacade(world, connection, dir); IBlockState obscuring = disableObscured ? null : getBlockOrFacade(world, pos2, dir); + + CTMData data = ((ICTMBlock)state.getBlock()).getCTMData(state); // no block or a bad API user if (con == null) { return false; } - // TODO VERY TEMPORARY - boolean ret = con.getBlock() == state.getBlock(); + boolean ret = false; + + if(con.getBlock() instanceof ICTMBlock) + { + String state2 = ((IStringSerializable)con.getValue(((ICTMBlock)con.getBlock()).getTypeProperty())).getName(); + + ret = data.acceptableBlockStates.contains(state2); + } // no block obscuring this face if (obscuring == null) { @@ -286,14 +297,6 @@ public class CTM { return ret; } -// private boolean connectionBlocked(IBlockAccess world, int x, int y, int z, int side) { -// Block block = world.getBlock(x, y, z); -// if (block instanceof IConnectable) { -// return !((IConnectable) block).canConnectCTM(world, x, y, z, side); -// } -// return false; -// } - public IBlockState getBlockOrFacade(IBlockAccess world, BlockPos pos, EnumFacing side) { IBlockState state = world.getBlockState(pos); return state; diff --git a/src/main/java/mekanism/client/render/ctm/CTMBlockRenderContext.java b/src/main/java/mekanism/client/render/ctm/CTMBlockRenderContext.java index 20c351bbc..ceed95c0e 100644 --- a/src/main/java/mekanism/client/render/ctm/CTMBlockRenderContext.java +++ b/src/main/java/mekanism/client/render/ctm/CTMBlockRenderContext.java @@ -6,23 +6,27 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; -public class CTMBlockRenderContext { - +public class CTMBlockRenderContext +{ private EnumMap ctmData = new EnumMap<>(EnumFacing.class); - public CTMBlockRenderContext(IBlockAccess world, BlockPos pos) { - for (EnumFacing face : EnumFacing.VALUES) { + public CTMBlockRenderContext(IBlockAccess world, BlockPos pos) + { + for(EnumFacing face : EnumFacing.VALUES) + { CTM ctm = createCTM(); ctm.createSubmapIndices(world, pos, face); ctmData.put(face, ctm); } } - protected CTM createCTM() { + protected CTM createCTM() + { return CTM.getInstance(); } - public CTM getCTM(EnumFacing face) { + public CTM getCTM(EnumFacing face) + { return ctmData.get(face); } } diff --git a/src/main/java/mekanism/client/render/ctm/CTMData.java b/src/main/java/mekanism/client/render/ctm/CTMData.java new file mode 100644 index 000000000..2f1e97a3e --- /dev/null +++ b/src/main/java/mekanism/client/render/ctm/CTMData.java @@ -0,0 +1,60 @@ +package mekanism.client.render.ctm; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.IStringSerializable; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public class CTMData +{ + public List acceptableBlockStates = new ArrayList(); + + public boolean renderConvexConnections = false; + + public String facingOverride; + + public CTMData(IStringSerializable... states) + { + for(IStringSerializable state : states) + { + acceptableBlockStates.add(state.getName()); + } + } + + public CTMData setRenderConvexConnections() + { + renderConvexConnections = true; + return this; + } + + public CTMData setFacingOverride(String s) + { + facingOverride= s; + return this; + } + + public boolean hasFacingOverride() + { + return facingOverride != null; + } + + @SideOnly(Side.CLIENT) + public boolean shouldRenderSide(IBlockAccess world, BlockPos pos, EnumFacing side) + { + IBlockState state = world.getBlockState(pos); + + if(state.getBlock() instanceof ICTMBlock) + { + IStringSerializable serializable = (IStringSerializable)state.getValue(((ICTMBlock)state.getBlock()).getTypeProperty()); + return acceptableBlockStates.contains(serializable.getName()); + } + + return false; + } +} diff --git a/src/main/java/mekanism/client/render/ctm/TextureStitcher.java b/src/main/java/mekanism/client/render/ctm/CTMRegistry.java similarity index 69% rename from src/main/java/mekanism/client/render/ctm/TextureStitcher.java rename to src/main/java/mekanism/client/render/ctm/CTMRegistry.java index 12a9fd84b..bf0142cc9 100644 --- a/src/main/java/mekanism/client/render/ctm/TextureStitcher.java +++ b/src/main/java/mekanism/client/render/ctm/CTMRegistry.java @@ -19,18 +19,22 @@ import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.TRSRTransformation; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -public class TextureStitcher { - +public class CTMRegistry +{ private static List textures = new ArrayList(); private IBakedModel baseModel; public static ResourceLocation baseResource = new ResourceLocation("mekanism:block/ctm_block"); - public static String[] ctmTypes = new String[] {"dynamic_tank"}; + public static String[] ctmTypes = new String[] {"dynamic_tank", "structural_glass", "dynamic_valve", "teleporter", "teleporter_frame", "induction_casing", "induction_port_input", "induction_port_output", + "induction_cell_basic", "induction_cell_advanced", "induction_cell_elite", "induction_cell_ultimate", "induction_provider_basic", "induction_provider_advanced", "induction_provider_elite", + "induction_provider_ultimate", "thermal_evaporation_controller", "thermal_evaporation_controller_on", "thermal_evaporation_valve", "superheating_element", "superheating_element_on", "reactor_port", + "reactor_neutron_capture", "reactor_logic_adapter", "reactor_laser_focus", "reactor_glass", "reactor_frame", "reactor_controller_on", "reactor_controller_off", "boiler_casing", "boiler_valve", + "electromagnetic_coil", "thermal_evaporation_valve", "thermal_evaporation_block", "turbine_casing", "turbine_vent", "turbine_valve"}; public static Map textureCache = new HashMap(); - public TextureStitcher() + public CTMRegistry() { if(textureCache.isEmpty()) { @@ -42,8 +46,10 @@ public class TextureStitcher { } @SubscribeEvent - public void onTextureStitch(TextureStitchEvent.Pre event) { - for (TextureSpriteCallback callback : textures) { + public void onTextureStitch(TextureStitchEvent.Pre event) + { + for(TextureSpriteCallback callback : textures) + { callback.stitch(event.map); } } @@ -54,7 +60,7 @@ public class TextureStitcher { IModel model = event.modelLoader.getModel(baseResource); baseModel = model.bake(new TRSRTransformation(ModelRotation.X0_Y0), Attributes.DEFAULT_BAKED_FORMAT, r -> Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(r.toString())); - for (String ctm : ctmTypes) + for(String ctm : ctmTypes) { ModelChisel chiselModel = new ModelChisel(baseModel, ctm); chiselModel.load(); @@ -79,14 +85,4 @@ public class TextureStitcher { return new ChiselTextureCTM(EnumWorldBlockLayer.SOLID, callbacks); } - - public static ChiselFace createFace(String name) - { - ChiselFace face = new ChiselFace(); - - face.addTexture(textureCache.get(name)); - face.setLayer(EnumWorldBlockLayer.SOLID); - - return face; - } } diff --git a/src/main/java/mekanism/client/render/ctm/ChiselTextureCTM.java b/src/main/java/mekanism/client/render/ctm/ChiselTextureCTM.java index 6a2bf6c64..e86ac1cf3 100644 --- a/src/main/java/mekanism/client/render/ctm/ChiselTextureCTM.java +++ b/src/main/java/mekanism/client/render/ctm/ChiselTextureCTM.java @@ -7,28 +7,30 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -import lombok.Getter; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.ResourceLocation; -public class ChiselTextureCTM { - - @Getter +public class ChiselTextureCTM +{ protected EnumWorldBlockLayer layer; - protected TextureSpriteCallback[] sprites; + public TextureSpriteCallback[] sprites; - public ChiselTextureCTM(EnumWorldBlockLayer layer, TextureSpriteCallback[] sprites) { + public ChiselTextureCTM(EnumWorldBlockLayer layer, TextureSpriteCallback[] sprites) + { this.layer = layer; this.sprites = sprites; } - public List transformQuad(BakedQuad bq, CTMBlockRenderContext context, int quadGoal) { + public List transformQuad(BakedQuad bq, CTMBlockRenderContext context, int quadGoal) + { Quad quad = Quad.from(bq, DefaultVertexFormats.ITEM); - if (context == null) { + + if(context == null) + { return Collections.singletonList(quad.transformUVs(sprites[0].getSprite()).rebake()); } @@ -36,21 +38,27 @@ public class ChiselTextureCTM { int[] ctm = ((CTMBlockRenderContext)context).getCTM(bq.getFace()).getSubmapIndices(); - for (int i = 0; i < quads.length; i++) { + for(int i = 0; i < quads.length; i++) + { Quad q = quads[i]; - if (q != null) { - int ctmid = q.getUvs().normalize().getQuadrant(); + + if(q != null) + { + int ctmid = q.getUVs().normalize().getQuadrant(); quads[i] = q.grow().transformUVs(sprites[ctm[ctmid] > 15 ? 0 : 1].getSprite(), CTM.uvs[ctm[ctmid]].normalize()); } } + return Arrays.stream(quads).filter(Objects::nonNull).map(q -> q.rebake()).collect(Collectors.toList()); } - public TextureAtlasSprite getParticle(){ + public TextureAtlasSprite getParticle() + { return sprites[0].getSprite(); } - public Collection getTextures() { + public Collection getTextures() + { return Arrays.stream(sprites).map(TextureSpriteCallback::getLocation).collect(Collectors.toList()); } } diff --git a/src/main/java/mekanism/client/render/ctm/ICTMBlock.java b/src/main/java/mekanism/client/render/ctm/ICTMBlock.java index 9c5d23fc0..99f421826 100644 --- a/src/main/java/mekanism/client/render/ctm/ICTMBlock.java +++ b/src/main/java/mekanism/client/render/ctm/ICTMBlock.java @@ -1,5 +1,14 @@ package mekanism.client.render.ctm; -public interface ICTMBlock { +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.IStringSerializable; +public interface ICTMBlock +{ + public CTMData getCTMData(IBlockState state); + + public PropertyEnum getTypeProperty(); + + public String getOverrideTexture(IBlockState state); } diff --git a/src/main/java/mekanism/client/render/ctm/ModelChisel.java b/src/main/java/mekanism/client/render/ctm/ModelChisel.java index adb3e6630..ac0492585 100644 --- a/src/main/java/mekanism/client/render/ctm/ModelChisel.java +++ b/src/main/java/mekanism/client/render/ctm/ModelChisel.java @@ -7,8 +7,6 @@ import java.util.List; import java.util.Map; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.block.statemap.DefaultStateMapper; -import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.resources.model.IBakedModel; @@ -24,20 +22,15 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - -public class ModelChisel implements IModel { - - private static StateMapperBase mapper = new DefaultStateMapper(); - +public class ModelChisel implements IModel +{ private Map overrides = Maps.newHashMap(); - private transient ChiselFace faceObj; - private transient Map overridesObj = new EnumMap<>(EnumFacing.class); + private transient ChiselTextureCTM faceObj; + private transient Map overridesObj = new EnumMap<>(EnumFacing.class); private transient IBakedModel modelObj; - private transient Map stateMap = Maps.newHashMap(); - private transient List textures = Lists.newArrayList(); public String modelName; @@ -49,44 +42,53 @@ public class ModelChisel implements IModel { } @Override - public Collection getDependencies() { + public Collection getDependencies() + { return new ArrayList(); } @Override - public Collection getTextures() { + public Collection getTextures() + { return ImmutableList.copyOf(textures); } @Override - public IFlexibleBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter) { + public IFlexibleBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter) + { return null; } @Override - public IModelState getDefaultState() { + public IModelState getDefaultState() + { return TRSRTransformation.identity(); } - void load() { - if (faceObj != null) { + void load() + { + if(faceObj != null) + { return; } - System.out.println("LOADING MODEL"); - faceObj = TextureStitcher.createFace(modelName); - faceObj.getTextureList().forEach(t -> textures.addAll(t.getTextures())); - overridesObj.values().forEach(f -> f.getTextureList().forEach(t -> textures.addAll(t.getTextures()))); + + faceObj = CTMRegistry.textureCache.get(modelName); + textures.addAll(faceObj.getTextures()); + overridesObj.values().forEach(t -> textures.addAll(t.getTextures())); } - public ChiselFace getDefaultFace() { + public ChiselTextureCTM getDefaultFace() + { return faceObj; } - public ChiselFace getFace(EnumFacing facing) { + public ChiselTextureCTM getFace(EnumFacing facing) + { return overridesObj.getOrDefault(facing, faceObj); } - public IBakedModel getModel(IBlockState state) { + public IBakedModel getModel(IBlockState state) + { return modelObj; } } diff --git a/src/main/java/mekanism/client/render/ctm/ModelChiselBlock.java b/src/main/java/mekanism/client/render/ctm/ModelChiselBlock.java index 2d09eb758..b41be7899 100644 --- a/src/main/java/mekanism/client/render/ctm/ModelChiselBlock.java +++ b/src/main/java/mekanism/client/render/ctm/ModelChiselBlock.java @@ -8,6 +8,7 @@ import javax.vecmath.Matrix4f; import javax.vecmath.Vector3f; import mekanism.common.block.BlockBasic; +import mekanism.common.block.states.BlockStateFacing; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.BakedQuad; @@ -32,14 +33,13 @@ import org.apache.commons.lang3.tuple.Pair; import com.google.common.collect.FluentIterable; import com.google.common.collect.Lists; -import com.google.common.collect.Ordering; /** * Model for all chisel blocks */ @SuppressWarnings("deprecation") -public class ModelChiselBlock implements ISmartBlockModel, ISmartItemModel, IPerspectiveAwareModel { - +public class ModelChiselBlock implements ISmartBlockModel, ISmartItemModel, IPerspectiveAwareModel +{ public static final TRSRTransformation DEFAULT_BLOCK_THIRD_PERSON_TRANSOFRM = new TRSRTransformation(new Vector3f(0, 1.5f / 16f, -2.75f / 16f), TRSRTransformation.quatFromYXZDegrees(new Vector3f(10, -45, 170)), new Vector3f(0.375f, 0.375f, 0.375f), null); public static final Matrix4f DEFAULT_BLOCK_THIRD_PERSON_MATRIX = DEFAULT_BLOCK_THIRD_PERSON_TRANSOFRM.getMatrix(); @@ -48,107 +48,144 @@ public class ModelChiselBlock implements ISmartBlockModel, ISmartItemModel, IPer private ModelChisel model; - public ModelChiselBlock(List face, List general, ModelChisel model){ + public ModelChiselBlock(List face, List general, ModelChisel model) + { this.face = face; this.general = general; this.model = model; } - public ModelChiselBlock(ModelChisel model){ + public ModelChiselBlock(ModelChisel model) + { this(Collections.emptyList(), Collections.emptyList(), model); } @Override - public List getFaceQuads(EnumFacing facing){ + public List getFaceQuads(EnumFacing facing) + { return FluentIterable.from(face).filter(quad -> quad.getFace() == facing).toList(); } @Override - public List getGeneralQuads() { + public List getGeneralQuads() + { return general; } @Override - public boolean isAmbientOcclusion(){ + public boolean isAmbientOcclusion() + { return true; } @Override - public boolean isGui3d(){ + public boolean isGui3d() + { return true; } @Override - public boolean isBuiltInRenderer(){ + public boolean isBuiltInRenderer() + { return false; } @Override - public TextureAtlasSprite getParticleTexture() { + public TextureAtlasSprite getParticleTexture() + { return this.model.getDefaultFace().getParticle(); } @Override - public ItemCameraTransforms getItemCameraTransforms(){ + public ItemCameraTransforms getItemCameraTransforms() + { return ItemCameraTransforms.DEFAULT; } // TODO implement model caching, returning a new model every time is a HUGE waste of memory and CPU @Override - public IBakedModel handleBlockState(IBlockState stateIn) { - if (stateIn.getBlock() instanceof ICTMBlock && stateIn instanceof IExtendedBlockState) { + public IBakedModel handleBlockState(IBlockState stateIn) + { + if(stateIn.getBlock() instanceof ICTMBlock && stateIn instanceof IExtendedBlockState) + { IExtendedBlockState state = (IExtendedBlockState) stateIn; CTMBlockRenderContext ctxList = state.getValue(BlockBasic.ctmProperty); return createModel(stateIn, model, ctxList); - } else { + } + else { return this; } } @Override - public IBakedModel handleItemState(ItemStack stack) { + public IBakedModel handleItemState(ItemStack stack) + { Block block = ((ItemBlock) stack.getItem()).getBlock(); return createModel(block.getDefaultState(), model, null); } - private ModelChiselBlock createModel(IBlockState state, ModelChisel model, CTMBlockRenderContext ctx) { + private ModelChiselBlock createModel(IBlockState state, ModelChisel model, CTMBlockRenderContext ctx) + { List faceQuads = Lists.newArrayList(); List generalQuads = Lists.newArrayList(); - for (EnumFacing facing : EnumFacing.VALUES){ - ChiselFace face = model.getFace(facing); + + for(EnumFacing facing : EnumFacing.VALUES) + { + ChiselTextureCTM face = model.getFace(facing); + ICTMBlock block = (ICTMBlock)state.getBlock(); + CTMData data = block.getCTMData(state); + + if(block.getOverrideTexture(state) != null) + { + face = CTMRegistry.textureCache.get(block.getOverrideTexture(state)); + } - int quadGoal = ctx == null ? 1 : Ordering.natural().max(FluentIterable.from(face.getTextureList()).transform(tex -> CTM.QUADS_PER_SIDE)); + int quadGoal = ctx == null ? 1 : CTM.QUADS_PER_SIDE; IBakedModel baked = model.getModel(state); List origFaceQuads = baked.getFaceQuads(facing); List origGeneralQuads = FluentIterable.from(baked.getGeneralQuads()).filter(q -> q.getFace() == facing).toList(); - addAllQuads(origFaceQuads, face, ctx, quadGoal, faceQuads); - addAllQuads(origGeneralQuads, face, ctx, quadGoal, generalQuads); + addAllQuads(origFaceQuads, face, ctx, state, quadGoal, faceQuads); + addAllQuads(origGeneralQuads, face, ctx, state, quadGoal, generalQuads); } + return new ModelChiselBlock(faceQuads, generalQuads, model); } - private void addAllQuads(List from, ChiselFace face, @Nullable CTMBlockRenderContext ctx, int quadGoal, List to) { - for (BakedQuad q : from) { - for (ChiselTextureCTM tex : face.getTextureList()) { - to.addAll(tex.transformQuad(q, ctx == null ? null : ctx, quadGoal)); + private void addAllQuads(List from, ChiselTextureCTM tex, @Nullable CTMBlockRenderContext ctx, IBlockState state, int quadGoal, List to) + { + for(BakedQuad q : from) + { + ChiselTextureCTM toUse = tex; + CTMData data = ((ICTMBlock)state.getBlock()).getCTMData(state); + + if(data.hasFacingOverride() && q.getFace() == state.getValue(BlockStateFacing.facingProperty)) + { + toUse = CTMRegistry.textureCache.get(data.facingOverride); } + + to.addAll(toUse.transformQuad(q, ctx == null ? null : ctx, quadGoal)); } } @Override - public VertexFormat getFormat() { + public VertexFormat getFormat() + { return Attributes.DEFAULT_BAKED_FORMAT; } private Pair thirdPersonTransform; @Override - public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { - if (cameraTransformType == TransformType.THIRD_PERSON) { - if (thirdPersonTransform == null) { + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) + { + if(cameraTransformType == TransformType.THIRD_PERSON) + { + if(thirdPersonTransform == null) + { thirdPersonTransform = ImmutablePair.of(this, DEFAULT_BLOCK_THIRD_PERSON_MATRIX); } + return thirdPersonTransform; } return Pair.of(this, null); diff --git a/src/main/java/mekanism/client/render/ctm/PropertyCTMRenderContext.java b/src/main/java/mekanism/client/render/ctm/PropertyCTMRenderContext.java index 8759cb566..452a67813 100644 --- a/src/main/java/mekanism/client/render/ctm/PropertyCTMRenderContext.java +++ b/src/main/java/mekanism/client/render/ctm/PropertyCTMRenderContext.java @@ -5,25 +5,29 @@ import net.minecraftforge.common.property.IUnlistedProperty; /** * Block Property for the render context list */ -public class PropertyCTMRenderContext implements IUnlistedProperty { - +public class PropertyCTMRenderContext implements IUnlistedProperty +{ @Override - public String getName(){ + public String getName() + { return "connections"; } @Override - public boolean isValid(CTMBlockRenderContext value){ + public boolean isValid(CTMBlockRenderContext value) + { return true; } @Override - public Class getType(){ + public Class getType() + { return CTMBlockRenderContext.class; } @Override - public String valueToString(CTMBlockRenderContext value){ + public String valueToString(CTMBlockRenderContext value) + { return value.toString(); } } diff --git a/src/main/java/mekanism/client/render/ctm/Quad.java b/src/main/java/mekanism/client/render/ctm/Quad.java index 379d479c7..b674c180b 100644 --- a/src/main/java/mekanism/client/render/ctm/Quad.java +++ b/src/main/java/mekanism/client/render/ctm/Quad.java @@ -4,11 +4,6 @@ import java.util.List; import javax.annotation.Nullable; -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import lombok.Value; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -29,34 +24,31 @@ import com.google.common.collect.ListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.MultimapBuilder; -@ToString(of = { "vertPos", "vertUv" }) -public class Quad { - +public class Quad +{ public static final ISubmap TOP_LEFT = new Submap(8, 8, 0, 0); public static final ISubmap TOP_RIGHT = new Submap(8, 8, 8, 0); public static final ISubmap BOTTOM_LEFT = new Submap(8, 8, 0, 8); public static final ISubmap BOTTOM_RIGHT = new Submap(8, 8, 8, 8); - @Value - public static class Vertex { + public static class Vertex + { Vector3f pos; Vector2f uvs; } private static final TextureAtlasSprite BASE = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(TextureMap.LOCATION_MISSING_TEXTURE.toString()); - @ToString - public class UVs { - - @Getter + public class UVs + { private float minU, minV, maxU, maxV; - @Getter private final TextureAtlasSprite sprite; private final Vector2f[] data; - private UVs(Vector2f... data) { + private UVs(Vector2f... data) + { this(BASE, data); } @@ -134,6 +126,11 @@ public class Quad { public UVs relativize() { return relativize(sprite); } + + public TextureAtlasSprite getSprite() + { + return sprite; + } public UVs relativize(TextureAtlasSprite sprite) { Vector2f min = new Vector2f(sprite.getMinU(), sprite.getMinV()); @@ -190,8 +187,7 @@ public class Quad { private final Vector2f[] vertUv; // Technically nonfinal, but treated as such except in constructor - @Getter - private UVs uvs; + private UVs uvsObj; private final Builder builder; @@ -199,16 +195,17 @@ public class Quad { this.vertPos = verts; this.vertUv = uvs; this.builder = builder; - this.uvs = new UVs(uvs); + this.uvsObj = new UVs(uvs); } private Quad(Vector3f[] verts, UVs uvs, Builder builder) { this(verts, uvs.vectorize(), builder); - this.uvs = new UVs(uvs.getSprite(), vertUv); + this.uvsObj = new UVs(uvs.getSprite(), vertUv); } - - public void compute() { - + + public UVs getUVs() + { + return uvsObj; } public Quad[] subdivide(int count) { @@ -235,7 +232,7 @@ public class Quad { @Nullable private Pair divide(boolean vertical) { float min, max; - UVs uvs = getUvs().normalize(); + UVs uvs = uvsObj.normalize(); if (vertical) { min = uvs.minV; max = uvs.maxV; @@ -249,7 +246,7 @@ public class Quad { int firstIndex = 0; for (int i = 0; i < vertUv.length; i++) { - if (vertUv[i].y == getUvs().minV && vertUv[i].x == getUvs().minU) { + if (vertUv[i].y == uvsObj.minV && vertUv[i].x == uvsObj.minU) { firstIndex = i; break; } @@ -305,7 +302,7 @@ public class Quad { public Quad rotate(int amount) { Vector2f[] uvs = new Vector2f[4]; - TextureAtlasSprite s = getUvs().getSprite(); + TextureAtlasSprite s = uvsObj.getSprite(); for (int i = 0; i < 4; i++) { Vector2f normalized = new Vector2f(normalize(s.getMinU(), s.getMaxU(), vertUv[i].x), normalize(s.getMinV(), s.getMaxV(), vertUv[i].y)); @@ -332,14 +329,14 @@ public class Quad { } Quad ret = new Quad(vertPos, uvs, builder); - ret.uvs = new UVs(getUvs().getSprite(), ret.vertUv); + ret.uvsObj = new UVs(uvsObj.getSprite(), ret.vertUv); return ret; } public Quad derotate() { int start = 0; for (int i = 0; i < 4; i++) { - if (vertUv[i].x <= getUvs().minU && vertUv[i].y <= getUvs().minV) { + if (vertUv[i].x <= uvsObj.minU && vertUv[i].y <= uvsObj.minV) { start = i; break; } @@ -383,11 +380,11 @@ public class Quad { } public Quad transformUVs(TextureAtlasSprite sprite, ISubmap submap) { - return new Quad(vertPos, getUvs().transform(sprite, submap), builder); + return new Quad(vertPos, uvsObj.transform(sprite, submap), builder); } public Quad grow() { - return new Quad(vertPos, getUvs().normalizeQuadrant(), builder); + return new Quad(vertPos, uvsObj.normalizeQuadrant(), builder); } public static Quad from(BakedQuad baked, VertexFormat fmt) { @@ -396,17 +393,36 @@ public class Quad { return b.build().derotate(); // for now we will ignore rotated UVs } - @RequiredArgsConstructor - public static class Builder implements IVertexConsumer { - - @Getter + public static class Builder implements IVertexConsumer + { + public Builder(VertexFormat fmt) + { + vertexFormat = fmt; + } + private final VertexFormat vertexFormat; - @Setter private int quadTint; - @Setter private EnumFacing quadOrientation; + + @Override + public void setQuadTint(int tint) + { + quadTint = tint; + } + + @Override + public void setQuadOrientation(EnumFacing orientation) + { + quadOrientation = orientation; + } + + @Override + public VertexFormat getVertexFormat() + { + return vertexFormat; + } @Override public void setQuadColored() {} diff --git a/src/main/java/mekanism/client/render/ctm/Submap.java b/src/main/java/mekanism/client/render/ctm/Submap.java index e313001f1..57fca7bf4 100644 --- a/src/main/java/mekanism/client/render/ctm/Submap.java +++ b/src/main/java/mekanism/client/render/ctm/Submap.java @@ -1,18 +1,45 @@ package mekanism.client.render.ctm; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.RequiredArgsConstructor; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -@Getter -@AllArgsConstructor -public class Submap implements ISubmap { - +public class Submap implements ISubmap +{ private final float width, height; private final float xOffset, yOffset; private final SubmapNormalized normalized = new SubmapNormalized(this); + + public Submap(float w, float h, float x, float y) + { + width = w; + height = h; + xOffset = x; + yOffset = y; + } + + @Override + public float getXOffset() + { + return xOffset; + } + + @Override + public float getYOffset() + { + return yOffset; + } + + @Override + public float getWidth() + { + return width; + } + + @Override + public float getHeight() + { + return height; + } @Override public float getInterpolatedU(TextureAtlasSprite sprite, float u) { @@ -41,10 +68,14 @@ public class Submap implements ISubmap { private static final float FACTOR = 16f; - @RequiredArgsConstructor - private static class SubmapNormalized implements ISubmap { - + private static class SubmapNormalized implements ISubmap + { private final ISubmap parent; + + public SubmapNormalized(ISubmap submap) + { + parent = submap; + } @Override public float getXOffset() { diff --git a/src/main/java/mekanism/client/render/ctm/TextureSpriteCallback.java b/src/main/java/mekanism/client/render/ctm/TextureSpriteCallback.java index 05860b3bf..fa6a228ec 100644 --- a/src/main/java/mekanism/client/render/ctm/TextureSpriteCallback.java +++ b/src/main/java/mekanism/client/render/ctm/TextureSpriteCallback.java @@ -9,16 +9,18 @@ import net.minecraft.util.ResourceLocation; * Callback when textures are stitched */ @Getter -public class TextureSpriteCallback { - +public class TextureSpriteCallback +{ private ResourceLocation location; private TextureAtlasSprite sprite; - public TextureSpriteCallback(ResourceLocation loc) { - this.location = loc; + public TextureSpriteCallback(ResourceLocation loc) + { + location = loc; } - public void stitch(TextureMap map) { - this.sprite = map.registerSprite(location); + public void stitch(TextureMap map) + { + sprite = map.registerSprite(location); } } diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index bb600f912..cf0e0a59a 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -168,7 +168,6 @@ public class CommonProxy implements IGuiProvider GameRegistry.registerTileEntity(TileEntityEliteFactory.class, "UltimateSmeltingFactory"); GameRegistry.registerTileEntity(TileEntityPurificationChamber.class, "PurificationChamber"); GameRegistry.registerTileEntity(TileEntityEnergizedSmelter.class, "EnergizedSmelter"); - //GameRegistry.registerTileEntity(TileEntityMetallurgicInfuser.class, "MetallurgicInfuser"); GameRegistry.registerTileEntity(TileEntityGasTank.class, "GasTank"); GameRegistry.registerTileEntity(TileEntityEnergyCube.class, "EnergyCube"); GameRegistry.registerTileEntity(TileEntityElectricPump.class, "ElectricPump"); @@ -195,7 +194,6 @@ public class CommonProxy implements IGuiProvider GameRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber"); GameRegistry.registerTileEntity(TileEntityFluidTank.class, "PortableTank"); //TODO rename GameRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher"); - //GameRegistry.registerTileEntity(TileEntityLaser.class, "Laser"); GameRegistry.registerTileEntity(TileEntityLaserAmplifier.class, "LaserAmplifier"); GameRegistry.registerTileEntity(TileEntityLaserTractorBeam.class, "LaserTractorBeam"); GameRegistry.registerTileEntity(TileEntitySolarNeutronActivator.class, "SolarNeutronActivator"); diff --git a/src/main/java/mekanism/common/MekanismBlocks.java b/src/main/java/mekanism/common/MekanismBlocks.java index 175db6556..65e647d23 100644 --- a/src/main/java/mekanism/common/MekanismBlocks.java +++ b/src/main/java/mekanism/common/MekanismBlocks.java @@ -228,7 +228,7 @@ public class MekanismBlocks } }); - ItemMeshDefinition mesher = new ItemMeshDefinition() { + ItemMeshDefinition machineMesher = new ItemMeshDefinition() { @Override public ModelResourceLocation getModelLocation(ItemStack stack) { @@ -251,8 +251,34 @@ public class MekanismBlocks } }; - ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock), mesher); - ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), mesher); - ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), mesher); + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock), machineMesher); + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), machineMesher); + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), machineMesher); + + ItemMeshDefinition basicMesher = new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) + { + MachineType type = MachineType.get(stack); + + if(type != null) + { + String resource = "mekanism:" + type.getName(); + + if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) + { + RecipeType recipe = RecipeType.values()[((ItemBlockMachine)stack.getItem()).getRecipeType(stack)]; + resource = "mekanism:" + type.getName() + "_" + recipe.getName(); + } + + return ClientProxy.machineResources.get(resource); + } + + return null; + } + }; + + //ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.BasicBlock), basicMesher); + //ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.BasicBlock2), basicMesher); } } diff --git a/src/main/java/mekanism/common/PacketHandler.java b/src/main/java/mekanism/common/PacketHandler.java index 99edda28d..360193619 100644 --- a/src/main/java/mekanism/common/PacketHandler.java +++ b/src/main/java/mekanism/common/PacketHandler.java @@ -71,10 +71,7 @@ import mekanism.common.network.PacketWalkieTalkieState; import mekanism.common.network.PacketWalkieTalkieState.WalkieTalkieStateMessage; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompressedStreamTools; -import net.minecraft.nbt.NBTSizeTracker; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; @@ -87,8 +84,6 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; import net.minecraftforge.fml.relauncher.Side; -import scala.tools.nsc.Global.Run; - /** * Mekanism packet handler. As always, use packets sparingly! * @author AidanBrady @@ -161,6 +156,10 @@ public class PacketHandler { output.writeShort((Short)data); } + else if(data instanceof Long) + { + output.writeLong((Long)data); + } else if(data instanceof Boolean) { output.writeBoolean((Boolean)data); @@ -211,8 +210,7 @@ public class PacketHandler { encode(((ArrayList)data).toArray(), output); } - else - { + else { throw new RuntimeException("Un-encodable data passed to encode(): " + data); } } diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index bc4a3210b..fe9fc0e42 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -3,9 +3,11 @@ package mekanism.common.block; import java.util.List; import java.util.Random; +import mekanism.api.Coord4D; import mekanism.api.energy.IEnergizedItem; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.client.render.ctm.CTMBlockRenderContext; +import mekanism.client.render.ctm.CTMData; import mekanism.client.render.ctm.ICTMBlock; import mekanism.client.render.ctm.PropertyCTMRenderContext; import mekanism.common.Mekanism; @@ -17,6 +19,7 @@ import mekanism.common.block.states.BlockStateBasic; import mekanism.common.block.states.BlockStateBasic.BasicBlock; import mekanism.common.block.states.BlockStateBasic.BasicBlockType; import mekanism.common.block.states.BlockStateFacing; +import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.inventory.InventoryBin; @@ -27,6 +30,7 @@ import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.tile.TileEntityInductionCell; +import mekanism.common.tile.TileEntityInductionPort; import mekanism.common.tile.TileEntityInductionProvider; import mekanism.common.tile.TileEntityMultiblock; import mekanism.common.tile.TileEntitySecurityDesk; @@ -99,12 +103,16 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple { public static final PropertyCTMRenderContext ctmProperty = new PropertyCTMRenderContext(); + public CTMData[][] ctmData = new CTMData[16][4]; + public BlockBasic() { super(Material.iron); setHardness(5F); setResistance(10F); setCreativeTab(Mekanism.tabMekanism); + + initCTMs(); } public static BlockBasic getBlockBasic(BasicBlock block) @@ -120,6 +128,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple public abstract BasicBlock getBasicBlock(); + @Override public BlockState createBlockState() { return new BlockStateBasic(this, getProperty()); @@ -160,6 +169,34 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple state = state.withProperty(BlockStateBasic.activeProperty, ((IActiveState)tile).getActive()); } + if(tile instanceof TileEntityInductionCell) + { + state = state.withProperty(BlockStateBasic.tierProperty, ((TileEntityInductionCell)tile).tier.getBaseTier()); + } + + if(tile instanceof TileEntityInductionProvider) + { + state = state.withProperty(BlockStateBasic.tierProperty, ((TileEntityInductionProvider)tile).tier.getBaseTier()); + } + + if(tile instanceof TileEntityInductionPort) + { + state = state.withProperty(BlockStateBasic.activeProperty, ((TileEntityInductionPort)tile).mode); + } + + if(tile instanceof TileEntitySuperheatingElement) + { + TileEntitySuperheatingElement element = (TileEntitySuperheatingElement)tile; + boolean active = false; + + if(element.multiblockUUID != null && SynchronizedBoilerData.clientHotMap.get(element.multiblockUUID) != null) + { + active = SynchronizedBoilerData.clientHotMap.get(element.multiblockUUID); + } + + state = state.withProperty(BlockStateBasic.activeProperty, active); + } + return state; } @@ -172,7 +209,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple return stateIn; } - IExtendedBlockState state = (IExtendedBlockState) stateIn; + IExtendedBlockState state = (IExtendedBlockState)stateIn; CTMBlockRenderContext ctx = new CTMBlockRenderContext(w, pos); return state.withProperty(ctmProperty, ctx); @@ -208,7 +245,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple if(neighborBlock == this && tileEntity instanceof IMultiblock) { - ((IMultiblock)tileEntity).update(); + ((IMultiblock)tileEntity).doUpdate(); } if(tileEntity instanceof TileEntityBasicBlock) @@ -218,96 +255,48 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple if(tileEntity instanceof IStructuralMultiblock) { - ((IStructuralMultiblock)tileEntity).update(); + ((IStructuralMultiblock)tileEntity).doUpdate(); } } } -/* - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister register) + public void initCTMs() { - switch(blockType) + switch(getBasicBlock()) { case BASIC_BLOCK_1: - ctms[7][0] = new CTMData("ctm/TeleporterFrame", this, Arrays.asList(7)).addOtherBlockConnectivities(MekanismBlocks.MachineBlock, Arrays.asList(11)).registerIcons(register); - ctms[9][0] = new CTMData("ctm/DynamicTank", this, Arrays.asList(9, 11)).registerIcons(register); - ctms[10][0] = new CTMData("ctm/StructuralGlass", this, Arrays.asList(10)).registerIcons(register); - ctms[11][0] = new CTMData("ctm/DynamicValve", this, Arrays.asList(11, 9)).registerIcons(register); + ctmData[7][0] = new CTMData(BasicBlockType.TELEPORTER_FRAME, MachineType.TELEPORTER); + ctmData[9][0] = new CTMData(BasicBlockType.DYNAMIC_TANK, BasicBlockType.DYNAMIC_VALVE); + ctmData[10][0] = new CTMData(BasicBlockType.STRUCTURAL_GLASS); + ctmData[11][0] = new CTMData(BasicBlockType.DYNAMIC_TANK, BasicBlockType.DYNAMIC_VALVE); - ctms[14][0] = new CTMData("ctm/ThermalEvaporationBlock", this, Arrays.asList(14, 15)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock2, Arrays.asList(0)).addFacingOverride("ctm/ThermalEvaporationController").registerIcons(register); - ctms[14][1] = new CTMData("ctm/ThermalEvaporationBlock", this, Arrays.asList(14, 15)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock2, Arrays.asList(0)).addFacingOverride("ctm/ThermalEvaporationControllerOn").registerIcons(register); - ctms[15][0] = new CTMData("ctm/ThermalEvaporationValve", this, Arrays.asList(15, 14)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock2, Arrays.asList(0)).registerIcons(register); + ctmData[14][0] = new CTMData(BasicBlockType.THERMAL_EVAPORATION_BLOCK, BasicBlockType.THERMAL_EVAPORATION_VALVE, BasicBlockType.THERMAL_EVAPORATION_CONTROLLER); + ctmData[14][1] = new CTMData(BasicBlockType.THERMAL_EVAPORATION_BLOCK, BasicBlockType.THERMAL_EVAPORATION_VALVE, BasicBlockType.THERMAL_EVAPORATION_CONTROLLER); + ctmData[15][0] = new CTMData(BasicBlockType.THERMAL_EVAPORATION_BLOCK, BasicBlockType.THERMAL_EVAPORATION_VALVE, BasicBlockType.THERMAL_EVAPORATION_CONTROLLER); - icons[0][0] = register.registerIcon("mekanism:OsmiumBlock"); - icons[1][0] = register.registerIcon("mekanism:BronzeBlock"); - icons[2][0] = register.registerIcon("mekanism:RefinedObsidian"); - icons[3][0] = register.registerIcon("mekanism:CoalBlock"); - icons[4][0] = register.registerIcon("mekanism:RefinedGlowstone"); - icons[5][0] = register.registerIcon("mekanism:SteelBlock"); - icons[6][0] = register.registerIcon(ICON_BASE); - - 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"); - icons[9][0] = ctms[9][0].mainTextureData.icon; - icons[10][0] = ctms[10][0].mainTextureData.icon; - icons[11][0] = ctms[11][0].mainTextureData.icon; - icons[12][0] = register.registerIcon("mekanism:CopperBlock"); - icons[13][0] = register.registerIcon("mekanism:TinBlock"); - icons[14][0] = ctms[14][0].facingOverride.icon; - icons[14][1] = ctms[14][1].facingOverride.icon; - icons[14][2] = ctms[14][0].mainTextureData.icon; - icons[15][0] = ctms[15][0].mainTextureData.icon; break; case BASIC_BLOCK_2: - ctms[0][0] = new CTMData("ctm/ThermalEvaporationBlock", this, Arrays.asList(0)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock, Arrays.asList(14, 15)).registerIcons(register); - ctms[1][0] = new CTMData("ctm/InductionCasing", this, Arrays.asList(1, 2)).registerIcons(register); - ctms[2][0] = new CTMData("ctm/InductionPortInput", this, Arrays.asList(1, 2)).registerIcons(register); - ctms[2][1] = new CTMData("ctm/InductionPortOutput", this, Arrays.asList(1, 2)).registerIcons(register); - ctms[3][0] = new CTMData("ctm/InductionCellBasic", this, Arrays.asList(3, 4)).registerIcons(register).setRenderConvexConnections(); - ctms[3][1] = new CTMData("ctm/InductionCellAdvanced", this, Arrays.asList(3, 4)).registerIcons(register).setRenderConvexConnections(); - ctms[3][2] = new CTMData("ctm/InductionCellElite", this, Arrays.asList(3, 4)).registerIcons(register).setRenderConvexConnections(); - ctms[3][3] = new CTMData("ctm/InductionCellUltimate", this, Arrays.asList(3, 4)).registerIcons(register).setRenderConvexConnections(); - ctms[4][0] = new CTMData("ctm/InductionProviderBasic", this, Arrays.asList(3, 4)).registerIcons(register).setRenderConvexConnections(); - ctms[4][1] = new CTMData("ctm/InductionProviderAdvanced", this, Arrays.asList(3, 4)).registerIcons(register).setRenderConvexConnections(); - 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); - - icons[6][0] = register.registerIcon("mekanism:PressureDisperser"); - - icons[0][0] = ctms[0][0].mainTextureData.icon; - icons[1][0] = ctms[1][0].mainTextureData.icon; - icons[2][0] = ctms[2][0].mainTextureData.icon; - icons[2][1] = ctms[2][1].mainTextureData.icon; - icons[3][0] = ctms[3][0].mainTextureData.icon; - icons[3][1] = ctms[3][1].mainTextureData.icon; - icons[3][2] = ctms[3][2].mainTextureData.icon; - icons[3][3] = ctms[3][3].mainTextureData.icon; - icons[4][0] = ctms[4][0].mainTextureData.icon; - icons[4][1] = ctms[4][1].mainTextureData.icon; - 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); - + ctmData[0][0] = new CTMData(BasicBlockType.THERMAL_EVAPORATION_BLOCK, BasicBlockType.THERMAL_EVAPORATION_VALVE, BasicBlockType.THERMAL_EVAPORATION_CONTROLLER); + ctmData[1][0] = new CTMData(BasicBlockType.INDUCTION_CASING, BasicBlockType.INDUCTION_PORT); + ctmData[2][0] = new CTMData(BasicBlockType.INDUCTION_CASING, BasicBlockType.INDUCTION_PORT); + ctmData[2][1] = new CTMData(BasicBlockType.INDUCTION_CASING, BasicBlockType.INDUCTION_PORT); + ctmData[3][0] = new CTMData(BasicBlockType.INDUCTION_CELL, BasicBlockType.INDUCTION_PROVIDER).setRenderConvexConnections(); + ctmData[3][1] = new CTMData(BasicBlockType.INDUCTION_CELL, BasicBlockType.INDUCTION_PROVIDER).setRenderConvexConnections(); + ctmData[3][2] = new CTMData(BasicBlockType.INDUCTION_CELL, BasicBlockType.INDUCTION_PROVIDER).setRenderConvexConnections(); + ctmData[3][3] = new CTMData(BasicBlockType.INDUCTION_CELL, BasicBlockType.INDUCTION_PROVIDER).setRenderConvexConnections(); + ctmData[4][0] = new CTMData(BasicBlockType.INDUCTION_CELL, BasicBlockType.INDUCTION_PROVIDER).setRenderConvexConnections(); + ctmData[4][1] = new CTMData(BasicBlockType.INDUCTION_CELL, BasicBlockType.INDUCTION_PROVIDER).setRenderConvexConnections(); + ctmData[4][2] = new CTMData(BasicBlockType.INDUCTION_CELL, BasicBlockType.INDUCTION_PROVIDER).setRenderConvexConnections(); + ctmData[4][3] = new CTMData(BasicBlockType.INDUCTION_CELL, BasicBlockType.INDUCTION_PROVIDER).setRenderConvexConnections(); + ctmData[5][0] = new CTMData(BasicBlockType.SUPERHEATING_ELEMENT).setRenderConvexConnections(); + ctmData[5][1] = new CTMData(BasicBlockType.SUPERHEATING_ELEMENT).setRenderConvexConnections(); + ctmData[7][0] = new CTMData(BasicBlockType.BOILER_CASING, BasicBlockType.BOILER_VALVE); + ctmData[8][0] = new CTMData(BasicBlockType.BOILER_CASING, BasicBlockType.BOILER_VALVE); + break; } } - +/* @Override @SideOnly(Side.CLIENT) public IIcon getIcon(IBlockAccess world, BlockPos pos, int side) @@ -884,7 +873,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple { return null; } - + return BasicBlockType.get(state).create(); } @@ -945,12 +934,12 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple if(tileEntity instanceof IMultiblock) { - ((IMultiblock)tileEntity).update(); + ((IMultiblock)tileEntity).doUpdate(); } if(tileEntity instanceof IStructuralMultiblock) { - ((IStructuralMultiblock)tileEntity).update(); + ((IStructuralMultiblock)tileEntity).doUpdate(); } } } @@ -1058,22 +1047,20 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple return itemStack; } -/* @Override @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(IBlockAccess world, BlockPos pos, int side) + public boolean shouldSideBeRendered(IBlockAccess world, BlockPos pos, EnumFacing side) { - Coord4D obj = new Coord4D(pos).offset(EnumFacing.getFront(side).getOpposite()); + Coord4D obj = new Coord4D(pos).offset(EnumFacing.getFront(side.ordinal()).getOpposite()); - if(BasicBlockType.get(this, world.getBlockMetadata(x, y, z)) == BasicBlockType.STRUCTURAL_GLASS) + if(BasicBlockType.get(world.getBlockState(obj)) == BasicBlockType.STRUCTURAL_GLASS) { - return ctms[10][0].shouldRenderSide(world, pos, side); + return ctmData[10][0].shouldRenderSide(world, pos, side); } else { return super.shouldSideBeRendered(world, pos, side); } } -*/ @Override public EnumFacing[] getValidRotations(World world, BlockPos pos) @@ -1115,6 +1102,41 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple return false; } + + @Override + public CTMData getCTMData(IBlockState state) + { + return ctmData[getMetaFromState(state)][0]; + } + + @Override + public String getOverrideTexture(IBlockState state) + { + BasicBlockType type = state.getValue(getBasicBlock().getProperty()); + + if(type == BasicBlockType.INDUCTION_CELL || type == BasicBlockType.INDUCTION_PROVIDER) + { + return type.getName() + "_" + state.getValue(BlockStateBasic.tierProperty).getName(); + } + + if(type == BasicBlockType.THERMAL_EVAPORATION_CONTROLLER) + { + return type.getName() + (state.getValue(BlockStateBasic.activeProperty) ? "_on" : ""); + } + + if(type == BasicBlockType.INDUCTION_PORT) + { + return type.getName() + (state.getValue(BlockStateBasic.activeProperty) ? "output" : "input"); + } + + return null; + } + + @Override + public PropertyEnum getTypeProperty() + { + return getBasicBlock().getProperty(); + } /* @Override diff --git a/src/main/java/mekanism/common/block/states/BlockStateBasic.java b/src/main/java/mekanism/common/block/states/BlockStateBasic.java index cecb506fb..dbeb545b6 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateBasic.java +++ b/src/main/java/mekanism/common/block/states/BlockStateBasic.java @@ -2,6 +2,7 @@ package mekanism.common.block.states; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; +import mekanism.common.Tier.BaseTier; import mekanism.common.block.BlockBasic; import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityBoilerCasing; @@ -42,10 +43,11 @@ import com.google.common.base.Predicates; public class BlockStateBasic extends ExtendedBlockState { public static final PropertyBool activeProperty = PropertyBool.create("active"); + public static final PropertyEnum tierProperty = PropertyEnum.create("tier", BaseTier.class); public BlockStateBasic(BlockBasic block, PropertyEnum typeProperty) { - super(block, new IProperty[] {BlockStateFacing.facingProperty, typeProperty, activeProperty}, new IUnlistedProperty[] {BlockBasic.ctmProperty}); + super(block, new IProperty[] {BlockStateFacing.facingProperty, typeProperty, activeProperty, tierProperty}, new IUnlistedProperty[] {BlockBasic.ctmProperty}); } public static enum BasicBlock @@ -154,7 +156,7 @@ public class BlockStateBasic extends ExtendedBlockState return null; } - public static BasicBlockType get(BasicBlock blockType, int metadata) + public static BasicBlockType get(BasicBlock blockType, int metadata) { BasicBlockType firstTry = values()[blockType.ordinal() << 4 | metadata]; if(firstTry.blockType == blockType && firstTry.meta == metadata) diff --git a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java index 174aef92b..ced1759f5 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java @@ -16,8 +16,8 @@ import mekanism.common.tile.TileEntityBoilerValve; import mekanism.common.tile.TileEntityPressureDisperser; import mekanism.common.tile.TileEntitySuperheatingElement; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; public class BoilerUpdateProtocol extends UpdateProtocol { @@ -149,7 +149,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol } //Gradle build requires these fields to be final - final Coord4D renderLocation = structure.renderLocation.clone(); + final Coord4D renderLocation = structure.renderLocation; final int volLength = structure.volLength; final int volWidth = structure.volWidth; diff --git a/src/main/java/mekanism/common/multiblock/IMultiblock.java b/src/main/java/mekanism/common/multiblock/IMultiblock.java index 97ec03128..aecde9861 100644 --- a/src/main/java/mekanism/common/multiblock/IMultiblock.java +++ b/src/main/java/mekanism/common/multiblock/IMultiblock.java @@ -8,5 +8,5 @@ public interface IMultiblock> public boolean onActivate(EntityPlayer player); - public void update(); + public void doUpdate(); } diff --git a/src/main/java/mekanism/common/multiblock/IStructuralMultiblock.java b/src/main/java/mekanism/common/multiblock/IStructuralMultiblock.java index 279a6daf6..67394fdef 100644 --- a/src/main/java/mekanism/common/multiblock/IStructuralMultiblock.java +++ b/src/main/java/mekanism/common/multiblock/IStructuralMultiblock.java @@ -12,5 +12,5 @@ public interface IStructuralMultiblock public void setController(Coord4D coord); - public void update(); + public void doUpdate(); } diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index ffd71d9fa..38e7fbb82 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -6,13 +6,12 @@ import java.util.List; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.common.Mekanism; import mekanism.common.tile.TileEntityMultiblock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.world.World; import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; public abstract class UpdateProtocol> { @@ -38,7 +37,7 @@ public abstract class UpdateProtocol> */ public void loopThrough(TileEntity tile) { - World worldObj = tile.getWorld(); + World worldObj = pointer.getWorld(); int origX = tile.getPos().getX(), origY = tile.getPos().getY(), origZ = tile.getPos().getZ(); @@ -220,8 +219,8 @@ public abstract class UpdateProtocol> for(EnumFacing side : EnumFacing.VALUES) { Coord4D coord = Coord4D.get(tile).offset(side); - TileEntity tileEntity = coord.getTileEntity(tile.getWorld()); - + TileEntity tileEntity = coord.getTileEntity(pointer.getWorld()); + if(isViableNode(coord)) { if(!iteratedNodes.contains(tileEntity)) @@ -319,6 +318,11 @@ public abstract class UpdateProtocol> public boolean isViableNode(BlockPos pos) { TileEntity tile = pointer.getWorld().getTileEntity(pos); + + if(tile == null || !tile.hasWorldObj()) + { + return false; + } if(tile instanceof IStructuralMultiblock) { @@ -548,7 +552,7 @@ public abstract class UpdateProtocol> if(toUse == null) { - toUse = obj.clone(); + toUse = obj; } } else if(tileEntity instanceof IStructuralMultiblock) diff --git a/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java b/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java index 7295dd046..f29dd47dc 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java @@ -30,11 +30,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraft.util.ITickable; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.Method; @Interface(iface = "ic2.api.tile.IWrenchable", modid = "IC2") -public abstract class TileEntityBasicBlock extends TileEntity implements IWrenchable, ITileNetwork, IChunkLoadHandler, IFrequencyHandler +public abstract class TileEntityBasicBlock extends TileEntity implements IWrenchable, ITileNetwork, IChunkLoadHandler, IFrequencyHandler, ITickable { /** The direction this block is facing. */ public EnumFacing facing = EnumFacing.NORTH; diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index c0abb7302..44b26c32d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -30,14 +30,13 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; -import net.minecraftforge.common.util.Constants.NBT; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; @@ -180,7 +179,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I if(take) { activeType = fluid.getFluid(); - recurringNodes.add(wrapper.clone()); + recurringNodes.add(wrapper); fluidTank.fill(fluid, true); if(shouldTake(fluid, wrapper)) diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java index 23ee49412..9870d34e8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java +++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java @@ -90,10 +90,10 @@ public abstract class TileEntityMultiblock> extend getManager().updateCache(this); } } - + if(structure == null && ticker == 5) { - update(); + doUpdate(); } if(prevStructure == (structure == null)) @@ -135,7 +135,7 @@ public abstract class TileEntityMultiblock> extend } @Override - public void update() + public void doUpdate() { if(!worldObj.isRemote && (structure == null || !getSynchronizedData().didTick)) { @@ -204,7 +204,7 @@ public abstract class TileEntityMultiblock> extend } @Override - public void handlePacketData(ByteBuf dataStream) + public void (ByteBuf dataStream) { super.handlePacketData(dataStream); diff --git a/src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java b/src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java index 942b700cf..8c4875637 100644 --- a/src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java +++ b/src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java @@ -32,13 +32,13 @@ public class TileEntityStructuralGlass extends TileEntity implements IStructural } @Override - public void update() + public void doUpdate() { if(master != null) { if(master.getTileEntity(worldObj) instanceof IMultiblock) { - ((IMultiblock)master.getTileEntity(worldObj)).update(); + ((IMultiblock)master.getTileEntity(worldObj)).doUpdate(); } else { master = null; @@ -49,7 +49,7 @@ public class TileEntityStructuralGlass extends TileEntity implements IStructural if(multiblock != null) { - multiblock.update(); + multiblock.doUpdate(); } } } diff --git a/src/main/resources/assets/mekanism/blockstates/dynamic_tank.json b/src/main/resources/assets/mekanism/blockstates/dynamic_tank.json index baa07a60a..227de80f1 100644 --- a/src/main/resources/assets/mekanism/blockstates/dynamic_tank.json +++ b/src/main/resources/assets/mekanism/blockstates/dynamic_tank.json @@ -3,7 +3,7 @@ "defaults": { "model": "cube_all", "textures": { - "all": "mekanism:blocks/DynamicTank" + "all": "mekanism:blocks/ctm/dynamic_tank" } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/dynamic_valve.json b/src/main/resources/assets/mekanism/blockstates/dynamic_valve.json index 46c4ba0b9..1e8809ef3 100644 --- a/src/main/resources/assets/mekanism/blockstates/dynamic_valve.json +++ b/src/main/resources/assets/mekanism/blockstates/dynamic_valve.json @@ -3,7 +3,7 @@ "defaults": { "model": "cube_all", "textures": { - "all": "mekanism:blocks/DynamicValve" + "all": "mekanism:blocks/ctm/dynamic_valve" } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/induction_casing.json b/src/main/resources/assets/mekanism/blockstates/induction_casing.json index 934408e0a..ddf7d7ac3 100644 --- a/src/main/resources/assets/mekanism/blockstates/induction_casing.json +++ b/src/main/resources/assets/mekanism/blockstates/induction_casing.json @@ -3,7 +3,7 @@ "defaults": { "model": "cube_all", "textures": { - "all": "mekanism:blocks/InductionCasing" + "all": "mekanism:blocks/ctm/" } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/structural_glass.json b/src/main/resources/assets/mekanism/blockstates/structural_glass.json index 4083a5b20..18ba4cb10 100644 --- a/src/main/resources/assets/mekanism/blockstates/structural_glass.json +++ b/src/main/resources/assets/mekanism/blockstates/structural_glass.json @@ -3,7 +3,7 @@ "defaults": { "model": "cube_all", "textures": { - "all": "mekanism:blocks/DynamicGlass" + "all": "mekanism:blocks/ctm/dynamic_glass" } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/teleporter.json b/src/main/resources/assets/mekanism/blockstates/teleporter.json index ef65e97a5..2fa5ab931 100644 --- a/src/main/resources/assets/mekanism/blockstates/teleporter.json +++ b/src/main/resources/assets/mekanism/blockstates/teleporter.json @@ -3,7 +3,7 @@ "defaults": { "model": "cube_all", "textures": { - "all": "mekanism:blocks/ctm/Teleporter" + "all": "mekanism:blocks/ctm/teleporter" } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/teleporter_frame.json b/src/main/resources/assets/mekanism/blockstates/teleporter_frame.json index 738c7e6d4..6855ccf3d 100644 --- a/src/main/resources/assets/mekanism/blockstates/teleporter_frame.json +++ b/src/main/resources/assets/mekanism/blockstates/teleporter_frame.json @@ -3,7 +3,7 @@ "defaults": { "model": "cube_all", "textures": { - "all": "mekanism:blocks/TeleporterFrame" + "all": "mekanism:blocks/ctm/teleporter_frame" } }, "variants": { diff --git a/src/main/resources/assets/mekanism/textures/blocks/DynamicTank.png b/src/main/resources/assets/mekanism/textures/blocks/DynamicTank.png deleted file mode 100644 index e6b2a90eca7a0d28077650b68ce312b4ff449228..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1208 zcmbVMTWB0r7#>VhV`yU(kr=#;6D_S|_RN``-PswlO|v^2v*;#avzjeZbS`JJV={9l zGiTl1C`jvrih?mq+9jr6R3}2TBhwnkrZ?Hs3vwIdWebC9FMXYrmw%|>Edl zE6I(=azf5aqq03Te;et6cX(|@iznSf;sZ_v0L}zQxlpCnEB)6oi(sg(YICcp_ zCX?KB?4oT0%0#J3NQ+w07Qj{P?cmA#@WWhQER?cQuEqi z!xr5oxiTT13P815jZ~u%>`wrwC<+inAc{Oi@Il=rdX0C3o~D9^0@JrWVq=#L6?Fqw zNRp$TE{EWFx!j7d8#EF{QwD0f2Vg`1juXbUgbqj^{p-f6=%7&d5XhqdSA3J+N2#Yt zrn$Skp%6&DQAd26UWz`YVYA{Omt?ghN54cY+fqeYk0Tm0A45>)6Q)E585z7NC5%!+ zQe@GJHFZ|wYcQ@+dPaj{3c`#upd~UXaUd0w2cu9*$W3n64T$cVsA=1#wi{gSvRpOo zBb{Ksfbmqb3P#JA;Gm2>Hl1cSj@zz{5zVdlmDd5QAb# zSNN!5S-hl3QC<-&g*OtCY?KrsE*Vj-!MFZz>Hu{Lgmv$$b%#(MjuOV@otB$^~P+mBF)57sD_J4o$Kwa72_1W*0dw+O-%iIH>ANkAu;O;9obPc_(z6CD! z9&_%${f))<&s4U3dZD-fme#|E4!-+h>iVZ=JHf~2Paivf?$OpRX8V_H*VV6X{WbiT NWHZCsq11yr{sB}mn704` diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicValve.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicValve.png deleted file mode 100644 index 87bb9aec2349c8d8b5ab0f7f1bb79c34dc7b932e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1253 zcmbVMZD`zN9M4)Ddaf{0i#w{uRHTFD@^Z=L5_^`rBxetIXT9ENoqkwep6i8PUM|V? z(sOpW&6k1TI?;ki5!o1VhlE2Fx)JZwC1?R>)60UXn!C;0TcKN8kkkf6M_`BrYpd8cuZjE8pIz@ zVe3wf=7&(xb^*%9SX?7%3g!41#WFla?LujiiW3w`&^%620>cSZ0&P7QwC3t%p(tfr zw%{&>ReawO2%^zw#2WFK?T!%?&+`OH6EuxO1nx~*z7pV;*V|T*fTy{J;~TbxhKh=6 z*ZmX*JzWpMbn^KPVasbJ3Z{$*6o;T#G8x(O^lC#5j>C8is?Kyyk0z?g9sP#m7r7&vf1#c3v~ zmXi$6(K_4K*^DoXnKYS^lM+Q|C`x8{hRJ5rVv>ooT%5^>ZEnu;e8tj0+qMC1x47I5 zxq|2d#kbv(ZCBe>FjTR9+pE|PDvD^|h+*k=!`m6&(0afUaE%F|XIzeeS&)^3<(=EIfB;pLWlbEMHokBHk2I zd+HbSpI@x?$hTcxN*w%=%7X5x$L{##(1F>L)YiMu+_BZfw{vHggqOamcRlgh(a6ki zm(K<>AH2Kk_IoGp-0|f3E32>ny!+!ndmlJ{wY$(c5b1S#p0_7nUOduQIElpxbK=T&hLF;@W9^)(VYEZii+q> z9;sALsjSNB$RpG?ETtq?rJCIw96JYzv|f8hX#ZGy&$++n=kxhK@41J4I6oR0S{M=t z1S8f)rY}AN+SfoAA4knJ`S@gxc?DqGkT6WaLt%o4011TwmY5d~`@%dybW|O@oq<;RHlbOF(A1F&Anzy-uG#sie%NQsQ0bR|yeGVrzbm_h_5A(+UO_{FIJ zwhsUyC=AfZG!ma`4+73~GDvfzgPo?l^B6xQU-;hP$2Qq?&Q$RYMPNCXU?CnW7f+UNUU_2#BB3n7Fz=UOdR4B!S zhy>6o@7)8mGQb00Q8`3n8&HjI=SUiK4VZQKJfB#ch z#*LQ36kk||$WcCCxUiL4Q&I+m!aNK?xd;+DokgDr1VdyIh!lVzz{X!F5g-bg?IfJd zX0RkOj3?p4ET$_F7a$9T0tVy=Ie0=$Diid8K+wyPPV=IAQ=LF3&vi^krnC1nmx=J@ zVpxJra|K_y;H+G2Cy1rEWhRUY_rd~i6cGcH5i^9d`T}{)syD?I%<2o|Ju8=jJ44ad z^*6z}S@dkp>Yk7X^3>A_XLytBPtvdr07aFYFGgI&Na zy*m44a}%uI&p~UgCMHaEP9$2c6-TOGzL=LRP#keMzQ`uyGGT!FZeB{+uJ#wZKK4-D zT*7b2FJ8OYa^h6zby`wRwRP@L(!B3&iT5f>H^j>K0`a#?!y3zjqlen1cSDlqn?BS-T zE|$%&bMsbYt2x~Hs=~$kSHZ-x(IHjrU&6rCSHT5E^v=S1=Y77NK_=(gKyyv`QNFJ3 zr>NBWhSY+yOKz%TZDDo0BqOU2+MK$|qVxEz+f<8 z`e*e81nt;=sdsg7f~H~N(q)a;i_yA7{hqlG(RFVQRzP`5i<=v78Qc4fzCr?YyX{w}?gdm4VQo#zr`b(C3ab!oZv zp{5b@qt>_YYm&c#9o4Fb?>@wJs!!NUb~AY5Rba+tbt27)i#o4qj>3k*x`SfqfC1I2S`=7H=u%w+$XMfAsdo z;;i?FIF|!Aj%Y+kkY@%>9eb&(F?*^1ue(LE!sgHCdOKa%1G$kEBAfgQcgvrQDzitc z#(U4N z#ZcnM+%W=vt3y+F7br{v4TtqrFB*E{ie%AQy=kkT|I&3KwXViCdwXX{rLsTWa`WSz mst&%}v1_2pazpS0sfv&olCx%cN%33lpM>SbVczuIo$wE<*}ob9 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 deleted file mode 100644 index 2e3f80eaacf999b83bdf5230f85abd96ec153e02..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1829 zcmaJ?X;2eq7!HRc_hAtg5SG{xQIpL=0wxBKB%~x7inq4)~uZxciOIXd^x5`3A51w>(CNF1gVqA zBoK^TCE-z6lwcJ@ghdk<>fX^2Z_lAn& z7@-{QXJ7cvhnRq2as~)0l}fVGlZ>G8AVjCrL5c_H;X%R?Bt?o06RJou#ezu%4y+KN z5;-P8WPn~#7>guhK14jye^QXjr(|V{&t<|32C9T|5F%6bDNOv~O3q-TunAo|dUGHa1%d*o{t$)3f#_Us8rPrWNuy74 zIfy7(3d^ubuJ{Xg*|c2!BuM4BXAX=?Ho;;pib#P^88al)$3mM{?=x3CeJoznazQ*8 zP~X>o^?C9LA0E9qHMRI=YVKhfKI|wy)o1du$MKKlFpuLOuIjwBUy$n*Ft_PgX;*D& z{PMa(V&z5Koj?yAi0vY;A6-Q6{aR&vt)ko8hB@HseD#^@0d@C!bT+HGX81xu(evW+ z;TQN0 zM+I(8-n*4g+FBR#m(b2#YR`O|~5l>dUmNTH`3S5glxEH#EEKk6qoxA~|lx#>{@F1#}kW+1Y`Kx{UmHV>-mj zYEV!-@ze9hv7}W}xBhJid4*wc+PmI@)&O_dzM?SPL~|>)cYD!_7!C1tb;&fRGfgwo2$~D^Tjty;N}qUb zm>8HfV{sJfOw>B~ZncL@LGe(UN&S-topvRlZ{654w;I!z&RR?LS%6Ql3^uT6ufLyg zP^5X$x>D3`Rx+SE{kG-e(7wUGhT7XF8u#!IJ8&}wd#)s>@wzlCFnbqMzjS#ihY@rB zz2*;r?Ze%Hjz<_Ck{@b*K3{1N5Iy*&xU={A@~o2i@8{?|ud_F5-j=l&8fEW(P_EHD zY-oHm-1K@hX;arodWc=qy$UNc-J1E(U#$ukldkHj5m>_1-0f(T?cnks6LUic8WP4M z_!W$SsCjEf8{M;o4edTB`zwpi?qGLu1`Eg>%;jNiOHN~l7NabRyGhP<8MZTiCEB@o z*@MW86M5YqTY-0Tt@~?(o2~k<%r6X3XD8LsnbjvzyE)Nq+;b;?JSD1wKduYWo_ES$ zLe4bSq}?&74pJ|z*UkE^G^~o^oFmwKZ{O&nhPTRxA2uh3?FUkOK3oi3;TWAXykfLq zX5TI*Wnm?J{bL%6zN%nSD#osk=QSMZp8wQfb==6Px};>~6N9*+`zbaa?_V%)t%Y%O z&rMxMos0F^#LH1m7F70xZt!KJ8{8&c}z!~g&Q 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 deleted file mode 100644 index 64591b932766160859016d670e12370fb5857a35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1581 zcmbVMeNfYO7>-3IIFx$o5Zt*KKV}DQnzW@f(qTV9sur;pMctuk5@;+j26%q$(4F(tsdES0ZhA7tZDW4Ti4*h=+)|)!e|Y|}+~xO`=Xu_b z-}`1$cGlc6qZ39005HauX>~}mJoHA%r167o?qq3-7t(Wu#caOd$2kfxk*tdXZC<>9 za!@!KD7r+Y0zgC&?aUQ&?F%r1^{Vg?MkRWE5*q+g(?lOmcqjpMQ3W((gdUu3g+Q7# zLQ8dawcTf-+;nCsM=dVRauTH;!azc4Z-c2KCJA^c0S85IA;V*$5gOFRq;=>RhQL9H z;4wl&PUYIOK?}=KpiZSz5^59y^#&E9(;5&Y2}IS121e8{YEU8wrqyFeGC2G|k~NOZ z#~jv-VO!G92)PBphrzJl?^pRXDwZpN5re@1t5Fz5l@db92N(etl?*>EtYD>hf}?!` z%`#v}5qGi0f)SED9SXtgv)i8wGyHI(q?ExT?t>AP8uofaaSft*!9o4&#tYHBGvK3O z2gS3+93kCD{yyo>L6fewB4#y$q-)IXM2+Wexzy95$=TDc+dwnD3cjk{`X( zeTA9%{*1fRHjguBFYH>>6VacTml|C^p+EZB$a78Wx~^7D`Ahz%Jhn6@Q@HA}d_H@& zvF%pQ_ij^P!{Nr(xQ>n+?aLF7Y%H&>G0%&ykJ2(YQxG zI#{ci{Iq%gkMx>>-mmV6-M@F&9j$GCbA03EoE>!8*o5*YKexell4v%qV!yiwRkj5u zJ=lFe=i^@Jsr$q7f~%{du=m-Y1&_O-2HW8ZrBO7N%1v+rEA zFoyhdQ}$>t#4HmV`tJ?IJgq~rruKcQj+)(ms>=4HeBUI+Hgs0xf%3g83;4A&?$=u) zgOMQIlRqNjRk45lxTcz}Jdz3;N_#px_Q!rY!Z*Hi^x1?%va_-n;Bvix)xkZQCGztd z9F1vf_a?Ps0||49s*?x7-!9Er{iM12yvyCbK)Vca?8U zOgpx-3`(4MxhZ2i;U4v?8aZ&hC~8xnrSXgjs#esz7gsT(UG#Xi^RK05)g?vCt4@A{ p^m3m5AEui#oy+QWbshsEfTmvRTGOp_YePS9TY8rDsCm`8e*oF7N?!l~ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/StructuralGlass.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/StructuralGlass.png deleted file mode 100644 index ef433d55c02ec467979ce2775a5719ee4182becb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1225 zcmbVMTWl0n7@p8ZO)ct^DZDUFHELyc=FHA^cE+ylc4pfyVQblLpx|{bXSb7f<_t4u z*=Y?zz>tt=`(O}b2xz33NURALMG0zrFz^D2gh-8%Y99cbh)RP7P4!H>TYYGFaFRK< z`M&@1o&TS`eZAc)8&)?^6tyzjqvgr`K=j^o7a7;w{97l}Dx4X>{iuj5x(}(eg$zh% z9lZqeP`5_5o`Y=^RkzhH4B&y>dc{OeOph?J(D4YHqT1R+PdA4krVUuK-4t`<^ydt1 zTPbE!BFE=E6%N`xqdx2(?Jbz2L#Avo?N8Bdp+XEe5bJd447-66rkDl03Ry?T978Wa z@KB0b3~C_PN2|z(bRw2uOv3p|K(fae661wauc1+>!Dhauj4tEl9) zuBtDxOEH5OdkV)@DwS9z9z%YK1F|f0yub+pOAu@@;$l5y-JrQo#pr-PSjU3Neu`p02wiv5Y)7w%4xNe?~2F88aL|(Sa(fW^KBE~RjzbL zuA=%-$H*@rG+e8KzCnahFo--_Rq4kz*{+2u!Q;^lEhel%-`)nTE+0Acg2alwjC+Ak z0HLVMY}~LcR+Pm!EAy7j8c9(yiZb6S8gZt|xBjnm90`hx>f}FlQ#&HX7%i8&fNYlf z2)d+se9|SW4$Q${Nv`=+DnT@zq#I z)9#O*KlQUz_c!Gaf6E$h?)U9G9$hy-Ie+l8`&))ry#MUIbC>=omcGwrPFT0k>HN0Y z*Dp-g-#&k{QF-Ldt#|KkIlTGQwH{_?y7&_Q60;Z?N&+otf(&3kn z?yO(&)U7kB*w>zSy} diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerCasing-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/boiler_casing-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerCasing-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/boiler_casing-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerCasing.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/boiler_casing.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerCasing.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/boiler_casing.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerValve-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/boiler_valve-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerValve-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/boiler_valve-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerValve.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/boiler_valve.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/BoilerValve.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/boiler_valve.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicGlass-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/dynamic_glass-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicGlass-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/dynamic_glass-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/DynamicGlass.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/dynamic_glass.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/DynamicGlass.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/dynamic_glass.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicValve-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/dynamic_valve-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicValve-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/dynamic_valve-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/DynamicValve.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/dynamic_valve.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/DynamicValve.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/dynamic_valve.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ElectromagneticCoil-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/electromagnetic_coil-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ElectromagneticCoil-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/electromagnetic_coil-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ElectromagneticCoil.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/electromagnetic_coil.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ElectromagneticCoil.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/electromagnetic_coil.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCasing-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_casing-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCasing-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/induction_casing-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCasing.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_casing.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCasing.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/induction_casing.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellAdvanced-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_cell_advanced-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellAdvanced-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/induction_cell_advanced-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_cell_advanced.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellAdvanced.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/induction_cell_advanced.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellBasic-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_cell_basic-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellBasic-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/induction_cell_basic-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellBasic.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_cell_basic.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellBasic.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/induction_cell_basic.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellElite-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_cell_elite-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellElite-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/induction_cell_elite-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellElite.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_cell_elite.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellElite.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/induction_cell_elite.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellUltimate-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_cell_ultimate-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellUltimate-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/induction_cell_ultimate-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_cell_ultimate.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/InductionCellUltimate.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/induction_cell_ultimate.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortInput-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_port_input-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortInput-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/induction_port_input-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortInput.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_port_input.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortInput.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/induction_port_input.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortOutput-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_port_output-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortOutput-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/induction_port_output-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortOutput.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_port_output.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/InductionPortOutput.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/induction_port_output.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderAdvanced-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_provider_advanced-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderAdvanced-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/induction_provider_advanced-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_provider_advanced.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderAdvanced.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/induction_provider_advanced.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderBasic-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_provider_basic-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderBasic-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/induction_provider_basic-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderBasic.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_provider_basic.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderBasic.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/induction_provider_basic.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderElite-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_provider_elite-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderElite-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/induction_provider_elite-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderElite.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_provider_elite.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderElite.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/induction_provider_elite.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderUltimate-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_provider_ultimate-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderUltimate-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/induction_provider_ultimate-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_provider_ultimate.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/InductionProviderUltimate.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/induction_provider_ultimate.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_controller_off-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_controller_off-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_controller_off.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOff.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_controller_off.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_controller_on-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_controller_on-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_controller_on.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorControllerOn.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_controller_on.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorFrame-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_frame-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorFrame-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_frame-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorFrame.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_frame.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorFrame.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_frame.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorGlass-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_glass-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorGlass-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_glass-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorGlass.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_glass.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorGlass.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_glass.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLaserFocus-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_laser_focus-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLaserFocus-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_laser_focus-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLaserFocus.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_laser_focus.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLaserFocus.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_laser_focus.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLogicAdapter-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_logic_adapter-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLogicAdapter-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_logic_adapter-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLogicAdapter.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_logic_adapter.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorLogicAdapter.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_logic_adapter.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorNeutronCapture-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_neutron_capture-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorNeutronCapture-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_neutron_capture-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorNeutronCapture.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_neutron_capture.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorNeutronCapture.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_neutron_capture.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_port-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_port-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_port.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_port.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/StructuralGlass-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/structural_glass-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/StructuralGlass-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/structural_glass-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicGlass.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/structural_glass.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/DynamicGlass.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/structural_glass.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElement-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/superheating_element-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElement-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/superheating_element-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElement.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/superheating_element.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElement.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/superheating_element.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElementOn-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/superheating_element_on-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElementOn-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/superheating_element_on-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElementOn.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/superheating_element_on.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/SuperheatingElementOn.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/superheating_element_on.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TeleporterFrame-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/teleporter_frame-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/TeleporterFrame-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/teleporter_frame-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TeleporterFrame.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/teleporter_frame.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/TeleporterFrame.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/teleporter_frame.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationBlock-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/thermal_evaporation_block-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationBlock-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/thermal_evaporation_block-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationBlock.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/thermal_evaporation_block.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationBlock.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/thermal_evaporation_block.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationController-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/thermal_evaporation_controller-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationController-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/thermal_evaporation_controller-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationController.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/thermal_evaporation_controller.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationController.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/thermal_evaporation_controller.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationControllerOn-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/thermal_evaporation_controller_on-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationControllerOn-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/thermal_evaporation_controller_on-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationControllerOn-ctm.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/ctm/thermal_evaporation_controller_on-ctm.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationControllerOn-ctm.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/ctm/thermal_evaporation_controller_on-ctm.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationControllerOn.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/thermal_evaporation_controller_on.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationControllerOn.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/thermal_evaporation_controller_on.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationControllerOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/ctm/thermal_evaporation_controller_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationControllerOn.png.mcmeta rename to src/main/resources/assets/mekanism/textures/blocks/ctm/thermal_evaporation_controller_on.png.mcmeta diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationValve-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/thermal_evaporation_valve-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationValve-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/thermal_evaporation_valve-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationValve.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/thermal_evaporation_valve.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/ThermalEvaporationValve.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/thermal_evaporation_valve.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/turbine_casing-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/turbine_casing-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/turbine_casing.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineCasing.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/turbine_casing.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/turbine_valve-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/turbine_valve-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/turbine_valve.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineValve.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/turbine_valve.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/turbine_vent-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/turbine_vent-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/turbine_vent.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/TurbineVent.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/turbine_vent.png From fb339a550c1a444e685363493b68df18708d24e5 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Mon, 9 May 2016 00:11:31 -0400 Subject: [PATCH 02/22] Fix goof --- src/main/java/mekanism/common/tile/TileEntityMultiblock.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java index 9870d34e8..0b381dff3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java +++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java @@ -204,7 +204,7 @@ public abstract class TileEntityMultiblock> extend } @Override - public void (ByteBuf dataStream) + public void handlePacketData(ByteBuf dataStream) { super.handlePacketData(dataStream); From fc7b18580552a77dc5b0462cf02e718e180ba212 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Mon, 9 May 2016 14:52:56 -0400 Subject: [PATCH 03/22] Attempt to fix tile entity persistence --- src/main/java/mekanism/api/Coord4D.java | 6 +-- .../mekanism/common/block/BlockBasic.java | 2 + .../common/multiblock/UpdateProtocol.java | 54 ++++++++++--------- .../common/tile/TileEntityDynamicTank.java | 3 +- .../common/tile/TileEntityMultiblock.java | 18 ++++++- 5 files changed, 54 insertions(+), 29 deletions(-) diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index a9d51b79b..8fd32fa5c 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -128,7 +128,7 @@ public class Coord4D extends BlockPos TileEntity tile = world.getTileEntity(this); - return (tile != null && tile.hasWorldObj()) ? tile : null; + return (tile != null && tile.hasWorldObj() && !tile.isInvalid()) ? tile : null; } /** @@ -227,7 +227,7 @@ public class Coord4D extends BlockPos */ public Coord4D offset(EnumFacing facing, int n) { - return (facing == null || n == 0) ? this : new Coord4D(this.getX() + facing.getFrontOffsetX() * n, this.getY() + facing.getFrontOffsetY() * n, this.getZ() + facing.getFrontOffsetZ() * n); + return (facing == null || n == 0) ? this : new Coord4D(getX() + facing.getFrontOffsetX() * n, getY() + facing.getFrontOffsetY() * n, getZ() + facing.getFrontOffsetZ() * n, dimensionId); } public ItemStack getStack(IBlockAccess world) @@ -280,7 +280,7 @@ public class Coord4D extends BlockPos */ public Coord4D difference(Vec3i vec) { - return vec.getX() == 0 && vec.getY() == 0 && vec.getZ() == 0 ? this : new Coord4D(this.getX() - vec.getX(), this.getY() - vec.getY(), this.getZ() - vec.getZ()); + return vec.getX() == 0 && vec.getY() == 0 && vec.getZ() == 0 ? this : new Coord4D(getX() - vec.getX(), getY() - vec.getY(), getZ() - vec.getZ(), dimensionId); } /** diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index fe9fc0e42..7d157515f 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -953,6 +953,8 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple { ((IBoundingBlock)tileEntity).onBreak(); } + + System.out.println(world.getTileEntity(pos)); super.breakBlock(world, pos, state); diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index 38e7fbb82..6251cf4f6 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -16,7 +16,7 @@ import net.minecraft.world.World; public abstract class UpdateProtocol> { /** The multiblock nodes that have already been iterated over. */ - public Set iteratedNodes = new HashSet(); + public Set iteratedNodes = new HashSet(); public Set innerNodes = new HashSet(); @@ -35,11 +35,11 @@ public abstract class UpdateProtocol> * Recursively loops through each node connected to the given TileEntity. * @param tile - the TileEntity to loop over */ - public void loopThrough(TileEntity tile) + public void loopThrough(Coord4D coord) { World worldObj = pointer.getWorld(); - int origX = tile.getPos().getX(), origY = tile.getPos().getY(), origZ = tile.getPos().getZ(); + int origX = coord.getX(), origY = coord.getY(), origZ = coord.getZ(); boolean isCorner = true; boolean isHollow = true; @@ -142,13 +142,13 @@ public abstract class UpdateProtocol> rightBlocks = false; break; } - else if(isFrame(Coord4D.get(tile).add(x, y, z), origX+xmin, origX+xmax, origY+ymin, origY+ymax, origZ+zmin, origZ+zmax) && !isValidFrame(origX+x, origY+y, origZ+z)) + else if(isFrame(coord.add(x, y, z), origX+xmin, origX+xmax, origY+ymin, origY+ymax, origZ+zmin, origZ+zmax) && !isValidFrame(origX+x, origY+y, origZ+z)) { rightFrame = false; break; } else { - locations.add(Coord4D.get(tile).add(x, y, z)); + locations.add(coord.add(x, y, z)); } } else { @@ -193,15 +193,15 @@ public abstract class UpdateProtocol> structure.volHeight = Math.abs(ymax-ymin)+1; structure.volWidth = Math.abs(zmax-zmin)+1; 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); + structure.renderLocation = coord.add(0, 1, 0); + structure.minLocation = coord.add(xmin, ymin, zmin); + structure.maxLocation = coord.add(xmax, ymax, zmax); if(structure.volLength >= 3 && structure.volHeight >= 3 && structure.volWidth >= 3) { onStructureCreated(structure, origX, origY, origZ, xmin, xmax, ymin, ymax, zmin, zmax); - if(structure.locations.contains(Coord4D.get(pointer)) && isCorrectCorner(Coord4D.get(tile), origX+xmin, origY+ymin, origZ+zmin)) + if(structure.locations.contains(Coord4D.get(pointer)) && isCorrectCorner(coord, origX+xmin, origY+ymin, origZ+zmin)) { if(canForm(structure)) { @@ -214,18 +214,17 @@ public abstract class UpdateProtocol> } innerNodes.clear(); - iteratedNodes.add(tile); + iteratedNodes.add(coord); for(EnumFacing side : EnumFacing.VALUES) { - Coord4D coord = Coord4D.get(tile).offset(side); - TileEntity tileEntity = coord.getTileEntity(pointer.getWorld()); + Coord4D sideCoord = coord.offset(side); - if(isViableNode(coord)) + if(isViableNode(sideCoord)) { - if(!iteratedNodes.contains(tileEntity)) + if(!iteratedNodes.contains(sideCoord)) { - loopThrough(tileEntity); + loopThrough(sideCoord); } } } @@ -319,7 +318,7 @@ public abstract class UpdateProtocol> { TileEntity tile = pointer.getWorld().getTileEntity(pos); - if(tile == null || !tile.hasWorldObj()) + if(tile == null || !tile.hasWorldObj() || tile.isInvalid()) { return false; } @@ -462,16 +461,21 @@ public abstract class UpdateProtocol> */ public void doUpdate() { - loopThrough(pointer); - + loopThrough(Coord4D.get(pointer)); + if(structureFound != null) { - for(TileEntity tileEntity : iteratedNodes) + for(Coord4D coord : iteratedNodes) { - if(!structureFound.locations.contains(Coord4D.get(tileEntity))) + if(!structureFound.locations.contains(coord)) { - for(TileEntity tile : iteratedNodes) + System.out.println("No contain " + coord + " " + coord.getTileEntity(pointer.getWorld())); + System.out.println(coord.getBlockState(pointer.getWorld()).getBlock()); + + for(Coord4D newCoord : iteratedNodes) { + TileEntity tile = newCoord.getTileEntity(pointer.getWorld()); + if(tile instanceof TileEntityMultiblock) { ((TileEntityMultiblock)tile).structure = null; @@ -482,9 +486,9 @@ public abstract class UpdateProtocol> } } - for(Coord4D coord : innerNodes) + for(Coord4D newCoord : innerNodes) { - killInnerNode(coord); + killInnerNode(newCoord); } return; @@ -569,8 +573,10 @@ public abstract class UpdateProtocol> } } else { - for(TileEntity tile : iteratedNodes) + for(Coord4D coord : iteratedNodes) { + TileEntity tile = coord.getTileEntity(pointer.getWorld()); + if(tile instanceof TileEntityMultiblock) { TileEntityMultiblock tileEntity = (TileEntityMultiblock)tile; diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java index 6d29ef7f6..12a33f9ec 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java @@ -9,6 +9,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; +import mekanism.common.PacketHandler; import mekanism.common.base.IFluidContainerManager; import mekanism.common.block.BlockBasic; import mekanism.common.content.tank.SynchronizedTankData; @@ -208,7 +209,7 @@ public class TileEntityDynamicTank extends TileEntityMultiblock> extend { if(!prevStructure) { - Mekanism.proxy.doMultiblockSparkle(this); + //Mekanism.proxy.doMultiblockSparkle(this); } } @@ -134,6 +137,19 @@ public abstract class TileEntityMultiblock> extend } } + @Override + public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newSate) + { + boolean b = super.shouldRefresh(world, pos, oldState, newSate); + + if(!world.isRemote) + { + System.out.println(b); + } + + return b; + } + @Override public void doUpdate() { From eba5f7e356c0096cc8cd1e731020fcf98ec45132 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Mon, 9 May 2016 18:36:40 -0400 Subject: [PATCH 04/22] Work on TileEntity stuff. Details below. I've added the method "Coord4D.safeTileGet()" which is likely going to be necessary in a lot of cases where duplicate TEs could be created- for some reason World.getTileEntity() fails to return the saved TileEntity fairly often. --- src/main/java/mekanism/api/Coord4D.java | 45 ++++++++++++++++++- .../{common => api}/ObfuscatedNames.java | 3 +- .../mekanism/client/ClientTickHandler.java | 2 +- .../client/gui/element/GuiElement.java | 2 +- .../client/render/MekanismRenderer.java | 2 +- .../mekanism/client/sound/SoundHandler.java | 2 +- .../common/CommonPlayerTickHandler.java | 1 + .../mekanism/common/block/BlockBasic.java | 18 +------- .../mekanism/common/block/BlockMachine.java | 14 ------ .../content/boiler/BoilerUpdateProtocol.java | 10 ++--- .../content/matrix/MatrixUpdateProtocol.java | 5 +-- .../content/tank/TankUpdateProtocol.java | 2 +- .../common/item/ItemConfigurator.java | 8 ++-- .../common/multiblock/UpdateProtocol.java | 23 +++++----- .../common/network/PacketDataRequest.java | 5 +-- .../network/PacketPortableTeleporter.java | 2 +- .../common/network/PacketTileEntity.java | 3 +- .../common/tile/TileEntityBasicBlock.java | 8 ++++ .../common/tile/TileEntityMultiblock.java | 12 +++-- .../tile/TileEntityStructuralGlass.java | 16 ++++--- 20 files changed, 108 insertions(+), 75 deletions(-) rename src/main/java/mekanism/{common => api}/ObfuscatedNames.java (89%) diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index 8fd32fa5c..dd6f0321f 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -3,7 +3,9 @@ package mekanism.api; import io.netty.buffer.ByteBuf; import java.util.ArrayList; +import java.util.List; +import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -20,6 +22,7 @@ import net.minecraft.util.Vec3i; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; +import net.minecraft.world.chunk.Chunk.EnumCreateEntityType; import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint; /** @@ -44,6 +47,11 @@ public class Coord4D extends BlockPos dimensionId = 0; } + + public Coord4D(int x, int y, int z, World world) + { + this(x, y, z, world.provider.getDimensionId()); + } public Coord4D(double x, double y, double z) { @@ -130,7 +138,42 @@ public class Coord4D extends BlockPos return (tile != null && tile.hasWorldObj() && !tile.isInvalid()) ? tile : null; } - + + public TileEntity safeTileGet(World world) + { + if(!exists(world)) + { + return null; + } + + TileEntity tile = world.getChunkFromBlockCoords(this).getTileEntity(this, EnumCreateEntityType.CHECK); + + if(tile != null) + { + return tile; + } + + for(TileEntity iter : world.loadedTileEntityList) + { + if(!iter.isInvalid() && iter.getPos().equals(this)) + { + return iter; + } + } + + List added = (List)MekanismUtils.getPrivateValue(world, World.class, ObfuscatedNames.World_addedTileEntityList); + + for(TileEntity iter : added) + { + if(!iter.isInvalid() && iter.getPos().equals(this)) + { + return iter; + } + } + + return null; + } + /** * Gets the Block value of the block representing this Coord4D. * @param world - world this Coord4D is in diff --git a/src/main/java/mekanism/common/ObfuscatedNames.java b/src/main/java/mekanism/api/ObfuscatedNames.java similarity index 89% rename from src/main/java/mekanism/common/ObfuscatedNames.java rename to src/main/java/mekanism/api/ObfuscatedNames.java index 81e5d8d83..cdcbde660 100644 --- a/src/main/java/mekanism/common/ObfuscatedNames.java +++ b/src/main/java/mekanism/api/ObfuscatedNames.java @@ -1,4 +1,4 @@ -package mekanism.common; +package mekanism.api; public final class ObfuscatedNames { @@ -13,4 +13,5 @@ public final class ObfuscatedNames public static String[] SoundManager_invPlayingSounds = new String[] {"invPlayingSounds", "field_148630_i"}; public static String[] AbstractClientPlayer_getPlayerInfo = new String[] {"getPlayerInfo", "func_110303_q"}; public static String[] NetworkPlayerInfo_locationCape = new String[] {"locationCape", "field_178862_f"}; + public static String[] World_addedTileEntityList = new String[] {"addedTileEntityList", "field_147484_a"}; } \ No newline at end of file diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index 2d5799eec..8e73e9dd4 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -13,13 +13,13 @@ import java.util.Map; import java.util.Set; import mekanism.api.IClientTicker; +import mekanism.api.ObfuscatedNames; import mekanism.api.MekanismConfig.client; import mekanism.api.gas.GasStack; import mekanism.client.sound.SoundHandler; import mekanism.common.CommonPlayerTickHandler; import mekanism.common.KeySync; import mekanism.common.Mekanism; -import mekanism.common.ObfuscatedNames; import mekanism.common.item.ItemFlamethrower; import mekanism.common.item.ItemFreeRunners; import mekanism.common.item.ItemGasMask; diff --git a/src/main/java/mekanism/client/gui/element/GuiElement.java b/src/main/java/mekanism/client/gui/element/GuiElement.java index 8cbcfad14..a45ce8717 100644 --- a/src/main/java/mekanism/client/gui/element/GuiElement.java +++ b/src/main/java/mekanism/client/gui/element/GuiElement.java @@ -2,8 +2,8 @@ package mekanism.client.gui.element; import java.util.List; +import mekanism.api.ObfuscatedNames; import mekanism.client.gui.IGuiWrapper; -import mekanism.common.ObfuscatedNames; import mekanism.common.util.MekanismUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 5a0ca1722..0383824fc 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; import mekanism.api.EnumColor; +import mekanism.api.ObfuscatedNames; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.OreGas; @@ -17,7 +18,6 @@ import mekanism.client.render.tileentity.RenderConfigurableMachine; import mekanism.client.render.tileentity.RenderDynamicTank; import mekanism.client.render.tileentity.RenderFluidTank; import mekanism.client.render.tileentity.RenderThermalEvaporationController; -import mekanism.common.ObfuscatedNames; import mekanism.common.base.IMetaItem; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; diff --git a/src/main/java/mekanism/client/sound/SoundHandler.java b/src/main/java/mekanism/client/sound/SoundHandler.java index 1c25d5064..9665a82cd 100644 --- a/src/main/java/mekanism/client/sound/SoundHandler.java +++ b/src/main/java/mekanism/client/sound/SoundHandler.java @@ -3,7 +3,7 @@ package mekanism.client.sound; import java.util.HashMap; import java.util.Map; -import mekanism.common.ObfuscatedNames; +import mekanism.api.ObfuscatedNames; import mekanism.common.util.MekanismUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.ISound; diff --git a/src/main/java/mekanism/common/CommonPlayerTickHandler.java b/src/main/java/mekanism/common/CommonPlayerTickHandler.java index a7a703b0b..895435867 100644 --- a/src/main/java/mekanism/common/CommonPlayerTickHandler.java +++ b/src/main/java/mekanism/common/CommonPlayerTickHandler.java @@ -1,5 +1,6 @@ package mekanism.common; +import mekanism.api.ObfuscatedNames; import mekanism.api.gas.GasStack; import mekanism.common.entity.EntityFlame; import mekanism.common.item.ItemFlamethrower; diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 7d157515f..e4f8494e3 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -851,20 +851,6 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple return type != null && type.tileEntityClass != null; } - - @Override - public void onBlockAdded(World world, BlockPos pos, IBlockState state) - { - TileEntity tileEntity = world.getTileEntity(pos); - - if(!world.isRemote) - { - if(tileEntity instanceof TileEntityBasicBlock) - { - ((TileEntityBasicBlock)tileEntity).onAdded(); - } - } - } @Override public TileEntity createTileEntity(World world, IBlockState state) @@ -886,7 +872,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple int side = MathHelper.floor_double((placer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; int height = Math.round(placer.rotationPitch); int change = 3; - + if(tileEntity.canSetFacing(0) && tileEntity.canSetFacing(1)) { if(height >= 65) @@ -953,8 +939,6 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple { ((IBoundingBlock)tileEntity).onBreak(); } - - System.out.println(world.getTileEntity(pos)); super.breakBlock(world, pos, state); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index c0b22aa78..a24437399 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -1085,20 +1085,6 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou return super.getRenderColor(state); } - - @Override - public void onBlockAdded(World world, BlockPos pos, IBlockState state) - { - TileEntity tileEntity = world.getTileEntity(pos); - - if(!world.isRemote) - { - if(tileEntity instanceof TileEntityBasicBlock) - { - ((TileEntityBasicBlock)tileEntity).onAdded(); - } - } - } @Override public boolean canConnectRedstone(IBlockAccess world, BlockPos pos, EnumFacing side) diff --git a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java index ced1759f5..e5cd225bb 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java @@ -43,7 +43,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol return true; } - TileEntity tile = pointer.getWorld().getTileEntity(new BlockPos(x, y, z)); + TileEntity tile = new Coord4D(x, y, z, pointer.getWorld()).safeTileGet(pointer.getWorld()); return tile instanceof TileEntityPressureDisperser || tile instanceof TileEntitySuperheatingElement; } @@ -58,7 +58,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol for(Coord4D coord : innerNodes) { - TileEntity tile = coord.getTileEntity(pointer.getWorld()); + TileEntity tile = coord.safeTileGet(pointer.getWorld()); if(tile instanceof TileEntityPressureDisperser) { @@ -89,7 +89,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol for(int z = 1; z < structure.volWidth-1; z++) { Coord4D coord4D = pos.add(x, 0, z); - TileEntity tile = pointer.getWorld().getTileEntity(coord4D); + TileEntity tile = coord4D.safeTileGet(pointer.getWorld()); if(!(tile instanceof TileEntityPressureDisperser)) { @@ -112,7 +112,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol @Override public boolean isValid(Coord4D coord) { - return coord.getTileEntity(pointer.getWorld()) instanceof TileEntitySuperheatingElement; + return coord.safeTileGet(pointer.getWorld()) instanceof TileEntitySuperheatingElement; } }).calculate(elements.iterator().next()); } @@ -244,7 +244,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol { for(Coord4D obj : structure.locations) { - if(obj.getTileEntity(pointer.getWorld()) instanceof TileEntityBoilerValve) + if(obj.safeTileGet(pointer.getWorld()) instanceof TileEntityBoilerValve) { ValveData data = new ValveData(); data.location = obj; diff --git a/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java b/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java index 5960c72c7..574aba571 100644 --- a/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java @@ -12,7 +12,6 @@ import mekanism.common.multiblock.UpdateProtocol; import mekanism.common.tile.TileEntityInductionCasing; import mekanism.common.tile.TileEntityInductionCell; import mekanism.common.tile.TileEntityInductionProvider; - import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -35,7 +34,7 @@ public class MatrixUpdateProtocol extends UpdateProtocol @Override public boolean isValidInnerNode(int x, int y, int z) { - TileEntity tile = pointer.getWorld().getTileEntity(new BlockPos(x, y, z)); + TileEntity tile = new Coord4D(x, y, z, pointer.getWorld()).safeTileGet(pointer.getWorld()); if(tile != null && (tile instanceof TileEntityInductionCell || tile instanceof TileEntityInductionProvider)) { @@ -81,7 +80,7 @@ public class MatrixUpdateProtocol extends UpdateProtocol { for(Coord4D coord : innerNodes) { - TileEntity tile = coord.getTileEntity(pointer.getWorld()); + TileEntity tile = coord.safeTileGet(pointer.getWorld()); if(tile instanceof TileEntityInductionCell) { diff --git a/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java b/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java index c952729ef..a7f94a07a 100644 --- a/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java @@ -90,7 +90,7 @@ public class TankUpdateProtocol extends UpdateProtocol { for(Coord4D obj : structure.locations) { - if(obj.getTileEntity(pointer.getWorld()) instanceof TileEntityDynamicValve) + if(obj.safeTileGet(pointer.getWorld()) instanceof TileEntityDynamicValve) { ValveData data = new ValveData(); data.location = obj; diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 5f7eedd77..a04576257 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -32,13 +32,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentText; -import net.minecraft.world.World; import net.minecraft.util.EnumFacing; -import buildcraft.api.tools.IToolWrench; -import cofh.api.item.IToolHammer; +import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; import net.minecraftforge.fml.common.Optional.Method; +import buildcraft.api.tools.IToolWrench; +import cofh.api.item.IToolHammer; @InterfaceList({ @Interface(iface = "buildcraft.api.tools.IToolWrench", modid = "BuildCraft") @@ -69,7 +69,7 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool { Block block = world.getBlockState(pos).getBlock(); TileEntity tile = world.getTileEntity(pos); - + if(getState(stack).isConfigurating()) //Configurate { if(tile instanceof ISideConfiguration && ((ISideConfiguration)tile).getConfig().supports(getState(stack).getTransmission())) diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index 6251cf4f6..544ac01ea 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -291,7 +291,7 @@ public abstract class UpdateProtocol> */ public boolean isViableNode(int x, int y, int z) { - TileEntity tile = pointer.getWorld().getTileEntity(new BlockPos(x, y, z)); + TileEntity tile = new Coord4D(x, y, z, pointer.getWorld().provider.getDimensionId()).safeTileGet(pointer.getWorld()); if(tile instanceof IStructuralMultiblock) { @@ -316,7 +316,7 @@ public abstract class UpdateProtocol> */ public boolean isViableNode(BlockPos pos) { - TileEntity tile = pointer.getWorld().getTileEntity(pos); + TileEntity tile = new Coord4D(pos, pointer.getWorld().provider.getDimensionId()).safeTileGet(pointer.getWorld()); if(tile == null || !tile.hasWorldObj() || tile.isInvalid()) { @@ -422,7 +422,7 @@ public abstract class UpdateProtocol> { for(Coord4D coord : structureFound.internalLocations) { - TileEntity tile = coord.getTileEntity(pointer.getWorld()); + TileEntity tile = coord.safeTileGet(pointer.getWorld()); if(tile instanceof TileEntityInternalMultiblock) { @@ -437,7 +437,7 @@ public abstract class UpdateProtocol> { for(Coord4D coord : structure.internalLocations) { - TileEntity tile = coord.getTileEntity(pointer.getWorld()); + TileEntity tile = coord.safeTileGet(pointer.getWorld()); if(tile instanceof TileEntityInternalMultiblock) { @@ -448,7 +448,7 @@ public abstract class UpdateProtocol> public void killInnerNode(Coord4D coord) { - TileEntity tile = coord.getTileEntity(pointer.getWorld()); + TileEntity tile = coord.safeTileGet(pointer.getWorld()); if(tile instanceof TileEntityInternalMultiblock) { @@ -469,12 +469,12 @@ public abstract class UpdateProtocol> { if(!structureFound.locations.contains(coord)) { - System.out.println("No contain " + coord + " " + coord.getTileEntity(pointer.getWorld())); + System.out.println("No contain " + coord + " " + coord.safeTileGet(pointer.getWorld())); System.out.println(coord.getBlockState(pointer.getWorld()).getBlock()); for(Coord4D newCoord : iteratedNodes) { - TileEntity tile = newCoord.getTileEntity(pointer.getWorld()); + TileEntity tile = newCoord.safeTileGet(pointer.getWorld()); if(tile instanceof TileEntityMultiblock) { @@ -500,7 +500,7 @@ public abstract class UpdateProtocol> for(Coord4D obj : structureFound.locations) { - TileEntity tileEntity = obj.getTileEntity(pointer.getWorld()); + TileEntity tileEntity = obj.safeTileGet(pointer.getWorld()); if(tileEntity instanceof TileEntityMultiblock && ((TileEntityMultiblock)tileEntity).cachedID != null) { @@ -540,7 +540,7 @@ public abstract class UpdateProtocol> cache.apply((T)structureFound); structureFound.inventoryID = idToUse; - + System.out.println("Success"); onFormed(); List structures = new ArrayList(); @@ -548,7 +548,7 @@ public abstract class UpdateProtocol> for(Coord4D obj : structureFound.locations) { - TileEntity tileEntity = obj.getTileEntity(pointer.getWorld()); + TileEntity tileEntity = obj.safeTileGet(pointer.getWorld()); if(tileEntity instanceof TileEntityMultiblock) { @@ -573,9 +573,10 @@ public abstract class UpdateProtocol> } } else { + System.out.println("No structure"); for(Coord4D coord : iteratedNodes) { - TileEntity tile = coord.getTileEntity(pointer.getWorld()); + TileEntity tile = coord.safeTileGet(pointer.getWorld()); if(tile instanceof TileEntityMultiblock) { diff --git a/src/main/java/mekanism/common/network/PacketDataRequest.java b/src/main/java/mekanism/common/network/PacketDataRequest.java index 10c2381a7..e75ea9513 100644 --- a/src/main/java/mekanism/common/network/PacketDataRequest.java +++ b/src/main/java/mekanism/common/network/PacketDataRequest.java @@ -29,11 +29,10 @@ public class PacketDataRequest implements IMessageHandler> extend public TileEntityMultiblock(String name) { super(name); + + if(FMLCommonHandler.instance().getEffectiveSide().isServer()) + System.out.println("CREATE"); } @Override @@ -67,7 +72,7 @@ public abstract class TileEntityMultiblock> extend { if(!prevStructure) { - //Mekanism.proxy.doMultiblockSparkle(this); + Mekanism.proxy.doMultiblockSparkle(this); } } @@ -111,8 +116,9 @@ public abstract class TileEntityMultiblock> extend for(EnumFacing side : EnumFacing.VALUES) { Coord4D obj = Coord4D.get(this).offset(side); + TileEntity tile = obj.safeTileGet(worldObj); - if(!obj.isAirBlock(worldObj) && (obj.getTileEntity(worldObj) == null || obj.getTileEntity(worldObj).getClass() != getClass())) + if(!obj.isAirBlock(worldObj) && (tile == null || tile.getClass() != getClass())) { obj.getBlock(worldObj).onNeighborChange(worldObj, obj, getPos()); } @@ -170,7 +176,7 @@ public abstract class TileEntityMultiblock> extend { for(Coord4D obj : getSynchronizedData().locations) { - TileEntityMultiblock tileEntity = (TileEntityMultiblock)obj.getTileEntity(worldObj); + TileEntityMultiblock tileEntity = (TileEntityMultiblock)obj.safeTileGet(worldObj); if(tileEntity != null && tileEntity.isRendering) { diff --git a/src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java b/src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java index 8c4875637..3cbc5e529 100644 --- a/src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java +++ b/src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java @@ -19,9 +19,11 @@ public class TileEntityStructuralGlass extends TileEntity implements IStructural { if(master != null) { - if(master.getTileEntity(worldObj) instanceof IMultiblock) + TileEntity masterTile = master.safeTileGet(worldObj); + + if(masterTile instanceof IMultiblock) { - return ((IMultiblock)master.getTileEntity(worldObj)).onActivate(player); + return ((IMultiblock)masterTile).onActivate(player); } else { master = null; @@ -36,9 +38,11 @@ public class TileEntityStructuralGlass extends TileEntity implements IStructural { if(master != null) { - if(master.getTileEntity(worldObj) instanceof IMultiblock) + TileEntity masterTile = master.safeTileGet(worldObj); + + if(masterTile instanceof IMultiblock) { - ((IMultiblock)master.getTileEntity(worldObj)).doUpdate(); + ((IMultiblock)masterTile).doUpdate(); } else { master = null; @@ -84,13 +88,13 @@ public class TileEntityStructuralGlass extends TileEntity implements IStructural for(EnumFacing side : EnumFacing.VALUES) { Coord4D coord = pos.offset(side); - TileEntity tile = coord.getTileEntity(worldObj); + TileEntity tile = coord.safeTileGet(worldObj); if(!iterated.contains(coord)) { if(tile instanceof IMultiblock) { - found = (IMultiblock)coord.getTileEntity(worldObj); + found = (IMultiblock)tile; return; } else if(tile instanceof IStructuralMultiblock) From c6f3c162f9f6af5378b5b40f710cd900b37549d8 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Mon, 9 May 2016 19:59:16 -0400 Subject: [PATCH 05/22] More work --- src/main/java/mekanism/api/Coord4D.java | 9 +- .../mekanism/api/util/ReflectionUtils.java | 74 +++++++++++++++++ .../mekanism/client/ClientTickHandler.java | 7 +- .../client/gui/element/GuiElement.java | 23 +++--- .../client/render/MekanismRenderer.java | 26 +----- .../mekanism/client/render/ctm/CTMData.java | 13 --- .../mekanism/client/render/ctm/ICTMBlock.java | 3 +- .../client/render/ctm/ModelChiselBlock.java | 15 +--- .../mekanism/client/sound/SoundHandler.java | 6 +- .../common/CommonPlayerTickHandler.java | 5 +- .../mekanism/common/block/BlockBasic.java | 11 ++- .../common/frequency/FrequencyManager.java | 2 +- .../common/multiblock/MultiblockManager.java | 4 +- .../common/multiblock/UpdateProtocol.java | 9 +- .../network/PacketPortableTeleporter.java | 4 +- .../common/tile/TileEntityContainerBlock.java | 9 ++ .../common/tile/TileEntityMultiblock.java | 11 ++- .../mekanism/common/util/MekanismUtils.java | 78 +----------------- .../textures/blocks/models/security_desk.png | Bin 11862 -> 31433 bytes 19 files changed, 146 insertions(+), 163 deletions(-) create mode 100644 src/main/java/mekanism/api/util/ReflectionUtils.java diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index dd6f0321f..59b4cda3c 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.List; -import mekanism.common.util.MekanismUtils; +import mekanism.api.util.ReflectionUtils; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -52,6 +52,11 @@ public class Coord4D extends BlockPos { this(x, y, z, world.provider.getDimensionId()); } + + public Coord4D(Vec3i pos, World world) + { + this(pos, world.provider.getDimensionId()); + } public Coord4D(double x, double y, double z) { @@ -161,7 +166,7 @@ public class Coord4D extends BlockPos } } - List added = (List)MekanismUtils.getPrivateValue(world, World.class, ObfuscatedNames.World_addedTileEntityList); + List added = (List)ReflectionUtils.getPrivateValue(world, World.class, ObfuscatedNames.World_addedTileEntityList); for(TileEntity iter : added) { diff --git a/src/main/java/mekanism/api/util/ReflectionUtils.java b/src/main/java/mekanism/api/util/ReflectionUtils.java new file mode 100644 index 000000000..459ddf84c --- /dev/null +++ b/src/main/java/mekanism/api/util/ReflectionUtils.java @@ -0,0 +1,74 @@ +package mekanism.api.util; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; + +public final class ReflectionUtils +{ + /** + * Retrieves a private value from a defined class and field. + * @param obj - the Object to retrieve the value from, null if static + * @param c - Class to retrieve field value from + * @param fields - possible names of field to iterate through + * @return value as an Object, cast as necessary + */ + public static Object getPrivateValue(Object obj, Class c, String[] fields) + { + for(String field : fields) + { + try { + Field f = c.getDeclaredField(field); + f.setAccessible(true); + return f.get(obj); + } catch(Exception e) { + continue; + } + } + + return null; + } + + /** + * Sets a private value from a defined class and field to a new value. + * @param obj - the Object to perform the operation on, null if static + * @param value - value to set the field to + * @param c - Class the operation will be performed on + * @param fields - possible names of field to iterate through + */ + public static void setPrivateValue(Object obj, Object value, Class c, String[] fields) + { + for(String field : fields) + { + try { + Field f = c.getDeclaredField(field); + f.setAccessible(true); + f.set(obj, value); + } catch(Exception e) { + continue; + } + } + } + + /** + * Retrieves a private method from a class, sets it as accessible, and returns it. + * @param c - Class the method is located in + * @param methods - possible names of the method to iterate through + * @param params - the Types inserted as parameters into the method + * @return private method + */ + public static Method getPrivateMethod(Class c, String[] methods, Class... params) + { + for(String method : methods) + { + try { + Method m = c.getDeclaredMethod(method, params); + m.setAccessible(true); + return m; + } catch(Exception e) { + continue; + } + } + + return null; + } +} diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index 8e73e9dd4..8951fe084 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -13,9 +13,10 @@ import java.util.Map; import java.util.Set; import mekanism.api.IClientTicker; -import mekanism.api.ObfuscatedNames; import mekanism.api.MekanismConfig.client; +import mekanism.api.ObfuscatedNames; import mekanism.api.gas.GasStack; +import mekanism.api.util.ReflectionUtils; import mekanism.client.sound.SoundHandler; import mekanism.common.CommonPlayerTickHandler; import mekanism.common.KeySync; @@ -390,13 +391,13 @@ public class ClientTickHandler public static void setCape(AbstractClientPlayer player, ResourceLocation cape) { try { - Method m = MekanismUtils.getPrivateMethod(AbstractClientPlayer.class, ObfuscatedNames.AbstractClientPlayer_getPlayerInfo); + Method m = ReflectionUtils.getPrivateMethod(AbstractClientPlayer.class, ObfuscatedNames.AbstractClientPlayer_getPlayerInfo); Object obj = m.invoke(player); if(obj instanceof NetworkPlayerInfo) { NetworkPlayerInfo info = (NetworkPlayerInfo)obj; - MekanismUtils.setPrivateValue(info, cape, NetworkPlayerInfo.class, ObfuscatedNames.NetworkPlayerInfo_locationCape); + ReflectionUtils.setPrivateValue(info, cape, NetworkPlayerInfo.class, ObfuscatedNames.NetworkPlayerInfo_locationCape); } } catch(Exception e) {} } diff --git a/src/main/java/mekanism/client/gui/element/GuiElement.java b/src/main/java/mekanism/client/gui/element/GuiElement.java index a45ce8717..39ea7457d 100644 --- a/src/main/java/mekanism/client/gui/element/GuiElement.java +++ b/src/main/java/mekanism/client/gui/element/GuiElement.java @@ -3,18 +3,17 @@ package mekanism.client.gui.element; import java.util.List; import mekanism.api.ObfuscatedNames; +import mekanism.api.util.ReflectionUtils; import mekanism.client.gui.IGuiWrapper; -import mekanism.common.util.MekanismUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public abstract class GuiElement { @@ -48,8 +47,8 @@ public abstract class GuiElement if(guiObj instanceof GuiContainer) { try { - int size = (Integer)MekanismUtils.getPrivateValue(guiObj, GuiContainer.class, ObfuscatedNames.GuiContainer_xSize); - MekanismUtils.setPrivateValue(guiObj, size + xSize, GuiContainer.class, ObfuscatedNames.GuiContainer_xSize); + int size = (Integer)ReflectionUtils.getPrivateValue(guiObj, GuiContainer.class, ObfuscatedNames.GuiContainer_xSize); + ReflectionUtils.setPrivateValue(guiObj, size + xSize, GuiContainer.class, ObfuscatedNames.GuiContainer_xSize); } catch(Exception e) { e.printStackTrace(); } @@ -61,8 +60,8 @@ public abstract class GuiElement if(guiObj instanceof GuiContainer) { try { - int size = (Integer)MekanismUtils.getPrivateValue(guiObj, GuiContainer.class, ObfuscatedNames.GuiContainer_ySize); - MekanismUtils.setPrivateValue(guiObj, size + ySize, GuiContainer.class, ObfuscatedNames.GuiContainer_ySize); + int size = (Integer)ReflectionUtils.getPrivateValue(guiObj, GuiContainer.class, ObfuscatedNames.GuiContainer_ySize); + ReflectionUtils.setPrivateValue(guiObj, size + ySize, GuiContainer.class, ObfuscatedNames.GuiContainer_ySize); } catch(Exception e) { e.printStackTrace(); } @@ -74,9 +73,9 @@ public abstract class GuiElement if(guiObj instanceof GuiContainer) { try { - int left = (Integer)MekanismUtils.getPrivateValue(guiObj, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); + int left = (Integer)ReflectionUtils.getPrivateValue(guiObj, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); System.out.println(left + " " + guiLeft); - MekanismUtils.setPrivateValue(guiObj, left + guiLeft, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); + ReflectionUtils.setPrivateValue(guiObj, left + guiLeft, GuiContainer.class, ObfuscatedNames.GuiContainer_guiLeft); } catch(Exception e) { e.printStackTrace(); } @@ -88,8 +87,8 @@ public abstract class GuiElement if(guiObj instanceof GuiContainer) { try { - int top = (Integer)MekanismUtils.getPrivateValue(guiObj, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); - MekanismUtils.setPrivateValue(guiObj, top + guiTop, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); + int top = (Integer)ReflectionUtils.getPrivateValue(guiObj, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); + ReflectionUtils.setPrivateValue(guiObj, top + guiTop, GuiContainer.class, ObfuscatedNames.GuiContainer_guiTop); } catch(Exception e) { e.printStackTrace(); } diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 0383824fc..4ae0bb746 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -14,12 +14,12 @@ import mekanism.api.gas.OreGas; import mekanism.api.infuse.InfuseRegistry; import mekanism.api.infuse.InfuseType; import mekanism.api.transmitters.TransmissionType; +import mekanism.api.util.ReflectionUtils; import mekanism.client.render.tileentity.RenderConfigurableMachine; import mekanism.client.render.tileentity.RenderDynamicTank; import mekanism.client.render.tileentity.RenderFluidTank; import mekanism.client.render.tileentity.RenderThermalEvaporationController; import mekanism.common.base.IMetaItem; -import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GLAllocation; @@ -765,32 +765,10 @@ public class MekanismRenderer } } -/* - public static TextureMap getTextureMap(int type) - { - try { - List l = (List)MekanismUtils.getPrivateValue(Minecraft.getMinecraft().renderEngine, TextureManager.class, ObfuscatedNames.TextureManager_listTickables); - - for(ITickable t : l) - { - if(t instanceof TextureMap) - { - if(((TextureMap)t).getTextureType() == type) - { - return (TextureMap)t; - } - } - } - } catch(Exception e) {} - - return null; - } -*/ - public static float getPartialTick() { try { - Timer t = (Timer)MekanismUtils.getPrivateValue(Minecraft.getMinecraft(), Minecraft.class, ObfuscatedNames.Minecraft_timer); + Timer t = (Timer)ReflectionUtils.getPrivateValue(Minecraft.getMinecraft(), Minecraft.class, ObfuscatedNames.Minecraft_timer); return t.renderPartialTicks; } catch(Exception e) {} diff --git a/src/main/java/mekanism/client/render/ctm/CTMData.java b/src/main/java/mekanism/client/render/ctm/CTMData.java index 2f1e97a3e..0333ce1cb 100644 --- a/src/main/java/mekanism/client/render/ctm/CTMData.java +++ b/src/main/java/mekanism/client/render/ctm/CTMData.java @@ -17,8 +17,6 @@ public class CTMData public boolean renderConvexConnections = false; - public String facingOverride; - public CTMData(IStringSerializable... states) { for(IStringSerializable state : states) @@ -33,17 +31,6 @@ public class CTMData return this; } - public CTMData setFacingOverride(String s) - { - facingOverride= s; - return this; - } - - public boolean hasFacingOverride() - { - return facingOverride != null; - } - @SideOnly(Side.CLIENT) public boolean shouldRenderSide(IBlockAccess world, BlockPos pos, EnumFacing side) { diff --git a/src/main/java/mekanism/client/render/ctm/ICTMBlock.java b/src/main/java/mekanism/client/render/ctm/ICTMBlock.java index 99f421826..e7c9a7303 100644 --- a/src/main/java/mekanism/client/render/ctm/ICTMBlock.java +++ b/src/main/java/mekanism/client/render/ctm/ICTMBlock.java @@ -2,6 +2,7 @@ package mekanism.client.render.ctm; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.IBlockState; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; public interface ICTMBlock @@ -10,5 +11,5 @@ public interface ICTMBlock public PropertyEnum getTypeProperty(); - public String getOverrideTexture(IBlockState state); + public String getOverrideTexture(IBlockState state, EnumFacing side); } diff --git a/src/main/java/mekanism/client/render/ctm/ModelChiselBlock.java b/src/main/java/mekanism/client/render/ctm/ModelChiselBlock.java index b41be7899..e0267f5b9 100644 --- a/src/main/java/mekanism/client/render/ctm/ModelChiselBlock.java +++ b/src/main/java/mekanism/client/render/ctm/ModelChiselBlock.java @@ -8,7 +8,6 @@ import javax.vecmath.Matrix4f; import javax.vecmath.Vector3f; import mekanism.common.block.BlockBasic; -import mekanism.common.block.states.BlockStateFacing; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.BakedQuad; @@ -136,9 +135,9 @@ public class ModelChiselBlock implements ISmartBlockModel, ISmartItemModel, IPer ICTMBlock block = (ICTMBlock)state.getBlock(); CTMData data = block.getCTMData(state); - if(block.getOverrideTexture(state) != null) + if(block.getOverrideTexture(state, facing) != null) { - face = CTMRegistry.textureCache.get(block.getOverrideTexture(state)); + face = CTMRegistry.textureCache.get(block.getOverrideTexture(state, facing)); } int quadGoal = ctx == null ? 1 : CTM.QUADS_PER_SIDE; @@ -156,15 +155,7 @@ public class ModelChiselBlock implements ISmartBlockModel, ISmartItemModel, IPer { for(BakedQuad q : from) { - ChiselTextureCTM toUse = tex; - CTMData data = ((ICTMBlock)state.getBlock()).getCTMData(state); - - if(data.hasFacingOverride() && q.getFace() == state.getValue(BlockStateFacing.facingProperty)) - { - toUse = CTMRegistry.textureCache.get(data.facingOverride); - } - - to.addAll(toUse.transformQuad(q, ctx == null ? null : ctx, quadGoal)); + to.addAll(tex.transformQuad(q, ctx == null ? null : ctx, quadGoal)); } } diff --git a/src/main/java/mekanism/client/sound/SoundHandler.java b/src/main/java/mekanism/client/sound/SoundHandler.java index 9665a82cd..8c764a760 100644 --- a/src/main/java/mekanism/client/sound/SoundHandler.java +++ b/src/main/java/mekanism/client/sound/SoundHandler.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.Map; import mekanism.api.ObfuscatedNames; -import mekanism.common.util.MekanismUtils; +import mekanism.api.util.ReflectionUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.ISound; import net.minecraft.client.audio.ITickableSound; @@ -118,7 +118,7 @@ public class SoundHandler public static SoundManager getSoundManager() { try { - return (SoundManager)MekanismUtils.getPrivateValue(mc.getSoundHandler(), net.minecraft.client.audio.SoundHandler.class, ObfuscatedNames.SoundHandler_sndManager); + return (SoundManager)ReflectionUtils.getPrivateValue(mc.getSoundHandler(), net.minecraft.client.audio.SoundHandler.class, ObfuscatedNames.SoundHandler_sndManager); } catch(Exception e) { return null; } @@ -130,7 +130,7 @@ public class SoundHandler if(invPlayingSounds == null) { try { - invPlayingSounds = (Map)MekanismUtils.getPrivateValue(getSoundManager(), net.minecraft.client.audio.SoundManager.class, ObfuscatedNames.SoundManager_invPlayingSounds); + invPlayingSounds = (Map)ReflectionUtils.getPrivateValue(getSoundManager(), net.minecraft.client.audio.SoundManager.class, ObfuscatedNames.SoundManager_invPlayingSounds); } catch(Exception e) { invPlayingSounds = null; } diff --git a/src/main/java/mekanism/common/CommonPlayerTickHandler.java b/src/main/java/mekanism/common/CommonPlayerTickHandler.java index 895435867..749c72ee0 100644 --- a/src/main/java/mekanism/common/CommonPlayerTickHandler.java +++ b/src/main/java/mekanism/common/CommonPlayerTickHandler.java @@ -2,6 +2,7 @@ package mekanism.common; import mekanism.api.ObfuscatedNames; import mekanism.api.gas.GasStack; +import mekanism.api.util.ReflectionUtils; import mekanism.common.entity.EntityFlame; import mekanism.common.item.ItemFlamethrower; import mekanism.common.item.ItemFreeRunners; @@ -9,8 +10,6 @@ import mekanism.common.item.ItemGasMask; import mekanism.common.item.ItemJetpack; import mekanism.common.item.ItemJetpack.JetpackMode; import mekanism.common.item.ItemScubaTank; -import mekanism.common.util.MekanismUtils; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -102,7 +101,7 @@ public class CommonPlayerTickHandler if(player instanceof EntityPlayerMP) { - MekanismUtils.setPrivateValue(((EntityPlayerMP)player).playerNetServerHandler, 0, NetHandlerPlayServer.class, ObfuscatedNames.NetHandlerPlayServer_floatingTickCount); + ReflectionUtils.setPrivateValue(((EntityPlayerMP)player).playerNetServerHandler, 0, NetHandlerPlayServer.class, ObfuscatedNames.NetHandlerPlayServer_floatingTickCount); } jetpack.useGas(player.getEquipmentInSlot(3)); diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index e4f8494e3..955cabc55 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -241,9 +241,9 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple { if(!world.isRemote) { - TileEntity tileEntity = world.getTileEntity(pos); + TileEntity tileEntity = new Coord4D(pos, world).getTileEntity(world); - if(neighborBlock == this && tileEntity instanceof IMultiblock) + if(tileEntity instanceof IMultiblock) { ((IMultiblock)tileEntity).doUpdate(); } @@ -1096,7 +1096,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple } @Override - public String getOverrideTexture(IBlockState state) + public String getOverrideTexture(IBlockState state, EnumFacing side) { BasicBlockType type = state.getValue(getBasicBlock().getProperty()); @@ -1107,7 +1107,10 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple if(type == BasicBlockType.THERMAL_EVAPORATION_CONTROLLER) { - return type.getName() + (state.getValue(BlockStateBasic.activeProperty) ? "_on" : ""); + if(side == state.getValue(BlockStateFacing.facingProperty)) + { + return type.getName() + (state.getValue(BlockStateBasic.activeProperty) ? "_on" : ""); + } } if(type == BasicBlockType.INDUCTION_PORT) diff --git a/src/main/java/mekanism/common/frequency/FrequencyManager.java b/src/main/java/mekanism/common/frequency/FrequencyManager.java index 4e809aa81..89d7085fe 100644 --- a/src/main/java/mekanism/common/frequency/FrequencyManager.java +++ b/src/main/java/mekanism/common/frequency/FrequencyManager.java @@ -248,7 +248,7 @@ public class FrequencyManager iter.remove(); } else { - TileEntity tile = coord.getTileEntity(world); + TileEntity tile = coord.safeTileGet(world); if(!(tile instanceof IFrequencyHandler)) { diff --git a/src/main/java/mekanism/common/multiblock/MultiblockManager.java b/src/main/java/mekanism/common/multiblock/MultiblockManager.java index b398f560e..7adc2a790 100644 --- a/src/main/java/mekanism/common/multiblock/MultiblockManager.java +++ b/src/main/java/mekanism/common/multiblock/MultiblockManager.java @@ -39,7 +39,7 @@ public class MultiblockManager> for(Coord4D obj : inventories.get(id).locations) { - TileEntityMultiblock tileEntity = (TileEntityMultiblock)obj.getTileEntity(world); + TileEntityMultiblock tileEntity = (TileEntityMultiblock)obj.safeTileGet(world); if(tileEntity != null) { @@ -83,7 +83,7 @@ public class MultiblockManager> { if(obj.dimensionId == world.provider.getDimensionId() && obj.exists(world)) { - TileEntity tileEntity = obj.getTileEntity(world); + TileEntity tileEntity = obj.safeTileGet(world); if(!(tileEntity instanceof TileEntityMultiblock) || ((TileEntityMultiblock)tileEntity).getManager() != this || (getStructureId(((TileEntityMultiblock)tileEntity)) != null && getStructureId(((TileEntityMultiblock)tileEntity)) != inventoryID)) { diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index 544ac01ea..96139e5c2 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -316,7 +316,7 @@ public abstract class UpdateProtocol> */ public boolean isViableNode(BlockPos pos) { - TileEntity tile = new Coord4D(pos, pointer.getWorld().provider.getDimensionId()).safeTileGet(pointer.getWorld()); + TileEntity tile = new Coord4D(pos, pointer.getWorld()).safeTileGet(pointer.getWorld()); if(tile == null || !tile.hasWorldObj() || tile.isInvalid()) { @@ -540,7 +540,7 @@ public abstract class UpdateProtocol> cache.apply((T)structureFound); structureFound.inventoryID = idToUse; - System.out.println("Success"); + System.out.println("Success " + structureFound.locations.size()); onFormed(); List structures = new ArrayList(); @@ -573,7 +573,7 @@ public abstract class UpdateProtocol> } } else { - System.out.println("No structure"); + int killed = 0; for(Coord4D coord : iteratedNodes) { TileEntity tile = coord.safeTileGet(pointer.getWorld()); @@ -589,6 +589,7 @@ public abstract class UpdateProtocol> } tileEntity.structure = null; + killed++; } else if(tile instanceof IStructuralMultiblock) { @@ -596,6 +597,8 @@ public abstract class UpdateProtocol> } } + System.out.println(killed + " KILLED"); + for(Coord4D coord : innerNodes) { killInnerNode(coord); diff --git a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java index 8e54c0a06..1a14d1b9d 100644 --- a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java +++ b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java @@ -8,6 +8,7 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.ObfuscatedNames; import mekanism.api.Range4D; +import mekanism.api.util.ReflectionUtils; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.frequency.Frequency; @@ -16,7 +17,6 @@ import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage; import mekanism.common.network.PacketPortalFX.PortalFXMessage; import mekanism.common.tile.TileEntityTeleporter; -import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -114,7 +114,7 @@ public class PacketPortableTeleporter implements IMessageHandler> extend super(name); if(FMLCommonHandler.instance().getEffectiveSide().isServer()) - System.out.println("CREATE"); + Thread.dumpStack(); } @Override @@ -83,12 +83,14 @@ public abstract class TileEntityMultiblock> extend { for(EntityPlayer player : playersUsing) { - player.closeScreen(); + System.out.println(worldObj.isRemote + " " + clientHasStructure + " " + structure); + //player.closeScreen(); } } if(!worldObj.isRemote) { + //System.out.println(pos + " " + structure); if(structure == null) { isRendering = false; @@ -131,6 +133,7 @@ public abstract class TileEntityMultiblock> extend if(structure != null) { + //System.out.println("Whee " + structure + " " + isInvalid()); getSynchronizedData().didTick = false; if(getSynchronizedData().inventoryID != null) @@ -201,7 +204,7 @@ public abstract class TileEntityMultiblock> extend data.add(isRendering); data.add(structure != null); - + if(structure != null && isRendering) { if(sendStructure) @@ -237,7 +240,7 @@ public abstract class TileEntityMultiblock> extend isRendering = dataStream.readBoolean(); clientHasStructure = dataStream.readBoolean(); - + if(clientHasStructure && isRendering) { if(dataStream.readBoolean()) diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index a04db8bda..67d7942d2 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -5,8 +5,6 @@ import ic2.api.energy.EnergyNet; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; -import java.lang.reflect.Field; -import java.lang.reflect.Method; import java.net.HttpURLConnection; import java.net.URL; import java.util.ArrayList; @@ -75,6 +73,7 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing.Axis; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MovingObjectPosition; @@ -83,21 +82,19 @@ import net.minecraft.util.Vec3; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.BlockFluidBase; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; +import net.minecraftforge.fml.common.ModContainer; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import buildcraft.api.tools.IToolWrench; import cofh.api.item.IToolHammer; -import net.minecraftforge.fml.common.ModContainer; -import net.minecraftforge.fml.common.registry.GameData; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; /** * Utilities used by Mekanism. All miscellaneous methods are located here. @@ -990,73 +987,6 @@ public final class MekanismUtils player.openContainer.onCraftGuiOpened(player); } - /** - * Retrieves a private value from a defined class and field. - * @param obj - the Object to retrieve the value from, null if static - * @param c - Class to retrieve field value from - * @param fields - possible names of field to iterate through - * @return value as an Object, cast as necessary - */ - public static Object getPrivateValue(Object obj, Class c, String[] fields) - { - for(String field : fields) - { - try { - Field f = c.getDeclaredField(field); - f.setAccessible(true); - return f.get(obj); - } catch(Exception e) { - continue; - } - } - - return null; - } - - /** - * Sets a private value from a defined class and field to a new value. - * @param obj - the Object to perform the operation on, null if static - * @param value - value to set the field to - * @param c - Class the operation will be performed on - * @param fields - possible names of field to iterate through - */ - public static void setPrivateValue(Object obj, Object value, Class c, String[] fields) - { - for(String field : fields) - { - try { - Field f = c.getDeclaredField(field); - f.setAccessible(true); - f.set(obj, value); - } catch(Exception e) { - continue; - } - } - } - - /** - * Retrieves a private method from a class, sets it as accessible, and returns it. - * @param c - Class the method is located in - * @param methods - possible names of the method to iterate through - * @param params - the Types inserted as parameters into the method - * @return private method - */ - public static Method getPrivateMethod(Class c, String[] methods, Class... params) - { - for(String method : methods) - { - try { - Method m = c.getDeclaredMethod(method, params); - m.setAccessible(true); - return m; - } catch(Exception e) { - continue; - } - } - - return null; - } - /** * Gets a ResourceLocation with a defined resource type and name. * @param type - type of resource to retrieve diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/security_desk.png b/src/main/resources/assets/mekanism/textures/blocks/models/security_desk.png index 8dbcd403d09ddf9632a9f5d9f0a368c3b6c61f17..13d06ad61c7ca60a7a2b88d90bae920aedde34e5 100644 GIT binary patch literal 31433 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 Date: Mon, 9 May 2016 21:07:18 -0400 Subject: [PATCH 06/22] Of course, the issue isn't on Minecraft's end, it has to do with Coord4D hashing. Coord4D no longer extends BlockPos to prevent hash issues --- src/main/java/mekanism/api/Chunk3D.java | 4 +- src/main/java/mekanism/api/Coord4D.java | 259 +++++------- .../java/mekanism/api/ObfuscatedNames.java | 1 - src/main/java/mekanism/api/Pos3D.java | 5 + src/main/java/mekanism/api/Range4D.java | 12 +- .../api/transmitters/DynamicNetwork.java | 24 +- .../java/mekanism/client/ClientProxy.java | 2 +- .../mekanism/client/SparkleAnimation.java | 12 +- .../mekanism/client/gui/GuiSeismicReader.java | 9 +- src/main/java/mekanism/client/render/CTM.java | 383 ------------------ .../client/render/MinerVisualRenderer.java | 5 +- .../client/render/RenderTickHandler.java | 2 +- .../client/render/tileentity/RenderBin.java | 6 +- .../render/tileentity/RenderDynamicTank.java | 11 +- .../RenderThermalEvaporationController.java | 2 +- .../RenderThermoelectricBoiler.java | 18 +- src/main/java/mekanism/common/CTMData.java | 138 ------- .../java/mekanism/common/LaserManager.java | 16 +- .../mekanism/common/block/BlockBasic.java | 41 +- .../mekanism/common/block/BlockMachine.java | 71 +++- .../content/boiler/BoilerUpdateProtocol.java | 31 +- .../content/matrix/MatrixUpdateProtocol.java | 4 +- .../content/miner/ThreadMinerSearch.java | 6 +- .../content/tank/TankUpdateProtocol.java | 2 +- .../content/transporter/PathfinderCache.java | 4 +- .../transporter/TransporterPathfinder.java | 4 +- .../mekanism/common/entity/EntityBalloon.java | 14 +- .../mekanism/common/entity/EntityFlame.java | 16 +- .../mekanism/common/entity/EntityRobit.java | 2 +- .../common/frequency/FrequencyManager.java | 2 +- .../common/integration/WailaDataProvider.java | 2 +- .../common/item/ItemAtomicDisassembler.java | 14 +- .../mekanism/common/item/ItemBalloon.java | 4 +- .../common/item/ItemBlockMachine.java | 12 +- .../common/item/ItemPortableTeleporter.java | 2 +- .../common/multiblock/MultiblockManager.java | 4 +- .../common/multiblock/UpdateProtocol.java | 72 ++-- .../multipart/MultipartTransmitter.java | 2 +- .../multipart/PartDiversionTransporter.java | 2 +- .../common/multipart/PartGlowPanel.java | 4 +- .../multipart/PartLogisticalTransporter.java | 6 +- .../common/multipart/PartSidedPipe.java | 69 ++-- .../common/multipart/PartTransmitter.java | 2 +- .../common/network/PacketDataRequest.java | 2 +- .../common/network/PacketDigitalMinerGui.java | 4 +- .../network/PacketLogisticalSorterGui.java | 4 +- .../network/PacketOredictionificatorGui.java | 4 +- .../common/network/PacketPersonalChest.java | 2 +- .../common/network/PacketPortalFX.java | 4 +- .../common/network/PacketSimpleGui.java | 4 +- .../common/network/PacketTileEntity.java | 2 +- .../tile/TileEntityAdvancedBoundingBlock.java | 4 +- .../common/tile/TileEntityBoilerValve.java | 14 +- .../common/tile/TileEntityDigitalMiner.java | 24 +- .../common/tile/TileEntityElectricPump.java | 6 +- .../tile/TileEntityFluidicPlenisher.java | 6 +- .../mekanism/common/tile/TileEntityLaser.java | 8 +- .../common/tile/TileEntityLaserAmplifier.java | 8 +- .../tile/TileEntityLaserTractorBeam.java | 8 +- .../common/tile/TileEntityMultiblock.java | 6 +- .../tile/TileEntitySolarNeutronActivator.java | 2 +- .../tile/TileEntityStructuralGlass.java | 6 +- .../common/tile/TileEntityTeleporter.java | 17 +- ...ileEntityThermalEvaporationController.java | 10 +- .../TileEntityThermalEvaporationValve.java | 2 +- .../mekanism/common/util/MekanismUtils.java | 22 +- .../java/mekanism/common/util/MinerUtils.java | 6 +- .../common/util/TransporterUtils.java | 4 +- .../blockstates/induction_casing.json | 2 +- .../thermal_evaporation_controller.json | 8 +- 70 files changed, 458 insertions(+), 1032 deletions(-) delete mode 100644 src/main/java/mekanism/client/render/CTM.java delete mode 100644 src/main/java/mekanism/common/CTMData.java diff --git a/src/main/java/mekanism/api/Chunk3D.java b/src/main/java/mekanism/api/Chunk3D.java index 7de476a04..f469d5db5 100644 --- a/src/main/java/mekanism/api/Chunk3D.java +++ b/src/main/java/mekanism/api/Chunk3D.java @@ -50,8 +50,8 @@ public class Chunk3D */ public Chunk3D(Coord4D coord) { - xCoord = coord.getX() >> 4; - zCoord = coord.getZ() >> 4; + xCoord = coord.xCoord >> 4; + zCoord = coord.zCoord >> 4; dimensionId = coord.dimensionId; } diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index 59b4cda3c..5a0db0f80 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -3,9 +3,7 @@ package mekanism.api; import io.netty.buffer.ByteBuf; import java.util.ArrayList; -import java.util.List; -import mekanism.api.util.ReflectionUtils; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -18,11 +16,9 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3i; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.chunk.Chunk.EnumCreateEntityType; import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint; /** @@ -31,8 +27,12 @@ import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint; * @author aidancbrady * */ -public class Coord4D extends BlockPos +public class Coord4D { + public int xCoord; + public int yCoord; + public int zCoord; + public int dimensionId; /** @@ -43,35 +43,22 @@ public class Coord4D extends BlockPos */ public Coord4D(int x, int y, int z) { - super(x, y, z); + xCoord = x; + yCoord = y; + zCoord = z; dimensionId = 0; } - public Coord4D(int x, int y, int z, World world) - { - this(x, y, z, world.provider.getDimensionId()); - } - - public Coord4D(Vec3i pos, World world) - { - this(pos, world.provider.getDimensionId()); - } - - public Coord4D(double x, double y, double z) - { - super(x, y, z); - - dimensionId = 0; - } - /** * Creates a Coord4D from an entity's position, rounded down. * @param entity - entity to create the Coord4D from */ public Coord4D(Entity entity) { - super(entity); + xCoord = (int)entity.posX; + yCoord = (int)entity.posY; + zCoord = (int)entity.posZ; dimensionId = entity.worldObj.provider.getDimensionId(); } @@ -83,48 +70,44 @@ public class Coord4D extends BlockPos * @param z - z coordinate * @param dimension - dimension ID */ - public Coord4D(int x, int y, int z, int dimension) - { - super(x, y, z); - - dimensionId = dimension; - } - public Coord4D(double x, double y, double z, int dimension) { - super(x, y, z); + xCoord = MathHelper.floor_double(x); + yCoord = MathHelper.floor_double(y); + zCoord = MathHelper.floor_double(z); dimensionId = dimension; } - - public Coord4D(Vec3i pos) + + public Coord4D(BlockPos pos, World world) { - this(pos, 0); + this(pos.getX(), pos.getY(), pos.getZ(), world.provider.getDimensionId()); } - public Coord4D(Vec3i pos, int dimension) + public Coord4D(MovingObjectPosition mop, World world) { - this(pos.getX(), pos.getY(), pos.getZ()); - - dimensionId = dimension; - } - - - public Coord4D(MovingObjectPosition mop) - { - super(mop.getBlockPos()); - - dimensionId = 0; + this(mop.getBlockPos(), world); } /** - * Gets the metadata of the block representing this Coord4D. + * Gets the state of the block representing this Coord4D. * @param world - world this Coord4D is in - * @return the metadata of this Coord4D's block + * @return the state of this Coord4D's block */ public IBlockState getBlockState(IBlockAccess world) { - return world.getBlockState(this); + return world.getBlockState(getPos()); + } + + public int getBlockMeta(IBlockAccess world) + { + IBlockState state = getBlockState(world); + return state == null ? 0 : state.getBlock().getMetaFromState(state); + } + + public BlockPos getPos() + { + return new BlockPos(xCoord, yCoord, zCoord); } /** @@ -139,46 +122,9 @@ public class Coord4D extends BlockPos return null; } - TileEntity tile = world.getTileEntity(this); - - return (tile != null && tile.hasWorldObj() && !tile.isInvalid()) ? tile : null; + return world.getTileEntity(getPos()); } - - public TileEntity safeTileGet(World world) - { - if(!exists(world)) - { - return null; - } - - TileEntity tile = world.getChunkFromBlockCoords(this).getTileEntity(this, EnumCreateEntityType.CHECK); - - if(tile != null) - { - return tile; - } - - for(TileEntity iter : world.loadedTileEntityList) - { - if(!iter.isInvalid() && iter.getPos().equals(this)) - { - return iter; - } - } - - List added = (List)ReflectionUtils.getPrivateValue(world, World.class, ObfuscatedNames.World_addedTileEntityList); - - for(TileEntity iter : added) - { - if(!iter.isInvalid() && iter.getPos().equals(this)) - { - return iter; - } - } - - return null; - } - + /** * Gets the Block value of the block representing this Coord4D. * @param world - world this Coord4D is in @@ -191,13 +137,7 @@ public class Coord4D extends BlockPos return null; } - return world.getBlockState(this).getBlock(); - } - - public int getBlockMeta(IBlockAccess world) - { - IBlockState state = getBlockState(world); - return state == null ? 0 : state.getBlock().getMetaFromState(state); + return getBlockState(world).getBlock(); } /** @@ -207,9 +147,9 @@ public class Coord4D extends BlockPos */ public NBTTagCompound write(NBTTagCompound nbtTags) { - nbtTags.setInteger("x", getX()); - nbtTags.setInteger("y", getY()); - nbtTags.setInteger("z", getZ()); + nbtTags.setInteger("x", xCoord); + nbtTags.setInteger("y", yCoord); + nbtTags.setInteger("z", zCoord); nbtTags.setInteger("dimensionId", dimensionId); return nbtTags; @@ -219,9 +159,11 @@ public class Coord4D extends BlockPos * Writes this Coord4D's data to an ArrayList for packet transfer. * @param data - the ArrayList to add the data to */ - public void write(ArrayList data) + public void write(ArrayList data) { - data.add(toLong()); + data.add(xCoord); + data.add(yCoord); + data.add(zCoord); data.add(dimensionId); } @@ -231,7 +173,9 @@ public class Coord4D extends BlockPos */ public void write(ByteBuf dataStream) { - dataStream.writeLong(toLong()); + dataStream.writeInt(xCoord); + dataStream.writeInt(yCoord); + dataStream.writeInt(zCoord); dataStream.writeInt(dimensionId); } @@ -242,42 +186,47 @@ public class Coord4D extends BlockPos * @param z - z value to translate * @return translated Coord4D */ - public Coord4D add(int x, int y, int z) + public Coord4D translate(int x, int y, int z) { - return x == 0 && y == 0 && z == 0 ? this : new Coord4D(this.getX() + x, this.getY() + y, this.getZ() + z, dimensionId); + return new Coord4D(xCoord+x, yCoord+y, zCoord+z, dimensionId); } - - public Coord4D add(double x, double y, double z) - { - return x == 0.0D && y == 0.0D && z == 0.0D ? this : new Coord4D((double)this.getX() + x, (double)this.getY() + y, (double)this.getZ() + z, dimensionId); - } - + /** * Translates this Coord4D by the defined Coord4D's coordinates, regardless of dimension. * @param coord - coordinates to translate by * @return translated Coord4D */ - public Coord4D add(Vec3i coord) + public Coord4D translate(Coord4D coord) { - return add(coord.getX(), coord.getY(), coord.getZ()); + return translate(coord.xCoord, coord.yCoord, coord.zCoord); } /** - * Offset this BlockPos 1 block in the given direction + * Creates and returns a new Coord4D translated to the defined offsets of the side. + * @param side - side to translate this Coord4D to + * @return translated Coord4D */ - public Coord4D offset(EnumFacing facing) + public Coord4D offset(EnumFacing side) { - return this.offset(facing, 1); + return getFromSide(side, 1); } /** - * Offsets this BlockPos n blocks in the given direction + * Creates and returns a new Coord4D translated to the defined offsets of the side by the defined amount. + * @param side - side to translate this Coord4D to + * @param amount - how far to translate this Coord4D + * @return translated Coord4D */ - public Coord4D offset(EnumFacing facing, int n) + public Coord4D getFromSide(EnumFacing side, int amount) { - return (facing == null || n == 0) ? this : new Coord4D(getX() + facing.getFrontOffsetX() * n, getY() + facing.getFrontOffsetY() * n, getZ() + facing.getFrontOffsetZ() * n, dimensionId); + if(side == null || amount == 0) + { + return this; + } + + return new Coord4D(xCoord+(side.getFrontOffsetX()*amount), yCoord+(side.getFrontOffsetY()*amount), zCoord+(side.getFrontOffsetZ()*amount), dimensionId); } - + public ItemStack getStack(IBlockAccess world) { IBlockState state = getBlockState(world); @@ -286,7 +235,7 @@ public class Coord4D extends BlockPos { return null; } - + return new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state)); } @@ -297,8 +246,7 @@ public class Coord4D extends BlockPos */ public static Coord4D get(TileEntity tileEntity) { - BlockPos pos = tileEntity.getPos(); - return new Coord4D(pos.getX(), pos.getY(), pos.getZ(), tileEntity.getWorld().provider.getDimensionId()); + return new Coord4D(tileEntity.getPos(), tileEntity.getWorld()); } /** @@ -318,17 +266,17 @@ public class Coord4D extends BlockPos */ public static Coord4D read(ByteBuf dataStream) { - return new Coord4D(BlockPos.fromLong(dataStream.readLong()), dataStream.readInt()); + return new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); } /** * Creates and returns a new Coord4D with values representing the difference between the defined Coord4D - * @param vec - the Coord4D to subtract from this + * @param other - the Coord4D to subtract from this * @return a Coord4D representing the distance between the defined Coord4D */ - public Coord4D difference(Vec3i vec) + public Coord4D difference(Coord4D other) { - return vec.getX() == 0 && vec.getY() == 0 && vec.getZ() == 0 ? this : new Coord4D(getX() - vec.getX(), getY() - vec.getY(), getZ() - vec.getZ(), dimensionId); + return new Coord4D(xCoord-other.xCoord, yCoord-other.yCoord, zCoord-other.zCoord, dimensionId); } /** @@ -343,7 +291,7 @@ public class Coord4D extends BlockPos for(EnumFacing side : EnumFacing.VALUES) { - if(side.getDirectionVec().equals(diff)) + if(side.getFrontOffsetX() == diff.xCoord && side.getFrontOffsetY() == diff.yCoord && side.getFrontOffsetZ() == diff.zCoord) { return side; } @@ -357,11 +305,11 @@ public class Coord4D extends BlockPos * @param obj - the Coord4D to find the distance to * @return the distance to the defined Coord4D */ - public int distanceTo(Vec3i obj) + public int distanceTo(Coord4D obj) { - int subX = getX() - obj.getX(); - int subY = getY() - obj.getY(); - int subZ = getZ() - obj.getZ(); + int subX = xCoord - obj.xCoord; + int subY = yCoord - obj.yCoord; + int subZ = zCoord - obj.zCoord; return (int)MathHelper.sqrt_double(subX * subX + subY * subY + subZ * subZ); } @@ -373,7 +321,7 @@ public class Coord4D extends BlockPos */ public boolean sideVisible(EnumFacing side, IBlockAccess world) { - return world.isAirBlock(offset(side)); + return world.isAirBlock(step(side).getPos()); } /** @@ -383,7 +331,17 @@ public class Coord4D extends BlockPos */ public TargetPoint getTargetPoint(double range) { - return new TargetPoint(dimensionId, getX(), getY(), getZ(), range); + return new TargetPoint(dimensionId, xCoord, yCoord, zCoord, range); + } + + /** + * Steps this Coord4D in the defined side's offset without creating a new value. + * @param side - side to step towards + * @return this Coord4D + */ + public Coord4D step(EnumFacing side) + { + return translate(side.getFrontOffsetX(), side.getFrontOffsetY(), side.getFrontOffsetZ()); } /** @@ -393,7 +351,7 @@ public class Coord4D extends BlockPos */ public boolean exists(World world) { - return world.getChunkProvider() == null || world.getChunkProvider().chunkExists(getX() >> 4, getZ() >> 4); + return world.getChunkProvider() == null || world.getChunkProvider().chunkExists(xCoord >> 4, zCoord >> 4); } /** @@ -403,7 +361,7 @@ public class Coord4D extends BlockPos */ public Chunk getChunk(World world) { - return world.getChunkFromBlockCoords(this); + return world.getChunkFromBlockCoords(getPos()); } /** @@ -422,7 +380,7 @@ public class Coord4D extends BlockPos */ public boolean isAirBlock(IBlockAccess world) { - return world.isAirBlock(this); + return world.isAirBlock(getPos()); } /** @@ -432,7 +390,7 @@ public class Coord4D extends BlockPos */ public boolean isReplaceable(World world) { - return getBlock(world).isReplaceable(world, this); + return getBlock(world).isReplaceable(world, getPos()); } /** @@ -441,33 +399,38 @@ public class Coord4D extends BlockPos */ public AxisAlignedBB getBoundingBox() { - return new AxisAlignedBB(this, add(1,1,1)); + return AxisAlignedBB.fromBounds(xCoord, yCoord, zCoord, xCoord+1, yCoord+1, zCoord+1); + } + + @Override + public Coord4D clone() + { + return new Coord4D(xCoord, yCoord, zCoord, dimensionId); } @Override public String toString() { - return "[Coord4D: " + getX() + ", " + getY() + ", " + getZ() + ", dim=" + dimensionId + "]"; + return "[Coord4D: " + xCoord + ", " + yCoord + ", " + zCoord + ", dim=" + dimensionId + "]"; } @Override public boolean equals(Object obj) { - return obj instanceof Vec3i && - ( - ((Vec3i)obj).getX() == getX() && - ((Vec3i)obj).getY() == getY() && - ((Vec3i)obj).getZ() == getZ() - ) && !(obj instanceof Coord4D && ((Coord4D)obj).dimensionId != dimensionId); + return obj instanceof Coord4D && + ((Coord4D)obj).xCoord == xCoord && + ((Coord4D)obj).yCoord == yCoord && + ((Coord4D)obj).zCoord == zCoord && + ((Coord4D)obj).dimensionId == dimensionId; } @Override public int hashCode() { int code = 1; - code = 31 * code + getX(); - code = 31 * code + getY(); - code = 31 * code + getZ(); + code = 31 * code + xCoord; + code = 31 * code + yCoord; + code = 31 * code + zCoord; code = 31 * code + dimensionId; return code; } diff --git a/src/main/java/mekanism/api/ObfuscatedNames.java b/src/main/java/mekanism/api/ObfuscatedNames.java index cdcbde660..0edb63816 100644 --- a/src/main/java/mekanism/api/ObfuscatedNames.java +++ b/src/main/java/mekanism/api/ObfuscatedNames.java @@ -13,5 +13,4 @@ public final class ObfuscatedNames public static String[] SoundManager_invPlayingSounds = new String[] {"invPlayingSounds", "field_148630_i"}; public static String[] AbstractClientPlayer_getPlayerInfo = new String[] {"getPlayerInfo", "func_110303_q"}; public static String[] NetworkPlayerInfo_locationCape = new String[] {"locationCape", "field_178862_f"}; - public static String[] World_addedTileEntityList = new String[] {"addedTileEntityList", "field_147484_a"}; } \ No newline at end of file diff --git a/src/main/java/mekanism/api/Pos3D.java b/src/main/java/mekanism/api/Pos3D.java index 2baf6cb9a..b480604fb 100644 --- a/src/main/java/mekanism/api/Pos3D.java +++ b/src/main/java/mekanism/api/Pos3D.java @@ -27,6 +27,11 @@ public class Pos3D extends Vec3 { super(vec.xCoord, vec.yCoord, vec.zCoord); } + + public Pos3D(Coord4D coord) + { + super(coord.xCoord, coord.yCoord, coord.zCoord); + } public Pos3D(Vec3i vec) { diff --git a/src/main/java/mekanism/api/Range4D.java b/src/main/java/mekanism/api/Range4D.java index 567692faa..ee55b1da9 100644 --- a/src/main/java/mekanism/api/Range4D.java +++ b/src/main/java/mekanism/api/Range4D.java @@ -40,13 +40,13 @@ public class Range4D public Range4D(Coord4D coord) { - xMin = coord.getX(); - yMin = coord.getY(); - zMin = coord.getZ(); + xMin = coord.xCoord; + yMin = coord.yCoord; + zMin = coord.zCoord; - xMax = coord.getX()+1; - yMax = coord.getY()+1; - zMax = coord.getZ()+1; + xMax = coord.xCoord+1; + yMax = coord.yCoord+1; + zMax = coord.zCoord+1; dimensionId = coord.dimensionId; } diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java index b3250cf90..7fe1e4619 100644 --- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java +++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java @@ -248,23 +248,23 @@ public abstract class DynamicNetwork> implemen IGridTransmitter initTransmitter = transmitters.iterator().next(); Coord4D initCoord = initTransmitter.coord(); - int minX = initCoord.getX(); - int minY = initCoord.getY(); - int minZ = initCoord.getZ(); - int maxX = initCoord.getX(); - int maxY = initCoord.getY(); - int maxZ = initCoord.getZ(); + int minX = initCoord.xCoord; + int minY = initCoord.yCoord; + int minZ = initCoord.zCoord; + int maxX = initCoord.xCoord; + int maxY = initCoord.yCoord; + int maxZ = initCoord.zCoord; for(IGridTransmitter transmitter : transmitters) { Coord4D coord = transmitter.coord(); - if(coord.getX() < minX) minX = coord.getX(); - if(coord.getY() < minY) minY = coord.getY(); - if(coord.getZ() < minZ) minZ = coord.getZ(); - if(coord.getX() > maxX) maxX = coord.getX(); - if(coord.getY() > maxY) maxY = coord.getY(); - if(coord.getX() > maxZ) maxZ = coord.getZ(); + if(coord.xCoord < minX) minX = coord.xCoord; + if(coord.yCoord < minY) minY = coord.yCoord; + if(coord.zCoord < minZ) minZ = coord.zCoord; + if(coord.xCoord > maxX) maxX = coord.xCoord; + if(coord.yCoord > maxY) maxY = coord.yCoord; + if(coord.xCoord > maxZ) maxZ = coord.zCoord; } return new Range4D(minX, minY, minZ, maxX, maxY, maxZ, initTransmitter.world().provider.getDimensionId()); diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index def470266..730151799 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -606,7 +606,7 @@ public class ClientProxy extends CommonProxy { if(Minecraft.getMinecraft().theWorld != null) { - Minecraft.getMinecraft().effectRenderer.addBlockHitEffects(coord, mop); + Minecraft.getMinecraft().effectRenderer.addBlockHitEffects(coord.getPos(), mop); } } diff --git a/src/main/java/mekanism/client/SparkleAnimation.java b/src/main/java/mekanism/client/SparkleAnimation.java index 5230ca4a4..bab827f14 100644 --- a/src/main/java/mekanism/client/SparkleAnimation.java +++ b/src/main/java/mekanism/client/SparkleAnimation.java @@ -52,12 +52,12 @@ public class SparkleAnimation { for(int i = 0; i < 6; i++) { - world.spawnParticle(EnumParticleTypes.REDSTONE, coord.getX() + random.nextDouble(), coord.getY() + -.01, coord.getZ() + random.nextDouble(), 0, 0, 0); - world.spawnParticle(EnumParticleTypes.REDSTONE, coord.getX() + random.nextDouble(), coord.getY() + 1.01, coord.getZ() + random.nextDouble(), 0, 0, 0); - world.spawnParticle(EnumParticleTypes.REDSTONE, coord.getX() + random.nextDouble(), coord.getY() + random.nextDouble(), coord.getZ() + -.01, 0, 0, 0); - world.spawnParticle(EnumParticleTypes.REDSTONE, coord.getX() + random.nextDouble(), coord.getY() + random.nextDouble(), coord.getZ() + 1.01, 0, 0, 0); - world.spawnParticle(EnumParticleTypes.REDSTONE, coord.getX() + -.01, coord.getY() + random.nextDouble(), coord.getZ() + random.nextDouble(), 0, 0, 0); - world.spawnParticle(EnumParticleTypes.REDSTONE, coord.getX() + 1.01, coord.getY() + random.nextDouble(), coord.getZ() + random.nextDouble(), 0, 0, 0); + world.spawnParticle(EnumParticleTypes.REDSTONE, coord.xCoord + random.nextDouble(), coord.yCoord + -.01, coord.zCoord + random.nextDouble(), 0, 0, 0); + world.spawnParticle(EnumParticleTypes.REDSTONE, coord.xCoord + random.nextDouble(), coord.yCoord + 1.01, coord.zCoord + random.nextDouble(), 0, 0, 0); + world.spawnParticle(EnumParticleTypes.REDSTONE, coord.xCoord + random.nextDouble(), coord.yCoord + random.nextDouble(), coord.zCoord + -.01, 0, 0, 0); + world.spawnParticle(EnumParticleTypes.REDSTONE, coord.xCoord + random.nextDouble(), coord.yCoord + random.nextDouble(), coord.zCoord + 1.01, 0, 0, 0); + world.spawnParticle(EnumParticleTypes.REDSTONE, coord.xCoord + -.01, coord.yCoord + random.nextDouble(), coord.zCoord + random.nextDouble(), 0, 0, 0); + world.spawnParticle(EnumParticleTypes.REDSTONE, coord.xCoord + 1.01, coord.yCoord + random.nextDouble(), coord.zCoord + random.nextDouble(), 0, 0, 0); } } } diff --git a/src/main/java/mekanism/client/gui/GuiSeismicReader.java b/src/main/java/mekanism/client/gui/GuiSeismicReader.java index 773ae68ef..79333d910 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicReader.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicReader.java @@ -14,14 +14,13 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.opengl.GL11; import org.lwjgl.util.Rectangle; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiSeismicReader extends GuiScreen { @@ -43,7 +42,7 @@ public class GuiSeismicReader extends GuiScreen public GuiSeismicReader(World world, Coord4D coord, ItemStack stack) { - pos = new Coord4D(coord.getX(), Math.min(255, coord.getY()), coord.getZ()); + pos = new Coord4D(coord.xCoord, Math.min(255, coord.yCoord), coord.zCoord); worldObj = world; itemStack = stack; @@ -226,7 +225,7 @@ public class GuiSeismicReader extends GuiScreen public void calculate() { - for(BlockPos p = new BlockPos(pos.getX(), 0, pos.getZ()); p.getY() < pos.getY(); p = p.up()) + for(BlockPos p = new BlockPos(pos.zCoord, 0, pos.zCoord); p.getY() < pos.yCoord; p = p.up()) { IBlockState state = worldObj.getBlockState(p); Block block = state.getBlock(); diff --git a/src/main/java/mekanism/client/render/CTM.java b/src/main/java/mekanism/client/render/CTM.java deleted file mode 100644 index 2143c763b..000000000 --- a/src/main/java/mekanism/client/render/CTM.java +++ /dev/null @@ -1,383 +0,0 @@ -package mekanism.client.render; - -import java.util.HashMap; -import java.util.List; -import java.util.Map.Entry; - -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; -import net.minecraft.world.IBlockAccess; - -/** - * CTM Logic adapted from Chisel. Code licensed under GPLv2 - * - * @author AUTOMATIC_MAIDEN, asie, pokefenn, unpairedbracket - */ -public class CTM -{ - static int submaps[][] = { {16, 17, 18, 19}, {16, 9, 18, 13}, {8, 9, 12, 13}, {8, 17, 12, 19}, {16, 9, 6, 15}, {8, 17, 14, 7}, {2, 11, 6, 15}, - {8, 9, 14, 15}, {10, 1, 14, 15}, {10, 11, 14, 5}, {0, 11, 4, 15}, {0, 1, 14, 15}, {}, {}, {}, {}, {16, 17, 6, 7}, {16, 9, 6, 5}, {8, 9, 4, 5}, - {8, 17, 4, 7}, {2, 11, 18, 13}, {10, 3, 12, 19}, {10, 11, 12, 13}, {10, 3, 14, 7}, {0, 11, 14, 15}, {10, 11, 4, 15}, {10, 11, 4, 5}, - {10, 1, 14, 5}, {}, {}, {}, {}, {2, 3, 6, 7}, {2, 1, 6, 5}, {0, 1, 4, 5}, {0, 3, 4, 7}, {2, 11, 6, 5}, {8, 9, 4, 15}, {2, 1, 6, 15}, {8, 9, 14, 5}, - {0, 1, 4, 15}, {0, 1, 14, 5}, {10, 1, 4, 15}, {0, 11, 14, 5}, {}, {}, {}, {}, {2, 3, 18, 19}, {2, 1, 18, 13}, {0, 1, 12, 13}, {0, 3, 12, 19}, - {10, 1, 12, 13}, {0, 3, 14, 7}, {0, 11, 12, 13}, {10, 3, 4, 7}, {0, 11, 4, 5}, {10, 1, 4, 5}, {10, 11, 14, 15}, {0, 1, 4, 5}, {}, {}, {}, {},}; - - public static int[] getSubmapIndices(IBlockAccess world, int x, int y, int z, int side, HashMap> blockMetas, boolean convexConnections) - { - int index = getTexture(world, x, y, z, side, blockMetas, convexConnections); - - return submaps[index]; - } - - public static int getTexture(IBlockAccess world, int x, int y, int z, int side, HashMap> blockMetas, boolean convexConnections) - { - if(world == null) - { - return 0; - } - - int texture = 0; - - boolean b[] = new boolean[6]; - - if(side <= 1) - { - b[0] = isConnected(world, x - 1, y, z, side, blockMetas, convexConnections); - b[1] = isConnected(world, x + 1, y, z, side, blockMetas, convexConnections); - b[2] = isConnected(world, x, y, z + 1, side, blockMetas, convexConnections); - b[3] = isConnected(world, x, y, z - 1, side, blockMetas, convexConnections); - } - else if(side == 2) - { - b[0] = isConnected(world, x + 1, y, z, side, blockMetas, convexConnections); - b[1] = isConnected(world, x - 1, y, z, side, blockMetas, convexConnections); - b[2] = isConnected(world, x, y - 1, z, side, blockMetas, convexConnections); - b[3] = isConnected(world, x, y + 1, z, side, blockMetas, convexConnections); - } - else if(side == 3) - { - b[0] = isConnected(world, x - 1, y, z, side, blockMetas, convexConnections); - b[1] = isConnected(world, x + 1, y, z, side, blockMetas, convexConnections); - b[2] = isConnected(world, x, y - 1, z, side, blockMetas, convexConnections); - b[3] = isConnected(world, x, y + 1, z, side, blockMetas, convexConnections); - } - else if(side == 4) - { - b[0] = isConnected(world, x, y, z - 1, side, blockMetas, convexConnections); - b[1] = isConnected(world, x, y, z + 1, side, blockMetas, convexConnections); - b[2] = isConnected(world, x, y - 1, z, side, blockMetas, convexConnections); - b[3] = isConnected(world, x, y + 1, z, side, blockMetas, convexConnections); - } - else if(side == 5) - { - b[0] = isConnected(world, x, y, z + 1, side, blockMetas, convexConnections); - b[1] = isConnected(world, x, y, z - 1, side, blockMetas, convexConnections); - b[2] = isConnected(world, x, y - 1, z, side, blockMetas, convexConnections); - b[3] = isConnected(world, x, y + 1, z, side, blockMetas, convexConnections); - } - - if(b[0] & !b[1] & !b[2] & !b[3]) - { - texture = 3; - } - else if(!b[0] & b[1] & !b[2] & !b[3]) - { - texture = 1; - } - else if(!b[0] & !b[1] & b[2] & !b[3]) - { - texture = 16; - } - else if(!b[0] & !b[1] & !b[2] & b[3]) - { - texture = 48; - } - else if(b[0] & b[1] & !b[2] & !b[3]) - { - texture = 2; - } - else if(!b[0] & !b[1] & b[2] & b[3]) - { - texture = 32; - } - else if(b[0] & !b[1] & b[2] & !b[3]) - { - texture = 19; - } - else if(b[0] & !b[1] & !b[2] & b[3]) - { - texture = 51; - } - else if(!b[0] & b[1] & b[2] & !b[3]) - { - texture = 17; - } - else if(!b[0] & b[1] & !b[2] & b[3]) - { - texture = 49; - } - else if(!b[0] & b[1] & b[2] & b[3]) - { - texture = 33; - } - else if(b[0] & !b[1] & b[2] & b[3]) - { - texture = 35; - } - else if(b[0] & b[1] & !b[2] & b[3]) - { - texture = 50; - } - else if(b[0] & b[1] & b[2] & !b[3]) - { - texture = 18; - } - else if(b[0] & b[1] & b[2] & b[3]) - { - texture = 34; - } - - boolean b2[] = new boolean[6]; - - if(side <= 1) - { - b2[0] = !isConnected(world, x + 1, y, z + 1, side, blockMetas, convexConnections); - b2[1] = !isConnected(world, x - 1, y, z + 1, side, blockMetas, convexConnections); - b2[2] = !isConnected(world, x + 1, y, z - 1, side, blockMetas, convexConnections); - b2[3] = !isConnected(world, x - 1, y, z - 1, side, blockMetas, convexConnections); - } - else if(side == 2) - { - b2[0] = !isConnected(world, x - 1, y - 1, z, side, blockMetas, convexConnections); - b2[1] = !isConnected(world, x + 1, y - 1, z, side, blockMetas, convexConnections); - b2[2] = !isConnected(world, x - 1, y + 1, z, side, blockMetas, convexConnections); - b2[3] = !isConnected(world, x + 1, y + 1, z, side, blockMetas, convexConnections); - } - else if(side == 3) - { - b2[0] = !isConnected(world, x + 1, y - 1, z, side, blockMetas, convexConnections); - b2[1] = !isConnected(world, x - 1, y - 1, z, side, blockMetas, convexConnections); - b2[2] = !isConnected(world, x + 1, y + 1, z, side, blockMetas, convexConnections); - b2[3] = !isConnected(world, x - 1, y + 1, z, side, blockMetas, convexConnections); - } - else if(side == 4) - { - b2[0] = !isConnected(world, x, y - 1, z + 1, side, blockMetas, convexConnections); - b2[1] = !isConnected(world, x, y - 1, z - 1, side, blockMetas, convexConnections); - b2[2] = !isConnected(world, x, y + 1, z + 1, side, blockMetas, convexConnections); - b2[3] = !isConnected(world, x, y + 1, z - 1, side, blockMetas, convexConnections); - } - else if(side == 5) - { - b2[0] = !isConnected(world, x, y - 1, z - 1, side, blockMetas, convexConnections); - b2[1] = !isConnected(world, x, y - 1, z + 1, side, blockMetas, convexConnections); - b2[2] = !isConnected(world, x, y + 1, z - 1, side, blockMetas, convexConnections); - b2[3] = !isConnected(world, x, y + 1, z + 1, side, blockMetas, convexConnections); - } - - if(texture == 17 && b2[0]) - { - texture = 4; - } - - if(texture == 19 && b2[1]) - { - texture = 5; - } - - if(texture == 49 && b2[2]) - { - texture = 20; - } - - if(texture == 51 && b2[3]) - { - texture = 21; - } - - if(texture == 18 && b2[0] && b2[1]) - { - texture = 7; - } - - if(texture == 33 && b2[0] && b2[2]) - { - texture = 6; - } - - if(texture == 35 && b2[3] && b2[1]) - { - texture = 23; - } - - if(texture == 50 && b2[3] && b2[2]) - { - texture = 22; - } - - if(texture == 18 && !b2[0] && b2[1]) - { - texture = 39; - } - - if(texture == 33 && b2[0] && !b2[2]) - { - texture = 38; - } - - if(texture == 35 && !b2[3] && b2[1]) - { - texture = 53; - } - - if(texture == 50 && b2[3] && !b2[2]) - { - texture = 52; - } - - if(texture == 18 && b2[0] && !b2[1]) - { - texture = 37; - } - - if(texture == 33 && !b2[0] && b2[2]) - { - texture = 36; - } - - if(texture == 35 && b2[3] && !b2[1]) - { - texture = 55; - } - - if(texture == 50 && !b2[3] && b2[2]) - { - texture = 54; - } - - if(texture == 34 && b2[0] && b2[1] && b2[2] && b2[3]) - { - texture = 58; - } - - if(texture == 34 && !b2[0] && b2[1] && b2[2] && b2[3]) - { - texture = 9; - } - - if(texture == 34 && b2[0] && !b2[1] && b2[2] && b2[3]) - { - texture = 25; - } - - if(texture == 34 && b2[0] && b2[1] && !b2[2] && b2[3]) - { - texture = 8; - } - - if(texture == 34 && b2[0] && b2[1] && b2[2] && !b2[3]) - { - texture = 24; - } - - if(texture == 34 && b2[0] && b2[1] && !b2[2] && !b2[3]) - { - texture = 11; - } - - if(texture == 34 && !b2[0] && !b2[1] && b2[2] && b2[3]) - { - texture = 26; - } - - if(texture == 34 && !b2[0] && b2[1] && !b2[2] && b2[3]) - { - texture = 27; - } - - if(texture == 34 && b2[0] && !b2[1] && b2[2] && !b2[3]) - { - texture = 10; - } - - if(texture == 34 && b2[0] && !b2[1] && !b2[2] && b2[3]) - { - texture = 42; - } - if(texture == 34 && !b2[0] && b2[1] && b2[2] && !b2[3]) - { - texture = 43; - } - - if(texture == 34 && b2[0] && !b2[1] && !b2[2] && !b2[3]) - { - texture = 40; - } - - if(texture == 34 && !b2[0] && b2[1] && !b2[2] && !b2[3]) - { - texture = 41; - } - - if(texture == 34 && !b2[0] && !b2[1] && b2[2] && !b2[3]) - { - texture = 56; - } - - if(texture == 34 && !b2[0] && !b2[1] && !b2[2] && b2[3]) - { - texture = 57; - } - - return texture; - } - - public static boolean isConnected(IBlockAccess world, int x, int y, int z, int side, HashMap> blockMetas, boolean convexConnections) - { - int x2 = x, y2 = y, z2 = z; - - switch(side) - { - case 0: - y2--; - break; - case 1: - y2++; - break; - case 2: - z2--; - break; - case 3: - z2++; - break; - case 4: - x2--; - break; - case 5: - x2++; - break; - } - - IBlockState s1 = world.getBlockState(new BlockPos(x, y, z)); - IBlockState s2 = world.getBlockState(new BlockPos(x2, y2, z2)); - - Block block1 = s1.getBlock(); - Block block2 = s2.getBlock(); - - int meta1 = block1.getMetaFromState(s1); - int meta2 = block2.getMetaFromState(s2); - - boolean validBlockMeta1 = false; - boolean invalidBlockMeta2 = true; - - for(Entry> entry : blockMetas.entrySet()) - { - validBlockMeta1 |= block1.equals(entry.getKey()) && entry.getValue().contains(meta1); - - invalidBlockMeta2 &= convexConnections || !(block2.equals(entry.getKey()) && entry.getValue().contains(meta2)); - } - - return validBlockMeta1 && invalidBlockMeta2; - } -} \ No newline at end of file diff --git a/src/main/java/mekanism/client/render/MinerVisualRenderer.java b/src/main/java/mekanism/client/render/MinerVisualRenderer.java index 006ee6c0d..5ccecb42b 100644 --- a/src/main/java/mekanism/client/render/MinerVisualRenderer.java +++ b/src/main/java/mekanism/client/render/MinerVisualRenderer.java @@ -6,7 +6,6 @@ import java.util.List; import java.util.Map; import mekanism.api.Coord4D; -import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.tile.TileEntityDigitalMiner; @@ -79,9 +78,9 @@ public final class MinerVisualRenderer { Model3D toReturn = new Model3D(); - toReturn.setBlockBounds(rel.getX() + 0.4, rel.getY() + 0.4, rel.getZ() + 0.4, rel.getX() + 0.6, rel.getY() + 0.6, rel.getZ() + 0.6); + toReturn.setBlockBounds(rel.xCoord + 0.4, rel.yCoord + 0.4, rel.zCoord + 0.4, rel.xCoord + 0.6, rel.yCoord + 0.6, rel.zCoord + 0.6); toReturn.baseBlock = Blocks.water; - //toReturn.setTexture(MekanismRenderer.getColorIcon(EnumColor.WHITE)); + //toReturn.setTexture(MekanismRenderer.getColorIcon(EnumColor.WHITE)); TODO return toReturn; } diff --git a/src/main/java/mekanism/client/render/RenderTickHandler.java b/src/main/java/mekanism/client/render/RenderTickHandler.java index e22cce1dd..2afb176aa 100644 --- a/src/main/java/mekanism/client/render/RenderTickHandler.java +++ b/src/main/java/mekanism/client/render/RenderTickHandler.java @@ -51,7 +51,7 @@ public class RenderTickHandler if(pos != null) { - Coord4D obj = new Coord4D(pos.getBlockPos(), world.provider.getDimensionId()); + Coord4D obj = new Coord4D(pos.getBlockPos(), world); if(MekanismAPI.debug && mc.currentScreen == null && !mc.gameSettings.showDebugInfo) { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderBin.java b/src/main/java/mekanism/client/render/tileentity/RenderBin.java index 7b4762898..59a9d3989 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderBin.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderBin.java @@ -36,7 +36,7 @@ public class RenderBin extends TileEntitySpecialRenderer Coord4D obj = Coord4D.get(tileEntity).offset(tileEntity.facing); - if(tileEntity.getWorld().getBlockState(obj).getBlock().isSideSolid(tileEntity.getWorld(), obj, tileEntity.facing.getOpposite())) + if(obj.getBlockState(tileEntity.getWorld()).getBlock().isSideSolid(tileEntity.getWorld(), obj.getPos(), tileEntity.facing.getOpposite())) { return; } @@ -91,12 +91,12 @@ public class RenderBin extends TileEntitySpecialRenderer private void doLight(World world, Coord4D obj) { - if(world.getBlockState(obj).getBlock().isOpaqueCube()) + if(obj.getBlockState(world).getBlock().isOpaqueCube()) { return; } - int brightness = world.getLightFromNeighborsFor(EnumSkyBlock.SKY, obj); + int brightness = world.getLightFromNeighborsFor(EnumSkyBlock.SKY, obj.getPos()); int lightX = brightness % 65536; int lightY = brightness / 65536; float scale = 0.6F; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java b/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java index 5bd58efb8..f0dd973f3 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java @@ -16,12 +16,11 @@ import net.minecraft.init.Blocks; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.fluids.Fluid; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderDynamicTank extends TileEntitySpecialRenderer { @@ -46,7 +45,7 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer { @@ -44,7 +42,7 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer> acceptableBlockMetas = new HashMap>(); - - public CTMTextureData[] sideOverrides = new CTMTextureData[6]; - - public CTMTextureData facingOverride; - - public int facing; - - public boolean renderConvexConnections = false; - - public CTMData(String textureName, Block block, List connectableMeta) - { - mainTextureData = new CTMTextureData(textureName); - acceptableBlockMetas.put(block, connectableMeta); - } - - public CTMData addSideOverride(EnumFacing side, String sideTexture) - { - sideOverrides[side.ordinal()] = new CTMTextureData(sideTexture); - - return this; - } - - public CTMData addFacingOverride(String facingTexture) - { - facingOverride = new CTMTextureData(facingTexture); - - return this; - } - - public boolean hasFacingOverride() - { - return facingOverride != null; - } - - public void setFacing(int newFacing) - { - facing = newFacing; - } - - public CTMData registerIcons(IIconRegister register) - { - mainTextureData.registerIcons(register); - - if(facingOverride != null) - { - facingOverride.registerIcons(register); - } - - for(CTMTextureData data : sideOverrides) - { - if(data != null) - { - data.registerIcons(register); - } - } - - return this; - } - - public CTMTextureData getTextureData(int side) - { - if(hasFacingOverride() && side == facing) - { - return facingOverride; - } - - if(sideOverrides[side] != null) - { - return sideOverrides[side]; - } - - return mainTextureData; - } - - public IIcon getIcon(int side) - { - return getTextureData(side).icon; - } - - public TextureSubmap getSubmap(int side) - { - return getTextureData(side).submap; - } - - public TextureSubmap getSmallSubmap(int side) - { - return getTextureData(side).submapSmall; - } - - public CTMData addOtherBlockConnectivities(Block block, List connectableMeta) - { - acceptableBlockMetas.put(block, connectableMeta); - return this; - } - - public CTMData setRenderConvexConnections() - { - renderConvexConnections = true; - return this; - } - - @SideOnly(Side.CLIENT) - public boolean shouldRenderSide(IBlockAccess world, int x, int y, int z, int side) - { - Coord4D obj = new Coord4D(x, y, z); - Block coordBlock = obj.getBlock(world); - int coordMeta = obj.getBlockState(world); - boolean valid = false; - - for(Entry> entry : acceptableBlockMetas.entrySet()) - { - valid |= entry.getKey().equals(coordBlock) && entry.getValue().contains(coordMeta); - } - - return !valid; - } -*/} diff --git a/src/main/java/mekanism/common/LaserManager.java b/src/main/java/mekanism/common/LaserManager.java index 8c40dc3f1..7694f1436 100644 --- a/src/main/java/mekanism/common/LaserManager.java +++ b/src/main/java/mekanism/common/LaserManager.java @@ -37,7 +37,7 @@ public class LaserManager if(mop != null) { to = new Pos3D(mop.hitVec); - Coord4D toCoord = new Coord4D(mop.getBlockPos()); + Coord4D toCoord = new Coord4D(mop.getBlockPos(), world); TileEntity tile = toCoord.getTileEntity(world); if(tile instanceof ILaserReceptor) @@ -83,8 +83,8 @@ public class LaserManager IBlockState state = blockCoord.getBlockState(world); Block blockHit = state.getBlock(); - EntityPlayer dummy = Mekanism.proxy.getDummyPlayer((WorldServer)world, blockCoord.getX(), blockCoord.getY(), blockCoord.getZ()).get(); - BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(world, blockCoord, state, dummy); + EntityPlayer dummy = Mekanism.proxy.getDummyPlayer((WorldServer)world, blockCoord.xCoord, blockCoord.yCoord, blockCoord.zCoord).get(); + BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(world, blockCoord.getPos(), state, dummy); MinecraftForge.EVENT_BUS.post(event); if(event.isCanceled()) @@ -94,15 +94,15 @@ public class LaserManager if(dropAtBlock) { - blockHit.dropBlockAsItem(world, blockCoord, state, 0); + blockHit.dropBlockAsItem(world, blockCoord.getPos(), state, 0); } else { - ret = blockHit.getDrops(world, blockCoord, state, 0); + ret = blockHit.getDrops(world, blockCoord.getPos(), state, 0); } - blockHit.breakBlock(world, blockCoord, state); - world.setBlockToAir(blockCoord); - world.playAuxSFX(2001, blockCoord, Block.getIdFromBlock(blockHit)); + blockHit.breakBlock(world, blockCoord.getPos(), state); + world.setBlockToAir(blockCoord.getPos()); + world.playAuxSFX(2001, blockCoord.getPos(), Block.getIdFromBlock(blockHit)); return ret; } diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 955cabc55..2f7bd1fb2 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -1037,9 +1037,9 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockAccess world, BlockPos pos, EnumFacing side) { - Coord4D obj = new Coord4D(pos).offset(EnumFacing.getFront(side.ordinal()).getOpposite()); + BlockPos offsetPos = pos.offset(EnumFacing.getFront(side.ordinal()).getOpposite()); - if(BasicBlockType.get(world.getBlockState(obj)) == BasicBlockType.STRUCTURAL_GLASS) + if(BasicBlockType.get(world.getBlockState(offsetPos)) == BasicBlockType.STRUCTURAL_GLASS) { return ctmData[10][0].shouldRenderSide(world, pos, side); } @@ -1126,41 +1126,4 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple { return getBasicBlock().getProperty(); } - -/* - @Override - public CTMData getCTMData(IBlockAccess world, BlockPos pos, int meta) - { - if(ctms[meta][1] != null && MekanismUtils.isActive(world, pos)) - { - return ctms[meta][1]; - } - - BasicBlockType type = BasicBlockType.get(this, world.getBlockMetadata(x, y, z)); - - if(type == BasicBlockType.INDUCTION_CELL) - { - TileEntityInductionCell tileEntity = (TileEntityInductionCell)world.getTileEntity(pos); - return ctms[meta][tileEntity.tier.ordinal()]; - } - else if(type == BasicBlockType.INDUCTION_PROVIDER) - { - 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]; - } -*/ } \ No newline at end of file diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index a24437399..17444a790 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -9,6 +9,8 @@ import mekanism.api.MekanismConfig.client; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.api.energy.IStrictEnergyStorage; +import mekanism.client.render.ctm.CTMData; +import mekanism.client.render.ctm.ICTMBlock; import mekanism.common.Mekanism; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.FluidTankTier; @@ -24,6 +26,7 @@ import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ISustainedTank; import mekanism.common.base.ITierItem; import mekanism.common.base.IUpgradeTile; +import mekanism.common.block.states.BlockStateBasic.BasicBlockType; import mekanism.common.block.states.BlockStateFacing; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.block.states.BlockStateMachine.MachineBlock; @@ -124,9 +127,9 @@ import buildcraft.api.tools.IToolWrench; * @author AidanBrady * */ -public abstract class BlockMachine extends BlockContainer implements ISpecialBounds//, IBlockCTM, ICustomBlockIcon +public abstract class BlockMachine extends BlockContainer implements ISpecialBounds, ICTMBlock//, ICustomBlockIcon { - //public CTMData[][] ctms = new CTMData[16][4]; + public CTMData[][] ctmData = new CTMData[16][4]; public BlockMachine() { @@ -134,6 +137,8 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou setHardness(3.5F); setResistance(16F); setCreativeTab(Mekanism.tabMekanism); + + initCTMs(); } public static BlockMachine getBlockMachine(MachineBlock block) @@ -202,6 +207,18 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou return state; } + + public void initCTMs() + { + switch(getMachineBlock()) + { + case MACHINE_BLOCK_1: + ctmData[11][0] = new CTMData(BasicBlockType.TELEPORTER_FRAME, MachineType.TELEPORTER); + + break; + default: + } + } /* @Override @@ -573,15 +590,12 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou { for(Fluid f : FluidRegistry.getRegisteredFluids().values()) { - try - { //Prevent bad IDs + try { //Prevent bad IDs ItemStack filled = new ItemStack(item, 1, type.meta); itemMachine.setBaseTier(filled, BaseTier.ULTIMATE); itemMachine.setFluidStack(new FluidStack(f, itemMachine.getCapacity(filled)), filled); list.add(filled); - } catch(Exception e) - { - } + } catch(Exception e) {} } } @@ -645,8 +659,8 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou tileEntity.setFacing((short)change); world.notifyNeighborsOfStateChange(pos, this); - } else - { + } + else { SecurityUtils.displayNoAccess(entityplayer); } @@ -668,8 +682,8 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou if(SecurityUtils.canAccess(entityplayer, tileEntity)) { MekanismUtils.openPersonalChestGui((EntityPlayerMP)entityplayer, chest, null, true); - } else - { + } + else { SecurityUtils.displayNoAccess(entityplayer); } @@ -689,12 +703,12 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou entityplayer.inventory.markDirty(); return true; } - } else - { + } + else { entityplayer.openGui(Mekanism.instance, type.guiId, world, pos.getX(), pos.getY(), pos.getZ()); } - } else - { + } + else { SecurityUtils.displayNoAccess(entityplayer); } @@ -708,8 +722,8 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou if(SecurityUtils.canAccess(entityplayer, tileEntity)) { LogisticalSorterGuiMessage.openServerGui(SorterGuiPacket.SERVER, 0, world, (EntityPlayerMP)entityplayer, Coord4D.get(tileEntity), -1); - } else - { + } + else { SecurityUtils.displayNoAccess(entityplayer); } @@ -726,8 +740,8 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou if(owner == null || entityplayer.getName().equals(owner)) { entityplayer.openGui(Mekanism.instance, type.guiId, world, pos.getX(), pos.getY(), pos.getZ()); - } else - { + } + else { SecurityUtils.displayNoAccess(entityplayer); } @@ -760,6 +774,7 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou public TileEntity createTileEntity(World world, IBlockState state) { int metadata = getMetaFromState(state); + if(BlockStateMachine.MachineType.get(getMachineBlock(), metadata) == null) { return null; @@ -1178,6 +1193,24 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou return true; } } + + @Override + public CTMData getCTMData(IBlockState state) + { + return ctmData[getMetaFromState(state)][0]; + } + + @Override + public String getOverrideTexture(IBlockState state, EnumFacing side) + { + return null; + } + + @Override + public PropertyEnum getTypeProperty() + { + return getMachineBlock().getProperty(); + } @Override public void setRenderBounds(Block block, int metadata) {} diff --git a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java index e5cd225bb..c8a54d5cf 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java @@ -43,7 +43,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol return true; } - TileEntity tile = new Coord4D(x, y, z, pointer.getWorld()).safeTileGet(pointer.getWorld()); + TileEntity tile = new Coord4D(x, y, z, pointer.getWorld().provider.getDimensionId()).getTileEntity(pointer.getWorld()); return tile instanceof TileEntityPressureDisperser || tile instanceof TileEntitySuperheatingElement; } @@ -58,7 +58,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol for(Coord4D coord : innerNodes) { - TileEntity tile = coord.safeTileGet(pointer.getWorld()); + TileEntity tile = coord.getTileEntity(pointer.getWorld()); if(tile instanceof TileEntityPressureDisperser) { @@ -83,13 +83,13 @@ public class BoilerUpdateProtocol extends UpdateProtocol final Coord4D initDisperser = dispersers.iterator().next(); //Ensure that a full horizontal plane of dispersers exist, surrounding the found disperser - Coord4D pos = new Coord4D(structure.renderLocation.getX(), initDisperser.getY(), structure.renderLocation.getZ(), pointer.getWorld().provider.getDimensionId()); + Coord4D pos = new Coord4D(structure.renderLocation.xCoord, initDisperser.yCoord, structure.renderLocation.zCoord, pointer.getWorld().provider.getDimensionId()); for(int x = 1; x < structure.volLength-1; x++) { for(int z = 1; z < structure.volWidth-1; z++) { - Coord4D coord4D = pos.add(x, 0, z); - TileEntity tile = coord4D.safeTileGet(pointer.getWorld()); + Coord4D coord4D = pos.translate(x, 0, z); + TileEntity tile = coord4D.getTileEntity(pointer.getWorld()); if(!(tile instanceof TileEntityPressureDisperser)) { @@ -112,7 +112,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol @Override public boolean isValid(Coord4D coord) { - return coord.safeTileGet(pointer.getWorld()) instanceof TileEntitySuperheatingElement; + return coord.getTileEntity(pointer.getWorld()) instanceof TileEntitySuperheatingElement; } }).calculate(elements.iterator().next()); } @@ -125,15 +125,14 @@ public class BoilerUpdateProtocol extends UpdateProtocol Coord4D initAir = null; int totalAir = 0; - pos = new Coord4D(structure.renderLocation, pointer.getWorld().provider.getDimensionId()); //Find the first available block in the structure for water storage (including casings) for(int x = 0; x < structure.volLength; x++) { - for(int y = 0; y < initDisperser.getY() - structure.renderLocation.getY(); y++) + for(int y = 0; y < initDisperser.yCoord - structure.renderLocation.yCoord; y++) { for(int z = 0; z < structure.volWidth; z++) { - if(pointer.getWorld().isAirBlock(pos.add(x, y, z)) || isViableNode(pos.add(x, y, z))) + if(pointer.getWorld().isAirBlock(pos.translate(x, y, z).getPos()) || isViableNode(pos.translate(x, y, z).getPos())) { initAir = new Coord4D(x, y, z, pointer.getWorld().provider.getDimensionId()); totalAir++; @@ -157,10 +156,10 @@ public class BoilerUpdateProtocol extends UpdateProtocol @Override public final boolean isValid(Coord4D coord) { - return coord.getY() >= renderLocation.getY()-1 && coord.getY() < initDisperser.getY() && - coord.getX() >= renderLocation.getX() && coord.getX() < renderLocation.getX()+volLength && - coord.getZ() >= renderLocation.getZ() && coord.getZ() < renderLocation.getZ()+volWidth && - (coord.isAirBlock(pointer.getWorld()) || isViableNode(coord)); + return coord.yCoord >= renderLocation.yCoord-1 && coord.yCoord < initDisperser.yCoord && + coord.xCoord >= renderLocation.xCoord && coord.xCoord < renderLocation.xCoord+volLength && + coord.zCoord >= renderLocation.zCoord && coord.zCoord < renderLocation.zCoord+volWidth && + (coord.isAirBlock(pointer.getWorld()) || isViableNode(coord.getPos())); } }).calculate(initAir); @@ -170,10 +169,10 @@ public class BoilerUpdateProtocol extends UpdateProtocol return false; } - int steamHeight = (structure.renderLocation.getY()+structure.volHeight-2)-initDisperser.getY(); + int steamHeight = (structure.renderLocation.yCoord+structure.volHeight-2)-initDisperser.yCoord; structure.steamVolume = structure.volWidth*structure.volLength*steamHeight; - structure.upperRenderLocation = new Coord4D(structure.renderLocation.getX(), initDisperser.getY()+1, structure.renderLocation.getZ()); + structure.upperRenderLocation = new Coord4D(structure.renderLocation.xCoord, initDisperser.yCoord+1, structure.renderLocation.zCoord); return true; } @@ -244,7 +243,7 @@ public class BoilerUpdateProtocol extends UpdateProtocol { for(Coord4D obj : structure.locations) { - if(obj.safeTileGet(pointer.getWorld()) instanceof TileEntityBoilerValve) + if(obj.getTileEntity(pointer.getWorld()) instanceof TileEntityBoilerValve) { ValveData data = new ValveData(); data.location = obj; diff --git a/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java b/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java index 574aba571..ea1998146 100644 --- a/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java @@ -34,7 +34,7 @@ public class MatrixUpdateProtocol extends UpdateProtocol @Override public boolean isValidInnerNode(int x, int y, int z) { - TileEntity tile = new Coord4D(x, y, z, pointer.getWorld()).safeTileGet(pointer.getWorld()); + TileEntity tile = new Coord4D(x, y, z, pointer.getWorld().provider.getDimensionId()).getTileEntity(pointer.getWorld()); if(tile != null && (tile instanceof TileEntityInductionCell || tile instanceof TileEntityInductionProvider)) { @@ -80,7 +80,7 @@ public class MatrixUpdateProtocol extends UpdateProtocol { for(Coord4D coord : innerNodes) { - TileEntity tile = coord.safeTileGet(pointer.getWorld()); + TileEntity tile = coord.getTileEntity(pointer.getWorld()); if(tile instanceof TileEntityInductionCell) { diff --git a/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java b/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java index e3843b14c..89d40da86 100644 --- a/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java +++ b/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java @@ -53,9 +53,9 @@ public class ThreadMinerSearch extends Thread for(int i = 0; i < size; i++) { - int x = coord.getX()+i%diameter; - int z = coord.getY()+(i/diameter)%diameter; - int y = coord.getZ()+(i/diameter/diameter); + int x = coord.xCoord+i%diameter; + int z = coord.yCoord+(i/diameter)%diameter; + int y = coord.zCoord+(i/diameter/diameter); if(tileEntity.isInvalid()) { diff --git a/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java b/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java index a7f94a07a..c952729ef 100644 --- a/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java @@ -90,7 +90,7 @@ public class TankUpdateProtocol extends UpdateProtocol { for(Coord4D obj : structure.locations) { - if(obj.safeTileGet(pointer.getWorld()) instanceof TileEntityDynamicValve) + if(obj.getTileEntity(pointer.getWorld()) instanceof TileEntityDynamicValve) { ValveData data = new ValveData(); data.location = obj; diff --git a/src/main/java/mekanism/common/content/transporter/PathfinderCache.java b/src/main/java/mekanism/common/content/transporter/PathfinderCache.java index 9c56b7751..6d897158c 100644 --- a/src/main/java/mekanism/common/content/transporter/PathfinderCache.java +++ b/src/main/java/mekanism/common/content/transporter/PathfinderCache.java @@ -6,15 +6,13 @@ import java.util.List; import java.util.Map; import mekanism.api.Coord4D; - -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; public class PathfinderCache { public static Map> cachedPaths = new HashMap>(); - public static void onChanged(BlockPos location) + public static void onChanged(Coord4D location) { reset(); } diff --git a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java index 9767517c8..9b58c0879 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java @@ -21,8 +21,8 @@ import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.util.InventoryUtils; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; import org.apache.commons.lang3.tuple.Pair; @@ -104,7 +104,7 @@ public final class TransporterPathfinder while(true) { - Coord4D coord = start.offset(side, count); + Coord4D coord = start.getFromSide(side, count); if(transportStack.canInsertToTransporter(coord.getTileEntity(worldObj), side)) { diff --git a/src/main/java/mekanism/common/entity/EntityBalloon.java b/src/main/java/mekanism/common/entity/EntityBalloon.java index 9297c1196..2ed03473d 100644 --- a/src/main/java/mekanism/common/entity/EntityBalloon.java +++ b/src/main/java/mekanism/common/entity/EntityBalloon.java @@ -88,7 +88,7 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData this(world); latched = obj; - setPosition(latched.getX() + 0.5F, latched.getY() + 1.9F, latched.getZ() + 0.5F); + setPosition(latched.xCoord + 0.5F, latched.yCoord + 1.9F, latched.zCoord + 0.5F); prevPosX = posX; prevPosY = posY; @@ -97,9 +97,9 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData color = c; dataWatcher.updateObject(5, (byte)1); /* Is latched */ - dataWatcher.updateObject(6, latched != null ? latched.getX() : 0); /* Latched X */ - dataWatcher.updateObject(7, latched != null ? latched.getY() : 0); /* Latched Y */ - dataWatcher.updateObject(8, latched != null ? latched.getZ() : 0); /* Latched Z */ + dataWatcher.updateObject(6, latched != null ? latched.xCoord : 0); /* Latched X */ + dataWatcher.updateObject(7, latched != null ? latched.yCoord : 0); /* Latched Y */ + dataWatcher.updateObject(8, latched != null ? latched.zCoord : 0); /* Latched Z */ dataWatcher.updateObject(9, -1); /* Latched entity ID */ } @@ -145,9 +145,9 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData if(ticksExisted == 1) { dataWatcher.updateObject(5, new Byte(latched != null ? (byte)1 : (latchedEntity != null ? (byte)2 : (byte)0))); /* Is latched */ - dataWatcher.updateObject(6, new Integer(latched != null ? latched.getX() : 0)); /* Latched X */ - dataWatcher.updateObject(7, new Integer(latched != null ? latched.getY() : 0)); /* Latched Y */ - dataWatcher.updateObject(8, new Integer(latched != null ? latched.getZ() : 0)); /* Latched Z */ + dataWatcher.updateObject(6, new Integer(latched != null ? latched.xCoord : 0)); /* Latched X */ + dataWatcher.updateObject(7, new Integer(latched != null ? latched.yCoord : 0)); /* Latched Y */ + dataWatcher.updateObject(8, new Integer(latched != null ? latched.zCoord : 0)); /* Latched Z */ dataWatcher.updateObject(9, new Integer(latchedEntity != null ? latchedEntity.getEntityId() : -1)); /* Latched entity ID */ } } diff --git a/src/main/java/mekanism/common/entity/EntityFlame.java b/src/main/java/mekanism/common/entity/EntityFlame.java index 877724af3..79257fd76 100644 --- a/src/main/java/mekanism/common/entity/EntityFlame.java +++ b/src/main/java/mekanism/common/entity/EntityFlame.java @@ -184,17 +184,17 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData { IBlockState state = worldObj.getBlockState(mop.getBlockPos()); Block block = state.getBlock(); - boolean fluid = MekanismUtils.isFluid(worldObj, new Coord4D(mop)) || MekanismUtils.isDeadFluid(worldObj, new Coord4D(mop)); + boolean fluid = MekanismUtils.isFluid(worldObj, new Coord4D(mop, worldObj)) || MekanismUtils.isDeadFluid(worldObj, new Coord4D(mop, worldObj)); - Coord4D sideCoord = new Coord4D(mop.getBlockPos().offset(mop.sideHit), worldObj.provider.getDimensionId()); + Coord4D sideCoord = new Coord4D(mop.getBlockPos().offset(mop.sideHit), worldObj); if(general.aestheticWorldDamage && !fluid && (sideCoord.isAirBlock(worldObj) || sideCoord.isReplaceable(worldObj))) { - if(mode != ItemFlamethrower.FlamethrowerMode.COMBAT && !smeltBlock(new Coord4D(mop.getBlockPos()))) + if(mode != ItemFlamethrower.FlamethrowerMode.COMBAT && !smeltBlock(new Coord4D(mop, worldObj))) { if(mode == ItemFlamethrower.FlamethrowerMode.INFERNO && !worldObj.isRemote) { - worldObj.setBlockState(sideCoord, Blocks.fire.getDefaultState()); + worldObj.setBlockState(sideCoord.getPos(), Blocks.fire.getDefaultState()); } } } @@ -249,19 +249,19 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData if(newBlock != null && newBlock != Blocks.air) { - worldObj.setBlockState(block, Block.getBlockFromItem(result.getItem()).getStateFromMeta(result.getItemDamage()), 3); + worldObj.setBlockState(block.getPos(), Block.getBlockFromItem(result.getItem()).getStateFromMeta(result.getItemDamage()), 3); } else { - worldObj.setBlockToAir(block); + worldObj.setBlockToAir(block.getPos()); - EntityItem item = new EntityItem(worldObj, block.getX() + 0.5, block.getY() + 0.5, block.getZ() + 0.5, result.copy()); + EntityItem item = new EntityItem(worldObj, block.xCoord + 0.5, block.yCoord + 0.5, block.zCoord + 0.5, result.copy()); item.motionX = 0; item.motionY = 0; item.motionZ = 0; worldObj.spawnEntityInWorld(item); } - worldObj.playAuxSFXAtEntity(null, 2001, block, Block.getIdFromBlock(b) + (b.getMetaFromState(state) << 12)); + worldObj.playAuxSFXAtEntity(null, 2001, block.getPos(), Block.getIdFromBlock(b) + (b.getMetaFromState(state) << 12)); } spawnParticlesAt(new Pos3D(block).translate(0.5, 0.5, 0.5)); diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java index cb3122dd9..86dc56835 100644 --- a/src/main/java/mekanism/common/entity/EntityRobit.java +++ b/src/main/java/mekanism/common/entity/EntityRobit.java @@ -309,7 +309,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine travelToDimension(homeLocation.dimensionId); } - setPositionAndUpdate(homeLocation.getX()+0.5, homeLocation.getY()+0.3, homeLocation.getZ()+0.5); + setPositionAndUpdate(homeLocation.xCoord+0.5, homeLocation.yCoord+0.3, homeLocation.zCoord+0.5); motionX = 0; motionY = 0; diff --git a/src/main/java/mekanism/common/frequency/FrequencyManager.java b/src/main/java/mekanism/common/frequency/FrequencyManager.java index 89d7085fe..4e809aa81 100644 --- a/src/main/java/mekanism/common/frequency/FrequencyManager.java +++ b/src/main/java/mekanism/common/frequency/FrequencyManager.java @@ -248,7 +248,7 @@ public class FrequencyManager iter.remove(); } else { - TileEntity tile = coord.safeTileGet(world); + TileEntity tile = coord.getTileEntity(world); if(!(tile instanceof IFrequencyHandler)) { diff --git a/src/main/java/mekanism/common/integration/WailaDataProvider.java b/src/main/java/mekanism/common/integration/WailaDataProvider.java index 50d36ac92..ed4785831 100644 --- a/src/main/java/mekanism/common/integration/WailaDataProvider.java +++ b/src/main/java/mekanism/common/integration/WailaDataProvider.java @@ -90,7 +90,7 @@ public class WailaDataProvider implements IWailaDataProvider else if(tile instanceof TileEntityBoundingBlock) { TileEntityBoundingBlock bound = (TileEntityBoundingBlock)tile; - Coord4D coord = new Coord4D(bound.getPos(), tile.getWorld().provider.getDimensionId()); + Coord4D coord = new Coord4D(bound.getPos(), tile.getWorld()); if(bound.receivedCoords && coord.getTileEntity(tile.getWorld()) instanceof IInventory) { diff --git a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java index d844ce31a..7a6e8d75e 100644 --- a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java +++ b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java @@ -104,7 +104,7 @@ public class ItemAtomicDisassembler extends ItemEnergized } ItemStack stack = new ItemStack(block, 1, meta); - Coord4D orig = new Coord4D(pos, player.worldObj.provider.getDimensionId()); + Coord4D orig = new Coord4D(pos, player.worldObj); List names = MekanismUtils.getOreDictName(stack); @@ -120,7 +120,7 @@ public class ItemAtomicDisassembler extends ItemEnergized if(getMode(itemstack) == 3 && isOre && !player.capabilities.isCreativeMode) { - Set found = new Finder(player.worldObj, stack, new Coord4D(pos, player.worldObj.provider.getDimensionId())).calc(); + Set found = new Finder(player.worldObj, stack, new Coord4D(pos, player.worldObj)).calc(); for(Coord4D coord : found) { @@ -131,11 +131,11 @@ public class ItemAtomicDisassembler extends ItemEnergized Block block2 = coord.getBlock(player.worldObj); - block2.onBlockDestroyedByPlayer(player.worldObj, coord, state); - player.worldObj.playAuxSFXAtEntity(null, 2001, coord, meta << 12); - player.worldObj.setBlockToAir(coord); - block2.breakBlock(player.worldObj, coord, state); - block2.dropBlockAsItem(player.worldObj, coord, state, 0); + block2.onBlockDestroyedByPlayer(player.worldObj, coord.getPos(), state); + player.worldObj.playAuxSFXAtEntity(null, 2001, coord.getPos(), meta << 12); + player.worldObj.setBlockToAir(coord.getPos()); + block2.breakBlock(player.worldObj, coord.getPos(), state); + block2.dropBlockAsItem(player.worldObj, coord.getPos(), state, 0); setEnergy(itemstack, getEnergy(itemstack) - (general.DISASSEMBLER_USAGE*getEfficiency(itemstack))); } diff --git a/src/main/java/mekanism/common/item/ItemBalloon.java b/src/main/java/mekanism/common/item/ItemBalloon.java index 8f197b7f8..70661630f 100644 --- a/src/main/java/mekanism/common/item/ItemBalloon.java +++ b/src/main/java/mekanism/common/item/ItemBalloon.java @@ -129,7 +129,7 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem if(!world.isRemote) { - world.spawnEntityInWorld(new EntityBalloon(world, new Coord4D(pos, world.provider.getDimensionId()), getColor(stack))); + world.spawnEntityInWorld(new EntityBalloon(world, new Coord4D(pos, world), getColor(stack))); stack.stackSize--; } } @@ -237,7 +237,7 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem if(!source.getWorld().isRemote) { - source.getWorld().spawnEntityInWorld(new EntityBalloon(source.getWorld(), new Coord4D(new BlockPos(pos)), getColor(stack))); + source.getWorld().spawnEntityInWorld(new EntityBalloon(source.getWorld(), new Coord4D(new BlockPos(pos), source.getWorld()), getColor(stack))); } } diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 84867b777..c16229929 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -511,16 +511,16 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec else { if(pos.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { - Coord4D coord = new Coord4D(pos.getBlockPos(), world.provider.getDimensionId()); + Coord4D coord = new Coord4D(pos.getBlockPos(), world); - if(!world.provider.canMineBlock(entityplayer, coord)) + if(!world.provider.canMineBlock(entityplayer, coord.getPos())) { return itemstack; } if(!entityplayer.isSneaking()) { - if(!entityplayer.canPlayerEdit(coord, pos.sideHit, itemstack)) + if(!entityplayer.canPlayerEdit(coord.getPos(), pos.sideHit, itemstack)) { return itemstack; } @@ -546,7 +546,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec setFluidStack(newStack, itemstack); } - world.setBlockToAir(coord); + world.setBlockToAir(coord.getPos()); } } else { @@ -559,12 +559,12 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec Coord4D trans = coord.offset(pos.sideHit); - if(!entityplayer.canPlayerEdit(trans, pos.sideHit, itemstack)) + if(!entityplayer.canPlayerEdit(trans.getPos(), pos.sideHit, itemstack)) { return itemstack; } - if(tryPlaceContainedLiquid(world, itemstack, trans) && !entityplayer.capabilities.isCreativeMode) + if(tryPlaceContainedLiquid(world, itemstack, trans.getPos()) && !entityplayer.capabilities.isCreativeMode) { FluidStack newStack = stored.copy(); newStack.amount -= FluidContainerRegistry.BUCKET_VOLUME; diff --git a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java index e3fd4db9a..aa6eb8c23 100644 --- a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java +++ b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java @@ -83,7 +83,7 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem neededEnergy+=10000; } - int distance = (int)entity.getDistance(coords.getX(), coords.getY(), coords.getZ()); + int distance = (int)entity.getDistance(coords.xCoord, coords.yCoord, coords.zCoord); neededEnergy+=(distance*10); diff --git a/src/main/java/mekanism/common/multiblock/MultiblockManager.java b/src/main/java/mekanism/common/multiblock/MultiblockManager.java index 7adc2a790..b398f560e 100644 --- a/src/main/java/mekanism/common/multiblock/MultiblockManager.java +++ b/src/main/java/mekanism/common/multiblock/MultiblockManager.java @@ -39,7 +39,7 @@ public class MultiblockManager> for(Coord4D obj : inventories.get(id).locations) { - TileEntityMultiblock tileEntity = (TileEntityMultiblock)obj.safeTileGet(world); + TileEntityMultiblock tileEntity = (TileEntityMultiblock)obj.getTileEntity(world); if(tileEntity != null) { @@ -83,7 +83,7 @@ public class MultiblockManager> { if(obj.dimensionId == world.provider.getDimensionId() && obj.exists(world)) { - TileEntity tileEntity = obj.safeTileGet(world); + TileEntity tileEntity = obj.getTileEntity(world); if(!(tileEntity instanceof TileEntityMultiblock) || ((TileEntityMultiblock)tileEntity).getManager() != this || (getStructureId(((TileEntityMultiblock)tileEntity)) != null && getStructureId(((TileEntityMultiblock)tileEntity)) != inventoryID)) { diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index 96139e5c2..62ed693ac 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -39,7 +39,7 @@ public abstract class UpdateProtocol> { World worldObj = pointer.getWorld(); - int origX = coord.getX(), origY = coord.getY(), origZ = coord.getZ(); + int origX = coord.xCoord, origY = coord.yCoord, origZ = coord.zCoord; boolean isCorner = true; boolean isHollow = true; @@ -142,13 +142,13 @@ public abstract class UpdateProtocol> rightBlocks = false; break; } - else if(isFrame(coord.add(x, y, z), origX+xmin, origX+xmax, origY+ymin, origY+ymax, origZ+zmin, origZ+zmax) && !isValidFrame(origX+x, origY+y, origZ+z)) + else if(isFrame(coord.translate(x, y, z), origX+xmin, origX+xmax, origY+ymin, origY+ymax, origZ+zmin, origZ+zmax) && !isValidFrame(origX+x, origY+y, origZ+z)) { rightFrame = false; break; } else { - locations.add(coord.add(x, y, z)); + locations.add(coord.translate(x, y, z)); } } else { @@ -193,9 +193,9 @@ public abstract class UpdateProtocol> structure.volHeight = Math.abs(ymax-ymin)+1; structure.volWidth = Math.abs(zmax-zmin)+1; structure.volume = structure.volLength*structure.volHeight*structure.volWidth; - structure.renderLocation = coord.add(0, 1, 0); - structure.minLocation = coord.add(xmin, ymin, zmin); - structure.maxLocation = coord.add(xmax, ymax, zmax); + structure.renderLocation = coord.translate(0, 1, 0); + structure.minLocation = coord.translate(xmin, ymin, zmin); + structure.maxLocation = coord.translate(xmax, ymax, zmax); if(structure.volLength >= 3 && structure.volHeight >= 3 && structure.volWidth >= 3) { @@ -220,7 +220,7 @@ public abstract class UpdateProtocol> { Coord4D sideCoord = coord.offset(side); - if(isViableNode(sideCoord)) + if(isViableNode(sideCoord.getPos())) { if(!iteratedNodes.contains(sideCoord)) { @@ -237,27 +237,27 @@ public abstract class UpdateProtocol> public EnumFacing getSide(Coord4D obj, int xmin, int xmax, int ymin, int ymax, int zmin, int zmax) { - if(obj.getX() == xmin) + if(obj.xCoord == xmin) { return EnumFacing.WEST; } - else if(obj.getX() == xmax) + else if(obj.xCoord == xmax) { return EnumFacing.EAST; } - else if(obj.getY() == ymin) + else if(obj.yCoord == ymin) { return EnumFacing.DOWN; } - else if(obj.getY() == ymax) + else if(obj.yCoord == ymax) { return EnumFacing.UP; } - else if(obj.getZ() == zmin) + else if(obj.zCoord == zmin) { return EnumFacing.NORTH; } - else if(obj.getZ() == zmax) + else if(obj.zCoord == zmax) { return EnumFacing.SOUTH; } @@ -291,7 +291,7 @@ public abstract class UpdateProtocol> */ public boolean isViableNode(int x, int y, int z) { - TileEntity tile = new Coord4D(x, y, z, pointer.getWorld().provider.getDimensionId()).safeTileGet(pointer.getWorld()); + TileEntity tile = new Coord4D(x, y, z, pointer.getWorld().provider.getDimensionId()).getTileEntity(pointer.getWorld()); if(tile instanceof IStructuralMultiblock) { @@ -316,7 +316,7 @@ public abstract class UpdateProtocol> */ public boolean isViableNode(BlockPos pos) { - TileEntity tile = new Coord4D(pos, pointer.getWorld()).safeTileGet(pointer.getWorld()); + TileEntity tile = new Coord4D(pos, pointer.getWorld()).getTileEntity(pointer.getWorld()); if(tile == null || !tile.hasWorldObj() || tile.isInvalid()) { @@ -350,7 +350,7 @@ public abstract class UpdateProtocol> */ private boolean isCorrectCorner(Coord4D obj, int xmin, int ymin, int zmin) { - if(obj.getX() == xmin && obj.getY() == ymin && obj.getZ() == zmin) + if(obj.xCoord == xmin && obj.yCoord == ymin && obj.zCoord == zmin) { return true; } @@ -371,31 +371,31 @@ public abstract class UpdateProtocol> */ private boolean isFrame(Coord4D obj, int xmin, int xmax, int ymin, int ymax, int zmin, int zmax) { - if(obj.getX() == xmin && obj.getY() == ymin) + if(obj.xCoord == xmin && obj.yCoord == ymin) return true; - if(obj.getX() == xmax && obj.getY() == ymin) + if(obj.xCoord == xmax && obj.yCoord == ymin) return true; - if(obj.getX() == xmin && obj.getY() == ymax) + if(obj.xCoord == xmin && obj.yCoord == ymax) return true; - if(obj.getX() == xmax && obj.getY() == ymax) + if(obj.xCoord == xmax && obj.yCoord == ymax) return true; - if(obj.getX() == xmin && obj.getZ() == zmin) + if(obj.xCoord == xmin && obj.zCoord == zmin) return true; - if(obj.getX() == xmax && obj.getZ() == zmin) + if(obj.xCoord == xmax && obj.zCoord == zmin) return true; - if(obj.getX() == xmin && obj.getZ() == zmax) + if(obj.xCoord == xmin && obj.zCoord == zmax) return true; - if(obj.getX() == xmax && obj.getZ() == zmax) + if(obj.xCoord == xmax && obj.zCoord == zmax) return true; - if(obj.getY() == ymin && obj.getZ() == zmin) + if(obj.yCoord == ymin && obj.zCoord == zmin) return true; - if(obj.getY() == ymax && obj.getZ() == zmin) + if(obj.yCoord == ymax && obj.zCoord == zmin) return true; - if(obj.getY() == ymin && obj.getZ() == zmax) + if(obj.yCoord == ymin && obj.zCoord == zmax) return true; - if(obj.getY() == ymax && obj.getZ() == zmax) + if(obj.yCoord == ymax && obj.zCoord == zmax) return true; return false; @@ -422,7 +422,7 @@ public abstract class UpdateProtocol> { for(Coord4D coord : structureFound.internalLocations) { - TileEntity tile = coord.safeTileGet(pointer.getWorld()); + TileEntity tile = coord.getTileEntity(pointer.getWorld()); if(tile instanceof TileEntityInternalMultiblock) { @@ -437,7 +437,7 @@ public abstract class UpdateProtocol> { for(Coord4D coord : structure.internalLocations) { - TileEntity tile = coord.safeTileGet(pointer.getWorld()); + TileEntity tile = coord.getTileEntity(pointer.getWorld()); if(tile instanceof TileEntityInternalMultiblock) { @@ -448,7 +448,7 @@ public abstract class UpdateProtocol> public void killInnerNode(Coord4D coord) { - TileEntity tile = coord.safeTileGet(pointer.getWorld()); + TileEntity tile = coord.getTileEntity(pointer.getWorld()); if(tile instanceof TileEntityInternalMultiblock) { @@ -469,12 +469,12 @@ public abstract class UpdateProtocol> { if(!structureFound.locations.contains(coord)) { - System.out.println("No contain " + coord + " " + coord.safeTileGet(pointer.getWorld())); + System.out.println("No contain " + coord + " " + coord.getTileEntity(pointer.getWorld())); System.out.println(coord.getBlockState(pointer.getWorld()).getBlock()); for(Coord4D newCoord : iteratedNodes) { - TileEntity tile = newCoord.safeTileGet(pointer.getWorld()); + TileEntity tile = newCoord.getTileEntity(pointer.getWorld()); if(tile instanceof TileEntityMultiblock) { @@ -500,7 +500,7 @@ public abstract class UpdateProtocol> for(Coord4D obj : structureFound.locations) { - TileEntity tileEntity = obj.safeTileGet(pointer.getWorld()); + TileEntity tileEntity = obj.getTileEntity(pointer.getWorld()); if(tileEntity instanceof TileEntityMultiblock && ((TileEntityMultiblock)tileEntity).cachedID != null) { @@ -548,7 +548,7 @@ public abstract class UpdateProtocol> for(Coord4D obj : structureFound.locations) { - TileEntity tileEntity = obj.safeTileGet(pointer.getWorld()); + TileEntity tileEntity = obj.getTileEntity(pointer.getWorld()); if(tileEntity instanceof TileEntityMultiblock) { @@ -576,7 +576,7 @@ public abstract class UpdateProtocol> int killed = 0; for(Coord4D coord : iteratedNodes) { - TileEntity tile = coord.safeTileGet(pointer.getWorld()); + TileEntity tile = coord.getTileEntity(pointer.getWorld()); if(tile instanceof TileEntityMultiblock) { diff --git a/src/main/java/mekanism/common/multipart/MultipartTransmitter.java b/src/main/java/mekanism/common/multipart/MultipartTransmitter.java index 7aa371482..c9998facf 100644 --- a/src/main/java/mekanism/common/multipart/MultipartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/MultipartTransmitter.java @@ -38,7 +38,7 @@ public class MultipartTransmitter> extends Tran @Override public Coord4D coord() { - return new Coord4D(getPart().getPos(), getPart().getWorld().provider.getDimensionId()); + return new Coord4D(getPart().getPos(), getPart().getWorld()); } @Override diff --git a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java index 6e468645c..4b03b9f2f 100644 --- a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java @@ -143,7 +143,7 @@ public class PartDiversionTransporter extends PartLogisticalTransporter notifyPartUpdate(); notifyTileChange(); player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + LangUtils.localize("tooltip.configurator.toggleDiverter") + ": " + EnumColor.RED + description)); - Coord4D coord = new Coord4D(getPos(), getWorld().provider.getDimensionId()); + Coord4D coord = new Coord4D(getPos(), getWorld()); Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord, getNetworkedData(new ArrayList())), new Range4D(coord)); return true; diff --git a/src/main/java/mekanism/common/multipart/PartGlowPanel.java b/src/main/java/mekanism/common/multipart/PartGlowPanel.java index e55fe9af7..9cd04f1b6 100644 --- a/src/main/java/mekanism/common/multipart/PartGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/PartGlowPanel.java @@ -215,7 +215,7 @@ public class PartGlowPanel extends Multipart implements IOccludingPart//, JIconH public boolean canStay() { - Coord4D adj = new Coord4D(getPos().offset(side), getWorld().provider.getDimensionId()); - return getWorld().isSideSolid(adj, side.getOpposite()) || (getContainer().getPartInSlot(PartSlot.getFaceSlot(side)) instanceof IFaceMicroblock && ((IFaceMicroblock)getContainer().getPartInSlot(PartSlot.getFaceSlot(side))).isFaceHollow()); + Coord4D adj = new Coord4D(getPos().offset(side), getWorld()); + return getWorld().isSideSolid(adj.getPos(), side.getOpposite()) || (getContainer().getPartInSlot(PartSlot.getFaceSlot(side)) instanceof IFaceMicroblock && ((IFaceMicroblock)getContainer().getPartInSlot(PartSlot.getFaceSlot(side))).isFaceHollow()); } } diff --git a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java index 4b3d05912..0bd280cac 100644 --- a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java @@ -35,10 +35,10 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumFacing; //import net.minecraft.util.IIcon; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.Constants.NBT; -import net.minecraft.util.EnumFacing; /* import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; @@ -388,8 +388,8 @@ public class PartLogisticalTransporter extends PartTransmitter> extends { if(o1 instanceof IGridTransmitter && o2 instanceof IGridTransmitter) { - Coord4D thisCoord = new Coord4D(getPos(), getWorld().provider.getDimensionId()); + Coord4D thisCoord = new Coord4D(getPos(), getWorld()); Coord4D o1Coord = ((IGridTransmitter)o1).coord(); Coord4D o2Coord = ((IGridTransmitter)o2).coord(); diff --git a/src/main/java/mekanism/common/network/PacketDataRequest.java b/src/main/java/mekanism/common/network/PacketDataRequest.java index e75ea9513..abbf47093 100644 --- a/src/main/java/mekanism/common/network/PacketDataRequest.java +++ b/src/main/java/mekanism/common/network/PacketDataRequest.java @@ -29,7 +29,7 @@ public class PacketDataRequest implements IMessageHandler= structure.upperRenderLocation.getY()) + if(structure != null && structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.yCoord) { if(structure.steamStored != null && structure.steamStored.amount > 0) { @@ -63,7 +63,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl { if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) { - if(structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.getY()) + if(structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.yCoord) { return new FluidTankInfo[] {steamTank.getInfo()}; } @@ -78,7 +78,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl @Override public int fill(EnumFacing from, FluidStack resource, boolean doFill) { - if(structure != null && structure.upperRenderLocation != null && getPos().getY() < structure.upperRenderLocation.getY()) + if(structure != null && structure.upperRenderLocation != null && getPos().getY() < structure.upperRenderLocation.yCoord) { return waterTank.fill(resource, doFill); } @@ -89,7 +89,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl @Override public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { - if(structure != null && structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.getY()) + if(structure != null && structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.yCoord) { if(structure.steamStored != null) { @@ -106,7 +106,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl @Override public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { - if(structure != null && structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.getY()) + if(structure != null && structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.yCoord) { return steamTank.drain(maxDrain, doDrain); } @@ -119,7 +119,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl { if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) { - return structure.upperRenderLocation != null && getPos().getY() < structure.upperRenderLocation.getY(); + return structure.upperRenderLocation != null && getPos().getY() < structure.upperRenderLocation.yCoord; } return false; @@ -130,7 +130,7 @@ public class TileEntityBoilerValve extends TileEntityBoilerCasing implements IFl { if((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) { - return structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.getY(); + return structure.upperRenderLocation != null && getPos().getY() >= structure.upperRenderLocation.yCoord; } return false; diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index f326768f2..b0e40deb0 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -264,7 +264,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I toRemove.add(chunk); } - worldObj.playAuxSFXAtEntity(null, 2001, coord, Block.getIdFromBlock(block) + (meta << 12)); + worldObj.playAuxSFXAtEntity(null, 2001, coord.getPos(), Block.getIdFromBlock(block) + (meta << 12)); missingStack = null; } @@ -361,8 +361,8 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I IBlockState state = obj.getBlockState(worldObj); Block block = state.getBlock(); - EntityPlayer dummy = Mekanism.proxy.getDummyPlayer((WorldServer)worldObj, obj.getX(), obj.getY(), obj.getZ()).get(); - BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(worldObj, obj, state, dummy); + EntityPlayer dummy = Mekanism.proxy.getDummyPlayer((WorldServer)worldObj, obj.xCoord, obj.yCoord, obj.zCoord).get(); + BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(worldObj, obj.getPos(), state, dummy); MinecraftForge.EVENT_BUS.post(event); if(!event.isCanceled()) @@ -371,13 +371,13 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I if(stack != null) { - worldObj.setBlockState(obj, Block.getBlockFromItem(stack.getItem()).getStateFromMeta(stack.getItemDamage()), 3); + worldObj.setBlockState(obj.getPos(), Block.getBlockFromItem(stack.getItem()).getStateFromMeta(stack.getItemDamage()), 3); IBlockState s = obj.getBlockState(worldObj); - if(s.getBlock() instanceof BlockBush && !((BlockBush)s.getBlock()).canBlockStay(worldObj, obj, s)) + if(s.getBlock() instanceof BlockBush && !((BlockBush)s.getBlock()).canBlockStay(worldObj, obj.getPos(), s)) { - s.getBlock().dropBlockAsItem(worldObj, obj, s, 1); - worldObj.setBlockToAir(obj); + s.getBlock().dropBlockAsItem(worldObj, obj.getPos(), s, 1); + worldObj.setBlockToAir(obj.getPos()); } return true; @@ -387,7 +387,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I if(filter == null || (filter.replaceStack == null || !filter.requireStack)) { - worldObj.setBlockToAir(obj); + worldObj.setBlockToAir(obj.getPos()); return true; } @@ -529,7 +529,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I public TileEntity getPullInv() { - return Coord4D.get(this).add(0, 2, 0).getTileEntity(worldObj); + return Coord4D.get(this).translate(0, 2, 0).getTileEntity(worldObj); } public TileEntity getEjectInv() @@ -1030,9 +1030,9 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I int diameter = getDiameter(); Coord4D start = getStartingCoord(); - int x = start.getX()+index%diameter; - int y = start.getY()+(index/diameter/diameter); - int z = start.getZ()+(index/diameter)%diameter; + int x = start.xCoord+index%diameter; + int y = start.yCoord+(index/diameter/diameter); + int z = start.zCoord+(index/diameter)%diameter; return new Coord4D(x, y, z, worldObj.provider.getDimensionId()); } diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index 44b26c32d..4b20237c5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -184,7 +184,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I if(shouldTake(fluid, wrapper)) { - worldObj.setBlockToAir(wrapper); + worldObj.setBlockToAir(wrapper.getPos()); } } @@ -207,7 +207,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I if(shouldTake(fluid, wrapper)) { - worldObj.setBlockToAir(wrapper); + worldObj.setBlockToAir(wrapper.getPos()); } } @@ -233,7 +233,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I if(shouldTake(fluid, side)) { - worldObj.setBlockToAir(side); + worldObj.setBlockToAir(side.getPos()); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index 08cdb31f9..4b6bcde1f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -134,7 +134,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen { if(fluidTank.getFluid().getFluid().canBePlacedInWorld()) { - worldObj.setBlockState(below, MekanismUtils.getFlowingBlock(fluidTank.getFluid().getFluid()).getDefaultState(), 3); + worldObj.setBlockState(below.getPos(), MekanismUtils.getFlowingBlock(fluidTank.getFluid().getFluid()).getDefaultState(), 3); setEnergy(getEnergy() - energyPerTick); fluidTank.drain(FluidContainerRegistry.BUCKET_VOLUME, true); @@ -184,7 +184,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen { if(canReplace(coord, true, false)) { - worldObj.setBlockState(coord, MekanismUtils.getFlowingBlock(fluidTank.getFluid().getFluid()).getDefaultState(), 3); + worldObj.setBlockState(coord.getPos(), MekanismUtils.getFlowingBlock(fluidTank.getFluid().getFluid()).getDefaultState(), 3); fluidTank.drain(FluidContainerRegistry.BUCKET_VOLUME, true); } @@ -231,7 +231,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen return isPathfinding; } - return coord.getBlock(worldObj).isReplaceable(worldObj, coord); + return coord.getBlock(worldObj).isReplaceable(worldObj, coord.getPos()); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityLaser.java b/src/main/java/mekanism/common/tile/TileEntityLaser.java index e8cd09553..c03bba1c3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaser.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaser.java @@ -48,7 +48,7 @@ public class TileEntityLaser extends TileEntityNoisyElectricBlock implements IAc if(isActive) { MovingObjectPosition mop = LaserManager.fireLaserClient(this, facing, usage.laserUsage, worldObj); - Coord4D hitCoord = mop == null ? null : new Coord4D(mop); + Coord4D hitCoord = mop == null ? null : new Coord4D(mop, worldObj); if(hitCoord == null || !hitCoord.equals(digging)) { @@ -60,7 +60,7 @@ public class TileEntityLaser extends TileEntityNoisyElectricBlock implements IAc { Block blockHit = hitCoord.getBlock(worldObj); TileEntity tileHit = hitCoord.getTileEntity(worldObj); - float hardness = blockHit.getBlockHardness(worldObj, hitCoord); + float hardness = blockHit.getBlockHardness(worldObj, hitCoord.getPos()); if(!(hardness < 0 || (tileHit instanceof ILaserReceptor && !((ILaserReceptor)tileHit).canLasersDig()))) { @@ -80,7 +80,7 @@ public class TileEntityLaser extends TileEntityNoisyElectricBlock implements IAc setActive(true); LaserInfo info = LaserManager.fireLaser(this, facing, usage.laserUsage, worldObj); - Coord4D hitCoord = info.movingPos == null ? null : new Coord4D(info.movingPos); + Coord4D hitCoord = info.movingPos == null ? null : new Coord4D(info.movingPos, worldObj); if(hitCoord == null || !hitCoord.equals(digging)) { @@ -92,7 +92,7 @@ public class TileEntityLaser extends TileEntityNoisyElectricBlock implements IAc { Block blockHit = hitCoord.getBlock(worldObj); TileEntity tileHit = hitCoord.getTileEntity(worldObj); - float hardness = blockHit.getBlockHardness(worldObj, hitCoord); + float hardness = blockHit.getBlockHardness(worldObj, hitCoord.getPos()); if(!(hardness < 0 || (tileHit instanceof ILaserReceptor && !((ILaserReceptor)tileHit).canLasersDig()))) { diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java index e3b5baf63..df069d4d8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java @@ -76,7 +76,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement if(on) { MovingObjectPosition mop = LaserManager.fireLaserClient(this, facing, lastFired, worldObj); - Coord4D hitCoord = mop == null ? null : new Coord4D(mop); + Coord4D hitCoord = mop == null ? null : new Coord4D(mop, worldObj); if(hitCoord == null || !hitCoord.equals(digging)) { @@ -88,7 +88,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement { Block blockHit = hitCoord.getBlock(worldObj); TileEntity tileHit = hitCoord.getTileEntity(worldObj); - float hardness = blockHit.getBlockHardness(worldObj, hitCoord); + float hardness = blockHit.getBlockHardness(worldObj, hitCoord.getPos()); if(!(hardness < 0 || (tileHit instanceof ILaserReceptor && !((ILaserReceptor)tileHit).canLasersDig()))) { @@ -128,7 +128,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement } LaserInfo info = LaserManager.fireLaser(this, facing, firing, worldObj); - Coord4D hitCoord = info.movingPos == null ? null : new Coord4D(info.movingPos); + Coord4D hitCoord = info.movingPos == null ? null : new Coord4D(info.movingPos, worldObj); if(hitCoord == null || !hitCoord.equals(digging)) { @@ -140,7 +140,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement { Block blockHit = hitCoord.getBlock(worldObj); TileEntity tileHit = hitCoord.getTileEntity(worldObj); - float hardness = blockHit.getBlockHardness(worldObj, hitCoord); + float hardness = blockHit.getBlockHardness(worldObj, hitCoord.getPos()); if(!(hardness < 0 || (tileHit instanceof ILaserReceptor && !((ILaserReceptor)tileHit).canLasersDig()))) { diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java index 04be12ed4..8fd18c6af 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java @@ -64,7 +64,7 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme if(on) { MovingObjectPosition mop = LaserManager.fireLaserClient(this, facing, lastFired, worldObj); - Coord4D hitCoord = mop == null ? null : new Coord4D(mop); + Coord4D hitCoord = mop == null ? null : new Coord4D(mop, worldObj); if(hitCoord == null || !hitCoord.equals(digging)) { @@ -76,7 +76,7 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme { Block blockHit = hitCoord.getBlock(worldObj); TileEntity tileHit = hitCoord.getTileEntity(worldObj); - float hardness = blockHit.getBlockHardness(worldObj, hitCoord); + float hardness = blockHit.getBlockHardness(worldObj, hitCoord.getPos()); if(!(hardness < 0 || (tileHit instanceof ILaserReceptor && !((ILaserReceptor)tileHit).canLasersDig()))) { diggingProgress += lastFired; @@ -103,7 +103,7 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme } LaserInfo info = LaserManager.fireLaser(this, facing, firing, worldObj); - Coord4D hitCoord = info.movingPos == null ? null : new Coord4D(info.movingPos); + Coord4D hitCoord = info.movingPos == null ? null : new Coord4D(info.movingPos, worldObj); if(hitCoord == null || !hitCoord.equals(digging)) { @@ -115,7 +115,7 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme { Block blockHit = hitCoord.getBlock(worldObj); TileEntity tileHit = hitCoord.getTileEntity(worldObj); - float hardness = blockHit.getBlockHardness(worldObj, hitCoord); + float hardness = blockHit.getBlockHardness(worldObj, hitCoord.getPos()); if(!(hardness < 0 || (tileHit instanceof ILaserReceptor && !((ILaserReceptor)tileHit).canLasersDig()))) { diggingProgress += firing; diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java index d959d8dda..8c43e6d54 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java +++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java @@ -118,11 +118,11 @@ public abstract class TileEntityMultiblock> extend for(EnumFacing side : EnumFacing.VALUES) { Coord4D obj = Coord4D.get(this).offset(side); - TileEntity tile = obj.safeTileGet(worldObj); + TileEntity tile = obj.getTileEntity(worldObj); if(!obj.isAirBlock(worldObj) && (tile == null || tile.getClass() != getClass())) { - obj.getBlock(worldObj).onNeighborChange(worldObj, obj, getPos()); + obj.getBlock(worldObj).onNeighborChange(worldObj, obj.getPos(), getPos()); } } @@ -179,7 +179,7 @@ public abstract class TileEntityMultiblock> extend { for(Coord4D obj : getSynchronizedData().locations) { - TileEntityMultiblock tileEntity = (TileEntityMultiblock)obj.safeTileGet(worldObj); + TileEntityMultiblock tileEntity = (TileEntityMultiblock)obj.getTileEntity(worldObj); if(tileEntity != null && tileEntity.isRendering) { diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java index 1d3682658..f73f66fbf 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java @@ -268,7 +268,7 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im @Override public void onPlace() { - MekanismUtils.makeBoundingBlock(worldObj, Coord4D.get(this).offset(EnumFacing.UP), Coord4D.get(this)); + MekanismUtils.makeBoundingBlock(worldObj, Coord4D.get(this).offset(EnumFacing.UP).getPos(), Coord4D.get(this)); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java b/src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java index 3cbc5e529..5d41f980d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java +++ b/src/main/java/mekanism/common/tile/TileEntityStructuralGlass.java @@ -19,7 +19,7 @@ public class TileEntityStructuralGlass extends TileEntity implements IStructural { if(master != null) { - TileEntity masterTile = master.safeTileGet(worldObj); + TileEntity masterTile = master.getTileEntity(worldObj); if(masterTile instanceof IMultiblock) { @@ -38,7 +38,7 @@ public class TileEntityStructuralGlass extends TileEntity implements IStructural { if(master != null) { - TileEntity masterTile = master.safeTileGet(worldObj); + TileEntity masterTile = master.getTileEntity(worldObj); if(masterTile instanceof IMultiblock) { @@ -88,7 +88,7 @@ public class TileEntityStructuralGlass extends TileEntity implements IStructural for(EnumFacing side : EnumFacing.VALUES) { Coord4D coord = pos.offset(side); - TileEntity tile = coord.safeTileGet(worldObj); + TileEntity tile = coord.getTileEntity(worldObj); if(!iterated.contains(coord)) { diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index 74278019c..82e62ee45 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -4,7 +4,6 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Set; import java.util.UUID; @@ -17,7 +16,6 @@ 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; import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; @@ -30,7 +28,6 @@ import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; - import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; @@ -44,12 +41,12 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.ForgeChunkManager.Ticket; import net.minecraftforge.common.ForgeChunkManager.Type; -import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -414,13 +411,13 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo if(player.isEntityAlive()) { newWorld.spawnEntityInWorld(player); - player.setLocationAndAngles(coord.getX()+0.5, coord.getY()+1, coord.getZ()+0.5, player.rotationYaw, player.rotationPitch); + player.setLocationAndAngles(coord.xCoord+0.5, coord.yCoord+1, coord.zCoord+0.5, player.rotationYaw, player.rotationPitch); newWorld.updateEntityWithOptionalForce(player, false); player.setWorld(newWorld); } player.mcServer.getConfigurationManager().preparePlayer(player, oldWorld); - player.playerNetServerHandler.setPlayerLocation(coord.getX()+0.5, coord.getY()+1, coord.getZ()+0.5, player.rotationYaw, player.rotationPitch); + player.playerNetServerHandler.setPlayerLocation(coord.xCoord+0.5, coord.yCoord+1, coord.zCoord+0.5, player.rotationYaw, player.rotationPitch); player.theItemInWorldManager.setWorld(newWorld); player.mcServer.getConfigurationManager().updateTimeAndWeatherForPlayer(player, newWorld); player.mcServer.getConfigurationManager().syncPlayerInventory(player); @@ -435,7 +432,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo FMLCommonHandler.instance().firePlayerChangedDimensionEvent(player, id, coord.dimensionId); } else { - player.playerNetServerHandler.setPlayerLocation(coord.getX()+0.5, coord.getY()+1, coord.getZ()+0.5, player.rotationYaw, player.rotationPitch); + player.playerNetServerHandler.setPlayerLocation(coord.xCoord+0.5, coord.yCoord+1, coord.zCoord+0.5, player.rotationYaw, player.rotationPitch); } } @@ -449,7 +446,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo entity.isDead = false; world.spawnEntityInWorld(entity); - entity.setLocationAndAngles(coord.getX()+0.5, coord.getY()+1, coord.getZ()+0.5, entity.rotationYaw, entity.rotationPitch); + entity.setLocationAndAngles(coord.xCoord+0.5, coord.yCoord+1, coord.zCoord+0.5, entity.rotationYaw, entity.rotationPitch); world.updateEntityWithOptionalForce(entity, false); entity.setWorld(world); world.resetUpdateEntityTick(); @@ -466,7 +463,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo entity.isDead = true; } else { - entity.setLocationAndAngles(coord.getX()+0.5, coord.getY()+1, coord.getZ()+0.5, entity.rotationYaw, entity.rotationPitch); + 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))); } } @@ -533,7 +530,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo energyCost+=10000; } - int distance = (int)entity.getDistance(coords.getX(), coords.getY(), coords.getZ()); + int distance = (int)entity.getDistance(coords.xCoord, coords.yCoord, coords.zCoord); energyCost+=(distance*10); return energyCost; diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java index 51447e6c4..cbda51daf 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java @@ -349,10 +349,10 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva startPoint = startPoint.offset(EnumFacing.UP); } - Coord4D test = startPoint.offset(EnumFacing.DOWN).offset(right, 2); + Coord4D test = startPoint.offset(EnumFacing.DOWN).getFromSide(right, 2); isLeftOnFace = test.getTileEntity(worldObj) instanceof TileEntityThermalEvaporationBlock; - startPoint = startPoint.offset(left, isLeftOnFace ? 1 : 2); + startPoint = startPoint.getFromSide(left, isLeftOnFace ? 1 : 2); if(!scanTopLayer(startPoint)) { @@ -390,7 +390,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva { for(int z = 0; z < 4; z++) { - Coord4D pointer = current.offset(right, x).offset(back, z); + Coord4D pointer = current.getFromSide(right, x).getFromSide(back, z); TileEntity pointerTile = pointer.getTileEntity(worldObj); int corner = getCorner(x, z); @@ -465,7 +465,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva { for(int z = 0; z < 4; z++) { - Coord4D pointer = current.offset(right, x).offset(back, z); + Coord4D pointer = current.getFromSide(right, x).getFromSide(back, z); TileEntity pointerTile = pointer.getTileEntity(worldObj); if((x == 1 || x == 2) && (z == 1 || z == 2)) @@ -557,7 +557,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva Coord4D startPoint = Coord4D.get(this).offset(right); startPoint = isLeftOnFace ? startPoint.offset(right) : startPoint; - startPoint = startPoint.offset(right.getOpposite()).offset(MekanismUtils.getBack(facing)).add(0, -(height-2), 0); + startPoint = startPoint.offset(right.getOpposite()).offset(MekanismUtils.getBack(facing)).translate(0, -(height-2), 0); return startPoint; } diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java index cd504518a..0c7344f80 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationValve.java @@ -28,7 +28,7 @@ public class TileEntityThermalEvaporationValve extends TileEntityThermalEvaporat if(!obj.isAirBlock(worldObj) && !(obj.getTileEntity(worldObj) instanceof TileEntityThermalEvaporationBlock)) { - obj.getBlock(worldObj).onNeighborChange(worldObj, obj, getPos()); + obj.getBlock(worldObj).onNeighborChange(worldObj, obj.getPos(), getPos()); } } } diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 67d7942d2..08e9ff4d1 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -723,13 +723,13 @@ public final class MekanismUtils { IBlockState blockState = sideCoord.getBlockState(world); Block block = blockState.getBlock(); - boolean weakPower = block.shouldCheckWeakPower(world, coord, side); + boolean weakPower = block.shouldCheckWeakPower(world, coord.getPos(), side); if(weakPower && isDirectlyGettingPowered(world, sideCoord)) { return true; } - else if(!weakPower && block.getWeakPower(world, sideCoord, blockState, side) > 0) + else if(!weakPower && block.getWeakPower(world, sideCoord.getPos(), blockState, side) > 0) { return true; } @@ -753,7 +753,7 @@ public final class MekanismUtils if(sideCoord.exists(world)) { - if(world.getRedstonePower(coord, side) > 0) + if(world.getRedstonePower(coord.getPos(), side) > 0) { return true; } @@ -777,9 +777,9 @@ public final class MekanismUtils if(offset.exists(world)) { Block block1 = offset.getBlock(world); - block1.onNeighborChange(world, offset, coord); + block1.onNeighborChange(world, offset.getPos(), coord.getPos()); - if(block1.isNormalCube(world, offset)) + if(block1.isNormalCube(world, offset.getPos())) { offset = offset.offset(dir); @@ -787,9 +787,9 @@ public final class MekanismUtils { block1 = offset.getBlock(world); - if(block1.getWeakChanges(world, offset)) + if(block1.getWeakChanges(world, offset.getPos())) { - block1.onNeighborChange(world, offset, coord); + block1.onNeighborChange(world, offset.getPos(), coord.getPos()); } } } @@ -809,7 +809,7 @@ public final class MekanismUtils if(!world.isRemote) { - ((TileEntityBoundingBlock)world.getTileEntity(boundingLocation)).setMainLocation(orig); + ((TileEntityBoundingBlock)world.getTileEntity(boundingLocation)).setMainLocation(orig.getPos()); } } @@ -825,7 +825,7 @@ public final class MekanismUtils if(!world.isRemote) { - ((TileEntityAdvancedBoundingBlock)world.getTileEntity(boundingLocation)).setMainLocation(orig); + ((TileEntityAdvancedBoundingBlock)world.getTileEntity(boundingLocation)).setMainLocation(orig.getPos()); } } @@ -905,7 +905,7 @@ public final class MekanismUtils if(state.getProperties().containsKey(BlockFluidBase.LEVEL) && state.getValue(BlockFluidBase.LEVEL) == 0) { - return fluid.drain(world, pos, false); + return fluid.drain(world, pos.getPos(), false); } } @@ -1233,7 +1233,7 @@ public final class MekanismUtils */ public static String getCoordDisplay(Coord4D obj) { - return "[" + obj.getX() + ", " + obj.getY() + ", " + obj.getZ() + "]"; + return "[" + obj.xCoord + ", " + obj.yCoord + ", " + obj.zCoord + "]"; } @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/common/util/MinerUtils.java b/src/main/java/mekanism/common/util/MinerUtils.java index 7c9bbd020..72efd00f5 100644 --- a/src/main/java/mekanism/common/util/MinerUtils.java +++ b/src/main/java/mekanism/common/util/MinerUtils.java @@ -21,20 +21,20 @@ public final class MinerUtils IBlockState state = obj.getBlockState(world); Block block = state.getBlock(); - if(block == null || block.isAir(world, obj)) + if(block == null || block.isAir(world, obj.getPos())) { return new ArrayList(); } if(!silk) { - return block.getDrops(world, obj, state, 0); + return block.getDrops(world, obj.getPos(), state, 0); } else { List ret = new ArrayList(); ret.add(new ItemStack(block, 1, block.getMetaFromState(state))); - if(specialSilkIDs.contains(block) || (block.getDrops(world, obj, state, 0) != null && block.getDrops(world, obj, state, 0).size() > 0)) + if(specialSilkIDs.contains(block) || (block.getDrops(world, obj.getPos(), state, 0) != null && block.getDrops(world, obj.getPos(), state, 0).size() > 0)) { return ret; } diff --git a/src/main/java/mekanism/common/util/TransporterUtils.java b/src/main/java/mekanism/common/util/TransporterUtils.java index e5aec1bbb..f3853ea4c 100644 --- a/src/main/java/mekanism/common/util/TransporterUtils.java +++ b/src/main/java/mekanism/common/util/TransporterUtils.java @@ -211,7 +211,7 @@ public final class TransporterUtils TransporterManager.remove(stack); - EntityItem entityItem = new EntityItem(tileEntity.world(), tileEntity.coord().getX() + pos[0], tileEntity.coord().getY() + pos[1], tileEntity.coord().getZ() + pos[2], stack.itemStack); + EntityItem entityItem = new EntityItem(tileEntity.world(), tileEntity.coord().xCoord + pos[0], tileEntity.coord().yCoord + pos[1], tileEntity.coord().zCoord + pos[2], stack.itemStack); entityItem.motionX = 0; entityItem.motionY = 0; @@ -232,7 +232,7 @@ public final class TransporterUtils itemFix = 0.1F; } - return new float[] {0.5F + offset.getX()*progress, 0.5F + offset.getY()*progress - itemFix, 0.5F + offset.getZ()*progress}; + return new float[] {0.5F + offset.xCoord*progress, 0.5F + offset.yCoord*progress - itemFix, 0.5F + offset.zCoord*progress}; } public static void incrementColor(ILogisticalTransporter tileEntity) diff --git a/src/main/resources/assets/mekanism/blockstates/induction_casing.json b/src/main/resources/assets/mekanism/blockstates/induction_casing.json index ddf7d7ac3..9de5ea564 100644 --- a/src/main/resources/assets/mekanism/blockstates/induction_casing.json +++ b/src/main/resources/assets/mekanism/blockstates/induction_casing.json @@ -3,7 +3,7 @@ "defaults": { "model": "cube_all", "textures": { - "all": "mekanism:blocks/ctm/" + "all": "mekanism:blocks/ctm/induction_casing" } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_controller.json b/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_controller.json index 313dda6a1..dcf74a220 100644 --- a/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_controller.json +++ b/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_controller.json @@ -3,8 +3,8 @@ "defaults": { "model": "mekanism:machine", "textures": { - "sides": "mekanism:blocks/SalinationBlock", - "front": "mekanism:blocks/SalinationController" + "sides": "mekanism:blocks/ctm/thermal_evaporation_block", + "front": "mekanism:blocks/ctm/thermal_evaporation_controller" } }, "variants": { @@ -14,10 +14,6 @@ "east": {"y": 90}, "west": {"y": -90} }, - "active": { - "true": {"textures": {"front": "mekanism:blocks/SalinationControllerOn"}}, - "false": {} - }, "inventory": [{}] } } From d8760b842f25bcc68273d5dedd97f70afc8729e3 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Mon, 9 May 2016 23:23:05 -0400 Subject: [PATCH 07/22] CTM work --- .../mekanism/client/render/ctm/CTMData.java | 4 +- .../client/render/ctm/ModelChiselBlock.java | 5 +- .../mekanism/common/block/BlockBasic.java | 91 +------------------ .../common/block/states/BlockStateBasic.java | 48 ++++++---- .../content/tank/TankUpdateProtocol.java | 2 + .../mekanism/common/item/ItemBlockBasic.java | 33 ------- .../common/multiblock/UpdateProtocol.java | 10 +- .../common/tile/TileEntityDynamicTank.java | 1 - .../common/tile/TileEntityMultiblock.java | 4 - ...ction_provider.json => boiler_casing.json} | 2 +- ...{induction_cell.json => boiler_valve.json} | 2 +- .../blockstates/electromagnetic_coil.json | 14 +++ .../blockstates/induction_cell_advanced.json | 14 +++ .../blockstates/induction_cell_basic.json | 14 +++ .../blockstates/induction_cell_elite.json | 14 +++ .../blockstates/induction_cell_ultimate.json | 14 +++ .../induction_provider_advanced.json | 14 +++ .../blockstates/induction_provider_basic.json | 14 +++ .../blockstates/induction_provider_elite.json | 14 +++ .../induction_provider_ultimate.json | 14 +++ .../blockstates/superheating_element.json | 14 +++ 21 files changed, 185 insertions(+), 157 deletions(-) rename src/main/resources/assets/mekanism/blockstates/{induction_provider.json => boiler_casing.json} (76%) rename src/main/resources/assets/mekanism/blockstates/{induction_cell.json => boiler_valve.json} (76%) create mode 100644 src/main/resources/assets/mekanism/blockstates/electromagnetic_coil.json create mode 100644 src/main/resources/assets/mekanism/blockstates/induction_cell_advanced.json create mode 100644 src/main/resources/assets/mekanism/blockstates/induction_cell_basic.json create mode 100644 src/main/resources/assets/mekanism/blockstates/induction_cell_elite.json create mode 100644 src/main/resources/assets/mekanism/blockstates/induction_cell_ultimate.json create mode 100644 src/main/resources/assets/mekanism/blockstates/induction_provider_advanced.json create mode 100644 src/main/resources/assets/mekanism/blockstates/induction_provider_basic.json create mode 100644 src/main/resources/assets/mekanism/blockstates/induction_provider_elite.json create mode 100644 src/main/resources/assets/mekanism/blockstates/induction_provider_ultimate.json create mode 100644 src/main/resources/assets/mekanism/blockstates/superheating_element.json diff --git a/src/main/java/mekanism/client/render/ctm/CTMData.java b/src/main/java/mekanism/client/render/ctm/CTMData.java index 0333ce1cb..f6cfd7e77 100644 --- a/src/main/java/mekanism/client/render/ctm/CTMData.java +++ b/src/main/java/mekanism/client/render/ctm/CTMData.java @@ -39,9 +39,9 @@ public class CTMData if(state.getBlock() instanceof ICTMBlock) { IStringSerializable serializable = (IStringSerializable)state.getValue(((ICTMBlock)state.getBlock()).getTypeProperty()); - return acceptableBlockStates.contains(serializable.getName()); + return !acceptableBlockStates.contains(serializable.getName()); } - return false; + return true; } } diff --git a/src/main/java/mekanism/client/render/ctm/ModelChiselBlock.java b/src/main/java/mekanism/client/render/ctm/ModelChiselBlock.java index e0267f5b9..2217ab61b 100644 --- a/src/main/java/mekanism/client/render/ctm/ModelChiselBlock.java +++ b/src/main/java/mekanism/client/render/ctm/ModelChiselBlock.java @@ -92,7 +92,7 @@ public class ModelChiselBlock implements ISmartBlockModel, ISmartItemModel, IPer @Override public TextureAtlasSprite getParticleTexture() { - return this.model.getDefaultFace().getParticle(); + return model.getDefaultFace().getParticle(); } @Override @@ -120,7 +120,7 @@ public class ModelChiselBlock implements ISmartBlockModel, ISmartItemModel, IPer @Override public IBakedModel handleItemState(ItemStack stack) { - Block block = ((ItemBlock) stack.getItem()).getBlock(); + Block block = ((ItemBlock)stack.getItem()).getBlock(); return createModel(block.getDefaultState(), model, null); } @@ -179,6 +179,7 @@ public class ModelChiselBlock implements ISmartBlockModel, ISmartItemModel, IPer return thirdPersonTransform; } + return Pair.of(this, null); } } diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 2f7bd1fb2..3802fd4ba 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -144,7 +144,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple { BlockStateBasic.BasicBlockType type = BlockStateBasic.BasicBlockType.get(getBasicBlock(), meta&0xF); - return this.getDefaultState().withProperty(getProperty(), type); + return getDefaultState().withProperty(getProperty(), type); } @Override @@ -296,92 +296,6 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple break; } } -/* - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess world, BlockPos pos, int side) - { - int meta = world.getBlockMetadata(pos); - - switch(blockType) - { - case BASIC_BLOCK_1: - switch(meta) - { - case 6: - TileEntityBin tileEntity = (TileEntityBin)world.getTileEntity(pos); - - boolean active = MekanismUtils.isActive(world, pos); - return binIcons[tileEntity.tier.ordinal()][MekanismUtils.getBaseOrientation(side, tileEntity.facing)+(active ? 6 : 0)]; - case 14: - TileEntityThermalEvaporationController tileEntity1 = (TileEntityThermalEvaporationController)world.getTileEntity(pos); - - if(side == tileEntity1.facing) - { - return MekanismUtils.isActive(world, pos) ? icons[meta][1] : icons[meta][0]; - } - else { - return icons[meta][2]; - } - default: - return getIcon(side, meta); - } - case BASIC_BLOCK_2: - switch(meta) - { - case 2: - TileEntityInductionPort tileEntity = (TileEntityInductionPort)world.getTileEntity(pos); - return icons[meta][tileEntity.mode ? 1 : 0]; - case 3: - TileEntityInductionCell tileEntity1 = (TileEntityInductionCell)world.getTileEntity(pos); - return icons[meta][tileEntity1.tier.ordinal()]; - 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); - } - } - - return null; - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) - { - switch(blockType) - { - case BASIC_BLOCK_1: - switch(meta) - { - case 14: - if(side == 2) - { - return icons[meta][0]; - } - else { - return icons[meta][2]; - } - default: - return icons[meta][0]; - } - case BASIC_BLOCK_2: - return icons[meta][0]; - default: - return icons[meta][0]; - } - } -*/ @Override public int damageDropped(IBlockState state) @@ -1037,7 +951,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockAccess world, BlockPos pos, EnumFacing side) { - BlockPos offsetPos = pos.offset(EnumFacing.getFront(side.ordinal()).getOpposite()); + BlockPos offsetPos = pos.offset(side.getOpposite()); if(BasicBlockType.get(world.getBlockState(offsetPos)) == BasicBlockType.STRUCTURAL_GLASS) { @@ -1109,6 +1023,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple { if(side == state.getValue(BlockStateFacing.facingProperty)) { + System.out.println("Yeet"); return type.getName() + (state.getValue(BlockStateBasic.activeProperty) ? "_on" : ""); } } diff --git a/src/main/java/mekanism/common/block/states/BlockStateBasic.java b/src/main/java/mekanism/common/block/states/BlockStateBasic.java index dbeb545b6..2a61f562c 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateBasic.java +++ b/src/main/java/mekanism/common/block/states/BlockStateBasic.java @@ -90,24 +90,24 @@ public class BlockStateBasic extends ExtendedBlockState REFINED_GLOWSTONE(BasicBlock.BASIC_BLOCK_1, 4, "RefinedGlowstone", null, false, Predicates.alwaysFalse(), false, false), STEEL_BLOCK(BasicBlock.BASIC_BLOCK_1, 5, "SteelBlock", null, false, Predicates.alwaysFalse(), false, false), BIN(BasicBlock.BASIC_BLOCK_1, 6, "Bin", TileEntityBin.class, false, Plane.HORIZONTAL, true, false), - TELEPORTER_FRAME(BasicBlock.BASIC_BLOCK_1, 7, "TeleporterFrame", null, false, Predicates.alwaysFalse(), false, true), + TELEPORTER_FRAME(BasicBlock.BASIC_BLOCK_1, 7, "TeleporterFrame", null, false, Predicates.alwaysFalse(), false, false), STEEL_CASING(BasicBlock.BASIC_BLOCK_1, 8, "SteelCasing", null, false, Predicates.alwaysFalse(), false, false), - DYNAMIC_TANK(BasicBlock.BASIC_BLOCK_1, 9, "DynamicTank", TileEntityDynamicTank.class, false, Predicates.alwaysFalse(), false, true), - STRUCTURAL_GLASS(BasicBlock.BASIC_BLOCK_1, 10, "StructuralGlass", TileEntityStructuralGlass.class, false, Predicates.alwaysFalse(), false, true), - DYNAMIC_VALVE(BasicBlock.BASIC_BLOCK_1, 11, "DynamicValve", TileEntityDynamicValve.class, false, Predicates.alwaysFalse(), false, true), + DYNAMIC_TANK(BasicBlock.BASIC_BLOCK_1, 9, "DynamicTank", TileEntityDynamicTank.class, false, Predicates.alwaysFalse(), false, false), + STRUCTURAL_GLASS(BasicBlock.BASIC_BLOCK_1, 10, "StructuralGlass", TileEntityStructuralGlass.class, false, Predicates.alwaysFalse(), false, false), + DYNAMIC_VALVE(BasicBlock.BASIC_BLOCK_1, 11, "DynamicValve", TileEntityDynamicValve.class, false, Predicates.alwaysFalse(), false, false), COPPER_BLOCK(BasicBlock.BASIC_BLOCK_1, 12, "CopperBlock", null, false, Predicates.alwaysFalse(), false, false), TIN_BLOCK(BasicBlock.BASIC_BLOCK_1, 13, "TinBlock", null, false, Predicates.alwaysFalse(), false, false), - THERMAL_EVAPORATION_CONTROLLER(BasicBlock.BASIC_BLOCK_1, 14, "ThermalEvaporationController", TileEntityThermalEvaporationController.class, false, Plane.HORIZONTAL, true, true), - THERMAL_EVAPORATION_VALVE(BasicBlock.BASIC_BLOCK_1, 15, "ThermalEvaporationValve", TileEntityThermalEvaporationValve.class, false, Predicates.alwaysFalse(), false, true), - THERMAL_EVAPORATION_BLOCK(BasicBlock.BASIC_BLOCK_2, 0, "ThermalEvaporationBlock", TileEntityThermalEvaporationBlock.class, false, Predicates.alwaysFalse(), false, true), - INDUCTION_CASING(BasicBlock.BASIC_BLOCK_2, 1, "InductionCasing", TileEntityInductionCasing.class, false, Predicates.alwaysFalse(), false, true), - INDUCTION_PORT(BasicBlock.BASIC_BLOCK_2, 2, "InductionPort", TileEntityInductionPort.class, false, Predicates.alwaysFalse(), false, true), + THERMAL_EVAPORATION_CONTROLLER(BasicBlock.BASIC_BLOCK_1, 14, "ThermalEvaporationController", TileEntityThermalEvaporationController.class, false, Plane.HORIZONTAL, true, false), + THERMAL_EVAPORATION_VALVE(BasicBlock.BASIC_BLOCK_1, 15, "ThermalEvaporationValve", TileEntityThermalEvaporationValve.class, false, Predicates.alwaysFalse(), false, false), + THERMAL_EVAPORATION_BLOCK(BasicBlock.BASIC_BLOCK_2, 0, "ThermalEvaporationBlock", TileEntityThermalEvaporationBlock.class, false, Predicates.alwaysFalse(), false, false), + INDUCTION_CASING(BasicBlock.BASIC_BLOCK_2, 1, "InductionCasing", TileEntityInductionCasing.class, false, Predicates.alwaysFalse(), false, false), + INDUCTION_PORT(BasicBlock.BASIC_BLOCK_2, 2, "InductionPort", TileEntityInductionPort.class, false, Predicates.alwaysFalse(), false, false), INDUCTION_CELL(BasicBlock.BASIC_BLOCK_2, 3, "InductionCell", TileEntityInductionCell.class, false, Predicates.alwaysFalse(), false, true), INDUCTION_PROVIDER(BasicBlock.BASIC_BLOCK_2, 4, "InductionProvider", TileEntityInductionProvider.class, false, Predicates.alwaysFalse(), false, true), - SUPERHEATING_ELEMENT(BasicBlock.BASIC_BLOCK_2, 5, "SuperheatingElement", TileEntitySuperheatingElement.class, true, Predicates.alwaysFalse(), false, true), + SUPERHEATING_ELEMENT(BasicBlock.BASIC_BLOCK_2, 5, "SuperheatingElement", TileEntitySuperheatingElement.class, true, Predicates.alwaysFalse(), false, false), PRESSURE_DISPERSER(BasicBlock.BASIC_BLOCK_2, 6, "PressureDisperser",TileEntityPressureDisperser.class, true, Predicates.alwaysFalse(), false, false), - BOILER_CASING(BasicBlock.BASIC_BLOCK_2, 7, "BoilerCasing", TileEntityBoilerCasing.class, true, Predicates.alwaysFalse(), false, true), - BOILER_VALVE(BasicBlock.BASIC_BLOCK_2, 8, "BoilerValve", TileEntityBoilerValve.class, true, Predicates.alwaysFalse(), false, true), + BOILER_CASING(BasicBlock.BASIC_BLOCK_2, 7, "BoilerCasing", TileEntityBoilerCasing.class, true, Predicates.alwaysFalse(), false, false), + BOILER_VALVE(BasicBlock.BASIC_BLOCK_2, 8, "BoilerValve", TileEntityBoilerValve.class, true, Predicates.alwaysFalse(), false, false), SECURITY_DESK(BasicBlock.BASIC_BLOCK_2, 9, "SecurityDesk", TileEntitySecurityDesk.class, true, Plane.HORIZONTAL, false, false); public BasicBlock blockType; @@ -118,9 +118,9 @@ public class BlockStateBasic extends ExtendedBlockState public boolean hasDescription; public Predicate facingPredicate; public boolean activable; - public boolean ctm; + public boolean tiers; - private BasicBlockType(BasicBlock block, int metadata, String s, Class tileClass, boolean hasDesc, Predicate facingAllowed, boolean activeState, boolean ctmTex) + private BasicBlockType(BasicBlock block, int metadata, String s, Class tileClass, boolean hasDesc, Predicate facingAllowed, boolean activeState, boolean t) { blockType = block; meta = metadata; @@ -129,7 +129,7 @@ public class BlockStateBasic extends ExtendedBlockState hasDescription = hasDesc; facingPredicate = facingAllowed; activable = activeState; - ctm = ctmTex; + tiers = t; } public static BasicBlockType get(IBlockState state) @@ -138,6 +138,7 @@ public class BlockStateBasic extends ExtendedBlockState { return state.getValue(((BlockBasic)state.getBlock()).getProperty()); } + return null; } @@ -159,13 +160,20 @@ public class BlockStateBasic extends ExtendedBlockState public static BasicBlockType get(BasicBlock blockType, int metadata) { BasicBlockType firstTry = values()[blockType.ordinal() << 4 | metadata]; + if(firstTry.blockType == blockType && firstTry.meta == metadata) + { return firstTry; + } + for(BasicBlockType type : values()) { if(type.blockType == blockType && type.meta == metadata) + { return type; + } } + return null; } @@ -236,6 +244,7 @@ public class BlockStateBasic extends ExtendedBlockState BlockBasic block = (BlockBasic)state.getBlock(); BasicBlockType type = state.getValue(block.getProperty()); StringBuilder builder = new StringBuilder(); + String nameOverride = null; if(type.hasActiveTexture()) { @@ -263,13 +272,20 @@ public class BlockStateBasic extends ExtendedBlockState return new ModelResourceLocation("builtin/missing", "missing"); } } + + if(type.tiers) + { + BaseTier tier = state.getValue(tierProperty); + + nameOverride = type.getName() + "_" + tier.getName(); + } if(builder.length() == 0) { builder.append("normal"); } - ResourceLocation baseLocation = new ResourceLocation("mekanism", type.getName()); + ResourceLocation baseLocation = new ResourceLocation("mekanism", nameOverride != null ? nameOverride : type.getName()); return new ModelResourceLocation(baseLocation, builder.toString()); } } diff --git a/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java b/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java index c952729ef..719899cec 100644 --- a/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java @@ -64,6 +64,8 @@ public class TankUpdateProtocol extends UpdateProtocol ((TankCache)cache).fluid.amount += ((TankCache)merge).fluid.amount; } + ((TankCache)cache).editMode = ((TankCache)merge).editMode; + List rejects = StackUtils.getMergeRejects(((TankCache)cache).inventory, ((TankCache)merge).inventory); if(!rejects.isEmpty()) diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index d03d89ebd..10897e018 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -28,7 +28,6 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; @@ -138,12 +137,6 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt return i; } - @Override - public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) - { - return null; //TODO: IDONTKNOWHOWTODOTHIS - } - @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) @@ -199,19 +192,6 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt return BasicBlockType.get(stack) == BasicBlockType.BIN && stack.getTagCompound() != null && stack.getTagCompound().hasKey("newCount"); } -/* - @Override - public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) - { - if(BasicBlockType.get(stack) != BasicBlockType.BIN) - { - return true; - } - - return false; - } -*/ - @Override public ItemStack getContainerItem(ItemStack stack) { @@ -317,19 +297,6 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt return "null"; } - @Override - public String getItemStackDisplayName(ItemStack itemstack) - { - BasicBlockType type = BasicBlockType.get(itemstack); - - if(type == BasicBlockType.INDUCTION_CELL || type == BasicBlockType.INDUCTION_PROVIDER) - { - return getBaseTier(itemstack).getLocalizedName() + " " + super.getItemStackDisplayName(itemstack); - } - - return super.getItemStackDisplayName(itemstack); - } - @Override public double getEnergy(ItemStack itemStack) { diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index 62ed693ac..ce4729f8b 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -469,9 +469,6 @@ public abstract class UpdateProtocol> { if(!structureFound.locations.contains(coord)) { - System.out.println("No contain " + coord + " " + coord.getTileEntity(pointer.getWorld())); - System.out.println(coord.getBlockState(pointer.getWorld()).getBlock()); - for(Coord4D newCoord : iteratedNodes) { TileEntity tile = newCoord.getTileEntity(pointer.getWorld()); @@ -538,9 +535,8 @@ public abstract class UpdateProtocol> //TODO perhaps drop from pointer? cache.apply((T)structureFound); - structureFound.inventoryID = idToUse; - System.out.println("Success " + structureFound.locations.size()); + onFormed(); List structures = new ArrayList(); @@ -573,7 +569,6 @@ public abstract class UpdateProtocol> } } else { - int killed = 0; for(Coord4D coord : iteratedNodes) { TileEntity tile = coord.getTileEntity(pointer.getWorld()); @@ -589,7 +584,6 @@ public abstract class UpdateProtocol> } tileEntity.structure = null; - killed++; } else if(tile instanceof IStructuralMultiblock) { @@ -597,8 +591,6 @@ public abstract class UpdateProtocol> } } - System.out.println(killed + " KILLED"); - for(Coord4D coord : innerNodes) { killInnerNode(coord); diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java index 12a33f9ec..37026d408 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java @@ -9,7 +9,6 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; -import mekanism.common.PacketHandler; import mekanism.common.base.IFluidContainerManager; import mekanism.common.block.BlockBasic; import mekanism.common.content.tank.SynchronizedTankData; diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java index 8c43e6d54..f15b0e97f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java +++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java @@ -23,7 +23,6 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -53,9 +52,6 @@ public abstract class TileEntityMultiblock> extend public TileEntityMultiblock(String name) { super(name); - - if(FMLCommonHandler.instance().getEffectiveSide().isServer()) - Thread.dumpStack(); } @Override diff --git a/src/main/resources/assets/mekanism/blockstates/induction_provider.json b/src/main/resources/assets/mekanism/blockstates/boiler_casing.json similarity index 76% rename from src/main/resources/assets/mekanism/blockstates/induction_provider.json rename to src/main/resources/assets/mekanism/blockstates/boiler_casing.json index 8aee4d7ae..7e99ba86a 100644 --- a/src/main/resources/assets/mekanism/blockstates/induction_provider.json +++ b/src/main/resources/assets/mekanism/blockstates/boiler_casing.json @@ -3,7 +3,7 @@ "defaults": { "model": "cube_all", "textures": { - "all": "mekanism:blocks/InductionProvider" + "all": "mekanism:blocks/ctm/boiler_casing" } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/induction_cell.json b/src/main/resources/assets/mekanism/blockstates/boiler_valve.json similarity index 76% rename from src/main/resources/assets/mekanism/blockstates/induction_cell.json rename to src/main/resources/assets/mekanism/blockstates/boiler_valve.json index a1e478842..f79477340 100644 --- a/src/main/resources/assets/mekanism/blockstates/induction_cell.json +++ b/src/main/resources/assets/mekanism/blockstates/boiler_valve.json @@ -3,7 +3,7 @@ "defaults": { "model": "cube_all", "textures": { - "all": "mekanism:blocks/InductionCell" + "all": "mekanism:blocks/ctm/boiler_valve" } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/electromagnetic_coil.json b/src/main/resources/assets/mekanism/blockstates/electromagnetic_coil.json new file mode 100644 index 000000000..83f4410f4 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/electromagnetic_coil.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/ctm/electromagnetic_coil" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/induction_cell_advanced.json b/src/main/resources/assets/mekanism/blockstates/induction_cell_advanced.json new file mode 100644 index 000000000..d728e406d --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/induction_cell_advanced.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/ctm/induction_cell_advanced" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/induction_cell_basic.json b/src/main/resources/assets/mekanism/blockstates/induction_cell_basic.json new file mode 100644 index 000000000..7e32ce21a --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/induction_cell_basic.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/ctm/induction_cell_basic" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/induction_cell_elite.json b/src/main/resources/assets/mekanism/blockstates/induction_cell_elite.json new file mode 100644 index 000000000..a18e0807c --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/induction_cell_elite.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/ctm/induction_cell_elite" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/induction_cell_ultimate.json b/src/main/resources/assets/mekanism/blockstates/induction_cell_ultimate.json new file mode 100644 index 000000000..2d9450126 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/induction_cell_ultimate.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/ctm/induction_cell_ultimate" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/induction_provider_advanced.json b/src/main/resources/assets/mekanism/blockstates/induction_provider_advanced.json new file mode 100644 index 000000000..b3cb0c0d5 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/induction_provider_advanced.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/ctm/induction_provider_advanced" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/induction_provider_basic.json b/src/main/resources/assets/mekanism/blockstates/induction_provider_basic.json new file mode 100644 index 000000000..133736265 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/induction_provider_basic.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/ctm/induction_provider_basic" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/induction_provider_elite.json b/src/main/resources/assets/mekanism/blockstates/induction_provider_elite.json new file mode 100644 index 000000000..b9228617a --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/induction_provider_elite.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/ctm/induction_provider_elite" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/induction_provider_ultimate.json b/src/main/resources/assets/mekanism/blockstates/induction_provider_ultimate.json new file mode 100644 index 000000000..db3d05b46 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/induction_provider_ultimate.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/ctm/induction_provider_ultimate" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/superheating_element.json b/src/main/resources/assets/mekanism/blockstates/superheating_element.json new file mode 100644 index 000000000..54303a302 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/superheating_element.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "mekanism:blocks/ctm/superheating_element" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} + From 98c57960d120d0ac01dd8055715e3177ede4741a Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 10 May 2016 00:12:01 -0400 Subject: [PATCH 08/22] Got more CTM stuff rendering --- .../client/render/ctm/ModelChiselBlock.java | 4 +- .../mekanism/common/block/BlockBasic.java | 30 +-- .../mekanism/common/block/BlockMachine.java | 219 ++---------------- .../common/block/states/BlockStateBasic.java | 6 +- .../block/states/BlockStateMachine.java | 11 +- ...ileEntityThermalEvaporationController.java | 16 +- .../mekanism/common/util/MekanismUtils.java | 2 +- .../thermal_evaporation_controller.json | 7 +- 8 files changed, 44 insertions(+), 251 deletions(-) diff --git a/src/main/java/mekanism/client/render/ctm/ModelChiselBlock.java b/src/main/java/mekanism/client/render/ctm/ModelChiselBlock.java index 2217ab61b..8ee65da96 100644 --- a/src/main/java/mekanism/client/render/ctm/ModelChiselBlock.java +++ b/src/main/java/mekanism/client/render/ctm/ModelChiselBlock.java @@ -7,7 +7,7 @@ import javax.annotation.Nullable; import javax.vecmath.Matrix4f; import javax.vecmath.Vector3f; -import mekanism.common.block.BlockBasic; +import mekanism.common.block.states.BlockStateBasic; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.BakedQuad; @@ -109,7 +109,7 @@ public class ModelChiselBlock implements ISmartBlockModel, ISmartItemModel, IPer if(stateIn.getBlock() instanceof ICTMBlock && stateIn instanceof IExtendedBlockState) { IExtendedBlockState state = (IExtendedBlockState) stateIn; - CTMBlockRenderContext ctxList = state.getValue(BlockBasic.ctmProperty); + CTMBlockRenderContext ctxList = state.getValue(BlockStateBasic.ctmProperty); return createModel(stateIn, model, ctxList); } else { diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 3802fd4ba..bc1838d31 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -9,7 +9,6 @@ import mekanism.api.energy.IStrictEnergyStorage; import mekanism.client.render.ctm.CTMBlockRenderContext; import mekanism.client.render.ctm.CTMData; import mekanism.client.render.ctm.ICTMBlock; -import mekanism.client.render.ctm.PropertyCTMRenderContext; import mekanism.common.Mekanism; import mekanism.common.Tier.BaseTier; import mekanism.common.base.IActiveState; @@ -101,8 +100,6 @@ import buildcraft.api.tools.IToolWrench; */ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? implements ICustomBlockIcon { - public static final PropertyCTMRenderContext ctmProperty = new PropertyCTMRenderContext(); - public CTMData[][] ctmData = new CTMData[16][4]; public BlockBasic() @@ -212,30 +209,9 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple IExtendedBlockState state = (IExtendedBlockState)stateIn; CTMBlockRenderContext ctx = new CTMBlockRenderContext(w, pos); - return state.withProperty(ctmProperty, ctx); + return state.withProperty(BlockStateBasic.ctmProperty, ctx); } -/* - @Override - public IIcon getIcon(ItemStack stack, int side) - { - if(BasicType.get(stack) == BasicType.BIN) - { - return binIcons[((ItemBlockBasic)stack.getItem()).getBaseTier(stack).ordinal()][side]; - } - else if(BasicType.get(stack) == BasicType.INDUCTION_CELL) - { - return icons[3][((ItemBlockBasic)stack.getItem()).getBaseTier(stack).ordinal()]; - } - else if(BasicType.get(stack) == BasicType.INDUCTION_PROVIDER) - { - return icons[4][((ItemBlockBasic)stack.getItem()).getBaseTier(stack).ordinal()]; - } - - return getIcon(side, stack.getItemDamage()); - } -*/ - @Override public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block neighborBlock) { @@ -1023,9 +999,11 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple { if(side == state.getValue(BlockStateFacing.facingProperty)) { - System.out.println("Yeet"); return type.getName() + (state.getValue(BlockStateBasic.activeProperty) ? "_on" : ""); } + else { + return "thermal_evaporation_block"; + } } if(type == BasicBlockType.INDUCTION_PORT) diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 17444a790..de6ccd1c5 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -9,6 +9,7 @@ import mekanism.api.MekanismConfig.client; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.api.energy.IStrictEnergyStorage; +import mekanism.client.render.ctm.CTMBlockRenderContext; import mekanism.client.render.ctm.CTMData; import mekanism.client.render.ctm.ICTMBlock; import mekanism.common.Mekanism; @@ -26,6 +27,7 @@ import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ISustainedTank; import mekanism.common.base.ITierItem; import mekanism.common.base.IUpgradeTile; +import mekanism.common.block.states.BlockStateBasic; import mekanism.common.block.states.BlockStateBasic.BasicBlockType; import mekanism.common.block.states.BlockStateFacing; import mekanism.common.block.states.BlockStateMachine; @@ -74,6 +76,7 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; @@ -154,6 +157,21 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou } public abstract MachineBlock getMachineBlock(); + + @SideOnly(Side.CLIENT) + @Override + public IBlockState getExtendedState(IBlockState stateIn, IBlockAccess w, BlockPos pos) + { + if(stateIn.getBlock() == null || stateIn.getBlock().getMaterial() == Material.air) + { + return stateIn; + } + + IExtendedBlockState state = (IExtendedBlockState)stateIn; + CTMBlockRenderContext ctx = new CTMBlockRenderContext(w, pos); + + return state.withProperty(BlockStateBasic.ctmProperty, ctx); + } public BlockState createBlockState() { @@ -220,88 +238,6 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou } } -/* - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister register) - { - BASE_ICON = register.registerIcon("mekanism:SteelCasing"); - DefIcon def = DefIcon.getAll(BASE_ICON).setOverrides(false); - - switch(blockType) - { - 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, "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, "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, "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, "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; - MekanismRenderer.loadDynamicTextures(register, "formulaic_assemblicator/" + MachineType.FORMULAIC_ASSEMBLICATOR.name, icons[5]); - MekanismRenderer.loadDynamicTextures(register, "fuelwood_heater/" + MachineType.FUELWOOD_HEATER.name, icons[6]); - - break; - } - } - - @Override - public IIcon getIcon(ItemStack stack, int side) - { - MachineType type = MachineType.get(stack); - ItemBlockMachine item = (ItemBlockMachine)stack.getItem(); - - if(type == MachineType.BASIC_FACTORY) - { - return factoryIcons[0][item.getRecipeType(stack)][side]; - } - else if(type == MachineType.ADVANCED_FACTORY) - { - return factoryIcons[1][item.getRecipeType(stack)][side]; - } - else if(type == MachineType.ELITE_FACTORY) - { - return factoryIcons[2][item.getRecipeType(stack)][side]; - } - - return getIcon(side, stack.getItemDamage()); - } -*/ - @Override public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { @@ -448,107 +384,6 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou return 0; } -/* - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) - { - switch(blockType) - { - case MACHINE_BLOCK_1: - switch(meta) - { - case 0: - case 1: - case 2: - case 3: - case 9: - case 10: - return icons[meta][side]; - default: - return icons[meta][0] != null ? icons[meta][0] : BASE_ICON; - } - case MACHINE_BLOCK_2: - switch(meta) - { - case 3: - case 5: - return icons[meta][side]; - default: - return icons[meta][0] != null ? icons[meta][0] : BASE_ICON; - } - case MACHINE_BLOCK_3: - switch(meta) - { - case 3: - case 5: - case 6: - return icons[meta][side]; - default: - return icons[meta][0] != null ? icons[meta][0] : BASE_ICON; - } - default: - return BASE_ICON; - } - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess world, BlockPos pos, int side) - { - int meta = world.getBlockMetadata(pos); - TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(pos); - - switch(blockType) - { - case MACHINE_BLOCK_1: - switch(meta) - { - case 0: - case 1: - case 2: - case 3: - case 9: - case 10: - boolean active = MekanismUtils.isActive(world, pos); - return icons[meta][MekanismUtils.getBaseOrientation(side, tileEntity.facing)+(active ? 6 : 0)]; - case 5: - case 6: - case 7: - TileEntityFactory factory = (TileEntityFactory)tileEntity; - active = MekanismUtils.isActive(world, pos); - - return factoryIcons[factory.tier.ordinal()][factory.recipeType.ordinal()][MekanismUtils.getBaseOrientation(side, tileEntity.facing)+(active ? 6 : 0)]; - default: - return icons[meta][0]; - } - case MACHINE_BLOCK_2: - switch(meta) - { - case 3: - case 5: - boolean active = MekanismUtils.isActive(world, pos); - return icons[meta][MekanismUtils.getBaseOrientation(side, tileEntity.facing)+(active ? 6 : 0)]; - default: - return icons[meta][0]; - } - case MACHINE_BLOCK_3: - 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: - return icons[meta][0]; - } - } - - return null; - } -*/ - @Override public int damageDropped(IBlockState state) { @@ -1274,22 +1109,4 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou return 0; } -/* - @Override - public CTMData getCTMData(IBlockAccess world, BlockPos pos, int meta) - { - if(ctms[meta][1] != null && MekanismUtils.isActive(world, pos)) - { - return ctms[meta][1]; - } - - return ctms[meta][0]; - } - - @Override - public boolean shouldRenderBlock(IBlockAccess world, BlockPos pos, int meta) - { - return !MachineType.get(this, meta).hasModel; - }*/ - } diff --git a/src/main/java/mekanism/common/block/states/BlockStateBasic.java b/src/main/java/mekanism/common/block/states/BlockStateBasic.java index 2a61f562c..c0ad482c2 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateBasic.java +++ b/src/main/java/mekanism/common/block/states/BlockStateBasic.java @@ -1,5 +1,6 @@ package mekanism.common.block.states; +import mekanism.client.render.ctm.PropertyCTMRenderContext; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.Tier.BaseTier; @@ -44,10 +45,11 @@ public class BlockStateBasic extends ExtendedBlockState { public static final PropertyBool activeProperty = PropertyBool.create("active"); public static final PropertyEnum tierProperty = PropertyEnum.create("tier", BaseTier.class); + public static final PropertyCTMRenderContext ctmProperty = new PropertyCTMRenderContext(); public BlockStateBasic(BlockBasic block, PropertyEnum typeProperty) { - super(block, new IProperty[] {BlockStateFacing.facingProperty, typeProperty, activeProperty, tierProperty}, new IUnlistedProperty[] {BlockBasic.ctmProperty}); + super(block, new IProperty[] {BlockStateFacing.facingProperty, typeProperty, activeProperty, tierProperty}, new IUnlistedProperty[] {BlockStateBasic.ctmProperty}); } public static enum BasicBlock @@ -97,7 +99,7 @@ public class BlockStateBasic extends ExtendedBlockState DYNAMIC_VALVE(BasicBlock.BASIC_BLOCK_1, 11, "DynamicValve", TileEntityDynamicValve.class, false, Predicates.alwaysFalse(), false, false), COPPER_BLOCK(BasicBlock.BASIC_BLOCK_1, 12, "CopperBlock", null, false, Predicates.alwaysFalse(), false, false), TIN_BLOCK(BasicBlock.BASIC_BLOCK_1, 13, "TinBlock", null, false, Predicates.alwaysFalse(), false, false), - THERMAL_EVAPORATION_CONTROLLER(BasicBlock.BASIC_BLOCK_1, 14, "ThermalEvaporationController", TileEntityThermalEvaporationController.class, false, Plane.HORIZONTAL, true, false), + THERMAL_EVAPORATION_CONTROLLER(BasicBlock.BASIC_BLOCK_1, 14, "ThermalEvaporationController", TileEntityThermalEvaporationController.class, false, Predicates.alwaysFalse(), false, false), THERMAL_EVAPORATION_VALVE(BasicBlock.BASIC_BLOCK_1, 15, "ThermalEvaporationValve", TileEntityThermalEvaporationValve.class, false, Predicates.alwaysFalse(), false, false), THERMAL_EVAPORATION_BLOCK(BasicBlock.BASIC_BLOCK_2, 0, "ThermalEvaporationBlock", TileEntityThermalEvaporationBlock.class, false, Predicates.alwaysFalse(), false, false), INDUCTION_CASING(BasicBlock.BASIC_BLOCK_2, 1, "InductionCasing", TileEntityInductionCasing.class, false, Predicates.alwaysFalse(), false, false), diff --git a/src/main/java/mekanism/common/block/states/BlockStateMachine.java b/src/main/java/mekanism/common/block/states/BlockStateMachine.java index 825caa203..4a4a430ab 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateMachine.java +++ b/src/main/java/mekanism/common/block/states/BlockStateMachine.java @@ -55,6 +55,7 @@ import mekanism.common.tile.TileEntitySolarNeutronActivator; import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.util.LangUtils; import net.minecraft.block.Block; +import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.IBlockState; @@ -66,11 +67,13 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing.Plane; import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.property.ExtendedBlockState; +import net.minecraftforge.common.property.IUnlistedProperty; import com.google.common.base.Predicate; import com.google.common.base.Predicates; -public class BlockStateMachine extends BlockStateFacing +public class BlockStateMachine extends ExtendedBlockState { public static final PropertyBool activeProperty = PropertyBool.create("active"); public static final PropertyEnum tierProperty = PropertyEnum.create("tier", BaseTier.class); @@ -78,7 +81,7 @@ public class BlockStateMachine extends BlockStateFacing public BlockStateMachine(BlockMachine block, PropertyEnum typeProperty) { - super(block, typeProperty, activeProperty, tierProperty, recipeProperty); + super(block, new IProperty[] {BlockStateFacing.facingProperty, typeProperty, activeProperty, tierProperty, recipeProperty}, new IUnlistedProperty[] {BlockStateBasic.ctmProperty}); } public static enum MachineBlock @@ -423,7 +426,7 @@ public class BlockStateMachine extends BlockStateFacing if(type.hasRotations()) { - EnumFacing facing = state.getValue(facingProperty); + EnumFacing facing = state.getValue(BlockStateFacing.facingProperty); if(type.canRotateTo(facing)) { @@ -432,7 +435,7 @@ public class BlockStateMachine extends BlockStateFacing builder.append(","); } - builder.append(facingProperty.getName()); + builder.append(BlockStateFacing.facingProperty.getName()); builder.append("="); builder.append(facing.getName()); } diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java index cbda51daf..fd4200816 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java @@ -71,6 +71,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva public boolean updatedThisTick = false; public int clientSolarAmount; + public boolean clientStructured; public boolean cacheStructure = false; @@ -187,14 +188,13 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva { if(!updatedThisTick) { - boolean prev = structured; - clearStructure(); structured = buildStructure(); - if(structured != prev) + if(structured != clientStructured) { Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); + clientStructured = structured; } if(structured) @@ -583,8 +583,6 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva outputTank.setFluid(null); } - boolean prev = structured; - structured = dataStream.readBoolean(); controllerConflict = dataStream.readBoolean(); clientSolarAmount = dataStream.readInt(); @@ -595,10 +593,10 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva lastGain = dataStream.readFloat(); totalLoss = dataStream.readFloat(); - if(structured != prev) + if(structured != clientStructured) { inputTank.setCapacity(getMaxFluid()); - worldObj.markBlockRangeForRenderUpdate(getPos(), getPos().add(1,1,1)); + MekanismUtils.updateBlock(worldObj, getPos()); if(structured) { @@ -610,9 +608,9 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva } }); } + + clientStructured = structured; } - - MekanismUtils.updateBlock(worldObj, getPos()); } @Override diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 08e9ff4d1..8023e1961 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -838,7 +838,7 @@ public final class MekanismUtils { if(!(world.getTileEntity(pos) instanceof IActiveState) || ((IActiveState)world.getTileEntity(pos)).renderUpdate()) { - world.markBlockRangeForRenderUpdate(pos, pos); + world.markBlockRangeForRenderUpdate(pos, pos.add(1, 1, 1)); } if(!(world.getTileEntity(pos) instanceof IActiveState) || ((IActiveState)world.getTileEntity(pos)).lightUpdate() && client.machineEffects) diff --git a/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_controller.json b/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_controller.json index dcf74a220..5e49fc919 100644 --- a/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_controller.json +++ b/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_controller.json @@ -8,12 +8,7 @@ } }, "variants": { - "facing": { - "north": {}, - "south": {"y": 180}, - "east": {"y": 90}, - "west": {"y": -90} - }, + "normal": [{}], "inventory": [{}] } } From 730ee4e4508c082ee2ecb541fe9d1332331ab4d7 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 10 May 2016 15:38:12 -0400 Subject: [PATCH 09/22] Loads and loads of render work. I can see the light at the end of the tunnel - Finished CTM - BasicBlock item rendering - Balloon item rendering - Plastic Fence item rendering - Started work on Portable Tank fluid item rendering - Fixed Obsidian TNT and Bin rendering --- .../java/mekanism/client/ClientProxy.java | 309 +++++++++++++++--- .../client/render/ctm/CTMRegistry.java | 2 +- .../entity/RenderObsidianTNTPrimed.java | 65 ++-- .../client/render/item/BakedFluidModel.java | 126 +++++++ .../render/item/FluidTankItemModel.java | 82 +++++ .../client/render/tileentity/RenderBin.java | 33 +- .../java/mekanism/common/CommonProxy.java | 15 +- src/main/java/mekanism/common/Mekanism.java | 2 +- .../java/mekanism/common/MekanismBlocks.java | 181 +--------- .../mekanism/common/block/BlockBasic.java | 7 +- .../common/block/states/BlockStateBasic.java | 2 +- .../mekanism/common/item/ItemBalloon.java | 18 +- .../mekanism/tools/common/ToolsItems.java | 49 ++- .../tools/item/ItemMekanismArmor.java | 12 +- .../mekanism/blockstates/PlasticFence.json | 16 +- .../mekanism/blockstates/bin_advanced.json | 36 ++ .../blockstates/{bin.json => bin_basic.json} | 3 +- .../mekanism/blockstates/bin_elite.json | 36 ++ .../mekanism/blockstates/bin_ultimate.json | 36 ++ .../mekanism/blockstates/fluid_tank.json | 6 +- .../mekanism/blockstates/induction_port.json | 2 +- .../mekanism/blockstates/security_desk.json | 4 - .../thermal_evaporation_controller.json | 6 + .../models/block/chemical_washer.json | 2 +- .../models/block/fluid_tank/fluid_0.json | 18 + .../models/block/metallurgic_infuser.json | 2 +- .../mekanism/models/block/security_desk.json | 2 +- .../mekanism/models/entity/balloon.json | 54 +-- .../assets/mekanism/models/item/Balloon.json | 14 +- .../textures/blocks/SalinationBlock.png | Bin 1455 -> 0 bytes .../textures/blocks/SalinationController.png | Bin 1454 -> 0 bytes .../blocks/SalinationControllerOn.png | Bin 1531 -> 0 bytes .../blocks/SalinationControllerOn.png.mcmeta | 5 - .../textures/blocks/SalinationValve.png | Bin 1495 -> 0 bytes .../textures/blocks/SteelBlock_Oxidized.png | Bin 1529 -> 0 bytes .../mekanism/textures/blocks/Teleporter.png | Bin 1834 -> 0 bytes .../textures/blocks/TeleporterFrame.png | Bin 1695 -> 0 bytes .../textures/blocks/TeleporterFront.png | Bin 1648 -> 0 bytes ...t_input-ctm.png => induction_port-ctm.png} | Bin ...tion_port_input.png => induction_port.png} | Bin .../mekanism/textures/entities/Balloon.png | Bin 0 -> 1952 bytes 41 files changed, 759 insertions(+), 386 deletions(-) create mode 100644 src/main/java/mekanism/client/render/item/BakedFluidModel.java create mode 100644 src/main/java/mekanism/client/render/item/FluidTankItemModel.java create mode 100644 src/main/resources/assets/mekanism/blockstates/bin_advanced.json rename src/main/resources/assets/mekanism/blockstates/{bin.json => bin_basic.json} (89%) create mode 100644 src/main/resources/assets/mekanism/blockstates/bin_elite.json create mode 100644 src/main/resources/assets/mekanism/blockstates/bin_ultimate.json create mode 100644 src/main/resources/assets/mekanism/models/block/fluid_tank/fluid_0.json delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/SalinationBlock.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/SalinationController.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png.mcmeta delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/SalinationValve.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/SteelBlock_Oxidized.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/Teleporter.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/TeleporterFrame.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/TeleporterFront.png rename src/main/resources/assets/mekanism/textures/blocks/ctm/{induction_port_input-ctm.png => induction_port-ctm.png} (100%) rename src/main/resources/assets/mekanism/textures/blocks/ctm/{induction_port_input.png => induction_port.png} (100%) create mode 100644 src/main/resources/assets/mekanism/textures/entities/Balloon.png diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 730151799..212cb0101 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -1,10 +1,14 @@ package mekanism.client; import java.io.File; +import java.io.IOException; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import mekanism.api.Coord4D; +import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.client; import mekanism.api.MekanismConfig.general; import mekanism.api.Pos3D; @@ -71,6 +75,7 @@ import mekanism.client.render.entity.RenderBalloon; import mekanism.client.render.entity.RenderFlame; import mekanism.client.render.entity.RenderObsidianTNTPrimed; import mekanism.client.render.entity.RenderRobit; +import mekanism.client.render.item.FluidTankItemModel; import mekanism.client.render.tileentity.RenderBin; import mekanism.client.render.tileentity.RenderChargepad; import mekanism.client.render.tileentity.RenderChemicalCrystallizer; @@ -101,16 +106,27 @@ import mekanism.client.render.tileentity.RenderThermalEvaporationController; import mekanism.client.render.tileentity.RenderThermoelectricBoiler; import mekanism.common.CommonProxy; import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; +import mekanism.common.Tier.BaseTier; +import mekanism.common.Tier.EnergyCubeTier; +import mekanism.common.Tier.GasTankTier; +import mekanism.common.base.IEnergyCube; +import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; +import mekanism.common.block.states.BlockStateBasic.BasicBlockType; import mekanism.common.block.states.BlockStateMachine.MachineType; +import mekanism.common.block.states.BlockStateOre.EnumOreType; import mekanism.common.entity.EntityBabySkeleton; import mekanism.common.entity.EntityBalloon; import mekanism.common.entity.EntityFlame; import mekanism.common.entity.EntityObsidianTNT; import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.InventoryPersonalChest; +import mekanism.common.item.ItemBlockBasic; +import mekanism.common.item.ItemBlockGasTank; +import mekanism.common.item.ItemBlockMachine; import mekanism.common.item.ItemCraftingFormula; import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.item.ItemSeismicReader; @@ -179,6 +195,7 @@ import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderSkeleton; +import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.client.resources.model.ModelBakery; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.monster.EntitySkeleton; @@ -189,7 +206,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.FMLClientHandler; @@ -197,6 +216,7 @@ import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.client.registry.IRenderFactory; import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; @@ -211,6 +231,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ClientProxy extends CommonProxy { public static Map machineResources = new HashMap(); + public static Map basicResources = new HashMap(); + + public static ModelResourceLocation TANK_MODEL = new ModelResourceLocation("mekanism:fluid_tank", "inventory"); @Override public void loadConfiguration() @@ -236,14 +259,6 @@ public class ClientProxy extends CommonProxy } } -/* - @Override - public int getArmorIndex(String string) - { - return RenderingRegistry.addNewArmourRendererPrefix(string); - } -*/ - @Override public void openPersonalChest(EntityPlayer entityplayer, int id, int windowId, boolean isBlock, BlockPos pos) { @@ -329,42 +344,8 @@ public class ClientProxy extends CommonProxy } @Override - public void registerRenderInformation() + public void registerItemRenders() { -//TODO RenderPartTransmitter.init(); -//TODO RenderGlowPanel.init(); - - //Register item handler -//TODO ItemRenderingHandler handler = new ItemRenderingHandler(); - -/*TODO - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.EnergyCube), handler); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.MachineBlock), handler); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), handler); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), handler); - MinecraftForgeClient.registerItemRenderer(MekanismItems.Robit, handler); - MinecraftForgeClient.registerItemRenderer(MekanismItems.WalkieTalkie, handler); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.GasTank), handler); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.ObsidianTNT), handler); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.BasicBlock), handler); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.BasicBlock2), handler); - MinecraftForgeClient.registerItemRenderer(MekanismItems.Jetpack, handler); - MinecraftForgeClient.registerItemRenderer(MekanismItems.ArmoredJetpack, handler); - MinecraftForgeClient.registerItemRenderer(MekanismItems.PartTransmitter, handler); - MinecraftForgeClient.registerItemRenderer(MekanismItems.GasMask, handler); - MinecraftForgeClient.registerItemRenderer(MekanismItems.ScubaTank, handler); - MinecraftForgeClient.registerItemRenderer(MekanismItems.Balloon, handler); - MinecraftForgeClient.registerItemRenderer(MekanismItems.FreeRunners, handler); - MinecraftForgeClient.registerItemRenderer(MekanismItems.AtomicDisassembler, handler); - MinecraftForgeClient.registerItemRenderer(MekanismItems.GlowPanel, handler); - MinecraftForgeClient.registerItemRenderer(MekanismItems.Flamethrower, handler); - - //Register block handlers - RenderingRegistry.registerBlockHandler(new MachineRenderingHandler()); - RenderingRegistry.registerBlockHandler(new BasicRenderingHandler()); - RenderingRegistry.registerBlockHandler(new PlasticRenderingHandler()); - RenderingRegistry.registerBlockHandler(new CTMRenderingHandler()); -*/ // registerItemRender(MekanismItems.PartTransmitter); registerItemRender(MekanismItems.ElectricBow); registerItemRender(MekanismItems.Dust); @@ -428,8 +409,236 @@ public class ClientProxy extends CommonProxy ModelBakery.registerItemVariants(MekanismItems.CraftingFormula, ItemCraftingFormula.MODEL, ItemCraftingFormula.INVALID_MODEL, ItemCraftingFormula.ENCODED_MODEL); + } + + @Override + public void registerBlockRenders() + { + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.ObsidianTNT), 0, new ModelResourceLocation("mekanism:ObsidianTNT", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.SaltBlock), 0, new ModelResourceLocation("mekanism:SaltBlock", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.CardboardBox), 0, new ModelResourceLocation("mekanism:CardboardBox", "storage=false")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.CardboardBox), 1, new ModelResourceLocation("mekanism:CardboardBox", "storage=true")); - Mekanism.logger.info("Render registrations complete."); + for(MachineType type : MachineType.values()) + { + List modelsToAdd = new ArrayList(); + String resource = "mekanism:" + type.getName(); + RecipeType recipePointer = null; + + if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) + { + recipePointer = RecipeType.values()[0]; + resource = "mekanism:" + type.getName() + "_" + recipePointer.getName(); + } + + while(true) + { + if(machineResources.get(resource) == null) + { + List entries = new ArrayList(); + + if(type.hasActiveTexture()) + { + entries.add("active=false"); + } + + if(type.hasRotations()) + { + entries.add("facing=north"); + } + + String properties = new String(); + + for(int i = 0; i < entries.size(); i++) + { + properties += entries.get(i); + + if(i < entries.size()-1) + { + properties += ","; + } + } + + if(type == MachineType.FLUID_TANK) + { + properties = "inventory"; + } + + ModelResourceLocation model = new ModelResourceLocation(resource, properties); + + machineResources.put(resource, model); + modelsToAdd.add(model); + + if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) + { + if(recipePointer.ordinal() < RecipeType.values().length-1) + { + recipePointer = RecipeType.values()[recipePointer.ordinal()+1]; + resource = "mekanism:" + type.getName() + "_" + recipePointer.getName(); + + continue; + } + } + } + + break; + } + + ModelLoader.registerItemVariants(Item.getItemFromBlock(type.typeBlock.getBlock()), modelsToAdd.toArray(new ModelResourceLocation[] {})); + } + + for(BasicBlockType type : BasicBlockType.values()) + { + List modelsToAdd = new ArrayList(); + String resource = "mekanism:" + type.getName(); + BaseTier tierPointer = null; + + if(type.tiers) + { + tierPointer = BaseTier.values()[0]; + resource = "mekanism:" + type.getName() + "_" + tierPointer.getName(); + } + + while(true) + { + if(machineResources.get(resource) == null) + { + List entries = new ArrayList(); + + if(type.hasActiveTexture()) + { + entries.add("active=false"); + } + + if(type.hasRotations() || type == BasicBlockType.THERMAL_EVAPORATION_CONTROLLER) + { + entries.add("facing=north"); + } + + String properties = new String(); + + for(int i = 0; i < entries.size(); i++) + { + properties += entries.get(i); + + if(i < entries.size()-1) + { + properties += ","; + } + } + + ModelResourceLocation model = new ModelResourceLocation(resource, properties); + + basicResources.put(resource, model); + modelsToAdd.add(model); + + if(type.tiers) + { + if(tierPointer.ordinal() < BaseTier.values().length-1) + { + tierPointer = BaseTier.values()[tierPointer.ordinal()+1]; + resource = "mekanism:" + type.getName() + "_" + tierPointer.getName(); + + continue; + } + } + } + + break; + } + + ModelLoader.registerItemVariants(Item.getItemFromBlock(type.blockType.getBlock()), modelsToAdd.toArray(new ModelResourceLocation[] {})); + } + + for(EnumColor color : EnumColor.DYES) + { + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.PlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=plastic")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.SlickPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=slick")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.GlowPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=glow")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.ReinforcedPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=reinforced")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.RoadPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=road")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.PlasticFence), color.getMetaValue(), new ModelResourceLocation("mekanism:PlasticFence", "inventory")); + } + + for(EnumOreType ore : EnumOreType.values()) + { + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.OreBlock), ore.ordinal(), new ModelResourceLocation("mekanism:OreBlock", "type=" + ore.getName())); + } + + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.EnergyCube), new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) + { + EnergyCubeTier tier = ((IEnergyCube)stack.getItem()).getEnergyCubeTier(stack); + ResourceLocation baseLocation = new ResourceLocation("mekanism", "EnergyCube"); + + return new ModelResourceLocation(baseLocation, "facing=north,tier="+tier); + } + }); + + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.GasTank), new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) + { + GasTankTier tier = GasTankTier.values()[((ItemBlockGasTank)stack.getItem()).getBaseTier(stack).ordinal()]; + ResourceLocation baseLocation = new ResourceLocation("mekanism", "GasTank"); + + return new ModelResourceLocation(baseLocation, "facing=north,tier="+tier); + } + }); + + ItemMeshDefinition machineMesher = new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) + { + MachineType type = MachineType.get(stack); + + if(type != null) + { + String resource = "mekanism:" + type.getName(); + + if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) + { + RecipeType recipe = RecipeType.values()[((ItemBlockMachine)stack.getItem()).getRecipeType(stack)]; + resource = "mekanism:" + type.getName() + "_" + recipe.getName(); + } + + return machineResources.get(resource); + } + + return null; + } + }; + + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock), machineMesher); + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), machineMesher); + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), machineMesher); + + ItemMeshDefinition basicMesher = new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) + { + BasicBlockType type = BasicBlockType.get(stack); + + if(type != null) + { + String resource = "mekanism:" + type.getName(); + + if(type.tiers) + { + BaseTier tier = ((ItemBlockBasic)stack.getItem()).getBaseTier(stack); + resource = "mekanism:" + type.getName() + "_" + tier.getName(); + } + + return basicResources.get(resource); + } + + return null; + } + }; + + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.BasicBlock), basicMesher); + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.BasicBlock2), basicMesher); } public void registerItemRender(Item item) @@ -642,6 +851,17 @@ public class ClientProxy extends CommonProxy HolidayManager.init(); } + + /* @SubscribeEvent + public void onModelBake(ModelBakeEvent event) throws IOException + { + Object obj = event.modelRegistry.getObject(TANK_MODEL); + + if(obj instanceof IBakedModel) + { + event.modelRegistry.putObject(TANK_MODEL, new FluidTankItemModel((IBakedModel)obj)); + } + }*/ @Override public void preInit() @@ -649,6 +869,7 @@ public class ClientProxy extends CommonProxy MekanismRenderer.init(); MinecraftForge.EVENT_BUS.register(new CTMRegistry()); + MinecraftForge.EVENT_BUS.register(this); //Register entity rendering handlers RenderingRegistry.registerEntityRenderingHandler(EntityObsidianTNT.class, new IRenderFactory() { diff --git a/src/main/java/mekanism/client/render/ctm/CTMRegistry.java b/src/main/java/mekanism/client/render/ctm/CTMRegistry.java index bf0142cc9..d264b9d8d 100644 --- a/src/main/java/mekanism/client/render/ctm/CTMRegistry.java +++ b/src/main/java/mekanism/client/render/ctm/CTMRegistry.java @@ -26,7 +26,7 @@ public class CTMRegistry private IBakedModel baseModel; public static ResourceLocation baseResource = new ResourceLocation("mekanism:block/ctm_block"); - public static String[] ctmTypes = new String[] {"dynamic_tank", "structural_glass", "dynamic_valve", "teleporter", "teleporter_frame", "induction_casing", "induction_port_input", "induction_port_output", + public static String[] ctmTypes = new String[] {"dynamic_tank", "structural_glass", "dynamic_valve", "teleporter", "teleporter_frame", "induction_casing", "induction_port", "induction_port_output", "induction_cell_basic", "induction_cell_advanced", "induction_cell_elite", "induction_cell_ultimate", "induction_provider_basic", "induction_provider_advanced", "induction_provider_elite", "induction_provider_ultimate", "thermal_evaporation_controller", "thermal_evaporation_controller_on", "thermal_evaporation_valve", "superheating_element", "superheating_element_on", "reactor_port", "reactor_neutron_capture", "reactor_logic_adapter", "reactor_laser_focus", "reactor_glass", "reactor_frame", "reactor_controller_on", "reactor_controller_off", "boiler_casing", "boiler_valve", diff --git a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java index 9c514f7a4..267705634 100644 --- a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java +++ b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java @@ -1,25 +1,23 @@ package mekanism.client.render.entity; -import mekanism.client.model.ModelObsidianTNT; +import mekanism.common.MekanismBlocks; import mekanism.common.entity.EntityObsidianTNT; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; - +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BlockRendererDispatcher; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderObsidianTNTPrimed extends Render { - private ModelObsidianTNT model = new ModelObsidianTNT(); - public RenderObsidianTNTPrimed(RenderManager renderManager) { super(renderManager); @@ -27,36 +25,27 @@ public class RenderObsidianTNTPrimed extends Render } @Override - public void doRender(EntityObsidianTNT entityobsidiantnt, double x, double y, double z, float f, float f1) + public void doRender(EntityObsidianTNT entityobsidiantnt, double x, double y, double z, float entityYaw, float partialTicks) { + BlockRendererDispatcher renderer = Minecraft.getMinecraft().getBlockRendererDispatcher(); GL11.glPushMatrix(); - GL11.glTranslatef((float)x, (float)y+1.2F, (float)z); - GL11.glScalef(0.8F, 0.8F, 0.8F); - GL11.glRotatef(180, 1, 0, 0); + GL11.glTranslatef((float)x, (float)y+0.5F, (float)z); - if((entityobsidiantnt.fuse - f1) + 1.0F < 10F) - { - float scale = 1.0F - ((entityobsidiantnt.fuse - f1) + 1.0F) / 10F; + if(entityobsidiantnt.fuse - partialTicks + 1.0F < 10.0F) + { + float f = 1.0F - (entityobsidiantnt.fuse - partialTicks + 1.0F) / 10.0F; + f = MathHelper.clamp_float(f, 0.0F, 1.0F); + f = f * f; + f = f * f; + float f1 = 1.0F + f * 0.3F; + GlStateManager.scale(f1, f1, f1); + } - if(scale < 0.0F) - { - scale = 0.0F; - } - - if(scale > 1.0F) - { - scale = 1.0F; - } - - scale *= scale; - scale *= scale; - float renderScale = 1.0F + scale * 0.3F; - GL11.glScalef(renderScale, renderScale, renderScale); - } - - float f3 = (1.0F - ((entityobsidiantnt.fuse - f1) + 1.0F) / 100F) * 0.8F; - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ObsidianTNT.png")); - model.render(0.0625F); + float f3 = (1.0F - ((entityobsidiantnt.fuse - partialTicks) + 1.0F) / 100F) * 0.8F; + bindEntityTexture(entityobsidiantnt); + GlStateManager.translate(-0.5F, -0.5F, 0.5F); + renderer.renderBlockBrightness(MekanismBlocks.ObsidianTNT.getDefaultState(), entityobsidiantnt.getBrightness(partialTicks)); + GlStateManager.translate(0.0F, 0.0F, 1.0F); if(entityobsidiantnt.fuse / 5 % 2 == 0) { @@ -65,7 +54,11 @@ public class RenderObsidianTNTPrimed extends Render GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_DST_ALPHA); GL11.glColor4f(1.0F, 1.0F, 1.0F, f3); - model.render(0.0625F); + GlStateManager.doPolygonOffset(-3.0F, -3.0F); + GlStateManager.enablePolygonOffset(); + renderer.renderBlockBrightness(MekanismBlocks.ObsidianTNT.getDefaultState(), 1.0F); + GlStateManager.doPolygonOffset(0.0F, 0.0F); + GlStateManager.disablePolygonOffset(); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glDisable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_LIGHTING); diff --git a/src/main/java/mekanism/client/render/item/BakedFluidModel.java b/src/main/java/mekanism/client/render/item/BakedFluidModel.java new file mode 100644 index 000000000..131ced2b8 --- /dev/null +++ b/src/main/java/mekanism/client/render/item/BakedFluidModel.java @@ -0,0 +1,126 @@ +package mekanism.client.render.item; + +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; + +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.util.EnumFacing; + +public class BakedFluidModel implements IBakedModel +{ + public static final int STAGES = 16; + + public static final HashMap[] MODELS = new HashMap[STAGES]; + + static + { + for(int x = 0; x < STAGES; x++) + { + MODELS[x] = new HashMap(); + } + } + + private IBakedModel baseModel; + private String fluidName; + private int fluidLevel; + private boolean cullFluidTop; + + public BakedFluidModel(IBakedModel model, String id, int level, boolean cullTop) + { + baseModel = model; + fluidName = id; + fluidLevel = level; + cullFluidTop = cullTop; + } + + @Override + public List getFaceQuads(EnumFacing facing) + { + List faceQuads = new LinkedList(); + + faceQuads.addAll(baseModel.getFaceQuads(facing)); + + if(fluidLevel > 0 && fluidLevel <= STAGES) + { + HashMap fluidModels = MODELS[fluidLevel - 1]; + + if(fluidModels.containsKey(fluidName)) + { + faceQuads.addAll(fluidModels.get(fluidName).getFaceQuads(facing)); + } + } + + return faceQuads; + } + + @Override + public List getGeneralQuads() + { + List generalQuads = new LinkedList(); + + generalQuads.addAll(baseModel.getGeneralQuads()); + + if(fluidLevel > 0 && fluidLevel <= STAGES) + { + HashMap fluidModels = MODELS[fluidLevel - 1]; + + if(fluidModels.containsKey(fluidName)) + { + // The fluid model needs a separate culling logic from the rest of the tank, + // because the top of the fluid is supposed to be visible if the tank block + // above is empty. (getGeneralQuads() handles quads that don't have a cullface + // annotation in the .json) + + if(cullFluidTop) + { + for(BakedQuad quad : fluidModels.get(fluidName).getGeneralQuads()) + { + if(quad.getFace() != EnumFacing.UP) + { + generalQuads.add(quad); + } + } + } + else { + generalQuads.addAll(fluidModels.get(fluidName).getGeneralQuads()); + } + } + } + + return generalQuads; + } + + @Override + public boolean isAmbientOcclusion() + { + return baseModel.isAmbientOcclusion(); + } + + @Override + public boolean isGui3d() + { + return baseModel.isGui3d(); + } + + @Override + public boolean isBuiltInRenderer() + { + return baseModel.isBuiltInRenderer(); + } + + @Override + public TextureAtlasSprite getParticleTexture() + { + return baseModel.getParticleTexture(); + } + + @Override + public ItemCameraTransforms getItemCameraTransforms() + { + return baseModel.getItemCameraTransforms(); + } +} \ No newline at end of file diff --git a/src/main/java/mekanism/client/render/item/FluidTankItemModel.java b/src/main/java/mekanism/client/render/item/FluidTankItemModel.java new file mode 100644 index 000000000..1a5b38fbe --- /dev/null +++ b/src/main/java/mekanism/client/render/item/FluidTankItemModel.java @@ -0,0 +1,82 @@ +package mekanism.client.render.item; + +import java.util.HashMap; +import java.util.List; + +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.client.model.ISmartItemModel; + +public class FluidTankItemModel implements ISmartItemModel +{ + public static final int STAGES = 16; + + public static final HashMap[] MODELS = new HashMap[STAGES]; + + static + { + for(int x = 0; x < STAGES; x++) + { + MODELS[x] = new HashMap(); + } + } + + private IBakedModel baseModel; + + public FluidTankItemModel(IBakedModel base) + { + baseModel = base; + } + + @Override + public IBakedModel handleItemState(ItemStack stack) + { + return null; + } + + @Override + public List getFaceQuads(EnumFacing p_177551_1_) + { + throw new UnsupportedOperationException(); + } + + @Override + public List getGeneralQuads() + { + throw new UnsupportedOperationException(); + } + + @Override + public boolean isAmbientOcclusion() + { + throw new UnsupportedOperationException(); + } + + @Override + public boolean isGui3d() + { + throw new UnsupportedOperationException(); + } + + @Override + public boolean isBuiltInRenderer() + { + throw new UnsupportedOperationException(); + } + + @Override + public TextureAtlasSprite getParticleTexture() + { + throw new UnsupportedOperationException(); + } + + @Override + public ItemCameraTransforms getItemCameraTransforms() + { + throw new UnsupportedOperationException(); + } +} diff --git a/src/main/java/mekanism/client/render/tileentity/RenderBin.java b/src/main/java/mekanism/client/render/tileentity/RenderBin.java index 59a9d3989..ba3a0e064 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderBin.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderBin.java @@ -5,19 +5,15 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityBin; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraft.world.EnumSkyBlock; -import net.minecraft.world.World; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderBin extends TileEntitySpecialRenderer { @@ -41,8 +37,7 @@ public class RenderBin extends TileEntitySpecialRenderer return; } - doLight(tileEntity.getWorld(), obj); - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240); + MekanismRenderer.glowOn(); if(itemStack != null) { @@ -70,15 +65,11 @@ public class RenderBin extends TileEntitySpecialRenderer float scale = 0.03125F; float scaler = 0.9F; - GL11.glScalef(scale*scaler, scale*scaler, 0); + GL11.glScalef(scale*scaler, scale*scaler, -0.0001F); GL11.glRotatef(180, 0, 0, 1); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); - renderItem.renderItemAndEffectIntoGUI(itemStack, 0, 0); - GL11.glEnable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } @@ -87,21 +78,7 @@ public class RenderBin extends TileEntitySpecialRenderer renderText(amount, tileEntity.facing, 0.02F, x, y - 0.31F, z); } - } - - private void doLight(World world, Coord4D obj) - { - if(obj.getBlockState(world).getBlock().isOpaqueCube()) - { - return; - } - - int brightness = world.getLightFromNeighborsFor(EnumSkyBlock.SKY, obj.getPos()); - int lightX = brightness % 65536; - int lightY = brightness / 65536; - float scale = 0.6F; - - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightX * scale, lightY * scale); + MekanismRenderer.glowOff(); } @SuppressWarnings("incomplete-switch") diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index cf0e0a59a..993d5d1d4 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -226,19 +226,14 @@ public class CommonProxy implements IGuiProvider public void openPersonalChest(EntityPlayer entityplayer, int id, int windowId, boolean isBlock, BlockPos pos) {} /** - * Register and load client-only render information. + * Register and load client-only item render information. */ - public void registerRenderInformation() {} - + public void registerItemRenders() {} + /** - * Gets the armor index number from ClientProxy. - * @param string - armor indicator - * @return armor index number + * Register and load client-only block render information. */ - public int getArmorIndex(String string) - { - return 0; - } + public void registerBlockRenders() {} /** * Set and load the mod's common configuration properties. diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index a6352fa8e..f36adf793 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -1379,7 +1379,7 @@ public class Mekanism packetHandler.initialize(); //Load proxy - proxy.registerRenderInformation(); + proxy.registerItemRenders(); proxy.loadUtilities(); //Completion notification diff --git a/src/main/java/mekanism/common/MekanismBlocks.java b/src/main/java/mekanism/common/MekanismBlocks.java index 65e647d23..d2bff9924 100644 --- a/src/main/java/mekanism/common/MekanismBlocks.java +++ b/src/main/java/mekanism/common/MekanismBlocks.java @@ -5,16 +5,6 @@ import static mekanism.common.block.states.BlockStateBasic.BasicBlock.BASIC_BLOC import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_1; import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_2; import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_3; - -import java.util.ArrayList; -import java.util.List; - -import mekanism.api.EnumColor; -import mekanism.client.ClientProxy; -import mekanism.common.Tier.EnergyCubeTier; -import mekanism.common.Tier.GasTankTier; -import mekanism.common.base.IEnergyCube; -import mekanism.common.base.IFactory.RecipeType; import mekanism.common.block.BlockBasic; import mekanism.common.block.BlockBounding; import mekanism.common.block.BlockCardboardBox; @@ -28,11 +18,8 @@ import mekanism.common.block.BlockPlasticFence; import mekanism.common.block.BlockPlasticFence.PlasticFenceStateMapper; import mekanism.common.block.BlockSalt; import mekanism.common.block.states.BlockStateBasic.BasicBlockStateMapper; -import mekanism.common.block.states.BlockStateBasic.BasicBlockType; import mekanism.common.block.states.BlockStateCardboardBox.CardboardBoxStateMapper; import mekanism.common.block.states.BlockStateMachine.MachineBlockStateMapper; -import mekanism.common.block.states.BlockStateMachine.MachineType; -import mekanism.common.block.states.BlockStateOre.EnumOreType; import mekanism.common.block.states.BlockStatePlastic.PlasticBlockStateMapper; import mekanism.common.block.states.BlockStatePlastic.PlasticBlockType; import mekanism.common.item.ItemBlockBasic; @@ -43,12 +30,7 @@ import mekanism.common.item.ItemBlockMachine; import mekanism.common.item.ItemBlockOre; import mekanism.common.item.ItemBlockPlastic; import net.minecraft.block.Block; -import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.statemap.IStateMapper; -import net.minecraft.client.resources.model.ModelResourceLocation; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; @@ -118,167 +100,6 @@ public class MekanismBlocks ModelLoader.setCustomStateMapper(PlasticFence, fenceMapper); ModelLoader.setCustomStateMapper(CardboardBox, boxMapper); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.ObsidianTNT), 0, new ModelResourceLocation("mekanism:ObsidianTNT", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.SaltBlock), 0, new ModelResourceLocation("mekanism:SaltBlock", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.CardboardBox), 0, new ModelResourceLocation("mekanism:CardboardBox", "storage=false")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.CardboardBox), 1, new ModelResourceLocation("mekanism:CardboardBox", "storage=true")); - - for(MachineType type : MachineType.values()) - { - List modelsToAdd = new ArrayList(); - String resource = "mekanism:" + type.getName(); - RecipeType recipePointer = null; - - if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) - { - recipePointer = RecipeType.values()[0]; - resource = "mekanism:" + type.getName() + "_" + recipePointer.getName(); - } - - while(true) - { - if(ClientProxy.machineResources.get(resource) == null) - { - List entries = new ArrayList(); - - if(type.hasActiveTexture()) - { - entries.add("active=false"); - } - - if(type.hasRotations()) - { - entries.add("facing=north"); - } - - String properties = new String(); - - for(int i = 0; i < entries.size(); i++) - { - properties += entries.get(i); - - if(i < entries.size()-1) - { - properties += ","; - } - } - - ModelResourceLocation model = new ModelResourceLocation(resource, properties); - - ClientProxy.machineResources.put(resource, model); - modelsToAdd.add(model); - - if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) - { - if(recipePointer.ordinal() < RecipeType.values().length-1) - { - recipePointer = RecipeType.values()[recipePointer.ordinal()+1]; - resource = "mekanism:" + type.getName() + "_" + recipePointer.getName(); - - continue; - } - } - } - - break; - } - - ModelLoader.registerItemVariants(Item.getItemFromBlock(type.typeBlock.getBlock()), modelsToAdd.toArray(new ModelResourceLocation[] {})); - } - - for(BasicBlockType type : BasicBlockType.values()) - { - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(type.blockType.getBlock()), type.meta, new ModelResourceLocation("mekanism:" + type.getName(), "inventory")); - } - - for(EnumColor color : EnumColor.DYES) - { - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.PlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=plastic")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.SlickPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=slick")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.GlowPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=glow")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.ReinforcedPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=reinforced")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.RoadPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=road")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.PlasticFence), color.getMetaValue(), new ModelResourceLocation("mekanism:PlasticFence", "inventory")); - } - - for(EnumOreType ore : EnumOreType.values()) - { - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.OreBlock), ore.ordinal(), new ModelResourceLocation("mekanism:OreBlock", "type=" + ore.getName())); - } - - ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.EnergyCube), new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) - { - EnergyCubeTier tier = ((IEnergyCube)stack.getItem()).getEnergyCubeTier(stack); - ResourceLocation baseLocation = new ResourceLocation("mekanism", "EnergyCube"); - - return new ModelResourceLocation(baseLocation, "facing=north,tier="+tier); - } - }); - - ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.GasTank), new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) - { - GasTankTier tier = GasTankTier.values()[((ItemBlockGasTank)stack.getItem()).getBaseTier(stack).ordinal()]; - ResourceLocation baseLocation = new ResourceLocation("mekanism", "GasTank"); - - return new ModelResourceLocation(baseLocation, "facing=north,tier="+tier); - } - }); - - ItemMeshDefinition machineMesher = new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) - { - MachineType type = MachineType.get(stack); - - if(type != null) - { - String resource = "mekanism:" + type.getName(); - - if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) - { - RecipeType recipe = RecipeType.values()[((ItemBlockMachine)stack.getItem()).getRecipeType(stack)]; - resource = "mekanism:" + type.getName() + "_" + recipe.getName(); - } - - return ClientProxy.machineResources.get(resource); - } - - return null; - } - }; - - ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock), machineMesher); - ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), machineMesher); - ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), machineMesher); - - ItemMeshDefinition basicMesher = new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) - { - MachineType type = MachineType.get(stack); - - if(type != null) - { - String resource = "mekanism:" + type.getName(); - - if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) - { - RecipeType recipe = RecipeType.values()[((ItemBlockMachine)stack.getItem()).getRecipeType(stack)]; - resource = "mekanism:" + type.getName() + "_" + recipe.getName(); - } - - return ClientProxy.machineResources.get(resource); - } - - return null; - } - }; - - //ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.BasicBlock), basicMesher); - //ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.BasicBlock2), basicMesher); + Mekanism.proxy.registerBlockRenders(); } } diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index bc1838d31..d97e9dc1d 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -176,6 +176,11 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple state = state.withProperty(BlockStateBasic.tierProperty, ((TileEntityInductionProvider)tile).tier.getBaseTier()); } + if(tile instanceof TileEntityBin) + { + state = state.withProperty(BlockStateBasic.tierProperty, ((TileEntityBin)tile).tier.getBaseTier()); + } + if(tile instanceof TileEntityInductionPort) { state = state.withProperty(BlockStateBasic.activeProperty, ((TileEntityInductionPort)tile).mode); @@ -1008,7 +1013,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple if(type == BasicBlockType.INDUCTION_PORT) { - return type.getName() + (state.getValue(BlockStateBasic.activeProperty) ? "output" : "input"); + return type.getName() + (state.getValue(BlockStateBasic.activeProperty) ? "_output" : ""); } return null; diff --git a/src/main/java/mekanism/common/block/states/BlockStateBasic.java b/src/main/java/mekanism/common/block/states/BlockStateBasic.java index c0ad482c2..9da1b0b77 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateBasic.java +++ b/src/main/java/mekanism/common/block/states/BlockStateBasic.java @@ -91,7 +91,7 @@ public class BlockStateBasic extends ExtendedBlockState COAL_BLOCK(BasicBlock.BASIC_BLOCK_1, 3, "CharcoalBlock", null, false, Predicates.alwaysFalse(), false, false), REFINED_GLOWSTONE(BasicBlock.BASIC_BLOCK_1, 4, "RefinedGlowstone", null, false, Predicates.alwaysFalse(), false, false), STEEL_BLOCK(BasicBlock.BASIC_BLOCK_1, 5, "SteelBlock", null, false, Predicates.alwaysFalse(), false, false), - BIN(BasicBlock.BASIC_BLOCK_1, 6, "Bin", TileEntityBin.class, false, Plane.HORIZONTAL, true, false), + BIN(BasicBlock.BASIC_BLOCK_1, 6, "Bin", TileEntityBin.class, false, Plane.HORIZONTAL, true, true), TELEPORTER_FRAME(BasicBlock.BASIC_BLOCK_1, 7, "TeleporterFrame", null, false, Predicates.alwaysFalse(), false, false), STEEL_CASING(BasicBlock.BASIC_BLOCK_1, 8, "SteelCasing", null, false, Predicates.alwaysFalse(), false, false), DYNAMIC_TANK(BasicBlock.BASIC_BLOCK_1, 9, "DynamicTank", TileEntityDynamicTank.class, false, Predicates.alwaysFalse(), false, false), diff --git a/src/main/java/mekanism/common/item/ItemBalloon.java b/src/main/java/mekanism/common/item/ItemBalloon.java index 70661630f..a64f2a67c 100644 --- a/src/main/java/mekanism/common/item/ItemBalloon.java +++ b/src/main/java/mekanism/common/item/ItemBalloon.java @@ -21,6 +21,8 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemBalloon extends ItemMekanism implements IMetaItem { @@ -34,7 +36,7 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem @Override public String getTexture(int meta) { - return EnumColor.DYES[meta].getOreDictName() + "Balloon"; + return "Balloon"; } @Override @@ -42,6 +44,14 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem { return EnumColor.DYES.length; } + + @SideOnly(Side.CLIENT) + public int getColorFromItemStack(ItemStack stack, int renderPass) + { + EnumColor dye = getColor(stack); + + return (int)(dye.getColor(0)*255) << 16 | (int)(dye.getColor(1)*255) << 8 | (int)(dye.getColor(2)*255); + } public EnumColor getColor(ItemStack stack) { @@ -74,7 +84,10 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem world.spawnEntityInWorld(new EntityBalloon(world, pos.xCoord-0.5, pos.yCoord-0.25, pos.zCoord-0.5, getColor(itemstack))); } - itemstack.stackSize--; + if(!entityplayer.capabilities.isCreativeMode) + { + itemstack.stackSize--; + } return itemstack; } @@ -242,6 +255,7 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem } stack.stackSize--; + return stack; } } diff --git a/src/main/java/mekanism/tools/common/ToolsItems.java b/src/main/java/mekanism/tools/common/ToolsItems.java index 3c9e42ad9..69a340ab6 100644 --- a/src/main/java/mekanism/tools/common/ToolsItems.java +++ b/src/main/java/mekanism/tools/common/ToolsItems.java @@ -1,6 +1,5 @@ package mekanism.tools.common; -import mekanism.common.Mekanism; import mekanism.tools.item.ItemMekanismArmor; import mekanism.tools.item.ItemMekanismAxe; import mekanism.tools.item.ItemMekanismHoe; @@ -108,60 +107,60 @@ public class ToolsItems GlowstoneShovel = new ItemMekanismShovel(MekanismTools.toolGLOWSTONE).setUnlocalizedName("GlowstoneShovel"); GlowstoneHoe = new ItemMekanismHoe(MekanismTools.toolGLOWSTONE).setUnlocalizedName("GlowstoneHoe"); GlowstoneSword = new ItemMekanismSword(MekanismTools.toolGLOWSTONE).setUnlocalizedName("GlowstoneSword"); - GlowstoneHelmet = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 0).setUnlocalizedName("GlowstoneHelmet"); - GlowstoneChestplate = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 1).setUnlocalizedName("GlowstoneChestplate"); - GlowstoneLeggings = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 2).setUnlocalizedName("GlowstoneLeggings"); - GlowstoneBoots = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 3).setUnlocalizedName("GlowstoneBoots"); + GlowstoneHelmet = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, 0).setUnlocalizedName("GlowstoneHelmet"); + GlowstoneChestplate = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, 1).setUnlocalizedName("GlowstoneChestplate"); + GlowstoneLeggings = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, 2).setUnlocalizedName("GlowstoneLeggings"); + GlowstoneBoots = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, 3).setUnlocalizedName("GlowstoneBoots"); BronzePaxel = new ItemMekanismPaxel(MekanismTools.toolBRONZE2).setUnlocalizedName("BronzePaxel"); BronzePickaxe = new ItemMekanismPickaxe(MekanismTools.toolBRONZE).setUnlocalizedName("BronzePickaxe"); BronzeAxe = new ItemMekanismAxe(MekanismTools.toolBRONZE).setUnlocalizedName("BronzeAxe"); BronzeShovel = new ItemMekanismShovel(MekanismTools.toolBRONZE).setUnlocalizedName("BronzeShovel"); BronzeHoe = new ItemMekanismHoe(MekanismTools.toolBRONZE).setUnlocalizedName("BronzeHoe"); BronzeSword = new ItemMekanismSword(MekanismTools.toolBRONZE).setUnlocalizedName("BronzeSword"); - BronzeHelmet = (new ItemMekanismArmor(MekanismTools.armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 0)).setUnlocalizedName("BronzeHelmet"); - BronzeChestplate = (new ItemMekanismArmor(MekanismTools.armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 1)).setUnlocalizedName("BronzeChestplate"); - BronzeLeggings = (new ItemMekanismArmor(MekanismTools.armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 2)).setUnlocalizedName("BronzeLeggings"); - BronzeBoots = (new ItemMekanismArmor(MekanismTools.armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 3)).setUnlocalizedName("BronzeBoots"); + BronzeHelmet = (new ItemMekanismArmor(MekanismTools.armorBRONZE, 0)).setUnlocalizedName("BronzeHelmet"); + BronzeChestplate = (new ItemMekanismArmor(MekanismTools.armorBRONZE, 1)).setUnlocalizedName("BronzeChestplate"); + BronzeLeggings = (new ItemMekanismArmor(MekanismTools.armorBRONZE, 2)).setUnlocalizedName("BronzeLeggings"); + BronzeBoots = (new ItemMekanismArmor(MekanismTools.armorBRONZE, 3)).setUnlocalizedName("BronzeBoots"); OsmiumPaxel = new ItemMekanismPaxel(MekanismTools.toolOSMIUM2).setUnlocalizedName("OsmiumPaxel"); OsmiumPickaxe = new ItemMekanismPickaxe(MekanismTools.toolOSMIUM).setUnlocalizedName("OsmiumPickaxe"); OsmiumAxe = new ItemMekanismAxe(MekanismTools.toolOSMIUM).setUnlocalizedName("OsmiumAxe"); OsmiumShovel = new ItemMekanismShovel(MekanismTools.toolOSMIUM).setUnlocalizedName("OsmiumShovel"); OsmiumHoe = new ItemMekanismHoe(MekanismTools.toolOSMIUM).setUnlocalizedName("OsmiumHoe"); OsmiumSword = new ItemMekanismSword(MekanismTools.toolOSMIUM).setUnlocalizedName("OsmiumSword"); - OsmiumHelmet = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, Mekanism.proxy.getArmorIndex("osmium"), 0)).setUnlocalizedName("OsmiumHelmet"); - OsmiumChestplate = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, Mekanism.proxy.getArmorIndex("osmium"), 1)).setUnlocalizedName("OsmiumChestplate"); - OsmiumLeggings = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, Mekanism.proxy.getArmorIndex("osmium"), 2)).setUnlocalizedName("OsmiumLeggings"); - OsmiumBoots = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, Mekanism.proxy.getArmorIndex("osmium"), 3)).setUnlocalizedName("OsmiumBoots"); + OsmiumHelmet = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, 0)).setUnlocalizedName("OsmiumHelmet"); + OsmiumChestplate = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, 1)).setUnlocalizedName("OsmiumChestplate"); + OsmiumLeggings = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, 2)).setUnlocalizedName("OsmiumLeggings"); + OsmiumBoots = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, 3)).setUnlocalizedName("OsmiumBoots"); ObsidianPaxel = new ItemMekanismPaxel(MekanismTools.toolOBSIDIAN2).setUnlocalizedName("ObsidianPaxel"); ObsidianPickaxe = new ItemMekanismPickaxe(MekanismTools.toolOBSIDIAN).setUnlocalizedName("ObsidianPickaxe"); ObsidianAxe = new ItemMekanismAxe(MekanismTools.toolOBSIDIAN).setUnlocalizedName("ObsidianAxe"); ObsidianShovel = new ItemMekanismShovel(MekanismTools.toolOBSIDIAN).setUnlocalizedName("ObsidianShovel"); ObsidianHoe = new ItemMekanismHoe(MekanismTools.toolOBSIDIAN).setUnlocalizedName("ObsidianHoe"); ObsidianSword = new ItemMekanismSword(MekanismTools.toolOBSIDIAN).setUnlocalizedName("ObsidianSword"); - ObsidianHelmet = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 0)).setUnlocalizedName("ObsidianHelmet"); - ObsidianChestplate = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 1)).setUnlocalizedName("ObsidianChestplate"); - ObsidianLeggings = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 2)).setUnlocalizedName("ObsidianLeggings"); - ObsidianBoots = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 3)).setUnlocalizedName("ObsidianBoots"); + ObsidianHelmet = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, 0)).setUnlocalizedName("ObsidianHelmet"); + ObsidianChestplate = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, 1)).setUnlocalizedName("ObsidianChestplate"); + ObsidianLeggings = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, 2)).setUnlocalizedName("ObsidianLeggings"); + ObsidianBoots = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, 3)).setUnlocalizedName("ObsidianBoots"); LazuliPaxel = new ItemMekanismPaxel(MekanismTools.toolLAZULI2).setUnlocalizedName("LazuliPaxel"); LazuliPickaxe = new ItemMekanismPickaxe(MekanismTools.toolLAZULI).setUnlocalizedName("LazuliPickaxe"); LazuliAxe = new ItemMekanismAxe(MekanismTools.toolLAZULI).setUnlocalizedName("LazuliAxe"); LazuliShovel = new ItemMekanismShovel(MekanismTools.toolLAZULI).setUnlocalizedName("LazuliShovel"); LazuliHoe = new ItemMekanismHoe(MekanismTools.toolLAZULI).setUnlocalizedName("LazuliHoe"); LazuliSword = new ItemMekanismSword(MekanismTools.toolLAZULI).setUnlocalizedName("LazuliSword"); - LazuliHelmet = (new ItemMekanismArmor(MekanismTools.armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 0)).setUnlocalizedName("LazuliHelmet"); - LazuliChestplate = (new ItemMekanismArmor(MekanismTools.armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 1)).setUnlocalizedName("LazuliChestplate"); - LazuliLeggings = (new ItemMekanismArmor(MekanismTools.armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 2)).setUnlocalizedName("LazuliLeggings"); - LazuliBoots = (new ItemMekanismArmor(MekanismTools.armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 3)).setUnlocalizedName("LazuliBoots"); + LazuliHelmet = (new ItemMekanismArmor(MekanismTools.armorLAZULI, 0)).setUnlocalizedName("LazuliHelmet"); + LazuliChestplate = (new ItemMekanismArmor(MekanismTools.armorLAZULI, 1)).setUnlocalizedName("LazuliChestplate"); + LazuliLeggings = (new ItemMekanismArmor(MekanismTools.armorLAZULI, 2)).setUnlocalizedName("LazuliLeggings"); + LazuliBoots = (new ItemMekanismArmor(MekanismTools.armorLAZULI, 3)).setUnlocalizedName("LazuliBoots"); SteelPaxel = new ItemMekanismPaxel(MekanismTools.toolSTEEL2).setUnlocalizedName("SteelPaxel"); SteelPickaxe = new ItemMekanismPickaxe(MekanismTools.toolSTEEL).setUnlocalizedName("SteelPickaxe"); SteelAxe = new ItemMekanismAxe(MekanismTools.toolSTEEL).setUnlocalizedName("SteelAxe"); SteelShovel = new ItemMekanismShovel(MekanismTools.toolSTEEL).setUnlocalizedName("SteelShovel"); SteelHoe = new ItemMekanismHoe(MekanismTools.toolSTEEL).setUnlocalizedName("SteelHoe"); SteelSword = new ItemMekanismSword(MekanismTools.toolSTEEL).setUnlocalizedName("SteelSword"); - SteelHelmet = new ItemMekanismArmor(MekanismTools.armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 0).setUnlocalizedName("SteelHelmet"); - SteelChestplate = new ItemMekanismArmor(MekanismTools.armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 1).setUnlocalizedName("SteelChestplate"); - SteelLeggings = new ItemMekanismArmor(MekanismTools.armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 2).setUnlocalizedName("SteelLeggings"); - SteelBoots = new ItemMekanismArmor(MekanismTools.armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 3).setUnlocalizedName("SteelBoots"); + SteelHelmet = new ItemMekanismArmor(MekanismTools.armorSTEEL, 0).setUnlocalizedName("SteelHelmet"); + SteelChestplate = new ItemMekanismArmor(MekanismTools.armorSTEEL, 1).setUnlocalizedName("SteelChestplate"); + SteelLeggings = new ItemMekanismArmor(MekanismTools.armorSTEEL, 2).setUnlocalizedName("SteelLeggings"); + SteelBoots = new ItemMekanismArmor(MekanismTools.armorSTEEL, 3).setUnlocalizedName("SteelBoots"); } public static void setHarvestLevels() diff --git a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java index 4c969acb6..83cf2d13c 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java @@ -21,9 +21,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemMekanismArmor extends ItemArmor { - public ItemMekanismArmor(ArmorMaterial enumarmormaterial, int renderIndex, int armorType) + public ItemMekanismArmor(ArmorMaterial enumarmormaterial, int renderIndex) { - super(enumarmormaterial, renderIndex, armorType); + super(enumarmormaterial, renderIndex, 0); setCreativeTab(Mekanism.tabMekanism); } @@ -33,14 +33,6 @@ public class ItemMekanismArmor extends ItemArmor list.add(LangUtils.localize("tooltip.hp") + ": " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); } -/* - @Override - public void registerIcons(IIconRegister register) - { - itemIcon = register.registerIcon("mekanism:" + getUnlocalizedName().replace("item.", "")); - } -*/ - @Override public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { diff --git a/src/main/resources/assets/mekanism/blockstates/PlasticFence.json b/src/main/resources/assets/mekanism/blockstates/PlasticFence.json index 9755c3c56..e4caedf61 100755 --- a/src/main/resources/assets/mekanism/blockstates/PlasticFence.json +++ b/src/main/resources/assets/mekanism/blockstates/PlasticFence.json @@ -15,6 +15,20 @@ "east=true,north=false,south=true,west=true": { "model": "mekanism:plastic_fence_nse", "y": 90, "uvlock": true }, "east=false,north=true,south=true,west=true": { "model": "mekanism:plastic_fence_nse", "y": 180, "uvlock": true }, "east=true,north=true,south=false,west=true": { "model": "mekanism:plastic_fence_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "mekanism:plastic_fence_nsew", "uvlock": true } + "east=true,north=true,south=true,west=true": { "model": "mekanism:plastic_fence_nsew", "uvlock": true }, + "inventory": { + "model": "mekanism:plastic_fence_inventory", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } + } } } diff --git a/src/main/resources/assets/mekanism/blockstates/bin_advanced.json b/src/main/resources/assets/mekanism/blockstates/bin_advanced.json new file mode 100644 index 000000000..b16f0e1a5 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/bin_advanced.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/bin/BinAdvancedFront", + "west": "mekanism:blocks/bin/BinAdvancedRight", + "east": "mekanism:blocks/bin/BinAdvancedLeft", + "south": "mekanism:blocks/bin/BinAdvancedBack", + "up": "mekanism:blocks/bin/BinAdvancedTop", + "down": "mekanism:blocks/bin/BinAdvancedBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/bin/BinAdvancedFrontOn", + "west": "mekanism:blocks/bin/BinAdvancedRightOn", + "east": "mekanism:blocks/bin/BinAdvancedLeftOn", + "south": "mekanism:blocks/bin/BinAdvancedBackOn", + "up": "mekanism:blocks/bin/BinAdvancedTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/bin.json b/src/main/resources/assets/mekanism/blockstates/bin_basic.json similarity index 89% rename from src/main/resources/assets/mekanism/blockstates/bin.json rename to src/main/resources/assets/mekanism/blockstates/bin_basic.json index d7bf345b5..2aff352be 100644 --- a/src/main/resources/assets/mekanism/blockstates/bin.json +++ b/src/main/resources/assets/mekanism/blockstates/bin_basic.json @@ -25,8 +25,7 @@ "west": "mekanism:blocks/bin/BinBasicRightOn", "east": "mekanism:blocks/bin/BinBasicLeftOn", "south": "mekanism:blocks/bin/BinBasicBackOn", - "up": "mekanism:blocks/bin/BinBasicTopOn", - "down": "mekanism:blocks/bin/BinBasicBottomOn" + "up": "mekanism:blocks/bin/BinBasicTopOn" } }, "false": {} diff --git a/src/main/resources/assets/mekanism/blockstates/bin_elite.json b/src/main/resources/assets/mekanism/blockstates/bin_elite.json new file mode 100644 index 000000000..640a12e8c --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/bin_elite.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/bin/BinEliteFront", + "west": "mekanism:blocks/bin/BinEliteRight", + "east": "mekanism:blocks/bin/BinEliteLeft", + "south": "mekanism:blocks/bin/BinEliteBack", + "up": "mekanism:blocks/bin/BinEliteTop", + "down": "mekanism:blocks/bin/BinEliteBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/bin/BinEliteFrontOn", + "west": "mekanism:blocks/bin/BinEliteRightOn", + "east": "mekanism:blocks/bin/BinEliteLeftOn", + "south": "mekanism:blocks/bin/BinEliteBackOn", + "up": "mekanism:blocks/bin/BinEliteTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/bin_ultimate.json b/src/main/resources/assets/mekanism/blockstates/bin_ultimate.json new file mode 100644 index 000000000..7f9b40808 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/bin_ultimate.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/bin/BinUltimateFront", + "west": "mekanism:blocks/bin/BinUltimateRight", + "east": "mekanism:blocks/bin/BinUltimateLeft", + "south": "mekanism:blocks/bin/BinUltimateBack", + "up": "mekanism:blocks/bin/BinUltimateTop", + "down": "mekanism:blocks/bin/BinUltimateBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/bin/BinUltimateFrontOn", + "west": "mekanism:blocks/bin/BinUltimateRightOn", + "east": "mekanism:blocks/bin/BinUltimateLeftOn", + "south": "mekanism:blocks/bin/BinUltimateBackOn", + "up": "mekanism:blocks/bin/BinUltimateTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/fluid_tank.json b/src/main/resources/assets/mekanism/blockstates/fluid_tank.json index a3725d3ab..d8af24a61 100644 --- a/src/main/resources/assets/mekanism/blockstates/fluid_tank.json +++ b/src/main/resources/assets/mekanism/blockstates/fluid_tank.json @@ -9,7 +9,11 @@ "true": {"textures": {"all": "mekanism:blocks/models/fluid_tank_on"}}, "false": {"textures": {"all": "mekanism:blocks/models/fluid_tank"}} }, - "inventory": [{}] + "inventory": [{ + "textures": { + "all": "mekanism:blocks/models/fluid_tank" + } + }] } } diff --git a/src/main/resources/assets/mekanism/blockstates/induction_port.json b/src/main/resources/assets/mekanism/blockstates/induction_port.json index 891b0dad2..20d9509fc 100644 --- a/src/main/resources/assets/mekanism/blockstates/induction_port.json +++ b/src/main/resources/assets/mekanism/blockstates/induction_port.json @@ -3,7 +3,7 @@ "defaults": { "model": "cube_all", "textures": { - "all": "mekanism:blocks/InductionPort" + "all": "mekanism:blocks/ctm/induction_port" } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/security_desk.json b/src/main/resources/assets/mekanism/blockstates/security_desk.json index d4be63785..1ebc7df52 100644 --- a/src/main/resources/assets/mekanism/blockstates/security_desk.json +++ b/src/main/resources/assets/mekanism/blockstates/security_desk.json @@ -11,10 +11,6 @@ "east": {"y": 90}, "west": {"y": -90} }, - "active": { - "true": {}, - "false": {} - }, "inventory": [{}] } } diff --git a/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_controller.json b/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_controller.json index 5e49fc919..61ab2f43f 100644 --- a/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_controller.json +++ b/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_controller.json @@ -9,6 +9,12 @@ }, "variants": { "normal": [{}], + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, "inventory": [{}] } } diff --git a/src/main/resources/assets/mekanism/models/block/chemical_washer.json b/src/main/resources/assets/mekanism/models/block/chemical_washer.json index 17b65abf1..dd61e61d6 100644 --- a/src/main/resources/assets/mekanism/models/block/chemical_washer.json +++ b/src/main/resources/assets/mekanism/models/block/chemical_washer.json @@ -302,6 +302,6 @@ ], "textures": { "all": "mekanism:blocks/models/chemical_washer", - "particle": "..." + "particle": "mekanism:blocks/SteelCasing" } } diff --git a/src/main/resources/assets/mekanism/models/block/fluid_tank/fluid_0.json b/src/main/resources/assets/mekanism/models/block/fluid_tank/fluid_0.json new file mode 100644 index 000000000..3fd9e69a0 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/block/fluid_tank/fluid_0.json @@ -0,0 +1,18 @@ +{ + "textures": { + "fluid" : "blocks/water_still" + }, + "elements": [{ + "name": "Fluid", + "from": [ 0.0005, 0.0005, 0.0005 ], + "to": [ 15.9995, 0.9995, 15.9995 ], + "faces": { + "north": { "texture": "#fluid", "uv": [ 0.0005, 15.0, 15.9995, 15.9995 ], "cullface": "north" }, + "east": { "texture": "#fluid", "uv": [ 0.0005, 15.0, 15.9995, 15.9995 ], "cullface": "east" }, + "south": { "texture": "#fluid", "uv": [ 0.0005, 15.0, 15.9995, 15.9995 ], "cullface": "south" }, + "west": { "texture": "#fluid", "uv": [ 0.0005, 15.0, 15.9995, 15.9995 ], "cullface": "west" }, + "up": { "texture": "#fluid", "uv": [ 0.0005, 0.0005, 15.9995, 15.9995 ] }, + "down": { "texture": "#fluid", "uv": [ 0.0005, 0.0005, 15.9995, 15.9995 ], "cullface": "down" } + } + }] +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/models/block/metallurgic_infuser.json b/src/main/resources/assets/mekanism/models/block/metallurgic_infuser.json index bd21bfaf8..7536cee52 100644 --- a/src/main/resources/assets/mekanism/models/block/metallurgic_infuser.json +++ b/src/main/resources/assets/mekanism/models/block/metallurgic_infuser.json @@ -224,6 +224,6 @@ ], "textures": { "all": "mekanism:blocks/models/metallurgic_infuser", - "particle": "..." + "particle": "mekanism:blocks/SteelCasing" } } diff --git a/src/main/resources/assets/mekanism/models/block/security_desk.json b/src/main/resources/assets/mekanism/models/block/security_desk.json index 4c616be43..9bc379c52 100644 --- a/src/main/resources/assets/mekanism/models/block/security_desk.json +++ b/src/main/resources/assets/mekanism/models/block/security_desk.json @@ -133,6 +133,6 @@ ], "textures": { "all": "mekanism:blocks/models/security_desk", - "particle": "..." + "particle": "mekanism:blocks/SteelCasing" } } diff --git a/src/main/resources/assets/mekanism/models/entity/balloon.json b/src/main/resources/assets/mekanism/models/entity/balloon.json index 3ed2673d9..2334f36db 100755 --- a/src/main/resources/assets/mekanism/models/entity/balloon.json +++ b/src/main/resources/assets/mekanism/models/entity/balloon.json @@ -2,8 +2,8 @@ "elements": [ { "__comment": "String", - "from": [7.5, 8.5, 7.5], - "to": [8.5, 19.5, 8.5], + "from": [7.85, 8.5, 7.85], + "to": [8.15, 19.5, 8.15], "faces": { "down": {"uv": [9, 0, 9.25, 0.25], "texture": "#all"}, "up": {"uv": [8.75, 0, 9, 0.25], "texture": "#all"}, @@ -18,12 +18,12 @@ "from": [7.5, 19.5, 7.5], "to": [8.5, 20.5, 8.5], "faces": { - "down": {"uv": [5, 2.25, 5.25, 2.5], "texture": "#all"}, - "up": {"uv": [4.75, 2.25, 5, 2.5], "texture": "#all"}, - "north": {"uv": [4.75, 2.5, 5, 2.75], "texture": "#all"}, - "south": {"uv": [5.25, 2.5, 5.5, 2.75], "texture": "#all"}, - "west": {"uv": [5, 2.5, 5.25, 2.75], "texture": "#all"}, - "east": {"uv": [4.5, 2.5, 4.75, 2.75], "texture": "#all"} + "down": {"uv": [5, 2.25, 5.25, 2.5], "texture": "#all", "tintindex": 0}, + "up": {"uv": [4.75, 2.25, 5, 2.5], "texture": "#all", "tintindex": 0}, + "north": {"uv": [4.75, 2.5, 5, 2.75], "texture": "#all", "tintindex": 0}, + "south": {"uv": [5.25, 2.5, 5.5, 2.75], "texture": "#all", "tintindex": 0}, + "west": {"uv": [5, 2.5, 5.25, 2.75], "texture": "#all", "tintindex": 0}, + "east": {"uv": [4.5, 2.5, 4.75, 2.75], "texture": "#all", "tintindex": 0} } }, { @@ -31,12 +31,12 @@ "from": [6, 20.5, 6], "to": [10, 25.5, 10], "faces": { - "down": {"uv": [6.5, 0, 7.5, 1], "texture": "#all"}, - "up": {"uv": [5.5, 0, 6.5, 1], "texture": "#all"}, - "north": {"uv": [5.5, 1, 6.5, 2.25], "texture": "#all"}, - "south": {"uv": [7.5, 1, 8.5, 2.25], "texture": "#all"}, - "west": {"uv": [6.5, 1, 7.5, 2.25], "texture": "#all"}, - "east": {"uv": [4.5, 1, 5.5, 2.25], "texture": "#all"} + "down": {"uv": [6.5, 0, 7.5, 1], "texture": "#all", "tintindex": 0}, + "up": {"uv": [5.5, 0, 6.5, 1], "texture": "#all", "tintindex": 0}, + "north": {"uv": [5.5, 1, 6.5, 2.25], "texture": "#all", "tintindex": 0}, + "south": {"uv": [7.5, 1, 8.5, 2.25], "texture": "#all", "tintindex": 0}, + "west": {"uv": [6.5, 1, 7.5, 2.25], "texture": "#all", "tintindex": 0}, + "east": {"uv": [4.5, 1, 5.5, 2.25], "texture": "#all", "tintindex": 0} } }, { @@ -44,12 +44,12 @@ "from": [6, 21, 5.5], "to": [10, 25, 10.5], "faces": { - "down": {"uv": [2.25, 2, 3.25, 3.25], "texture": "#all"}, - "up": {"uv": [1.25, 2, 2.25, 3.25], "texture": "#all"}, - "north": {"uv": [1.25, 3.25, 2.25, 4.25], "texture": "#all"}, - "south": {"uv": [3.5, 3.25, 4.5, 4.25], "texture": "#all"}, - "west": {"uv": [2.25, 3.25, 3.5, 4.25], "texture": "#all"}, - "east": {"uv": [0, 3.25, 1.25, 4.25], "texture": "#all"} + "down": {"uv": [2.25, 2, 3.25, 3.25], "texture": "#all", "tintindex": 0}, + "up": {"uv": [1.25, 2, 2.25, 3.25], "texture": "#all", "tintindex": 0}, + "north": {"uv": [1.25, 3.25, 2.25, 4.25], "texture": "#all", "tintindex": 0}, + "south": {"uv": [3.5, 3.25, 4.5, 4.25], "texture": "#all", "tintindex": 0}, + "west": {"uv": [2.25, 3.25, 3.5, 4.25], "texture": "#all", "tintindex": 0}, + "east": {"uv": [0, 3.25, 1.25, 4.25], "texture": "#all", "tintindex": 0} } }, { @@ -57,17 +57,17 @@ "from": [5.5, 21, 6], "to": [10.5, 25, 10], "faces": { - "down": {"uv": [2.25, 0, 3.5, 1], "texture": "#all"}, - "up": {"uv": [1, 0, 2.25, 1], "texture": "#all"}, - "north": {"uv": [1, 1, 2.25, 2], "texture": "#all"}, - "south": {"uv": [3.25, 1, 4.5, 2], "texture": "#all"}, - "west": {"uv": [2.25, 1, 3.25, 2], "texture": "#all"}, - "east": {"uv": [0, 1, 1, 2], "texture": "#all"} + "down": {"uv": [2.25, 0, 3.5, 1], "texture": "#all", "tintindex": 0}, + "up": {"uv": [1, 0, 2.25, 1], "texture": "#all", "tintindex": 0}, + "north": {"uv": [1, 1, 2.25, 2], "texture": "#all", "tintindex": 0}, + "south": {"uv": [3.25, 1, 4.5, 2], "texture": "#all", "tintindex": 0}, + "west": {"uv": [2.25, 1, 3.25, 2], "texture": "#all", "tintindex": 0}, + "east": {"uv": [0, 1, 1, 2], "texture": "#all", "tintindex": 0} } } ], "textures": { - "all": "...", + "all": "mekanism:entities/Balloon", "particle": "..." } } diff --git a/src/main/resources/assets/mekanism/models/item/Balloon.json b/src/main/resources/assets/mekanism/models/item/Balloon.json index f65c531c4..124a9e243 100644 --- a/src/main/resources/assets/mekanism/models/item/Balloon.json +++ b/src/main/resources/assets/mekanism/models/item/Balloon.json @@ -2,9 +2,17 @@ "parent": "mekanism:entity/balloon", "display": { "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] + "rotation": [ -150, 0, 10 ], + "translation": [ 0, 1.5, -0.4 ], + "scale": [ 1.8, 1.8, 1.8 ] + }, + "firstperson": { + "translation": [ 0, -2, 0 ], + "scale": [ 1.8, 1.8, 1.8 ] + }, + "gui": { + "translation": [ 0, -7.4, 0 ], + "scale": [ 1.5, 1.5, 1.5 ] } } } diff --git a/src/main/resources/assets/mekanism/textures/blocks/SalinationBlock.png b/src/main/resources/assets/mekanism/textures/blocks/SalinationBlock.png deleted file mode 100644 index 7023484edb35bcaea92dd329c6eddb7cbd39f2ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1455 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 F`X9rPDg^)l diff --git a/src/main/resources/assets/mekanism/textures/blocks/SteelBlock_Oxidized.png b/src/main/resources/assets/mekanism/textures/blocks/SteelBlock_Oxidized.png deleted file mode 100644 index 06621f301014fbb24cf3942cd26aa4f8942b5db2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1529 zcmbVMZBP_-9KONHK>|f&HGAT9Rm@zd;oInjD4b9M*YUIO7se!hKob`e6Lp!tow|$=9%k%&J zwmL62D<&!~N~Kc8*yfRTWsVKKkrB$caZ`z2nO>Bw1@dCPNcK@8tulLf7Y*20s+hLZ zl&8Gx9G$9CjVogu1#&^o0>aI+YAS?L`&mI@t5m7!et~i?r)9uJ7c-m*95{Ls1Q?GA z%-7{0If8{QVdhnc^x}$Khr43A8~1?eX+WxX*2^_IYDC^KM3<4t% zdASLE98^J09$?``8qleAkQ>2Jz<{e!ofb#YR{;z`H86_67!IK*p*0Yw9vFQ<#hd6U zBJ5=5s4rz_0!w6BAYj<%^QnCrH7^#!D30SWg25ODDF{d^=VZzcaZ+N~0!d45kr8Bu z=YWt!%EfzS6R1S`I0aV7$$4U!lSYM7B!m5w0HbOIX4z0)BWOvs)BlDsCR%co3p8w} zCEhE#mHQ}443ib@p6)0FRH7jkii~n8R4K{3y)4biHqrztU(_DPLtq9ZO473Zvv_@BvQHvWek1lLyEPjSnmx<`DS`tCcC~DQ3@eDIgVrCMC?R5K608^4BAftH`CufVgn2MgxxWJ^xoaSP2Ra z)yaSACVZq6V`%xL3zW^1KB76Lc|@g4w%gACu2MzB+eov+-y2$r4x@F1rUF6otSpzrLoP0QBSqYV%-pxi`#b)x?(qbF>hg#Qu zT`mQj3)&x5ZoB*UU%{SWbwcN!NlRu4$DbF-)6w}id(u}=-`!i-iq|ylU1m(HSraUY z?E0i-unA*jTX`CqP1v`lua8K& z;DwVrj$J(4Q&(oY-ZUrQSeJ!-aH4N$KiS<8^iHmjsEIpkU(05@s+JW_ysVzT<%`YE zI^BcSGkbd8IL4C;8xz|qr_Q^vH^RroKyxcvmU~@10lGhmHSYo2C`xuDO?wg3GI8$Qhz z=3ZE|Z*6^Ns$cyhkiA(m$>1$q+B!b=?hD&v44JM6M-G|ZY8N(;=f>|m-j?v;3V+g9 mi(&`L^3r^re{?^Jh*r%xP_^q~@|_)_pRvuFOSWXZ{q8@yaYAGO diff --git a/src/main/resources/assets/mekanism/textures/blocks/Teleporter.png b/src/main/resources/assets/mekanism/textures/blocks/Teleporter.png deleted file mode 100644 index 46b046fff7ae327016697bb206ede186c9fe5d76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1834 zcmbVNc~BE~6b^@|AS!}Xi{ctYK}DmGG41P>GnDu=cp;!L|iu>HgFkM7Lw@A|&?z4w0a&F&3b zz0%SCb9(}T;20Vr2**dj@=mkHzwhR~JdO|ZG2td`9U6n_r5czJEJveZAXF)hg~MT~ zJaI=8>`x%rAc$lWwn_XYM}{iNQVWJ`P^xh@f#4r#P)lWTFa|`!v51OG9H_1(0*IVT z+{h49#A-gQKthr<@Vcbc5?NB5j4dYy1_1sB4sJjRV^YANj8|zn1}<^jE(f1mwm~8= z4#DEM#P?2Z5{ChNR09JHGJ_1`Aqq%klOTvgXL2B4VB#U- zY8rVACtM(!(85<-q5{Lz91zs&^<+JbjA~**h|Ok$6e>uil5hk`o2bI129iqaF=;^n zYh@ZljUlKCuvnBvqX`(7h!Bg5|_#$%F<=kC)&79j2oXN?BIFGU(JKxGL^ScQcOxJ3MfEJx%V z9>nJ{=)Qtr7EdUoL3sF7CQm5x<s1huoOcz5)_S}tbi~DilJHsss{Lcz-uF- zlB0U9x8-);2P=Rzhz^#EG^i37PcH}gh&+?UhM{PPN`k3uDk+*tXOLJlxs*huQ{=2@ zN(?(j7EPSs%l}W>K-?kFQXl`Rm&q->2rbhO)sHVe^bf4Un?{3o$J=L;J$Tb?3>5@R z4EJj`a8c*r*_Ycp#wr$i?6+pSoY0iz7KgZC7_j!XIjDJ7Ny)L2mFZbgQipeGKDOa= zHe2Vl^^CQ3$aF=Om%iVBHPUo$xL^0MCXwd%GFzi_MM0S<>WW_b-2fQSD17XF;R<_MbB&vOx*d0TWTYu|ekxq>ZnV$Y zA@j_EU){cu7f`k5D(gMr(5gIohiH^)&b*WPYWcw6VD5&c`Fq*LsS%|t}G~yn@Z6VI$t$-vW06~1`1A)&iJ^8WdHeG5dyj|SlCL5XvnBruw}h!CaUnO zSnG1BU^GRQ@)f;tc&bg&=oa;=wdUNQ^7#YhNK5~UCq!Sr?BszWbJw-zoYI?4Ioa9S zjG963W~%Lt(QmE#BF-I*9GT+0@BHiTrqV30GuVsDr1M$*eNLV~8FL@eZ)rz*)hw)Y z`%$PntloXmBEP6ER@E{?Kx{4}>U-aMIFyTxhx>urLoKtG|IjrQ<$%@AYsbS4x)AEASaI{hKEtlaL+8z6>x0KUi|hZ;RmW8- zVq>qhb|lTMn`Yw9-~H0y;a)8B+S^!Rd!c2z()8<)3+h?X28gt;Uq<*jr$Y;*A zah<1B7dh{UjEtN)rN(OPk#Spg-@~A-1_xoL#I>!Dx-Bti;k5|nU|_v&*;&8Vuiw1M zyM*?5Ggj#Rs>yC?E;am)#+MpJ363C&8XyyOP3j$5pDFQRz`A|S6^N{>AK14 za(VBIhWzOrcVlZ~Hcxth=!z=){2v)JvJ!eq`5>^8>i y*4?P`AMSo40+;<5xN7|jJDZbd-EL*nTF)S8Q-}D;#XVM*zgMVmwV<50J^df#irNMM diff --git a/src/main/resources/assets/mekanism/textures/blocks/TeleporterFrame.png b/src/main/resources/assets/mekanism/textures/blocks/TeleporterFrame.png deleted file mode 100644 index 702e2a9710992ab3b20f8507efc480101bde53b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1695 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 SsbSW8{{d=MB3!Llk@pXm;(As9 diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_port_input-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_port-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/induction_port_input-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/induction_port-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_port_input.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_port.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/induction_port_input.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/induction_port.png diff --git a/src/main/resources/assets/mekanism/textures/entities/Balloon.png b/src/main/resources/assets/mekanism/textures/entities/Balloon.png new file mode 100644 index 0000000000000000000000000000000000000000..c482ae1ec6b961c94391389ae902672aeddd1b12 GIT binary patch literal 1952 zcmbuA`9Bj30Ef5bs+?iWONdIj33Fs*M2-wYSQDbHk)xNqxo|9AJ$@m76AY* z0gRcMy_K1noPF>eUkvUh007O%K%#C*BgKqgg!m~ajyvKmB;Kut37i(lb-qyE+7-R9 zpc_E2(w#fS@ZqeFKYTq7)qb&Ge%0JQLUXlPY_N|MBd7FJXx_M0J^$G0xhXj%UP5i)Gd_ zXcbs7N@V%JdP*rI8YgVr@Yq$>IZdY`2CZvzh!%T%%eVa_+ohN0 z3B}nWFrKVWi$#r9A{%gz`gz{kUgG11wg>W2^aNd&%Cc$-MUVc*abTvdHg~9GAaszV zVB$km_PjEos3q zjn{bU5a}6L=TtjancIk=aft|GM51n8Y;>q z=(oNo^E}i(Z{y+kv0g>6JxO8o+%7k&XOE0-^7y8rhiG4hly7}X#%7&oH94t%9 z?el$bxFpH%8{u~S6?p}m_(^c^OI<4BhSt_uem?I@h?!VI19KNlRDX0)M$lXK>(gD2 zUNvW6>TVN=ZF_)3I(-YwJ166O#}?XaDw?in=98YM>-4L`g;jnk|0>M^BkXACC|c7r zWh#{1QWaX}58B<6`A`$k?6CUYdodDpZPFlsDezW2%=&$o#kHa)}AzRw$Xr;SYx>i~Wk(ZDid1k&E~ z;0^$A#LfzC>U0mdRxqErtif+$eNN*!tN#^X`4A=uRJY6n^<-^odK0YuM2e`*IjV_g zFe`Jzp;A&4g=4-g@33um+f_!D63X_WnLpp$Bh8yvPE-fAvwfgMidl{#0*OQ*#6%1r zmAOA(QGa;#Fs2K1;C6WnL0KhC@;l#_nn_8#ZMtEpT>`53?Nb1l>z_d4?bh?bE&r}C?6dK>50thy|6syYpROh=|I9(Lcp zP(y1*q-d*FKmxNY;IZ)StVN&WKLxp_U3XZZb?xga;8COTw8atji)S7Qoufs+@eT!O_R#Ru^OuM z$!T?nECx;w=e7y7koR;gpeN2XFcq8S`Raqw8%Xh~&Hz$frh8uO4cdVCOy~wg_=L2n z2G7953n=X4z;sJG=(M`!->a_umd^FgH3q(RfO=uMTc*PSydza{4i77c!6s(~s0(8k z9kDQ-+}H3vs$`Nj{I#xT2?ReZ!K|9ZJoj_um2_AfB!4wBz>H0P@$kg2BG*yfD_>&K zQd3df)z%IY-l-?NSMxQ=(?@v~NMYF5i-y7^nOX)TyM9YXl5Cs039yGKo`{J5Cs- zxg>q3M|%xwe?0TJWnV}mIp|%54Y7IY_k$Voh!I7>CoxSl5Mz}DcJODHJmdZa2h_ND literal 0 HcmV?d00001 From a1100dd47a61c81831192276b72c2122270e6143 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 10 May 2016 19:37:00 -0400 Subject: [PATCH 10/22] More render work! - Added BuildCraft impl to render Model3D - Got Gas and Fluid icons working properly - Fixed CTM crash - Fixed Flamethrower flame rotation issue - Fluid Tank now renders inner fluid - Fix some texture errors --- src/main/java/mekanism/api/gas/Gas.java | 6 +- src/main/java/mekanism/api/gas/OreGas.java | 2 +- .../java/mekanism/client/ClientProxy.java | 24 +- .../client/gui/element/GuiFluidGauge.java | 1 - .../mekanism/client/gui/element/GuiGauge.java | 1 - .../client/render/MekanismRenderer.java | 426 ++--------- .../client/render/MinerVisualRenderer.java | 3 +- .../client/render/RenderResizableCuboid.java | 663 ++++++++++++++++++ .../java/mekanism/client/render/ctm/CTM.java | 5 +- .../client/render/entity/RenderFlame.java | 5 + .../render/item/BakedCustomItemModel.java | 146 ++++ .../client/render/item/BakedFluidModel.java | 126 ---- ...Model.java => CustomItemModelFactory.java} | 19 +- .../render/tileentity/RenderDynamicTank.java | 5 +- .../render/tileentity/RenderFluidTank.java | 25 +- .../render/tileentity/RenderTeleporter.java | 2 +- .../RenderThermalEvaporationController.java | 8 +- .../RenderThermoelectricBoiler.java | 7 +- src/main/java/mekanism/common/Mekanism.java | 37 +- .../mekanism/common/block/BlockMachine.java | 5 + .../common/block/states/BlockStateBasic.java | 2 +- .../common/tile/TileEntityDynamicTank.java | 3 +- .../blockstates/pressure_disperser.json | 14 + .../blockstates/resistive_heater.json | 2 +- .../models/block/fluid_tank/fluid_0.json | 18 - .../textures/blocks/bin/BinAdvancedBottom.png | Bin 0 -> 1528 bytes 26 files changed, 948 insertions(+), 607 deletions(-) create mode 100644 src/main/java/mekanism/client/render/RenderResizableCuboid.java create mode 100644 src/main/java/mekanism/client/render/item/BakedCustomItemModel.java delete mode 100644 src/main/java/mekanism/client/render/item/BakedFluidModel.java rename src/main/java/mekanism/client/render/item/{FluidTankItemModel.java => CustomItemModelFactory.java} (77%) create mode 100644 src/main/resources/assets/mekanism/blockstates/pressure_disperser.json delete mode 100644 src/main/resources/assets/mekanism/models/block/fluid_tank/fluid_0.json create mode 100644 src/main/resources/assets/mekanism/textures/blocks/bin/BinAdvancedBottom.png diff --git a/src/main/java/mekanism/api/gas/Gas.java b/src/main/java/mekanism/api/gas/Gas.java index 93ddab407..a712432ed 100644 --- a/src/main/java/mekanism/api/gas/Gas.java +++ b/src/main/java/mekanism/api/gas/Gas.java @@ -35,9 +35,10 @@ public class Gas * Creates a new Gas object with a defined name or key value. * @param s - name or key to associate this Gas with */ - public Gas(String s) + public Gas(String s, String icon) { unlocalizedName = name = s; + iconLocation = new ResourceLocation(icon); } /** @@ -144,9 +145,8 @@ public class Gas * @param i - IIcon to associate with this Gas * @return this Gas object */ - public Gas setIcon(TextureMap map, String location) + public Gas updateIcon(TextureMap map) { - iconLocation = new ResourceLocation(location); sprite = map.registerSprite(iconLocation); from_fluid = false; diff --git a/src/main/java/mekanism/api/gas/OreGas.java b/src/main/java/mekanism/api/gas/OreGas.java index 316169c2a..73c1aaeb5 100644 --- a/src/main/java/mekanism/api/gas/OreGas.java +++ b/src/main/java/mekanism/api/gas/OreGas.java @@ -9,7 +9,7 @@ public class OreGas extends Gas public OreGas(String s, String name) { - super(s); + super(s, "mekanism:blocks/liquid/Liquid" + (s.contains("clean") ? "Clean" : "") + "Ore"); oreName = name; } diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 212cb0101..5872a96d8 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -75,7 +75,7 @@ import mekanism.client.render.entity.RenderBalloon; import mekanism.client.render.entity.RenderFlame; import mekanism.client.render.entity.RenderObsidianTNTPrimed; import mekanism.client.render.entity.RenderRobit; -import mekanism.client.render.item.FluidTankItemModel; +import mekanism.client.render.item.CustomItemModelFactory; import mekanism.client.render.tileentity.RenderBin; import mekanism.client.render.tileentity.RenderChargepad; import mekanism.client.render.tileentity.RenderChemicalCrystallizer; @@ -233,7 +233,7 @@ public class ClientProxy extends CommonProxy public static Map machineResources = new HashMap(); public static Map basicResources = new HashMap(); - public static ModelResourceLocation TANK_MODEL = new ModelResourceLocation("mekanism:fluid_tank", "inventory"); + public static final String[] CUSTOM_RENDERS = new String[] {"fluid_tank"}; @Override public void loadConfiguration() @@ -852,16 +852,20 @@ public class ClientProxy extends CommonProxy HolidayManager.init(); } - /* @SubscribeEvent + @SubscribeEvent public void onModelBake(ModelBakeEvent event) throws IOException { - Object obj = event.modelRegistry.getObject(TANK_MODEL); - - if(obj instanceof IBakedModel) - { - event.modelRegistry.putObject(TANK_MODEL, new FluidTankItemModel((IBakedModel)obj)); - } - }*/ + for(String s : CUSTOM_RENDERS) + { + ModelResourceLocation model = new ModelResourceLocation("mekanism:" + s, "inventory"); + Object obj = event.modelRegistry.getObject(model); + + if(obj instanceof IBakedModel) + { + event.modelRegistry.putObject(model, new CustomItemModelFactory((IBakedModel)obj)); + } + } + } @Override public void preInit() diff --git a/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java b/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java index a4f74baef..b198b0b61 100644 --- a/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java @@ -13,7 +13,6 @@ import mekanism.common.base.ITankManager; import mekanism.common.item.ItemGaugeDropper; import mekanism.common.network.PacketDropperUse.DropperUseMessage; import mekanism.common.util.LangUtils; - import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/client/gui/element/GuiGauge.java b/src/main/java/mekanism/client/gui/element/GuiGauge.java index 5f24b3b98..146cf95e1 100644 --- a/src/main/java/mekanism/client/gui/element/GuiGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiGauge.java @@ -10,7 +10,6 @@ import mekanism.common.base.ISideConfiguration; import mekanism.common.item.ItemConfigurator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 4ae0bb746..d61f395dd 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -10,7 +10,6 @@ import mekanism.api.EnumColor; import mekanism.api.ObfuscatedNames; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; -import mekanism.api.gas.OreGas; import mekanism.api.infuse.InfuseRegistry; import mekanism.api.infuse.InfuseType; import mekanism.api.transmitters.TransmissionType; @@ -26,11 +25,8 @@ import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.ItemModelMesher; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.model.ModelBakery; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.init.Blocks; @@ -52,8 +48,6 @@ import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class MekanismRenderer { - //private static RenderBlocks renderBlocks = new RenderBlocks(); - public enum FluidType { STILL, @@ -92,8 +86,6 @@ public class MekanismRenderer @SubscribeEvent public void onStitch(TextureStitchEvent.Pre event) { - initFluidTextures(event.map); - for(EnumColor color : EnumColor.values()) { colors[color.ordinal()] = event.map.registerSprite(new ResourceLocation("mekanism:blocks/overlay/overlay_" + color.unlocalizedName)); @@ -107,36 +99,9 @@ public class MekanismRenderer energyIcon = event.map.registerSprite(new ResourceLocation("mekanism:blocks/liquid/LiquidEnergy")); heatIcon = event.map.registerSprite(new ResourceLocation("mekanism:blocks/liquid/LiquidHeat")); - GasRegistry.getGas("hydrogen").setIcon(event.map, "mekanism:blocks/liquid/LiquidHydrogen"); - GasRegistry.getGas("oxygen").setIcon(event.map,"mekanism:blocks/liquid/LiquidOxygen"); - GasRegistry.getGas("water").setIcon(event.map,"mekanism:blocks/liquid/LiquidSteam"); - GasRegistry.getGas("chlorine").setIcon(event.map,"mekanism:blocks/liquid/LiquidChlorine"); - GasRegistry.getGas("sulfurDioxideGas").setIcon(event.map,"mekanism:blocks/liquid/LiquidSulfurDioxide"); - GasRegistry.getGas("sulfurTrioxideGas").setIcon(event.map,"mekanism:blocks/liquid/LiquidSulfurTrioxide"); - GasRegistry.getGas("sulfuricAcid").setIcon(event.map,"mekanism:blocks/liquid/LiquidSulfuricAcid"); - GasRegistry.getGas("hydrogenChloride").setIcon(event.map,"mekanism:blocks/liquid/LiquidHydrogenChloride"); - GasRegistry.getGas("liquidOsmium").setIcon(event.map,"mekanism:blocks/liquid/LiquidOsmium"); - GasRegistry.getGas("liquidStone").setIcon(event.map,"mekanism:blocks/liquid/LiquidStone"); - GasRegistry.getGas("ethene").setIcon(event.map,"mekanism:blocks/liquid/LiquidEthene"); - GasRegistry.getGas("brine").setIcon(event.map,"mekanism:blocks/liquid/LiquidBrine"); - GasRegistry.getGas("sodium").setIcon(event.map,"mekanism:blocks/liquid/LiquidSodium"); - GasRegistry.getGas("deuterium").setIcon(event.map,"mekanism:blocks/liquid/LiquidDeuterium"); - GasRegistry.getGas("tritium").setIcon(event.map,"mekanism:blocks/liquid/LiquidTritium"); - GasRegistry.getGas("fusionFuelDT").setIcon(event.map,"mekanism:blocks/liquid/LiquidDT"); - GasRegistry.getGas("lithium").setIcon(event.map,"mekanism:blocks/liquid/LiquidLithium"); - for(Gas gas : GasRegistry.getRegisteredGasses()) { - if(gas instanceof OreGas) - { - if(gas.getUnlocalizedName().contains("clean")) - { - gas.setIcon(event.map,"mekanism:blocks/liquid/LiquidCleanOre"); - } - else { - gas.setIcon(event.map,"mekanism:blocks/liquid/LiquidOre"); - } - } + gas.updateIcon(event.map); } for(InfuseType type : InfuseRegistry.getInfuseMap().values()) @@ -156,6 +121,12 @@ public class MekanismRenderer RenderFluidTank.resetDisplayInts(); } + @SubscribeEvent + public void onStitch(TextureStitchEvent.Post event) + { + initFluidTextures(event.map); + } + public static void registerItemRender(String domain, Item item) { ItemModelMesher mesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher(); @@ -198,8 +169,6 @@ public class MekanismRenderer for(Fluid fluid : FluidRegistry.getRegisteredFluids().values()) { - // TextureAtlasSprite toUse = null; - if(fluid.getFlowing() != null) { String flow = fluid.getFlowing().toString(); @@ -213,7 +182,6 @@ public class MekanismRenderer sprite = map.registerSprite(fluid.getStill()); } - // toUse = sprite; textureMap.get(FluidType.FLOWING).put(fluid, sprite); } @@ -230,12 +198,8 @@ public class MekanismRenderer sprite = map.registerSprite(fluid.getStill()); } - // toUse = sprite; textureMap.get(FluidType.STILL).put(fluid, sprite); } - // if (toUse != null) { - // textureMap.get(FluidType.FROZEN).put(fluid, toUse); - // } } } @@ -251,124 +215,20 @@ public class MekanismRenderer return map.containsKey(fluid) ? map.get(fluid) : missingIcon; } - public static boolean blockIconExists(String texture) //Credit to CoFHCore - { - String[] split = texture.split(":"); - texture = split[0] + ":textures/blocks/" + split[1] + ".png"; - - try { - Minecraft.getMinecraft().getResourceManager().getAllResources(new ResourceLocation(texture)); - return true; - } catch(Throwable t) { - return false; - } - } - - public static void loadDynamicTextures(TextureMap register, String name, TextureAtlasSprite[] textures, DefIcon... defaults) - { - for(EnumFacing side : EnumFacing.VALUES) - { - ResourceLocation tex = new ResourceLocation("mekanism:" + name + simpleSides[side.ordinal()]); - ResourceLocation texOn = new ResourceLocation(tex.toString() + "On"); - - if(blockIconExists(tex.toString())) - { - textures[side.ordinal()] = register.registerSprite(tex); - - if(blockIconExists(texOn.toString())) - { - textures[side.ordinal()+6] = register.registerSprite(texOn); - } - else { - boolean found = false; - - for(DefIcon def : defaults) - { - if(def.icons.contains(side.ordinal()+6) && def.overridesInactive) - { - textures[side.ordinal()+6] = def.defIcon; - found = true; - } - } - - if(!found) - { - textures[side.ordinal()+6] = register.registerSprite(tex); - } - } - } - else { - for(DefIcon def : defaults) - { - if(def.icons.contains(side.ordinal())) - { - textures[side.ordinal()] = def.defIcon; - } - - if(def.icons.contains(side.ordinal()+6)) - { - textures[side.ordinal()+6] = def.defIcon; - } - } - } - } - } - - public static class DefIcon - { - public TextureAtlasSprite defIcon; - - 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; - - for(int i : is) - { - icons.add(i); - } - } - - 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); - } - - public static DefIcon getActivePair(TextureAtlasSprite icon, int... is) - { - DefIcon ret = new DefIcon(icon, is); - - for(int i : is) - { - ret.icons.add(i+6); - } - - return ret; - } - } - public static class Model3D { - public double minX; - public double minY; - public double minZ; - public double maxX; - public double maxY; - public double maxZ; + public double posX, posY, posZ; - public ResourceLocation[] textures = new ResourceLocation[6]; + public double minX, minY, minZ; + public double maxX, maxY, maxZ; + + public double textureStartX = 0, textureStartY = 0, textureStartZ = 0; + public double textureSizeX = 16, textureSizeY = 16, textureSizeZ = 16; + public double textureOffsetX = 0, textureOffsetY = 0, textureOffsetZ = 0; + + public int[] textureFlips = new int[6]; + + public TextureAtlasSprite[] textures = new TextureAtlasSprite[6]; public boolean[] renderSides = new boolean[] {true, true, true, true, true, true, false}; @@ -383,6 +243,21 @@ public class MekanismRenderer maxY = yPos; maxZ = zPos; } + + public double sizeX() + { + return maxX-minX; + } + + public double sizeY() + { + return maxY-minY; + } + + public double sizeZ() + { + return maxZ-minZ; + } public void setSideRender(EnumFacing side, boolean value) { @@ -394,17 +269,17 @@ public class MekanismRenderer return renderSides[side.ordinal()]; } - public ResourceLocation getBlockTextureFromSide(int i) + public TextureAtlasSprite getBlockTextureFromSide(int i) { return textures[i]; } - public void setTexture(ResourceLocation tex) + public void setTexture(TextureAtlasSprite tex) { Arrays.fill(textures, tex); } - public void setTextures(ResourceLocation down, ResourceLocation up, ResourceLocation north, ResourceLocation south, ResourceLocation west, ResourceLocation east) + public void setTextures(TextureAtlasSprite down, TextureAtlasSprite up, TextureAtlasSprite north, TextureAtlasSprite south, TextureAtlasSprite west, TextureAtlasSprite east) { textures[0] = down; textures[1] = up; @@ -415,6 +290,15 @@ public class MekanismRenderer } } + public static void prepFlowing(Model3D model, Fluid fluid) + { + TextureAtlasSprite still = getFluidTexture(fluid, FluidType.STILL); + TextureAtlasSprite flowing = getFluidTexture(fluid, FluidType.FLOWING); + + model.setTextures(still, still, flowing, flowing, flowing, flowing); + model.textureFlips = new int[] {0, 0, 2, 2, 2, 2}; + } + public static void renderObject(Model3D object) { if(object == null) @@ -422,50 +306,10 @@ public class MekanismRenderer return; } -/* - renderBlocks.renderMaxX = object.maxX; - renderBlocks.renderMinX = object.minX; - renderBlocks.renderMaxY = object.maxY; - renderBlocks.renderMinY = object.minY; - renderBlocks.renderMaxZ = object.maxZ; - renderBlocks.renderMinZ = object.minZ; - - renderBlocks.enableAO = false; - - Tessellator.instance.startDrawingQuads(); - - if(object.shouldSideRender(EnumFacing.DOWN)) - { - renderBlocks.renderFaceYNeg(null, 0, 0, 0, object.getBlockTextureFromSide(0)); - } - - if(object.shouldSideRender(EnumFacing.UP)) - { - renderBlocks.renderFaceYPos(null, 0, 0, 0, object.getBlockTextureFromSide(1)); - } - - if(object.shouldSideRender(EnumFacing.NORTH)) - { - renderBlocks.renderFaceZNeg(null, 0, 0, 0, object.getBlockTextureFromSide(2)); - } - - if(object.shouldSideRender(EnumFacing.SOUTH)) - { - renderBlocks.renderFaceZPos(null, 0, 0, 0, object.getBlockTextureFromSide(3)); - } - - if(object.shouldSideRender(EnumFacing.WEST)) - { - renderBlocks.renderFaceXNeg(null, 0, 0, 0, object.getBlockTextureFromSide(4)); - } - - if(object.shouldSideRender(EnumFacing.EAST)) - { - renderBlocks.renderFaceXPos(null, 0, 0, 0, object.getBlockTextureFromSide(5)); - } - - Tessellator.instance.draw(); -*/ + GL11.glPushMatrix(); + GL11.glTranslated(object.minX, object.minY, object.minZ); + RenderResizableCuboid.INSTANCE.renderCube(object); + GL11.glPopMatrix(); } public static void color(EnumColor color) @@ -558,164 +402,6 @@ public class MekanismRenderer GL11.glCullFace(GL11.GL_BACK); GL11.glDisable(GL11.GL_CULL_FACE); } - - /** - * Cleaned-up snip of ItemRenderer.renderItem() -- meant to render 2D items as equipped. - * @param item - ItemStack to render - */ - public static void renderItem(ItemStack item) - { -/* - ResourceLocation icon = item.getItem().getIconIndex(item); - TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager(); - - if(icon == null) - { - GL11.glPopMatrix(); - return; - } - - texturemanager.bindTexture(texturemanager.getResourceLocation(item.getItemSpriteNumber())); - Tessellator tessellator = Tessellator.instance; - - float minU = icon.getMinU(); - float maxU = icon.getMaxU(); - float minV = icon.getMinV(); - float maxV = icon.getMaxV(); - - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glTranslatef(0.0F, -0.3F, 0.0F); - - GL11.glScalef(1.5F, 1.5F, 1.5F); - GL11.glRotatef(50.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(335.0F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(-0.9375F, -0.0625F, 0.0F); - - RenderManager.instance.itemRenderer.renderItemIn2D(tessellator, maxU, minV, minU, maxV, icon.getIconWidth(), icon.getIconHeight(), 0.0625F); - - GL11.glDisable(GL12.GL_RESCALE_NORMAL); -*/ - } - -/* - public static void prepareItemRender(RenderBlocks renderer, int metadata, Block block) - { - if(!(block instanceof ISpecialBounds) || ((ISpecialBounds)block).doDefaultBoundSetting(metadata)) - { - block.setBlockBoundsForItemRender(); - } - - if(block instanceof ISpecialBounds) - { - ((ISpecialBounds)block).setRenderBounds(block, metadata); - } - - if(!(block instanceof ISpecialBounds) || ((ISpecialBounds)block).doDefaultBoundSetting(metadata)) - { - renderer.setRenderBoundsFromBlock(block); - } - else { - renderer.setRenderBounds(0, 0, 0, 1, 1, 1); - } - - if(renderer.useInventoryTint) - { - int renderColor = block.getRenderColor(metadata); - float red = (renderColor >> 16 & 255) / 255.0F; - float green = (renderColor >> 8 & 255) / 255.0F; - float blue = (renderColor & 255) / 255.0F; - GL11.glColor4f(red, green, blue, 1.0F); - } - - GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - } - - public static void renderCustomItem(RenderBlocks renderer, ItemStack stack) - { - Block block = Block.getBlockFromItem(stack.getItem()); - - if(block instanceof ICustomBlockIcon) - { - ICustomBlockIcon custom = (ICustomBlockIcon)block; - prepareItemRender(renderer, stack.getItemDamage(), Block.getBlockFromItem(stack.getItem())); - - try { - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderer.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, custom.getIcon(stack, 0)); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderer.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, custom.getIcon(stack, 1)); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, -1.0F); - 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, 2)); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, custom.getIcon(stack, 4)); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, custom.getIcon(stack, 5)); - tessellator.draw(); - } catch(Exception e) {} - - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - } - } - - */ -/* - * Cleaned-up snip of RenderBlocks.renderBlockAsItem() -- used for rendering an item as an entity, - * in a player's inventory, and in a player's hand. - * @param renderer - RenderBlocks renderer to render the item with - * @param metadata - block/item metadata - * @param block - block to render - *//* - - public static void renderItem(RenderBlocks renderer, int metadata, Block block) - { - prepareItemRender(renderer, metadata, block); - - try { - Tessellator tessellator = Tessellator.instance; - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderer.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, metadata)); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderer.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, metadata)); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, -1.0F); - 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(2, metadata)); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, metadata)); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, metadata)); - tessellator.draw(); - } catch(Exception e) {} - - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - } -*/ public static void colorFluid(Fluid fluid) { @@ -775,20 +461,6 @@ public class MekanismRenderer return 0; } - public void drawTexturedModalRect(int par1, int par2, int par3, int par4, int par5, int par6) - { - int zLevel = 0; - float f = 0.00390625F; - float f1 = 0.00390625F; - WorldRenderer worldRenderer = Tessellator.getInstance().getWorldRenderer(); - worldRenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); - worldRenderer.pos((par1 + 0), (par2 + par6), zLevel).tex(((par3 + 0) * f), ((par4 + par6) * f1)).endVertex(); - worldRenderer.pos((par1 + par5), (par2 + par6), zLevel).tex(((par3 + par5) * f), ((par4 + par6) * f1)).endVertex(); - worldRenderer.pos((par1 + par5), (par2 + 0), zLevel).tex(((par3 + par5) * f), ((par4 + 0) * f1)).endVertex(); - worldRenderer.pos((par1 + 0), (par2 + 0), zLevel).tex(((par3 + 0) * f), ((par4 + 0) * f1)).endVertex(); - worldRenderer.finishDrawing(); - } - public static ResourceLocation getBlocksTexture() { return TextureMap.locationBlocksTexture; diff --git a/src/main/java/mekanism/client/render/MinerVisualRenderer.java b/src/main/java/mekanism/client/render/MinerVisualRenderer.java index 5ccecb42b..9d3f6097d 100644 --- a/src/main/java/mekanism/client/render/MinerVisualRenderer.java +++ b/src/main/java/mekanism/client/render/MinerVisualRenderer.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; import mekanism.api.Coord4D; +import mekanism.api.EnumColor; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.tile.TileEntityDigitalMiner; @@ -80,7 +81,7 @@ public final class MinerVisualRenderer toReturn.setBlockBounds(rel.xCoord + 0.4, rel.yCoord + 0.4, rel.zCoord + 0.4, rel.xCoord + 0.6, rel.yCoord + 0.6, rel.zCoord + 0.6); toReturn.baseBlock = Blocks.water; - //toReturn.setTexture(MekanismRenderer.getColorIcon(EnumColor.WHITE)); TODO + toReturn.setTexture(MekanismRenderer.getColorIcon(EnumColor.WHITE)); return toReturn; } diff --git a/src/main/java/mekanism/client/render/RenderResizableCuboid.java b/src/main/java/mekanism/client/render/RenderResizableCuboid.java new file mode 100644 index 000000000..0f6942ec6 --- /dev/null +++ b/src/main/java/mekanism/client/render/RenderResizableCuboid.java @@ -0,0 +1,663 @@ +package mekanism.client.render; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +import mekanism.client.render.MekanismRenderer.Model3D; +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.client.renderer.vertex.VertexFormatElement; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumFacing.Axis; +import net.minecraft.util.EnumFacing.AxisDirection; +import net.minecraft.util.Vec3; +import net.minecraft.util.Vec3i; +import net.minecraft.world.IBlockAccess; + +import org.lwjgl.opengl.GL11; + +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; + +/* + * Adapted from BuildCraft + */ +public class RenderResizableCuboid { + protected RenderManager manager = Minecraft.getMinecraft().getRenderManager(); + + public static final Vec3 VEC_ONE = vec3(1); + public static final Vec3 VEC_ZERO = vec3(0); + public static final Vec3 VEC_HALF = vec3(0.5); + + public interface IBlockLocation { + Vec3 transformToWorld(Vec3 vec); + } + + public interface IFacingLocation { + EnumFacing transformToWorld(EnumFacing face); + } + + public enum DefaultFacingLocation implements IFacingLocation { + INSTANCE; + + @Override + public EnumFacing transformToWorld(EnumFacing face) { + return face; + } + } + + public enum EnumShadeType { + FACE(DefaultVertexFormats.COLOR_4UB), + LIGHT(DefaultVertexFormats.TEX_2S), + AMBIENT_OCCLUSION(DefaultVertexFormats.COLOR_4UB); + + private final VertexFormatElement element; + + private EnumShadeType(VertexFormatElement element) { + this.element = element; + } + } + + public enum EnumShadeArgument { + NONE, + FACE(EnumShadeType.FACE), + FACE_LIGHT(EnumShadeType.FACE, EnumShadeType.LIGHT), + FACE_OCCLUDE(EnumShadeType.FACE, EnumShadeType.AMBIENT_OCCLUSION), + FACE_LIGHT_OCCLUDE(EnumShadeType.FACE, EnumShadeType.LIGHT, EnumShadeType.AMBIENT_OCCLUSION), + LIGHT(EnumShadeType.LIGHT), + LIGHT_OCCLUDE(EnumShadeType.LIGHT, EnumShadeType.AMBIENT_OCCLUSION), + OCCLUDE(EnumShadeType.AMBIENT_OCCLUSION); + + public final ImmutableSet types; + final VertexFormat vertexFormat; + + EnumShadeArgument(EnumShadeType... types) { + this.vertexFormat = new VertexFormat(); + vertexFormat.addElement(DefaultVertexFormats.POSITION_3F); + vertexFormat.addElement(DefaultVertexFormats.TEX_2F); + for (EnumShadeType type : types) { + if (!vertexFormat.getElements().contains(type.element)) vertexFormat.addElement(type.element); + } + this.types = ImmutableSet.copyOf(types); + } + + public boolean isEnabled(EnumShadeType type) { + return types.contains(type); + } + } + + public static final RenderResizableCuboid INSTANCE = new RenderResizableCuboid(); + + /** The AO map assumes that each direction in the world has a different amount of light going towards it. */ + private static final Map aoMap = Maps.newEnumMap(EnumFacing.class); + + private static final int U_MIN = 0; + private static final int U_MAX = 1; + private static final int V_MIN = 2; + private static final int V_MAX = 3; + + static { + // Static constants taken directly from minecraft's block renderer + // ( net.minecraft.client.renderer.BlockModelRenderer.EnumNeighborInfo ) + aoMap.put(EnumFacing.UP, vec3(1)); + aoMap.put(EnumFacing.DOWN, vec3(0.5)); + aoMap.put(EnumFacing.NORTH, vec3(0.8)); + aoMap.put(EnumFacing.SOUTH, vec3(0.8)); + aoMap.put(EnumFacing.EAST, vec3(0.6)); + aoMap.put(EnumFacing.WEST, vec3(0.6)); + } + + /** This will render a cuboid from its middle. */ + public void renderCubeFromCentre(Model3D cuboid) { + GL11.glPushMatrix(); + GL11.glTranslated(-cuboid.sizeX() / 2d, -cuboid.sizeY() / 2d, -cuboid.sizeZ() / 2d); + renderCube(cuboid, EnumShadeArgument.NONE, null, null, null); + GL11.glPopMatrix(); + } + + public void renderCube(Model3D cuboid) { + renderCube(cuboid, EnumShadeArgument.NONE, null, null, null); + } + + public void renderCube(Model3D cube, EnumShadeArgument shadeTypes, IBlockLocation formula, IFacingLocation faceFormula, IBlockAccess world) { + if (faceFormula == null) { + faceFormula = DefaultFacingLocation.INSTANCE; + } + + TextureAtlasSprite[] sprites = cube.textures; + + int[] flips = cube.textureFlips; + if (flips == null) { + flips = new int[6]; + } + + Vec3 textureStart = new Vec3(cube.textureStartX / 16D, cube.textureStartY / 16D, cube.textureStartZ / 16D); + Vec3 textureSize = new Vec3(cube.textureSizeX / 16D, cube.textureSizeY / 16D, cube.textureSizeZ / 16D); + Vec3 textureOffset = new Vec3(cube.textureOffsetX / 16D, cube.textureOffsetY / 16D, cube.textureOffsetZ / 16D); + Vec3 size = new Vec3(cube.sizeX(), cube.sizeY(), cube.sizeZ()); + + manager.renderEngine.bindTexture(TextureMap.locationBlocksTexture); + + Tessellator tess = Tessellator.getInstance(); + WorldRenderer wr = tess.getWorldRenderer(); + + GlStateManager.enableAlpha(); + GlStateManager.alphaFunc(GL11.GL_GREATER, 0.1F); + GlStateManager.disableLighting(); + + wr.begin(GL11.GL_QUADS, shadeTypes.vertexFormat); + + for (EnumFacing face : EnumFacing.values()) { + renderCuboidFace(wr, face, sprites, flips, textureStart, textureSize, size, textureOffset, shadeTypes, formula, faceFormula, world); + } + + tess.draw(); + + GlStateManager.disableAlpha(); + GlStateManager.enableLighting(); + GlStateManager.enableFog(); + } + + private void renderCuboidFace(WorldRenderer wr, EnumFacing face, TextureAtlasSprite[] sprites, int[] flips, Vec3 textureStart, Vec3 textureSize, + Vec3 size, Vec3 textureOffset, EnumShadeArgument shadeTypes, IBlockLocation locationFormula, IFacingLocation faceFormula, + IBlockAccess access) { + int ordinal = face.ordinal(); + if (sprites[ordinal] == null) { + return; + } + + Vec3 textureEnd = textureStart.add(textureSize); + float[] uv = getUVArray(sprites[ordinal], flips[ordinal], face, textureStart, textureEnd); + List renderInfoList = getRenderInfos(uv, face, size, textureSize, textureOffset); + + Axis u = face.getAxis() == Axis.X ? Axis.Z : Axis.X; + Axis v = face.getAxis() == Axis.Y ? Axis.Z : Axis.Y; + double other = face.getAxisDirection() == AxisDirection.POSITIVE ? getValue(size, face.getAxis()) : 0; + + /* Swap the face if this is positive: the renderer returns indexes that ALWAYS are for the negative face, so + * light it properly this way */ + face = face.getAxisDirection() == AxisDirection.NEGATIVE ? face : face.getOpposite(); + + EnumFacing opposite = face.getOpposite(); + + for (RenderInfo ri : renderInfoList) { + renderPoint(wr, face, u, v, other, ri, true, false, locationFormula, faceFormula, access, shadeTypes); + renderPoint(wr, face, u, v, other, ri, true, true, locationFormula, faceFormula, access, shadeTypes); + renderPoint(wr, face, u, v, other, ri, false, true, locationFormula, faceFormula, access, shadeTypes); + renderPoint(wr, face, u, v, other, ri, false, false, locationFormula, faceFormula, access, shadeTypes); + + renderPoint(wr, opposite, u, v, other, ri, false, false, locationFormula, faceFormula, access, shadeTypes); + renderPoint(wr, opposite, u, v, other, ri, false, true, locationFormula, faceFormula, access, shadeTypes); + renderPoint(wr, opposite, u, v, other, ri, true, true, locationFormula, faceFormula, access, shadeTypes); + renderPoint(wr, opposite, u, v, other, ri, true, false, locationFormula, faceFormula, access, shadeTypes); + } + } + + public static Vec3 withValue(Vec3 vector, Axis axis, double value) { + if (axis == Axis.X) return new Vec3(value, vector.yCoord, vector.zCoord); + else if (axis == Axis.Y) return new Vec3(vector.xCoord, value, vector.zCoord); + else if (axis == Axis.Z) return new Vec3(vector.xCoord, vector.yCoord, value); + else throw new RuntimeException("Was given a null axis! That was probably not intentional, consider this a bug! (Vector = " + vector + ")"); + } + + private void renderPoint(WorldRenderer wr, EnumFacing face, Axis u, Axis v, double other, RenderInfo ri, boolean minU, boolean minV, + IBlockLocation locationFormula, IFacingLocation faceFormula, IBlockAccess access, EnumShadeArgument shadeTypes) { + int U_ARRAY = minU ? U_MIN : U_MAX; + int V_ARRAY = minV ? V_MIN : V_MAX; + + Vec3 vertex = withValue(VEC_ZERO, u, ri.xyz[U_ARRAY]); + vertex = withValue(vertex, v, ri.xyz[V_ARRAY]); + vertex = withValue(vertex, face.getAxis(), other); + + wr.pos(vertex.xCoord, vertex.yCoord, vertex.zCoord); + wr.tex(ri.uv[U_ARRAY], ri.uv[V_ARRAY]); + + if (shadeTypes.isEnabled(EnumShadeType.FACE)) { + setWorldRendererRGB(wr, aoMap.get(faceFormula.transformToWorld(face))); + } + + if (shadeTypes.isEnabled(EnumShadeType.AMBIENT_OCCLUSION)) { + applyLocalAO(wr, faceFormula.transformToWorld(face), locationFormula, access, shadeTypes, vertex); + } else if (shadeTypes.isEnabled(EnumShadeType.LIGHT)) { + Vec3 transVertex = locationFormula.transformToWorld(vertex); + BlockPos pos = convertFloor(transVertex); + Block block = access.getBlockState(pos).getBlock(); + int combindedLight = block.getMixedBrightnessForBlock(access, pos); + wr.lightmap(combindedLight >> 16 & 65535, combindedLight & 65535); + } + + wr.endVertex(); + } + + public static BlockPos convertFloor(Vec3 vec) { + return new BlockPos(vec.xCoord, vec.yCoord, vec.zCoord); + } + + public static Vec3 convert(Vec3i vec3i) { + return new Vec3(vec3i.getX(), vec3i.getY(), vec3i.getZ()); + } + + public static Vec3 convert(EnumFacing face) { + if (face == null) { + return VEC_ZERO; + } + return new Vec3(face.getFrontOffsetX(), face.getFrontOffsetY(), face.getFrontOffsetZ()); + + } + + public static EnumFacing[] getNeighbours(EnumFacing face) { + EnumFacing[] faces = new EnumFacing[4]; + int ordinal = 0; + for (EnumFacing next : EnumFacing.values()) { + if (next.getAxis() != face.getAxis()) { + faces[ordinal] = next; + ordinal++; + } + } + return faces; + } + + private void applyLocalAO(WorldRenderer wr, EnumFacing face, IBlockLocation locationFormula, IBlockAccess access, EnumShadeArgument shadeTypes, + Vec3 vertex) { + // This doesn't work. At all. + boolean allAround = false; + + int numPositions = allAround ? 7 : 5; + int[] skyLight = new int[numPositions]; + int[] blockLight = new int[numPositions]; + float[] colorMultiplier = new float[numPositions]; + double[] distances = new double[numPositions]; + double totalDist = 0; + Vec3 transVertex = locationFormula.transformToWorld(vertex); + BlockPos pos = convertFloor(transVertex); + Block block = access.getBlockState(pos).getBlock(); + int combindedLight = block.getMixedBrightnessForBlock(access, pos); + + skyLight[0] = combindedLight / 0x10000; + blockLight[0] = combindedLight % 0x10000; + colorMultiplier[0] = block.getAmbientOcclusionLightValue(); + distances[0] = transVertex.distanceTo(convertMiddle(pos)); + + int index = 0; + EnumFacing[] testArray = allAround ? EnumFacing.values() : getNeighbours(face); + for (EnumFacing otherFace : testArray) { + Vec3 nearestOther = vertex.add(convert(otherFace)); + pos = convertFloor(locationFormula.transformToWorld(nearestOther)); + block = access.getBlockState(pos).getBlock(); + combindedLight = block.getMixedBrightnessForBlock(access, pos); + + index++; + + skyLight[index] = (int) (combindedLight / 0x10000); + blockLight[index] = (int) (combindedLight % 0x10000); + colorMultiplier[index] = block.getAmbientOcclusionLightValue(); + // The extra 0.1 is to stop any 1 divided by 0 errors + distances[index] = 1 / (transVertex.distanceTo(convertMiddle(pos)) + 0.1); + totalDist += distances[index]; + } + + double avgBlockLight = 0; + double avgSkyLight = 0; + float avgColorMultiplier = 0; + for (int i = 0; i < numPositions; i++) { + double part = distances[i] / totalDist; + avgBlockLight += blockLight[i] * part; + avgSkyLight += skyLight[i] * part; + avgColorMultiplier += colorMultiplier[i] * part; + } + + if (shadeTypes.isEnabled(EnumShadeType.LIGHT)) { + int capBlockLight = (int) avgBlockLight; + int capSkyLight = (int) avgSkyLight; + wr.lightmap(capBlockLight, capSkyLight); + } + + Vec3 color; + if (shadeTypes.isEnabled(EnumShadeType.FACE)) { + color = aoMap.get(face); + } else { + color = VEC_ONE; + } + color = multiply(color, avgColorMultiplier); + setWorldRendererRGB(wr, color); + } + + public static void setWorldRendererRGB(WorldRenderer wr, Vec3 color) { + wr.color((float) color.xCoord, (float) color.yCoord, (float) color.zCoord, 1f); + } + + public static Vec3 vec3(double value) { + return new Vec3(value, value, value); + } + + public static Vec3 multiply(Vec3 vec, double multiple) { + return new Vec3(vec.xCoord * multiple, vec.yCoord * multiple, vec.zCoord * multiple); + } + + public static Vec3 convertMiddle(Vec3i vec3i) { + return convert(vec3i).add(VEC_HALF); + } + + /** Note that this method DOES take into account its position. But not its rotation. (Open an issue on github if you + * need rotation, and a second method will be made that does all the trig required) */ + public void renderCubeStatic(List quads, Model3D cuboid) { + TextureAtlasSprite[] sprites = cuboid.textures; + + int[] flips = cuboid.textureFlips; + if (flips == null) { + flips = new int[6]; + } + + double textureStartX = cuboid.textureStartX / 16D; + double textureStartY = cuboid.textureStartY / 16D; + double textureStartZ = cuboid.textureStartZ / 16D; + + double textureSizeX = cuboid.textureSizeX / 16D; + double textureSizeY = cuboid.textureSizeY / 16D; + double textureSizeZ = cuboid.textureSizeZ / 16D; + + double textureEndX = textureSizeX + textureStartX; + double textureEndY = textureSizeY + textureStartY; + double textureEndZ = textureSizeZ + textureStartZ; + + double textureOffsetX = cuboid.textureOffsetX / 16D; + double textureOffsetY = cuboid.textureOffsetY / 16D; + double textureOffsetZ = cuboid.textureOffsetZ / 16D; + + double sizeX = cuboid.sizeX(); + double sizeY = cuboid.sizeY(); + double sizeZ = cuboid.sizeZ(); + + if (sprites[0] != null) { + // Down + float[] uv = getUVArray(sprites[0], flips[0], textureStartX, textureEndX, textureStartZ, textureEndZ); + for (RenderInfo ri : getRenderInfos(uv, sizeX, sizeZ, textureSizeX, textureSizeZ, textureOffsetX, textureOffsetZ)) { + ri = ri.offset(cuboid, Axis.Y); + double[][] arr = new double[4][]; + arr[0] = new double[] { ri.xyz[U_MAX], cuboid.posY, ri.xyz[V_MIN], -1, ri.uv[U_MAX], ri.uv[V_MIN], 0 }; + arr[1] = new double[] { ri.xyz[U_MAX], cuboid.posY, ri.xyz[V_MAX], -1, ri.uv[U_MAX], ri.uv[V_MAX], 0 }; + arr[2] = new double[] { ri.xyz[U_MIN], cuboid.posY, ri.xyz[V_MAX], -1, ri.uv[U_MIN], ri.uv[V_MAX], 0 }; + arr[3] = new double[] { ri.xyz[U_MIN], cuboid.posY, ri.xyz[V_MIN], -1, ri.uv[U_MIN], ri.uv[V_MIN], 0 }; + convertToDoubleQuads(quads, arr, EnumFacing.DOWN); + } + } + + if (sprites[1] != null) { + // Up + float[] uv = getUVArray(sprites[1], flips[1], textureStartX, textureEndX, textureStartZ, textureEndZ); + + for (RenderInfo ri : getRenderInfos(uv, sizeX, sizeZ, textureSizeX, textureSizeZ, textureOffsetX, textureOffsetZ)) { + ri = ri.offset(cuboid, Axis.Y); + double[][] arr = new double[4][]; + arr[0] = new double[] { ri.xyz[U_MAX], sizeY + cuboid.posY, ri.xyz[V_MIN], -1, ri.uv[U_MAX], ri.uv[V_MIN], 0 }; + arr[1] = new double[] { ri.xyz[U_MAX], sizeY + cuboid.posY, ri.xyz[V_MAX], -1, ri.uv[U_MAX], ri.uv[V_MAX], 0 }; + arr[2] = new double[] { ri.xyz[U_MIN], sizeY + cuboid.posY, ri.xyz[V_MAX], -1, ri.uv[U_MIN], ri.uv[V_MAX], 0 }; + arr[3] = new double[] { ri.xyz[U_MIN], sizeY + cuboid.posY, ri.xyz[V_MIN], -1, ri.uv[U_MIN], ri.uv[V_MIN], 0 }; + convertToDoubleQuads(quads, arr, EnumFacing.UP); + } + } + + if (sprites[2] != null) { + // North (-Z) + float[] uv = getUVArray(sprites[2], flips[2], textureStartX, textureEndX, textureStartY, textureEndY); + + for (RenderInfo ri : getRenderInfos(uv, sizeX, sizeY, textureSizeX, textureSizeY, textureOffsetX, textureOffsetY)) { + ri = ri.offset(cuboid, Axis.Z); + double[][] arr = new double[4][]; + arr[0] = new double[] { ri.xyz[U_MAX], ri.xyz[V_MIN], cuboid.posZ, -1, ri.uv[U_MAX], ri.uv[V_MIN], 0 }; + arr[1] = new double[] { ri.xyz[U_MAX], ri.xyz[V_MAX], cuboid.posZ, -1, ri.uv[U_MAX], ri.uv[V_MAX], 0 }; + arr[2] = new double[] { ri.xyz[U_MIN], ri.xyz[V_MAX], cuboid.posZ, -1, ri.uv[U_MIN], ri.uv[V_MAX], 0 }; + arr[3] = new double[] { ri.xyz[U_MIN], ri.xyz[V_MIN], cuboid.posZ, -1, ri.uv[U_MIN], ri.uv[V_MIN], 0 }; + convertToDoubleQuads(quads, arr, EnumFacing.NORTH); + } + } + + if (sprites[3] != null) { + // South (+Z) + float[] uv = getUVArray(sprites[3], flips[3], textureStartX, textureEndX, textureStartY, textureEndY); + + for (RenderInfo ri : getRenderInfos(uv, sizeX, sizeY, textureSizeX, textureSizeY, textureOffsetX, textureOffsetY)) { + ri = ri.offset(cuboid, Axis.Z); + double[][] arr = new double[4][]; + arr[0] = new double[] { ri.xyz[U_MAX], ri.xyz[V_MIN], cuboid.posZ + sizeZ, -1, ri.uv[U_MAX], ri.uv[V_MIN], 0 }; + arr[1] = new double[] { ri.xyz[U_MAX], ri.xyz[V_MAX], cuboid.posZ + sizeZ, -1, ri.uv[U_MAX], ri.uv[V_MAX], 0 }; + arr[2] = new double[] { ri.xyz[U_MIN], ri.xyz[V_MAX], cuboid.posZ + sizeZ, -1, ri.uv[U_MIN], ri.uv[V_MAX], 0 }; + arr[3] = new double[] { ri.xyz[U_MIN], ri.xyz[V_MIN], cuboid.posZ + sizeZ, -1, ri.uv[U_MIN], ri.uv[V_MIN], 0 }; + convertToDoubleQuads(quads, arr, EnumFacing.SOUTH); + } + } + + if (sprites[4] != null) { + // West (-X) + float[] uv = getUVArray(sprites[4], flips[4], textureStartZ, textureEndZ, textureStartY, textureEndY); + + for (RenderInfo ri : getRenderInfos(uv, sizeZ, sizeY, textureSizeZ, textureSizeY, textureOffsetZ, textureOffsetY)) { + ri = ri.offset(cuboid, Axis.X); + double[][] arr = new double[4][]; + arr[0] = new double[] { cuboid.posX, ri.xyz[V_MIN], ri.xyz[U_MAX], -1, ri.uv[U_MAX], ri.uv[V_MIN], 0 }; + arr[1] = new double[] { cuboid.posX, ri.xyz[V_MAX], ri.xyz[U_MAX], -1, ri.uv[U_MAX], ri.uv[V_MAX], 0 }; + arr[2] = new double[] { cuboid.posX, ri.xyz[V_MAX], ri.xyz[U_MIN], -1, ri.uv[U_MIN], ri.uv[V_MAX], 0 }; + arr[3] = new double[] { cuboid.posX, ri.xyz[V_MIN], ri.xyz[U_MIN], -1, ri.uv[U_MIN], ri.uv[V_MIN], 0 }; + convertToDoubleQuads(quads, arr, EnumFacing.WEST); + } + } + + if (sprites[5] != null) { + // East (+X) + float[] uv = getUVArray(sprites[5], flips[5], textureStartZ, textureEndZ, textureStartY, textureEndY); + + for (RenderInfo ri : getRenderInfos(uv, sizeZ, sizeY, textureSizeZ, textureSizeY, textureOffsetZ, textureOffsetY)) { + ri = ri.offset(cuboid, Axis.X); + double[][] arr = new double[4][]; + arr[0] = new double[] { cuboid.posX + sizeX, ri.xyz[V_MIN], ri.xyz[U_MAX], -1, ri.uv[U_MAX], ri.uv[V_MIN], 0 }; + arr[1] = new double[] { cuboid.posX + sizeX, ri.xyz[V_MAX], ri.xyz[U_MAX], -1, ri.uv[U_MAX], ri.uv[V_MAX], 0 }; + arr[2] = new double[] { cuboid.posX + sizeX, ri.xyz[V_MAX], ri.xyz[U_MIN], -1, ri.uv[U_MIN], ri.uv[V_MAX], 0 }; + arr[3] = new double[] { cuboid.posX + sizeX, ri.xyz[V_MIN], ri.xyz[U_MIN], -1, ri.uv[U_MIN], ri.uv[V_MIN], 0 }; + convertToDoubleQuads(quads, arr, EnumFacing.EAST); + } + } + } + + private void convertToDoubleQuads(List quads, double[][] points, EnumFacing face) { + BakedQuad quad = convertToQuad(points, face); + quads.add(quad); + + double[][] otherPoints = new double[][] { points[3], points[2], points[1], points[0] }; + quad = convertToQuad(otherPoints, face); + quads.add(quad); + } + + private BakedQuad convertToQuad(double[][] points, EnumFacing face) { + int[] list = new int[points.length * points[0].length]; + for (int i = 0; i < points.length; i++) { + double[] arr = points[i]; + for (int j = 0; j < arr.length; j++) { + double d = arr[j]; + int used = 0; + if (j == 3 || j == 6) {// Shade or unused + used = (int) d; + } else { + used = Float.floatToRawIntBits((float) d); + } + list[i * arr.length + j] = used; + } + } + return new BakedQuad(list, -1, face); + } + + /** Returns an array containing [uMin, uMax, vMin, vMax]. start* and end* must be doubles between 0 and 1 */ + private float[] getUVArray(TextureAtlasSprite sprite, int flips, double startU, double endU, double startV, double endV) { + float minU = sprite.getInterpolatedU(startU * 16); + float maxU = sprite.getInterpolatedU(endU * 16); + float minV = sprite.getInterpolatedV(startV * 16); + float maxV = sprite.getInterpolatedV(endV * 16); + float[] uvarray = new float[] { minU, maxU, minV, maxV }; + if (flips % 2 == 1) { + float holder = uvarray[0]; + uvarray[0] = uvarray[1]; + uvarray[1] = holder; + } + if (flips >> 1 % 2 == 1) { + float holder = uvarray[2]; + uvarray[2] = uvarray[3]; + uvarray[3] = holder; + } + return uvarray; + } + + private float[] getUVArray(TextureAtlasSprite sprite, int flips, EnumFacing face, Vec3 start, Vec3 end) { + Axis u = face.getAxis() == Axis.X ? Axis.Z : Axis.X; + Axis v = face.getAxis() == Axis.Y ? Axis.Z : Axis.Y; + + float minU = sprite.getInterpolatedU(getValue(start, u) * 16); + float maxU = sprite.getInterpolatedU(getValue(end, u) * 16); + float minV = sprite.getInterpolatedV(getValue(start, v) * 16); + float maxV = sprite.getInterpolatedV(getValue(end, v) * 16); + + float[] uvarray = new float[] { minU, maxU, minV, maxV }; + if (flips % 2 == 1) { + float holder = uvarray[0]; + uvarray[0] = uvarray[1]; + uvarray[1] = holder; + } + if (flips >> 1 % 2 == 1) { + float holder = uvarray[2]; + uvarray[2] = uvarray[3]; + uvarray[3] = holder; + } + return uvarray; + } + + private List getRenderInfos(float[] uv, EnumFacing face, Vec3 size, Vec3 texSize, Vec3 texOffset) { + Axis u = face.getAxis() == Axis.X ? Axis.Z : Axis.X; + Axis v = face.getAxis() == Axis.Y ? Axis.Z : Axis.Y; + + double sizeU = getValue(size, u); + double sizeV = getValue(size, v); + double textureSizeU = getValue(texSize, u); + double textureSizeV = getValue(texSize, v); + double textureOffsetU = getValue(texOffset, u); + double textureOffsetV = getValue(texOffset, v); + + return getRenderInfos(uv, sizeU, sizeV, textureSizeU, textureSizeV, textureOffsetU, textureOffsetV); + } + + public static double getValue(Vec3 vector, Axis axis) { + if (axis == Axis.X) return vector.xCoord; + else if (axis == Axis.Y) return vector.yCoord; + else if (axis == Axis.Z) return vector.zCoord; + else throw new RuntimeException("Was given a null axis! That was probably not intentional, consider this a bug! (Vector = " + vector + ")"); + } + + /** A way to automatically generate the different positions given the same arguments. + * + * @param rotation TODO */ + private List getRenderInfos(float[] uv, double sizeU, double sizeV, double textureSizeU, double textureSizeV, double textureOffsetU, + double textureOffsetV) { + + List infos = Lists.newArrayList(); + boolean firstU = true; + for (double u = 0; u < sizeU; u += textureSizeU) { + float[] uvCu = Arrays.copyOf(uv, 4); + double addU = textureSizeU; + boolean lowerU = false; + + // If there is an offset then make sure the texture positions are changed properly + if (firstU && textureOffsetU != 0) { + uvCu[U_MIN] = uvCu[U_MIN] + (uvCu[U_MAX] - uvCu[U_MIN]) * (float) textureOffsetU; + addU -= textureOffsetU; + // addU = 1 - textureOffsetU; + lowerU = true; + } + + // If the size of the texture is greater than the cuboid goes on for then make sure the texture + // positions are lowered + if (u + addU > sizeU) { + addU = sizeU - u; + if (firstU && textureOffsetU != 0) { + uvCu[U_MAX] = uvCu[U_MIN] + (uvCu[U_MAX] - uvCu[U_MIN]) * (float) (addU / (textureSizeU - textureOffsetU)); + } else { + uvCu[U_MAX] = uvCu[U_MIN] + (uvCu[U_MAX] - uvCu[U_MIN]) * (float) (addU / textureSizeU); + } + } + firstU = false; + boolean firstV = true; + for (double v = 0; v < sizeV; v += textureSizeV) { + float[] uvCv = Arrays.copyOf(uvCu, 4); + + double addV = textureSizeV; + + boolean lowerV = false; + + if (firstV && textureOffsetV != 0) { + uvCv[V_MIN] = uvCv[V_MIN] + (uvCv[V_MAX] - uvCv[V_MIN]) * (float) textureOffsetV; + addV -= textureOffsetV; + lowerV = true; + } + if (v + addV > sizeV) { + addV = sizeV - v; + if (firstV && textureOffsetV != 0) { + uvCv[V_MAX] = uvCv[V_MIN] + (uvCv[V_MAX] - uvCv[V_MIN]) * (float) (addV / (textureSizeV - textureOffsetV)); + } else { + uvCv[V_MAX] = uvCv[V_MIN] + (uvCv[V_MAX] - uvCv[V_MIN]) * (float) (addV / textureSizeV); + } + } + + double[] xyz = new double[4]; + xyz[U_MIN] = u; + xyz[U_MAX] = u + addU; + xyz[V_MIN] = v; + xyz[V_MAX] = v + addV; + infos.add(new RenderInfo(uvCv, xyz)); + + if (lowerV) { + v -= textureOffsetV; + } + firstV = false; + } + // If we lowered the U because the cuboid started on an offset, reset it back to what was actually + // rendered, not what the for loop assumes + if (lowerU) { + u -= textureOffsetU; + } + } + return infos; + } + + private static final class RenderInfo { + private final float[] uv; + private final double[] xyz; + + public RenderInfo(float[] uv, double[] xyz) { + this.uv = uv; + this.xyz = xyz; + } + + public RenderInfo offset(Model3D ent, Axis axis) { + switch (axis) { + case X: { + return new RenderInfo(uv, new double[] { xyz[0] + ent.posZ, xyz[1] + ent.posZ, xyz[2] + ent.posY, xyz[3] + ent.posY }); + } + case Y: { + return new RenderInfo(uv, new double[] { xyz[0] + ent.posX, xyz[1] + ent.posX, xyz[2] + ent.posZ, xyz[3] + ent.posZ }); + } + case Z: { + return new RenderInfo(uv, new double[] { xyz[0] + ent.posX, xyz[1] + ent.posX, xyz[2] + ent.posY, xyz[3] + ent.posY }); + } + } + return new RenderInfo(uv, xyz); + } + } +} \ No newline at end of file diff --git a/src/main/java/mekanism/client/render/ctm/CTM.java b/src/main/java/mekanism/client/render/ctm/CTM.java index 862aa322c..c40ebd968 100644 --- a/src/main/java/mekanism/client/render/ctm/CTM.java +++ b/src/main/java/mekanism/client/render/ctm/CTM.java @@ -273,13 +273,14 @@ public class CTM { CTMData data = ((ICTMBlock)state.getBlock()).getCTMData(state); // no block or a bad API user - if (con == null) { + if (con == null || data == null) + { return false; } boolean ret = false; - if(con.getBlock() instanceof ICTMBlock) + if(con.getBlock() instanceof ICTMBlock && ((ICTMBlock)con.getBlock()).getCTMData(con) != null) { String state2 = ((IStringSerializable)con.getValue(((ICTMBlock)con.getBlock()).getTypeProperty())).getName(); diff --git a/src/main/java/mekanism/client/render/entity/RenderFlame.java b/src/main/java/mekanism/client/render/entity/RenderFlame.java index 5040280ef..aaba3f992 100644 --- a/src/main/java/mekanism/client/render/entity/RenderFlame.java +++ b/src/main/java/mekanism/client/render/entity/RenderFlame.java @@ -26,6 +26,11 @@ public class RenderFlame extends Render @Override public void doRender(EntityFlame entity, double x, double y, double z, float f, float partialTick) { + if(entity.ticksExisted < 1) + { + return; + } + float alpha = (entity.ticksExisted+partialTick)/(float)EntityFlame.LIFESPAN; float size = (float)Math.pow(2*alpha, 2); diff --git a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java new file mode 100644 index 000000000..f9d0d7f6d --- /dev/null +++ b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java @@ -0,0 +1,146 @@ +package mekanism.client.render.item; + +import java.util.LinkedList; +import java.util.List; + +import javax.vecmath.Matrix4f; + +import mekanism.client.render.ctm.ModelChiselBlock; +import mekanism.client.render.tileentity.RenderFluidTank; +import mekanism.common.Tier.FluidTankTier; +import mekanism.common.block.states.BlockStateBasic.BasicBlockType; +import mekanism.common.block.states.BlockStateMachine.MachineType; +import mekanism.common.item.ItemBlockMachine; +import mekanism.common.tile.TileEntityFluidTank; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.client.model.Attributes; +import net.minecraftforge.client.model.IFlexibleBakedModel; +import net.minecraftforge.client.model.IPerspectiveAwareModel; +import net.minecraftforge.fluids.Fluid; + +import org.apache.commons.lang3.tuple.Pair; +import org.lwjgl.opengl.GL11; + +public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel +{ + private IBakedModel baseModel; + private ItemStack stack; + + private static final RenderFluidTank fluidTankRenderer = (RenderFluidTank)TileEntityRendererDispatcher.instance.mapSpecialRenderers.get(TileEntityFluidTank.class); + + public BakedCustomItemModel(IBakedModel model, ItemStack s) + { + baseModel = model; + stack = s; + } + + private void doRender(TransformType type) + { + BasicBlockType basicType = BasicBlockType.get(stack); + + if(basicType != null) + { + return; + } + + MachineType machineType = MachineType.get(stack); + + if(machineType != null) + { + if(machineType == MachineType.FLUID_TANK) + { + GL11.glPushMatrix(); + ItemBlockMachine itemMachine = (ItemBlockMachine)stack.getItem(); + float targetScale = (float)(itemMachine.getFluidStack(stack) != null ? itemMachine.getFluidStack(stack).amount : 0)/itemMachine.getCapacity(stack); + FluidTankTier tier = FluidTankTier.values()[itemMachine.getBaseTier(stack).ordinal()]; + Fluid fluid = itemMachine.getFluidStack(stack) != null ? itemMachine.getFluidStack(stack).getFluid() : null; + fluidTankRenderer.render(tier, fluid, targetScale, false, null, -0.5, -0.5, -0.5); + GL11.glPopMatrix(); + } + + return; + } + } + + @Override + public List getFaceQuads(EnumFacing facing) + { + List faceQuads = new LinkedList(); + + faceQuads.addAll(baseModel.getFaceQuads(facing)); + + return faceQuads; + } + + @Override + public List getGeneralQuads() + { + List generalQuads = new LinkedList(); + + generalQuads.addAll(baseModel.getGeneralQuads()); + + return generalQuads; + } + + @Override + public boolean isAmbientOcclusion() + { + return baseModel.isAmbientOcclusion(); + } + + @Override + public boolean isGui3d() + { + return baseModel.isGui3d(); + } + + @Override + public boolean isBuiltInRenderer() + { + return baseModel.isBuiltInRenderer(); + } + + @Override + public TextureAtlasSprite getParticleTexture() + { + return baseModel.getParticleTexture(); + } + + @Override + public ItemCameraTransforms getItemCameraTransforms() + { + return baseModel.getItemCameraTransforms(); + } + + @Override + public VertexFormat getFormat() + { + return Attributes.DEFAULT_BAKED_FORMAT; + } + + @Override + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) + { + if(cameraTransformType == TransformType.THIRD_PERSON) + { + ForgeHooksClient.multiplyCurrentGlMatrix(ModelChiselBlock.DEFAULT_BLOCK_THIRD_PERSON_MATRIX); + } + + GL11.glScalef(0.5F, 0.5F, 0.5F); + doRender(cameraTransformType); + GL11.glScalef(2.0F, 2.0F, 2.0F); + RenderHelper.enableStandardItemLighting(); + + return Pair.of(this, null); + } +} diff --git a/src/main/java/mekanism/client/render/item/BakedFluidModel.java b/src/main/java/mekanism/client/render/item/BakedFluidModel.java deleted file mode 100644 index 131ced2b8..000000000 --- a/src/main/java/mekanism/client/render/item/BakedFluidModel.java +++ /dev/null @@ -1,126 +0,0 @@ -package mekanism.client.render.item; - -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; - -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.IBakedModel; -import net.minecraft.util.EnumFacing; - -public class BakedFluidModel implements IBakedModel -{ - public static final int STAGES = 16; - - public static final HashMap[] MODELS = new HashMap[STAGES]; - - static - { - for(int x = 0; x < STAGES; x++) - { - MODELS[x] = new HashMap(); - } - } - - private IBakedModel baseModel; - private String fluidName; - private int fluidLevel; - private boolean cullFluidTop; - - public BakedFluidModel(IBakedModel model, String id, int level, boolean cullTop) - { - baseModel = model; - fluidName = id; - fluidLevel = level; - cullFluidTop = cullTop; - } - - @Override - public List getFaceQuads(EnumFacing facing) - { - List faceQuads = new LinkedList(); - - faceQuads.addAll(baseModel.getFaceQuads(facing)); - - if(fluidLevel > 0 && fluidLevel <= STAGES) - { - HashMap fluidModels = MODELS[fluidLevel - 1]; - - if(fluidModels.containsKey(fluidName)) - { - faceQuads.addAll(fluidModels.get(fluidName).getFaceQuads(facing)); - } - } - - return faceQuads; - } - - @Override - public List getGeneralQuads() - { - List generalQuads = new LinkedList(); - - generalQuads.addAll(baseModel.getGeneralQuads()); - - if(fluidLevel > 0 && fluidLevel <= STAGES) - { - HashMap fluidModels = MODELS[fluidLevel - 1]; - - if(fluidModels.containsKey(fluidName)) - { - // The fluid model needs a separate culling logic from the rest of the tank, - // because the top of the fluid is supposed to be visible if the tank block - // above is empty. (getGeneralQuads() handles quads that don't have a cullface - // annotation in the .json) - - if(cullFluidTop) - { - for(BakedQuad quad : fluidModels.get(fluidName).getGeneralQuads()) - { - if(quad.getFace() != EnumFacing.UP) - { - generalQuads.add(quad); - } - } - } - else { - generalQuads.addAll(fluidModels.get(fluidName).getGeneralQuads()); - } - } - } - - return generalQuads; - } - - @Override - public boolean isAmbientOcclusion() - { - return baseModel.isAmbientOcclusion(); - } - - @Override - public boolean isGui3d() - { - return baseModel.isGui3d(); - } - - @Override - public boolean isBuiltInRenderer() - { - return baseModel.isBuiltInRenderer(); - } - - @Override - public TextureAtlasSprite getParticleTexture() - { - return baseModel.getParticleTexture(); - } - - @Override - public ItemCameraTransforms getItemCameraTransforms() - { - return baseModel.getItemCameraTransforms(); - } -} \ No newline at end of file diff --git a/src/main/java/mekanism/client/render/item/FluidTankItemModel.java b/src/main/java/mekanism/client/render/item/CustomItemModelFactory.java similarity index 77% rename from src/main/java/mekanism/client/render/item/FluidTankItemModel.java rename to src/main/java/mekanism/client/render/item/CustomItemModelFactory.java index 1a5b38fbe..9536dc0ae 100644 --- a/src/main/java/mekanism/client/render/item/FluidTankItemModel.java +++ b/src/main/java/mekanism/client/render/item/CustomItemModelFactory.java @@ -1,6 +1,5 @@ package mekanism.client.render.item; -import java.util.HashMap; import java.util.List; import net.minecraft.client.renderer.block.model.BakedQuad; @@ -11,23 +10,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraftforge.client.model.ISmartItemModel; -public class FluidTankItemModel implements ISmartItemModel +public class CustomItemModelFactory implements ISmartItemModel { - public static final int STAGES = 16; - - public static final HashMap[] MODELS = new HashMap[STAGES]; - - static - { - for(int x = 0; x < STAGES; x++) - { - MODELS[x] = new HashMap(); - } - } - private IBakedModel baseModel; - public FluidTankItemModel(IBakedModel base) + public CustomItemModelFactory(IBakedModel base) { baseModel = base; } @@ -35,7 +22,7 @@ public class FluidTankItemModel implements ISmartItemModel @Override public IBakedModel handleItemState(ItemStack stack) { - return null; + return new BakedCustomItemModel(baseModel, stack); } @Override diff --git a/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java b/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java index f0dd973f3..62c0ea095 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java @@ -6,6 +6,7 @@ import java.util.Map; import mekanism.api.Coord4D; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; +import mekanism.client.render.MekanismRenderer.FluidType; import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.content.tank.SynchronizedTankData.ValveData; import mekanism.common.content.tank.TankUpdateProtocol; @@ -110,7 +111,7 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer { @@ -27,8 +24,6 @@ public class RenderFluidTank extends TileEntitySpecialRenderer cachedValveFluids = new HashMap(); private static int stages = 1400; - - private ModelFluidTank model = new ModelFluidTank(); @Override public void renderTileEntityAt(TileEntityFluidTank tileEntity, double x, double y, double z, float partialTick, int destroyStage) @@ -60,8 +55,8 @@ public class RenderFluidTank extends TileEntitySpecialRenderer { @@ -83,7 +83,7 @@ public class RenderThermalEvaporationController extends TileEntitySpecialRendere Model3D toReturn = new Model3D(); toReturn.baseBlock = Blocks.water; - toReturn.setTexture(fluid.getStill()); + toReturn.setTexture(MekanismRenderer.getFluidTexture(fluid, FluidType.STILL)); final int stages = getStages(data.height); DisplayInteger[] displays = new DisplayInteger[stages]; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java index 24bf21d4b..98e0cd589 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderThermoelectricBoiler.java @@ -5,6 +5,7 @@ import java.util.Map; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; +import mekanism.client.render.MekanismRenderer.FluidType; import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.client.render.tileentity.RenderDynamicTank.RenderData; import mekanism.client.render.tileentity.RenderDynamicTank.ValveRenderData; @@ -150,7 +151,7 @@ public class RenderThermoelectricBoiler extends TileEntitySpecialRenderer tierProperty = PropertyEnum.create("tier", BaseTier.class); + public static final PropertyEnum tierProperty = PropertyEnum.create("tier", BaseTier.class, BaseTier.BASIC, BaseTier.ADVANCED, BaseTier.ELITE, BaseTier.ULTIMATE); public static final PropertyCTMRenderContext ctmProperty = new PropertyCTMRenderContext(); public BlockStateBasic(BlockBasic block, PropertyEnum typeProperty) diff --git a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java index 37026d408..ec15efc5e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityDynamicTank.java @@ -9,6 +9,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.common.Mekanism; +import mekanism.common.PacketHandler; import mekanism.common.base.IFluidContainerManager; import mekanism.common.block.BlockBasic; import mekanism.common.content.tank.SynchronizedTankData; @@ -257,7 +258,7 @@ public class TileEntityDynamicTank extends TileEntityMultiblockeM}Q)9IikdGL)(e@%uQPAB^@s+AHmiTA|n4Zh%mUGTElrySMa!-qq`A3j{KV zNN_R2oKEAM^J~+o7&S&Voj9k7#wnm7sEJl(xG4$}-O#AXu0Y-XU|w?fem&3c`Mtl7 ztINq=Fgj*Zj6$IpZMRVlc~pkp=m_~+-{98C!$irFFD(*WlAjiVBApeS0J3}NLf`;2 zTe{)`NK+^xIW8|>%FoIq8Ns8bLl||ye`7yQDl1Z6h!=0FjD~ z@Ss!qSvind5CKG}bt(qKFeufa#t6LzCsH6B#Rvp7AQ-AbF%m;b9EFA+SXL8R7wMp^ zLt6662)iZ8OCpHh?^pXZYC$YSFoVH>pg4l#DjA{jmGTlDQ1QMQVG9)SF(T)cIDv;k z7HOxjQZmA_r-N7Uc(bxz8|HmOfs#Xp1ZXdUsZqq^3EgV|?UNkfUpIzD`|?V?0C51H zuu^2?e7I(W$#U%8EEEFD-jEALPEHD4LJ7=D58x#`WrXDuHOsN2L6>Sk0ZynGIfN>J zX;~HR)TXKkf;A9YTJO{YENo{uzQ#aMD6X?wtQH)@EJQkmVFo>pn=J&6>&#S`Yv+9u z%`+gZ&B@wBT+17|q*(;CB#3!}P!g_!9Je3|KDXe7%w}lL5{_pDzi)0RLxUHlfXJ-^ ztW^{|&_IYuZa8_$j9CdCMPU|Hc3rF2=rKxfNw?~>I$Wp4;UO+NOxQGoT+9D*5!o3e zR3HDTm++QcgrVu{>X#R<`v>rH(};3+Y`)y`N}-5&*G{G91#ZmzqNAuNSGi_=k7xbb zPqYc~@dpBXzRhSnJ9#@6cPH}q#nsihDa!@woEtqi?&9-tsZEK6mwsF3vR}FXv`ZWt zl|F03*oXb))lZ&h-U|j7SmB2AU1Ci}dewPk+WLZ&P2GPjJ=C#JGija4WU8a8Hy7M> z9p&&XJKO&3?A&GB-qAfZcBCK(t490~R|pE}jE>iwz* zwwV!UUc4wz-U!#fs<_y7#IbM6n758zPut$2*%BMQ$6@#Cr^GJW-#*{4?eg^!*RiD+ zPM$ouH}8i-&AmN6*~uI6!yVnD`uqEpH6uGRGe#vB985@lRoVQ@^4n35B(mn$J4MHm zoi^Rpnqb+_pB`L%ErMxWQT~Z(+d6tSBxSU8 z_DST_M)$1xE9)w5-)^~jb^JF)$8O}OtQp_g*VN|r?(gW%-P`6yJC|sST4Sa=w`DJA zaUMSXtj(?6lKIn3b^PhwwUrH~nv5MEt9P|`i906$`1m_AJ|?&J!zO%N_Wh_w6GnW$ z<86z+^>JU{;hX%13p2~vxE#wnM^Pm^_hH4n=}~)`x}3YJrklL&)`P^=wJ9--VuFpH z<9&)oj);qkYptlPymxllv_v>*&BQP39=`Y0#RlM?e<$+5XXhsV-OeAcD~)e5O&LSa vp{EtkKC?`z^p&?CpD@OV$1CfTo*}0d3wx`QYOk$m4gHJlmTamqV|n#I-%K?| literal 0 HcmV?d00001 From 374cc57515bb89d47269241430840a8c1c270891 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 10 May 2016 22:24:37 -0400 Subject: [PATCH 11/22] Use new GlStateManager methods, got armor models to render (though the transformations seriously need to be updated) --- src/api/java/buildcraft/api/APIHelper.java | 4 +- .../java/buildcraft/api/ITripleRegistry.java | 4 +- .../buildcraft/api/blocks/package-info.java | 1 + .../api/blueprints/IBuilderContext.java | 1 - .../api/blueprints/MappingRegistry.java | 11 +- .../buildcraft/api/blueprints/Schematic.java | 1 - .../api/blueprints/SchematicBlock.java | 11 +- .../api/blueprints/SchematicEntity.java | 1 - .../api/blueprints/SchematicFluid.java | 1 - .../api/blueprints/SchematicMask.java | 1 - .../api/blueprints/SchematicTile.java | 1 - .../api/blueprints/package-info.java | 1 + .../api/boards/RedstoneBoardRobotNBT.java | 1 - .../buildcraft/api/boards/package-info.java | 1 + .../buildcraft/api/core/BuildCraftAPI.java | 6 +- .../buildcraft/api/core/ConfigAccessor.java | 4 +- .../java/buildcraft/api/core/EnumColor.java | 1 - .../buildcraft/api/core/EnumPipePart.java | 6 +- .../java/buildcraft/api/core/Identifier.java | 1 - .../buildcraft/api/core/package-info.java | 1 + .../buildcraft/api/crops/package-info.java | 1 + .../api/enums/EnumBlueprintType.java | 1 - .../buildcraft/api/enums/EnumEnergyStage.java | 4 +- .../api/enums/EnumLaserTableType.java | 1 - .../api/enums/EnumMachineState.java | 1 - .../java/buildcraft/api/enums/EnumSpring.java | 1 - .../buildcraft/api/enums/package-info.java | 1 + .../buildcraft/api/events/RobotEvent.java | 2 - .../buildcraft/api/events/package-info.java | 1 + .../buildcraft/api/facades/package-info.java | 1 + .../buildcraft/api/filler/package-info.java | 1 + .../buildcraft/api/fuels/ICoolantManager.java | 1 - .../buildcraft/api/fuels/package-info.java | 1 + .../api/gates/GateExpansionController.java | 1 - .../buildcraft/api/gates/GateExpansions.java | 4 +- .../buildcraft/api/gates/IGateExpansion.java | 1 - .../buildcraft/api/gates/package-info.java | 1 + .../buildcraft/api/items/IBlueprintItem.java | 1 - .../buildcraft/api/items/IMapLocation.java | 1 - .../buildcraft/api/items/package-info.java | 1 + .../buildcraft/api/library/package-info.java | 1 + .../api/lists/ListMatchHandler.java | 1 + .../buildcraft/api/lists/package-info.java | 1 + src/api/java/buildcraft/api/package-info.java | 1 + .../buildcraft/api/power/ILaserTarget.java | 1 - .../api/power/IRedstoneEngineReceiver.java | 1 - .../buildcraft/api/power/package-info.java | 1 + .../BuildCraftExtendedProperty.java | 6 +- .../api/properties/BuildCraftProperties.java | 14 +- .../buildcraft/api/recipes/package-info.java | 1 + .../buildcraft/api/robots/DockingStation.java | 2 - .../api/robots/EntityRobotBase.java | 5 +- .../api/robots/ResourceIdBlock.java | 4 +- .../api/robots/ResourceIdRequest.java | 4 +- .../buildcraft/api/robots/package-info.java | 1 + .../api/statements/StatementManager.java | 1 - .../containers/ISidedStatementContainer.java | 1 - .../api/statements/package-info.java | 1 + .../buildcraft/api/tablet/package-info.java | 1 + .../api/tiles/ITileAreaProvider.java | 1 - .../buildcraft/api/tiles/package-info.java | 1 + .../buildcraft/api/tools/package-info.java | 1 + .../java/buildcraft/api/transport/IPipe.java | 1 - .../buildcraft/api/transport/IPipeTile.java | 1 - .../api/transport/PipeConnectionAPI.java | 4 +- .../buildcraft/api/transport/PipeManager.java | 1 - .../api/transport/package-info.java | 1 + .../transport/pipe_bc8/IConnection_BC8.java | 1 - .../pipe_bc8/IExtractionManager.java | 1 - .../transport/pipe_bc8/IInsertionManager.java | 1 - .../api/transport/pipe_bc8/IPipeContents.java | 1 - .../pipe_bc8/IPipeContentsEditable.java | 5 +- .../api/transport/pipe_bc8/IPipeHelper.java | 2 - .../pipe_bc8/IPipePropertyProvider.java | 1 - .../api/transport/pipe_bc8/IPipeRegistry.java | 1 - .../api/transport/pipe_bc8/IPipe_BC8.java | 1 - .../api/transport/pipe_bc8/PipeAPI_BC8.java | 1 - .../transport/pipe_bc8/PipeBehaviour_BC8.java | 3 +- .../transport/pipe_bc8/PipeConnectionAPI.java | 5 +- .../pipe_bc8/PipeDefinition_BC8.java | 2 - .../event_bc8/IPipeEventConnection_BC8.java | 1 - .../event_bc8/IPipeEventContents_BC8.java | 1 - .../event_bc8/IPipeEventInteract_BC8.java | 1 - .../IPipePluggableDynamicRenderer.java | 1 - .../pluggable/IPipePluggableItem.java | 1 - .../IPipePluggableStaticRenderer.java | 1 - .../transport/pluggable/PipePluggable.java | 1 - .../computercraft/api/ComputerCraftAPI.java | 10 +- .../computercraft/api/filesystem/IMount.java | 2 + .../api/filesystem/IWritableMount.java | 2 + .../api/filesystem/package-info.java | 2 +- .../computercraft/api/lua/package-info.java | 1 + .../computercraft/api/media/IMedia.java | 2 +- .../computercraft/api/media/package-info.java | 1 + .../computercraft/api/package-info.java | 2 +- .../api/peripheral/IComputerAccess.java | 1 + .../api/peripheral/package-info.java | 1 + .../api/permissions/package-info.java | 2 +- .../api/redstone/package-info.java | 1 + .../api/turtle/ITurtleAccess.java | 6 +- .../api/turtle/ITurtleUpgrade.java | 6 +- .../api/turtle/package-info.java | 1 + src/api/java/ic2/api/crops/CropCard.java | 3 - src/api/java/ic2/api/crops/Crops.java | 4 - src/api/java/ic2/api/energy/IEnergyNet.java | 3 +- .../ic2/api/energy/event/EnergyTileEvent.java | 6 +- .../ic2/api/energy/tile/IEnergyEmitter.java | 1 - .../java/ic2/api/event/ExplosionEvent.java | 4 +- src/api/java/ic2/api/event/LaserEvent.java | 4 +- src/api/java/ic2/api/event/PaintEvent.java | 4 +- .../java/ic2/api/event/RetextureEvent.java | 4 +- src/api/java/ic2/api/info/Info.java | 1 - src/api/java/ic2/api/item/ILatheItem.java | 1 - .../recipe/ICannerEnrichRecipeManager.java | 1 - .../api/recipe/RecipeInputFluidContainer.java | 1 - .../ic2/api/recipe/RecipeInputItemStack.java | 1 - .../ic2/api/recipe/RecipeInputOreDict.java | 1 - src/api/java/li/cil/oc/api/API.java | 3 +- src/api/java/li/cil/oc/api/Driver.java | 4 +- src/api/java/li/cil/oc/api/IMC.java | 1 + src/api/java/li/cil/oc/api/Items.java | 4 +- src/api/java/li/cil/oc/api/Machine.java | 6 +- src/api/java/li/cil/oc/api/Nanomachines.java | 4 +- .../li/cil/oc/api/component/package-info.java | 2 +- .../java/li/cil/oc/api/detail/DriverAPI.java | 4 +- .../java/li/cil/oc/api/detail/ItemAPI.java | 4 +- .../java/li/cil/oc/api/detail/MachineAPI.java | 4 +- .../oc/api/driver/item/UpgradeRenderer.java | 6 +- .../cil/oc/api/driver/item/package-info.java | 2 +- .../li/cil/oc/api/driver/package-info.java | 2 +- .../li/cil/oc/api/event/GeolyzerEvent.java | 6 +- .../li/cil/oc/api/event/RobotRenderEvent.java | 5 +- .../li/cil/oc/api/event/package-info.java | 2 +- src/api/java/li/cil/oc/api/fs/FileSystem.java | 4 +- .../java/li/cil/oc/api/fs/package-info.java | 2 +- .../java/li/cil/oc/api/internal/Agent.java | 4 +- .../li/cil/oc/api/internal/package-info.java | 2 +- .../li/cil/oc/api/machine/Architecture.java | 8 +- .../java/li/cil/oc/api/machine/Arguments.java | 4 +- .../java/li/cil/oc/api/machine/Machine.java | 4 +- .../li/cil/oc/api/machine/package-info.java | 2 +- .../li/cil/oc/api/manual/package-info.java | 2 +- .../java/li/cil/oc/api/network/Component.java | 4 +- .../li/cil/oc/api/network/package-info.java | 2 +- .../api/prefab/ResourceContentProvider.java | 11 +- .../oc/api/prefab/TextureTabIconRenderer.java | 1 + .../li/cil/oc/api/prefab/package-info.java | 2 +- .../waila/api/IWailaCommonAccessor.java | 1 - .../waila/api/IWailaSummaryProvider.java | 4 +- .../waila/api/IWailaTooltipRenderer.java | 2 +- .../mcp/mobius/waila/api/package-info.java | 2 +- .../codechicken/core/launch/DepLoader.java | 57 +++-- .../java/cofh/api/energy/package-info.java | 2 +- src/main/java/cofh/api/item/package-info.java | 2 +- src/main/java/cofh/api/package-info.java | 1 + .../mekanism/api/gas/GasTransmission.java | 1 - .../client/ClientConnectionHandler.java | 1 - .../java/mekanism/client/ClientProxy.java | 8 +- .../mekanism/client/entity/EntityLaser.java | 25 +- .../gui/GuiAdvancedElectricMachine.java | 5 +- .../mekanism/client/gui/GuiBoilerStats.java | 5 +- .../mekanism/client/gui/GuiChanceMachine.java | 5 +- .../client/gui/GuiChemicalCrystallizer.java | 10 +- .../gui/GuiChemicalDissolutionChamber.java | 7 +- .../client/gui/GuiChemicalInfuser.java | 5 +- .../client/gui/GuiChemicalOxidizer.java | 5 +- .../client/gui/GuiChemicalWasher.java | 5 +- .../mekanism/client/gui/GuiDictionary.java | 14 +- .../mekanism/client/gui/GuiDigitalMiner.java | 11 +- .../client/gui/GuiDigitalMinerConfig.java | 22 +- .../mekanism/client/gui/GuiDynamicTank.java | 5 +- .../client/gui/GuiElectricMachine.java | 5 +- .../mekanism/client/gui/GuiElectricPump.java | 5 +- .../client/gui/GuiElectrolyticSeparator.java | 7 +- .../mekanism/client/gui/GuiEnergyCube.java | 5 +- .../java/mekanism/client/gui/GuiFactory.java | 6 +- .../mekanism/client/gui/GuiFluidTank.java | 5 +- .../client/gui/GuiFluidicPlenisher.java | 5 +- .../client/gui/GuiFormulaicAssemblicator.java | 10 +- .../client/gui/GuiFuelwoodHeater.java | 5 +- .../java/mekanism/client/gui/GuiGasTank.java | 5 +- .../client/gui/GuiInductionMatrix.java | 5 +- .../client/gui/GuiLaserAmplifier.java | 7 +- .../client/gui/GuiLogisticalSorter.java | 26 +- .../mekanism/client/gui/GuiMFilterSelect.java | 5 +- .../client/gui/GuiMItemStackFilter.java | 22 +- .../client/gui/GuiMMaterialFilter.java | 22 +- .../mekanism/client/gui/GuiMModIDFilter.java | 18 +- .../client/gui/GuiMOreDictFilter.java | 18 +- .../mekanism/client/gui/GuiMatrixStats.java | 5 +- .../java/mekanism/client/gui/GuiMekanism.java | 9 +- .../client/gui/GuiMetallurgicInfuser.java | 5 +- .../client/gui/GuiOredictionificator.java | 10 +- .../gui/GuiOredictionificatorFilter.java | 10 +- src/main/java/mekanism/client/gui/GuiPRC.java | 5 +- .../mekanism/client/gui/GuiPersonalChest.java | 5 +- .../client/gui/GuiQuantumEntangloporter.java | 5 +- .../client/gui/GuiResistiveHeater.java | 5 +- .../mekanism/client/gui/GuiRobitCrafting.java | 5 +- .../client/gui/GuiRobitInventory.java | 5 +- .../mekanism/client/gui/GuiRobitMain.java | 5 +- .../mekanism/client/gui/GuiRobitRepair.java | 11 +- .../client/gui/GuiRotaryCondensentrator.java | 5 +- .../mekanism/client/gui/GuiSecurityDesk.java | 5 +- .../mekanism/client/gui/GuiSeismicReader.java | 43 ++-- .../client/gui/GuiSeismicVibrator.java | 5 +- .../client/gui/GuiSideConfiguration.java | 5 +- .../client/gui/GuiSolarNeutronActivator.java | 5 +- .../mekanism/client/gui/GuiTFilterSelect.java | 5 +- .../client/gui/GuiTItemStackFilter.java | 18 +- .../client/gui/GuiTMaterialFilter.java | 18 +- .../mekanism/client/gui/GuiTModIDFilter.java | 14 +- .../client/gui/GuiTOreDictFilter.java | 14 +- .../mekanism/client/gui/GuiTeleporter.java | 5 +- .../gui/GuiThermalEvaporationController.java | 5 +- .../client/gui/GuiThermoelectricBoiler.java | 5 +- .../client/gui/GuiTransporterConfig.java | 10 +- .../client/gui/GuiUpgradeManagement.java | 18 +- .../client/gui/element/GuiConfigTypeTab.java | 1 - .../gui/element/GuiContainerEditMode.java | 1 - .../client/gui/element/GuiDetectionTab.java | 1 - .../client/gui/element/GuiElement.java | 7 +- .../client/gui/element/GuiEnergyGauge.java | 1 - .../client/gui/element/GuiGasGauge.java | 1 - .../mekanism/client/gui/element/GuiGraph.java | 5 +- .../client/gui/element/GuiMatrixTab.java | 1 - .../client/gui/element/GuiNumberGauge.java | 1 - .../client/gui/element/GuiPowerBar.java | 1 - .../client/gui/element/GuiRateBar.java | 1 - .../gui/element/GuiRedstoneControl.java | 1 - .../client/gui/element/GuiScrollList.java | 6 +- .../client/gui/element/GuiSortingTab.java | 1 - .../gui/element/GuiTransporterConfigTab.java | 1 - .../client/model/ModelArmoredJetpack.java | 11 +- .../client/model/ModelAtomicDisassembler.java | 5 +- .../mekanism/client/model/ModelBalloon.java | 20 +- .../mekanism/client/model/ModelChargepad.java | 14 +- .../client/model/ModelDigitalMiner.java | 14 +- .../client/model/ModelEnergyCube.java | 14 +- .../mekanism/client/model/ModelGasMask.java | 5 +- .../mekanism/client/model/ModelJetpack.java | 10 +- .../model/ModelQuantumEntangloporter.java | 14 +- .../client/model/ModelResistiveHeater.java | 14 +- .../mekanism/client/model/ModelRobit.java | 12 +- .../client/model/ModelSecurityDesk.java | 14 +- .../client/render/MekanismRenderer.java | 5 +- .../client/render/MinerVisualRenderer.java | 5 +- .../client/render/ModelCustomArmor.java | 20 +- .../client/render/RenderPartTransmitter.java | 30 +-- .../client/render/RenderResizableCuboid.java | 4 +- .../java/mekanism/client/render/ctm/Dir.java | 1 - .../client/render/entity/RenderBalloon.java | 7 +- .../client/render/entity/RenderFlame.java | 16 +- .../entity/RenderObsidianTNTPrimed.java | 6 +- .../client/render/entity/RenderRobit.java | 1 - .../render/item/BakedCustomItemModel.java | 187 +++++++++++++- .../render/item/ItemRenderingHandler.java | 236 +++++++++--------- .../render/particle/EntityJetpackFlameFX.java | 1 - .../render/particle/EntityJetpackSmokeFX.java | 1 - .../render/particle/EntityScubaBubbleFX.java | 1 - .../client/render/tileentity/RenderBin.java | 108 ++++---- .../render/tileentity/RenderChargepad.java | 23 +- .../RenderChemicalCrystallizer.java | 23 +- .../RenderChemicalDissolutionChamber.java | 23 +- .../tileentity/RenderChemicalInfuser.java | 20 +- .../tileentity/RenderChemicalOxidizer.java | 17 +- .../tileentity/RenderChemicalWasher.java | 18 +- .../tileentity/RenderConfigurableMachine.java | 20 +- .../render/tileentity/RenderDigitalMiner.java | 3 - .../render/tileentity/RenderDynamicTank.java | 5 +- .../render/tileentity/RenderElectricPump.java | 23 +- .../RenderElectrolyticSeparator.java | 25 +- .../render/tileentity/RenderEnergyCube.java | 41 +-- .../render/tileentity/RenderFluidTank.java | 5 +- .../tileentity/RenderFluidicPlenisher.java | 23 +- .../render/tileentity/RenderGasTank.java | 24 +- .../tileentity/RenderLaserAmplifier.java | 43 ++-- .../tileentity/RenderLaserTractorBeam.java | 38 +-- .../tileentity/RenderLogisticalSorter.java | 31 ++- .../tileentity/RenderPersonalChest.java | 31 ++- .../RenderPressurizedReactionChamber.java | 23 +- .../RenderQuantumEntangloporter.java | 24 +- .../tileentity/RenderResistiveHeater.java | 23 +- .../RenderRotaryCondensentrator.java | 23 +- .../render/tileentity/RenderSecurityDesk.java | 23 +- .../tileentity/RenderSeismicVibrator.java | 23 +- .../RenderSolarNeutronActivator.java | 23 +- .../render/tileentity/RenderTeleporter.java | 7 +- .../RenderThermalEvaporationController.java | 5 +- .../RenderThermoelectricBoiler.java | 5 +- .../java/mekanism/common/FluidNetwork.java | 2 +- .../java/mekanism/common/FuelHandler.java | 2 +- .../java/mekanism/common/LaserManager.java | 3 +- .../java/mekanism/common/MekanismItems.java | 1 - .../java/mekanism/common/asm/LoadingHook.java | 2 +- .../common/base/EnergyAcceptorWrapper.java | 3 +- .../common/base/IAdvancedBoundingBlock.java | 2 +- .../mekanism/common/base/IEnergyWrapper.java | 2 +- .../java/mekanism/common/base/IFactory.java | 1 - .../common/base/ISideConfiguration.java | 1 - .../mekanism/common/block/BlockBounding.java | 1 - .../common/block/BlockObsidianTNT.java | 5 - .../java/mekanism/common/block/BlockOre.java | 3 - .../common/block/states/BlockStateBasic.java | 26 +- .../block/states/BlockStateBounding.java | 2 - .../block/states/BlockStateEnergyCube.java | 3 - .../common/block/states/BlockStateOre.java | 2 - .../block/states/BlockStatePlastic.java | 5 - .../common/capabilities/CableOutputter.java | 3 - .../common/capabilities/Capabilities.java | 1 - .../capabilities/GridTransmitterTile.java | 1 - .../capabilities/LogisticalTransporter.java | 1 - .../capabilities/StrictEnergyAcceptor.java | 1 - .../capabilities/StrictEnergyStorage.java | 1 - .../content/transporter/TItemStackFilter.java | 3 - .../content/transporter/TMaterialFilter.java | 3 - .../content/transporter/TModIDFilter.java | 3 - .../content/transporter/TOreDictFilter.java | 3 - .../transporter/TransporterManager.java | 2 +- .../common/integration/CCPeripheral.java | 4 +- .../common/integration/MekanismHooks.java | 1 - .../common/integration/OreDictManager.java | 2 +- .../container/ContainerPersonalChest.java | 1 - .../common/item/ItemAtomicDisassembler.java | 2 +- .../common/item/ItemBlockEnergyCube.java | 2 +- .../common/item/ItemBlockMachine.java | 4 +- .../mekanism/common/item/ItemEnergized.java | 2 +- .../mekanism/common/item/ItemFreeRunners.java | 2 +- .../common/item/ItemGaugeDropper.java | 2 - .../mekanism/common/item/ItemJetpack.java | 8 - .../common/item/ItemNetworkReader.java | 3 +- .../mekanism/common/item/ItemUpgrade.java | 5 +- .../common/multipart/ItemGlowPanel.java | 30 +-- .../common/multipart/ItemPartTransmitter.java | 7 +- .../common/multipart/MultipartMekanism.java | 11 +- .../multipart/MultipartTransmitter.java | 5 +- .../multipart/PartDiversionTransporter.java | 1 - .../common/multipart/PartGlowPanel.java | 21 +- .../common/multipart/PartMechanicalPipe.java | 4 - .../common/multipart/PartPressurizedTube.java | 4 - .../common/multipart/PartTransmitter.java | 3 +- .../common/multipart/PartUniversalCable.java | 5 +- .../multipart/PlasticMicroMaterial.java | 4 +- .../common/multipart/TransmitterType.java | 1 - .../common/network/PacketConfigSync.java | 2 +- .../common/network/PacketTileEntity.java | 1 - .../common/recipe/ShapedMekanismRecipe.java | 2 - .../tile/TileEntityAdvancedBoundingBlock.java | 4 +- .../tile/TileEntityAmbientAccumulator.java | 2 - .../mekanism/common/tile/TileEntityBin.java | 3 +- .../common/tile/TileEntityBoilerCasing.java | 3 - .../common/tile/TileEntityChargepad.java | 3 +- .../common/tile/TileEntityDigitalMiner.java | 2 +- .../common/tile/TileEntityElectricBlock.java | 4 +- .../tile/TileEntityElectrolyticSeparator.java | 2 - .../common/tile/TileEntityEnergyCube.java | 3 +- .../common/tile/TileEntityFactory.java | 2 +- .../common/tile/TileEntityFluidTank.java | 2 - .../tile/TileEntityFluidicPlenisher.java | 3 +- .../common/tile/TileEntityGasTank.java | 2 +- .../tile/TileEntityInductionCasing.java | 2 +- .../common/tile/TileEntityInductionCell.java | 2 +- .../common/tile/TileEntityInductionPort.java | 4 +- .../mekanism/common/tile/TileEntityLaser.java | 2 +- .../common/tile/TileEntityLaserAmplifier.java | 4 +- .../tile/TileEntityLaserTractorBeam.java | 2 +- .../tile/TileEntityLogisticalSorter.java | 2 +- .../tile/TileEntityNoisyElectricBlock.java | 1 - .../mekanism/common/tile/TileEntityPRC.java | 2 +- .../tile/TileEntitySolarNeutronActivator.java | 2 +- .../tile/TileEntitySuperheatingElement.java | 1 - .../java/mekanism/common/util/CableUtils.java | 3 +- .../java/mekanism/common/util/HeatUtils.java | 1 - .../java/mekanism/common/util/MinerUtils.java | 1 - .../java/mekanism/common/util/PipeUtils.java | 1 - .../client/BlockRenderingHandler.java | 32 +-- .../client/gui/GuiReactorLogicAdapter.java | 4 +- .../client/model/ModelHeatGenerator.java | 8 +- .../generators/client/model/ModelTurbine.java | 46 ++-- .../render/RenderAdvancedSolarGenerator.java | 16 +- .../client/render/RenderBioGenerator.java | 22 +- .../client/render/RenderGasGenerator.java | 20 +- .../client/render/RenderHeatGenerator.java | 16 +- .../render/RenderIndustrialTurbine.java | 4 +- .../client/render/RenderReactor.java | 28 +-- .../client/render/RenderSolarGenerator.java | 8 +- .../client/render/RenderTurbineRotor.java | 16 +- .../client/render/RenderWindGenerator.java | 16 +- .../render/item/GeneratorsItemRenderer.java | 2 +- .../mekanism/tools/item/ItemMekanismHoe.java | 1 - .../tools/item/ItemMekanismPaxel.java | 1 - .../mekanism/models/block/energy_cube.json | 13 - 392 files changed, 1471 insertions(+), 1513 deletions(-) diff --git a/src/api/java/buildcraft/api/APIHelper.java b/src/api/java/buildcraft/api/APIHelper.java index dd47dcc7c..777c9fccf 100644 --- a/src/api/java/buildcraft/api/APIHelper.java +++ b/src/api/java/buildcraft/api/APIHelper.java @@ -2,11 +2,11 @@ package buildcraft.api; import java.util.Arrays; -import org.apache.commons.lang3.StringUtils; - import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.LoaderState; +import org.apache.commons.lang3.StringUtils; + import buildcraft.api.core.BCLog; public class APIHelper { diff --git a/src/api/java/buildcraft/api/ITripleRegistry.java b/src/api/java/buildcraft/api/ITripleRegistry.java index ea29b613c..8b7f1ee92 100644 --- a/src/api/java/buildcraft/api/ITripleRegistry.java +++ b/src/api/java/buildcraft/api/ITripleRegistry.java @@ -2,10 +2,10 @@ package buildcraft.api; import java.util.Set; -import org.apache.commons.lang3.tuple.Triple; - import net.minecraft.item.Item; +import org.apache.commons.lang3.tuple.Triple; + public interface ITripleRegistry extends ISimpleRegistry { /** @return An unmodifiable set containing all the current mappings of the registry */ Set> getDefinitions(); diff --git a/src/api/java/buildcraft/api/blocks/package-info.java b/src/api/java/buildcraft/api/blocks/package-info.java index c3bc6eac1..f6dd0ee7c 100644 --- a/src/api/java/buildcraft/api/blocks/package-info.java +++ b/src/api/java/buildcraft/api/blocks/package-info.java @@ -6,3 +6,4 @@ package buildcraft.api.blocks; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/buildcraft/api/blueprints/IBuilderContext.java b/src/api/java/buildcraft/api/blueprints/IBuilderContext.java index aa93d4bf9..3a57573f6 100644 --- a/src/api/java/buildcraft/api/blueprints/IBuilderContext.java +++ b/src/api/java/buildcraft/api/blueprints/IBuilderContext.java @@ -6,7 +6,6 @@ package buildcraft.api.blueprints; import net.minecraft.util.Vec3; import net.minecraft.world.World; - import buildcraft.api.core.IBox; /** This interface provide contextual information when building or initializing blueprint slots. */ diff --git a/src/api/java/buildcraft/api/blueprints/MappingRegistry.java b/src/api/java/buildcraft/api/blueprints/MappingRegistry.java index 1f6b6d861..04fcf3ee3 100755 --- a/src/api/java/buildcraft/api/blueprints/MappingRegistry.java +++ b/src/api/java/buildcraft/api/blueprints/MappingRegistry.java @@ -10,11 +10,6 @@ import java.util.Comparator; import java.util.HashMap; import java.util.Map.Entry; -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.ListMultimap; - -import org.apache.logging.log4j.Level; - import net.minecraft.block.Block; import net.minecraft.crash.CrashReportCategory; import net.minecraft.entity.Entity; @@ -24,7 +19,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagShort; import net.minecraft.util.ResourceLocation; - import net.minecraftforge.common.util.Constants; import net.minecraftforge.fml.common.FMLModContainer; import net.minecraftforge.fml.common.Loader; @@ -32,8 +26,13 @@ import net.minecraftforge.fml.common.ModContainer; import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent; import net.minecraftforge.fml.common.registry.GameRegistry; +import org.apache.logging.log4j.Level; + import buildcraft.api.core.BCLog; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.ListMultimap; + public class MappingRegistry { public HashMap blockToId = new HashMap(); diff --git a/src/api/java/buildcraft/api/blueprints/Schematic.java b/src/api/java/buildcraft/api/blueprints/Schematic.java index a43358801..dc3ce350a 100755 --- a/src/api/java/buildcraft/api/blueprints/Schematic.java +++ b/src/api/java/buildcraft/api/blueprints/Schematic.java @@ -10,7 +10,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; import net.minecraft.util.Vec3; - import buildcraft.api.core.IInvSlot; /** A schematic is a piece of a blueprint. It allows to stock blocks or entities to blueprints, and can have a state diff --git a/src/api/java/buildcraft/api/blueprints/SchematicBlock.java b/src/api/java/buildcraft/api/blueprints/SchematicBlock.java index ccb907b52..6f6fdaee1 100755 --- a/src/api/java/buildcraft/api/blueprints/SchematicBlock.java +++ b/src/api/java/buildcraft/api/blueprints/SchematicBlock.java @@ -4,9 +4,12 @@ * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.blueprints; -import java.util.*; - -import com.google.gson.GsonBuilder; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import net.minecraft.block.Block; import net.minecraft.block.BlockFalling; @@ -19,10 +22,8 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing.Axis; - import net.minecraftforge.common.util.Constants; import net.minecraftforge.fluids.BlockFluidBase; - import buildcraft.api.core.BCLog; public class SchematicBlock extends SchematicBlockBase { diff --git a/src/api/java/buildcraft/api/blueprints/SchematicEntity.java b/src/api/java/buildcraft/api/blueprints/SchematicEntity.java index 2057bd6d5..68d465923 100755 --- a/src/api/java/buildcraft/api/blueprints/SchematicEntity.java +++ b/src/api/java/buildcraft/api/blueprints/SchematicEntity.java @@ -17,7 +17,6 @@ import net.minecraft.nbt.NBTTagDouble; import net.minecraft.nbt.NBTTagFloat; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.Vec3; - import net.minecraftforge.common.util.Constants; public class SchematicEntity extends Schematic { diff --git a/src/api/java/buildcraft/api/blueprints/SchematicFluid.java b/src/api/java/buildcraft/api/blueprints/SchematicFluid.java index 798f01728..f3912aabb 100644 --- a/src/api/java/buildcraft/api/blueprints/SchematicFluid.java +++ b/src/api/java/buildcraft/api/blueprints/SchematicFluid.java @@ -10,7 +10,6 @@ import java.util.List; import net.minecraft.block.BlockLiquid; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; - import net.minecraftforge.fluids.FluidStack; public class SchematicFluid extends SchematicBlock { diff --git a/src/api/java/buildcraft/api/blueprints/SchematicMask.java b/src/api/java/buildcraft/api/blueprints/SchematicMask.java index c2953e286..fa5f43a7b 100755 --- a/src/api/java/buildcraft/api/blueprints/SchematicMask.java +++ b/src/api/java/buildcraft/api/blueprints/SchematicMask.java @@ -14,7 +14,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.WorldServer; - import buildcraft.api.core.BuildCraftAPI; public class SchematicMask extends SchematicBlockBase { diff --git a/src/api/java/buildcraft/api/blueprints/SchematicTile.java b/src/api/java/buildcraft/api/blueprints/SchematicTile.java index f70fd19ce..5c47547fe 100755 --- a/src/api/java/buildcraft/api/blueprints/SchematicTile.java +++ b/src/api/java/buildcraft/api/blueprints/SchematicTile.java @@ -12,7 +12,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; - import buildcraft.api.core.JavaTools; public class SchematicTile extends SchematicBlock { diff --git a/src/api/java/buildcraft/api/blueprints/package-info.java b/src/api/java/buildcraft/api/blueprints/package-info.java index 3b3632424..07f2f046a 100644 --- a/src/api/java/buildcraft/api/blueprints/package-info.java +++ b/src/api/java/buildcraft/api/blueprints/package-info.java @@ -6,3 +6,4 @@ package buildcraft.api.blueprints; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/buildcraft/api/boards/RedstoneBoardRobotNBT.java b/src/api/java/buildcraft/api/boards/RedstoneBoardRobotNBT.java index 4a4161b19..72ebd4466 100755 --- a/src/api/java/buildcraft/api/boards/RedstoneBoardRobotNBT.java +++ b/src/api/java/buildcraft/api/boards/RedstoneBoardRobotNBT.java @@ -6,7 +6,6 @@ package buildcraft.api.boards; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; - import buildcraft.api.robots.EntityRobotBase; public abstract class RedstoneBoardRobotNBT extends RedstoneBoardNBT { diff --git a/src/api/java/buildcraft/api/boards/package-info.java b/src/api/java/buildcraft/api/boards/package-info.java index 6253f5b79..4b250a286 100644 --- a/src/api/java/buildcraft/api/boards/package-info.java +++ b/src/api/java/buildcraft/api/boards/package-info.java @@ -6,3 +6,4 @@ package buildcraft.api.boards; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/buildcraft/api/core/BuildCraftAPI.java b/src/api/java/buildcraft/api/core/BuildCraftAPI.java index 6e43e6d8c..b96784aff 100644 --- a/src/api/java/buildcraft/api/core/BuildCraftAPI.java +++ b/src/api/java/buildcraft/api/core/BuildCraftAPI.java @@ -8,13 +8,13 @@ import java.lang.reflect.Method; import java.util.HashMap; import java.util.Set; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; - import net.minecraft.block.Block; import net.minecraft.util.BlockPos; import net.minecraft.world.World; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; + public final class BuildCraftAPI { public static ICoreProxy proxy; diff --git a/src/api/java/buildcraft/api/core/ConfigAccessor.java b/src/api/java/buildcraft/api/core/ConfigAccessor.java index a66346ac5..64d95f917 100644 --- a/src/api/java/buildcraft/api/core/ConfigAccessor.java +++ b/src/api/java/buildcraft/api/core/ConfigAccessor.java @@ -2,10 +2,10 @@ package buildcraft.api.core; import java.util.Map; -import com.google.common.collect.Maps; - import net.minecraftforge.common.config.Property; +import com.google.common.collect.Maps; + /** Use this to access the various config options. It is recommended that you use this as opposed to the variables in * the mod, as users may only install the modules that they want, and not the one you may have refereed to. */ @Deprecated diff --git a/src/api/java/buildcraft/api/core/EnumColor.java b/src/api/java/buildcraft/api/core/EnumColor.java index 852eea1ba..155996f45 100644 --- a/src/api/java/buildcraft/api/core/EnumColor.java +++ b/src/api/java/buildcraft/api/core/EnumColor.java @@ -11,7 +11,6 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/api/java/buildcraft/api/core/EnumPipePart.java b/src/api/java/buildcraft/api/core/EnumPipePart.java index f3ea8d6fb..de48191f5 100644 --- a/src/api/java/buildcraft/api/core/EnumPipePart.java +++ b/src/api/java/buildcraft/api/core/EnumPipePart.java @@ -1,17 +1,17 @@ package buildcraft.api.core; +import io.netty.buffer.ByteBuf; + import java.util.Locale; import java.util.Map; -import com.google.common.collect.Maps; - import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTBase.NBTPrimitive; import net.minecraft.nbt.NBTTagString; import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; -import io.netty.buffer.ByteBuf; +import com.google.common.collect.Maps; public enum EnumPipePart implements IStringSerializable,INetworkLoadable_BC8 { DOWN(EnumFacing.DOWN), diff --git a/src/api/java/buildcraft/api/core/Identifier.java b/src/api/java/buildcraft/api/core/Identifier.java index 891b4b724..45dab1ad7 100644 --- a/src/api/java/buildcraft/api/core/Identifier.java +++ b/src/api/java/buildcraft/api/core/Identifier.java @@ -11,7 +11,6 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.World; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/api/java/buildcraft/api/core/package-info.java b/src/api/java/buildcraft/api/core/package-info.java index 0d8264ada..57a6ababf 100644 --- a/src/api/java/buildcraft/api/core/package-info.java +++ b/src/api/java/buildcraft/api/core/package-info.java @@ -6,3 +6,4 @@ package buildcraft.api.core; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/buildcraft/api/crops/package-info.java b/src/api/java/buildcraft/api/crops/package-info.java index 803ce050a..3961a8800 100644 --- a/src/api/java/buildcraft/api/crops/package-info.java +++ b/src/api/java/buildcraft/api/crops/package-info.java @@ -6,3 +6,4 @@ package buildcraft.api.crops; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/buildcraft/api/enums/EnumBlueprintType.java b/src/api/java/buildcraft/api/enums/EnumBlueprintType.java index 8d6217797..31ee2dba5 100644 --- a/src/api/java/buildcraft/api/enums/EnumBlueprintType.java +++ b/src/api/java/buildcraft/api/enums/EnumBlueprintType.java @@ -1,7 +1,6 @@ package buildcraft.api.enums; import net.minecraft.item.ItemStack; - import buildcraft.api.items.IBlueprintItem; public enum EnumBlueprintType { diff --git a/src/api/java/buildcraft/api/enums/EnumEnergyStage.java b/src/api/java/buildcraft/api/enums/EnumEnergyStage.java index dd809fea8..c25616782 100644 --- a/src/api/java/buildcraft/api/enums/EnumEnergyStage.java +++ b/src/api/java/buildcraft/api/enums/EnumEnergyStage.java @@ -1,9 +1,9 @@ package buildcraft.api.enums; -import org.apache.commons.lang3.StringUtils; - import net.minecraft.util.IStringSerializable; +import org.apache.commons.lang3.StringUtils; + public enum EnumEnergyStage implements IStringSerializable { BLUE, GREEN, diff --git a/src/api/java/buildcraft/api/enums/EnumLaserTableType.java b/src/api/java/buildcraft/api/enums/EnumLaserTableType.java index cc8b41e7d..82569e1e3 100644 --- a/src/api/java/buildcraft/api/enums/EnumLaserTableType.java +++ b/src/api/java/buildcraft/api/enums/EnumLaserTableType.java @@ -2,7 +2,6 @@ package buildcraft.api.enums; import net.minecraft.block.state.IBlockState; import net.minecraft.util.IStringSerializable; - import buildcraft.api.properties.BuildCraftProperties; public enum EnumLaserTableType implements IStringSerializable { diff --git a/src/api/java/buildcraft/api/enums/EnumMachineState.java b/src/api/java/buildcraft/api/enums/EnumMachineState.java index 6a215c235..48bfa4075 100644 --- a/src/api/java/buildcraft/api/enums/EnumMachineState.java +++ b/src/api/java/buildcraft/api/enums/EnumMachineState.java @@ -2,7 +2,6 @@ package buildcraft.api.enums; import net.minecraft.block.state.IBlockState; import net.minecraft.util.IStringSerializable; - import buildcraft.api.properties.BuildCraftProperties; public enum EnumMachineState implements IStringSerializable { diff --git a/src/api/java/buildcraft/api/enums/EnumSpring.java b/src/api/java/buildcraft/api/enums/EnumSpring.java index b4825fb5b..8f2e4d0bc 100644 --- a/src/api/java/buildcraft/api/enums/EnumSpring.java +++ b/src/api/java/buildcraft/api/enums/EnumSpring.java @@ -3,7 +3,6 @@ package buildcraft.api.enums; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.util.IStringSerializable; - import buildcraft.api.properties.BuildCraftProperties; public enum EnumSpring implements IStringSerializable { diff --git a/src/api/java/buildcraft/api/enums/package-info.java b/src/api/java/buildcraft/api/enums/package-info.java index 8c585be95..d42334751 100644 --- a/src/api/java/buildcraft/api/enums/package-info.java +++ b/src/api/java/buildcraft/api/enums/package-info.java @@ -6,3 +6,4 @@ package buildcraft.api.enums; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/buildcraft/api/events/RobotEvent.java b/src/api/java/buildcraft/api/events/RobotEvent.java index 9b12b64d2..d70137733 100644 --- a/src/api/java/buildcraft/api/events/RobotEvent.java +++ b/src/api/java/buildcraft/api/events/RobotEvent.java @@ -6,10 +6,8 @@ package buildcraft.api.events; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; - import net.minecraftforge.fml.common.eventhandler.Cancelable; import net.minecraftforge.fml.common.eventhandler.Event; - import buildcraft.api.robots.EntityRobotBase; public abstract class RobotEvent extends Event { diff --git a/src/api/java/buildcraft/api/events/package-info.java b/src/api/java/buildcraft/api/events/package-info.java index 06cd25fea..3bdb55140 100644 --- a/src/api/java/buildcraft/api/events/package-info.java +++ b/src/api/java/buildcraft/api/events/package-info.java @@ -6,3 +6,4 @@ package buildcraft.api.events; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/buildcraft/api/facades/package-info.java b/src/api/java/buildcraft/api/facades/package-info.java index 2c79167b3..5393f3e57 100644 --- a/src/api/java/buildcraft/api/facades/package-info.java +++ b/src/api/java/buildcraft/api/facades/package-info.java @@ -6,3 +6,4 @@ package buildcraft.api.facades; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/buildcraft/api/filler/package-info.java b/src/api/java/buildcraft/api/filler/package-info.java index 3e9d907de..6449026b6 100644 --- a/src/api/java/buildcraft/api/filler/package-info.java +++ b/src/api/java/buildcraft/api/filler/package-info.java @@ -6,3 +6,4 @@ package buildcraft.api.filler; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/buildcraft/api/fuels/ICoolantManager.java b/src/api/java/buildcraft/api/fuels/ICoolantManager.java index 849bf1acf..54aff0367 100644 --- a/src/api/java/buildcraft/api/fuels/ICoolantManager.java +++ b/src/api/java/buildcraft/api/fuels/ICoolantManager.java @@ -7,7 +7,6 @@ package buildcraft.api.fuels; import java.util.Collection; import net.minecraftforge.fluids.Fluid; - import buildcraft.api.core.StackKey; public interface ICoolantManager { diff --git a/src/api/java/buildcraft/api/fuels/package-info.java b/src/api/java/buildcraft/api/fuels/package-info.java index 93d524dbf..4089f42c1 100644 --- a/src/api/java/buildcraft/api/fuels/package-info.java +++ b/src/api/java/buildcraft/api/fuels/package-info.java @@ -6,3 +6,4 @@ package buildcraft.api.fuels; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/buildcraft/api/gates/GateExpansionController.java b/src/api/java/buildcraft/api/gates/GateExpansionController.java index 749de86f7..c443aee0b 100644 --- a/src/api/java/buildcraft/api/gates/GateExpansionController.java +++ b/src/api/java/buildcraft/api/gates/GateExpansionController.java @@ -8,7 +8,6 @@ import java.util.List; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; - import buildcraft.api.statements.IActionInternal; import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementParameter; diff --git a/src/api/java/buildcraft/api/gates/GateExpansions.java b/src/api/java/buildcraft/api/gates/GateExpansions.java index b1e600371..006d1bc9b 100644 --- a/src/api/java/buildcraft/api/gates/GateExpansions.java +++ b/src/api/java/buildcraft/api/gates/GateExpansions.java @@ -10,10 +10,10 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import com.google.common.collect.HashBiMap; - import net.minecraft.item.ItemStack; +import com.google.common.collect.HashBiMap; + public final class GateExpansions { private static final Map expansions = new HashMap(); private static final ArrayList expansionIDs = new ArrayList(); diff --git a/src/api/java/buildcraft/api/gates/IGateExpansion.java b/src/api/java/buildcraft/api/gates/IGateExpansion.java index f197c0ca7..d58f0e9ee 100644 --- a/src/api/java/buildcraft/api/gates/IGateExpansion.java +++ b/src/api/java/buildcraft/api/gates/IGateExpansion.java @@ -10,7 +10,6 @@ import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/api/java/buildcraft/api/gates/package-info.java b/src/api/java/buildcraft/api/gates/package-info.java index b86ad48bd..e58f15f69 100644 --- a/src/api/java/buildcraft/api/gates/package-info.java +++ b/src/api/java/buildcraft/api/gates/package-info.java @@ -6,3 +6,4 @@ package buildcraft.api.gates; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/buildcraft/api/items/IBlueprintItem.java b/src/api/java/buildcraft/api/items/IBlueprintItem.java index d67bc39fd..fe72af7d0 100644 --- a/src/api/java/buildcraft/api/items/IBlueprintItem.java +++ b/src/api/java/buildcraft/api/items/IBlueprintItem.java @@ -1,7 +1,6 @@ package buildcraft.api.items; import net.minecraft.item.ItemStack; - import buildcraft.api.enums.EnumBlueprintType; public interface IBlueprintItem extends INamedItem { diff --git a/src/api/java/buildcraft/api/items/IMapLocation.java b/src/api/java/buildcraft/api/items/IMapLocation.java index 60b87af6f..545e07dd4 100644 --- a/src/api/java/buildcraft/api/items/IMapLocation.java +++ b/src/api/java/buildcraft/api/items/IMapLocation.java @@ -5,7 +5,6 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; - import buildcraft.api.core.IBox; import buildcraft.api.core.IZone; diff --git a/src/api/java/buildcraft/api/items/package-info.java b/src/api/java/buildcraft/api/items/package-info.java index f6d2835d6..0a8a9b6e0 100644 --- a/src/api/java/buildcraft/api/items/package-info.java +++ b/src/api/java/buildcraft/api/items/package-info.java @@ -6,3 +6,4 @@ package buildcraft.api.items; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/buildcraft/api/library/package-info.java b/src/api/java/buildcraft/api/library/package-info.java index e41a0dc0f..a12f6d708 100644 --- a/src/api/java/buildcraft/api/library/package-info.java +++ b/src/api/java/buildcraft/api/library/package-info.java @@ -6,3 +6,4 @@ package buildcraft.api.library; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/buildcraft/api/lists/ListMatchHandler.java b/src/api/java/buildcraft/api/lists/ListMatchHandler.java index adc332891..d18710c04 100644 --- a/src/api/java/buildcraft/api/lists/ListMatchHandler.java +++ b/src/api/java/buildcraft/api/lists/ListMatchHandler.java @@ -1,6 +1,7 @@ package buildcraft.api.lists; import java.util.List; + import net.minecraft.item.ItemStack; public abstract class ListMatchHandler { diff --git a/src/api/java/buildcraft/api/lists/package-info.java b/src/api/java/buildcraft/api/lists/package-info.java index 603c33587..9cca05170 100644 --- a/src/api/java/buildcraft/api/lists/package-info.java +++ b/src/api/java/buildcraft/api/lists/package-info.java @@ -6,3 +6,4 @@ package buildcraft.api.lists; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/buildcraft/api/package-info.java b/src/api/java/buildcraft/api/package-info.java index 640f52a7d..3e2a2335d 100644 --- a/src/api/java/buildcraft/api/package-info.java +++ b/src/api/java/buildcraft/api/package-info.java @@ -6,3 +6,4 @@ package buildcraft.api; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/buildcraft/api/power/ILaserTarget.java b/src/api/java/buildcraft/api/power/ILaserTarget.java index 0b3909935..95627970a 100644 --- a/src/api/java/buildcraft/api/power/ILaserTarget.java +++ b/src/api/java/buildcraft/api/power/ILaserTarget.java @@ -4,7 +4,6 @@ * should be located as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.power; -import net.minecraft.util.BlockPos; /** This interface should be defined by any Tile which wants to receive energy from BuildCraft lasers. * diff --git a/src/api/java/buildcraft/api/power/IRedstoneEngineReceiver.java b/src/api/java/buildcraft/api/power/IRedstoneEngineReceiver.java index 213d06fe2..ccbb2f7bb 100644 --- a/src/api/java/buildcraft/api/power/IRedstoneEngineReceiver.java +++ b/src/api/java/buildcraft/api/power/IRedstoneEngineReceiver.java @@ -5,7 +5,6 @@ package buildcraft.api.power; import net.minecraft.util.EnumFacing; - import cofh.api.energy.IEnergyReceiver; /** Implement this on tiles that you wish to be able to receive Redstone Engine (low-power) energy. diff --git a/src/api/java/buildcraft/api/power/package-info.java b/src/api/java/buildcraft/api/power/package-info.java index c20c3ee4c..0c4fe99d9 100644 --- a/src/api/java/buildcraft/api/power/package-info.java +++ b/src/api/java/buildcraft/api/power/package-info.java @@ -6,3 +6,4 @@ package buildcraft.api.power; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/buildcraft/api/properties/BuildCraftExtendedProperty.java b/src/api/java/buildcraft/api/properties/BuildCraftExtendedProperty.java index c1998b193..21a7ec85e 100644 --- a/src/api/java/buildcraft/api/properties/BuildCraftExtendedProperty.java +++ b/src/api/java/buildcraft/api/properties/BuildCraftExtendedProperty.java @@ -2,12 +2,12 @@ package buildcraft.api.properties; import java.util.List; -import com.google.common.base.Predicate; -import com.google.common.base.Predicates; - import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; + public class BuildCraftExtendedProperty> extends BuildCraftProperty implements IUnlistedProperty { private final Predicate function; diff --git a/src/api/java/buildcraft/api/properties/BuildCraftProperties.java b/src/api/java/buildcraft/api/properties/BuildCraftProperties.java index 747dd470a..9851da271 100644 --- a/src/api/java/buildcraft/api/properties/BuildCraftProperties.java +++ b/src/api/java/buildcraft/api/properties/BuildCraftProperties.java @@ -2,12 +2,18 @@ package buildcraft.api.properties; import java.util.Map; -import com.google.common.collect.Maps; - import net.minecraft.util.EnumFacing; - import buildcraft.api.core.EnumColor; -import buildcraft.api.enums.*; +import buildcraft.api.enums.EnumBlueprintType; +import buildcraft.api.enums.EnumDecoratedBlock; +import buildcraft.api.enums.EnumEnergyStage; +import buildcraft.api.enums.EnumEngineType; +import buildcraft.api.enums.EnumFillerPattern; +import buildcraft.api.enums.EnumLaserTableType; +import buildcraft.api.enums.EnumMachineState; +import buildcraft.api.enums.EnumSpring; + +import com.google.common.collect.Maps; public final class BuildCraftProperties { public static final BuildCraftProperty BLOCK_FACING = BuildCraftProperty.create("facing", EnumFacing.Plane.HORIZONTAL.facings()); diff --git a/src/api/java/buildcraft/api/recipes/package-info.java b/src/api/java/buildcraft/api/recipes/package-info.java index f8cc9942a..b15cbf465 100644 --- a/src/api/java/buildcraft/api/recipes/package-info.java +++ b/src/api/java/buildcraft/api/recipes/package-info.java @@ -6,3 +6,4 @@ package buildcraft.api.recipes; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/buildcraft/api/robots/DockingStation.java b/src/api/java/buildcraft/api/robots/DockingStation.java index 8417a86e5..3e5d2904c 100755 --- a/src/api/java/buildcraft/api/robots/DockingStation.java +++ b/src/api/java/buildcraft/api/robots/DockingStation.java @@ -9,9 +9,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; - import net.minecraftforge.fluids.IFluidHandler; - import buildcraft.api.core.BCLog; import buildcraft.api.core.EnumPipePart; import buildcraft.api.statements.StatementSlot; diff --git a/src/api/java/buildcraft/api/robots/EntityRobotBase.java b/src/api/java/buildcraft/api/robots/EntityRobotBase.java index a86842256..8f9b64b74 100755 --- a/src/api/java/buildcraft/api/robots/EntityRobotBase.java +++ b/src/api/java/buildcraft/api/robots/EntityRobotBase.java @@ -11,13 +11,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.World; - import net.minecraftforge.fluids.IFluidHandler; - -import cofh.api.energy.IEnergyStorage; - import buildcraft.api.boards.RedstoneBoardRobot; import buildcraft.api.core.IZone; +import cofh.api.energy.IEnergyStorage; public abstract class EntityRobotBase extends EntityLiving implements IInventory, IFluidHandler { diff --git a/src/api/java/buildcraft/api/robots/ResourceIdBlock.java b/src/api/java/buildcraft/api/robots/ResourceIdBlock.java index 29159a912..3e9363afa 100755 --- a/src/api/java/buildcraft/api/robots/ResourceIdBlock.java +++ b/src/api/java/buildcraft/api/robots/ResourceIdBlock.java @@ -4,12 +4,12 @@ * of the license located in http://www.mod-buildcraft.com/MMPL-1.0.txt */ package buildcraft.api.robots; -import org.apache.commons.lang3.builder.HashCodeBuilder; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; +import org.apache.commons.lang3.builder.HashCodeBuilder; + import buildcraft.api.core.EnumPipePart; public class ResourceIdBlock extends ResourceId { diff --git a/src/api/java/buildcraft/api/robots/ResourceIdRequest.java b/src/api/java/buildcraft/api/robots/ResourceIdRequest.java index ab37ad2c6..e23e218f1 100755 --- a/src/api/java/buildcraft/api/robots/ResourceIdRequest.java +++ b/src/api/java/buildcraft/api/robots/ResourceIdRequest.java @@ -4,10 +4,10 @@ * of the license located in http://www.mod-buildcraft.com/MMPL-1.0.txt */ package buildcraft.api.robots; -import org.apache.commons.lang3.builder.HashCodeBuilder; - import net.minecraft.nbt.NBTTagCompound; +import org.apache.commons.lang3.builder.HashCodeBuilder; + import buildcraft.api.core.EnumPipePart; public class ResourceIdRequest extends ResourceIdBlock { diff --git a/src/api/java/buildcraft/api/robots/package-info.java b/src/api/java/buildcraft/api/robots/package-info.java index 4fd622b34..6bb10c952 100644 --- a/src/api/java/buildcraft/api/robots/package-info.java +++ b/src/api/java/buildcraft/api/robots/package-info.java @@ -6,3 +6,4 @@ package buildcraft.api.robots; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/buildcraft/api/statements/StatementManager.java b/src/api/java/buildcraft/api/statements/StatementManager.java index 04e559c47..34872e5b0 100644 --- a/src/api/java/buildcraft/api/statements/StatementManager.java +++ b/src/api/java/buildcraft/api/statements/StatementManager.java @@ -12,7 +12,6 @@ import java.util.Map; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; - import buildcraft.api.core.BCLog; public final class StatementManager { diff --git a/src/api/java/buildcraft/api/statements/containers/ISidedStatementContainer.java b/src/api/java/buildcraft/api/statements/containers/ISidedStatementContainer.java index b65ace45a..4c3de34f5 100644 --- a/src/api/java/buildcraft/api/statements/containers/ISidedStatementContainer.java +++ b/src/api/java/buildcraft/api/statements/containers/ISidedStatementContainer.java @@ -1,7 +1,6 @@ package buildcraft.api.statements.containers; import net.minecraft.util.EnumFacing; - import buildcraft.api.statements.IStatementContainer; /** Created by asie on 3/14/15. */ diff --git a/src/api/java/buildcraft/api/statements/package-info.java b/src/api/java/buildcraft/api/statements/package-info.java index 7dd2c74e6..4a6139b3d 100644 --- a/src/api/java/buildcraft/api/statements/package-info.java +++ b/src/api/java/buildcraft/api/statements/package-info.java @@ -6,3 +6,4 @@ package buildcraft.api.statements; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/buildcraft/api/tablet/package-info.java b/src/api/java/buildcraft/api/tablet/package-info.java index cc87d8657..0f16c278b 100644 --- a/src/api/java/buildcraft/api/tablet/package-info.java +++ b/src/api/java/buildcraft/api/tablet/package-info.java @@ -6,3 +6,4 @@ package buildcraft.api.tablet; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/buildcraft/api/tiles/ITileAreaProvider.java b/src/api/java/buildcraft/api/tiles/ITileAreaProvider.java index 8b5ee48a9..521b4e7ea 100644 --- a/src/api/java/buildcraft/api/tiles/ITileAreaProvider.java +++ b/src/api/java/buildcraft/api/tiles/ITileAreaProvider.java @@ -1,7 +1,6 @@ package buildcraft.api.tiles; import net.minecraft.util.BlockPos; - import buildcraft.api.core.IAreaProvider; /** Used for more fine-grained control of whether or not a machine connects to the provider here. */ diff --git a/src/api/java/buildcraft/api/tiles/package-info.java b/src/api/java/buildcraft/api/tiles/package-info.java index d4c217fc3..54d026b2d 100644 --- a/src/api/java/buildcraft/api/tiles/package-info.java +++ b/src/api/java/buildcraft/api/tiles/package-info.java @@ -6,3 +6,4 @@ package buildcraft.api.tiles; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/buildcraft/api/tools/package-info.java b/src/api/java/buildcraft/api/tools/package-info.java index 873fba1b0..bb6df1f41 100644 --- a/src/api/java/buildcraft/api/tools/package-info.java +++ b/src/api/java/buildcraft/api/tools/package-info.java @@ -6,3 +6,4 @@ package buildcraft.api.tools; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/buildcraft/api/transport/IPipe.java b/src/api/java/buildcraft/api/transport/IPipe.java index 96a7a764c..563b53cc5 100755 --- a/src/api/java/buildcraft/api/transport/IPipe.java +++ b/src/api/java/buildcraft/api/transport/IPipe.java @@ -5,7 +5,6 @@ package buildcraft.api.transport; import net.minecraft.util.EnumFacing; - import buildcraft.api.gates.IGate; public interface IPipe { diff --git a/src/api/java/buildcraft/api/transport/IPipeTile.java b/src/api/java/buildcraft/api/transport/IPipeTile.java index 5ed528422..a74e22ef5 100644 --- a/src/api/java/buildcraft/api/transport/IPipeTile.java +++ b/src/api/java/buildcraft/api/transport/IPipeTile.java @@ -8,7 +8,6 @@ import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; - import buildcraft.api.transport.pluggable.PipePluggable; public interface IPipeTile extends IInjectable { diff --git a/src/api/java/buildcraft/api/transport/PipeConnectionAPI.java b/src/api/java/buildcraft/api/transport/PipeConnectionAPI.java index e79da2646..ce44514c1 100644 --- a/src/api/java/buildcraft/api/transport/PipeConnectionAPI.java +++ b/src/api/java/buildcraft/api/transport/PipeConnectionAPI.java @@ -2,14 +2,14 @@ package buildcraft.api.transport; import java.util.Map; -import com.google.common.collect.Maps; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import com.google.common.collect.Maps; + /** Use this class to register blocks with custom block sizes so that pipes can connect to them properly. Note that you * do not need to register a custom pipe connection if your block implements ICustomPipeConnection. The registered * version does not override your own implementation. */ diff --git a/src/api/java/buildcraft/api/transport/PipeManager.java b/src/api/java/buildcraft/api/transport/PipeManager.java index 0fd0f8aad..8a1e3b5aa 100755 --- a/src/api/java/buildcraft/api/transport/PipeManager.java +++ b/src/api/java/buildcraft/api/transport/PipeManager.java @@ -13,7 +13,6 @@ import java.util.Map; import net.minecraft.util.BlockPos; import net.minecraft.world.World; - import buildcraft.api.transport.pluggable.PipePluggable; public abstract class PipeManager { diff --git a/src/api/java/buildcraft/api/transport/package-info.java b/src/api/java/buildcraft/api/transport/package-info.java index 7ab0064d3..e0c225e57 100644 --- a/src/api/java/buildcraft/api/transport/package-info.java +++ b/src/api/java/buildcraft/api/transport/package-info.java @@ -6,3 +6,4 @@ package buildcraft.api.transport; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/buildcraft/api/transport/pipe_bc8/IConnection_BC8.java b/src/api/java/buildcraft/api/transport/pipe_bc8/IConnection_BC8.java index a18140f6b..a2e124e2a 100644 --- a/src/api/java/buildcraft/api/transport/pipe_bc8/IConnection_BC8.java +++ b/src/api/java/buildcraft/api/transport/pipe_bc8/IConnection_BC8.java @@ -2,7 +2,6 @@ package buildcraft.api.transport.pipe_bc8; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; - import buildcraft.api.transport.pipe_bc8.IExtractionManager.IExtractable_BC8; import buildcraft.api.transport.pipe_bc8.IInsertionManager.IInsertable_BC8; diff --git a/src/api/java/buildcraft/api/transport/pipe_bc8/IExtractionManager.java b/src/api/java/buildcraft/api/transport/pipe_bc8/IExtractionManager.java index 0983d7d16..5b63c8d60 100644 --- a/src/api/java/buildcraft/api/transport/pipe_bc8/IExtractionManager.java +++ b/src/api/java/buildcraft/api/transport/pipe_bc8/IExtractionManager.java @@ -1,7 +1,6 @@ package buildcraft.api.transport.pipe_bc8; import net.minecraft.util.EnumFacing; - import buildcraft.api.core.IFluidFilter; import buildcraft.api.core.IStackFilter; import buildcraft.api.transport.pipe_bc8.IInsertionManager.IInsertableFactory; diff --git a/src/api/java/buildcraft/api/transport/pipe_bc8/IInsertionManager.java b/src/api/java/buildcraft/api/transport/pipe_bc8/IInsertionManager.java index fff014268..4443683a5 100644 --- a/src/api/java/buildcraft/api/transport/pipe_bc8/IInsertionManager.java +++ b/src/api/java/buildcraft/api/transport/pipe_bc8/IInsertionManager.java @@ -1,7 +1,6 @@ package buildcraft.api.transport.pipe_bc8; import net.minecraft.util.EnumFacing; - import buildcraft.api.core.IFluidFilter; import buildcraft.api.core.IStackFilter; import buildcraft.api.transport.pipe_bc8.IPipeContentsEditable.IPipeContentsEditableFluid; diff --git a/src/api/java/buildcraft/api/transport/pipe_bc8/IPipeContents.java b/src/api/java/buildcraft/api/transport/pipe_bc8/IPipeContents.java index 23e16eeb2..9457c9adf 100644 --- a/src/api/java/buildcraft/api/transport/pipe_bc8/IPipeContents.java +++ b/src/api/java/buildcraft/api/transport/pipe_bc8/IPipeContents.java @@ -3,7 +3,6 @@ package buildcraft.api.transport.pipe_bc8; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; - import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/src/api/java/buildcraft/api/transport/pipe_bc8/IPipeContentsEditable.java b/src/api/java/buildcraft/api/transport/pipe_bc8/IPipeContentsEditable.java index 789772f12..8f9f21b68 100644 --- a/src/api/java/buildcraft/api/transport/pipe_bc8/IPipeContentsEditable.java +++ b/src/api/java/buildcraft/api/transport/pipe_bc8/IPipeContentsEditable.java @@ -1,18 +1,15 @@ package buildcraft.api.transport.pipe_bc8; +import io.netty.buffer.ByteBuf; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; - import net.minecraftforge.fluids.Fluid; - import buildcraft.api.core.INBTLoadable_BC8; import buildcraft.api.core.INetworkLoadable_BC8; import buildcraft.api.transport.pipe_bc8.IPipePropertyProvider.IPipePropertyProviderEditable; -import io.netty.buffer.ByteBuf; - /** Provides a way to change the contents of a pipe. */ public interface IPipeContentsEditable extends IPipeContents, INetworkLoadable_BC8, INBTLoadable_BC8 { IPipeContents asReadOnly(); diff --git a/src/api/java/buildcraft/api/transport/pipe_bc8/IPipeHelper.java b/src/api/java/buildcraft/api/transport/pipe_bc8/IPipeHelper.java index 1d39da2b1..ef07c485c 100644 --- a/src/api/java/buildcraft/api/transport/pipe_bc8/IPipeHelper.java +++ b/src/api/java/buildcraft/api/transport/pipe_bc8/IPipeHelper.java @@ -1,9 +1,7 @@ package buildcraft.api.transport.pipe_bc8; import net.minecraft.item.ItemStack; - import net.minecraftforge.fluids.FluidStack; - import buildcraft.api.transport.pipe_bc8.IPipeContentsEditable.IPipeContentsEditableFluid; import buildcraft.api.transport.pipe_bc8.IPipeContentsEditable.IPipeContentsEditableItem; diff --git a/src/api/java/buildcraft/api/transport/pipe_bc8/IPipePropertyProvider.java b/src/api/java/buildcraft/api/transport/pipe_bc8/IPipePropertyProvider.java index 5581d82ff..4b4e998a9 100644 --- a/src/api/java/buildcraft/api/transport/pipe_bc8/IPipePropertyProvider.java +++ b/src/api/java/buildcraft/api/transport/pipe_bc8/IPipePropertyProvider.java @@ -3,7 +3,6 @@ package buildcraft.api.transport.pipe_bc8; import java.util.Set; import net.minecraft.nbt.NBTBase; - import buildcraft.api.core.INBTLoadable_BC8; import buildcraft.api.core.INetworkLoadable_BC8; diff --git a/src/api/java/buildcraft/api/transport/pipe_bc8/IPipeRegistry.java b/src/api/java/buildcraft/api/transport/pipe_bc8/IPipeRegistry.java index ca0ec628b..9a401b621 100644 --- a/src/api/java/buildcraft/api/transport/pipe_bc8/IPipeRegistry.java +++ b/src/api/java/buildcraft/api/transport/pipe_bc8/IPipeRegistry.java @@ -1,7 +1,6 @@ package buildcraft.api.transport.pipe_bc8; import net.minecraft.item.Item; - import buildcraft.api.ITripleRegistry; public interface IPipeRegistry extends ITripleRegistry { diff --git a/src/api/java/buildcraft/api/transport/pipe_bc8/IPipe_BC8.java b/src/api/java/buildcraft/api/transport/pipe_bc8/IPipe_BC8.java index b327a1d21..5bc716319 100644 --- a/src/api/java/buildcraft/api/transport/pipe_bc8/IPipe_BC8.java +++ b/src/api/java/buildcraft/api/transport/pipe_bc8/IPipe_BC8.java @@ -4,7 +4,6 @@ import java.util.Map; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; - import buildcraft.api.core.INBTLoadable_BC8; import buildcraft.api.transport.pipe_bc8.event_bc8.IPipeEvent_BC8; diff --git a/src/api/java/buildcraft/api/transport/pipe_bc8/PipeAPI_BC8.java b/src/api/java/buildcraft/api/transport/pipe_bc8/PipeAPI_BC8.java index 80030d459..cd141c4b3 100644 --- a/src/api/java/buildcraft/api/transport/pipe_bc8/PipeAPI_BC8.java +++ b/src/api/java/buildcraft/api/transport/pipe_bc8/PipeAPI_BC8.java @@ -1,7 +1,6 @@ package buildcraft.api.transport.pipe_bc8; import net.minecraft.item.EnumDyeColor; - import buildcraft.api.APIHelper; import buildcraft.api.transport.pipe_bc8.IExtractionManager.IExtractable_BC8; import buildcraft.api.transport.pipe_bc8.IInsertionManager.IInsertable_BC8; diff --git a/src/api/java/buildcraft/api/transport/pipe_bc8/PipeBehaviour_BC8.java b/src/api/java/buildcraft/api/transport/pipe_bc8/PipeBehaviour_BC8.java index 41daf25fb..e17039a14 100644 --- a/src/api/java/buildcraft/api/transport/pipe_bc8/PipeBehaviour_BC8.java +++ b/src/api/java/buildcraft/api/transport/pipe_bc8/PipeBehaviour_BC8.java @@ -1,10 +1,9 @@ package buildcraft.api.transport.pipe_bc8; +import io.netty.buffer.ByteBuf; import net.minecraft.nbt.NBTBase; import net.minecraft.util.EnumFacing; -import io.netty.buffer.ByteBuf; - /** An instance is created by instance of IBehaviourFactory per pipe block in world, and is registered with the pipe * event bus to listen and respond to events. */ public abstract class PipeBehaviour_BC8 implements IPipeListener { diff --git a/src/api/java/buildcraft/api/transport/pipe_bc8/PipeConnectionAPI.java b/src/api/java/buildcraft/api/transport/pipe_bc8/PipeConnectionAPI.java index 370f9cf1f..6605adc83 100644 --- a/src/api/java/buildcraft/api/transport/pipe_bc8/PipeConnectionAPI.java +++ b/src/api/java/buildcraft/api/transport/pipe_bc8/PipeConnectionAPI.java @@ -2,16 +2,15 @@ package buildcraft.api.transport.pipe_bc8; import java.util.Map; -import com.google.common.collect.Maps; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; - import buildcraft.api.transport.ICustomPipeConnection; +import com.google.common.collect.Maps; + /** Use this class to register blocks with custom block sizes so that pipes can connect to them properly. Note that you * do not need to register a custom pipe connection if your block implements ICustomPipeConnection. The registered * version also overrides your own implementation. */ diff --git a/src/api/java/buildcraft/api/transport/pipe_bc8/PipeDefinition_BC8.java b/src/api/java/buildcraft/api/transport/pipe_bc8/PipeDefinition_BC8.java index 909cf8c5a..b79a6a3af 100644 --- a/src/api/java/buildcraft/api/transport/pipe_bc8/PipeDefinition_BC8.java +++ b/src/api/java/buildcraft/api/transport/pipe_bc8/PipeDefinition_BC8.java @@ -6,10 +6,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.ResourceLocation; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; - import buildcraft.api.ObjectDefinition; import buildcraft.api.core.BCLog; diff --git a/src/api/java/buildcraft/api/transport/pipe_bc8/event_bc8/IPipeEventConnection_BC8.java b/src/api/java/buildcraft/api/transport/pipe_bc8/event_bc8/IPipeEventConnection_BC8.java index f03e246a8..ca95bb5c8 100644 --- a/src/api/java/buildcraft/api/transport/pipe_bc8/event_bc8/IPipeEventConnection_BC8.java +++ b/src/api/java/buildcraft/api/transport/pipe_bc8/event_bc8/IPipeEventConnection_BC8.java @@ -3,7 +3,6 @@ package buildcraft.api.transport.pipe_bc8.event_bc8; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; - import buildcraft.api.transport.IPipeConnection; import buildcraft.api.transport.pipe_bc8.IConnection_BC8; import buildcraft.api.transport.pipe_bc8.IPipe_BC8; diff --git a/src/api/java/buildcraft/api/transport/pipe_bc8/event_bc8/IPipeEventContents_BC8.java b/src/api/java/buildcraft/api/transport/pipe_bc8/event_bc8/IPipeEventContents_BC8.java index 5b0c1f894..9e6711637 100644 --- a/src/api/java/buildcraft/api/transport/pipe_bc8/event_bc8/IPipeEventContents_BC8.java +++ b/src/api/java/buildcraft/api/transport/pipe_bc8/event_bc8/IPipeEventContents_BC8.java @@ -3,7 +3,6 @@ package buildcraft.api.transport.pipe_bc8.event_bc8; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; - import buildcraft.api.transport.pipe_bc8.IPipeContents; import buildcraft.api.transport.pipe_bc8.IPipeContentsEditable; import buildcraft.api.transport.pipe_bc8.IPipe_BC8; diff --git a/src/api/java/buildcraft/api/transport/pipe_bc8/event_bc8/IPipeEventInteract_BC8.java b/src/api/java/buildcraft/api/transport/pipe_bc8/event_bc8/IPipeEventInteract_BC8.java index 5f73794dd..a2405ea55 100644 --- a/src/api/java/buildcraft/api/transport/pipe_bc8/event_bc8/IPipeEventInteract_BC8.java +++ b/src/api/java/buildcraft/api/transport/pipe_bc8/event_bc8/IPipeEventInteract_BC8.java @@ -3,7 +3,6 @@ package buildcraft.api.transport.pipe_bc8.event_bc8; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; - import buildcraft.api.tools.IToolWrench; import buildcraft.api.transport.pipe_bc8.IPipeListener; diff --git a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableDynamicRenderer.java b/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableDynamicRenderer.java index 2601a356d..5d1332f9b 100644 --- a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableDynamicRenderer.java +++ b/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableDynamicRenderer.java @@ -1,7 +1,6 @@ package buildcraft.api.transport.pluggable; import net.minecraft.util.EnumFacing; - import buildcraft.api.transport.IPipe; public interface IPipePluggableDynamicRenderer { diff --git a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableItem.java b/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableItem.java index b9295e5f0..1a2d7bbee 100644 --- a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableItem.java +++ b/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableItem.java @@ -2,7 +2,6 @@ package buildcraft.api.transport.pluggable; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; - import buildcraft.api.transport.IPipe; public interface IPipePluggableItem { diff --git a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableStaticRenderer.java b/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableStaticRenderer.java index e4bfc3f60..fd55e2f1c 100644 --- a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableStaticRenderer.java +++ b/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableStaticRenderer.java @@ -4,7 +4,6 @@ import java.util.List; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.util.EnumFacing; - import buildcraft.api.transport.IPipe; public interface IPipePluggableStaticRenderer { diff --git a/src/api/java/buildcraft/api/transport/pluggable/PipePluggable.java b/src/api/java/buildcraft/api/transport/pluggable/PipePluggable.java index 02a0bd3ab..3aaa96f92 100755 --- a/src/api/java/buildcraft/api/transport/pluggable/PipePluggable.java +++ b/src/api/java/buildcraft/api/transport/pluggable/PipePluggable.java @@ -9,7 +9,6 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; - import buildcraft.api.core.INBTStoreable; import buildcraft.api.core.ISerializable; import buildcraft.api.transport.IPipeTile; diff --git a/src/api/java/dan200/computercraft/api/ComputerCraftAPI.java b/src/api/java/dan200/computercraft/api/ComputerCraftAPI.java index b2612351d..95312efbd 100644 --- a/src/api/java/dan200/computercraft/api/ComputerCraftAPI.java +++ b/src/api/java/dan200/computercraft/api/ComputerCraftAPI.java @@ -6,6 +6,11 @@ package dan200.computercraft.api; +import java.lang.reflect.Method; + +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; import dan200.computercraft.api.filesystem.IMount; import dan200.computercraft.api.filesystem.IWritableMount; import dan200.computercraft.api.media.IMediaProvider; @@ -13,11 +18,6 @@ import dan200.computercraft.api.peripheral.IPeripheralProvider; import dan200.computercraft.api.permissions.ITurtlePermissionProvider; import dan200.computercraft.api.redstone.IBundledRedstoneProvider; import dan200.computercraft.api.turtle.ITurtleUpgrade; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; - -import java.lang.reflect.Method; /** * The static entry point to the ComputerCraft API. diff --git a/src/api/java/dan200/computercraft/api/filesystem/IMount.java b/src/api/java/dan200/computercraft/api/filesystem/IMount.java index 1538edbed..f0b32300e 100644 --- a/src/api/java/dan200/computercraft/api/filesystem/IMount.java +++ b/src/api/java/dan200/computercraft/api/filesystem/IMount.java @@ -10,6 +10,8 @@ import java.io.IOException; import java.io.InputStream; import java.util.List; +import net.minecraft.world.World; + /** * Represents a read only part of a virtual filesystem that can be mounted onto a computercraft using IComputerAccess.mount(). * Ready made implementations of this interface can be created using ComputerCraftAPI.createSaveDirMount() or ComputerCraftAPI.createResourceMount(), or you're free to implement it yourselves! diff --git a/src/api/java/dan200/computercraft/api/filesystem/IWritableMount.java b/src/api/java/dan200/computercraft/api/filesystem/IWritableMount.java index f8053d070..37b2f6411 100644 --- a/src/api/java/dan200/computercraft/api/filesystem/IWritableMount.java +++ b/src/api/java/dan200/computercraft/api/filesystem/IWritableMount.java @@ -9,6 +9,8 @@ package dan200.computercraft.api.filesystem; import java.io.IOException; import java.io.OutputStream; +import net.minecraft.world.World; + /** * Represents a part of a virtual filesystem that can be mounted onto a computercraft using IComputerAccess.mount() or IComputerAccess.mountWritable(), that can also be written to. * Ready made implementations of this interface can be created using ComputerCraftAPI.createSaveDirMount(), or you're free to implement it yourselves! diff --git a/src/api/java/dan200/computercraft/api/filesystem/package-info.java b/src/api/java/dan200/computercraft/api/filesystem/package-info.java index 0f4e29c05..5848dd642 100644 --- a/src/api/java/dan200/computercraft/api/filesystem/package-info.java +++ b/src/api/java/dan200/computercraft/api/filesystem/package-info.java @@ -7,4 +7,4 @@ @API( owner="ComputerCraft", provides="ComputerCraft|API|FileSystem", apiVersion="1.78" ) package dan200.computercraft.api.filesystem; -import net.minecraftforge.fml.common.API; \ No newline at end of file +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/dan200/computercraft/api/lua/package-info.java b/src/api/java/dan200/computercraft/api/lua/package-info.java index 76494d864..1d11269f8 100644 --- a/src/api/java/dan200/computercraft/api/lua/package-info.java +++ b/src/api/java/dan200/computercraft/api/lua/package-info.java @@ -8,3 +8,4 @@ package dan200.computercraft.api.lua; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/dan200/computercraft/api/media/IMedia.java b/src/api/java/dan200/computercraft/api/media/IMedia.java index 75c6b6433..eb4e6ef6d 100644 --- a/src/api/java/dan200/computercraft/api/media/IMedia.java +++ b/src/api/java/dan200/computercraft/api/media/IMedia.java @@ -6,9 +6,9 @@ package dan200.computercraft.api.media; -import dan200.computercraft.api.filesystem.IMount; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import dan200.computercraft.api.filesystem.IMount; /** * Represents an item that can be placed in a disk drive and used by a Computer. diff --git a/src/api/java/dan200/computercraft/api/media/package-info.java b/src/api/java/dan200/computercraft/api/media/package-info.java index 19c8454a2..6ec23997f 100644 --- a/src/api/java/dan200/computercraft/api/media/package-info.java +++ b/src/api/java/dan200/computercraft/api/media/package-info.java @@ -8,3 +8,4 @@ package dan200.computercraft.api.media; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/dan200/computercraft/api/package-info.java b/src/api/java/dan200/computercraft/api/package-info.java index 1dee80957..c868c7163 100644 --- a/src/api/java/dan200/computercraft/api/package-info.java +++ b/src/api/java/dan200/computercraft/api/package-info.java @@ -7,4 +7,4 @@ @API( owner="ComputerCraft", provides="ComputerCraft|API", apiVersion="1.78" ) package dan200.computercraft.api; -import net.minecraftforge.fml.common.API; \ No newline at end of file +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/dan200/computercraft/api/peripheral/IComputerAccess.java b/src/api/java/dan200/computercraft/api/peripheral/IComputerAccess.java index baca44395..44271076f 100644 --- a/src/api/java/dan200/computercraft/api/peripheral/IComputerAccess.java +++ b/src/api/java/dan200/computercraft/api/peripheral/IComputerAccess.java @@ -6,6 +6,7 @@ package dan200.computercraft.api.peripheral; +import net.minecraft.world.World; import dan200.computercraft.api.filesystem.IMount; import dan200.computercraft.api.filesystem.IWritableMount; diff --git a/src/api/java/dan200/computercraft/api/peripheral/package-info.java b/src/api/java/dan200/computercraft/api/peripheral/package-info.java index 04cd616ee..5180674c3 100644 --- a/src/api/java/dan200/computercraft/api/peripheral/package-info.java +++ b/src/api/java/dan200/computercraft/api/peripheral/package-info.java @@ -8,3 +8,4 @@ package dan200.computercraft.api.peripheral; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/dan200/computercraft/api/permissions/package-info.java b/src/api/java/dan200/computercraft/api/permissions/package-info.java index 8bd07d828..6e7426430 100644 --- a/src/api/java/dan200/computercraft/api/permissions/package-info.java +++ b/src/api/java/dan200/computercraft/api/permissions/package-info.java @@ -7,4 +7,4 @@ @API( owner="ComputerCraft", provides="ComputerCraft|API|Permissions", apiVersion="1.78" ) package dan200.computercraft.api.permissions; -import net.minecraftforge.fml.common.API; \ No newline at end of file +import net.minecraftforge.fml.common.API; diff --git a/src/api/java/dan200/computercraft/api/redstone/package-info.java b/src/api/java/dan200/computercraft/api/redstone/package-info.java index d864d3db1..92e5f25ce 100644 --- a/src/api/java/dan200/computercraft/api/redstone/package-info.java +++ b/src/api/java/dan200/computercraft/api/redstone/package-info.java @@ -8,3 +8,4 @@ package dan200.computercraft.api.redstone; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/dan200/computercraft/api/turtle/ITurtleAccess.java b/src/api/java/dan200/computercraft/api/turtle/ITurtleAccess.java index f30032efa..b851d397b 100644 --- a/src/api/java/dan200/computercraft/api/turtle/ITurtleAccess.java +++ b/src/api/java/dan200/computercraft/api/turtle/ITurtleAccess.java @@ -6,15 +6,15 @@ package dan200.computercraft.api.turtle; -import dan200.computercraft.api.lua.ILuaContext; -import dan200.computercraft.api.lua.LuaException; -import dan200.computercraft.api.peripheral.IPeripheral; import net.minecraft.inventory.IInventory; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.Vec3; import net.minecraft.world.World; +import dan200.computercraft.api.lua.ILuaContext; +import dan200.computercraft.api.lua.LuaException; +import dan200.computercraft.api.peripheral.IPeripheral; /** * The interface passed to turtle by turtles, providing methods that they can call. diff --git a/src/api/java/dan200/computercraft/api/turtle/ITurtleUpgrade.java b/src/api/java/dan200/computercraft/api/turtle/ITurtleUpgrade.java index 5de721541..08e59fb4a 100644 --- a/src/api/java/dan200/computercraft/api/turtle/ITurtleUpgrade.java +++ b/src/api/java/dan200/computercraft/api/turtle/ITurtleUpgrade.java @@ -6,16 +6,18 @@ package dan200.computercraft.api.turtle; -import dan200.computercraft.api.peripheral.IPeripheral; +import javax.vecmath.Matrix4f; + import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; + import org.apache.commons.lang3.tuple.Pair; -import javax.vecmath.Matrix4f; +import dan200.computercraft.api.peripheral.IPeripheral; /** diff --git a/src/api/java/dan200/computercraft/api/turtle/package-info.java b/src/api/java/dan200/computercraft/api/turtle/package-info.java index 590ece68b..741b60882 100644 --- a/src/api/java/dan200/computercraft/api/turtle/package-info.java +++ b/src/api/java/dan200/computercraft/api/turtle/package-info.java @@ -8,3 +8,4 @@ package dan200.computercraft.api.turtle; import net.minecraftforge.fml.common.API; + diff --git a/src/api/java/ic2/api/crops/CropCard.java b/src/api/java/ic2/api/crops/CropCard.java index 952cc4306..6afb26d24 100644 --- a/src/api/java/ic2/api/crops/CropCard.java +++ b/src/api/java/ic2/api/crops/CropCard.java @@ -4,11 +4,8 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; - import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.ModContainer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; /** * Base agriculture crop. diff --git a/src/api/java/ic2/api/crops/Crops.java b/src/api/java/ic2/api/crops/Crops.java index 1fc86e486..27bc26de6 100644 --- a/src/api/java/ic2/api/crops/Crops.java +++ b/src/api/java/ic2/api/crops/Crops.java @@ -4,10 +4,6 @@ import java.util.Collection; import net.minecraft.item.ItemStack; import net.minecraft.world.biome.BiomeGenBase; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - import net.minecraftforge.common.BiomeDictionary.Type; /** diff --git a/src/api/java/ic2/api/energy/IEnergyNet.java b/src/api/java/ic2/api/energy/IEnergyNet.java index 6c3bac5a7..321fe566c 100644 --- a/src/api/java/ic2/api/energy/IEnergyNet.java +++ b/src/api/java/ic2/api/energy/IEnergyNet.java @@ -2,9 +2,8 @@ package ic2.api.energy; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.world.World; - import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; /** * Interface representing the methods provided by the global EnergyNet class. diff --git a/src/api/java/ic2/api/energy/event/EnergyTileEvent.java b/src/api/java/ic2/api/energy/event/EnergyTileEvent.java index e4571693b..4de79ceae 100644 --- a/src/api/java/ic2/api/energy/event/EnergyTileEvent.java +++ b/src/api/java/ic2/api/energy/event/EnergyTileEvent.java @@ -1,10 +1,8 @@ package ic2.api.energy.event; -import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.event.world.WorldEvent; - import ic2.api.energy.tile.IEnergyTile; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.event.world.WorldEvent; /** * Base class for energy net events, don't use it directly. diff --git a/src/api/java/ic2/api/energy/tile/IEnergyEmitter.java b/src/api/java/ic2/api/energy/tile/IEnergyEmitter.java index 17f56678e..d20b73e1c 100644 --- a/src/api/java/ic2/api/energy/tile/IEnergyEmitter.java +++ b/src/api/java/ic2/api/energy/tile/IEnergyEmitter.java @@ -1,7 +1,6 @@ package ic2.api.energy.tile; import net.minecraft.tileentity.TileEntity; - import net.minecraft.util.EnumFacing; /** diff --git a/src/api/java/ic2/api/event/ExplosionEvent.java b/src/api/java/ic2/api/event/ExplosionEvent.java index a2ad98eaf..091c8d9ec 100644 --- a/src/api/java/ic2/api/event/ExplosionEvent.java +++ b/src/api/java/ic2/api/event/ExplosionEvent.java @@ -3,10 +3,8 @@ package ic2.api.event; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; - -import net.minecraftforge.fml.common.eventhandler.Cancelable; - import net.minecraftforge.event.world.WorldEvent; +import net.minecraftforge.fml.common.eventhandler.Cancelable; @Cancelable public class ExplosionEvent extends WorldEvent { diff --git a/src/api/java/ic2/api/event/LaserEvent.java b/src/api/java/ic2/api/event/LaserEvent.java index 974964123..abbad0ae4 100644 --- a/src/api/java/ic2/api/event/LaserEvent.java +++ b/src/api/java/ic2/api/event/LaserEvent.java @@ -4,10 +4,8 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.world.World; - -import net.minecraftforge.fml.common.eventhandler.Cancelable; - import net.minecraftforge.event.world.WorldEvent; +import net.minecraftforge.fml.common.eventhandler.Cancelable; /** * A bunch of Events to handle the power of the Mining Laser. diff --git a/src/api/java/ic2/api/event/PaintEvent.java b/src/api/java/ic2/api/event/PaintEvent.java index caa2aee28..fc01535c8 100644 --- a/src/api/java/ic2/api/event/PaintEvent.java +++ b/src/api/java/ic2/api/event/PaintEvent.java @@ -1,10 +1,8 @@ package ic2.api.event; import net.minecraft.world.World; - -import net.minecraftforge.fml.common.eventhandler.Cancelable; - import net.minecraftforge.event.world.WorldEvent; +import net.minecraftforge.fml.common.eventhandler.Cancelable; @Cancelable public class PaintEvent extends WorldEvent { diff --git a/src/api/java/ic2/api/event/RetextureEvent.java b/src/api/java/ic2/api/event/RetextureEvent.java index cf431496e..9fda0116f 100644 --- a/src/api/java/ic2/api/event/RetextureEvent.java +++ b/src/api/java/ic2/api/event/RetextureEvent.java @@ -2,10 +2,8 @@ package ic2.api.event; import net.minecraft.block.Block; import net.minecraft.world.World; - -import net.minecraftforge.fml.common.eventhandler.Cancelable; - import net.minecraftforge.event.world.WorldEvent; +import net.minecraftforge.fml.common.eventhandler.Cancelable; @Cancelable public class RetextureEvent extends WorldEvent { diff --git a/src/api/java/ic2/api/info/Info.java b/src/api/java/ic2/api/info/Info.java index 7be58fca3..7bc07062e 100644 --- a/src/api/java/ic2/api/info/Info.java +++ b/src/api/java/ic2/api/info/Info.java @@ -1,7 +1,6 @@ package ic2.api.info; import net.minecraft.util.DamageSource; - import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.LoaderState; diff --git a/src/api/java/ic2/api/item/ILatheItem.java b/src/api/java/ic2/api/item/ILatheItem.java index 3963c6f7e..c1df3562c 100644 --- a/src/api/java/ic2/api/item/ILatheItem.java +++ b/src/api/java/ic2/api/item/ILatheItem.java @@ -2,7 +2,6 @@ package ic2.api.item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/api/java/ic2/api/recipe/ICannerEnrichRecipeManager.java b/src/api/java/ic2/api/recipe/ICannerEnrichRecipeManager.java index 5eba1b68e..87240e70f 100644 --- a/src/api/java/ic2/api/recipe/ICannerEnrichRecipeManager.java +++ b/src/api/java/ic2/api/recipe/ICannerEnrichRecipeManager.java @@ -3,7 +3,6 @@ package ic2.api.recipe; import java.util.Map; import net.minecraft.item.ItemStack; - import net.minecraftforge.fluids.FluidStack; public interface ICannerEnrichRecipeManager { diff --git a/src/api/java/ic2/api/recipe/RecipeInputFluidContainer.java b/src/api/java/ic2/api/recipe/RecipeInputFluidContainer.java index 103d293e2..ae9d1dccd 100644 --- a/src/api/java/ic2/api/recipe/RecipeInputFluidContainer.java +++ b/src/api/java/ic2/api/recipe/RecipeInputFluidContainer.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.item.ItemStack; - import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; diff --git a/src/api/java/ic2/api/recipe/RecipeInputItemStack.java b/src/api/java/ic2/api/recipe/RecipeInputItemStack.java index 84f86ea12..f00951381 100644 --- a/src/api/java/ic2/api/recipe/RecipeInputItemStack.java +++ b/src/api/java/ic2/api/recipe/RecipeInputItemStack.java @@ -4,7 +4,6 @@ import java.util.Arrays; import java.util.List; import net.minecraft.item.ItemStack; - import net.minecraftforge.oredict.OreDictionary; public class RecipeInputItemStack implements IRecipeInput { diff --git a/src/api/java/ic2/api/recipe/RecipeInputOreDict.java b/src/api/java/ic2/api/recipe/RecipeInputOreDict.java index e6e4695d0..e90676328 100644 --- a/src/api/java/ic2/api/recipe/RecipeInputOreDict.java +++ b/src/api/java/ic2/api/recipe/RecipeInputOreDict.java @@ -6,7 +6,6 @@ import java.util.List; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; - import net.minecraftforge.oredict.OreDictionary; public class RecipeInputOreDict implements IRecipeInput { diff --git a/src/api/java/li/cil/oc/api/API.java b/src/api/java/li/cil/oc/api/API.java index 8a02ae0fb..e23da1570 100644 --- a/src/api/java/li/cil/oc/api/API.java +++ b/src/api/java/li/cil/oc/api/API.java @@ -1,6 +1,5 @@ package li.cil.oc.api; -import com.typesafe.config.Config; import li.cil.oc.api.detail.DriverAPI; import li.cil.oc.api.detail.FileSystemAPI; import li.cil.oc.api.detail.ItemAPI; @@ -9,6 +8,8 @@ import li.cil.oc.api.detail.ManualAPI; import li.cil.oc.api.detail.NanomachinesAPI; import li.cil.oc.api.detail.NetworkAPI; +import com.typesafe.config.Config; + /** * Central reference for the API. *

diff --git a/src/api/java/li/cil/oc/api/Driver.java b/src/api/java/li/cil/oc/api/Driver.java index 9d8d8be21..493cc3e10 100644 --- a/src/api/java/li/cil/oc/api/Driver.java +++ b/src/api/java/li/cil/oc/api/Driver.java @@ -1,5 +1,7 @@ package li.cil.oc.api; +import java.util.Collection; + import li.cil.oc.api.driver.Block; import li.cil.oc.api.driver.Converter; import li.cil.oc.api.driver.EnvironmentHost; @@ -8,8 +10,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import java.util.Collection; - /** * This API allows registering new drivers with the mod. *

diff --git a/src/api/java/li/cil/oc/api/IMC.java b/src/api/java/li/cil/oc/api/IMC.java index e1632093b..e4785ed7c 100644 --- a/src/api/java/li/cil/oc/api/IMC.java +++ b/src/api/java/li/cil/oc/api/IMC.java @@ -4,6 +4,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.fml.common.event.FMLInterModComms; + import org.apache.commons.lang3.tuple.Pair; /** diff --git a/src/api/java/li/cil/oc/api/Items.java b/src/api/java/li/cil/oc/api/Items.java index 81a10bc2f..93e4b2615 100644 --- a/src/api/java/li/cil/oc/api/Items.java +++ b/src/api/java/li/cil/oc/api/Items.java @@ -1,11 +1,11 @@ package li.cil.oc.api; +import java.util.concurrent.Callable; + import li.cil.oc.api.detail.ItemInfo; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; -import java.util.concurrent.Callable; - /** * Access to item definitions for all blocks and items provided by * OpenComputers. diff --git a/src/api/java/li/cil/oc/api/Machine.java b/src/api/java/li/cil/oc/api/Machine.java index 43fb6c572..6af312f43 100644 --- a/src/api/java/li/cil/oc/api/Machine.java +++ b/src/api/java/li/cil/oc/api/Machine.java @@ -1,11 +1,11 @@ package li.cil.oc.api; -import li.cil.oc.api.machine.Architecture; -import li.cil.oc.api.machine.MachineHost; - import java.util.Collection; import java.util.Collections; +import li.cil.oc.api.machine.Architecture; +import li.cil.oc.api.machine.MachineHost; + /** * This API is intended for people who would like to implement custom computer * blocks or anything else hosting a computer. diff --git a/src/api/java/li/cil/oc/api/Nanomachines.java b/src/api/java/li/cil/oc/api/Nanomachines.java index afa239b8d..a0ab61e99 100644 --- a/src/api/java/li/cil/oc/api/Nanomachines.java +++ b/src/api/java/li/cil/oc/api/Nanomachines.java @@ -1,11 +1,11 @@ package li.cil.oc.api; +import java.util.Collections; + import li.cil.oc.api.nanomachines.BehaviorProvider; import li.cil.oc.api.nanomachines.Controller; import net.minecraft.entity.player.EntityPlayer; -import java.util.Collections; - /** * This API allows interfacing with nanomachines. *

diff --git a/src/api/java/li/cil/oc/api/component/package-info.java b/src/api/java/li/cil/oc/api/component/package-info.java index 229794703..831cef78e 100644 --- a/src/api/java/li/cil/oc/api/component/package-info.java +++ b/src/api/java/li/cil/oc/api/component/package-info.java @@ -11,4 +11,4 @@ apiVersion = API.VERSION) package li.cil.oc.api.component; -import li.cil.oc.api.API; \ No newline at end of file +import li.cil.oc.api.API; diff --git a/src/api/java/li/cil/oc/api/detail/DriverAPI.java b/src/api/java/li/cil/oc/api/detail/DriverAPI.java index 44bafd166..b3cc4d530 100644 --- a/src/api/java/li/cil/oc/api/detail/DriverAPI.java +++ b/src/api/java/li/cil/oc/api/detail/DriverAPI.java @@ -1,5 +1,7 @@ package li.cil.oc.api.detail; +import java.util.Collection; + import li.cil.oc.api.driver.Block; import li.cil.oc.api.driver.Converter; import li.cil.oc.api.driver.EnvironmentHost; @@ -8,8 +10,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import java.util.Collection; - public interface DriverAPI { /** * Registers a new driver for a block component. diff --git a/src/api/java/li/cil/oc/api/detail/ItemAPI.java b/src/api/java/li/cil/oc/api/detail/ItemAPI.java index 358472c48..089736215 100644 --- a/src/api/java/li/cil/oc/api/detail/ItemAPI.java +++ b/src/api/java/li/cil/oc/api/detail/ItemAPI.java @@ -1,11 +1,11 @@ package li.cil.oc.api.detail; +import java.util.concurrent.Callable; + import li.cil.oc.api.FileSystem; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; -import java.util.concurrent.Callable; - public interface ItemAPI { /** * Get a descriptor object for the block or item with the specified name. diff --git a/src/api/java/li/cil/oc/api/detail/MachineAPI.java b/src/api/java/li/cil/oc/api/detail/MachineAPI.java index 282291c1a..c543662c9 100644 --- a/src/api/java/li/cil/oc/api/detail/MachineAPI.java +++ b/src/api/java/li/cil/oc/api/detail/MachineAPI.java @@ -1,11 +1,11 @@ package li.cil.oc.api.detail; +import java.util.Collection; + import li.cil.oc.api.machine.Architecture; import li.cil.oc.api.machine.Machine; import li.cil.oc.api.machine.MachineHost; -import java.util.Collection; - public interface MachineAPI { /** * Register an architecture that can be used to create new machines. diff --git a/src/api/java/li/cil/oc/api/driver/item/UpgradeRenderer.java b/src/api/java/li/cil/oc/api/driver/item/UpgradeRenderer.java index 87bc9f1ad..b3b1ad08c 100644 --- a/src/api/java/li/cil/oc/api/driver/item/UpgradeRenderer.java +++ b/src/api/java/li/cil/oc/api/driver/item/UpgradeRenderer.java @@ -1,12 +1,10 @@ package li.cil.oc.api.driver.item; +import java.util.Set; + import li.cil.oc.api.event.RobotRenderEvent; import li.cil.oc.api.internal.Robot; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.Set; /** * This interface can be implemented by items to allow custom rendering of diff --git a/src/api/java/li/cil/oc/api/driver/item/package-info.java b/src/api/java/li/cil/oc/api/driver/item/package-info.java index 24a730120..d8ba8c6ec 100644 --- a/src/api/java/li/cil/oc/api/driver/item/package-info.java +++ b/src/api/java/li/cil/oc/api/driver/item/package-info.java @@ -10,4 +10,4 @@ apiVersion = API.VERSION) package li.cil.oc.api.driver.item; -import li.cil.oc.api.API; \ No newline at end of file +import li.cil.oc.api.API; diff --git a/src/api/java/li/cil/oc/api/driver/package-info.java b/src/api/java/li/cil/oc/api/driver/package-info.java index 7a3ee423c..7416e5feb 100644 --- a/src/api/java/li/cil/oc/api/driver/package-info.java +++ b/src/api/java/li/cil/oc/api/driver/package-info.java @@ -10,4 +10,4 @@ apiVersion = API.VERSION) package li.cil.oc.api.driver; -import li.cil.oc.api.API; \ No newline at end of file +import li.cil.oc.api.API; diff --git a/src/api/java/li/cil/oc/api/event/GeolyzerEvent.java b/src/api/java/li/cil/oc/api/event/GeolyzerEvent.java index 5d940f7a6..c0571906b 100644 --- a/src/api/java/li/cil/oc/api/event/GeolyzerEvent.java +++ b/src/api/java/li/cil/oc/api/event/GeolyzerEvent.java @@ -1,13 +1,13 @@ package li.cil.oc.api.event; +import java.util.HashMap; +import java.util.Map; + import li.cil.oc.api.driver.EnvironmentHost; import net.minecraft.util.BlockPos; import net.minecraftforge.fml.common.eventhandler.Cancelable; import net.minecraftforge.fml.common.eventhandler.Event; -import java.util.HashMap; -import java.util.Map; - /** * This event is fired by the geolyzer block/upgrade. *

diff --git a/src/api/java/li/cil/oc/api/event/RobotRenderEvent.java b/src/api/java/li/cil/oc/api/event/RobotRenderEvent.java index 4b20d0364..6c2d163b5 100644 --- a/src/api/java/li/cil/oc/api/event/RobotRenderEvent.java +++ b/src/api/java/li/cil/oc/api/event/RobotRenderEvent.java @@ -1,15 +1,16 @@ package li.cil.oc.api.event; +import java.util.Set; + import li.cil.oc.api.driver.item.UpgradeRenderer; import li.cil.oc.api.internal.Agent; import li.cil.oc.api.internal.Robot; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.eventhandler.Cancelable; + import org.lwjgl.util.vector.Vector3f; import org.lwjgl.util.vector.Vector4f; -import java.util.Set; - /** * Fired directly before the robot's chassis is rendered. *

diff --git a/src/api/java/li/cil/oc/api/event/package-info.java b/src/api/java/li/cil/oc/api/event/package-info.java index 7fe9fe75e..65e5831d9 100644 --- a/src/api/java/li/cil/oc/api/event/package-info.java +++ b/src/api/java/li/cil/oc/api/event/package-info.java @@ -8,4 +8,4 @@ apiVersion = API.VERSION) package li.cil.oc.api.event; -import li.cil.oc.api.API; \ No newline at end of file +import li.cil.oc.api.API; diff --git a/src/api/java/li/cil/oc/api/fs/FileSystem.java b/src/api/java/li/cil/oc/api/fs/FileSystem.java index a9af47466..13962275d 100644 --- a/src/api/java/li/cil/oc/api/fs/FileSystem.java +++ b/src/api/java/li/cil/oc/api/fs/FileSystem.java @@ -1,9 +1,9 @@ package li.cil.oc.api.fs; -import li.cil.oc.api.Persistable; - import java.io.FileNotFoundException; +import li.cil.oc.api.Persistable; + /** * Interface for file system driver compatible file systems. *

diff --git a/src/api/java/li/cil/oc/api/fs/package-info.java b/src/api/java/li/cil/oc/api/fs/package-info.java index d1e3c5f2f..98eb58849 100644 --- a/src/api/java/li/cil/oc/api/fs/package-info.java +++ b/src/api/java/li/cil/oc/api/fs/package-info.java @@ -19,4 +19,4 @@ apiVersion = API.VERSION) package li.cil.oc.api.fs; -import li.cil.oc.api.API; \ No newline at end of file +import li.cil.oc.api.API; diff --git a/src/api/java/li/cil/oc/api/internal/Agent.java b/src/api/java/li/cil/oc/api/internal/Agent.java index 6f78c196b..ce114627e 100644 --- a/src/api/java/li/cil/oc/api/internal/Agent.java +++ b/src/api/java/li/cil/oc/api/internal/Agent.java @@ -1,11 +1,11 @@ package li.cil.oc.api.internal; +import java.util.UUID; + import li.cil.oc.api.machine.MachineHost; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; -import java.util.UUID; - /** * General marker interface for autonomous agents such as robots and drones. */ diff --git a/src/api/java/li/cil/oc/api/internal/package-info.java b/src/api/java/li/cil/oc/api/internal/package-info.java index ad700a273..d894dcae0 100644 --- a/src/api/java/li/cil/oc/api/internal/package-info.java +++ b/src/api/java/li/cil/oc/api/internal/package-info.java @@ -19,4 +19,4 @@ apiVersion = API.VERSION) package li.cil.oc.api.internal; -import li.cil.oc.api.API; \ No newline at end of file +import li.cil.oc.api.API; diff --git a/src/api/java/li/cil/oc/api/machine/Architecture.java b/src/api/java/li/cil/oc/api/machine/Architecture.java index 5503e447c..cb37a1ecc 100644 --- a/src/api/java/li/cil/oc/api/machine/Architecture.java +++ b/src/api/java/li/cil/oc/api/machine/Architecture.java @@ -1,10 +1,14 @@ package li.cil.oc.api.machine; +import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import java.lang.annotation.*; - /** * This interface abstracts away any language specific details for the Machine. *

diff --git a/src/api/java/li/cil/oc/api/machine/Arguments.java b/src/api/java/li/cil/oc/api/machine/Arguments.java index a5a1c992c..3e6c8671b 100644 --- a/src/api/java/li/cil/oc/api/machine/Arguments.java +++ b/src/api/java/li/cil/oc/api/machine/Arguments.java @@ -1,9 +1,9 @@ package li.cil.oc.api.machine; -import net.minecraft.item.ItemStack; - import java.util.Map; +import net.minecraft.item.ItemStack; + /** * This interface provides access to arguments passed to a {@link Callback}. *

diff --git a/src/api/java/li/cil/oc/api/machine/Machine.java b/src/api/java/li/cil/oc/api/machine/Machine.java index b7270f76c..9c53f93b4 100644 --- a/src/api/java/li/cil/oc/api/machine/Machine.java +++ b/src/api/java/li/cil/oc/api/machine/Machine.java @@ -1,9 +1,9 @@ package li.cil.oc.api.machine; -import li.cil.oc.api.network.ManagedEnvironment; - import java.util.Map; +import li.cil.oc.api.network.ManagedEnvironment; + /** * This interface allows interacting with a Machine obtained via the factory * method {@link li.cil.oc.api.Machine#create(MachineHost)}. diff --git a/src/api/java/li/cil/oc/api/machine/package-info.java b/src/api/java/li/cil/oc/api/machine/package-info.java index 97807dcc8..2922cfd54 100644 --- a/src/api/java/li/cil/oc/api/machine/package-info.java +++ b/src/api/java/li/cil/oc/api/machine/package-info.java @@ -22,4 +22,4 @@ apiVersion = API.VERSION) package li.cil.oc.api.machine; -import li.cil.oc.api.API; \ No newline at end of file +import li.cil.oc.api.API; diff --git a/src/api/java/li/cil/oc/api/manual/package-info.java b/src/api/java/li/cil/oc/api/manual/package-info.java index 1cdeae847..1c821b918 100644 --- a/src/api/java/li/cil/oc/api/manual/package-info.java +++ b/src/api/java/li/cil/oc/api/manual/package-info.java @@ -11,4 +11,4 @@ apiVersion = API.VERSION) package li.cil.oc.api.manual; -import li.cil.oc.api.API; \ No newline at end of file +import li.cil.oc.api.API; diff --git a/src/api/java/li/cil/oc/api/network/Component.java b/src/api/java/li/cil/oc/api/network/Component.java index abf29618f..84df6eaa5 100644 --- a/src/api/java/li/cil/oc/api/network/Component.java +++ b/src/api/java/li/cil/oc/api/network/Component.java @@ -1,10 +1,10 @@ package li.cil.oc.api.network; +import java.util.Collection; + import li.cil.oc.api.machine.Callback; import li.cil.oc.api.machine.Context; -import java.util.Collection; - /** * Components are nodes that can be addressed computers via drivers. *

diff --git a/src/api/java/li/cil/oc/api/network/package-info.java b/src/api/java/li/cil/oc/api/network/package-info.java index 4892d137c..0bda9c964 100644 --- a/src/api/java/li/cil/oc/api/network/package-info.java +++ b/src/api/java/li/cil/oc/api/network/package-info.java @@ -10,4 +10,4 @@ apiVersion = API.VERSION) package li.cil.oc.api.network; -import li.cil.oc.api.API; \ No newline at end of file +import li.cil.oc.api.API; diff --git a/src/api/java/li/cil/oc/api/prefab/ResourceContentProvider.java b/src/api/java/li/cil/oc/api/prefab/ResourceContentProvider.java index 44d5efe68..cbcc90206 100644 --- a/src/api/java/li/cil/oc/api/prefab/ResourceContentProvider.java +++ b/src/api/java/li/cil/oc/api/prefab/ResourceContentProvider.java @@ -1,16 +1,17 @@ package li.cil.oc.api.prefab; -import com.google.common.base.Charsets; -import li.cil.oc.api.manual.ContentProvider; -import net.minecraft.client.Minecraft; -import net.minecraft.util.ResourceLocation; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.ArrayList; +import li.cil.oc.api.manual.ContentProvider; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; + +import com.google.common.base.Charsets; + /** * Basic implementation of a content provider based on Minecraft's resource * loading framework. diff --git a/src/api/java/li/cil/oc/api/prefab/TextureTabIconRenderer.java b/src/api/java/li/cil/oc/api/prefab/TextureTabIconRenderer.java index 415a295ed..f0fcaf2c8 100644 --- a/src/api/java/li/cil/oc/api/prefab/TextureTabIconRenderer.java +++ b/src/api/java/li/cil/oc/api/prefab/TextureTabIconRenderer.java @@ -8,6 +8,7 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; + import org.lwjgl.opengl.GL11; /** diff --git a/src/api/java/li/cil/oc/api/prefab/package-info.java b/src/api/java/li/cil/oc/api/prefab/package-info.java index 306982259..8f9e779b5 100644 --- a/src/api/java/li/cil/oc/api/prefab/package-info.java +++ b/src/api/java/li/cil/oc/api/prefab/package-info.java @@ -13,4 +13,4 @@ apiVersion = API.VERSION) package li.cil.oc.api.prefab; -import li.cil.oc.api.API; \ No newline at end of file +import li.cil.oc.api.API; diff --git a/src/api/java/mcp/mobius/waila/api/IWailaCommonAccessor.java b/src/api/java/mcp/mobius/waila/api/IWailaCommonAccessor.java index de56a5406..5226d11ef 100644 --- a/src/api/java/mcp/mobius/waila/api/IWailaCommonAccessor.java +++ b/src/api/java/mcp/mobius/waila/api/IWailaCommonAccessor.java @@ -8,7 +8,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; diff --git a/src/api/java/mcp/mobius/waila/api/IWailaSummaryProvider.java b/src/api/java/mcp/mobius/waila/api/IWailaSummaryProvider.java index 03d94ebd6..f79064981 100644 --- a/src/api/java/mcp/mobius/waila/api/IWailaSummaryProvider.java +++ b/src/api/java/mcp/mobius/waila/api/IWailaSummaryProvider.java @@ -1,9 +1,9 @@ package mcp.mobius.waila.api; -import net.minecraft.item.ItemStack; - import java.util.LinkedHashMap; +import net.minecraft.item.ItemStack; + public interface IWailaSummaryProvider { /* This interface is used to control the display data in the description screen */ diff --git a/src/api/java/mcp/mobius/waila/api/IWailaTooltipRenderer.java b/src/api/java/mcp/mobius/waila/api/IWailaTooltipRenderer.java index 746c75e77..efbfd91b7 100644 --- a/src/api/java/mcp/mobius/waila/api/IWailaTooltipRenderer.java +++ b/src/api/java/mcp/mobius/waila/api/IWailaTooltipRenderer.java @@ -1,6 +1,6 @@ package mcp.mobius.waila.api; -import java.awt.*; +import java.awt.Dimension; public interface IWailaTooltipRenderer { diff --git a/src/api/java/mcp/mobius/waila/api/package-info.java b/src/api/java/mcp/mobius/waila/api/package-info.java index 6102327b9..e1f6cdfa2 100644 --- a/src/api/java/mcp/mobius/waila/api/package-info.java +++ b/src/api/java/mcp/mobius/waila/api/package-info.java @@ -1,3 +1,3 @@ @API(apiVersion="1.3",owner="Waila",provides="WailaAPI") package mcp.mobius.waila.api; -import net.minecraftforge.fml.common.API; \ No newline at end of file +import net.minecraftforge.fml.common.API; diff --git a/src/main/java/codechicken/core/launch/DepLoader.java b/src/main/java/codechicken/core/launch/DepLoader.java index 96e9d56b0..b9eab1105 100644 --- a/src/main/java/codechicken/core/launch/DepLoader.java +++ b/src/main/java/codechicken/core/launch/DepLoader.java @@ -1,41 +1,62 @@ package codechicken.core.launch; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import net.minecraftforge.fml.common.versioning.ComparableVersion; -import net.minecraftforge.fml.relauncher.FMLInjectionData; -import net.minecraftforge.fml.relauncher.FMLLaunchHandler; -import net.minecraftforge.fml.relauncher.IFMLCallHook; -import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; -import net.minecraft.launchwrapper.LaunchClassLoader; -import sun.misc.URLClassPath; -import sun.net.util.URLUtil; - -import javax.swing.*; -import javax.swing.event.HyperlinkEvent; -import javax.swing.event.HyperlinkListener; -import java.awt.*; +import java.awt.Desktop; import java.awt.Dialog.ModalityType; +import java.awt.Dimension; +import java.awt.GraphicsEnvironment; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.io.*; +import java.io.Closeable; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.InterruptedIOException; import java.lang.reflect.Field; import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; import java.net.URLConnection; import java.nio.ByteBuffer; -import java.util.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; import java.util.List; +import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; +import javax.swing.Box; +import javax.swing.JDialog; +import javax.swing.JEditorPane; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JProgressBar; +import javax.swing.WindowConstants; +import javax.swing.event.HyperlinkEvent; +import javax.swing.event.HyperlinkListener; + +import net.minecraft.launchwrapper.LaunchClassLoader; +import net.minecraftforge.fml.common.versioning.ComparableVersion; +import net.minecraftforge.fml.relauncher.FMLInjectionData; +import net.minecraftforge.fml.relauncher.FMLLaunchHandler; +import net.minecraftforge.fml.relauncher.IFMLCallHook; +import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; +import sun.misc.URLClassPath; +import sun.net.util.URLUtil; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + /** * For autodownloading stuff. * This is really unoriginal, mostly ripped off FML, credits to cpw. diff --git a/src/main/java/cofh/api/energy/package-info.java b/src/main/java/cofh/api/energy/package-info.java index 9ff1bd299..63b756020 100644 --- a/src/main/java/cofh/api/energy/package-info.java +++ b/src/main/java/cofh/api/energy/package-info.java @@ -3,5 +3,5 @@ package cofh.api.energy; import net.minecraftforge.fml.common.API; - import cofh.api.CoFHAPIProps; + diff --git a/src/main/java/cofh/api/item/package-info.java b/src/main/java/cofh/api/item/package-info.java index c05530025..2bc4b17aa 100644 --- a/src/main/java/cofh/api/item/package-info.java +++ b/src/main/java/cofh/api/item/package-info.java @@ -5,6 +5,6 @@ @API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHAPI", provides = "CoFHAPI|item") package cofh.api.item; -import cofh.api.CoFHAPIProps; import net.minecraftforge.fml.common.API; +import cofh.api.CoFHAPIProps; diff --git a/src/main/java/cofh/api/package-info.java b/src/main/java/cofh/api/package-info.java index 6a3b1a5a9..e1a357b5b 100644 --- a/src/main/java/cofh/api/package-info.java +++ b/src/main/java/cofh/api/package-info.java @@ -3,3 +3,4 @@ package cofh.api; import net.minecraftforge.fml.common.API; + diff --git a/src/main/java/mekanism/api/gas/GasTransmission.java b/src/main/java/mekanism/api/gas/GasTransmission.java index aa4e17c5e..495b800da 100644 --- a/src/main/java/mekanism/api/gas/GasTransmission.java +++ b/src/main/java/mekanism/api/gas/GasTransmission.java @@ -9,7 +9,6 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.transmitters.TransmissionType; import mekanism.common.capabilities.Capabilities; - import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; diff --git a/src/main/java/mekanism/client/ClientConnectionHandler.java b/src/main/java/mekanism/client/ClientConnectionHandler.java index 0b94513fc..a4432e7e5 100644 --- a/src/main/java/mekanism/client/ClientConnectionHandler.java +++ b/src/main/java/mekanism/client/ClientConnectionHandler.java @@ -5,7 +5,6 @@ import java.net.InetSocketAddress; import mekanism.api.MekanismConfig.general; import mekanism.client.voice.VoiceClient; import mekanism.common.Mekanism; - import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.network.FMLNetworkEvent.ClientConnectedToServerEvent; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 5872a96d8..6d23144c4 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -233,7 +233,8 @@ public class ClientProxy extends CommonProxy public static Map machineResources = new HashMap(); public static Map basicResources = new HashMap(); - public static final String[] CUSTOM_RENDERS = new String[] {"fluid_tank"}; + public static final String[] CUSTOM_RENDERS = new String[] {"fluid_tank", "bin_basic", "bin_advanced", "bin_elite", "bin_ultimate", + "Jetpack", "FreeRunners", "AtomicDisassembler", "ScubaTank", "GasMask", "ArmoredJetpack", "Flamethrower"}; @Override public void loadConfiguration() @@ -527,6 +528,11 @@ public class ClientProxy extends CommonProxy } } + if(type == BasicBlockType.BIN) + { + properties = "inventory"; + } + ModelResourceLocation model = new ModelResourceLocation(resource, properties); basicResources.put(resource, model); diff --git a/src/main/java/mekanism/client/entity/EntityLaser.java b/src/main/java/mekanism/client/entity/EntityLaser.java index ec4967563..9f96f6656 100644 --- a/src/main/java/mekanism/client/entity/EntityLaser.java +++ b/src/main/java/mekanism/client/entity/EntityLaser.java @@ -4,20 +4,18 @@ import mekanism.api.Pos3D; import mekanism.client.render.MekanismRenderer; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.entity.Entity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import net.minecraft.util.EnumFacing; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class EntityLaser extends EntityFX { @@ -42,7 +40,7 @@ public class EntityLaser extends EntityFX { worldRendererIn.finishDrawing(); - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glPushAttrib(GL11.GL_POLYGON_BIT + GL11.GL_ENABLE_BIT); GL11.glDisable(GL11.GL_CULL_FACE); MekanismRenderer.glowOn(); @@ -52,7 +50,7 @@ public class EntityLaser extends EntityFX float newY = (float)(this.prevPosY + (this.posY - this.prevPosY) * (double)partialTicks - interpPosY); float newZ = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (double)partialTicks - interpPosZ); - GL11.glTranslatef(newX, newY, newZ); + GlStateManager.translate(newX, newY, newZ); switch(direction) { @@ -62,14 +60,15 @@ public class EntityLaser extends EntityFX break; case WEST: case EAST: - GL11.glRotated(90, 0, 0, 1); + GlStateManager.rotate(90, 0, 0, 1); break; case NORTH: case SOUTH: - GL11.glRotated(90, 1, 0, 0); + GlStateManager.rotate(90, 1, 0, 0); break; } - GL11.glRotated(45, 0, 1, 0); + + GlStateManager.rotate(45, 0, 1, 0); worldRendererIn.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); worldRendererIn.pos(-particleScale, -length/2, 0).tex(0, 0).color(particleRed, particleGreen, particleBlue, particleAlpha).endVertex(); worldRendererIn.pos(-particleScale, length/2, 0).tex(0, 1).color(particleRed, particleGreen, particleBlue, particleAlpha).endVertex(); @@ -77,7 +76,7 @@ public class EntityLaser extends EntityFX worldRendererIn.pos(particleScale, -length/2, 0).tex(1, 0).color(particleRed, particleGreen, particleBlue, particleAlpha).endVertex(); worldRendererIn.finishDrawing(); - GL11.glRotated(90, 0, 1, 0); + GlStateManager.rotate(90, 0, 1, 0); worldRendererIn.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); worldRendererIn.pos(-particleScale, -length/2, 0).tex(0, 0).color(particleRed, particleGreen, particleBlue, particleAlpha).endVertex(); worldRendererIn.pos(-particleScale, length/2, 0).tex(0, 1).color(particleRed, particleGreen, particleBlue, particleAlpha).endVertex(); @@ -87,7 +86,7 @@ public class EntityLaser extends EntityFX MekanismRenderer.glowOff(); GL11.glPopAttrib(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismRenderer.getBlocksTexture()); worldRendererIn.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); diff --git a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java index 81d3a7eb3..ae8632dd3 100644 --- a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java @@ -24,12 +24,11 @@ import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiAdvancedElectricMachine extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiBoilerStats.java b/src/main/java/mekanism/client/gui/GuiBoilerStats.java index e23e5161a..0c5876093 100644 --- a/src/main/java/mekanism/client/gui/GuiBoilerStats.java +++ b/src/main/java/mekanism/client/gui/GuiBoilerStats.java @@ -19,12 +19,11 @@ 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 net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiBoilerStats extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiChanceMachine.java b/src/main/java/mekanism/client/gui/GuiChanceMachine.java index 9fdca649c..c334cb19f 100644 --- a/src/main/java/mekanism/client/gui/GuiChanceMachine.java +++ b/src/main/java/mekanism/client/gui/GuiChanceMachine.java @@ -22,12 +22,11 @@ import mekanism.common.tile.TileEntityChanceMachine; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiChanceMachine extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java index 0de4a869d..ae8916bd0 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java @@ -30,16 +30,16 @@ import mekanism.common.tile.TileEntityChemicalCrystallizer; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.opengl.GL11; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiChemicalCrystallizer extends GuiMekanism { @@ -127,11 +127,11 @@ public class GuiChemicalCrystallizer extends GuiMekanism if(renderStack != null) { try { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); itemRender.renderItemAndEffectIntoGUI(renderStack, 131, 14); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } catch(Exception e) {} } diff --git a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java index 007e50e8e..a299c0241 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java @@ -7,13 +7,13 @@ 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; 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; @@ -24,12 +24,11 @@ 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 net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiChemicalDissolutionChamber extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java index 9e7d5b188..2208988b3 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java @@ -24,12 +24,11 @@ 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 net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiChemicalInfuser extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java index cfe8c24bb..9cc16820d 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java @@ -24,12 +24,11 @@ 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 net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiChemicalOxidizer extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java index 78927cea2..becd2a6a8 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java @@ -29,12 +29,11 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiChemicalWasher extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiDictionary.java b/src/main/java/mekanism/client/gui/GuiDictionary.java index 2198cc7b5..1b633ccb4 100644 --- a/src/main/java/mekanism/client/gui/GuiDictionary.java +++ b/src/main/java/mekanism/client/gui/GuiDictionary.java @@ -8,16 +8,16 @@ import mekanism.common.inventory.container.ContainerDictionary; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; 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 GuiDictionary extends GuiMekanism { @@ -43,11 +43,11 @@ public class GuiDictionary extends GuiMekanism if(itemType != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); itemRender.renderItemAndEffectIntoGUI(itemType, 6, 6); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); @@ -67,7 +67,7 @@ public class GuiDictionary extends GuiMekanism if(xAxis >= 6 && xAxis <= 22 && yAxis >= 6 && yAxis <= 22) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_DEPTH_TEST); @@ -77,7 +77,7 @@ public class GuiDictionary extends GuiMekanism GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index fb6a49e60..d10e243da 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -5,7 +5,6 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.EnumColor; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; @@ -30,14 +29,14 @@ 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.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiDigitalMiner extends GuiMekanism { @@ -183,7 +182,7 @@ public class GuiDigitalMiner extends GuiMekanism if(tileEntity.missingStack != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glColor4f(1, 1, 1, 1); GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL12.GL_RESCALE_NORMAL); @@ -194,7 +193,7 @@ public class GuiDigitalMiner extends GuiMekanism itemRender.renderItemAndEffectIntoGUI(tileEntity.missingStack, 144, 27); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } else { mc.getTextureManager().bindTexture(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, "GuiSlot.png")); diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index 470f0134b..8c418be99 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -29,16 +29,16 @@ 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.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiDigitalMinerConfig extends GuiMekanism { @@ -464,11 +464,11 @@ public class GuiDigitalMinerConfig extends GuiMekanism if(itemFilter.itemType != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); itemRender.renderItemAndEffectIntoGUI(itemFilter.itemType, 59, yStart + 3); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } fontRendererObj.drawString(LangUtils.localize("gui.itemFilter"), 78, yStart + 2, 0x404040); @@ -485,11 +485,11 @@ public class GuiDigitalMinerConfig extends GuiMekanism if(oreDictStacks.get(filter).renderStack != null) { try { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); itemRender.renderItemAndEffectIntoGUI(oreDictStacks.get(filter).renderStack, 59, yStart + 3); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } catch(Exception e) {} } @@ -501,11 +501,11 @@ public class GuiDigitalMinerConfig extends GuiMekanism if(itemFilter.materialItem != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); itemRender.renderItemAndEffectIntoGUI(itemFilter.materialItem, 59, yStart + 3); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } fontRendererObj.drawString(LangUtils.localize("gui.materialFilter"), 78, yStart + 2, 0x404040); @@ -522,11 +522,11 @@ public class GuiDigitalMinerConfig extends GuiMekanism if(modIDStacks.get(filter).renderStack != null) { try { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); itemRender.renderItemAndEffectIntoGUI(modIDStacks.get(filter).renderStack, 59, yStart + 3); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } catch(Exception e) {} } diff --git a/src/main/java/mekanism/client/gui/GuiDynamicTank.java b/src/main/java/mekanism/client/gui/GuiDynamicTank.java index c7fa039a2..7f2442c81 100644 --- a/src/main/java/mekanism/client/gui/GuiDynamicTank.java +++ b/src/main/java/mekanism/client/gui/GuiDynamicTank.java @@ -11,12 +11,11 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiDynamicTank extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiElectricMachine.java b/src/main/java/mekanism/client/gui/GuiElectricMachine.java index 3722cdeb1..e62720f83 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiElectricMachine.java @@ -22,12 +22,11 @@ import mekanism.common.tile.TileEntityElectricMachine; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiElectricMachine extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiElectricPump.java b/src/main/java/mekanism/client/gui/GuiElectricPump.java index 1ac6cbdaf..21b328da0 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricPump.java +++ b/src/main/java/mekanism/client/gui/GuiElectricPump.java @@ -23,12 +23,11 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiElectricPump extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java index b568b2518..3af5ff8a0 100755 --- a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -34,13 +35,11 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - -import java.io.IOException; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiElectrolyticSeparator extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiEnergyCube.java b/src/main/java/mekanism/client/gui/GuiEnergyCube.java index 3c7d6fc86..3b7823e82 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergyCube.java +++ b/src/main/java/mekanism/client/gui/GuiEnergyCube.java @@ -21,12 +21,11 @@ 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 net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiEnergyCube extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index d6d1b0af3..9cdb23c9a 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -26,17 +26,15 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; - import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; 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 GuiFactory extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiFluidTank.java b/src/main/java/mekanism/client/gui/GuiFluidTank.java index 86e83b999..161342a15 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidTank.java +++ b/src/main/java/mekanism/client/gui/GuiFluidTank.java @@ -14,12 +14,11 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiFluidTank extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java index 1e21e00dc..22380fc34 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java +++ b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java @@ -23,12 +23,11 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiFluidicPlenisher extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java index f6e08e456..5cc36acb5 100644 --- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java +++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java @@ -27,16 +27,16 @@ import mekanism.common.tile.TileEntityFormulaicAssemblicator; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.renderer.GlStateManager; 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; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiFormulaicAssemblicator extends GuiMekanism { @@ -200,7 +200,7 @@ public class GuiFormulaicAssemblicator extends GuiMekanism if(stack != null) { Slot slot = (Slot)inventorySlots.inventorySlots.get(i+20); - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); if(slot.getStack() == null || !slot.getStack().isItemEqual(stack)) { @@ -213,7 +213,7 @@ public class GuiFormulaicAssemblicator extends GuiMekanism itemRender.renderItemAndEffectIntoGUI(stack, guiWidth + slot.xDisplayPosition, guiHeight + slot.yDisplayPosition); MekanismRenderer.blendOff(); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } } diff --git a/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java b/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java index 634ce007c..5e564399c 100644 --- a/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java +++ b/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java @@ -17,12 +17,11 @@ 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 net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiFuelwoodHeater extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiGasTank.java b/src/main/java/mekanism/client/gui/GuiGasTank.java index e2420e394..4cde3fa82 100644 --- a/src/main/java/mekanism/client/gui/GuiGasTank.java +++ b/src/main/java/mekanism/client/gui/GuiGasTank.java @@ -20,12 +20,11 @@ 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 net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiGasTank extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java index 3056b5ad6..988c8dc86 100644 --- a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java +++ b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java @@ -14,12 +14,11 @@ 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 net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiInductionMatrix extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java index 2e27b0b2b..fe39b4e07 100644 --- a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java +++ b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java @@ -19,15 +19,14 @@ 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 net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; 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 GuiLaserAmplifier extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java index 456eb43dd..ca23b0e40 100644 --- a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java +++ b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java @@ -30,17 +30,17 @@ 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.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiLogisticalSorter extends GuiMekanism { @@ -470,11 +470,11 @@ public class GuiLogisticalSorter extends GuiMekanism if(itemFilter.itemType != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); itemRender.renderItemAndEffectIntoGUI(itemFilter.itemType, 59, yStart + 3); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } fontRendererObj.drawString(LangUtils.localize("gui.itemFilter"), 78, yStart + 2, 0x404040); @@ -492,11 +492,11 @@ public class GuiLogisticalSorter extends GuiMekanism if(oreDictStacks.get(filter).renderStack != null) { try { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); itemRender.renderItemAndEffectIntoGUI(oreDictStacks.get(filter).renderStack, 59, yStart + 3); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } catch(final Exception e) {} } @@ -509,11 +509,11 @@ public class GuiLogisticalSorter extends GuiMekanism if(itemFilter.materialItem != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); itemRender.renderItemAndEffectIntoGUI(itemFilter.materialItem, 59, yStart + 3); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } fontRendererObj.drawString(LangUtils.localize("gui.materialFilter"), 78, yStart + 2, 0x404040); @@ -531,11 +531,11 @@ public class GuiLogisticalSorter extends GuiMekanism if(modIDStacks.get(filter).renderStack != null) { try { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); itemRender.renderItemAndEffectIntoGUI(modIDStacks.get(filter).renderStack, 59, yStart + 3); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } catch(final Exception e) {} } @@ -566,7 +566,7 @@ public class GuiLogisticalSorter extends GuiMekanism if(tileEntity.color != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glColor4f(1, 1, 1, 1); GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL12.GL_RESCALE_NORMAL); @@ -575,7 +575,7 @@ public class GuiLogisticalSorter extends GuiMekanism //TODO itemRender.renderIcon(13, 137, MekanismRenderer.getColorIcon(tileEntity.color), 16, 16); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } // Draw tooltips for buttons diff --git a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java index a86f1f9c9..2d3485ac0 100644 --- a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java @@ -14,12 +14,11 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiMFilterSelect extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java index bd80dbfa5..c669a773a 100644 --- a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java @@ -18,17 +18,17 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.block.Block; import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; 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 GuiMItemStackFilter extends GuiMekanism { @@ -128,20 +128,20 @@ public class GuiMItemStackFilter extends GuiMekanism if(filter.itemType != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); itemRender.renderItemAndEffectIntoGUI(filter.itemType, 12, 19); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } if(filter.replaceStack != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); itemRender.renderItemAndEffectIntoGUI(filter.replaceStack, 149, 19); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } if(xAxis >= 148 && xAxis <= 162 && yAxis >= 45 && yAxis <= 59) @@ -211,7 +211,7 @@ public class GuiMItemStackFilter extends GuiMekanism if(xAxis >= 12 && xAxis <= 28 && yAxis >= 19 && yAxis <= 35) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_DEPTH_TEST); @@ -221,12 +221,12 @@ public class GuiMItemStackFilter extends GuiMekanism GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } if(xAxis >= 149 && xAxis <= 165 && yAxis >= 19 && yAxis <= 35) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_DEPTH_TEST); @@ -236,7 +236,7 @@ public class GuiMItemStackFilter extends GuiMekanism drawGradientRect(x, y, x + 16, y + 16, -2130706433, -2130706433); GL11.glPopAttrib(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java index 829149e90..7b68b84ee 100644 --- a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java @@ -18,17 +18,17 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.block.Block; import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; 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 GuiMMaterialFilter extends GuiMekanism { @@ -128,20 +128,20 @@ public class GuiMMaterialFilter extends GuiMekanism if(filter.materialItem != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); itemRender.renderItemAndEffectIntoGUI(filter.materialItem, 12, 19); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } if(filter.replaceStack != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); itemRender.renderItemAndEffectIntoGUI(filter.replaceStack, 149, 19); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } if(xAxis >= 148 && xAxis <= 162 && yAxis >= 45 && yAxis <= 59) @@ -198,7 +198,7 @@ public class GuiMMaterialFilter extends GuiMekanism if(xAxis >= 12 && xAxis <= 28 && yAxis >= 19 && yAxis <= 35) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_DEPTH_TEST); @@ -208,12 +208,12 @@ public class GuiMMaterialFilter extends GuiMekanism GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } if(xAxis >= 149 && xAxis <= 165 && yAxis >= 19 && yAxis <= 35) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_DEPTH_TEST); @@ -223,7 +223,7 @@ public class GuiMMaterialFilter extends GuiMekanism drawGradientRect(x, y, x + 16, y + 16, -2130706433, -2130706433); GL11.glPopAttrib(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java index 4a1d310fb..0c9140abb 100644 --- a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java @@ -22,17 +22,17 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.block.Block; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; 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 GuiMModIDFilter extends GuiMekanism { @@ -168,21 +168,21 @@ public class GuiMModIDFilter extends GuiMekanism if(renderStack != null) { try { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); itemRender.renderItemAndEffectIntoGUI(renderStack, 12, 19); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } catch(Exception e) {} } if(filter.replaceStack != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); itemRender.renderItemAndEffectIntoGUI(filter.replaceStack, 149, 19); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } if(xAxis >= 148 && xAxis <= 162 && yAxis >= 45 && yAxis <= 59) @@ -233,7 +233,7 @@ public class GuiMModIDFilter extends GuiMekanism if(xAxis >= 149 && xAxis <= 165 && yAxis >= 19 && yAxis <= 35) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_DEPTH_TEST); @@ -243,7 +243,7 @@ public class GuiMModIDFilter extends GuiMekanism drawGradientRect(x, y, x + 16, y + 16, -2130706433, -2130706433); GL11.glPopAttrib(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } modIDText.drawTextBox(); diff --git a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java index e9526fc11..9bf25e8b9 100644 --- a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java @@ -22,17 +22,17 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.block.Block; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; 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 GuiMOreDictFilter extends GuiMekanism { @@ -168,21 +168,21 @@ public class GuiMOreDictFilter extends GuiMekanism if(renderStack != null) { try { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); itemRender.renderItemAndEffectIntoGUI(renderStack, 12, 19); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } catch(Exception e) {} } if(filter.replaceStack != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); itemRender.renderItemAndEffectIntoGUI(filter.replaceStack, 149, 19); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } if(xAxis >= 148 && xAxis <= 162 && yAxis >= 45 && yAxis <= 59) @@ -233,7 +233,7 @@ public class GuiMOreDictFilter extends GuiMekanism if(xAxis >= 149 && xAxis <= 165 && yAxis >= 19 && yAxis <= 35) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_DEPTH_TEST); @@ -243,7 +243,7 @@ public class GuiMOreDictFilter extends GuiMekanism drawGradientRect(x, y, x + 16, y + 16, -2130706433, -2130706433); GL11.glPopAttrib(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } oreDictText.drawTextBox(); diff --git a/src/main/java/mekanism/client/gui/GuiMatrixStats.java b/src/main/java/mekanism/client/gui/GuiMatrixStats.java index 2fa7a1f4e..125b7905c 100644 --- a/src/main/java/mekanism/client/gui/GuiMatrixStats.java +++ b/src/main/java/mekanism/client/gui/GuiMatrixStats.java @@ -18,12 +18,11 @@ 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 net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiMatrixStats extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiMekanism.java b/src/main/java/mekanism/client/gui/GuiMekanism.java index 82ca4090b..70df23899 100644 --- a/src/main/java/mekanism/client/gui/GuiMekanism.java +++ b/src/main/java/mekanism/client/gui/GuiMekanism.java @@ -1,7 +1,6 @@ package mekanism.client.gui; import java.io.IOException; -import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -14,10 +13,12 @@ import mekanism.common.item.ItemConfigurator; import mekanism.common.tile.TileEntityContainerBlock; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; + import org.lwjgl.opengl.GL11; public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper @@ -65,12 +66,12 @@ public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper float reverse = 1/scale; float yAdd = 4-(scale*8)/2F; - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); - GL11.glScalef(scale, scale, scale); + GlStateManager.scale(scale, scale, scale); fontRendererObj.drawString(text, (int)(x*reverse), (int)((y*reverse)+yAdd), color); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index 7d80c4425..53d1ab63a 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -30,12 +30,11 @@ 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 net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiMetallurgicInfuser extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificator.java b/src/main/java/mekanism/client/gui/GuiOredictionificator.java index 747e54f28..d253009f4 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificator.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificator.java @@ -26,15 +26,15 @@ 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.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.opengl.GL11; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiOredictionificator extends GuiMekanism { @@ -132,11 +132,11 @@ public class GuiOredictionificator extends GuiMekanism if(stack != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); itemRender.renderItemAndEffectIntoGUI(stack, 13, yStart + 3); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } fontRendererObj.drawString(LangUtils.localize("gui.filter"), 32, yStart + 2, 0x404040); diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java index c2dcfc64a..8f2558245 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java @@ -17,16 +17,16 @@ 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.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; 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 GuiOredictionificatorFilter extends GuiMekanism { @@ -149,11 +149,11 @@ public class GuiOredictionificatorFilter extends GuiMekanism if(renderStack != null) { try { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); itemRender.renderItemAndEffectIntoGUI(renderStack, 45, 19); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } catch(Exception e) {} } diff --git a/src/main/java/mekanism/client/gui/GuiPRC.java b/src/main/java/mekanism/client/gui/GuiPRC.java index 1434a7294..78d68a59f 100644 --- a/src/main/java/mekanism/client/gui/GuiPRC.java +++ b/src/main/java/mekanism/client/gui/GuiPRC.java @@ -30,12 +30,11 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiPRC extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiPersonalChest.java b/src/main/java/mekanism/client/gui/GuiPersonalChest.java index 8cca3c1b0..5143ca1b1 100644 --- a/src/main/java/mekanism/client/gui/GuiPersonalChest.java +++ b/src/main/java/mekanism/client/gui/GuiPersonalChest.java @@ -8,12 +8,11 @@ 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 net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiPersonalChest extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java index 4c7aaae4b..d856d536f 100644 --- a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java @@ -25,13 +25,12 @@ import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; 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 GuiQuantumEntangloporter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java index 73e16751d..0d141113f 100644 --- a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java +++ b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java @@ -28,13 +28,12 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; 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 GuiResistiveHeater extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java index 3a9788e68..87a50e929 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java +++ b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java @@ -12,12 +12,11 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.world.World; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiRobitCrafting extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiRobitInventory.java b/src/main/java/mekanism/client/gui/GuiRobitInventory.java index 8c80615e3..99e08d862 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitInventory.java +++ b/src/main/java/mekanism/client/gui/GuiRobitInventory.java @@ -12,12 +12,11 @@ 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 net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiRobitInventory extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiRobitMain.java b/src/main/java/mekanism/client/gui/GuiRobitMain.java index fee95ce54..46150562d 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitMain.java +++ b/src/main/java/mekanism/client/gui/GuiRobitMain.java @@ -14,13 +14,12 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; 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 GuiRobitMain extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiRobitRepair.java b/src/main/java/mekanism/client/gui/GuiRobitRepair.java index c2e7e49f5..7d12f7481 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitRepair.java +++ b/src/main/java/mekanism/client/gui/GuiRobitRepair.java @@ -1,5 +1,7 @@ package mekanism.client.gui; +import io.netty.buffer.Unpooled; + import java.io.IOException; import java.util.List; @@ -22,15 +24,12 @@ import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.client.C17PacketCustomPayload; import net.minecraft.util.StatCollector; import net.minecraft.world.World; - -import io.netty.buffer.Unpooled; -import org.apache.commons.io.Charsets; -import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.input.Keyboard; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiRobitRepair extends GuiMekanism implements ICrafting { diff --git a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java index 0482d5f5b..824aed384 100644 --- a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -33,12 +33,11 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiRotaryCondensentrator extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java index c388507bc..f85b88890 100644 --- a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java +++ b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java @@ -22,13 +22,12 @@ import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; 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 GuiSecurityDesk extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiSeismicReader.java b/src/main/java/mekanism/client/gui/GuiSeismicReader.java index 79333d910..1eb4229af 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicReader.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicReader.java @@ -10,6 +10,7 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; @@ -90,17 +91,17 @@ public class GuiSeismicReader extends GuiScreen GL11.glColor3f(1, 1, 1); // Fix the overlapping if > 100 - GL11.glPushMatrix(); - GL11.glTranslatef(guiWidth + 48, guiHeight + 87, 0); + GlStateManager.pushMatrix(); + GlStateManager.translate(guiWidth + 48, guiHeight + 87, 0); if(currentLayer >= 100) { - GL11.glTranslatef(0, 1, 0); - GL11.glScalef(0.7f, 0.7f, 0.7f); + GlStateManager.translate(0, 1, 0); + GlStateManager.scale(0.7f, 0.7f, 0.7f); } fontRendererObj.drawString(String.format("%s", currentLayer), 0, 0, 0xAFAFAF); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); // Render the item stacks for(int i = 0; i < 9; i++) @@ -117,22 +118,22 @@ public class GuiSeismicReader extends GuiScreen continue; } - GL11.glPushMatrix(); - GL11.glTranslatef(centralX - 2, centralY - i * 16 + (22 * 2), 0); + GlStateManager.pushMatrix(); + GlStateManager.translate(centralX - 2, centralY - i * 16 + (22 * 2), 0); if(i < 4) { - GL11.glTranslatef(0.2f, 2.5f, 0); + GlStateManager.translate(0.2f, 2.5f, 0); } if(i != 4) { - GL11.glTranslatef(1.5f, 0, 0); - GL11.glScalef(0.8f, 0.8f, 0.8f); + GlStateManager.translate(1.5f, 0, 0); + GlStateManager.scale(0.8f, 0.8f, 0.8f); } itemRender.renderItemAndEffectIntoGUI(stack, 0, 0); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } @@ -157,23 +158,23 @@ public class GuiSeismicReader extends GuiScreen renderScale = lengthX > 53 ? 53f / lengthX : 1.0f; - GL11.glPushMatrix(); - GL11.glTranslatef(guiWidth + 72, guiHeight + 16, 0); - GL11.glScalef(renderScale, renderScale, renderScale); + GlStateManager.pushMatrix(); + GlStateManager.translate(guiWidth + 72, guiHeight + 16, 0); + GlStateManager.scale(renderScale, renderScale, renderScale); fontRendererObj.drawString(capitalised, 0, 0, 0x919191); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); if(tooltip.intersects(new Rectangle(mouseX, mouseY, 1, 1))) { mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, "GuiTooltips.png")); int fontLengthX = fontRendererObj.getStringWidth(capitalised) + 5; int renderX = mouseX + 10, renderY = mouseY - 5; - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glColor3f(1, 1, 1); drawTexturedModalRect(renderX, renderY, 0, 0, fontLengthX, 16); drawTexturedModalRect(renderX + fontLengthX, renderY, 0, 16, 2, 16); fontRendererObj.drawString(capitalised, renderX + 4, renderY + 4, 0x919191); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } @@ -192,11 +193,11 @@ public class GuiSeismicReader extends GuiScreen } } - GL11.glPushMatrix(); - GL11.glTranslatef(guiWidth + 72, guiHeight + 26, 0); - GL11.glScalef(0.70f, 0.70f, 0.70f); + GlStateManager.pushMatrix(); + GlStateManager.translate(guiWidth + 72, guiHeight + 26, 0); + GlStateManager.scale(0.70f, 0.70f, 0.70f); fontRendererObj.drawString(LangUtils.localize("gui.abundancy") + ": " + frequency, 0, 0, 0x919191); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); super.drawScreen(mouseX, mouseY, partialTick); } diff --git a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java index 8eb74f2df..410ab55b4 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java @@ -18,12 +18,11 @@ 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 net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiSeismicVibrator extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiSideConfiguration.java b/src/main/java/mekanism/client/gui/GuiSideConfiguration.java index 80c180430..24b88b280 100644 --- a/src/main/java/mekanism/client/gui/GuiSideConfiguration.java +++ b/src/main/java/mekanism/client/gui/GuiSideConfiguration.java @@ -27,13 +27,12 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; 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 GuiSideConfiguration extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java b/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java index 35da165d0..344c76e75 100644 --- a/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java +++ b/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java @@ -18,12 +18,11 @@ 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 net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiSolarNeutronActivator extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java index 5094eed59..8cd7af810 100644 --- a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java @@ -14,12 +14,11 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiTFilterSelect extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java index 39edcc2f4..117dca81b 100644 --- a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java @@ -20,16 +20,16 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.TransporterUtils; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiTItemStackFilter extends GuiMekanism { @@ -183,16 +183,16 @@ public class GuiTItemStackFilter extends GuiMekanism if(filter.itemType != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); itemRender.renderItemAndEffectIntoGUI(filter.itemType, 12, 19); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } if(filter.color != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glColor4f(1, 1, 1, 1); GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL12.GL_RESCALE_NORMAL); @@ -201,7 +201,7 @@ public class GuiTItemStackFilter extends GuiMekanism //TODO itemRender.renderIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } if(xAxis >= 12 && xAxis <= 28 && yAxis >= 44 && yAxis <= 60) @@ -270,7 +270,7 @@ public class GuiTItemStackFilter extends GuiMekanism if(xAxis >= 12 && xAxis <= 28 && yAxis >= 19 && yAxis <= 35) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_DEPTH_TEST); @@ -280,7 +280,7 @@ public class GuiTItemStackFilter extends GuiMekanism GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java index f5c7e199e..6e1fc3431 100644 --- a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java @@ -20,18 +20,18 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.TransporterUtils; import net.minecraft.block.Block; import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiTMaterialFilter extends GuiMekanism { @@ -131,16 +131,16 @@ public class GuiTMaterialFilter extends GuiMekanism if(filter.materialItem != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); itemRender.renderItemAndEffectIntoGUI(filter.materialItem, 12, 19); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } if(filter.color != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glColor4f(1, 1, 1, 1); GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL12.GL_RESCALE_NORMAL); @@ -149,7 +149,7 @@ public class GuiTMaterialFilter extends GuiMekanism //TODO itemRender.renderIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } if(xAxis >= 12 && xAxis <= 28 && yAxis >= 44 && yAxis <= 60) @@ -204,7 +204,7 @@ public class GuiTMaterialFilter extends GuiMekanism if(xAxis >= 12 && xAxis <= 28 && yAxis >= 19 && yAxis <= 35) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_DEPTH_TEST); @@ -214,7 +214,7 @@ public class GuiTMaterialFilter extends GuiMekanism GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java index 4fa6af506..8963c1267 100644 --- a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java @@ -23,16 +23,16 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.TransporterUtils; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiTModIDFilter extends GuiMekanism { @@ -168,17 +168,17 @@ public class GuiTModIDFilter extends GuiMekanism if(renderStack != null) { try { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); itemRender.renderItemAndEffectIntoGUI(renderStack, 12, 19); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } catch(Exception e) {} } if(filter.color != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glColor4f(1, 1, 1, 1); GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL12.GL_RESCALE_NORMAL); @@ -187,7 +187,7 @@ public class GuiTModIDFilter extends GuiMekanism //TODO itemRender.renderIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } if(xAxis >= 12 && xAxis <= 28 && yAxis >= 44 && yAxis <= 60) diff --git a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java index fac53de45..1c0220a5c 100644 --- a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java @@ -23,16 +23,16 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.TransporterUtils; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiTOreDictFilter extends GuiMekanism { @@ -168,17 +168,17 @@ public class GuiTOreDictFilter extends GuiMekanism if(renderStack != null) { try { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); itemRender.renderItemAndEffectIntoGUI(renderStack, 12, 19); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } catch(Exception e) {} } if(filter.color != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glColor4f(1, 1, 1, 1); GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL12.GL_RESCALE_NORMAL); @@ -187,7 +187,7 @@ public class GuiTOreDictFilter extends GuiMekanism //TODO itemRender.renderIcon(12, 44, MekanismRenderer.getColorIcon(filter.color), 16, 16); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } if(xAxis >= 12 && xAxis <= 28 && yAxis >= 44 && yAxis <= 60) diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index 9ccc02d61..59323ede7 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -33,13 +33,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; 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 GuiTeleporter extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java b/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java index 46cc1204f..959930648 100644 --- a/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java +++ b/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java @@ -18,12 +18,11 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiThermalEvaporationController extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java index ee5e70c7d..531910dd0 100644 --- a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java +++ b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java @@ -21,12 +21,11 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidStack; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiThermoelectricBoiler extends GuiMekanism { diff --git a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java index 4a5c96408..5f78634b6 100644 --- a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java +++ b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java @@ -21,17 +21,17 @@ import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiTransporterConfig extends GuiMekanism { @@ -135,7 +135,7 @@ public class GuiTransporterConfig extends GuiMekanism if(configurable.getEjector().getOutputColor() != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glColor4f(1, 1, 1, 1); GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL12.GL_RESCALE_NORMAL); @@ -144,7 +144,7 @@ public class GuiTransporterConfig extends GuiMekanism //TODO itemRender.renderIcon(122, 49, MekanismRenderer.getColorIcon(configurable.getEjector().getOutputColor()), 16, 16); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } for(int i = 0; i < slotPosMap.size(); i++) diff --git a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java index e76ade020..14036b9d1 100644 --- a/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java +++ b/src/main/java/mekanism/client/gui/GuiUpgradeManagement.java @@ -16,14 +16,14 @@ import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiUpgradeManagement extends GuiMekanism { @@ -136,20 +136,20 @@ public class GuiUpgradeManagement extends GuiMekanism private void renderText(String text, int x, int y, float size, boolean scale) { - GL11.glPushMatrix(); - GL11.glScalef(size, size, size); + GlStateManager.pushMatrix(); + GlStateManager.scale(size, size, size); fontRendererObj.drawString(text, scale ? (int)((1F/size)*x) : x, scale ? (int)((1F/size)*y) : y, 0x00CD00); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } private void renderUpgrade(Upgrade type, int x, int y, float size, boolean scale) { - GL11.glPushMatrix(); - GL11.glScalef(size, size, size); + GlStateManager.pushMatrix(); + GlStateManager.scale(size, size, size); GL11.glEnable(GL11.GL_LIGHTING); itemRender.renderItemAndEffectIntoGUI(type.getStack(), scale ? (int)((1F/size)*x) : x, scale ? (int)((1F/size)*y) : y); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } @Override diff --git a/src/main/java/mekanism/client/gui/element/GuiConfigTypeTab.java b/src/main/java/mekanism/client/gui/element/GuiConfigTypeTab.java index f920b3e96..45a0fa455 100644 --- a/src/main/java/mekanism/client/gui/element/GuiConfigTypeTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiConfigTypeTab.java @@ -8,7 +8,6 @@ import mekanism.common.util.MekanismUtils; 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; diff --git a/src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java b/src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java index ba85dbafa..976984978 100644 --- a/src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java +++ b/src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java @@ -11,7 +11,6 @@ import mekanism.common.util.MekanismUtils; 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; diff --git a/src/main/java/mekanism/client/gui/element/GuiDetectionTab.java b/src/main/java/mekanism/client/gui/element/GuiDetectionTab.java index ec45fda7f..9165e6c3c 100644 --- a/src/main/java/mekanism/client/gui/element/GuiDetectionTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiDetectionTab.java @@ -13,7 +13,6 @@ import mekanism.common.util.MekanismUtils; 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; diff --git a/src/main/java/mekanism/client/gui/element/GuiElement.java b/src/main/java/mekanism/client/gui/element/GuiElement.java index 39ea7457d..9203cd240 100644 --- a/src/main/java/mekanism/client/gui/element/GuiElement.java +++ b/src/main/java/mekanism/client/gui/element/GuiElement.java @@ -8,6 +8,7 @@ import mekanism.client.gui.IGuiWrapper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -108,12 +109,12 @@ public abstract class GuiElement float reverse = 1/scale; float yAdd = 4-(scale*8)/2F; - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); - GL11.glScalef(scale, scale, scale); + GlStateManager.scale(scale, scale, scale); getFontRenderer().drawString(text, (int)(x*reverse), (int)((y*reverse)+yAdd), color); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java b/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java index fb4bc730c..0f14e864f 100644 --- a/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java @@ -6,7 +6,6 @@ import mekanism.client.gui.IGuiWrapper; import mekanism.client.render.MekanismRenderer; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; - import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/mekanism/client/gui/element/GuiGasGauge.java b/src/main/java/mekanism/client/gui/element/GuiGasGauge.java index 4a72182a6..c7eed7461 100644 --- a/src/main/java/mekanism/client/gui/element/GuiGasGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiGasGauge.java @@ -13,7 +13,6 @@ import mekanism.common.base.ITankManager; import mekanism.common.item.ItemGaugeDropper; import mekanism.common.network.PacketDropperUse.DropperUseMessage; import mekanism.common.util.LangUtils; - import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/client/gui/element/GuiGraph.java b/src/main/java/mekanism/client/gui/element/GuiGraph.java index 61ef889a4..9ba0945ba 100644 --- a/src/main/java/mekanism/client/gui/element/GuiGraph.java +++ b/src/main/java/mekanism/client/gui/element/GuiGraph.java @@ -8,12 +8,11 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiGraph extends GuiElement { diff --git a/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java b/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java index 507d9d8fb..2d05cef5b 100644 --- a/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java @@ -10,7 +10,6 @@ import mekanism.common.util.MekanismUtils; 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; diff --git a/src/main/java/mekanism/client/gui/element/GuiNumberGauge.java b/src/main/java/mekanism/client/gui/element/GuiNumberGauge.java index 24b02bbe9..aeebc111d 100644 --- a/src/main/java/mekanism/client/gui/element/GuiNumberGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiNumberGauge.java @@ -3,7 +3,6 @@ package mekanism.client.gui.element; import static java.lang.Math.min; import mekanism.api.transmitters.TransmissionType; import mekanism.client.gui.IGuiWrapper; - import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/mekanism/client/gui/element/GuiPowerBar.java b/src/main/java/mekanism/client/gui/element/GuiPowerBar.java index 299f08ea5..8e07de717 100644 --- a/src/main/java/mekanism/client/gui/element/GuiPowerBar.java +++ b/src/main/java/mekanism/client/gui/element/GuiPowerBar.java @@ -5,7 +5,6 @@ import mekanism.client.gui.IGuiWrapper; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/element/GuiRateBar.java b/src/main/java/mekanism/client/gui/element/GuiRateBar.java index c42c5f5f3..1dc566ee6 100644 --- a/src/main/java/mekanism/client/gui/element/GuiRateBar.java +++ b/src/main/java/mekanism/client/gui/element/GuiRateBar.java @@ -4,7 +4,6 @@ import mekanism.client.gui.IGuiWrapper; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/element/GuiRedstoneControl.java b/src/main/java/mekanism/client/gui/element/GuiRedstoneControl.java index 99cff4bd4..4f139b17a 100644 --- a/src/main/java/mekanism/client/gui/element/GuiRedstoneControl.java +++ b/src/main/java/mekanism/client/gui/element/GuiRedstoneControl.java @@ -11,7 +11,6 @@ import mekanism.common.util.MekanismUtils; 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; diff --git a/src/main/java/mekanism/client/gui/element/GuiScrollList.java b/src/main/java/mekanism/client/gui/element/GuiScrollList.java index 0e8648359..57f666b16 100644 --- a/src/main/java/mekanism/client/gui/element/GuiScrollList.java +++ b/src/main/java/mekanism/client/gui/element/GuiScrollList.java @@ -7,13 +7,11 @@ import mekanism.client.gui.IGuiWrapper; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiScrollList extends GuiElement { diff --git a/src/main/java/mekanism/client/gui/element/GuiSortingTab.java b/src/main/java/mekanism/client/gui/element/GuiSortingTab.java index cb0bdf0e9..5054e2b2b 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSortingTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSortingTab.java @@ -12,7 +12,6 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java b/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java index 4ae2f8fe5..6c9a34a39 100644 --- a/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java @@ -10,7 +10,6 @@ import mekanism.common.util.MekanismUtils; 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; diff --git a/src/main/java/mekanism/client/model/ModelArmoredJetpack.java b/src/main/java/mekanism/client/model/ModelArmoredJetpack.java index 55083bec4..ee585604d 100644 --- a/src/main/java/mekanism/client/model/ModelArmoredJetpack.java +++ b/src/main/java/mekanism/client/model/ModelArmoredJetpack.java @@ -3,6 +3,7 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.GlStateManager; import org.lwjgl.opengl.GL11; @@ -240,7 +241,7 @@ public class ModelArmoredJetpack extends ModelBase Packdoodad3.render(size); Bottomthruster.render(size); - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); MekanismRenderer.blendOn(); MekanismRenderer.glowOn(); GL11.glEnable(GL11.GL_CULL_FACE); @@ -253,7 +254,7 @@ public class ModelArmoredJetpack extends ModelBase GL11.glDisable(GL11.GL_CULL_FACE); MekanismRenderer.glowOff(); MekanismRenderer.blendOff(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); MekanismRenderer.glowOn(); light1.render(size); @@ -261,8 +262,8 @@ public class ModelArmoredJetpack extends ModelBase light3.render(size); Packcore.render(size); - GL11.glPushMatrix(); - GL11.glTranslatef(0.0F, 0.0F, -0.0625F); + GlStateManager.pushMatrix(); + GlStateManager.translate(0.0F, 0.0F, -0.0625F); Rightlight.render(size); Leftlight.render(size); @@ -275,7 +276,7 @@ public class ModelArmoredJetpack extends ModelBase Rightguardbot.render(size); Leftguardbot.render(size); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java b/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java index c312595f5..c64b7808c 100644 --- a/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java +++ b/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java @@ -3,6 +3,7 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.GlStateManager; import org.lwjgl.opengl.GL11; @@ -130,7 +131,7 @@ public class ModelAtomicDisassembler extends ModelBase public void render(float size) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); MekanismRenderer.glowOn(); Shape3.render(size); @@ -140,7 +141,7 @@ public class ModelAtomicDisassembler extends ModelBase Shape14.render(size); MekanismRenderer.glowOff(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); Shape1.render(size); Shape2.render(size); diff --git a/src/main/java/mekanism/client/model/ModelBalloon.java b/src/main/java/mekanism/client/model/ModelBalloon.java index e468fb8b4..8605a2acd 100644 --- a/src/main/java/mekanism/client/model/ModelBalloon.java +++ b/src/main/java/mekanism/client/model/ModelBalloon.java @@ -3,12 +3,12 @@ package mekanism.client.model; import mekanism.api.EnumColor; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - -import org.lwjgl.opengl.GL11; - +import net.minecraft.client.renderer.GlStateManager; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelBalloon extends ModelBase { @@ -57,10 +57,10 @@ public class ModelBalloon extends ModelBase public void render(float size, EnumColor color) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glColor3f(color.getColor(0), color.getColor(1), color.getColor(2)); - GL11.glScalef(1.5F, 1.5F, 1.5F); - GL11.glTranslatef(0, -0.07F, 0); + GlStateManager.scale(1.5F, 1.5F, 1.5F); + GlStateManager.translate(0, -0.07F, 0); Balloon2.render(size); Balloon1.render(size); @@ -68,12 +68,12 @@ public class ModelBalloon extends ModelBase Balloonnub.render(size); GL11.glColor3f(1, 1, 1); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); - GL11.glPushMatrix(); - GL11.glScalef(0.2F, 1, 0.2F); + GlStateManager.pushMatrix(); + GlStateManager.scale(0.2F, 1, 0.2F); String.render(size); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelChargepad.java b/src/main/java/mekanism/client/model/ModelChargepad.java index 47c6ebaba..50db8e829 100644 --- a/src/main/java/mekanism/client/model/ModelChargepad.java +++ b/src/main/java/mekanism/client/model/ModelChargepad.java @@ -5,14 +5,14 @@ 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.GlStateManager; 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; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelChargepad extends ModelBase { @@ -77,21 +77,21 @@ public class ModelChargepad extends ModelBase public void render(float size, TextureManager manager) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); MekanismRenderer.blendOn(); doRender(size); manager.bindTexture(OVERLAY); - GL11.glScalef(1.001F, 1.001F, 1.001F); - GL11.glTranslatef(0, -0.0011F, 0); + GlStateManager.scale(1.001F, 1.001F, 1.001F); + GlStateManager.translate(0, -0.0011F, 0); MekanismRenderer.glowOn(); doRender(size); MekanismRenderer.glowOff(); MekanismRenderer.blendOff(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } private void doRender(float size) diff --git a/src/main/java/mekanism/client/model/ModelDigitalMiner.java b/src/main/java/mekanism/client/model/ModelDigitalMiner.java index 07dc17d97..f7f04c26e 100644 --- a/src/main/java/mekanism/client/model/ModelDigitalMiner.java +++ b/src/main/java/mekanism/client/model/ModelDigitalMiner.java @@ -5,14 +5,14 @@ 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.GlStateManager; 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; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelDigitalMiner extends ModelBase { @@ -424,21 +424,21 @@ public class ModelDigitalMiner extends ModelBase public void render(float size, boolean on, TextureManager manager) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); MekanismRenderer.blendOn(); doRender(size); manager.bindTexture(on ? OVERLAY_ON : OVERLAY_OFF); - GL11.glScalef(1.001F, 1.001F, 1.001F); - GL11.glTranslatef(0, -0.0011F, 0); + GlStateManager.scale(1.001F, 1.001F, 1.001F); + GlStateManager.translate(0, -0.0011F, 0); MekanismRenderer.glowOn(); doRender(size); MekanismRenderer.glowOff(); MekanismRenderer.blendOff(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } private void doRender(float size) diff --git a/src/main/java/mekanism/client/model/ModelEnergyCube.java b/src/main/java/mekanism/client/model/ModelEnergyCube.java index e42182e97..ebd548e15 100644 --- a/src/main/java/mekanism/client/model/ModelEnergyCube.java +++ b/src/main/java/mekanism/client/model/ModelEnergyCube.java @@ -8,15 +8,15 @@ 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.GlStateManager; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelEnergyCube extends ModelBase { @@ -375,9 +375,9 @@ public class ModelEnergyCube extends ModelBase corner2.render(size); corner1.render(size); - GL11.glPushMatrix(); - GL11.glScalef(1.0001F, 1.0001F, 1.0001F); - GL11.glTranslatef(0, -0.00011F, 0); + GlStateManager.pushMatrix(); + GlStateManager.scale(1.0001F, 1.0001F, 1.0001F); + GlStateManager.translate(0, -0.00011F, 0); manager.bindTexture(RenderEnergyCube.resources.get(tier)); MekanismRenderer.glowOn(); @@ -391,7 +391,7 @@ public class ModelEnergyCube extends ModelBase corner1.render(size); MekanismRenderer.glowOff(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } public void renderSide(float size, EnumFacing side, IOState state, EnergyCubeTier tier, TextureManager renderer) diff --git a/src/main/java/mekanism/client/model/ModelGasMask.java b/src/main/java/mekanism/client/model/ModelGasMask.java index 2854a10f5..69c038163 100644 --- a/src/main/java/mekanism/client/model/ModelGasMask.java +++ b/src/main/java/mekanism/client/model/ModelGasMask.java @@ -3,12 +3,11 @@ 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; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelGasMask extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelJetpack.java b/src/main/java/mekanism/client/model/ModelJetpack.java index 8d6bb589c..d651740cd 100644 --- a/src/main/java/mekanism/client/model/ModelJetpack.java +++ b/src/main/java/mekanism/client/model/ModelJetpack.java @@ -3,12 +3,12 @@ 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.minecraft.client.renderer.GlStateManager; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelJetpack extends ModelBase { @@ -187,7 +187,7 @@ public class ModelJetpack extends ModelBase ExtendosupportL.render(size); ExtendosupportR.render(size); - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); MekanismRenderer.blendOn(); MekanismRenderer.glowOn(); GL11.glEnable(GL11.GL_CULL_FACE); @@ -200,7 +200,7 @@ public class ModelJetpack extends ModelBase GL11.glDisable(GL11.GL_CULL_FACE); MekanismRenderer.glowOff(); MekanismRenderer.blendOff(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); Packdoodad2.render(size); Packdoodad3.render(size); diff --git a/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java b/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java index f53ca5251..b64aa357a 100644 --- a/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java @@ -5,14 +5,14 @@ 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.GlStateManager; 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; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelQuantumEntangloporter extends ModelBase { @@ -316,21 +316,21 @@ public class ModelQuantumEntangloporter extends ModelBase public void render(float size, TextureManager manager) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); MekanismRenderer.blendOn(); doRender(size); manager.bindTexture(OVERLAY); - GL11.glScalef(1.001F, 1.001F, 1.001F); - GL11.glTranslatef(0, -0.0011F, 0); + GlStateManager.scale(1.001F, 1.001F, 1.001F); + GlStateManager.translate(0, -0.0011F, 0); MekanismRenderer.glowOn(); doRender(size); MekanismRenderer.glowOff(); MekanismRenderer.blendOff(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } public void doRender(float size) diff --git a/src/main/java/mekanism/client/model/ModelResistiveHeater.java b/src/main/java/mekanism/client/model/ModelResistiveHeater.java index 85b896d90..c8b922ee9 100644 --- a/src/main/java/mekanism/client/model/ModelResistiveHeater.java +++ b/src/main/java/mekanism/client/model/ModelResistiveHeater.java @@ -5,14 +5,14 @@ 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.GlStateManager; 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; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelResistiveHeater extends ModelBase { @@ -169,21 +169,21 @@ public class ModelResistiveHeater extends ModelBase public void render(float size, boolean on, TextureManager manager) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); MekanismRenderer.blendOn(); doRender(size); manager.bindTexture(on ? OVERLAY_ON : OVERLAY_OFF); - GL11.glScalef(1.001F, 1.001F, 1.001F); - GL11.glTranslatef(0, -0.0011F, 0); + GlStateManager.scale(1.001F, 1.001F, 1.001F); + GlStateManager.translate(0, -0.0011F, 0); MekanismRenderer.glowOn(); doRender(size); MekanismRenderer.glowOff(); MekanismRenderer.blendOff(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } private void doRender(float size) diff --git a/src/main/java/mekanism/client/model/ModelRobit.java b/src/main/java/mekanism/client/model/ModelRobit.java index a73c480e8..275863559 100644 --- a/src/main/java/mekanism/client/model/ModelRobit.java +++ b/src/main/java/mekanism/client/model/ModelRobit.java @@ -3,13 +3,13 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.Entity; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelRobit extends ModelBase { @@ -132,8 +132,8 @@ public class ModelRobit extends ModelBase super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); - GL11.glPushMatrix(); - GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); + GlStateManager.pushMatrix(); + GlStateManager.rotate(180, 0.0F, 1.0F, 0.0F); Body.render(f5); Bottom.render(f5); @@ -154,7 +154,7 @@ public class ModelRobit extends ModelBase eyeLeft.render(f5); MekanismRenderer.glowOff(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } public void render(float size) diff --git a/src/main/java/mekanism/client/model/ModelSecurityDesk.java b/src/main/java/mekanism/client/model/ModelSecurityDesk.java index d58d343ce..a0e2cd9fc 100644 --- a/src/main/java/mekanism/client/model/ModelSecurityDesk.java +++ b/src/main/java/mekanism/client/model/ModelSecurityDesk.java @@ -5,14 +5,14 @@ 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.GlStateManager; 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; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelSecurityDesk extends ModelBase { @@ -105,21 +105,21 @@ public class ModelSecurityDesk extends ModelBase public void render(float size, TextureManager manager) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); MekanismRenderer.blendOn(); doRender(size); manager.bindTexture(OVERLAY); - GL11.glScalef(1.001F, 1.001F, 1.001F); - GL11.glTranslatef(0, -0.0011F, 0); + GlStateManager.scale(1.001F, 1.001F, 1.001F); + GlStateManager.translate(0, -0.0011F, 0); MekanismRenderer.glowOn(); doRender(size); MekanismRenderer.glowOff(); MekanismRenderer.blendOff(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } private void doRender(float size) diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index d61f395dd..74301886e 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -22,6 +22,7 @@ import mekanism.common.base.IMetaItem; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GLAllocation; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemModelMesher; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; @@ -306,10 +307,10 @@ public class MekanismRenderer return; } - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glTranslated(object.minX, object.minY, object.minZ); RenderResizableCuboid.INSTANCE.renderCube(object); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } public static void color(EnumColor color) diff --git a/src/main/java/mekanism/client/render/MinerVisualRenderer.java b/src/main/java/mekanism/client/render/MinerVisualRenderer.java index 9d3f6097d..3cdc878ee 100644 --- a/src/main/java/mekanism/client/render/MinerVisualRenderer.java +++ b/src/main/java/mekanism/client/render/MinerVisualRenderer.java @@ -11,6 +11,7 @@ import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.tile.TileEntityDigitalMiner; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.init.Blocks; @@ -26,7 +27,7 @@ public final class MinerVisualRenderer public static void render(TileEntityDigitalMiner miner) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glTranslated(getX(miner.getPos().getX()), getY(miner.getPos().getY()), getZ(miner.getPos().getZ())); MekanismRenderer.blendOn(); MekanismRenderer.glowOn(); @@ -36,7 +37,7 @@ public final class MinerVisualRenderer getList(new MinerRenderData(miner)).render(); MekanismRenderer.glowOff(); MekanismRenderer.blendOff(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } private static DisplayInteger getList(MinerRenderData data) diff --git a/src/main/java/mekanism/client/render/ModelCustomArmor.java b/src/main/java/mekanism/client/render/ModelCustomArmor.java index bc1cd44b5..d676373de 100644 --- a/src/main/java/mekanism/client/render/ModelCustomArmor.java +++ b/src/main/java/mekanism/client/render/ModelCustomArmor.java @@ -10,15 +10,15 @@ import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class ModelCustomArmor extends ModelBiped { @@ -125,8 +125,8 @@ public class ModelCustomArmor extends ModelBiped { if(ModelCustomArmor.this.modelType != null) { - GL11.glPushMatrix(); - GL11.glTranslatef(0, 0, 0.06F); + GlStateManager.pushMatrix(); + GlStateManager.translate(0, 0, 0.06F); mc.renderEngine.bindTexture(modelType.resource); @@ -146,27 +146,27 @@ public class ModelCustomArmor extends ModelBiped } else if(biped.modelType == ArmorModel.GASMASK) { - GL11.glTranslatef(0, 0, -0.05F); + GlStateManager.translate(0, 0, -0.05F); ArmorModel.gasMaskModel.render(0.0625F); } else if(biped.modelType == ArmorModel.FREERUNNERS) { - GL11.glScalef(1.02F, 1.02F, 1.02F); + GlStateManager.scale(1.02F, 1.02F, 1.02F); if(partRender == biped.bipedLeftLeg) { - GL11.glTranslatef(-0.1375F, -0.75F, -0.0625F); + GlStateManager.translate(-0.1375F, -0.75F, -0.0625F); ArmorModel.freeRunnersModel.renderLeft(0.0625F); } else if(partRender == biped.bipedRightLeg) { - GL11.glTranslatef(0.1375F, -0.75F, -0.0625F); + GlStateManager.translate(0.1375F, -0.75F, -0.0625F); ArmorModel.freeRunnersModel.renderRight(0.0625F); } } } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } } diff --git a/src/main/java/mekanism/client/render/RenderPartTransmitter.java b/src/main/java/mekanism/client/render/RenderPartTransmitter.java index 23b44a306..95b301408 100644 --- a/src/main/java/mekanism/client/render/RenderPartTransmitter.java +++ b/src/main/java/mekanism/client/render/RenderPartTransmitter.java @@ -125,7 +125,7 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister private void push() { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glPushAttrib(GL11.GL_ENABLE_BIT); GL11.glEnable(GL11.GL_CULL_FACE); GL11.glEnable(GL11.GL_BLEND); @@ -136,7 +136,7 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister private void pop() { GL11.glPopAttrib(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } public void renderItem(TransmitterType type) @@ -164,7 +164,7 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister public void renderContents(PartLogisticalTransporter transporter, float partialTick, Vector3 vec) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); entityItem.age = 0; entityItem.hoverStart = 0; @@ -176,28 +176,28 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister { if(stack != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); entityItem.setEntityItemStack(stack.itemStack); float[] pos = TransporterUtils.getStackPosition(transporter.getTransmitter(), stack, partialTick*transporter.tier.speed); GL11.glTranslated(vec.x + pos[0], vec.y + pos[1] - entityItem.yOffset, vec.z + pos[2]); - GL11.glScalef(0.75F, 0.75F, 0.75F); + GlStateManager.scale(0.75F, 0.75F, 0.75F); renderer.doRender(entityItem, 0, 0, 0, 0, 0); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); if(stack.color != null) { CCRenderState.changeTexture(MekanismUtils.getResource(ResourceType.RENDER, "TransporterBox.png")); - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); MekanismRenderer.glowOn(); GL11.glDisable(GL11.GL_CULL_FACE); GL11.glColor4f(stack.color.getColor(0), stack.color.getColor(1), stack.color.getColor(2), 1.0F); - GL11.glTranslatef((float)(vec.x + pos[0]), (float)(vec.y + pos[1] - entityItem.yOffset - ((stack.itemStack.getItem() instanceof ItemBlock) ? 0.1 : 0)), (float)(vec.z + pos[2])); + GlStateManager.translate((float)(vec.x + pos[0]), (float)(vec.y + pos[1] - entityItem.yOffset - ((stack.itemStack.getItem() instanceof ItemBlock) ? 0.1 : 0)), (float)(vec.z + pos[2])); modelBox.render(0.0625F); MekanismRenderer.glowOff(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } } @@ -227,9 +227,9 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.8F); CCRenderState.changeTexture(mode == 0 ? MekanismRenderer.getItemsTexture() : MekanismRenderer.getBlocksTexture()); - GL11.glTranslatef((float)vec.x, (float)vec.y, (float)vec.z); - GL11.glScalef(0.5F, 0.5F, 0.5F); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); + GlStateManager.translate((float)vec.x, (float)vec.y, (float)vec.z); + GlStateManager.scale(0.5F, 0.5F, 0.5F); + GlStateManager.translate(0.5F, 0.5F, 0.5F); int display = getOverlayDisplay(world, side, mode).display; GL11.glCallList(display); @@ -239,7 +239,7 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister } } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } public void renderContents(PartUniversalCable cable, Vector3 pos) @@ -678,12 +678,12 @@ public class RenderPartTransmitter //TODO implements IIconSelfRegister GL11.glPopAttrib(); MekanismRenderer.glowOff(); MekanismRenderer.blendOff(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } private void pushTransporter() { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glPushAttrib(GL11.GL_ENABLE_BIT); GL11.glEnable(GL11.GL_CULL_FACE); GL11.glDisable(GL11.GL_LIGHTING); diff --git a/src/main/java/mekanism/client/render/RenderResizableCuboid.java b/src/main/java/mekanism/client/render/RenderResizableCuboid.java index 0f6942ec6..307b8f763 100644 --- a/src/main/java/mekanism/client/render/RenderResizableCuboid.java +++ b/src/main/java/mekanism/client/render/RenderResizableCuboid.java @@ -121,10 +121,10 @@ public class RenderResizableCuboid { /** This will render a cuboid from its middle. */ public void renderCubeFromCentre(Model3D cuboid) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glTranslated(-cuboid.sizeX() / 2d, -cuboid.sizeY() / 2d, -cuboid.sizeZ() / 2d); renderCube(cuboid, EnumShadeArgument.NONE, null, null, null); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } public void renderCube(Model3D cuboid) { diff --git a/src/main/java/mekanism/client/render/ctm/Dir.java b/src/main/java/mekanism/client/render/ctm/Dir.java index fa28018ba..db3fc3b05 100644 --- a/src/main/java/mekanism/client/render/ctm/Dir.java +++ b/src/main/java/mekanism/client/render/ctm/Dir.java @@ -12,7 +12,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing.Axis; import net.minecraft.util.EnumFacing.AxisDirection; import net.minecraft.world.IBlockAccess; -import mekanism.client.render.ctm.CTM; /** * Think of this class as a "Two dimensional ForgeDirection, with diagonals". diff --git a/src/main/java/mekanism/client/render/entity/RenderBalloon.java b/src/main/java/mekanism/client/render/entity/RenderBalloon.java index 8faf5fe79..7140824b5 100644 --- a/src/main/java/mekanism/client/render/entity/RenderBalloon.java +++ b/src/main/java/mekanism/client/render/entity/RenderBalloon.java @@ -6,6 +6,7 @@ import mekanism.common.entity.EntityBalloon; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.util.ResourceLocation; @@ -57,14 +58,14 @@ public class RenderBalloon extends Render public void render(EnumColor color, double x, double y, double z) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glTranslated(x, y, z); - GL11.glRotatef(180, 1, 0, 0); + GlStateManager.rotate(180, 1, 0, 0); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Balloon.png")); model.render(0.0625F, color); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/mekanism/client/render/entity/RenderFlame.java b/src/main/java/mekanism/client/render/entity/RenderFlame.java index aaba3f992..270522156 100644 --- a/src/main/java/mekanism/client/render/entity/RenderFlame.java +++ b/src/main/java/mekanism/client/render/entity/RenderFlame.java @@ -34,16 +34,16 @@ public class RenderFlame extends Render float alpha = (entity.ticksExisted+partialTick)/(float)EntityFlame.LIFESPAN; float size = (float)Math.pow(2*alpha, 2); - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); MekanismRenderer.glowOn(); MekanismRenderer.blendOn(); GL11.glColor4f(1, 1, 1, 1-alpha); bindTexture(getEntityTexture(entity)); - GL11.glTranslatef((float)x, (float)y, (float)z); - GL11.glRotatef((entity.prevRotationYaw + (entity.rotationYaw - entity.prevRotationYaw) * partialTick) - 90F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(entity.prevRotationPitch + (entity.rotationPitch - entity.prevRotationPitch) * partialTick, 0.0F, 0.0F, 1.0F); + GlStateManager.translate((float)x, (float)y, (float)z); + GlStateManager.rotate((entity.prevRotationYaw + (entity.rotationYaw - entity.prevRotationYaw) * partialTick) - 90F, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(entity.prevRotationPitch + (entity.rotationPitch - entity.prevRotationPitch) * partialTick, 0.0F, 0.0F, 1.0F); Tessellator tessellator = Tessellator.getInstance(); WorldRenderer worldrenderer = tessellator.getWorldRenderer(); @@ -56,9 +56,9 @@ public class RenderFlame extends Render float scale = 0.05625F*(0.8F+size); GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glRotatef(45F, 1.0F, 0.0F, 0.0F); - GL11.glScalef(scale, scale, scale); - GL11.glTranslatef(-4F, 0.0F, 0.0F); + GlStateManager.rotate(45F, 1.0F, 0.0F, 0.0F); + GlStateManager.scale(scale, scale, scale); + GlStateManager.translate(-4F, 0.0F, 0.0F); for(int j = 0; j < 4; j++) { @@ -76,7 +76,7 @@ public class RenderFlame extends Render GL11.glDisable(GL12.GL_RESCALE_NORMAL); MekanismRenderer.glowOff(); MekanismRenderer.blendOff(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } @Override diff --git a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java index 267705634..3073bf884 100644 --- a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java +++ b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java @@ -28,8 +28,8 @@ public class RenderObsidianTNTPrimed extends Render public void doRender(EntityObsidianTNT entityobsidiantnt, double x, double y, double z, float entityYaw, float partialTicks) { BlockRendererDispatcher renderer = Minecraft.getMinecraft().getBlockRendererDispatcher(); - GL11.glPushMatrix(); - GL11.glTranslatef((float)x, (float)y+0.5F, (float)z); + GlStateManager.pushMatrix(); + GlStateManager.translate((float)x, (float)y+0.5F, (float)z); if(entityobsidiantnt.fuse - partialTicks + 1.0F < 10.0F) { @@ -65,7 +65,7 @@ public class RenderObsidianTNTPrimed extends Render GL11.glEnable(GL11.GL_TEXTURE_2D); } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } @Override diff --git a/src/main/java/mekanism/client/render/entity/RenderRobit.java b/src/main/java/mekanism/client/render/entity/RenderRobit.java index 7dbd67e47..d251826dd 100644 --- a/src/main/java/mekanism/client/render/entity/RenderRobit.java +++ b/src/main/java/mekanism/client/render/entity/RenderRobit.java @@ -6,7 +6,6 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java index f9d0d7f6d..acd972e3c 100644 --- a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java +++ b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java @@ -5,18 +5,41 @@ import java.util.List; import javax.vecmath.Matrix4f; +import mekanism.client.model.ModelArmoredJetpack; +import mekanism.client.model.ModelAtomicDisassembler; +import mekanism.client.model.ModelFlamethrower; +import mekanism.client.model.ModelFreeRunners; +import mekanism.client.model.ModelGasMask; +import mekanism.client.model.ModelJetpack; +import mekanism.client.model.ModelScubaTank; import mekanism.client.render.ctm.ModelChiselBlock; +import mekanism.client.render.tileentity.RenderBin; import mekanism.client.render.tileentity.RenderFluidTank; +import mekanism.common.MekanismItems; import mekanism.common.Tier.FluidTankTier; import mekanism.common.block.states.BlockStateBasic.BasicBlockType; import mekanism.common.block.states.BlockStateMachine.MachineType; +import mekanism.common.inventory.InventoryBin; +import mekanism.common.item.ItemAtomicDisassembler; +import mekanism.common.item.ItemBlockBasic; import mekanism.common.item.ItemBlockMachine; +import mekanism.common.item.ItemFlamethrower; +import mekanism.common.item.ItemFreeRunners; +import mekanism.common.item.ItemGasMask; +import mekanism.common.item.ItemScubaTank; +import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityFluidTank; +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.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.resources.model.IBakedModel; @@ -29,14 +52,24 @@ import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.fluids.Fluid; import org.apache.commons.lang3.tuple.Pair; -import org.lwjgl.opengl.GL11; public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel { private IBakedModel baseModel; private ItemStack stack; + private Minecraft mc = Minecraft.getMinecraft(); + private static final RenderFluidTank fluidTankRenderer = (RenderFluidTank)TileEntityRendererDispatcher.instance.mapSpecialRenderers.get(TileEntityFluidTank.class); + private final RenderBin binRenderer = (RenderBin)TileEntityRendererDispatcher.instance.mapSpecialRenderers.get(TileEntityBin.class); + + public static ModelJetpack jetpack = new ModelJetpack(); + public static ModelArmoredJetpack armoredJetpack = new ModelArmoredJetpack(); + public static ModelGasMask gasMask = new ModelGasMask(); + public static ModelScubaTank scubaTank = new ModelScubaTank(); + public static ModelFreeRunners freeRunners = new ModelFreeRunners(); + public static ModelAtomicDisassembler atomicDisassembler = new ModelAtomicDisassembler(); + public static ModelFlamethrower flamethrower = new ModelFlamethrower(); public BakedCustomItemModel(IBakedModel model, ItemStack s) { @@ -50,6 +83,22 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel if(basicType != null) { + if(basicType == BasicBlockType.BIN) + { + GlStateManager.pushMatrix(); + ItemBlockBasic itemBasic = (ItemBlockBasic)stack.getItem(); + InventoryBin inv = new InventoryBin(stack); + binRenderer.render(EnumFacing.NORTH, inv.getItemType(), inv.getItemCount(), -0.5, -0.5, -0.5); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + GlStateManager.enableRescaleNormal(); + GlStateManager.enableAlpha(); + GlStateManager.alphaFunc(516, 0.1F); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(770, 771); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.popMatrix(); + } + return; } @@ -59,17 +108,133 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel { if(machineType == MachineType.FLUID_TANK) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); ItemBlockMachine itemMachine = (ItemBlockMachine)stack.getItem(); float targetScale = (float)(itemMachine.getFluidStack(stack) != null ? itemMachine.getFluidStack(stack).amount : 0)/itemMachine.getCapacity(stack); FluidTankTier tier = FluidTankTier.values()[itemMachine.getBaseTier(stack).ordinal()]; Fluid fluid = itemMachine.getFluidStack(stack) != null ? itemMachine.getFluidStack(stack).getFluid() : null; fluidTankRenderer.render(tier, fluid, targetScale, false, null, -0.5, -0.5, -0.5); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } return; } + + GlStateManager.translate(-0.5, -0.5, -0.5); + + if(stack.getItem() == MekanismItems.Jetpack) + { + GlStateManager.pushMatrix(); + GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(90, 0.0F, -1.0F, 0.0F); + GlStateManager.translate(0.2F, -0.35F, 0.0F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Jetpack.png")); + jetpack.render(0.0625F); + GlStateManager.popMatrix(); + } + else if(stack.getItem() == MekanismItems.ArmoredJetpack) + { + GlStateManager.pushMatrix(); + GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(90, 0.0F, -1.0F, 0.0F); + GlStateManager.translate(0.2F, -0.35F, 0.0F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Jetpack.png")); + armoredJetpack.render(0.0625F); + GlStateManager.popMatrix(); + } + else if(stack.getItem() instanceof ItemGasMask) + { + GlStateManager.pushMatrix(); + GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(90, 0.0F, -1.0F, 0.0F); + GlStateManager.translate(0.1F, 0.2F, 0.0F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ScubaSet.png")); + gasMask.render(0.0625F); + GlStateManager.popMatrix(); + } + else if(stack.getItem() instanceof ItemScubaTank) + { + GlStateManager.pushMatrix(); + GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(90, 0.0F, -1.0F, 0.0F); + GlStateManager.scale(1.6F, 1.6F, 1.6F); + GlStateManager.translate(0.2F, -0.5F, 0.0F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ScubaSet.png")); + scubaTank.render(0.0625F); + GlStateManager.popMatrix(); + } + else if(stack.getItem() instanceof ItemFreeRunners) + { + GlStateManager.pushMatrix(); + GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(90, 0.0F, -1.0F, 0.0F); + GlStateManager.scale(2.0F, 2.0F, 2.0F); + GlStateManager.translate(0.2F, -1.43F, 0.12F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FreeRunners.png")); + freeRunners.render(0.0625F); + GlStateManager.popMatrix(); + } + else if(stack.getItem() instanceof ItemAtomicDisassembler) + { + GlStateManager.pushMatrix(); + GlStateManager.scale(1.4F, 1.4F, 1.4F); + GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F); + + if(type == TransformType.THIRD_PERSON) + { + GlStateManager.rotate(-45, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(50, 1.0F, 0.0F, 0.0F); + GlStateManager.scale(2.0F, 2.0F, 2.0F); + GlStateManager.translate(0.0F, -0.4F, 0.4F); + } + else if(type == TransformType.GUI) + { + GlStateManager.rotate(225, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(45, -1.0F, 0.0F, -1.0F); + GlStateManager.scale(0.6F, 0.6F, 0.6F); + GlStateManager.translate(0.0F, -0.2F, 0.0F); + } + else { + GlStateManager.rotate(45, 0.0F, 1.0F, 0.0F); + GlStateManager.translate(0.0F, -0.7F, 0.0F); + } + + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "AtomicDisassembler.png")); + atomicDisassembler.render(0.0625F); + GlStateManager.popMatrix(); + } + else if(stack.getItem() instanceof ItemFlamethrower) + { + GlStateManager.pushMatrix(); + GlStateManager.rotate(160, 0.0F, 0.0F, 1.0F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Flamethrower.png")); + + GlStateManager.translate(0.0F, -1.0F, 0.0F); + GlStateManager.rotate(135, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(-20, 0.0F, 0.0F, 1.0F); + + if(type == TransformType.FIRST_PERSON || type == TransformType.THIRD_PERSON) + { + if(type == TransformType.FIRST_PERSON) + { + GlStateManager.rotate(55, 0.0F, 1.0F, 0.0F); + } + else { + GlStateManager.translate(0.0F, 0.5F, 0.0F); + } + + GlStateManager.scale(2.5F, 2.5F, 2.5F); + GlStateManager.translate(0.0F, -1.0F, -0.5F); + } + else if(type == TransformType.GUI) + { + GlStateManager.translate(-0.6F, 0.0F, 0.0F); + GlStateManager.rotate(45, 0.0F, 1.0F, 0.0F); + } + + flamethrower.render(0.0625F); + GlStateManager.popMatrix(); + } } @Override @@ -77,7 +242,10 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel { List faceQuads = new LinkedList(); - faceQuads.addAll(baseModel.getFaceQuads(facing)); + if(Block.getBlockFromItem(stack.getItem()) != null) + { + faceQuads.addAll(baseModel.getFaceQuads(facing)); + } return faceQuads; } @@ -87,7 +255,10 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel { List generalQuads = new LinkedList(); - generalQuads.addAll(baseModel.getGeneralQuads()); + if(Block.getBlockFromItem(stack.getItem()) != null) + { + generalQuads.addAll(baseModel.getGeneralQuads()); + } return generalQuads; } @@ -136,10 +307,12 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel ForgeHooksClient.multiplyCurrentGlMatrix(ModelChiselBlock.DEFAULT_BLOCK_THIRD_PERSON_MATRIX); } - GL11.glScalef(0.5F, 0.5F, 0.5F); + GlStateManager.pushMatrix(); + GlStateManager.scale(0.5F, 0.5F, 0.5F); doRender(cameraTransformType); - GL11.glScalef(2.0F, 2.0F, 2.0F); + GlStateManager.scale(2.0F, 2.0F, 2.0F); RenderHelper.enableStandardItemLighting(); + GlStateManager.popMatrix(); return Pair.of(this, null); } diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index 9e0687122..eeafb8198 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -52,7 +52,7 @@ public class ItemRenderingHandler// implements IItemRenderer if(type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) { - GL11.glTranslatef(0.5F, 0.5F, 0.5F); + GlStateManager.translate(0.5F, 0.5F, 0.5F); } if(item.getItem() instanceof IEnergyCube) @@ -61,9 +61,9 @@ public class ItemRenderingHandler// implements IItemRenderer IEnergizedItem energized = (IEnergizedItem)item.getItem(); 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); + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(270F, 0.0F, -1.0F, 0.0F); + GlStateManager.translate(0.0F, -1.0F, 0.0F); MekanismRenderer.blendOn(); @@ -77,7 +77,7 @@ public class ItemRenderingHandler// implements IItemRenderer MekanismRenderer.blendOff(); - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glTranslated(0.0, 1.0, 0.0); mc.renderEngine.bindTexture(RenderEnergyCube.coreTexture); @@ -89,14 +89,14 @@ public class ItemRenderingHandler// implements IItemRenderer EnumColor c = tier.getBaseTier().getColor(); - GL11.glPushMatrix(); - GL11.glScalef(0.4F, 0.4F, 0.4F); + GlStateManager.pushMatrix(); + GlStateManager.scale(0.4F, 0.4F, 0.4F); GL11.glColor4f(c.getColor(0), c.getColor(1), c.getColor(2), (float)(energized.getEnergy(item)/energized.getMaxEnergy(item))); - GL11.glTranslatef(0, (float)Math.sin(Math.toRadians((MekanismClient.ticksPassed + MekanismRenderer.getPartialTick()) * 3)) / 7, 0); - GL11.glRotatef((MekanismClient.ticksPassed + MekanismRenderer.getPartialTick()) * 4, 0, 1, 0); - GL11.glRotatef(36F + (MekanismClient.ticksPassed + MekanismRenderer.getPartialTick()) * 4, 0, 1, 1); + GlStateManager.translate(0, (float)Math.sin(Math.toRadians((MekanismClient.ticksPassed + MekanismRenderer.getPartialTick()) * 3)) / 7, 0); + GlStateManager.rotate((MekanismClient.ticksPassed + MekanismRenderer.getPartialTick()) * 4, 0, 1, 0); + GlStateManager.rotate(36F + (MekanismClient.ticksPassed + MekanismRenderer.getPartialTick()) * 4, 0, 1, 1); energyCore.render(0.0625F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); MekanismRenderer.glowOff(); @@ -105,7 +105,7 @@ public class ItemRenderingHandler// implements IItemRenderer GL11.glDisable(GL11.GL_POLYGON_SMOOTH); GL11.glDisable(GL11.GL_BLEND); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } else if(BasicType.get(item) == BasicType.INDUCTION_CELL || BasicType.get(item) == BasicType.INDUCTION_PROVIDER) { @@ -113,9 +113,9 @@ public class ItemRenderingHandler// implements IItemRenderer } else if(BasicType.get(item) == BasicType.BIN) { - GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(270, 0.0F, 1.0F, 0.0F); MekanismRenderer.renderCustomItem((RenderBlocks)data[0], item); - GL11.glRotatef(-270, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(-270, 0.0F, 1.0F, 0.0F); if(binRenderer == null || binRenderer.func_147498_b()/*getFontRenderer()* / == null) { @@ -137,31 +137,31 @@ public class ItemRenderingHandler// implements IItemRenderer if(itemStack != null) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); if(!(itemStack.getItem() instanceof ItemBlock) || Block.getBlockFromItem(itemStack.getItem()).getRenderType() != 0) { - GL11.glRotatef(180, 0, 0, 1); - GL11.glTranslatef(-1.02F, -0.2F, 0); + GlStateManager.rotate(180, 0, 0, 1); + GlStateManager.translate(-1.02F, -0.2F, 0); if(type == ItemRenderType.INVENTORY) { - GL11.glTranslatef(-0.45F, -0.4F, 0.0F); + GlStateManager.translate(-0.45F, -0.4F, 0.0F); } } if(type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON || type == ItemRenderType.ENTITY) { - GL11.glTranslatef(-0.22F, -0.2F, -0.22F); + GlStateManager.translate(-0.22F, -0.2F, -0.22F); } GL11.glTranslated(0.73, 0.08, 0.44); - GL11.glRotatef(90, 0, 1, 0); + GlStateManager.rotate(90, 0, 1, 0); float scale = 0.03125F; float scaler = 0.9F; - GL11.glScalef(scale*scaler, scale*scaler, 0); + GlStateManager.scale(scale*scaler, scale*scaler, 0); TextureManager renderEngine = mc.renderEngine; @@ -170,7 +170,7 @@ public class ItemRenderingHandler// implements IItemRenderer renderItem.renderItemAndEffectIntoGUI(binRenderer.func_147498_b()/*getFontRenderer()* /, renderEngine, itemStack, 0, 0); GL11.glEnable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } MekanismRenderer.glowOff(); @@ -179,26 +179,26 @@ public class ItemRenderingHandler// implements IItemRenderer { float maxScale = 0.02F; - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glPolygonOffset(-10, -10); GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL); float displayWidth = 1 - (2 / 16); float displayHeight = 1 - (2 / 16); - GL11.glTranslatef(0, -0.31F, 0); + GlStateManager.translate(0, -0.31F, 0); if(type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON || type == ItemRenderType.ENTITY) { GL11.glTranslated(-0.5, -0.4, -0.5); } - GL11.glTranslatef(0, 0.9F, 1); - GL11.glRotatef(90, 0, 1, 0); - GL11.glRotatef(90, 1, 0, 0); + GlStateManager.translate(0, 0.9F, 1); + GlStateManager.rotate(90, 0, 1, 0); + GlStateManager.rotate(90, 1, 0, 0); - GL11.glTranslatef(displayWidth / 2, 1F, displayHeight / 2); - GL11.glRotatef(-90, 1, 0, 0); + GlStateManager.translate(displayWidth / 2, 1F, displayHeight / 2); + GlStateManager.rotate(-90, 1, 0, 0); FontRenderer fontRenderer = binRenderer.func_147498_b();//getFontRenderer(); @@ -214,7 +214,7 @@ public class ItemRenderingHandler// implements IItemRenderer scale = Math.min(scale, maxScale); } - GL11.glScalef(scale, -scale, scale); + GlStateManager.scale(scale, -scale, scale); GL11.glDepthMask(false); int offsetX; @@ -231,31 +231,31 @@ public class ItemRenderingHandler// implements IItemRenderer GL11.glDepthMask(true); GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.GasTank) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); BaseTier tier = ((ItemBlockGasTank)item.getItem()).getBaseTier(item); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank" + tier.getName() + ".png")); - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.0F, 0.0F); + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(90F, 0.0F, 1.0F, 0.0F); + GlStateManager.translate(0.0F, -1.0F, 0.0F); gasTank.render(0.0625F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.ObsidianTNT) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); 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); + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(180F, 0.0F, -1.0F, 0.0F); + GlStateManager.translate(0.0F, -1.0F, 0.0F); obsidianTNT.render(0.0625F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } else if(item.getItem() instanceof ItemWalkieTalkie) { @@ -273,141 +273,141 @@ public class ItemRenderingHandler// implements IItemRenderer } else if(MachineType.get(item) == MachineType.PERSONAL_CHEST) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); ItemBlockMachine chest = (ItemBlockMachine)item.getItem(); - GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - GL11.glTranslatef(0, 1.0F, 1.0F); - GL11.glScalef(1.0F, -1F, -1F); + GlStateManager.rotate(90F, 0.0F, 1.0F, 0.0F); + GlStateManager.translate(-0.5F, -0.5F, -0.5F); + GlStateManager.translate(0, 1.0F, 1.0F); + GlStateManager.scale(1.0F, -1F, -1F); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PersonalChest.png")); personalChest.renderAll(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } else if(item.getItem() instanceof ItemRobit) { - GL11.glPushMatrix(); - 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); + GlStateManager.pushMatrix(); + GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(90, 0.0F, -1.0F, 0.0F); + GlStateManager.translate(0.0F, -1.5F, 0.0F); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Robit.png")); robit.render(0.08F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } else if(item.getItem() == MekanismItems.Jetpack) { - GL11.glPushMatrix(); - 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); + GlStateManager.pushMatrix(); + GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(90, 0.0F, -1.0F, 0.0F); + GlStateManager.translate(0.2F, -0.35F, 0.0F); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Jetpack.png")); jetpack.render(0.0625F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } else if(item.getItem() == MekanismItems.ArmoredJetpack) { - GL11.glPushMatrix(); - 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); + GlStateManager.pushMatrix(); + GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(90, 0.0F, -1.0F, 0.0F); + GlStateManager.translate(0.2F, -0.35F, 0.0F); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Jetpack.png")); armoredJetpack.render(0.0625F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } else if(item.getItem() instanceof ItemGasMask) { - GL11.glPushMatrix(); - 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); + GlStateManager.pushMatrix(); + GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(90, 0.0F, -1.0F, 0.0F); + GlStateManager.translate(0.1F, 0.2F, 0.0F); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ScubaSet.png")); gasMask.render(0.0625F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } else if(item.getItem() instanceof ItemScubaTank) { - GL11.glPushMatrix(); - GL11.glRotatef(180, 0.0F, 0.0F, 1.0F); - 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); + GlStateManager.pushMatrix(); + GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(90, 0.0F, -1.0F, 0.0F); + GlStateManager.scale(1.6F, 1.6F, 1.6F); + GlStateManager.translate(0.2F, -0.5F, 0.0F); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ScubaSet.png")); scubaTank.render(0.0625F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } else if(item.getItem() instanceof ItemFreeRunners) { - GL11.glPushMatrix(); - GL11.glRotatef(180, 0.0F, 0.0F, 1.0F); - 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); + GlStateManager.pushMatrix(); + GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(90, 0.0F, -1.0F, 0.0F); + GlStateManager.scale(2.0F, 2.0F, 2.0F); + GlStateManager.translate(0.2F, -1.43F, 0.12F); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FreeRunners.png")); freeRunners.render(0.0625F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } else if(item.getItem() instanceof ItemBalloon) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); if(type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) { - GL11.glScalef(2.5F, 2.5F, 2.5F); - GL11.glTranslatef(0.2F, 0, 0.1F); - GL11.glRotatef(15, -1, 0, 1); + GlStateManager.scale(2.5F, 2.5F, 2.5F); + GlStateManager.translate(0.2F, 0, 0.1F); + GlStateManager.rotate(15, -1, 0, 1); balloonRenderer.render(((ItemBalloon)item.getItem()).getColor(item), 0, 1.9F, 0); } else { balloonRenderer.render(((ItemBalloon)item.getItem()).getColor(item), 0, 1, 0); } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } else if(item.getItem() instanceof ItemAtomicDisassembler) { - GL11.glPushMatrix(); - GL11.glScalef(1.4F, 1.4F, 1.4F); - GL11.glRotatef(180, 0.0F, 0.0F, 1.0F); + GlStateManager.pushMatrix(); + GlStateManager.scale(1.4F, 1.4F, 1.4F); + GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F); if(type == ItemRenderType.EQUIPPED) { - GL11.glRotatef(-45, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(50, 1.0F, 0.0F, 0.0F); - GL11.glScalef(2.0F, 2.0F, 2.0F); - GL11.glTranslatef(0.0F, -0.4F, 0.4F); + GlStateManager.rotate(-45, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(50, 1.0F, 0.0F, 0.0F); + GlStateManager.scale(2.0F, 2.0F, 2.0F); + GlStateManager.translate(0.0F, -0.4F, 0.4F); } else if(type == ItemRenderType.INVENTORY) { - GL11.glRotatef(225, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(45, -1.0F, 0.0F, -1.0F); - GL11.glScalef(0.6F, 0.6F, 0.6F); - GL11.glTranslatef(0.0F, -0.2F, 0.0F); + GlStateManager.rotate(225, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(45, -1.0F, 0.0F, -1.0F); + GlStateManager.scale(0.6F, 0.6F, 0.6F); + GlStateManager.translate(0.0F, -0.2F, 0.0F); } else { - GL11.glRotatef(45, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.7F, 0.0F); + GlStateManager.rotate(45, 0.0F, 1.0F, 0.0F); + GlStateManager.translate(0.0F, -0.7F, 0.0F); } mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "AtomicDisassembler.png")); atomicDisassembler.render(0.0625F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } else if(item.getItem() instanceof ItemPartTransmitter) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glTranslated(-0.5, -0.5, -0.5); MekanismRenderer.blendOn(); GL11.glDisable(GL11.GL_CULL_FACE); RenderPartTransmitter.getInstance().renderItem(TransmitterType.values()[item.getItemDamage()]); GL11.glEnable(GL11.GL_CULL_FACE); MekanismRenderer.blendOff(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } else if(item.getItem() instanceof ItemGlowPanel) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); GL11.glTranslated(-0.5, -0.5, -0.5); double d = 0.15; @@ -419,51 +419,51 @@ public class ItemRenderingHandler// implements IItemRenderer RenderGlowPanel.getInstance().renderItem(item.getItemDamage()); GL11.glEnable(GL11.GL_CULL_FACE); GL11.glPopAttrib(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } else if(item.getItem() instanceof ItemFlamethrower) { - GL11.glPushMatrix(); - GL11.glRotatef(160, 0.0F, 0.0F, 1.0F); + GlStateManager.pushMatrix(); + GlStateManager.rotate(160, 0.0F, 0.0F, 1.0F); 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); - GL11.glRotatef(-20, 0.0F, 0.0F, 1.0F); + GlStateManager.translate(0.0F, -1.0F, 0.0F); + GlStateManager.rotate(135, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(-20, 0.0F, 0.0F, 1.0F); if(type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) { if(type == ItemRenderType.EQUIPPED_FIRST_PERSON) { - GL11.glRotatef(55, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(55, 0.0F, 1.0F, 0.0F); } else { - GL11.glTranslatef(0.0F, 0.5F, 0.0F); + GlStateManager.translate(0.0F, 0.5F, 0.0F); } - GL11.glScalef(2.5F, 2.5F, 2.5F); - GL11.glTranslatef(0.0F, -1.0F, -0.5F); + GlStateManager.scale(2.5F, 2.5F, 2.5F); + GlStateManager.translate(0.0F, -1.0F, -0.5F); } else if(type == ItemRenderType.INVENTORY) { - GL11.glTranslatef(-0.6F, 0.0F, 0.0F); - GL11.glRotatef(45, 0.0F, 1.0F, 0.0F); + GlStateManager.translate(-0.6F, 0.0F, 0.0F); + GlStateManager.rotate(45, 0.0F, 1.0F, 0.0F); } flamethrower.render(0.0625F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } else if(MachineType.get(item) == MachineType.FLUID_TANK) { - GL11.glPushMatrix(); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); + GlStateManager.pushMatrix(); + GlStateManager.rotate(270F, 0.0F, -1.0F, 0.0F); 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()]; Fluid fluid = itemMachine.getFluidStack(item) != null ? itemMachine.getFluidStack(item).getFluid() : null; portableTankRenderer.render(tier, fluid, targetScale, false, null, -0.5, -0.5, -0.5); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } else { if(item.getItem() instanceof ItemBlockMachine) @@ -472,7 +472,7 @@ public class ItemRenderingHandler// implements IItemRenderer if(machine == MachineType.BASIC_FACTORY || machine == MachineType.ADVANCED_FACTORY || machine == MachineType.ELITE_FACTORY) { - GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(-90F, 0.0F, 1.0F, 0.0F); MekanismRenderer.renderCustomItem(((RenderBlocks)data[0]), item); } else { diff --git a/src/main/java/mekanism/client/render/particle/EntityJetpackFlameFX.java b/src/main/java/mekanism/client/render/particle/EntityJetpackFlameFX.java index 6690b9da2..5b8540313 100644 --- a/src/main/java/mekanism/client/render/particle/EntityJetpackFlameFX.java +++ b/src/main/java/mekanism/client/render/particle/EntityJetpackFlameFX.java @@ -2,7 +2,6 @@ package mekanism.client.render.particle; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFlameFX; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.entity.Entity; import net.minecraft.world.World; diff --git a/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java b/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java index dfb8e63f3..8d219b70e 100644 --- a/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java +++ b/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java @@ -2,7 +2,6 @@ package mekanism.client.render.particle; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntitySmokeFX; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.entity.Entity; import net.minecraft.world.World; diff --git a/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java b/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java index c7935560e..caa6d488c 100644 --- a/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java +++ b/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java @@ -2,7 +2,6 @@ package mekanism.client.render.particle; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityBubbleFX; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.entity.Entity; import net.minecraft.world.World; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderBin.java b/src/main/java/mekanism/client/render/tileentity/RenderBin.java index ba3a0e064..46421e824 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderBin.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderBin.java @@ -1,10 +1,10 @@ package mekanism.client.render.tileentity; import mekanism.api.Coord4D; -import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityBin; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; @@ -22,103 +22,103 @@ public class RenderBin extends TileEntitySpecialRenderer @Override public void renderTileEntityAt(TileEntityBin tileEntity, double x, double y, double z, float partialTick, int destroyStage) { - String amount = ""; - ItemStack itemStack = tileEntity.itemType; - - if(itemStack != null) - { - amount = Integer.toString(tileEntity.clientAmount); - } - Coord4D obj = Coord4D.get(tileEntity).offset(tileEntity.facing); if(obj.getBlockState(tileEntity.getWorld()).getBlock().isSideSolid(tileEntity.getWorld(), obj.getPos(), tileEntity.facing.getOpposite())) { return; } + + render(tileEntity.facing, tileEntity.itemType, tileEntity.clientAmount, x, y, z); + } + + public void render(EnumFacing facing, ItemStack itemType, int clientAmount, double x, double y, double z) + { + String amount = ""; - MekanismRenderer.glowOn(); - - if(itemStack != null) + if(itemType != null) { - GL11.glPushMatrix(); + amount = Integer.toString(clientAmount); + } - switch(tileEntity.facing) + if(itemType != null) + { + GlStateManager.pushMatrix(); + + switch(facing) { case NORTH: - GL11.glTranslated(x + 0.73, y + 0.83, z - 0.01); + GL11.glTranslated(x + 0.73, y + 0.83, z - 0.0001); break; case SOUTH: - GL11.glTranslated(x + 0.27, y + 0.83, z + 1.01); - GL11.glRotatef(180, 0, 1, 0); + GL11.glTranslated(x + 0.27, y + 0.83, z + 1.0001); + GlStateManager.rotate(180, 0, 1, 0); break; case WEST: - GL11.glTranslated(x - 0.01, y + 0.83, z + 0.27); - GL11.glRotatef(90, 0, 1, 0); + GL11.glTranslated(x - 0.0001, y + 0.83, z + 0.27); + GlStateManager.rotate(90, 0, 1, 0); break; case EAST: - GL11.glTranslated(x + 1.01, y + 0.83, z + 0.73); - GL11.glRotatef(-90, 0, 1, 0); + GL11.glTranslated(x + 1.0001, y + 0.83, z + 0.73); + GlStateManager.rotate(-90, 0, 1, 0); break; } float scale = 0.03125F; float scaler = 0.9F; - GL11.glScalef(scale*scaler, scale*scaler, -0.0001F); - GL11.glRotatef(180, 0, 0, 1); + GlStateManager.scale(scale*scaler, scale*scaler, -0.0001F); + GlStateManager.rotate(180, 0, 0, 1); - renderItem.renderItemAndEffectIntoGUI(itemStack, 0, 0); - - GL11.glPopMatrix(); + renderItem.renderItemAndEffectIntoGUI(itemType, 0, 0); + + GlStateManager.popMatrix(); } if(!amount.equals("")) { - renderText(amount, tileEntity.facing, 0.02F, x, y - 0.31F, z); + renderText(amount, facing, 0.02F, x, y - 0.3725F, z); } - - MekanismRenderer.glowOff(); } @SuppressWarnings("incomplete-switch") private void renderText(String text, EnumFacing side, float maxScale, double x, double y, double z) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); - GL11.glPolygonOffset(-10, -10); - GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL); + GlStateManager.doPolygonOffset(-10, -10); + GlStateManager.enablePolygonOffset(); float displayWidth = 1 - (2 / 16); float displayHeight = 1 - (2 / 16); - GL11.glTranslated(x, y, z); + GlStateManager.translate(x, y, z); switch(side) { case SOUTH: - GL11.glTranslatef(0, 1, 0); - GL11.glRotatef(0, 0, 1, 0); - GL11.glRotatef(90, 1, 0, 0); + GlStateManager.translate(0, 1, 0); + GlStateManager.rotate(0, 0, 1, 0); + GlStateManager.rotate(90, 1, 0, 0); break; case NORTH: - GL11.glTranslatef(1, 1, 1); - GL11.glRotatef(180, 0, 1, 0); - GL11.glRotatef(90, 1, 0, 0); + GlStateManager.translate(1, 1, 1); + GlStateManager.rotate(180, 0, 1, 0); + GlStateManager.rotate(90, 1, 0, 0); break; case EAST: - GL11.glTranslatef(0, 1, 1); - GL11.glRotatef(90, 0, 1, 0); - GL11.glRotatef(90, 1, 0, 0); + GlStateManager.translate(0, 1, 1); + GlStateManager.rotate(90, 0, 1, 0); + GlStateManager.rotate(90, 1, 0, 0); break; case WEST: - GL11.glTranslatef(1, 1, 0); - GL11.glRotatef(-90, 0, 1, 0); - GL11.glRotatef(90, 1, 0, 0); + GlStateManager.translate(1, 1, 0); + GlStateManager.rotate(-90, 0, 1, 0); + GlStateManager.rotate(90, 1, 0, 0); break; } - GL11.glTranslatef(displayWidth / 2, 1F, displayHeight / 2); - GL11.glRotatef(-90, 1, 0, 0); + GlStateManager.translate(displayWidth / 2, 1F, displayHeight / 2); + GlStateManager.rotate(-90, 1, 0, 0); FontRenderer fontRenderer = getFontRenderer(); @@ -134,8 +134,8 @@ public class RenderBin extends TileEntitySpecialRenderer scale = Math.min(scale, maxScale); } - GL11.glScalef(scale, -scale, scale); - GL11.glDepthMask(false); + GlStateManager.scale(scale, -scale, scale); + GlStateManager.depthMask(false); int realHeight = (int)Math.floor(displayHeight / scale); int realWidth = (int)Math.floor(displayWidth / scale); @@ -143,12 +143,12 @@ public class RenderBin extends TileEntitySpecialRenderer int offsetX = (realWidth - requiredWidth) / 2; int offsetY = (realHeight - requiredHeight) / 2; - GL11.glDisable(GL11.GL_LIGHTING); + GlStateManager.disableLighting(); fontRenderer.drawString("\u00a7f" + text, offsetX - (realWidth / 2), 1 + offsetY - (realHeight / 2), 1); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDepthMask(true); - GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL); + GlStateManager.enableLighting(); + GlStateManager.depthMask(true); + GlStateManager.disablePolygonOffset(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java b/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java index f6fdca09c..331c73ef4 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java @@ -4,14 +4,13 @@ import mekanism.client.model.ModelChargepad; import mekanism.common.tile.TileEntityChargepad; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderChargepad extends TileEntitySpecialRenderer { @@ -20,20 +19,20 @@ public class RenderChargepad extends TileEntitySpecialRenderer { @@ -21,16 +20,16 @@ public class RenderChemicalCrystallizer extends TileEntitySpecialRenderer { @@ -20,20 +19,20 @@ public class RenderChemicalDissolutionChamber extends TileEntitySpecialRenderer< @Override public void renderTileEntityAt(TileEntityChemicalDissolutionChamber tileEntity, double x, double y, double z, float partialTick, int destroyStage) { - GL11.glPushMatrix(); - GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F); + GlStateManager.pushMatrix(); + GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F); bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalDissolutionChamber.png")); switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ { - 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; + case 2: GlStateManager.rotate(0, 0.0F, 1.0F, 0.0F); break; + case 3: GlStateManager.rotate(180, 0.0F, 1.0F, 0.0F); break; + case 4: GlStateManager.rotate(90, 0.0F, 1.0F, 0.0F); break; + case 5: GlStateManager.rotate(270, 0.0F, 1.0F, 0.0F); break; } - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); model.render(0.0625F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java index 527370f33..21a4f18fb 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java @@ -4,10 +4,8 @@ import mekanism.client.model.ModelChemicalInfuser; import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.init.Blocks; -import net.minecraft.util.EnumFacing; import org.lwjgl.opengl.GL11; @@ -18,22 +16,22 @@ public class RenderChemicalInfuser extends TileEntitySpecialRenderer extends TileEntitySpecialRenderer { @@ -44,7 +40,7 @@ public class RenderConfigurableMachine { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java b/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java index 62c0ea095..af035aa02 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java @@ -11,6 +11,7 @@ import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.content.tank.SynchronizedTankData.ValveData; import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.tile.TileEntityDynamicTank; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; @@ -89,12 +90,12 @@ public class RenderDynamicTank extends TileEntitySpecialRenderer { @@ -20,21 +19,21 @@ public class RenderElectricPump extends TileEntitySpecialRenderer { @@ -20,21 +19,21 @@ public class RenderElectrolyticSeparator extends TileEntitySpecialRenderer 0.1) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); bindTexture(coreTexture); @@ -96,19 +97,19 @@ public class RenderEnergyCube extends TileEntitySpecialRenderer { @@ -20,21 +19,21 @@ public class RenderFluidicPlenisher extends TileEntitySpecialRenderer { @@ -21,21 +19,21 @@ public class RenderGasTank extends TileEntitySpecialRenderer @Override public void renderTileEntityAt(TileEntityGasTank tileEntity, double x, double y, double z, float partialTick, int destroyStage) { - GL11.glPushMatrix(); - GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F); + GlStateManager.pushMatrix(); + GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F); bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank" + tileEntity.tier.getBaseTier().getSimpleName() + ".png")); switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ { - 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; + case 2: GlStateManager.rotate(0, 0.0F, 1.0F, 0.0F); break; + case 3: GlStateManager.rotate(180, 0.0F, 1.0F, 0.0F); break; + case 4: GlStateManager.rotate(90, 0.0F, 1.0F, 0.0F); break; + case 5: GlStateManager.rotate(270, 0.0F, 1.0F, 0.0F); break; } - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); model.render(0.0625F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); //TODO MekanismRenderer.machineRenderer.renderAModelAt(tileEntity, x, y, z, partialTick); } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java b/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java index 2b43080fc..5aca86ebf 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java @@ -5,14 +5,13 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityLaserAmplifier; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderLaserAmplifier extends TileEntitySpecialRenderer { @@ -21,43 +20,43 @@ public class RenderLaserAmplifier extends TileEntitySpecialRenderer { @@ -20,8 +19,8 @@ public class RenderLogisticalSorter extends TileEntitySpecialRenderer { @@ -20,27 +19,27 @@ public class RenderPersonalChest extends TileEntitySpecialRenderer { @@ -21,22 +20,22 @@ public class RenderPressurizedReactionChamber extends TileEntitySpecialRenderer< @Override public void renderTileEntityAt(TileEntityPRC tileEntity, double x, double y, double z, float partialTick, int destroyStage) { - GL11.glPushMatrix(); - GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F); + GlStateManager.pushMatrix(); + GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F); bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PressurizedReactionChamber.png")); switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ { - 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; + case 2: GlStateManager.rotate(0, 0.0F, 1.0F, 0.0F); break; + case 3: GlStateManager.rotate(180, 0.0F, 1.0F, 0.0F); break; + case 4: GlStateManager.rotate(90, 0.0F, 1.0F, 0.0F); break; + case 5: GlStateManager.rotate(270, 0.0F, 1.0F, 0.0F); break; } - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); model.render(0.0625F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); MekanismRenderer.machineRenderer.renderTileEntityAt(tileEntity, x, y, z, partialTick, destroyStage); } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderQuantumEntangloporter.java b/src/main/java/mekanism/client/render/tileentity/RenderQuantumEntangloporter.java index 01b52e195..090f3f166 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderQuantumEntangloporter.java @@ -2,18 +2,16 @@ package mekanism.client.render.tileentity; import mekanism.client.model.ModelQuantumEntangloporter; import mekanism.client.render.MekanismRenderer; -import mekanism.common.base.ISideConfiguration; import mekanism.common.tile.TileEntityQuantumEntangloporter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderQuantumEntangloporter extends TileEntitySpecialRenderer { @@ -22,22 +20,22 @@ public class RenderQuantumEntangloporter extends TileEntitySpecialRenderer { @@ -20,20 +19,20 @@ public class RenderResistiveHeater extends TileEntitySpecialRenderer { @@ -20,21 +19,21 @@ public class RenderRotaryCondensentrator extends TileEntitySpecialRenderer { @@ -20,21 +19,21 @@ public class RenderSecurityDesk extends TileEntitySpecialRenderer { @@ -20,23 +19,23 @@ public class RenderSeismicVibrator extends TileEntitySpecialRenderer { @@ -20,22 +19,22 @@ public class RenderSolarNeutronActivator extends TileEntitySpecialRendereralwaysFalse(), false, false), REFINED_GLOWSTONE(BasicBlock.BASIC_BLOCK_1, 4, "RefinedGlowstone", null, false, Predicates.alwaysFalse(), false, false), STEEL_BLOCK(BasicBlock.BASIC_BLOCK_1, 5, "SteelBlock", null, false, Predicates.alwaysFalse(), false, false), - BIN(BasicBlock.BASIC_BLOCK_1, 6, "Bin", TileEntityBin.class, false, Plane.HORIZONTAL, true, true), - TELEPORTER_FRAME(BasicBlock.BASIC_BLOCK_1, 7, "TeleporterFrame", null, false, Predicates.alwaysFalse(), false, false), - STEEL_CASING(BasicBlock.BASIC_BLOCK_1, 8, "SteelCasing", null, false, Predicates.alwaysFalse(), false, false), - DYNAMIC_TANK(BasicBlock.BASIC_BLOCK_1, 9, "DynamicTank", TileEntityDynamicTank.class, false, Predicates.alwaysFalse(), false, false), - STRUCTURAL_GLASS(BasicBlock.BASIC_BLOCK_1, 10, "StructuralGlass", TileEntityStructuralGlass.class, false, Predicates.alwaysFalse(), false, false), - DYNAMIC_VALVE(BasicBlock.BASIC_BLOCK_1, 11, "DynamicValve", TileEntityDynamicValve.class, false, Predicates.alwaysFalse(), false, false), + BIN(BasicBlock.BASIC_BLOCK_1, 6, "Bin", TileEntityBin.class, true, Plane.HORIZONTAL, true, true), + TELEPORTER_FRAME(BasicBlock.BASIC_BLOCK_1, 7, "TeleporterFrame", null, true, Predicates.alwaysFalse(), false, false), + STEEL_CASING(BasicBlock.BASIC_BLOCK_1, 8, "SteelCasing", null, true, Predicates.alwaysFalse(), false, false), + DYNAMIC_TANK(BasicBlock.BASIC_BLOCK_1, 9, "DynamicTank", TileEntityDynamicTank.class, true, Predicates.alwaysFalse(), false, false), + STRUCTURAL_GLASS(BasicBlock.BASIC_BLOCK_1, 10, "StructuralGlass", TileEntityStructuralGlass.class, true, Predicates.alwaysFalse(), false, false), + DYNAMIC_VALVE(BasicBlock.BASIC_BLOCK_1, 11, "DynamicValve", TileEntityDynamicValve.class, true, Predicates.alwaysFalse(), false, false), COPPER_BLOCK(BasicBlock.BASIC_BLOCK_1, 12, "CopperBlock", null, false, Predicates.alwaysFalse(), false, false), TIN_BLOCK(BasicBlock.BASIC_BLOCK_1, 13, "TinBlock", null, false, Predicates.alwaysFalse(), false, false), - THERMAL_EVAPORATION_CONTROLLER(BasicBlock.BASIC_BLOCK_1, 14, "ThermalEvaporationController", TileEntityThermalEvaporationController.class, false, Predicates.alwaysFalse(), false, false), - THERMAL_EVAPORATION_VALVE(BasicBlock.BASIC_BLOCK_1, 15, "ThermalEvaporationValve", TileEntityThermalEvaporationValve.class, false, Predicates.alwaysFalse(), false, false), - THERMAL_EVAPORATION_BLOCK(BasicBlock.BASIC_BLOCK_2, 0, "ThermalEvaporationBlock", TileEntityThermalEvaporationBlock.class, false, Predicates.alwaysFalse(), false, false), - INDUCTION_CASING(BasicBlock.BASIC_BLOCK_2, 1, "InductionCasing", TileEntityInductionCasing.class, false, Predicates.alwaysFalse(), false, false), - INDUCTION_PORT(BasicBlock.BASIC_BLOCK_2, 2, "InductionPort", TileEntityInductionPort.class, false, Predicates.alwaysFalse(), false, false), - INDUCTION_CELL(BasicBlock.BASIC_BLOCK_2, 3, "InductionCell", TileEntityInductionCell.class, false, Predicates.alwaysFalse(), false, true), - INDUCTION_PROVIDER(BasicBlock.BASIC_BLOCK_2, 4, "InductionProvider", TileEntityInductionProvider.class, false, Predicates.alwaysFalse(), false, true), + THERMAL_EVAPORATION_CONTROLLER(BasicBlock.BASIC_BLOCK_1, 14, "ThermalEvaporationController", TileEntityThermalEvaporationController.class, true, Predicates.alwaysFalse(), false, false), + THERMAL_EVAPORATION_VALVE(BasicBlock.BASIC_BLOCK_1, 15, "ThermalEvaporationValve", TileEntityThermalEvaporationValve.class, true, Predicates.alwaysFalse(), false, false), + THERMAL_EVAPORATION_BLOCK(BasicBlock.BASIC_BLOCK_2, 0, "ThermalEvaporationBlock", TileEntityThermalEvaporationBlock.class, true, Predicates.alwaysFalse(), false, false), + INDUCTION_CASING(BasicBlock.BASIC_BLOCK_2, 1, "InductionCasing", TileEntityInductionCasing.class, true, Predicates.alwaysFalse(), false, false), + INDUCTION_PORT(BasicBlock.BASIC_BLOCK_2, 2, "InductionPort", TileEntityInductionPort.class, true, Predicates.alwaysFalse(), false, false), + INDUCTION_CELL(BasicBlock.BASIC_BLOCK_2, 3, "InductionCell", TileEntityInductionCell.class, true, Predicates.alwaysFalse(), false, true), + INDUCTION_PROVIDER(BasicBlock.BASIC_BLOCK_2, 4, "InductionProvider", TileEntityInductionProvider.class, true, Predicates.alwaysFalse(), false, true), SUPERHEATING_ELEMENT(BasicBlock.BASIC_BLOCK_2, 5, "SuperheatingElement", TileEntitySuperheatingElement.class, true, Predicates.alwaysFalse(), false, false), PRESSURE_DISPERSER(BasicBlock.BASIC_BLOCK_2, 6, "PressureDisperser",TileEntityPressureDisperser.class, true, Predicates.alwaysFalse(), false, false), BOILER_CASING(BasicBlock.BASIC_BLOCK_2, 7, "BoilerCasing", TileEntityBoilerCasing.class, true, Predicates.alwaysFalse(), false, false), diff --git a/src/main/java/mekanism/common/block/states/BlockStateBounding.java b/src/main/java/mekanism/common/block/states/BlockStateBounding.java index cc9aa31d6..f97a1d67d 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateBounding.java +++ b/src/main/java/mekanism/common/block/states/BlockStateBounding.java @@ -1,8 +1,6 @@ package mekanism.common.block.states; -import mekanism.common.MekanismBlocks; import mekanism.common.block.BlockBounding; - import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.BlockState; diff --git a/src/main/java/mekanism/common/block/states/BlockStateEnergyCube.java b/src/main/java/mekanism/common/block/states/BlockStateEnergyCube.java index bdc4e0809..504e30622 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateEnergyCube.java +++ b/src/main/java/mekanism/common/block/states/BlockStateEnergyCube.java @@ -1,10 +1,7 @@ package mekanism.common.block.states; -import mekanism.common.MekanismBlocks; import mekanism.common.Tier; import mekanism.common.block.BlockEnergyCube; - -import net.minecraft.block.Block; import net.minecraft.block.properties.PropertyEnum; /** diff --git a/src/main/java/mekanism/common/block/states/BlockStateOre.java b/src/main/java/mekanism/common/block/states/BlockStateOre.java index e632fcc22..c413b5294 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateOre.java +++ b/src/main/java/mekanism/common/block/states/BlockStateOre.java @@ -1,8 +1,6 @@ package mekanism.common.block.states; -import mekanism.common.MekanismBlocks; import mekanism.common.block.BlockOre; - import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockState; import net.minecraft.util.IStringSerializable; diff --git a/src/main/java/mekanism/common/block/states/BlockStatePlastic.java b/src/main/java/mekanism/common/block/states/BlockStatePlastic.java index b375f9bb8..0f19d8ccc 100644 --- a/src/main/java/mekanism/common/block/states/BlockStatePlastic.java +++ b/src/main/java/mekanism/common/block/states/BlockStatePlastic.java @@ -1,11 +1,6 @@ package mekanism.common.block.states; -import mekanism.api.EnumColor; -import mekanism.common.MekanismBlocks; import mekanism.common.block.BlockPlastic; - -import net.minecraft.block.Block; -import net.minecraft.block.properties.PropertyDirection; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/mekanism/common/capabilities/CableOutputter.java b/src/main/java/mekanism/common/capabilities/CableOutputter.java index c732b3712..e295e1d74 100644 --- a/src/main/java/mekanism/common/capabilities/CableOutputter.java +++ b/src/main/java/mekanism/common/capabilities/CableOutputter.java @@ -2,11 +2,8 @@ package mekanism.common.capabilities; import mekanism.api.energy.ICableOutputter; import mekanism.common.capabilities.StorageHelper.NullStorage; - -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.CapabilityManager; -import net.minecraftforge.common.util.INBTSerializable; /** * Created by ben on 30/04/16. diff --git a/src/main/java/mekanism/common/capabilities/Capabilities.java b/src/main/java/mekanism/common/capabilities/Capabilities.java index ac6c6ca47..ef096d49b 100644 --- a/src/main/java/mekanism/common/capabilities/Capabilities.java +++ b/src/main/java/mekanism/common/capabilities/Capabilities.java @@ -11,7 +11,6 @@ import mekanism.api.transmitters.IBlockableConnection; import mekanism.api.transmitters.IGridTransmitter; import mekanism.common.base.ILogisticalTransporter; import mekanism.common.base.ITileNetwork; - import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.CapabilityInject; diff --git a/src/main/java/mekanism/common/capabilities/GridTransmitterTile.java b/src/main/java/mekanism/common/capabilities/GridTransmitterTile.java index 18bb51e5d..e7e648d6f 100644 --- a/src/main/java/mekanism/common/capabilities/GridTransmitterTile.java +++ b/src/main/java/mekanism/common/capabilities/GridTransmitterTile.java @@ -7,7 +7,6 @@ import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; import mekanism.common.capabilities.StorageHelper.NullStorage; - import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.CapabilityManager; diff --git a/src/main/java/mekanism/common/capabilities/LogisticalTransporter.java b/src/main/java/mekanism/common/capabilities/LogisticalTransporter.java index 53141a660..79320a011 100644 --- a/src/main/java/mekanism/common/capabilities/LogisticalTransporter.java +++ b/src/main/java/mekanism/common/capabilities/LogisticalTransporter.java @@ -10,7 +10,6 @@ import mekanism.common.base.ILogisticalTransporter; import mekanism.common.capabilities.StorageHelper.NullStorage; import mekanism.common.content.transporter.TransporterStack; import mekanism.common.tile.TileEntityLogisticalSorter; - import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/capabilities/StrictEnergyAcceptor.java b/src/main/java/mekanism/common/capabilities/StrictEnergyAcceptor.java index 9514b324a..2b15462bd 100644 --- a/src/main/java/mekanism/common/capabilities/StrictEnergyAcceptor.java +++ b/src/main/java/mekanism/common/capabilities/StrictEnergyAcceptor.java @@ -2,7 +2,6 @@ package mekanism.common.capabilities; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.common.capabilities.StorageHelper.DefaultStorage; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.CapabilityManager; diff --git a/src/main/java/mekanism/common/capabilities/StrictEnergyStorage.java b/src/main/java/mekanism/common/capabilities/StrictEnergyStorage.java index 2263f5664..44dd379ab 100644 --- a/src/main/java/mekanism/common/capabilities/StrictEnergyStorage.java +++ b/src/main/java/mekanism/common/capabilities/StrictEnergyStorage.java @@ -2,7 +2,6 @@ package mekanism.common.capabilities; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.capabilities.StorageHelper.DefaultStorage; - import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.capabilities.CapabilityManager; import net.minecraftforge.common.util.INBTSerializable; diff --git a/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java b/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java index 4c262820f..d3ea5564d 100644 --- a/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java @@ -9,9 +9,6 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; - -import io.netty.buffer.ByteBuf; public class TItemStackFilter extends TransporterFilter { diff --git a/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java b/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java index 26a3064da..752407da1 100644 --- a/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java @@ -12,9 +12,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; - -import io.netty.buffer.ByteBuf; public class TMaterialFilter extends TransporterFilter { diff --git a/src/main/java/mekanism/common/content/transporter/TModIDFilter.java b/src/main/java/mekanism/common/content/transporter/TModIDFilter.java index 3574c4873..5d62a3b3c 100644 --- a/src/main/java/mekanism/common/content/transporter/TModIDFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TModIDFilter.java @@ -8,9 +8,6 @@ import mekanism.common.PacketHandler; import mekanism.common.content.transporter.Finder.ModIDFinder; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; - -import io.netty.buffer.ByteBuf; public class TModIDFilter extends TransporterFilter { diff --git a/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java b/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java index de9a922d6..874256d86 100644 --- a/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java @@ -8,9 +8,6 @@ import mekanism.common.PacketHandler; import mekanism.common.content.transporter.Finder.OreDictFinder; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; - -import io.netty.buffer.ByteBuf; public class TOreDictFilter extends TransporterFilter { diff --git a/src/main/java/mekanism/common/content/transporter/TransporterManager.java b/src/main/java/mekanism/common/content/transporter/TransporterManager.java index 82a0a8a4e..0d81f4cc1 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterManager.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterManager.java @@ -20,8 +20,8 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; import net.minecraftforge.fml.common.Loader; +import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; public class TransporterManager { diff --git a/src/main/java/mekanism/common/integration/CCPeripheral.java b/src/main/java/mekanism/common/integration/CCPeripheral.java index 3d69d3085..73a606a8a 100644 --- a/src/main/java/mekanism/common/integration/CCPeripheral.java +++ b/src/main/java/mekanism/common/integration/CCPeripheral.java @@ -1,6 +1,8 @@ package mekanism.common.integration; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional; import dan200.computercraft.api.lua.ILuaContext; @@ -8,8 +10,6 @@ import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IPeripheral; import dan200.computercraft.api.peripheral.IPeripheralProvider; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; /** * Created by aidancbrady on 7/20/15. diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index 0079f2405..d706bafd3 100644 --- a/src/main/java/mekanism/common/integration/MekanismHooks.java +++ b/src/main/java/mekanism/common/integration/MekanismHooks.java @@ -10,7 +10,6 @@ import java.util.List; import java.util.Map; import li.cil.oc.api.Driver; -import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; import mekanism.common.MekanismItems; import mekanism.common.Resource; diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java index 1787c2a7a..0b559f245 100644 --- a/src/main/java/mekanism/common/integration/OreDictManager.java +++ b/src/main/java/mekanism/common/integration/OreDictManager.java @@ -26,8 +26,8 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.fml.common.Optional.Method; +import net.minecraftforge.oredict.OreDictionary; public final class OreDictManager { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerPersonalChest.java b/src/main/java/mekanism/common/inventory/container/ContainerPersonalChest.java index 44180ac5d..3114ac6ef 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerPersonalChest.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerPersonalChest.java @@ -1,7 +1,6 @@ package mekanism.common.inventory.container; import invtweaks.api.container.ChestContainer; -import mekanism.common.block.states.BlockStateMachine; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.inventory.slot.SlotPersonalChest; import mekanism.common.tile.TileEntityPersonalChest; diff --git a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java index 7a6e8d75e..08b00ed79 100644 --- a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java +++ b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java @@ -22,9 +22,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentText; import net.minecraft.util.DamageSource; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import net.minecraft.util.EnumFacing; import net.minecraftforge.event.entity.player.UseHoeEvent; import net.minecraftforge.fml.common.eventhandler.Event.Result; diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 3dd6891a4..0c981034f 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -39,12 +39,12 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants.NBT; -import cofh.api.energy.IEnergyContainerItem; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; import net.minecraftforge.fml.common.Optional.Method; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import cofh.api.energy.IEnergyContainerItem; @InterfaceList({ @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index c16229929..06f0f7e3f 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -9,14 +9,14 @@ import java.util.Map; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.Range4D; import mekanism.api.MekanismConfig.general; +import mekanism.api.Range4D; 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.Mekanism; import mekanism.common.Upgrade; import mekanism.common.base.IFactory; import mekanism.common.base.IRedstoneControl; diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java index a870d43ad..7464c2dd9 100644 --- a/src/main/java/mekanism/common/item/ItemEnergized.java +++ b/src/main/java/mekanism/common/item/ItemEnergized.java @@ -17,10 +17,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import cofh.api.energy.IEnergyContainerItem; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; import net.minecraftforge.fml.common.Optional.Method; +import cofh.api.energy.IEnergyContainerItem; @InterfaceList({ @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index e1545c460..61961d305 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -26,13 +26,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.entity.living.LivingAttackEvent; -import cofh.api.energy.IEnergyContainerItem; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; import net.minecraftforge.fml.common.Optional.Method; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import cofh.api.energy.IEnergyContainerItem; @InterfaceList({ @Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2") diff --git a/src/main/java/mekanism/common/item/ItemGaugeDropper.java b/src/main/java/mekanism/common/item/ItemGaugeDropper.java index be3fe256d..0409e1f51 100644 --- a/src/main/java/mekanism/common/item/ItemGaugeDropper.java +++ b/src/main/java/mekanism/common/item/ItemGaugeDropper.java @@ -13,8 +13,6 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/mekanism/common/item/ItemJetpack.java b/src/main/java/mekanism/common/item/ItemJetpack.java index 1efd23468..4f75d366b 100644 --- a/src/main/java/mekanism/common/item/ItemJetpack.java +++ b/src/main/java/mekanism/common/item/ItemJetpack.java @@ -37,12 +37,6 @@ public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor super(EnumHelper.addArmorMaterial("JETPACK", "jetpack", 0, new int[] {0, 0, 0, 0}, 0), 0, 1); setCreativeTab(Mekanism.tabMekanism); } - -/* - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) {} -*/ @Override public boolean showDurabilityBar(ItemStack stack) @@ -221,7 +215,6 @@ public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor { ItemStack empty = new ItemStack(this); setGas(empty, null); - empty.setItemDamage(100); return empty; } @@ -230,7 +223,6 @@ public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor { ItemStack empty = new ItemStack(this); setGas(empty, null); - empty.setItemDamage(100); list.add(empty); ItemStack filled = new ItemStack(this); diff --git a/src/main/java/mekanism/common/item/ItemNetworkReader.java b/src/main/java/mekanism/common/item/ItemNetworkReader.java index b02bf255b..13ded4385 100644 --- a/src/main/java/mekanism/common/item/ItemNetworkReader.java +++ b/src/main/java/mekanism/common/item/ItemNetworkReader.java @@ -11,14 +11,13 @@ import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmitterNetworkRegistry; import mekanism.common.capabilities.Capabilities; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentText; -import net.minecraft.world.World; import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; public class ItemNetworkReader extends ItemEnergized { diff --git a/src/main/java/mekanism/common/item/ItemUpgrade.java b/src/main/java/mekanism/common/item/ItemUpgrade.java index 03930846b..d9ff36717 100644 --- a/src/main/java/mekanism/common/item/ItemUpgrade.java +++ b/src/main/java/mekanism/common/item/ItemUpgrade.java @@ -9,12 +9,11 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; - -import org.lwjgl.input.Keyboard; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.input.Keyboard; + public class ItemUpgrade extends ItemMekanism implements IUpgradeItem { private Upgrade upgrade; diff --git a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java index cd76ea190..986f7ff37 100644 --- a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java @@ -2,19 +2,6 @@ package mekanism.common.multipart; import java.util.List; -import mekanism.api.EnumColor; -import mekanism.common.Mekanism; -import mekanism.common.util.LangUtils; -//import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.StatCollector; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; -import net.minecraft.util.EnumFacing; /* import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; @@ -25,10 +12,19 @@ import codechicken.multipart.TileMultipart; */ import mcmultipart.item.ItemMultiPart; import mcmultipart.multipart.IMultipart; -import mcmultipart.multipart.IMultipartContainer; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import mekanism.api.EnumColor; +import mekanism.common.Mekanism; +import mekanism.common.util.LangUtils; +//import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.StatCollector; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; public class ItemGlowPanel extends ItemMultiPart { diff --git a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java index f07a4ea76..740e50a58 100644 --- a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java @@ -2,6 +2,8 @@ package mekanism.common.multipart; import java.util.List; +import mcmultipart.item.ItemMultiPart; +import mcmultipart.multipart.IMultipart; import mekanism.api.EnumColor; import mekanism.api.transmitters.TransmissionType; import mekanism.client.MekKeyHandler; @@ -18,9 +20,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import net.minecraft.util.EnumFacing; /* import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; @@ -30,9 +32,6 @@ import codechicken.multipart.TMultiPart; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import mcmultipart.item.ItemMultiPart; -import mcmultipart.multipart.IMultipart; - public class ItemPartTransmitter extends ItemMultiPart { public ItemPartTransmitter() diff --git a/src/main/java/mekanism/common/multipart/MultipartMekanism.java b/src/main/java/mekanism/common/multipart/MultipartMekanism.java index 52c043517..5eb7b12ee 100644 --- a/src/main/java/mekanism/common/multipart/MultipartMekanism.java +++ b/src/main/java/mekanism/common/multipart/MultipartMekanism.java @@ -2,10 +2,14 @@ package mekanism.common.multipart; import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_1; import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_2; +import mcmultipart.multipart.IMultipart; +import mcmultipart.multipart.IPartFactory; +import mcmultipart.multipart.MultipartRegistry; import mekanism.common.MekanismBlocks; import mekanism.common.Tier; import mekanism.common.block.states.BlockStateMachine.MachineType; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.event.FMLInterModComms; /* import codechicken.microblock.BlockMicroMaterial; import codechicken.microblock.MicroMaterialRegistry; @@ -14,13 +18,6 @@ import codechicken.multipart.MultiPartRegistry.IPartFactory; import codechicken.multipart.MultipartGenerator; import codechicken.multipart.TMultiPart; */ -import mcmultipart.microblock.BlockMicroMaterial; -import mcmultipart.microblock.MicroblockRegistry; -import mcmultipart.multipart.IMultipart; -import mcmultipart.multipart.IPartFactory; -import mcmultipart.multipart.MultipartRegistry; - -import net.minecraftforge.fml.common.event.FMLInterModComms; public class MultipartMekanism implements IPartFactory { diff --git a/src/main/java/mekanism/common/multipart/MultipartTransmitter.java b/src/main/java/mekanism/common/multipart/MultipartTransmitter.java index c9998facf..aec7d9a82 100644 --- a/src/main/java/mekanism/common/multipart/MultipartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/MultipartTransmitter.java @@ -2,6 +2,7 @@ package mekanism.common.multipart; import java.util.Collection; +import mcmultipart.multipart.IMultipartContainer; import mekanism.api.Coord4D; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; @@ -9,10 +10,8 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.common.capabilities.Capabilities; import mekanism.common.transmitters.Transmitter; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; import net.minecraft.util.EnumFacing; - -import mcmultipart.multipart.IMultipartContainer; +import net.minecraft.world.World; public class MultipartTransmitter> extends Transmitter { diff --git a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java index 4b03b9f2f..dc69975f6 100644 --- a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java @@ -11,7 +11,6 @@ import mekanism.common.Mekanism; import mekanism.common.content.transporter.TransporterStack; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.LangUtils; - import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/multipart/PartGlowPanel.java b/src/main/java/mekanism/common/multipart/PartGlowPanel.java index 9cd04f1b6..8ca8469e6 100644 --- a/src/main/java/mekanism/common/multipart/PartGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/PartGlowPanel.java @@ -3,19 +3,21 @@ package mekanism.common.multipart; import java.util.Collections; import java.util.List; +import mcmultipart.microblock.IMicroblock.IFaceMicroblock; +import mcmultipart.multipart.IMultipart; +import mcmultipart.multipart.IOccludingPart; +import mcmultipart.multipart.Multipart; +import mcmultipart.multipart.PartSlot; +import mcmultipart.raytrace.PartMOP; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.client.render.RenderGlowPanel; import mekanism.common.MekanismItems; -import net.minecraft.client.particle.EffectRenderer; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; //import net.minecraft.util.IIcon; import net.minecraft.network.PacketBuffer; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.EnumFacing; /* import codechicken.lib.data.MCDataInput; @@ -33,17 +35,6 @@ import codechicken.multipart.NormalOcclusionTest; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; */ -import mcmultipart.block.TileMultipart; -import mcmultipart.microblock.IMicroblock; -import mcmultipart.microblock.IMicroblock.IFaceMicroblock; -import mcmultipart.multipart.IMultipart; -import mcmultipart.multipart.IOccludingPart; -import mcmultipart.multipart.Multipart; -import mcmultipart.multipart.PartSlot; -import mcmultipart.raytrace.PartMOP; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class PartGlowPanel extends Multipart implements IOccludingPart//, JIconHitEffects { diff --git a/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java b/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java index e3fcdf950..d4501766b 100644 --- a/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java +++ b/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java @@ -3,12 +3,10 @@ package mekanism.common.multipart; import java.util.Collection; import mekanism.api.transmitters.TransmissionType; -import mekanism.client.render.RenderPartTransmitter; import mekanism.common.FluidNetwork; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.PipeTier; -import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; //import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -29,8 +27,6 @@ import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.lib.vec.Vector3; */ -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class PartMechanicalPipe extends PartTransmitter implements IFluidHandler { diff --git a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java index b17a9fbc4..5f9825b18 100644 --- a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java +++ b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java @@ -9,11 +9,9 @@ import mekanism.api.gas.GasTank; import mekanism.api.gas.GasTransmission; import mekanism.api.gas.IGasHandler; import mekanism.api.transmitters.TransmissionType; -import mekanism.client.render.RenderPartTransmitter; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.TubeTier; -import mekanism.common.util.MekanismUtils; //import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; @@ -27,8 +25,6 @@ import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.lib.vec.Vector3; */ -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class PartPressurizedTube extends PartTransmitter implements IGasHandler { diff --git a/src/main/java/mekanism/common/multipart/PartTransmitter.java b/src/main/java/mekanism/common/multipart/PartTransmitter.java index a663bd4d5..1e1c4101d 100644 --- a/src/main/java/mekanism/common/multipart/PartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/PartTransmitter.java @@ -11,10 +11,9 @@ import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmitterNetworkRegistry; import mekanism.common.capabilities.Capabilities; - import net.minecraft.entity.player.EntityPlayer; -import net.minecraftforge.common.capabilities.Capability; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; public abstract class PartTransmitter> extends PartSidedPipe implements IAlloyInteraction { diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java index d71f79cff..cc7c83b07 100644 --- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java +++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java @@ -5,7 +5,6 @@ import ic2.api.energy.tile.IEnergySource; import java.util.Collection; import java.util.List; -import mekanism.common.capabilities.Capabilities; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.EnergyStack; import mekanism.api.energy.IStrictEnergyAcceptor; @@ -16,6 +15,7 @@ import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.CableTier; import mekanism.common.base.EnergyAcceptorWrapper; +import mekanism.common.capabilities.Capabilities; import mekanism.common.util.CableUtils; import mekanism.common.util.MekanismUtils; //import net.minecraft.client.renderer.texture.IIconRegister; @@ -26,6 +26,7 @@ import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; //import net.minecraft.util.IIcon; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; /* import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; @@ -34,8 +35,6 @@ import codechicken.lib.vec.Vector3; import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyProvider; -import net.minecraftforge.common.capabilities.Capability; - public class PartUniversalCable extends PartTransmitter implements IStrictEnergyAcceptor, IEnergyHandler { public Tier.CableTier tier; diff --git a/src/main/java/mekanism/common/multipart/PlasticMicroMaterial.java b/src/main/java/mekanism/common/multipart/PlasticMicroMaterial.java index 84d8ab5ed..4dbf6287e 100644 --- a/src/main/java/mekanism/common/multipart/PlasticMicroMaterial.java +++ b/src/main/java/mekanism/common/multipart/PlasticMicroMaterial.java @@ -1,9 +1,7 @@ package mekanism.common.multipart; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; - import mcmultipart.microblock.BlockMicroMaterial; +import net.minecraft.block.state.IBlockState; public class PlasticMicroMaterial extends BlockMicroMaterial { diff --git a/src/main/java/mekanism/common/multipart/TransmitterType.java b/src/main/java/mekanism/common/multipart/TransmitterType.java index bc9d010b3..4751e9e50 100644 --- a/src/main/java/mekanism/common/multipart/TransmitterType.java +++ b/src/main/java/mekanism/common/multipart/TransmitterType.java @@ -2,7 +2,6 @@ package mekanism.common.multipart; import mekanism.api.transmitters.TransmissionType; import mekanism.common.Tier.BaseTier; - import net.minecraft.client.renderer.texture.TextureAtlasSprite; public enum TransmitterType diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 4618f08ff..53be4f315 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -8,8 +8,8 @@ import mekanism.api.util.UnitDisplayUtils.EnergyType; import mekanism.common.Mekanism; import mekanism.common.Tier; import mekanism.common.base.IModule; -import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.block.states.BlockStateMachine; +import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.network.PacketConfigSync.ConfigSyncMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; diff --git a/src/main/java/mekanism/common/network/PacketTileEntity.java b/src/main/java/mekanism/common/network/PacketTileEntity.java index afe4b800c..c455d02bf 100644 --- a/src/main/java/mekanism/common/network/PacketTileEntity.java +++ b/src/main/java/mekanism/common/network/PacketTileEntity.java @@ -11,7 +11,6 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk.EnumCreateEntityType; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; diff --git a/src/main/java/mekanism/common/recipe/ShapedMekanismRecipe.java b/src/main/java/mekanism/common/recipe/ShapedMekanismRecipe.java index dbbc45a47..b899ef679 100644 --- a/src/main/java/mekanism/common/recipe/ShapedMekanismRecipe.java +++ b/src/main/java/mekanism/common/recipe/ShapedMekanismRecipe.java @@ -1,7 +1,5 @@ package mekanism.common.recipe; -import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; import mekanism.common.Mekanism; diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java index 328816a52..a14c14679 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java @@ -10,19 +10,17 @@ import mekanism.common.integration.IComputerIntegration; import mekanism.common.util.InventoryUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; -import net.minecraft.inventory.InventoryBasic; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; -import cofh.api.energy.IEnergyHandler; -import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; import net.minecraftforge.fml.common.Optional.Method; +import cofh.api.energy.IEnergyHandler; @InterfaceList({ @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2") diff --git a/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java b/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java index c836717d1..997c8224c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java +++ b/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java @@ -14,9 +14,7 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.IntegerInput; import mekanism.common.recipe.machines.AmbientGasRecipe; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IChatComponent; public class TileEntityAmbientAccumulator extends TileEntityContainerBlock implements IGasHandler, ITubeConnection { diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index b804f0614..e677ad76b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -31,9 +31,8 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; import net.minecraft.util.ITickable; - -import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; import net.minecraftforge.fml.common.Optional.Interface; +import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; @Interface(iface = "powercrystals.minefactoryreloaded.api.IDeepStorageUnit", modid = "MineFactoryReloaded") public class TileEntityBin extends TileEntityBasicBlock implements ISidedInventory, IActiveState, IDeepStorageUnit, IConfigurable, ITickable diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index f3fc0730f..aaf032918 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -1,7 +1,6 @@ package mekanism.common.tile; import io.netty.buffer.ByteBuf; -import io.netty.buffer.ByteBufUtil; import java.util.ArrayList; import java.util.HashSet; @@ -24,10 +23,8 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.common.network.ByteBufUtils; public class TileEntityBoilerCasing extends TileEntityMultiblock implements IFluidContainerManager, IHeatTransfer { diff --git a/src/main/java/mekanism/common/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java index fda840607..ae63a78f9 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChargepad.java +++ b/src/main/java/mekanism/common/tile/TileEntityChargepad.java @@ -26,10 +26,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; - -import cofh.api.energy.IEnergyContainerItem; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import cofh.api.energy.IEnergyContainerItem; public class TileEntityChargepad extends TileEntityNoisyElectricBlock { diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index b0e40deb0..8e6617df8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -56,10 +56,10 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.WorldServer; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.Constants.NBT; -import net.minecraft.util.EnumFacing; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java index 4ff595f82..10969a22c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java @@ -10,14 +10,14 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.EnumSet; -import mekanism.common.capabilities.Capabilities; import mekanism.api.MekanismConfig.general; import mekanism.common.base.IEnergyWrapper; +import mekanism.common.capabilities.Capabilities; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.MinecraftForge; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.Optional.Method; diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index 841b59cc2..084b64e12 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -44,8 +44,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumFacing.Axis; -import net.minecraft.util.EnumParticleTypes; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index 1c69b7851..aa69e2664 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -27,9 +27,8 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing.Axis; -import net.minecraft.util.MathHelper; import net.minecraft.util.EnumFacing; +import net.minecraft.util.MathHelper; public class TileEntityEnergyCube extends TileEntityElectricBlock implements IComputerIntegration, IRedstoneControl, ISideConfiguration, ISecurityTile { diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 645911f83..672f4eda6 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -37,8 +37,8 @@ import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; import mekanism.common.base.SoundWrapper; -import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.block.states.BlockStateMachine; +import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java index 514eb13ec..c4daf2d5e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java @@ -37,8 +37,6 @@ import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fml.common.network.ByteBufUtils; -import java.util.ArrayList; - public class TileEntityFluidTank extends TileEntityContainerBlock implements IActiveState, IConfigurable, IFluidHandler, ISustainedTank, IFluidContainerManager, ITankManager, ISecurityTile { public boolean isActive; diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index 4b6bcde1f..410e2a8da 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -16,7 +16,6 @@ import mekanism.common.Upgrade; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedTank; 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; @@ -33,8 +32,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.ChatComponentText; -import net.minecraftforge.common.util.Constants.NBT; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index 2f403ea93..9cfcbf9ed 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -32,8 +32,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.MathHelper; import net.minecraft.util.EnumFacing; +import net.minecraft.util.MathHelper; public class TileEntityGasTank extends TileEntityContainerBlock implements IGasHandler, ITubeConnection, IRedstoneControl, ISideConfiguration, ISecurityTile { diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java index 003c10f41..5cef11e50 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionCasing.java @@ -4,11 +4,11 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; -import mekanism.common.capabilities.Capabilities; import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.Mekanism; +import mekanism.common.capabilities.Capabilities; import mekanism.common.content.matrix.MatrixCache; import mekanism.common.content.matrix.MatrixUpdateProtocol; import mekanism.common.content.matrix.SynchronizedMatrixData; diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionCell.java b/src/main/java/mekanism/common/tile/TileEntityInductionCell.java index 1775b51e9..486f1d3e2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionCell.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionCell.java @@ -4,9 +4,9 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; -import mekanism.common.capabilities.Capabilities; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.Tier.InductionCellTier; +import mekanism.common.capabilities.Capabilities; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index 74e86d60a..d90dba879 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -10,7 +10,6 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.EnumSet; -import mekanism.common.capabilities.Capabilities; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigurable; @@ -19,6 +18,7 @@ import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; import mekanism.common.base.IEnergyWrapper; +import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.CableUtils; import mekanism.common.util.LangUtils; @@ -27,8 +27,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; -import net.minecraftforge.common.MinecraftForge; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; diff --git a/src/main/java/mekanism/common/tile/TileEntityLaser.java b/src/main/java/mekanism/common/tile/TileEntityLaser.java index c03bba1c3..b03f1db23 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaser.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaser.java @@ -20,8 +20,8 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.EnumFacing; +import net.minecraft.util.MovingObjectPosition; public class TileEntityLaser extends TileEntityNoisyElectricBlock implements IActiveState { diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java index df069d4d8..8de86340e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java @@ -4,7 +4,6 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; -import mekanism.common.capabilities.Capabilities; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.ICableOutputter; @@ -14,6 +13,7 @@ import mekanism.common.LaserManager; import mekanism.common.LaserManager.LaserInfo; import mekanism.common.Mekanism; import mekanism.common.base.IRedstoneControl; +import mekanism.common.capabilities.Capabilities; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; @@ -23,8 +23,8 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.EnumFacing; +import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.capabilities.Capability; public class TileEntityLaserAmplifier extends TileEntityContainerBlock implements ILaserReceptor, IRedstoneControl, ICableOutputter, IStrictEnergyStorage, IComputerIntegration, ISecurityTile diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java index 8fd18c6af..f11b97dab 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java @@ -20,8 +20,8 @@ import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.EnumFacing; +import net.minecraft.util.MovingObjectPosition; public class TileEntityLaserTractorBeam extends TileEntityContainerBlock implements ILaserReceptor, ISecurityTile { diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index 348fe102f..c8b771123 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -36,8 +36,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.Constants.NBT; import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.util.Constants.NBT; public class TileEntityLogisticalSorter extends TileEntityElectricBlock implements IRedstoneControl, IActiveState, ISpecialConfigData, ISustainedData, ISecurityTile { diff --git a/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java index a7dba3064..6d21a9630 100644 --- a/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java @@ -1,7 +1,6 @@ package mekanism.common.tile; import mekanism.api.MekanismConfig.client; -import mekanism.api.Pos3D; import mekanism.client.HolidayManager; import mekanism.client.sound.ISoundSource; import mekanism.common.Upgrade; diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index 7eede878f..0f97363a3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -33,8 +33,8 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java index f73f66fbf..0c5442d6a 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java @@ -30,8 +30,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.world.biome.BiomeGenDesert; import net.minecraft.util.EnumFacing; +import net.minecraft.world.biome.BiomeGenDesert; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java b/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java index 35f923c57..2eed930f3 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java +++ b/src/main/java/mekanism/common/tile/TileEntitySuperheatingElement.java @@ -9,7 +9,6 @@ import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.multiblock.TileEntityInternalMultiblock; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; - import net.minecraft.util.ITickable; public class TileEntitySuperheatingElement extends TileEntityInternalMultiblock implements ITickable diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index bbc626c99..77ea87a42 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -9,17 +9,16 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import mekanism.common.capabilities.Capabilities; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.transmitters.TransmissionType; import mekanism.common.base.IEnergyWrapper; +import mekanism.common.capabilities.Capabilities; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; - import cofh.api.energy.IEnergyConnection; import cofh.api.energy.IEnergyProvider; import cofh.api.energy.IEnergyReceiver; diff --git a/src/main/java/mekanism/common/util/HeatUtils.java b/src/main/java/mekanism/common/util/HeatUtils.java index b8fdd1741..f41ae9c1f 100644 --- a/src/main/java/mekanism/common/util/HeatUtils.java +++ b/src/main/java/mekanism/common/util/HeatUtils.java @@ -2,7 +2,6 @@ package mekanism.common.util; import mekanism.api.IHeatTransfer; import mekanism.common.capabilities.Capabilities; - import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.ICapabilityProvider; diff --git a/src/main/java/mekanism/common/util/MinerUtils.java b/src/main/java/mekanism/common/util/MinerUtils.java index 72efd00f5..9fdc1b2a5 100644 --- a/src/main/java/mekanism/common/util/MinerUtils.java +++ b/src/main/java/mekanism/common/util/MinerUtils.java @@ -6,7 +6,6 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.util.ListUtils; import net.minecraft.block.Block; -import net.minecraft.block.BlockSand; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/util/PipeUtils.java b/src/main/java/mekanism/common/util/PipeUtils.java index e8fff7bd2..7eb3364cd 100644 --- a/src/main/java/mekanism/common/util/PipeUtils.java +++ b/src/main/java/mekanism/common/util/PipeUtils.java @@ -6,7 +6,6 @@ import java.util.Collections; import java.util.List; import mekanism.common.capabilities.Capabilities; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java index e601af243..dc4916d92 100644 --- a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java +++ b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java @@ -37,55 +37,55 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - GL11.glPushMatrix(); - GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); + GlStateManager.pushMatrix(); + GlStateManager.rotate(90F, 0.0F, 1.0F, 0.0F); if(block == GeneratorsBlocks.Generator) { if(metadata == GeneratorType.BIO_GENERATOR.meta) { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "BioGenerator.png")); bioGenerator.render(0.0625F); } else if(metadata == GeneratorType.ADVANCED_SOLAR_GENERATOR.meta) { - 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); + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(90F, 0.0F, 1.0F, 0.0F); + GlStateManager.translate(0.0F, 0.2F, 0.0F); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "AdvancedSolarGenerator.png")); advancedSolarGenerator.render(0.022F); } else if(metadata == GeneratorType.SOLAR_GENERATOR.meta) { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(90F, 0.0F, -1.0F, 0.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarGenerator.png")); solarGenerator.render(0.0625F); } else if(metadata == GeneratorType.HEAT_GENERATOR.meta) { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "HeatGenerator.png")); heatGenerator.render(0.0625F, false, mc.renderEngine); } else if(metadata == GeneratorType.GAS_GENERATOR.meta) { - GL11.glRotatef(180F, 0.0F, 1.0F, 1.0F); - GL11.glRotatef(90F, -1.0F, 0.0F, 0.0F); + GlStateManager.rotate(180F, 0.0F, 1.0F, 1.0F); + GlStateManager.rotate(90F, -1.0F, 0.0F, 0.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); - GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(180F, 0.0F, 1.0F, 0.0F); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasGenerator.png")); gasGenerator.render(0.0625F); } else if(metadata == 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); + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(180F, 0.0F, 1.0F, 0.0F); + GlStateManager.translate(0.0F, 0.4F, 0.0F); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "WindGenerator.png")); windGenerator.render(0.016F, 0); } @@ -95,7 +95,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler } } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } @Override diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java b/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java index 13420e752..68034f5a1 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java @@ -49,11 +49,11 @@ public class GuiReactorLogicAdapter extends GuiMekanism for(ReactorLogic type : ReactorLogic.values()) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), type.getRenderStack(), 27, 35 + (22*type.ordinal())); GL11.glDisable(GL11.GL_LIGHTING); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); fontRendererObj.drawString(EnumColor.WHITE + type.getLocalizedName(), 46, 34+(22*type.ordinal()), 0x404040); } diff --git a/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java b/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java index 7796b0de9..2a57cf5a4 100644 --- a/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java @@ -144,21 +144,21 @@ public class ModelHeatGenerator extends ModelBase public void render(float size, boolean on, TextureManager manager) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); MekanismRenderer.blendOn(); doRender(size); manager.bindTexture(on ? OVERLAY_ON : OVERLAY_OFF); - GL11.glScalef(1.001F, 1.001F, 1.001F); - GL11.glTranslatef(0, -0.0011F, 0); + GlStateManager.scale(1.001F, 1.001F, 1.001F); + GlStateManager.translate(0, -0.0011F, 0); MekanismRenderer.glowOn(); doRender(size); MekanismRenderer.glowOff(); MekanismRenderer.blendOff(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } private void doRender(float size) diff --git a/src/main/java/mekanism/generators/client/model/ModelTurbine.java b/src/main/java/mekanism/generators/client/model/ModelTurbine.java index b5acb3ebb..d44b1f0ff 100644 --- a/src/main/java/mekanism/generators/client/model/ModelTurbine.java +++ b/src/main/java/mekanism/generators/client/model/ModelTurbine.java @@ -62,9 +62,9 @@ public class ModelTurbine extends ModelBase public void render(float size, int index) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); - GL11.glRotatef(index*5, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(index*5, 0.0F, 1.0F, 0.0F); float scale = index*0.5F; float widthDiv = 16; @@ -74,35 +74,35 @@ public class ModelTurbine extends ModelBase extension_east.render(size); extension_north.render(size); - GL11.glPushMatrix(); - GL11.glTranslatef(-0.25F, 0.0F, 0.0F); - GL11.glScalef(1.0F + scale, 1.0F, 1.0F + scale/widthDiv); - GL11.glTranslatef(0.25F, 0.0F, 0.0F); + GlStateManager.pushMatrix(); + GlStateManager.translate(-0.25F, 0.0F, 0.0F); + GlStateManager.scale(1.0F + scale, 1.0F, 1.0F + scale/widthDiv); + GlStateManager.translate(0.25F, 0.0F, 0.0F); blade_west.render(size); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); - GL11.glPushMatrix(); - GL11.glTranslatef(0.25F, 0.0F, 0.0F); - GL11.glScalef(1.0F + scale, 1.0F, 1.0F + scale/widthDiv); - GL11.glTranslatef(-0.25F, 0.0F, 0.0F); + GlStateManager.pushMatrix(); + GlStateManager.translate(0.25F, 0.0F, 0.0F); + GlStateManager.scale(1.0F + scale, 1.0F, 1.0F + scale/widthDiv); + GlStateManager.translate(-0.25F, 0.0F, 0.0F); blade_east.render(size); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); - GL11.glPushMatrix(); - GL11.glTranslatef(0.0F, 0.0F, -0.25F); - GL11.glScalef(1.0F + scale/widthDiv, 1.0F, 1.0F + scale); - GL11.glTranslatef(0.0F, 0.0F, 0.25F); + GlStateManager.pushMatrix(); + GlStateManager.translate(0.0F, 0.0F, -0.25F); + GlStateManager.scale(1.0F + scale/widthDiv, 1.0F, 1.0F + scale); + GlStateManager.translate(0.0F, 0.0F, 0.25F); blade_north.render(size); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); - GL11.glPushMatrix(); - GL11.glTranslatef(0.0F, 0.0F, 0.25F); - GL11.glScalef(1.0F + scale/widthDiv, 1.0F, 1.0F + scale); - GL11.glTranslatef(0.0F, 0.0F, -0.25F); + GlStateManager.pushMatrix(); + GlStateManager.translate(0.0F, 0.0F, 0.25F); + GlStateManager.scale(1.0F + scale/widthDiv, 1.0F, 1.0F + scale); + GlStateManager.translate(0.0F, 0.0F, -0.25F); blade_south.render(size); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) diff --git a/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java index b1d3fb18b..0fe478efe 100644 --- a/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java @@ -20,21 +20,21 @@ public class RenderAdvancedSolarGenerator extends TileEntitySpecialRenderer 0) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glTranslated(x + 0.5, y - 1, z + 0.5); - GL11.glRotatef(tileEntity.rotationLower, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(tileEntity.rotationLower, 0.0F, 1.0F, 0.0F); model.render(0.0625F, baseIndex); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } if(tileEntity.getHousedBlades() == 2) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); GL11.glTranslated(x + 0.5, y - 0.5, z + 0.5); - GL11.glRotatef(tileEntity.rotationUpper, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(tileEntity.rotationUpper, 0.0F, 1.0F, 0.0F); model.render(0.0625F, baseIndex+1); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/mekanism/generators/client/render/RenderWindGenerator.java b/src/main/java/mekanism/generators/client/render/RenderWindGenerator.java index 7865250a1..ed6b774d0 100644 --- a/src/main/java/mekanism/generators/client/render/RenderWindGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderWindGenerator.java @@ -17,19 +17,19 @@ public class RenderWindGenerator extends TileEntitySpecialRenderer Date: Wed, 11 May 2016 01:10:04 -0400 Subject: [PATCH 12/22] Fixed render transformations --- .../render/item/BakedCustomItemModel.java | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java index acd972e3c..d0a04dd72 100644 --- a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java +++ b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java @@ -120,7 +120,12 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel return; } - GlStateManager.translate(-0.5, -0.5, -0.5); + if(type == TransformType.GUI) + { + GlStateManager.scale(0.625, 0.625, 0.625); + GlStateManager.rotate(30.0F, 1.0F, 0.0F, 0.0F); + GlStateManager.rotate(-45.0F, 0.0F, 1.0F, 0.0F); + } if(stack.getItem() == MekanismItems.Jetpack) { @@ -182,16 +187,15 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel if(type == TransformType.THIRD_PERSON) { - GlStateManager.rotate(-45, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(45, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(50, 1.0F, 0.0F, 0.0F); GlStateManager.scale(2.0F, 2.0F, 2.0F); GlStateManager.translate(0.0F, -0.4F, 0.4F); } else if(type == TransformType.GUI) { - GlStateManager.rotate(225, 0.0F, 1.0F, 0.0F); - GlStateManager.rotate(45, -1.0F, 0.0F, -1.0F); - GlStateManager.scale(0.6F, 0.6F, 0.6F); + GlStateManager.rotate(90, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(45, -1.0F, 0.0F, 0.0F); GlStateManager.translate(0.0F, -0.2F, 0.0F); } else { @@ -220,7 +224,8 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel GlStateManager.rotate(55, 0.0F, 1.0F, 0.0F); } else { - GlStateManager.translate(0.0F, 0.5F, 0.0F); + GlStateManager.translate(0.0F, 0.7F, 0.0F); + GlStateManager.rotate(75, 0.0F, 1.0F, 0.0F); } GlStateManager.scale(2.5F, 2.5F, 2.5F); @@ -228,8 +233,9 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel } else if(type == TransformType.GUI) { - GlStateManager.translate(-0.6F, 0.0F, 0.0F); - GlStateManager.rotate(45, 0.0F, 1.0F, 0.0F); + GlStateManager.translate(0.45F, -0.45F, 0.0F); + GlStateManager.rotate(-45, 0.0F, 1.0F, 0.0F); + GlStateManager.scale(1.4, 1.4, 1.4); } flamethrower.render(0.0625F); From eea39a4845f393990e7e58250592a0387dd5ee12 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 11 May 2016 01:22:39 -0400 Subject: [PATCH 13/22] Fixed glass shadows --- src/main/java/mekanism/common/block/BlockBasic.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index d97e9dc1d..590a15d6d 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -687,6 +687,12 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple { return false; } + + @Override + public boolean isFullCube() + { + return false; + } @Override public int getRenderType() From 3b695c191b89bed81ac366daf87106e3b2f9a717 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 11 May 2016 01:24:44 -0400 Subject: [PATCH 14/22] Fixed lead dust name --- src/main/resources/assets/mekanism/lang/en_US.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index af35071d3..0f0bfd485 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -232,7 +232,7 @@ item.steelDust.name=Steel Dust item.copperDust.name=Copper Dust item.tinDust.name=Tin Dust item.silverDust.name=Silver Dust -//empty +item.leadDust.name=Lead Dust item.sulfurDust.name=Sulfur Dust item.lithiumDust.name=Lithium Dust From 627a2597db84971752abd570d73d4619459ab6e5 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 11 May 2016 01:30:57 -0400 Subject: [PATCH 15/22] Lead Dust fix, turns out I was only calling it once --- src/main/resources/assets/mekanism/lang/en_US.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index af35071d3..0f0bfd485 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -232,7 +232,7 @@ item.steelDust.name=Steel Dust item.copperDust.name=Copper Dust item.tinDust.name=Tin Dust item.silverDust.name=Silver Dust -//empty +item.leadDust.name=Lead Dust item.sulfurDust.name=Sulfur Dust item.lithiumDust.name=Lithium Dust From f4023f8baf2d98be48979752c1a6ede69b3e89d0 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 11 May 2016 07:29:43 -0400 Subject: [PATCH 16/22] Item and Block render of Personal Chest and Solar Neutron Activator --- .../java/mekanism/client/ClientProxy.java | 8 +- .../render/item/BakedCustomItemModel.java | 27 + .../mekanism/blockstates/personal_chest.json | 10 +- .../blockstates/solar_neutron_activator.json | 2 +- .../models/block/solar_neutron_activator.json | 619 ------------------ 5 files changed, 34 insertions(+), 632 deletions(-) delete mode 100644 src/main/resources/assets/mekanism/models/block/solar_neutron_activator.json diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 6d23144c4..81506be17 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -101,6 +101,7 @@ import mekanism.client.render.tileentity.RenderQuantumEntangloporter; import mekanism.client.render.tileentity.RenderResistiveHeater; import mekanism.client.render.tileentity.RenderSecurityDesk; import mekanism.client.render.tileentity.RenderSeismicVibrator; +import mekanism.client.render.tileentity.RenderSolarNeutronActivator; import mekanism.client.render.tileentity.RenderTeleporter; import mekanism.client.render.tileentity.RenderThermalEvaporationController; import mekanism.client.render.tileentity.RenderThermoelectricBoiler; @@ -234,7 +235,8 @@ public class ClientProxy extends CommonProxy public static Map basicResources = new HashMap(); public static final String[] CUSTOM_RENDERS = new String[] {"fluid_tank", "bin_basic", "bin_advanced", "bin_elite", "bin_ultimate", - "Jetpack", "FreeRunners", "AtomicDisassembler", "ScubaTank", "GasMask", "ArmoredJetpack", "Flamethrower"}; + "Jetpack", "FreeRunners", "AtomicDisassembler", "ScubaTank", "GasMask", "ArmoredJetpack", "Flamethrower", "personal_chest", + "solar_neutron_activator"}; @Override public void loadConfiguration() @@ -327,7 +329,7 @@ public class ClientProxy extends CommonProxy //ClientRegistry.registerTileEntity(TileEntityLaser.class, "Laser", new RenderLaser()); ClientRegistry.registerTileEntity(TileEntityLaserAmplifier.class, "LaserAmplifier", new RenderLaserAmplifier()); ClientRegistry.registerTileEntity(TileEntityLaserTractorBeam.class, "LaserTractorBeam", new RenderLaserTractorBeam()); - GameRegistry.registerTileEntity(TileEntitySolarNeutronActivator.class, "SolarNeutronActivator"); + ClientRegistry.registerTileEntity(TileEntitySolarNeutronActivator.class, "SolarNeutronActivator", new RenderSolarNeutronActivator()); GameRegistry.registerTileEntity(TileEntityAmbientAccumulator.class, "AmbientAccumulator"); GameRegistry.registerTileEntity(TileEntityInductionCasing.class, "InductionCasing"); GameRegistry.registerTileEntity(TileEntityInductionPort.class, "InductionPort"); @@ -460,7 +462,7 @@ public class ClientProxy extends CommonProxy } } - if(type == MachineType.FLUID_TANK) + if(type == MachineType.FLUID_TANK || type == MachineType.PERSONAL_CHEST || type == MachineType.SOLAR_NEUTRON_ACTIVATOR) { properties = "inventory"; } diff --git a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java index d0a04dd72..79ea89ba6 100644 --- a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java +++ b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java @@ -12,6 +12,7 @@ import mekanism.client.model.ModelFreeRunners; import mekanism.client.model.ModelGasMask; import mekanism.client.model.ModelJetpack; import mekanism.client.model.ModelScubaTank; +import mekanism.client.model.ModelSolarNeutronActivator; import mekanism.client.render.ctm.ModelChiselBlock; import mekanism.client.render.tileentity.RenderBin; import mekanism.client.render.tileentity.RenderFluidTank; @@ -33,6 +34,7 @@ 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.model.ModelChest; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.block.model.BakedQuad; @@ -52,6 +54,7 @@ import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.fluids.Fluid; import org.apache.commons.lang3.tuple.Pair; +import org.lwjgl.opengl.GL11; public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel { @@ -70,6 +73,8 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel public static ModelFreeRunners freeRunners = new ModelFreeRunners(); public static ModelAtomicDisassembler atomicDisassembler = new ModelAtomicDisassembler(); public static ModelFlamethrower flamethrower = new ModelFlamethrower(); + public static ModelChest personalChest = new ModelChest(); + public static ModelSolarNeutronActivator solarNeutronActivator = new ModelSolarNeutronActivator(); public BakedCustomItemModel(IBakedModel model, ItemStack s) { @@ -116,6 +121,28 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel fluidTankRenderer.render(tier, fluid, targetScale, false, null, -0.5, -0.5, -0.5); GlStateManager.popMatrix(); } + else if(machineType == MachineType.PERSONAL_CHEST) + { + GlStateManager.pushMatrix(); + + GlStateManager.rotate(180F, 0.0F, 1.0F, 0.0F); + GlStateManager.translate(-0.5F, -0.5F, -0.5F); + GlStateManager.translate(0, 1.0F, 1.0F); + GlStateManager.scale(1.0F, -1F, -1F); + + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PersonalChest.png")); + + personalChest.renderAll(); + GlStateManager.popMatrix(); + } + else if(machineType == MachineType.SOLAR_NEUTRON_ACTIVATOR) + { + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + 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); + } return; } diff --git a/src/main/resources/assets/mekanism/blockstates/personal_chest.json b/src/main/resources/assets/mekanism/blockstates/personal_chest.json index 60646b0da..b27ef28bf 100644 --- a/src/main/resources/assets/mekanism/blockstates/personal_chest.json +++ b/src/main/resources/assets/mekanism/blockstates/personal_chest.json @@ -1,15 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "mekanism:nothing", - "textures": { - "front": "mekanism:blocks/fuelwood_heater/FuelwoodHeaterFront", - "west": "mekanism:blocks/fuelwood_heater/FuelwoodHeaterRight", - "east": "mekanism:blocks/fuelwood_heater/FuelwoodHeaterLeft", - "south": "mekanism:blocks/fuelwood_heater/FuelwoodHeaterBack", - "up": "mekanism:blocks/fuelwood_heater/FuelwoodHeaterTop", - "down": "mekanism:blocks/fuelwood_heater/FuelwoodHeaterBottom" - } + "model": "mekanism:nothing" }, "variants": { "facing": { diff --git a/src/main/resources/assets/mekanism/blockstates/solar_neutron_activator.json b/src/main/resources/assets/mekanism/blockstates/solar_neutron_activator.json index 136868436..591d119c5 100644 --- a/src/main/resources/assets/mekanism/blockstates/solar_neutron_activator.json +++ b/src/main/resources/assets/mekanism/blockstates/solar_neutron_activator.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "mekanism:solar_neutron_activator" + "model": "mekanism:nothing" }, "variants": { "facing": { diff --git a/src/main/resources/assets/mekanism/models/block/solar_neutron_activator.json b/src/main/resources/assets/mekanism/models/block/solar_neutron_activator.json deleted file mode 100644 index a64483144..000000000 --- a/src/main/resources/assets/mekanism/models/block/solar_neutron_activator.json +++ /dev/null @@ -1,619 +0,0 @@ -{ - "elements": [ - { - "__comment": "support5", - "from": [0.5, 4, 6.5], - "to": [1.5, 5, 7.5], - "faces": { - "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, - "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, - "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, - "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} - } - }, - { - "__comment": "tube2c", - "from": [5, 14, 12], - "to": [6, 15, 13], - "faces": { - "down": {"uv": [0.375, 1.125, 0.25, 1.25], "texture": "#all"}, - "up": {"uv": [0.25, 1.25, 0.125, 1.125], "texture": "#all"}, - "north": {"uv": [0.125, 1.25, 0.25, 1.375], "texture": "#all"}, - "south": {"uv": [0.375, 1.25, 0.5, 1.375], "texture": "#all"}, - "west": {"uv": [0.25, 1.25, 0.375, 1.375], "texture": "#all"}, - "east": {"uv": [0, 1.25, 0.125, 1.375], "texture": "#all"} - } - }, - { - "__comment": "panelBraceRight2", - "from": [1, 27.5, 12], - "to": [6, 28.5, 14], - "faces": { - "down": {"uv": [9.5, 1.875, 8.875, 2.125], "texture": "#all"}, - "up": {"uv": [8.875, 2.125, 8.25, 1.875], "texture": "#all"}, - "north": {"uv": [8.25, 2.125, 8.875, 2.25], "texture": "#all"}, - "south": {"uv": [9.125, 2.125, 9.75, 2.25], "texture": "#all"}, - "west": {"uv": [8.875, 2.125, 9.125, 2.25], "texture": "#all"}, - "east": {"uv": [8, 2.125, 8.25, 2.25], "texture": "#all"} - } - }, - { - "__comment": "support7", - "from": [0.5, 4, 10.5], - "to": [1.5, 5, 11.5], - "faces": { - "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, - "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, - "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, - "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} - } - }, - { - "__comment": "support12", - "from": [14.5, 4, 8.5], - "to": [15.5, 5, 9.5], - "faces": { - "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, - "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, - "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, - "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} - } - }, - { - "__comment": "panelBraceLeft2", - "from": [10, 27.5, 12], - "to": [15, 28.5, 14], - "faces": { - "down": {"uv": [9.5, 1.875, 8.875, 2.125], "texture": "#all"}, - "up": {"uv": [8.875, 2.125, 8.25, 1.875], "texture": "#all"}, - "north": {"uv": [8.25, 2.125, 8.875, 2.25], "texture": "#all"}, - "south": {"uv": [9.125, 2.125, 9.75, 2.25], "texture": "#all"}, - "west": {"uv": [8.875, 2.125, 9.125, 2.25], "texture": "#all"}, - "east": {"uv": [8, 2.125, 8.25, 2.25], "texture": "#all"} - } - }, - { - "__comment": "tube2a", - "from": [10, 14, 12], - "to": [11, 15, 13], - "faces": { - "down": {"uv": [0.375, 1.125, 0.25, 1.25], "texture": "#all"}, - "up": {"uv": [0.25, 1.25, 0.125, 1.125], "texture": "#all"}, - "north": {"uv": [0.125, 1.25, 0.25, 1.375], "texture": "#all"}, - "south": {"uv": [0.375, 1.25, 0.5, 1.375], "texture": "#all"}, - "west": {"uv": [0.25, 1.25, 0.375, 1.375], "texture": "#all"}, - "east": {"uv": [0, 1.25, 0.125, 1.375], "texture": "#all"} - } - }, - { - "__comment": "panel3", - "from": [10.75, 27.95, 0], - "to": [16.75, 28.95, 16], - "faces": { - "down": {"uv": [14, 4, 13.25, 6], "texture": "#all"}, - "up": {"uv": [13.25, 6, 12.5, 4], "texture": "#all"}, - "north": {"uv": [12.5, 6, 13.25, 6.125], "texture": "#all"}, - "south": {"uv": [15.25, 6, 16, 6.125], "texture": "#all"}, - "west": {"uv": [13.25, 6, 15.25, 6.125], "texture": "#all"}, - "east": {"uv": [10.5, 6, 12.5, 6.125], "texture": "#all"} - } - }, - { - "__comment": "support13", - "from": [14.5, 4, 6.5], - "to": [15.5, 5, 7.5], - "faces": { - "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, - "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, - "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, - "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} - } - }, - { - "__comment": "panelBraceRight1", - "from": [1, 27.5, 2], - "to": [6, 28.5, 4], - "faces": { - "down": {"uv": [9.5, 1.875, 8.875, 2.125], "texture": "#all"}, - "up": {"uv": [8.875, 2.125, 8.25, 1.875], "texture": "#all"}, - "north": {"uv": [8.25, 2.125, 8.875, 2.25], "texture": "#all"}, - "south": {"uv": [9.125, 2.125, 9.75, 2.25], "texture": "#all"}, - "west": {"uv": [8.875, 2.125, 9.125, 2.25], "texture": "#all"}, - "east": {"uv": [8, 2.125, 8.25, 2.25], "texture": "#all"} - } - }, - { - "__comment": "tank", - "from": [0, 5, 0], - "to": [16, 14, 16], - "faces": { - "down": {"uv": [6, 0, 4, 2], "texture": "#all"}, - "up": {"uv": [4, 2, 2, 0], "texture": "#all"}, - "north": {"uv": [2, 2, 4, 3.125], "texture": "#all"}, - "south": {"uv": [6, 2, 8, 3.125], "texture": "#all"}, - "west": {"uv": [4, 2, 6, 3.125], "texture": "#all"}, - "east": {"uv": [0, 2, 2, 3.125], "texture": "#all"} - } - }, - { - "__comment": "panelBrace", - "from": [7, 25.8, 6], - "to": [9, 27.8, 15], - "faces": { - "down": {"uv": [8.625, 2.25, 8.375, 3.375], "texture": "#all"}, - "up": {"uv": [8.375, 3.375, 8.125, 2.25], "texture": "#all"}, - "north": {"uv": [8.125, 3.375, 8.375, 3.625], "texture": "#all"}, - "south": {"uv": [9.5, 3.375, 9.75, 3.625], "texture": "#all"}, - "west": {"uv": [8.375, 3.375, 9.5, 3.625], "texture": "#all"}, - "east": {"uv": [7, 3.375, 8.125, 3.625], "texture": "#all"} - } - }, - { - "__comment": "support4", - "from": [0.5, 4, 4.5], - "to": [1.5, 5, 5.5], - "faces": { - "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, - "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, - "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, - "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} - } - }, - { - "__comment": "laser", - "from": [7.5, 24.9, 7], - "to": [8.5, 26.9, 8], - "faces": { - "down": {"uv": [0.875, 0, 0.75, 0.125], "texture": "#all"}, - "up": {"uv": [0.75, 0.125, 0.625, 0], "texture": "#all"}, - "north": {"uv": [0.625, 0.125, 0.75, 0.375], "texture": "#all"}, - "south": {"uv": [0.875, 0.125, 1, 0.375], "texture": "#all"}, - "west": {"uv": [0.75, 0.125, 0.875, 0.375], "texture": "#all"}, - "east": {"uv": [0.5, 0.125, 0.625, 0.375], "texture": "#all"} - } - }, - { - "__comment": "panel1", - "from": [-0.75, 27.95, 0], - "to": [5.25, 28.95, 16], - "faces": { - "down": {"uv": [14, 4, 13.25, 6], "texture": "#all"}, - "up": {"uv": [13.25, 6, 12.5, 4], "texture": "#all"}, - "north": {"uv": [12.5, 6, 13.25, 6.125], "texture": "#all"}, - "south": {"uv": [15.25, 6, 16, 6.125], "texture": "#all"}, - "west": {"uv": [13.25, 6, 15.25, 6.125], "texture": "#all"}, - "east": {"uv": [10.5, 6, 12.5, 6.125], "texture": "#all"} - } - }, - { - "__comment": "support15", - "from": [14.5, 4, 2.5], - "to": [15.5, 5, 3.5], - "faces": { - "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, - "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, - "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, - "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} - } - }, - { - "__comment": "support8", - "from": [0.5, 4, 12.5], - "to": [1.5, 5, 13.5], - "faces": { - "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, - "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, - "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, - "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} - } - }, - { - "__comment": "laserBeamToggle", - "from": [7.5, 13.9, 7], - "to": [8.5, 24.9, 8], - "faces": { - "down": {"uv": [1.875, 0, 1.75, 0.125], "texture": "#all"}, - "up": {"uv": [1.75, 0.125, 1.625, 0], "texture": "#all"}, - "north": {"uv": [1.625, 0.125, 1.75, 1.5], "texture": "#all"}, - "south": {"uv": [1.875, 0.125, 2, 1.5], "texture": "#all"}, - "west": {"uv": [1.75, 0.125, 1.875, 1.5], "texture": "#all"}, - "east": {"uv": [1.5, 0.125, 1.625, 1.5], "texture": "#all"} - } - }, - { - "__comment": "brace2", - "from": [6, 13.5, 0.9], - "to": [7, 14.5, 2.9], - "faces": { - "down": {"uv": [0.5, 1.375, 0.375, 1.625], "texture": "#all"}, - "up": {"uv": [0.375, 1.625, 0.25, 1.375], "texture": "#all"}, - "north": {"uv": [0.25, 1.625, 0.375, 1.75], "texture": "#all"}, - "south": {"uv": [0.625, 1.625, 0.75, 1.75], "texture": "#all"}, - "west": {"uv": [0.375, 1.625, 0.625, 1.75], "texture": "#all"}, - "east": {"uv": [0, 1.625, 0.25, 1.75], "texture": "#all"} - } - }, - { - "__comment": "support9", - "from": [14.5, 4, 14.5], - "to": [15.5, 5, 15.5], - "faces": { - "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, - "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, - "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, - "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} - } - }, - { - "__comment": "hole2", - "from": [6.5, 14, 5.5], - "to": [7.5, 16, 6.5], - "faces": { - "down": {"uv": [0.375, 0.75, 0.25, 0.875], "texture": "#all"}, - "up": {"uv": [0.25, 0.875, 0.125, 0.75], "texture": "#all"}, - "north": {"uv": [0.125, 0.875, 0.25, 1.125], "texture": "#all"}, - "south": {"uv": [0.375, 0.875, 0.5, 1.125], "texture": "#all"}, - "west": {"uv": [0.25, 0.875, 0.375, 1.125], "texture": "#all"}, - "east": {"uv": [0, 0.875, 0.125, 1.125], "texture": "#all"} - } - }, - { - "__comment": "panel2", - "from": [5, 28, 0], - "to": [11, 29, 16], - "faces": { - "down": {"uv": [14, 1.875, 13.25, 3.875], "texture": "#all"}, - "up": {"uv": [13.25, 3.875, 12.5, 1.875], "texture": "#all"}, - "north": {"uv": [12.5, 3.875, 13.25, 4], "texture": "#all"}, - "south": {"uv": [15.25, 3.875, 16, 4], "texture": "#all"}, - "west": {"uv": [13.25, 3.875, 15.25, 4], "texture": "#all"}, - "east": {"uv": [10.5, 3.875, 12.5, 4], "texture": "#all"} - } - }, - { - "__comment": "port", - "from": [4, 4, -0.00999999999999979], - "to": [12, 12, 0.99], - "faces": { - "down": {"uv": [2.125, 5.625, 1.125, 5.75], "texture": "#all"}, - "up": {"uv": [1.125, 5.75, 0.125, 5.625], "texture": "#all"}, - "north": {"uv": [0.125, 5.75, 1.125, 6.75], "texture": "#all"}, - "south": {"uv": [1.25, 5.75, 2.25, 6.75], "texture": "#all"}, - "west": {"uv": [1.125, 5.75, 1.25, 6.75], "texture": "#all"}, - "east": {"uv": [0, 5.75, 0.125, 6.75], "texture": "#all"} - } - }, - { - "__comment": "support16", - "from": [14.5, 4, 0.5], - "to": [15.5, 5, 1.5], - "faces": { - "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, - "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, - "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, - "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} - } - }, - { - "__comment": "portConnector", - "from": [5, 4, 0.99], - "to": [11, 5, 1.99], - "faces": { - "down": {"uv": [1.625, 1.75, 0.875, 1.875], "texture": "#all"}, - "up": {"uv": [0.875, 1.875, 0.125, 1.75], "texture": "#all"}, - "north": {"uv": [0.125, 1.875, 0.875, 2], "texture": "#all"}, - "south": {"uv": [1, 1.875, 1.75, 2], "texture": "#all"}, - "west": {"uv": [0.875, 1.875, 1, 2], "texture": "#all"}, - "east": {"uv": [0, 1.875, 0.125, 2], "texture": "#all"} - } - }, - { - "__comment": "support10", - "from": [14.5, 4, 12.5], - "to": [15.5, 5, 13.5], - "faces": { - "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, - "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, - "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, - "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} - } - }, - { - "__comment": "support14", - "from": [14.5, 4, 4.5], - "to": [15.5, 5, 5.5], - "faces": { - "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, - "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, - "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, - "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} - } - }, - { - "__comment": "support1", - "from": [0.5, 4, 0.5], - "to": [1.5, 5, 1.5], - "faces": { - "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, - "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, - "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, - "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} - } - }, - { - "__comment": "support11", - "from": [14.5, 4, 10.5], - "to": [15.5, 5, 11.5], - "faces": { - "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, - "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, - "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, - "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} - } - }, - { - "__comment": "support6", - "from": [0.5, 4, 8.5], - "to": [1.5, 5, 9.5], - "faces": { - "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, - "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, - "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, - "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} - } - }, - { - "__comment": "support2", - "from": [0.5, 4, 14.5], - "to": [1.5, 5, 15.5], - "faces": { - "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, - "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, - "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, - "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} - } - }, - { - "__comment": "tube1a", - "from": [10, 14, 10], - "to": [11, 15, 11], - "faces": { - "down": {"uv": [0.375, 1.125, 0.25, 1.25], "texture": "#all"}, - "up": {"uv": [0.25, 1.25, 0.125, 1.125], "texture": "#all"}, - "north": {"uv": [0.125, 1.25, 0.25, 1.375], "texture": "#all"}, - "south": {"uv": [0.375, 1.25, 0.5, 1.375], "texture": "#all"}, - "west": {"uv": [0.25, 1.25, 0.375, 1.375], "texture": "#all"}, - "east": {"uv": [0, 1.25, 0.125, 1.375], "texture": "#all"} - } - }, - { - "__comment": "tube2b", - "from": [5, 15, 12], - "to": [11, 16, 13], - "faces": { - "down": {"uv": [1.625, 1.75, 0.875, 1.875], "texture": "#all"}, - "up": {"uv": [0.875, 1.875, 0.125, 1.75], "texture": "#all"}, - "north": {"uv": [0.125, 1.875, 0.875, 2], "texture": "#all"}, - "south": {"uv": [1, 1.875, 1.75, 2], "texture": "#all"}, - "west": {"uv": [0.875, 1.875, 1, 2], "texture": "#all"}, - "east": {"uv": [0, 1.875, 0.125, 2], "texture": "#all"} - } - }, - { - "__comment": "base", - "from": [0, 0, 0], - "to": [16, 4, 16], - "faces": { - "down": {"uv": [6, 3.125, 4, 5.125], "texture": "#all"}, - "up": {"uv": [4, 5.125, 2, 3.125], "texture": "#all"}, - "north": {"uv": [2, 5.125, 4, 5.625], "texture": "#all"}, - "south": {"uv": [6, 5.125, 8, 5.625], "texture": "#all"}, - "west": {"uv": [4, 5.125, 6, 5.625], "texture": "#all"}, - "east": {"uv": [0, 5.125, 2, 5.625], "texture": "#all"} - } - }, - { - "__comment": "tube1b", - "from": [5, 15, 10], - "to": [11, 16, 11], - "faces": { - "down": {"uv": [1.625, 1.75, 0.875, 1.875], "texture": "#all"}, - "up": {"uv": [0.875, 1.875, 0.125, 1.75], "texture": "#all"}, - "north": {"uv": [0.125, 1.875, 0.875, 2], "texture": "#all"}, - "south": {"uv": [1, 1.875, 1.75, 2], "texture": "#all"}, - "west": {"uv": [0.875, 1.875, 1, 2], "texture": "#all"}, - "east": {"uv": [0, 1.875, 0.125, 2], "texture": "#all"} - } - }, - { - "__comment": "support3", - "from": [0.5, 4, 2.5], - "to": [1.5, 5, 3.5], - "faces": { - "down": {"uv": [0.375, 0, 0.25, 0.125], "texture": "#all"}, - "up": {"uv": [0.25, 0.125, 0.125, 0], "texture": "#all"}, - "north": {"uv": [0.125, 0.125, 0.25, 0.25], "texture": "#all"}, - "south": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#all"}, - "west": {"uv": [0.25, 0.125, 0.375, 0.25], "texture": "#all"}, - "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#all"} - } - }, - { - "__comment": "hole4", - "from": [6.5, 14, 6.5], - "to": [9.5, 16, 7.5], - "faces": { - "down": {"uv": [0.875, 0.375, 0.5, 0.5], "texture": "#all"}, - "up": {"uv": [0.5, 0.5, 0.125, 0.375], "texture": "#all"}, - "north": {"uv": [0.125, 0.5, 0.5, 0.75], "texture": "#all"}, - "south": {"uv": [0.625, 0.5, 1, 0.75], "texture": "#all"}, - "west": {"uv": [0.5, 0.5, 0.625, 0.75], "texture": "#all"}, - "east": {"uv": [0, 0.5, 0.125, 0.75], "texture": "#all"} - } - }, - { - "__comment": "conduit", - "from": [7, 13.5, 7], - "to": [9, 14.5, 14], - "faces": { - "down": {"uv": [7.375, 0, 7.125, 0.875], "texture": "#all"}, - "up": {"uv": [7.125, 0.875, 6.875, 0], "texture": "#all"}, - "north": {"uv": [6.875, 0.875, 7.125, 1], "texture": "#all"}, - "south": {"uv": [8, 0.875, 8.25, 1], "texture": "#all"}, - "west": {"uv": [7.125, 0.875, 8, 1], "texture": "#all"}, - "east": {"uv": [6, 0.875, 6.875, 1], "texture": "#all"} - } - }, - { - "__comment": "hole1", - "from": [6.5, 14, 4.5], - "to": [9.5, 16, 5.5], - "faces": { - "down": {"uv": [0.875, 0.375, 0.5, 0.5], "texture": "#all"}, - "up": {"uv": [0.5, 0.5, 0.125, 0.375], "texture": "#all"}, - "north": {"uv": [0.125, 0.5, 0.5, 0.75], "texture": "#all"}, - "south": {"uv": [0.625, 0.5, 1, 0.75], "texture": "#all"}, - "west": {"uv": [0.5, 0.5, 0.625, 0.75], "texture": "#all"}, - "east": {"uv": [0, 0.5, 0.125, 0.75], "texture": "#all"} - } - }, - { - "__comment": "platform", - "from": [5, 12, 3], - "to": [11, 15, 9], - "faces": { - "down": {"uv": [4.5, 5.625, 3.75, 6.375], "texture": "#all"}, - "up": {"uv": [3.75, 6.375, 3, 5.625], "texture": "#all"}, - "north": {"uv": [3, 6.375, 3.75, 6.75], "texture": "#all"}, - "south": {"uv": [4.5, 6.375, 5.25, 6.75], "texture": "#all"}, - "west": {"uv": [3.75, 6.375, 4.5, 6.75], "texture": "#all"}, - "east": {"uv": [2.25, 6.375, 3, 6.75], "texture": "#all"} - } - }, - { - "__comment": "bridge", - "from": [2, 4, 2], - "to": [14, 5, 15], - "faces": { - "down": {"uv": [12.75, 0.125, 11.25, 1.75], "texture": "#all"}, - "up": {"uv": [11.25, 1.75, 9.75, 0.125], "texture": "#all"}, - "north": {"uv": [9.75, 1.75, 11.25, 1.875], "texture": "#all"}, - "south": {"uv": [12.875, 1.75, 14.375, 1.875], "texture": "#all"}, - "west": {"uv": [11.25, 1.75, 12.875, 1.875], "texture": "#all"}, - "east": {"uv": [8.125, 1.75, 9.75, 1.875], "texture": "#all"} - } - }, - { - "__comment": "pole", - "from": [6, 14, 14], - "to": [10, 29, 16], - "faces": { - "down": {"uv": [15.75, 0, 15.25, 0.25], "texture": "#all"}, - "up": {"uv": [15.25, 0.25, 14.75, 0], "texture": "#all"}, - "north": {"uv": [14.75, 0.25, 15.25, 2.125], "texture": "#all"}, - "south": {"uv": [15.5, 0.25, 16, 2.125], "texture": "#all"}, - "west": {"uv": [15.25, 0.25, 15.5, 2.125], "texture": "#all"}, - "east": {"uv": [14.5, 0.25, 14.75, 2.125], "texture": "#all"} - } - }, - { - "__comment": "panelBraceLeft1", - "from": [10, 27.5, 2], - "to": [15, 28.5, 4], - "faces": { - "down": {"uv": [9.5, 1.875, 8.875, 2.125], "texture": "#all"}, - "up": {"uv": [8.875, 2.125, 8.25, 1.875], "texture": "#all"}, - "north": {"uv": [8.25, 2.125, 8.875, 2.25], "texture": "#all"}, - "south": {"uv": [9.125, 2.125, 9.75, 2.25], "texture": "#all"}, - "west": {"uv": [8.875, 2.125, 9.125, 2.25], "texture": "#all"}, - "east": {"uv": [8, 2.125, 8.25, 2.25], "texture": "#all"} - } - }, - { - "__comment": "brace1", - "from": [9, 13.5, 0.9], - "to": [10, 14.5, 2.9], - "faces": { - "down": {"uv": [0.5, 1.375, 0.375, 1.625], "texture": "#all"}, - "up": {"uv": [0.375, 1.625, 0.25, 1.375], "texture": "#all"}, - "north": {"uv": [0.25, 1.625, 0.375, 1.75], "texture": "#all"}, - "south": {"uv": [0.625, 1.625, 0.75, 1.75], "texture": "#all"}, - "west": {"uv": [0.375, 1.625, 0.625, 1.75], "texture": "#all"}, - "east": {"uv": [0, 1.625, 0.25, 1.75], "texture": "#all"} - } - }, - { - "__comment": "tube1c", - "from": [5, 14, 10], - "to": [6, 15, 11], - "faces": { - "down": {"uv": [0.375, 1.125, 0.25, 1.25], "texture": "#all"}, - "up": {"uv": [0.25, 1.25, 0.125, 1.125], "texture": "#all"}, - "north": {"uv": [0.125, 1.25, 0.25, 1.375], "texture": "#all"}, - "south": {"uv": [0.375, 1.25, 0.5, 1.375], "texture": "#all"}, - "west": {"uv": [0.25, 1.25, 0.375, 1.375], "texture": "#all"}, - "east": {"uv": [0, 1.25, 0.125, 1.375], "texture": "#all"} - } - }, - { - "__comment": "panelBase", - "from": [5, 27, 1], - "to": [11, 28, 15], - "faces": { - "down": {"uv": [6.75, 5.625, 6, 7.375], "texture": "#all"}, - "up": {"uv": [6, 7.375, 5.25, 5.625], "texture": "#all"}, - "north": {"uv": [5.25, 7.375, 6, 7.5], "texture": "#all"}, - "south": {"uv": [7.75, 7.375, 8.5, 7.5], "texture": "#all"}, - "west": {"uv": [6, 7.375, 7.75, 7.5], "texture": "#all"}, - "east": {"uv": [3.5, 7.375, 5.25, 7.5], "texture": "#all"} - } - }, - { - "__comment": "hole3", - "from": [8.5, 14, 5.5], - "to": [9.5, 16, 6.5], - "faces": { - "down": {"uv": [0.375, 0.75, 0.25, 0.875], "texture": "#all"}, - "up": {"uv": [0.25, 0.875, 0.125, 0.75], "texture": "#all"}, - "north": {"uv": [0.125, 0.875, 0.25, 1.125], "texture": "#all"}, - "south": {"uv": [0.375, 0.875, 0.5, 1.125], "texture": "#all"}, - "west": {"uv": [0.25, 0.875, 0.375, 1.125], "texture": "#all"}, - "east": {"uv": [0, 0.875, 0.125, 1.125], "texture": "#all"} - } - } - ], - "textures": { - "all": "mekanism:blocks/models/solar_neutron_activator", - "particle": "..." - } -} From 8b1017a3a818ff2ff41fb29ff32e08768f423721 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 11 May 2016 17:42:51 -0400 Subject: [PATCH 17/22] Lots and lots of fancy rendering! --- .../java/mekanism/client/ClientProxy.java | 21 +- .../client/model/ModelObsidianTNT.java | 189 ----------- .../client/render/MekanismRenderer.java | 3 - .../render/item/BakedCustomItemModel.java | 14 +- .../client/render/tileentity/RenderBin.java | 6 +- .../java/mekanism/common/CommonProxy.java | 15 +- src/main/java/mekanism/common/Mekanism.java | 4 +- src/main/java/mekanism/common/Tier.java | 2 - .../block/states/BlockStateMachine.java | 7 +- .../content/boiler/BoilerUpdateProtocol.java | 8 +- .../common/tile/TileEntityBoilerCasing.java | 2 +- .../mekanism/blockstates/BoundingBlock.json | 14 + .../advanced_factory_combining.json | 1 + .../advanced_factory_compressing.json | 1 + .../advanced_factory_crushing.json | 1 + .../advanced_factory_enriching.json | 1 + .../advanced_factory_infusing.json | 1 + .../advanced_factory_injecting.json | 1 + .../advanced_factory_purifying.json | 1 + .../advanced_factory_smelting.json | 1 + .../blockstates/basic_factory_combining.json | 1 + .../basic_factory_compressing.json | 1 + .../blockstates/basic_factory_crushing.json | 1 + .../blockstates/basic_factory_enriching.json | 1 + .../blockstates/basic_factory_infusing.json | 1 + .../blockstates/basic_factory_injecting.json | 1 + .../blockstates/basic_factory_purifying.json | 1 + .../blockstates/basic_factory_smelting.json | 1 + .../mekanism/blockstates/bin_advanced.json | 1 + .../mekanism/blockstates/bin_basic.json | 1 + .../mekanism/blockstates/bin_elite.json | 1 + .../mekanism/blockstates/bin_ultimate.json | 1 + .../chemical_injection_chamber.json | 2 +- .../assets/mekanism/blockstates/combiner.json | 2 +- .../assets/mekanism/blockstates/crusher.json | 2 +- .../blockstates/elite_factory_combining.json | 1 + .../elite_factory_compressing.json | 1 + .../blockstates/elite_factory_crushing.json | 1 + .../blockstates/elite_factory_enriching.json | 1 + .../blockstates/elite_factory_infusing.json | 1 + .../blockstates/elite_factory_injecting.json | 1 + .../blockstates/elite_factory_purifying.json | 1 + .../blockstates/elite_factory_smelting.json | 1 + .../blockstates/energized_smelter.json | 2 +- .../blockstates/enrichment_chamber.json | 2 +- .../mekanism/blockstates/fuelwood_heater.json | 1 + .../blockstates/oredictionificator.json | 1 + .../blockstates/osmium_compressor.json | 10 +- .../blockstates/precision_sawmill.json | 2 +- .../blockstates/purification_chamber.json | 2 +- .../thermal_evaporation_block.json | 2 +- .../thermal_evaporation_valve.json | 2 +- .../mekanism/models/block/ctm_block.json | 26 +- .../assets/mekanism/models/block/nothing.json | 7 +- .../mekanism/models/block/obsidian_tnt.json | 2 +- .../models/block/quantum_entangloporter.json | 13 - .../mekanism/models/item/ArmoredJetpack.json | 8 +- .../models/item/AtomicDisassembler.json | 217 +----------- .../mekanism/models/item/EnergyCube.json | 11 - .../mekanism/models/item/Flamethrower.json | 308 +----------------- .../mekanism/models/item/FreeRunners.json | 8 +- .../assets/mekanism/models/item/GasMask.json | 8 +- .../mekanism/models/item/ItemProxy.json | 5 +- .../assets/mekanism/models/item/Jetpack.json | 8 +- .../mekanism/models/item/ScubaTank.json | 8 +- 65 files changed, 133 insertions(+), 839 deletions(-) delete mode 100644 src/main/java/mekanism/client/model/ModelObsidianTNT.java create mode 100644 src/main/resources/assets/mekanism/blockstates/BoundingBlock.json delete mode 100644 src/main/resources/assets/mekanism/models/item/EnergyCube.json diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 81506be17..4d6dc7aee 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -304,7 +304,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(TileEntityPersonalChest.class, "ElectricChest", new RenderPersonalChest()); //TODO rename + ClientRegistry.registerTileEntity(TileEntityPersonalChest.class, "PersonalChest", new RenderPersonalChest()); ClientRegistry.registerTileEntity(TileEntityDynamicTank.class, "DynamicTank", new RenderDynamicTank()); ClientRegistry.registerTileEntity(TileEntityDynamicValve.class, "DynamicValve", new RenderDynamicTank()); ClientRegistry.registerTileEntity(TileEntityChargepad.class, "Chargepad", new RenderChargepad()); @@ -317,14 +317,14 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityChemicalInfuser.class, "ChemicalInfuser", new RenderChemicalInfuser()); ClientRegistry.registerTileEntity(TileEntityChemicalInjectionChamber.class, "ChemicalInjectionChamber", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityElectrolyticSeparator.class, "ElectrolyticSeparator", new RenderElectrolyticSeparator()); - ClientRegistry.registerTileEntity(TileEntityThermalEvaporationController.class, "SalinationController", new RenderThermalEvaporationController()); //TODO rename + ClientRegistry.registerTileEntity(TileEntityThermalEvaporationController.class, "ThermalEvaporationController", new RenderThermalEvaporationController()); ClientRegistry.registerTileEntity(TileEntityPrecisionSawmill.class, "PrecisionSawmill", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityChemicalDissolutionChamber.class, "ChemicalDissolutionChamber", new RenderChemicalDissolutionChamber()); ClientRegistry.registerTileEntity(TileEntityChemicalWasher.class, "ChemicalWasher", new RenderChemicalWasher()); ClientRegistry.registerTileEntity(TileEntityChemicalCrystallizer.class, "ChemicalCrystallizer", new RenderChemicalCrystallizer()); ClientRegistry.registerTileEntity(TileEntitySeismicVibrator.class, "SeismicVibrator", new RenderSeismicVibrator()); ClientRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber", new RenderPressurizedReactionChamber()); - ClientRegistry.registerTileEntity(TileEntityFluidTank.class, "PortableTank", new RenderFluidTank()); //TODO rename + ClientRegistry.registerTileEntity(TileEntityFluidTank.class, "FluidTank", new RenderFluidTank()); ClientRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher", new RenderFluidicPlenisher()); //ClientRegistry.registerTileEntity(TileEntityLaser.class, "Laser", new RenderLaser()); ClientRegistry.registerTileEntity(TileEntityLaserAmplifier.class, "LaserAmplifier", new RenderLaserAmplifier()); @@ -405,7 +405,7 @@ public class ClientProxy extends CommonProxy ModelBakery.registerItemVariants(MekanismItems.WalkieTalkie, ItemWalkieTalkie.OFF_MODEL); - for(int i = 0; i <= 9; i++) + for(int i = 1; i <= 9; i++) { ModelBakery.registerItemVariants(MekanismItems.WalkieTalkie, ItemWalkieTalkie.getModel(i)); } @@ -424,6 +424,11 @@ public class ClientProxy extends CommonProxy for(MachineType type : MachineType.values()) { + if(!type.isValidMachine()) + { + continue; + } + List modelsToAdd = new ArrayList(); String resource = "mekanism:" + type.getName(); RecipeType recipePointer = null; @@ -545,9 +550,13 @@ public class ClientProxy extends CommonProxy if(tierPointer.ordinal() < BaseTier.values().length-1) { tierPointer = BaseTier.values()[tierPointer.ordinal()+1]; - resource = "mekanism:" + type.getName() + "_" + tierPointer.getName(); - continue; + if(tierPointer.isObtainable()) + { + resource = "mekanism:" + type.getName() + "_" + tierPointer.getName(); + + continue; + } } } } diff --git a/src/main/java/mekanism/client/model/ModelObsidianTNT.java b/src/main/java/mekanism/client/model/ModelObsidianTNT.java deleted file mode 100644 index 261a5139f..000000000 --- a/src/main/java/mekanism/client/model/ModelObsidianTNT.java +++ /dev/null @@ -1,189 +0,0 @@ -package mekanism.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ModelObsidianTNT extends ModelBase -{ - ModelRenderer Wick9; - ModelRenderer Wick8; - ModelRenderer Wick7; - ModelRenderer Wick6; - ModelRenderer Wick5; - ModelRenderer Wick4; - ModelRenderer Wick3; - ModelRenderer Wick2; - ModelRenderer Wick1; - ModelRenderer Wooden2; - ModelRenderer Wooden1; - ModelRenderer Rod1; - ModelRenderer Rod2; - ModelRenderer Rod3; - ModelRenderer Rod4; - ModelRenderer Rod5; - ModelRenderer Rod6; - ModelRenderer Rod7; - ModelRenderer Rod8; - ModelRenderer Rod9; - - public ModelObsidianTNT() - { - textureWidth = 64; - textureHeight = 64; - - Wick9 = new ModelRenderer(this, 0, 0); - Wick9.addBox(0F, 0F, 0F, 1, 2, 1); - Wick9.setRotationPoint(-0.5F, 9.2F, -0.5F); - Wick9.setTextureSize(64, 64); - Wick9.mirror = true; - setRotation(Wick9, 0F, 0F, 0.2268928F); - Wick8 = new ModelRenderer(this, 0, 0); - Wick8.addBox(0F, 0F, 0F, 1, 2, 1); - Wick8.setRotationPoint(-0.5F, 9.5F, -5.5F); - Wick8.setTextureSize(64, 64); - Wick8.mirror = true; - setRotation(Wick8, 0F, 0F, -0.2379431F); - Wick7 = new ModelRenderer(this, 0, 0); - Wick7.addBox(0F, 0F, 0F, 1, 2, 1); - Wick7.setRotationPoint(-0.5F, 9.5F, 4.5F); - Wick7.setTextureSize(64, 64); - Wick7.mirror = true; - setRotation(Wick7, 0F, 0F, -0.2379431F); - Wick6 = new ModelRenderer(this, 0, 0); - Wick6.addBox(0F, 0F, 0F, 1, 2, 1); - Wick6.setRotationPoint(-5.5F, 9.2F, -5.5F); - Wick6.setTextureSize(64, 64); - Wick6.mirror = true; - setRotation(Wick6, 0F, 0F, 0.2268928F); - Wick5 = new ModelRenderer(this, 0, 0); - Wick5.addBox(0F, 0F, 0F, 1, 2, 1); - Wick5.setRotationPoint(-5.5F, 9.5F, -0.5F); - Wick5.setTextureSize(64, 64); - Wick5.mirror = true; - setRotation(Wick5, 0F, 0F, -0.2379431F); - Wick4 = new ModelRenderer(this, 0, 0); - Wick4.addBox(0F, 0F, 0F, 1, 2, 1); - Wick4.setRotationPoint(-5.5F, 9.2F, 4.5F); - Wick4.setTextureSize(64, 64); - Wick4.mirror = true; - setRotation(Wick4, 0F, 0F, 0.2268928F); - Wick3 = new ModelRenderer(this, 0, 0); - Wick3.addBox(0F, 0F, 0F, 1, 2, 1); - Wick3.setRotationPoint(4.5F, 9.2F, -5.5F); - Wick3.setTextureSize(64, 64); - Wick3.mirror = true; - setRotation(Wick3, 0F, 0F, 0.2268928F); - Wick2 = new ModelRenderer(this, 0, 0); - Wick2.addBox(0F, 0F, 0F, 1, 2, 1); - Wick2.setRotationPoint(4.5F, 9.5F, -0.5F); - Wick2.setTextureSize(64, 64); - Wick2.mirror = true; - setRotation(Wick2, 0F, 0F, -0.2379431F); - Wick1 = new ModelRenderer(this, 0, 0); - Wick1.addBox(0F, 0F, 0F, 1, 2, 1); - Wick1.setRotationPoint(4.5F, 9.2F, 4.5F); - Wick1.setTextureSize(64, 64); - Wick1.mirror = true; - setRotation(Wick1, 0F, 0F, 0.2268928F); - Wooden2 = new ModelRenderer(this, 0, 0); - Wooden2.addBox(0F, 0F, 0F, 16, 3, 16); - Wooden2.setRotationPoint(-8F, 12F, -8F); - Wooden2.setTextureSize(64, 64); - Wooden2.mirror = true; - setRotation(Wooden2, 0F, 0F, 0F); - Wooden1 = new ModelRenderer(this, 0, 0); - Wooden1.addBox(0F, 0F, 0F, 16, 3, 16); - Wooden1.setRotationPoint(-8F, 20F, -8F); - Wooden1.setTextureSize(64, 64); - Wooden1.mirror = true; - setRotation(Wooden1, 0F, 0F, 0F); - Rod1 = new ModelRenderer(this, 0, 20); - Rod1.addBox(0F, 0F, 0F, 4, 13, 4); - Rod1.setRotationPoint(3F, 11F, 3F); - Rod1.setTextureSize(64, 64); - Rod1.mirror = true; - setRotation(Rod1, 0F, 0F, 0F); - Rod2 = new ModelRenderer(this, 0, 20); - Rod2.addBox(0F, 0F, 0F, 4, 13, 4); - Rod2.setRotationPoint(3F, 11F, -2F); - Rod2.setTextureSize(64, 64); - Rod2.mirror = true; - setRotation(Rod2, 0F, 0F, 0F); - Rod3 = new ModelRenderer(this, 0, 20); - Rod3.addBox(0F, 0F, 0F, 4, 13, 4); - Rod3.setRotationPoint(3F, 11F, -7F); - Rod3.setTextureSize(64, 64); - Rod3.mirror = true; - setRotation(Rod3, 0F, 0F, 0F); - Rod4 = new ModelRenderer(this, 0, 20); - Rod4.addBox(0F, 0F, 0F, 4, 13, 4); - Rod4.setRotationPoint(-2F, 11F, -7F); - Rod4.setTextureSize(64, 64); - Rod4.mirror = true; - setRotation(Rod4, 0F, 0F, 0F); - Rod5 = new ModelRenderer(this, 0, 20); - Rod5.addBox(0F, 0F, 0F, 4, 13, 4); - Rod5.setRotationPoint(-2F, 11F, -2F); - Rod5.setTextureSize(64, 64); - Rod5.mirror = true; - setRotation(Rod5, 0F, 0F, 0F); - Rod6 = new ModelRenderer(this, 0, 20); - Rod6.addBox(0F, 0F, 0F, 4, 13, 4); - Rod6.setRotationPoint(-2F, 11F, 3F); - Rod6.setTextureSize(64, 64); - Rod6.mirror = true; - setRotation(Rod6, 0F, 0F, 0F); - Rod7 = new ModelRenderer(this, 0, 20); - Rod7.addBox(0F, 0F, 0F, 4, 13, 4); - Rod7.setRotationPoint(-7F, 11F, -2F); - Rod7.setTextureSize(64, 64); - Rod7.mirror = true; - setRotation(Rod7, 0F, 0F, 0F); - Rod8 = new ModelRenderer(this, 0, 20); - Rod8.addBox(0F, 0F, 0F, 4, 13, 4); - Rod8.setRotationPoint(-7F, 11F, 3F); - Rod8.setTextureSize(64, 64); - Rod8.mirror = true; - setRotation(Rod8, 0F, 0F, 0F); - Rod9 = new ModelRenderer(this, 0, 20); - Rod9.addBox(0F, 0F, 0F, 4, 13, 4); - Rod9.setRotationPoint(-7F, 11F, -7F); - Rod9.setTextureSize(64, 64); - Rod9.mirror = true; - setRotation(Rod9, 0F, 0F, 0F); - } - - public void render(float size) - { - Wick9.render(size); - Wick8.render(size); - Wick7.render(size); - Wick6.render(size); - Wick5.render(size); - Wick4.render(size); - Wick3.render(size); - Wick2.render(size); - Wick1.render(size); - Wooden2.render(size); - Wooden1.render(size); - Rod1.render(size); - Rod2.render(size); - Rod3.render(size); - Rod4.render(size); - Rod5.render(size); - Rod6.render(size); - Rod7.render(size); - Rod8.render(size); - Rod9.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 74301886e..ef2bedf23 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -25,7 +25,6 @@ import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemModelMesher; import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.model.ModelBakery; @@ -354,8 +353,6 @@ public class MekanismRenderer optifineBreak = true; } - RenderHelper.disableStandardItemLighting(); - float glowRatioX = Math.min((glow/15F)*240F + lightmapLastX, 240); float glowRatioY = Math.min((glow/15F)*240F + lightmapLastY, 240); diff --git a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java index 79ea89ba6..3ad465f55 100644 --- a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java +++ b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java @@ -36,7 +36,6 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; @@ -93,7 +92,7 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel GlStateManager.pushMatrix(); ItemBlockBasic itemBasic = (ItemBlockBasic)stack.getItem(); InventoryBin inv = new InventoryBin(stack); - binRenderer.render(EnumFacing.NORTH, inv.getItemType(), inv.getItemCount(), -0.5, -0.5, -0.5); + binRenderer.render(EnumFacing.NORTH, inv.getItemType(), inv.getItemCount(), false, -0.5, -0.5, -0.5); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.enableRescaleNormal(); GlStateManager.enableAlpha(); @@ -221,8 +220,9 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel } else if(type == TransformType.GUI) { - GlStateManager.rotate(90, 0.0F, 1.0F, 0.0F); - GlStateManager.rotate(45, -1.0F, 0.0F, 0.0F); + GlStateManager.rotate(225, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(45, -1.0F, 0.0F, -1.0F); + GlStateManager.scale(0.6F, 0.6F, 0.6F); GlStateManager.translate(0.0F, -0.2F, 0.0F); } else { @@ -260,9 +260,8 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel } else if(type == TransformType.GUI) { - GlStateManager.translate(0.45F, -0.45F, 0.0F); - GlStateManager.rotate(-45, 0.0F, 1.0F, 0.0F); - GlStateManager.scale(1.4, 1.4, 1.4); + GlStateManager.translate(-0.6F, 0.0F, 0.0F); + GlStateManager.rotate(45, 0.0F, 1.0F, 0.0F); } flamethrower.render(0.0625F); @@ -344,7 +343,6 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel GlStateManager.scale(0.5F, 0.5F, 0.5F); doRender(cameraTransformType); GlStateManager.scale(2.0F, 2.0F, 2.0F); - RenderHelper.enableStandardItemLighting(); GlStateManager.popMatrix(); return Pair.of(this, null); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderBin.java b/src/main/java/mekanism/client/render/tileentity/RenderBin.java index 46421e824..fa7ead15f 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderBin.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderBin.java @@ -29,10 +29,10 @@ public class RenderBin extends TileEntitySpecialRenderer return; } - render(tileEntity.facing, tileEntity.itemType, tileEntity.clientAmount, x, y, z); + render(tileEntity.facing, tileEntity.itemType, tileEntity.clientAmount, true, x, y, z); } - public void render(EnumFacing facing, ItemStack itemType, int clientAmount, double x, double y, double z) + public void render(EnumFacing facing, ItemStack itemType, int clientAmount, boolean text, double x, double y, double z) { String amount = ""; @@ -75,7 +75,7 @@ public class RenderBin extends TileEntitySpecialRenderer GlStateManager.popMatrix(); } - if(!amount.equals("")) + if(text && !amount.equals("")) { renderText(amount, facing, 0.02F, x, y - 0.3725F, z); } diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 993d5d1d4..72cd7fb2d 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -145,13 +145,6 @@ import net.minecraftforge.fml.relauncher.FMLInjectionData; */ public class CommonProxy implements IGuiProvider { -/* - public static int MACHINE_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); - public static int BASIC_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); - public static int PLASTIC_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); - public static int CTM_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); -*/ - protected static WeakReference dummyPlayer = new WeakReference(null); /** @@ -171,7 +164,7 @@ public class CommonProxy implements IGuiProvider GameRegistry.registerTileEntity(TileEntityGasTank.class, "GasTank"); GameRegistry.registerTileEntity(TileEntityEnergyCube.class, "EnergyCube"); GameRegistry.registerTileEntity(TileEntityElectricPump.class, "ElectricPump"); - GameRegistry.registerTileEntity(TileEntityPersonalChest.class, "ElectricChest"); //TODO rename + GameRegistry.registerTileEntity(TileEntityPersonalChest.class, "PersonalChest"); GameRegistry.registerTileEntity(TileEntityDynamicTank.class, "DynamicTank"); GameRegistry.registerTileEntity(TileEntityDynamicValve.class, "DynamicValve"); GameRegistry.registerTileEntity(TileEntityChargepad.class, "Chargepad"); @@ -185,14 +178,14 @@ public class CommonProxy implements IGuiProvider GameRegistry.registerTileEntity(TileEntityChemicalInfuser.class, "ChemicalInfuser"); GameRegistry.registerTileEntity(TileEntityChemicalInjectionChamber.class, "ChemicalInjectionChamber"); GameRegistry.registerTileEntity(TileEntityElectrolyticSeparator.class, "ElectrolyticSeparator"); - GameRegistry.registerTileEntity(TileEntityThermalEvaporationController.class, "SalinationController"); //TODO rename + GameRegistry.registerTileEntity(TileEntityThermalEvaporationController.class, "ThermalEvaporationController"); GameRegistry.registerTileEntity(TileEntityPrecisionSawmill.class, "PrecisionSawmill"); GameRegistry.registerTileEntity(TileEntityChemicalDissolutionChamber.class, "ChemicalDissolutionChamber"); GameRegistry.registerTileEntity(TileEntityChemicalWasher.class, "ChemicalWasher"); GameRegistry.registerTileEntity(TileEntityChemicalCrystallizer.class, "ChemicalCrystallizer"); GameRegistry.registerTileEntity(TileEntitySeismicVibrator.class, "SeismicVibrator"); GameRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber"); - GameRegistry.registerTileEntity(TileEntityFluidTank.class, "PortableTank"); //TODO rename + GameRegistry.registerTileEntity(TileEntityFluidTank.class, "FluidTank"); GameRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher"); GameRegistry.registerTileEntity(TileEntityLaserAmplifier.class, "LaserAmplifier"); GameRegistry.registerTileEntity(TileEntityLaserTractorBeam.class, "LaserTractorBeam"); @@ -377,7 +370,7 @@ public class CommonProxy implements IGuiProvider usage.heavyWaterElectrolysisUsage = Mekanism.configuration.get("usage", "HeavyWaterElectrolysisUsage", 800D).getDouble(); usage.formulaicAssemblicatorUsage = Mekanism.configuration.get("usage", "FormulaicAssemblicatorUsage", 100D).getDouble(); -//TODO: Tier.loadConfig(); + Tier.loadConfig(); if(Mekanism.configuration.hasChanged()) { diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index ff23459a7..3f5d5d36d 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -1168,8 +1168,8 @@ public class Mekanism GameRegistry.registerTileEntity(TileEntityBoundingBlock.class, "BoundingBlock"); GameRegistry.registerTileEntity(TileEntityAdvancedBoundingBlock.class, "AdvancedBoundingBlock"); GameRegistry.registerTileEntity(TileEntityCardboardBox.class, "CardboardBox"); - GameRegistry.registerTileEntity(TileEntityThermalEvaporationValve.class, "SalinationValve"); //TODO rename - GameRegistry.registerTileEntity(TileEntityThermalEvaporationBlock.class, "SalinationTank"); //TODO rename + GameRegistry.registerTileEntity(TileEntityThermalEvaporationValve.class, "ThermalEvaporationValve"); + GameRegistry.registerTileEntity(TileEntityThermalEvaporationBlock.class, "ThermalEvaporationBlock"); GameRegistry.registerTileEntity(TileEntityPressureDisperser.class, "PressureDisperser"); GameRegistry.registerTileEntity(TileEntitySuperheatingElement.class, "SuperheatingElement"); GameRegistry.registerTileEntity(TileEntityMetallurgicInfuser.class, "MetallurgicInfuser"); diff --git a/src/main/java/mekanism/common/Tier.java b/src/main/java/mekanism/common/Tier.java index d57ee2a48..3fa50b985 100644 --- a/src/main/java/mekanism/common/Tier.java +++ b/src/main/java/mekanism/common/Tier.java @@ -726,12 +726,10 @@ public final class Tier public static void init() { -/* if(initiated) { return; } -*/ for(Class c : Tier.class.getDeclaredClasses()) { diff --git a/src/main/java/mekanism/common/block/states/BlockStateMachine.java b/src/main/java/mekanism/common/block/states/BlockStateMachine.java index 4a4a430ab..67b2a2059 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateMachine.java +++ b/src/main/java/mekanism/common/block/states/BlockStateMachine.java @@ -213,7 +213,7 @@ public class BlockStateMachine extends ExtendedBlockState for(MachineType type : MachineType.values()) { - if(type != QUANTUM_ENTANGLOPORTER && type != AMBIENT_ACCUMULATOR) + if(type.isValidMachine()) { ret.add(type); } @@ -221,6 +221,11 @@ public class BlockStateMachine extends ExtendedBlockState return ret; } + + public boolean isValidMachine() + { + return this != AMBIENT_ACCUMULATOR; + } public static MachineType get(Block block, int meta) { diff --git a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java index c8a54d5cf..ead5f76d1 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java @@ -126,13 +126,13 @@ public class BoilerUpdateProtocol extends UpdateProtocol int totalAir = 0; //Find the first available block in the structure for water storage (including casings) - for(int x = 0; x < structure.volLength; x++) + for(int x = structure.renderLocation.xCoord; x < structure.renderLocation.xCoord+structure.volLength; x++) { - for(int y = 0; y < initDisperser.yCoord - structure.renderLocation.yCoord; y++) + for(int y = structure.renderLocation.yCoord; y < initDisperser.yCoord; y++) { - for(int z = 0; z < structure.volWidth; z++) + for(int z = structure.renderLocation.zCoord; z < structure.renderLocation.zCoord+structure.volWidth; z++) { - if(pointer.getWorld().isAirBlock(pos.translate(x, y, z).getPos()) || isViableNode(pos.translate(x, y, z).getPos())) + if(pointer.getWorld().isAirBlock(new BlockPos(x, y, z)) || isViableNode(x, y, z)) { initAir = new Coord4D(x, y, z, pointer.getWorld().provider.getDimensionId()); totalAir++; diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index aaf032918..4de13ef1b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -217,7 +217,7 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock Date: Wed, 11 May 2016 19:09:28 -0400 Subject: [PATCH 18/22] Begin overhauling TE renders. Certain blocks are gonna need to remain TESRs --- .../java/mekanism/client/ClientProxy.java | 40 +- .../client/model/ModelChemicalInfuser.java | 268 -------- .../client/model/ModelChemicalOxidizer.java | 109 ---- .../client/model/ModelChemicalWasher.java | 220 ------- .../mekanism/client/model/ModelGasTank.java | 110 ---- .../client/model/ModelMetallurgicInfuser.java | 165 ----- .../ModelPressurizedReactionChamber.java | 109 ---- .../client/model/ModelSeismicVibrator.java | 13 - .../render/item/BakedCustomItemModel.java | 33 + .../RenderChemicalCrystallizer.java | 14 +- .../RenderChemicalDissolutionChamber.java | 2 +- .../tileentity/RenderChemicalInfuser.java | 37 -- .../tileentity/RenderChemicalOxidizer.java | 48 -- .../tileentity/RenderChemicalWasher.java | 35 -- .../tileentity/RenderConfigurableMachine.java | 13 +- .../RenderElectrolyticSeparator.java | 39 -- .../render/tileentity/RenderGasTank.java | 27 +- .../tileentity/RenderLaserAmplifier.java | 62 -- .../tileentity/RenderLaserTractorBeam.java | 59 -- .../RenderPressurizedReactionChamber.java | 42 -- .../tileentity/RenderSeismicVibrator.java | 2 +- .../java/mekanism/common/CommonProxy.java | 17 +- src/main/java/mekanism/common/Mekanism.java | 33 +- .../tile/TileEntityChemicalCrystallizer.java | 4 - .../blockstates/chemical_crystallizer.json | 2 +- .../chemical_dissolution_chamber.json | 2 +- .../blockstates/formulaic_assemblicator.json | 1 + .../blockstates/seismic_vibrator.json | 2 +- .../mekanism/gui/GuiChemicalCrystallizer.png | Bin 18862 -> 8644 bytes .../mekanism/models/block/chargepad.json | 2 +- .../models/block/chemical_crystallizer.json | 229 ------- .../block/chemical_dissolution_chamber.json | 398 ------------ .../models/block/chemical_infuser.json | 2 +- .../models/block/chemical_oxidizer.json | 2 +- .../mekanism/models/block/electric_pump.json | 132 +--- .../models/block/electrolytic_separator.json | 2 +- .../mekanism/models/block/energy_cube.json | 2 +- .../assets/mekanism/models/block/factory.json | 13 - .../models/block/fluidic_plenisher.json | 13 - .../mekanism/models/block/gas_tank.json | 2 +- .../assets/mekanism/models/block/laser.json | 4 +- .../models/block/laser_amplifier.json | 2 +- .../block/pressurized_reaction_chamber.json | 2 +- .../models/block/quantum_entangloporter.json | 2 +- .../models/block/resistive_heater.json | 2 +- .../models/block/rotary_condensentrator.json | 2 +- .../models/block/seismic_vibrator.json | 593 ------------------ .../mekanism/models/block/solar_tri.obj | 513 --------------- 48 files changed, 100 insertions(+), 3325 deletions(-) delete mode 100644 src/main/java/mekanism/client/model/ModelChemicalInfuser.java delete mode 100644 src/main/java/mekanism/client/model/ModelChemicalOxidizer.java delete mode 100644 src/main/java/mekanism/client/model/ModelChemicalWasher.java delete mode 100644 src/main/java/mekanism/client/model/ModelGasTank.java delete mode 100644 src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java delete mode 100644 src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java delete mode 100644 src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java delete mode 100644 src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java delete mode 100644 src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java delete mode 100644 src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java delete mode 100644 src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java delete mode 100644 src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java delete mode 100644 src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java delete mode 100644 src/main/resources/assets/mekanism/models/block/chemical_crystallizer.json delete mode 100644 src/main/resources/assets/mekanism/models/block/chemical_dissolution_chamber.json delete mode 100644 src/main/resources/assets/mekanism/models/block/factory.json delete mode 100644 src/main/resources/assets/mekanism/models/block/seismic_vibrator.json delete mode 100644 src/main/resources/assets/mekanism/models/block/solar_tri.obj diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 4d6dc7aee..78b228d0d 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -80,23 +80,16 @@ import mekanism.client.render.tileentity.RenderBin; import mekanism.client.render.tileentity.RenderChargepad; import mekanism.client.render.tileentity.RenderChemicalCrystallizer; import mekanism.client.render.tileentity.RenderChemicalDissolutionChamber; -import mekanism.client.render.tileentity.RenderChemicalInfuser; -import mekanism.client.render.tileentity.RenderChemicalOxidizer; -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.RenderElectricPump; -import mekanism.client.render.tileentity.RenderElectrolyticSeparator; import mekanism.client.render.tileentity.RenderEnergyCube; import mekanism.client.render.tileentity.RenderFluidTank; import mekanism.client.render.tileentity.RenderFluidicPlenisher; 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.RenderSecurityDesk; @@ -166,9 +159,6 @@ 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; -import mekanism.common.tile.TileEntityInductionPort; -import mekanism.common.tile.TileEntityInductionProvider; import mekanism.common.tile.TileEntityLaserAmplifier; import mekanism.common.tile.TileEntityLaserTractorBeam; import mekanism.common.tile.TileEntityLogisticalSorter; @@ -186,7 +176,6 @@ 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; import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.tile.TileEntityThermalEvaporationController; import net.minecraft.client.Minecraft; @@ -219,9 +208,9 @@ import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import scala.actors.threadpool.Arrays; /** * Client proxy for the Mekanism mod. @@ -236,7 +225,7 @@ public class ClientProxy extends CommonProxy public static final String[] CUSTOM_RENDERS = new String[] {"fluid_tank", "bin_basic", "bin_advanced", "bin_elite", "bin_ultimate", "Jetpack", "FreeRunners", "AtomicDisassembler", "ScubaTank", "GasMask", "ArmoredJetpack", "Flamethrower", "personal_chest", - "solar_neutron_activator"}; + "solar_neutron_activator", "chemical_dissolution_chamber", "chemical_crystallizer", "seismic_vibrator"}; @Override public void loadConfiguration() @@ -299,8 +288,7 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityEliteFactory.class, "UltimateSmeltingFactory", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityPurificationChamber.class, "PurificationChamber", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityEnergizedSmelter.class, "EnergizedSmelter", new RenderConfigurableMachine()); - //ClientRegistry.registerTileEntity(TileEntityMetallurgicInfuser.class, "MetallurgicInfuser", new RenderMetallurgicInfuser()); - //ClientRegistry.registerTileEntity(TileEntityObsidianTNT.class, "ObsidianTNT", new RenderObsidianTNT()); + ClientRegistry.registerTileEntity(TileEntityMetallurgicInfuser.class, "MetallurgicInfuser", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityGasTank.class, "GasTank", new RenderGasTank()); ClientRegistry.registerTileEntity(TileEntityEnergyCube.class, "EnergyCube", new RenderEnergyCube()); ClientRegistry.registerTileEntity(TileEntityElectricPump.class, "ElectricPump", new RenderElectricPump()); @@ -311,39 +299,23 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityLogisticalSorter.class, "LogisticalSorter", new RenderLogisticalSorter()); ClientRegistry.registerTileEntity(TileEntityBin.class, "Bin", new RenderBin()); ClientRegistry.registerTileEntity(TileEntityDigitalMiner.class, "DigitalMiner", new RenderDigitalMiner()); - GameRegistry.registerTileEntity(TileEntityRotaryCondensentrator.class, "RotaryCondensentrator"); ClientRegistry.registerTileEntity(TileEntityTeleporter.class, "MekanismTeleporter", new RenderTeleporter()); - ClientRegistry.registerTileEntity(TileEntityChemicalOxidizer.class, "ChemicalOxidizer", new RenderChemicalOxidizer()); - ClientRegistry.registerTileEntity(TileEntityChemicalInfuser.class, "ChemicalInfuser", new RenderChemicalInfuser()); ClientRegistry.registerTileEntity(TileEntityChemicalInjectionChamber.class, "ChemicalInjectionChamber", new RenderConfigurableMachine()); - ClientRegistry.registerTileEntity(TileEntityElectrolyticSeparator.class, "ElectrolyticSeparator", new RenderElectrolyticSeparator()); ClientRegistry.registerTileEntity(TileEntityThermalEvaporationController.class, "ThermalEvaporationController", new RenderThermalEvaporationController()); ClientRegistry.registerTileEntity(TileEntityPrecisionSawmill.class, "PrecisionSawmill", new RenderConfigurableMachine()); - ClientRegistry.registerTileEntity(TileEntityChemicalDissolutionChamber.class, "ChemicalDissolutionChamber", new RenderChemicalDissolutionChamber()); - ClientRegistry.registerTileEntity(TileEntityChemicalWasher.class, "ChemicalWasher", new RenderChemicalWasher()); ClientRegistry.registerTileEntity(TileEntityChemicalCrystallizer.class, "ChemicalCrystallizer", new RenderChemicalCrystallizer()); ClientRegistry.registerTileEntity(TileEntitySeismicVibrator.class, "SeismicVibrator", new RenderSeismicVibrator()); - ClientRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber", new RenderPressurizedReactionChamber()); + ClientRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityFluidTank.class, "FluidTank", new RenderFluidTank()); ClientRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher", new RenderFluidicPlenisher()); - //ClientRegistry.registerTileEntity(TileEntityLaser.class, "Laser", new RenderLaser()); - ClientRegistry.registerTileEntity(TileEntityLaserAmplifier.class, "LaserAmplifier", new RenderLaserAmplifier()); - ClientRegistry.registerTileEntity(TileEntityLaserTractorBeam.class, "LaserTractorBeam", new RenderLaserTractorBeam()); ClientRegistry.registerTileEntity(TileEntitySolarNeutronActivator.class, "SolarNeutronActivator", new RenderSolarNeutronActivator()); - GameRegistry.registerTileEntity(TileEntityAmbientAccumulator.class, "AmbientAccumulator"); - GameRegistry.registerTileEntity(TileEntityInductionCasing.class, "InductionCasing"); - GameRegistry.registerTileEntity(TileEntityInductionPort.class, "InductionPort"); - GameRegistry.registerTileEntity(TileEntityInductionCell.class, "InductionCell"); - GameRegistry.registerTileEntity(TileEntityInductionProvider.class, "InductionProvider"); - GameRegistry.registerTileEntity(TileEntityOredictionificator.class, "Oredictionificator"); - GameRegistry.registerTileEntity(TileEntityStructuralGlass.class, "StructuralGlass"); 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"); + ClientRegistry.registerTileEntity(TileEntityChemicalDissolutionChamber.class, "ChemicalDissolutionChamber", new RenderChemicalDissolutionChamber()); } @Override @@ -467,7 +439,7 @@ public class ClientProxy extends CommonProxy } } - if(type == MachineType.FLUID_TANK || type == MachineType.PERSONAL_CHEST || type == MachineType.SOLAR_NEUTRON_ACTIVATOR) + if(Arrays.asList(CUSTOM_RENDERS).contains(type.getName())) { properties = "inventory"; } diff --git a/src/main/java/mekanism/client/model/ModelChemicalInfuser.java b/src/main/java/mekanism/client/model/ModelChemicalInfuser.java deleted file mode 100644 index d5777f82f..000000000 --- a/src/main/java/mekanism/client/model/ModelChemicalInfuser.java +++ /dev/null @@ -1,268 +0,0 @@ -package mekanism.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ModelChemicalInfuser extends ModelBase -{ - 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() - { - textureWidth = 128; - textureHeight = 64; - - 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; - //TODO - 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; - //TODO - 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; - //TODO - 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; - //TODO - 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; - //TODO - 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; - //TODO - 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; - //TODO - setRotation(exhaust1, 0.3490659F, 0F, 0F); - } - - public void render(float size) - { - 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) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java deleted file mode 100644 index 13c18a3a1..000000000 --- a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java +++ /dev/null @@ -1,109 +0,0 @@ -package mekanism.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ModelChemicalOxidizer extends ModelBase -{ - 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 = 64; - - 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) - { - 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) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} \ No newline at end of file diff --git a/src/main/java/mekanism/client/model/ModelChemicalWasher.java b/src/main/java/mekanism/client/model/ModelChemicalWasher.java deleted file mode 100644 index 0e4c10df1..000000000 --- a/src/main/java/mekanism/client/model/ModelChemicalWasher.java +++ /dev/null @@ -1,220 +0,0 @@ -package mekanism.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ModelChemicalWasher extends ModelBase -{ - 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() - { - textureWidth = 128; - textureHeight = 64; - - 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; - //TODO - 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; - //TODO - 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; - //TODO - 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; - //TODO - 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; - //TODO - 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; - //TODO - 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; - //TODO - setRotation(tubeLeft3, 0F, 0F, -0.8203047F); - } - - public void render(float size) - { - 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) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/src/main/java/mekanism/client/model/ModelGasTank.java b/src/main/java/mekanism/client/model/ModelGasTank.java deleted file mode 100644 index 9942e6ae1..000000000 --- a/src/main/java/mekanism/client/model/ModelGasTank.java +++ /dev/null @@ -1,110 +0,0 @@ -package mekanism.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ModelGasTank extends ModelBase -{ - ModelRenderer rim4; - ModelRenderer rim5; - ModelRenderer rim2; - ModelRenderer tankBase; - ModelRenderer valve; - ModelRenderer rim3; - ModelRenderer tank; - ModelRenderer rim0; - ModelRenderer valveBase; - ModelRenderer rim1; - - public ModelGasTank() - { - textureWidth = 64; - textureHeight = 32; - - 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) - { - 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) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java b/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java deleted file mode 100644 index a7c1b4365..000000000 --- a/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java +++ /dev/null @@ -1,165 +0,0 @@ -package mekanism.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ModelMetallurgicInfuser extends ModelBase -{ - 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() - { - textureWidth = 128; - textureHeight = 64; - - 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) - { - 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) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java b/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java deleted file mode 100644 index 10f9cfd1e..000000000 --- a/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java +++ /dev/null @@ -1,109 +0,0 @@ -package mekanism.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ModelPressurizedReactionChamber extends ModelBase -{ - ModelRenderer frontDivider1; - ModelRenderer base; - ModelRenderer front; - ModelRenderer bar1; - ModelRenderer body; - ModelRenderer bar5; - ModelRenderer bar4; - ModelRenderer bar3; - ModelRenderer bar2; - ModelRenderer frontDivider2; - - public ModelPressurizedReactionChamber() - { - textureWidth = 128; - textureHeight = 64; - - 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) - { - 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) - { - 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 f09a7f23b..b6441c650 100644 --- a/src/main/java/mekanism/client/model/ModelSeismicVibrator.java +++ b/src/main/java/mekanism/client/model/ModelSeismicVibrator.java @@ -106,7 +106,6 @@ public class ModelSeismicVibrator extends ModelBase arm3.setRotationPoint(-1F, 7F, 3F); arm3.setTextureSize(128, 64); arm3.mirror = true; - //TODO setRotation(arm3, -0.3665191F, 0F, 0F); plate2 = new ModelRenderer(this, 48, 0); plate2.addBox(0F, 0F, 0F, 4, 2, 4); @@ -137,7 +136,6 @@ public class ModelSeismicVibrator extends ModelBase frameBack5.setRotationPoint(7.5F, 7F, 6.49F); frameBack5.setTextureSize(128, 64); frameBack5.mirror = true; - //TODO setRotation(frameBack5, 0F, 0F, 0.837758F); pole3 = new ModelRenderer(this, 0, 34); pole3.addBox(0F, 0F, 0F, 1, 25, 1); @@ -150,7 +148,6 @@ public class ModelSeismicVibrator extends ModelBase frameRight5.setRotationPoint(6.485F, 7F, -7.5F); frameRight5.setTextureSize(128, 64); frameRight5.mirror = true; - //TODO setRotation(frameRight5, 0.837758F, 0F, 0F); baseRight = new ModelRenderer(this, 38, 18); baseRight.mirror = true; @@ -187,35 +184,30 @@ public class ModelSeismicVibrator extends ModelBase frameRight4.setRotationPoint(6.49F, 7F, 7.5F); frameRight4.setTextureSize(128, 64); frameRight4.mirror = true; - //TODO 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; - //TODO 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; - //TODO 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; - //TODO 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; - //TODO setRotation(frameLeft4, -0.837758F, 0F, 0F); frameBack3 = new ModelRenderer(this, 36, 52); frameBack3.addBox(0F, 0F, 0F, 13, 1, 1); @@ -228,14 +220,12 @@ public class ModelSeismicVibrator extends ModelBase frameLeft2.setRotationPoint(-7.485F, -6F, -7.5F); frameLeft2.setTextureSize(128, 64); frameLeft2.mirror = true; - //TODO 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; - //TODO setRotation(frameLeft1, -0.837758F, 0F, 0F); pole2 = new ModelRenderer(this, 0, 34); pole2.addBox(0F, 0F, 0F, 1, 25, 1); @@ -248,21 +238,18 @@ public class ModelSeismicVibrator extends ModelBase frameBack1.setRotationPoint(7.5F, -6F, 6.49F); frameBack1.setTextureSize(128, 64); frameBack1.mirror = true; - //TODO 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; - //TODO 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; - //TODO setRotation(frameBack4, 0F, 0F, -0.837758F); frameLeft3 = new ModelRenderer(this, 64, 27); frameLeft3.addBox(0F, 0F, 0F, 1, 1, 13); diff --git a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java index 3ad465f55..0fbbb7e82 100644 --- a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java +++ b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java @@ -7,11 +7,14 @@ import javax.vecmath.Matrix4f; import mekanism.client.model.ModelArmoredJetpack; import mekanism.client.model.ModelAtomicDisassembler; +import mekanism.client.model.ModelChemicalCrystallizer; +import mekanism.client.model.ModelChemicalDissolutionChamber; import mekanism.client.model.ModelFlamethrower; import mekanism.client.model.ModelFreeRunners; import mekanism.client.model.ModelGasMask; import mekanism.client.model.ModelJetpack; import mekanism.client.model.ModelScubaTank; +import mekanism.client.model.ModelSeismicVibrator; import mekanism.client.model.ModelSolarNeutronActivator; import mekanism.client.render.ctm.ModelChiselBlock; import mekanism.client.render.tileentity.RenderBin; @@ -74,6 +77,9 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel public static ModelFlamethrower flamethrower = new ModelFlamethrower(); public static ModelChest personalChest = new ModelChest(); public static ModelSolarNeutronActivator solarNeutronActivator = new ModelSolarNeutronActivator(); + public static ModelSeismicVibrator seismicVibrator = new ModelSeismicVibrator(); + public static ModelChemicalDissolutionChamber chemicalDissolutionChamber = new ModelChemicalDissolutionChamber(); + public static ModelChemicalCrystallizer chemicalCrystallizer = new ModelChemicalCrystallizer(); public BakedCustomItemModel(IBakedModel model, ItemStack s) { @@ -142,6 +148,28 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarNeutronActivator.png")); solarNeutronActivator.render(0.0625F); } + else if(machineType == MachineType.SEISMIC_VIBRATOR) + { + GL11.glRotatef(180F, 0.0F, 0.0F, 1.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(machineType == MachineType.CHEMICAL_CRYSTALLIZER) + { + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + GL11.glTranslatef(0.05F, -1.02F, 0.05F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalCrystallizer.png")); + chemicalCrystallizer.render(0.0625F); + } + else if(machineType == MachineType.CHEMICAL_DISSOLUTION_CHAMBER) + { + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + GL11.glTranslatef(0.05F, -1.02F, 0.05F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalDissolutionChamber.png")); + chemicalDissolutionChamber.render(0.0625F); + } return; } @@ -343,6 +371,11 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel GlStateManager.scale(0.5F, 0.5F, 0.5F); doRender(cameraTransformType); GlStateManager.scale(2.0F, 2.0F, 2.0F); + GlStateManager.enableLighting(); + GlStateManager.enableLight(0); + GlStateManager.enableLight(1); + GlStateManager.enableColorMaterial(); + GlStateManager.colorMaterial(1032, 5634); GlStateManager.popMatrix(); return Pair.of(this, null); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java index e7dc091f0..a4f4733e6 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java @@ -10,8 +10,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class RenderChemicalCrystallizer extends TileEntitySpecialRenderer { @@ -21,7 +19,7 @@ public class RenderChemicalCrystallizer extends TileEntitySpecialRenderer -{ - private ModelChemicalInfuser model = new ModelChemicalInfuser(); - - @Override - public void renderTileEntityAt(TileEntityChemicalInfuser tileEntity, double x, double y, double z, float partialTick, int destroyStage) - { - GlStateManager.pushMatrix(); - GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F); - - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalInfuser.png")); - - switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ - { - case 2: GlStateManager.rotate(0, 0.0F, 1.0F, 0.0F); break; - case 3: GlStateManager.rotate(180, 0.0F, 1.0F, 0.0F); break; - case 4: GlStateManager.rotate(90, 0.0F, 1.0F, 0.0F); break; - case 5: GlStateManager.rotate(270, 0.0F, 1.0F, 0.0F); break; - } - - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - model.render(0.0625F); - - GlStateManager.popMatrix(); - } -} diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java deleted file mode 100644 index 5859cb8e7..000000000 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java +++ /dev/null @@ -1,48 +0,0 @@ -package mekanism.client.render.tileentity; - -import java.util.HashMap; -import java.util.Map; - -import mekanism.api.gas.Gas; -import mekanism.client.model.ModelChemicalOxidizer; -import mekanism.client.render.MekanismRenderer.DisplayInteger; -import mekanism.common.tile.TileEntityChemicalOxidizer; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.util.EnumFacing; - -import org.lwjgl.opengl.GL11; - -public class RenderChemicalOxidizer extends TileEntitySpecialRenderer -{ - private ModelChemicalOxidizer model = new ModelChemicalOxidizer(); - - private static final double offset = 0.001; - - private Map> cachedGasses = new HashMap>(); - - @Override - public void renderTileEntityAt(TileEntityChemicalOxidizer tileEntity, double x, double y, double z, float partialTick, int destroyStage) - { - GlStateManager.pushMatrix(); - GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F); - - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalOxidizer.png")); - - switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ - { - case 2: GlStateManager.rotate(0, 0.0F, 1.0F, 0.0F); break; - case 3: GlStateManager.rotate(180, 0.0F, 1.0F, 0.0F); break; - case 4: GlStateManager.rotate(90, 0.0F, 1.0F, 0.0F); break; - case 5: GlStateManager.rotate(270, 0.0F, 1.0F, 0.0F); break; - } - - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - - model.render(0.0625F); - - GlStateManager.popMatrix(); - } -} diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java deleted file mode 100644 index e541cdfbe..000000000 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java +++ /dev/null @@ -1,35 +0,0 @@ -package mekanism.client.render.tileentity; - -import mekanism.client.model.ModelChemicalWasher; -import mekanism.common.tile.TileEntityChemicalWasher; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; - -import org.lwjgl.opengl.GL11; - -public class RenderChemicalWasher extends TileEntitySpecialRenderer -{ - private ModelChemicalWasher model = new ModelChemicalWasher(); - - @Override - public void renderTileEntityAt(TileEntityChemicalWasher tileEntity, double x, double y, double z, float partialTick, int destroyStage) - { - GlStateManager.pushMatrix(); - GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalWasher.png")); - - switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ - { - case 2: GlStateManager.rotate(0, 0.0F, 1.0F, 0.0F); break; - case 3: GlStateManager.rotate(180, 0.0F, 1.0F, 0.0F); break; - case 4: GlStateManager.rotate(90, 0.0F, 1.0F, 0.0F); break; - case 5: GlStateManager.rotate(270, 0.0F, 1.0F, 0.0F); break; - } - - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - model.render(0.0625F); - GlStateManager.popMatrix(); - } -} diff --git a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java index b6e2bbbb5..bba54ec96 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java @@ -5,6 +5,7 @@ import java.util.HashMap; 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; @@ -14,6 +15,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; @@ -103,13 +105,13 @@ public class RenderConfigurableMachine -{ - private ModelElectrolyticSeparator model = new ModelElectrolyticSeparator(); - - @Override - public void renderTileEntityAt(TileEntityElectrolyticSeparator tileEntity, double x, double y, double z, float partialTick, int destroyStage) - { - GlStateManager.pushMatrix(); - GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 2.5F); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectrolyticSeparator.png")); - - switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ - { - case 2: GlStateManager.rotate(0, 0.0F, 1.0F, 0.0F); break; - case 3: GlStateManager.rotate(180, 0.0F, 1.0F, 0.0F); break; - case 4: GlStateManager.rotate(90, 0.0F, 1.0F, 0.0F); break; - case 5: GlStateManager.rotate(270, 0.0F, 1.0F, 0.0F); break; - } - - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - GlStateManager.rotate(90F, 0.0F, 1.0F, 0.0F); - model.render(0.0625F); - GlStateManager.popMatrix(); - } -} diff --git a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java index 71da113b3..bf0035742 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java @@ -1,40 +1,17 @@ package mekanism.client.render.tileentity; -import mekanism.client.model.ModelGasTank; +import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityGasTank; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class RenderGasTank extends TileEntitySpecialRenderer { - private ModelGasTank model = new ModelGasTank(); - @Override public void renderTileEntityAt(TileEntityGasTank tileEntity, double x, double y, double z, float partialTick, int destroyStage) { - GlStateManager.pushMatrix(); - GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank" + tileEntity.tier.getBaseTier().getSimpleName() + ".png")); - - switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ - { - case 2: GlStateManager.rotate(0, 0.0F, 1.0F, 0.0F); break; - case 3: GlStateManager.rotate(180, 0.0F, 1.0F, 0.0F); break; - case 4: GlStateManager.rotate(90, 0.0F, 1.0F, 0.0F); break; - case 5: GlStateManager.rotate(270, 0.0F, 1.0F, 0.0F); break; - } - - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - model.render(0.0625F); - GlStateManager.popMatrix(); - - //TODO MekanismRenderer.machineRenderer.renderAModelAt(tileEntity, x, y, z, partialTick); + MekanismRenderer.machineRenderer.renderTileEntityAt(tileEntity, x, y, z, partialTick, destroyStage); } } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java b/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java deleted file mode 100644 index 5aca86ebf..000000000 --- a/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java +++ /dev/null @@ -1,62 +0,0 @@ -package mekanism.client.render.tileentity; - -import mekanism.client.model.ModelLaserAmplifier; -import mekanism.client.render.MekanismRenderer; -import mekanism.common.tile.TileEntityLaserAmplifier; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import org.lwjgl.opengl.GL11; - -@SideOnly(Side.CLIENT) -public class RenderLaserAmplifier extends TileEntitySpecialRenderer -{ - private ModelLaserAmplifier model = new ModelLaserAmplifier(); - - @Override - public void renderTileEntityAt(TileEntityLaserAmplifier tileEntity, double x, double y, double z, float partialTick, int destroyStage) - { - GlStateManager.pushMatrix(); - GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F); - - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LaserAmplifier.png")); - - switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ - { - case 0: - GlStateManager.translate(0.0F, -2.0F, 0.0F); - GlStateManager.rotate(180F, 1.0F, 0.0F, 0.0F); - break; - case 5: - GlStateManager.translate(0.0F, -1.0F, 0.0F); - GlStateManager.translate(1.0F, 0.0F, 0.0F); - GlStateManager.rotate(90, 0.0F, 0.0F, -1.0F); - break; - case 4: - GlStateManager.translate(0.0F, -1.0F, 0.0F); - GlStateManager.translate(-1.0F, 0.0F, 0.0F); - GlStateManager.rotate(90, 0.0F, 0.0F, 1.0F); - break; - case 2: - GlStateManager.translate(0.0F, -1.0F, 0.0F); - GlStateManager.translate(0.0F, 0.0F, -1.0F); - GlStateManager.rotate(90, -1.0F, 0.0F, 0.0F); - break; - case 3: - GlStateManager.translate(0.0F, -1.0F, 0.0F); - GlStateManager.translate(0.0F, 0.0F, 1.0F); - GlStateManager.rotate(90, 1.0F, 0.0F, 0.0F); - break; - } - - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - MekanismRenderer.blendOn(); - model.render(0.0625F); - MekanismRenderer.blendOff(); - GlStateManager.popMatrix(); - } -} diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java b/src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java deleted file mode 100644 index c3cbc8c71..000000000 --- a/src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java +++ /dev/null @@ -1,59 +0,0 @@ -package mekanism.client.render.tileentity; - -import mekanism.client.model.ModelLaserAmplifier; -import mekanism.client.render.MekanismRenderer; -import mekanism.common.tile.TileEntityLaserTractorBeam; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; - -import org.lwjgl.opengl.GL11; - -public class RenderLaserTractorBeam extends TileEntitySpecialRenderer -{ - private ModelLaserAmplifier model = new ModelLaserAmplifier(); - - @Override - public void renderTileEntityAt(TileEntityLaserTractorBeam tileEntity, double x, double y, double z, float partialTick, int destroyStage) - { - GlStateManager.pushMatrix(); - GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F); - - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LaserTractorBeam.png")); - - switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ - { - case 0: - GlStateManager.translate(0.0F, -2.0F, 0.0F); - GlStateManager.rotate(180F, 1.0F, 0.0F, 0.0F); - break; - case 5: - GlStateManager.translate(0.0F, -1.0F, 0.0F); - GlStateManager.translate(1.0F, 0.0F, 0.0F); - GlStateManager.rotate(90, 0.0F, 0.0F, -1.0F); - break; - case 4: - GlStateManager.translate(0.0F, -1.0F, 0.0F); - GlStateManager.translate(-1.0F, 0.0F, 0.0F); - GlStateManager.rotate(90, 0.0F, 0.0F, 1.0F); - break; - case 2: - GlStateManager.translate(0.0F, -1.0F, 0.0F); - GlStateManager.translate(0.0F, 0.0F, -1.0F); - GlStateManager.rotate(90, -1.0F, 0.0F, 0.0F); - break; - case 3: - GlStateManager.translate(0.0F, -1.0F, 0.0F); - GlStateManager.translate(0.0F, 0.0F, 1.0F); - GlStateManager.rotate(90, 1.0F, 0.0F, 0.0F); - break; - } - - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - MekanismRenderer.blendOn(); - model.render(0.0625F); - MekanismRenderer.blendOff(); - GlStateManager.popMatrix(); - } -} diff --git a/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java b/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java deleted file mode 100644 index 2c4a3f4f8..000000000 --- a/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java +++ /dev/null @@ -1,42 +0,0 @@ -package mekanism.client.render.tileentity; - -import mekanism.client.model.ModelPressurizedReactionChamber; -import mekanism.client.render.MekanismRenderer; -import mekanism.common.tile.TileEntityPRC; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import org.lwjgl.opengl.GL11; - -@SideOnly(Side.CLIENT) -public class RenderPressurizedReactionChamber extends TileEntitySpecialRenderer -{ - private ModelPressurizedReactionChamber model = new ModelPressurizedReactionChamber(); - - @Override - public void renderTileEntityAt(TileEntityPRC tileEntity, double x, double y, double z, float partialTick, int destroyStage) - { - GlStateManager.pushMatrix(); - GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F); - - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PressurizedReactionChamber.png")); - - switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ - { - case 2: GlStateManager.rotate(0, 0.0F, 1.0F, 0.0F); break; - case 3: GlStateManager.rotate(180, 0.0F, 1.0F, 0.0F); break; - case 4: GlStateManager.rotate(90, 0.0F, 1.0F, 0.0F); break; - case 5: GlStateManager.rotate(270, 0.0F, 1.0F, 0.0F); break; - } - - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - model.render(0.0625F); - GlStateManager.popMatrix(); - - MekanismRenderer.machineRenderer.renderTileEntityAt(tileEntity, x, y, z, partialTick, destroyStage); - } -} \ No newline at end of file diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java b/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java index 4a41c9c52..3645f52cd 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java @@ -20,7 +20,7 @@ public class RenderSeismicVibrator extends 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 literal 18862 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 LME9 Date: Wed, 11 May 2016 20:37:35 -0400 Subject: [PATCH 19/22] More things are now rendering properly, we're almost done --- .../java/mekanism/client/ClientProxy.java | 21 +- .../client/model/ModelEnergyCube.java | 53 +-- .../mekanism/client/model/ModelLaser.java | 187 ----------- .../client/model/ModelLaserAmplifier.java | 85 ----- .../model/ModelQuantumEntangloporter.java | 9 +- .../client/model/ModelResistiveHeater.java | 9 +- .../client/model/ModelSecurityDesk.java | 9 - .../client/render/MekanismRenderer.java | 3 +- .../render/item/BakedCustomItemModel.java | 94 +++++- .../tileentity/RenderConfigurableMachine.java | 12 +- .../render/tileentity/RenderEnergyCube.java | 7 +- .../RenderQuantumEntangloporter.java | 2 +- .../tileentity/RenderResistiveHeater.java | 4 +- .../tileentity/RenderSeismicVibrator.java | 2 +- .../block/states/BlockStateMachine.java | 2 +- .../mekanism/blockstates/BoundingBlock.json | 5 +- .../mekanism/blockstates/EnergyCube.json | 15 +- .../mekanism/blockstates/electric_pump.json | 10 +- .../mekanism/blockstates/security_desk.json | 2 +- .../mekanism/models/block/energy_cube.json | 312 ------------------ .../models/block/quantum_entangloporter.json | 28 +- .../mekanism/models/block/security_desk.json | 138 -------- .../mekanism/render/SeismicVibratorOn.png | Bin 9416 -> 0 bytes .../blocks/models/chemical_crystallizer.png | Bin 4964 -> 0 bytes .../models/chemical_dissolution_chamber.png | Bin 6241 -> 0 bytes .../blocks/models/quantum_entangloporter.png | Bin 0 -> 7655 bytes 26 files changed, 156 insertions(+), 853 deletions(-) delete mode 100644 src/main/java/mekanism/client/model/ModelLaser.java delete mode 100644 src/main/java/mekanism/client/model/ModelLaserAmplifier.java delete mode 100644 src/main/resources/assets/mekanism/models/block/security_desk.json delete mode 100755 src/main/resources/assets/mekanism/render/SeismicVibratorOn.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/chemical_crystallizer.png delete mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/chemical_dissolution_chamber.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/models/quantum_entangloporter.png diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 78b228d0d..7bfaeec45 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -103,9 +103,7 @@ import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; import mekanism.common.Tier.BaseTier; -import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.GasTankTier; -import mekanism.common.base.IEnergyCube; import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; @@ -225,7 +223,8 @@ public class ClientProxy extends CommonProxy public static final String[] CUSTOM_RENDERS = new String[] {"fluid_tank", "bin_basic", "bin_advanced", "bin_elite", "bin_ultimate", "Jetpack", "FreeRunners", "AtomicDisassembler", "ScubaTank", "GasMask", "ArmoredJetpack", "Flamethrower", "personal_chest", - "solar_neutron_activator", "chemical_dissolution_chamber", "chemical_crystallizer", "seismic_vibrator"}; + "solar_neutron_activator", "chemical_dissolution_chamber", "chemical_crystallizer", "seismic_vibrator", "security_desk", + "quantum_entangloporter", "resistive_heater", "EnergyCube"}; @Override public void loadConfiguration() @@ -393,6 +392,7 @@ public class ClientProxy extends CommonProxy ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.SaltBlock), 0, new ModelResourceLocation("mekanism:SaltBlock", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.CardboardBox), 0, new ModelResourceLocation("mekanism:CardboardBox", "storage=false")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.CardboardBox), 1, new ModelResourceLocation("mekanism:CardboardBox", "storage=true")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.EnergyCube), 0, new ModelResourceLocation("mekanism:EnergyCube", "inventory")); for(MachineType type : MachineType.values()) { @@ -481,7 +481,7 @@ public class ClientProxy extends CommonProxy while(true) { - if(machineResources.get(resource) == null) + if(basicResources.get(resource) == null) { List entries = new ArrayList(); @@ -507,7 +507,7 @@ public class ClientProxy extends CommonProxy } } - if(type == BasicBlockType.BIN) + if(type == BasicBlockType.BIN || Arrays.asList(CUSTOM_RENDERS).contains(type.getName())) { properties = "inventory"; } @@ -554,17 +554,6 @@ public class ClientProxy extends CommonProxy ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.OreBlock), ore.ordinal(), new ModelResourceLocation("mekanism:OreBlock", "type=" + ore.getName())); } - ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.EnergyCube), new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) - { - EnergyCubeTier tier = ((IEnergyCube)stack.getItem()).getEnergyCubeTier(stack); - ResourceLocation baseLocation = new ResourceLocation("mekanism", "EnergyCube"); - - return new ModelResourceLocation(baseLocation, "facing=north,tier="+tier); - } - }); - ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.GasTank), new ItemMeshDefinition() { @Override public ModelResourceLocation getModelLocation(ItemStack stack) diff --git a/src/main/java/mekanism/client/model/ModelEnergyCube.java b/src/main/java/mekanism/client/model/ModelEnergyCube.java index ebd548e15..d810d0e5d 100644 --- a/src/main/java/mekanism/client/model/ModelEnergyCube.java +++ b/src/main/java/mekanism/client/model/ModelEnergyCube.java @@ -15,8 +15,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class ModelEnergyCube extends ModelBase { @@ -351,33 +349,36 @@ public class ModelEnergyCube extends ModelBase connectors = new ModelRenderer[] {connectorBottomToggle, connectorTopToggle, connectorFrontToggle, connectorBackToggle, connectorLeftToggle, connectorRightToggle}; } - public void render(float size, EnergyCubeTier tier, TextureManager manager) + public void render(float size, EnergyCubeTier tier, TextureManager manager, boolean renderMain) { - 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); + if(renderMain) + { + 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); + } GlStateManager.pushMatrix(); - GlStateManager.scale(1.0001F, 1.0001F, 1.0001F); - GlStateManager.translate(0, -0.00011F, 0); + GlStateManager.scale(1.001F, 1.005F, 1.001F); + GlStateManager.translate(0, -0.0061F, 0); manager.bindTexture(RenderEnergyCube.resources.get(tier)); MekanismRenderer.glowOn(); diff --git a/src/main/java/mekanism/client/model/ModelLaser.java b/src/main/java/mekanism/client/model/ModelLaser.java deleted file mode 100644 index 8a277f998..000000000 --- a/src/main/java/mekanism/client/model/ModelLaser.java +++ /dev/null @@ -1,187 +0,0 @@ -package mekanism.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; - -public class ModelLaser extends ModelBase -{ - 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 = 32; - - 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; - //TODO - 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) - { - 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) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/src/main/java/mekanism/client/model/ModelLaserAmplifier.java b/src/main/java/mekanism/client/model/ModelLaserAmplifier.java deleted file mode 100644 index 559ca73d8..000000000 --- a/src/main/java/mekanism/client/model/ModelLaserAmplifier.java +++ /dev/null @@ -1,85 +0,0 @@ -package mekanism.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ModelLaserAmplifier extends ModelBase -{ - ModelRenderer S1; - ModelRenderer S2; - ModelRenderer S3; - ModelRenderer S4; - ModelRenderer S5; - ModelRenderer Base; - ModelRenderer S6; - - public ModelLaserAmplifier() - { - textureWidth = 64; - textureHeight = 64; - - S1 = new ModelRenderer(this, 0, 39); - S1.addBox(0F, 0F, 0F, 1, 10, 10); - S1.setRotationPoint(7F, 11F, -5F); - S1.setTextureSize(64, 64); - S1.mirror = true; - setRotation(S1, 0F, 0F, 0F); - S2 = new ModelRenderer(this, 22, 39); - S2.addBox(0F, 0F, 0F, 10, 10, 1); - S2.setRotationPoint(-5F, 11F, 7F); - S2.setTextureSize(64, 64); - S2.mirror = true; - setRotation(S2, 0F, 0F, 0F); - S3 = new ModelRenderer(this, 0, 39); - S3.addBox(0F, 0F, 0F, 1, 10, 10); - S3.setRotationPoint(-8F, 11F, -5F); - S3.setTextureSize(64, 64); - S3.mirror = true; - setRotation(S3, 0F, 0F, 0F); - S4 = new ModelRenderer(this, 0, 28); - S4.addBox(0F, 0F, 0F, 10, 1, 10); - S4.setRotationPoint(-5F, 23F, -5F); - S4.setTextureSize(64, 64); - S4.mirror = true; - setRotation(S4, 0F, 0F, 0F); - S5 = new ModelRenderer(this, 22, 39); - S5.addBox(0F, 0F, 0F, 10, 10, 1); - S5.setRotationPoint(-5F, 11F, -8F); - S5.setTextureSize(64, 64); - S5.mirror = true; - setRotation(S5, 0F, 0F, 0F); - Base = new ModelRenderer(this, 0, 0); - Base.addBox(0F, 0F, 0F, 14, 14, 14); - Base.setRotationPoint(-7F, 9F, -7F); - Base.setTextureSize(64, 64); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - S6 = new ModelRenderer(this, 0, 28); - S6.addBox(0F, 0F, 0F, 10, 1, 10); - S6.setRotationPoint(-5F, 8F, -5F); - S6.setTextureSize(64, 64); - S6.mirror = true; - setRotation(S6, 0F, 0F, 0F); - } - - public void render(float size) - { - S1.render(size); - S2.render(size); - S3.render(size); - S4.render(size); - S5.render(size); - Base.render(size); - S6.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/ModelQuantumEntangloporter.java b/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java index b64aa357a..5f56d3f46 100644 --- a/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/model/ModelQuantumEntangloporter.java @@ -11,8 +11,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class ModelQuantumEntangloporter extends ModelBase { @@ -314,12 +312,15 @@ public class ModelQuantumEntangloporter extends ModelBase setRotation(portLeftLarge, 0F, 0F, 0F); } - public void render(float size, TextureManager manager) + public void render(float size, TextureManager manager, boolean renderMain) { GlStateManager.pushMatrix(); MekanismRenderer.blendOn(); - doRender(size); + if(renderMain) + { + doRender(size); + } manager.bindTexture(OVERLAY); GlStateManager.scale(1.001F, 1.001F, 1.001F); diff --git a/src/main/java/mekanism/client/model/ModelResistiveHeater.java b/src/main/java/mekanism/client/model/ModelResistiveHeater.java index c8b922ee9..11dd13fca 100644 --- a/src/main/java/mekanism/client/model/ModelResistiveHeater.java +++ b/src/main/java/mekanism/client/model/ModelResistiveHeater.java @@ -11,8 +11,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class ModelResistiveHeater extends ModelBase { @@ -167,12 +165,15 @@ public class ModelResistiveHeater extends ModelBase setRotation(portLeft, 0F, 0F, 0F); } - public void render(float size, boolean on, TextureManager manager) + public void render(float size, boolean on, TextureManager manager, boolean renderMain) { GlStateManager.pushMatrix(); MekanismRenderer.blendOn(); - doRender(size); + if(renderMain) + { + doRender(size); + } manager.bindTexture(on ? OVERLAY_ON : OVERLAY_OFF); GlStateManager.scale(1.001F, 1.001F, 1.001F); diff --git a/src/main/java/mekanism/client/model/ModelSecurityDesk.java b/src/main/java/mekanism/client/model/ModelSecurityDesk.java index a0e2cd9fc..6b51e1620 100644 --- a/src/main/java/mekanism/client/model/ModelSecurityDesk.java +++ b/src/main/java/mekanism/client/model/ModelSecurityDesk.java @@ -11,8 +11,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class ModelSecurityDesk extends ModelBase { @@ -51,42 +49,36 @@ public class ModelSecurityDesk extends ModelBase led.setRotationPoint(-7F, 5F, 4F); led.setTextureSize(128, 64); led.mirror = true; - //TODO 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; - //TODO 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; - //TODO 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; - //TODO 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; - //TODO 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; - //TODO setRotation(standBase, 0.1047198F, 0F, 0F); deskMiddle = new ModelRenderer(this, 0, 23); deskMiddle.addBox(0F, 0F, 0F, 14, 1, 14); @@ -99,7 +91,6 @@ public class ModelSecurityDesk extends ModelBase monitorScreen.setRotationPoint(-7F, 5F, 4F); monitorScreen.setTextureSize(128, 64); monitorScreen.mirror = true; - //TODO setRotation(monitorScreen, -0.4712389F, 0F, 0F); } diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index ef2bedf23..924ef0b06 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -226,7 +226,7 @@ public class MekanismRenderer public double textureSizeX = 16, textureSizeY = 16, textureSizeZ = 16; public double textureOffsetX = 0, textureOffsetY = 0, textureOffsetZ = 0; - public int[] textureFlips = new int[6]; + public int[] textureFlips = new int[] {2, 2, 2, 2, 2, 2}; public TextureAtlasSprite[] textures = new TextureAtlasSprite[6]; @@ -296,7 +296,6 @@ public class MekanismRenderer TextureAtlasSprite flowing = getFluidTexture(fluid, FluidType.FLOWING); model.setTextures(still, still, flowing, flowing, flowing, flowing); - model.textureFlips = new int[] {0, 0, 2, 2, 2, 2}; } public static void renderObject(Model3D object) diff --git a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java index 0fbbb7e82..cd26301ca 100644 --- a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java +++ b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java @@ -5,27 +5,38 @@ import java.util.List; import javax.vecmath.Matrix4f; +import mekanism.api.energy.IEnergizedItem; import mekanism.client.model.ModelArmoredJetpack; import mekanism.client.model.ModelAtomicDisassembler; import mekanism.client.model.ModelChemicalCrystallizer; import mekanism.client.model.ModelChemicalDissolutionChamber; +import mekanism.client.model.ModelEnergyCube; import mekanism.client.model.ModelFlamethrower; import mekanism.client.model.ModelFreeRunners; import mekanism.client.model.ModelGasMask; import mekanism.client.model.ModelJetpack; +import mekanism.client.model.ModelQuantumEntangloporter; +import mekanism.client.model.ModelResistiveHeater; import mekanism.client.model.ModelScubaTank; +import mekanism.client.model.ModelSecurityDesk; import mekanism.client.model.ModelSeismicVibrator; import mekanism.client.model.ModelSolarNeutronActivator; +import mekanism.client.render.MekanismRenderer; import mekanism.client.render.ctm.ModelChiselBlock; import mekanism.client.render.tileentity.RenderBin; +import mekanism.client.render.tileentity.RenderEnergyCube; import mekanism.client.render.tileentity.RenderFluidTank; import mekanism.common.MekanismItems; +import mekanism.common.SideData.IOState; +import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.FluidTankTier; +import mekanism.common.base.IEnergyCube; import mekanism.common.block.states.BlockStateBasic.BasicBlockType; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.inventory.InventoryBin; import mekanism.common.item.ItemAtomicDisassembler; import mekanism.common.item.ItemBlockBasic; +import mekanism.common.item.ItemBlockEnergyCube; import mekanism.common.item.ItemBlockMachine; import mekanism.common.item.ItemFlamethrower; import mekanism.common.item.ItemFreeRunners; @@ -56,7 +67,6 @@ import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.fluids.Fluid; import org.apache.commons.lang3.tuple.Pair; -import org.lwjgl.opengl.GL11; public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel { @@ -80,6 +90,10 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel public static ModelSeismicVibrator seismicVibrator = new ModelSeismicVibrator(); public static ModelChemicalDissolutionChamber chemicalDissolutionChamber = new ModelChemicalDissolutionChamber(); public static ModelChemicalCrystallizer chemicalCrystallizer = new ModelChemicalCrystallizer(); + public static ModelSecurityDesk securityDesk = new ModelSecurityDesk(); + public static ModelResistiveHeater resistiveHeater = new ModelResistiveHeater(); + public static ModelQuantumEntangloporter quantumEntangloporter = new ModelQuantumEntangloporter(); + public static ModelEnergyCube energyCube = new ModelEnergyCube(); public BakedCustomItemModel(IBakedModel model, ItemStack s) { @@ -108,6 +122,15 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.popMatrix(); } + else if(basicType == BasicBlockType.SECURITY_DESK) + { + GlStateManager.rotate(180, 1.0F, 0.0F, 0.0F); + GlStateManager.rotate(180, 0.0F, 1.0F, 0.0F); + GlStateManager.scale(0.8F, 0.8F, 0.8F); + GlStateManager.translate(0.0F, -0.8F, 0.0F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SecurityDesk.png")); + securityDesk.render(0.0625F, mc.renderEngine); + } return; } @@ -142,38 +165,77 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel } else if(machineType == MachineType.SOLAR_NEUTRON_ACTIVATOR) { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glScalef(0.6F, 0.6F, 0.6F); - GL11.glTranslatef(0.0F, -0.55F, 0.0F); + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.scale(0.6F, 0.6F, 0.6F); + GlStateManager.translate(0.0F, -0.55F, 0.0F); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarNeutronActivator.png")); solarNeutronActivator.render(0.0625F); } else if(machineType == MachineType.SEISMIC_VIBRATOR) { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glScalef(0.6F, 0.6F, 0.6F); - GL11.glTranslatef(0.0F, -0.55F, 0.0F); + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.scale(0.6F, 0.6F, 0.6F); + GlStateManager.translate(0.0F, -0.55F, 0.0F); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SeismicVibrator.png")); seismicVibrator.render(0.0625F); } else if(machineType == MachineType.CHEMICAL_CRYSTALLIZER) { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.05F, -1.02F, 0.05F); + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.translate(0.05F, -1.001F, 0.05F); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalCrystallizer.png")); chemicalCrystallizer.render(0.0625F); } else if(machineType == MachineType.CHEMICAL_DISSOLUTION_CHAMBER) { - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.05F, -1.02F, 0.05F); + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.translate(0.05F, -1.001F, 0.05F); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalDissolutionChamber.png")); chemicalDissolutionChamber.render(0.0625F); } + else if(machineType == MachineType.QUANTUM_ENTANGLOPORTER) + { + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.translate(0.0F, -1.0F, 0.0F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "QuantumEntangloporter.png")); + quantumEntangloporter.render(0.0625F, mc.renderEngine, true); + } + else if(machineType == MachineType.RESISTIVE_HEATER) + { + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.translate(0.05F, -0.96F, 0.05F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ResistiveHeater.png")); + resistiveHeater.render(0.0625F, false, mc.renderEngine, true); + } return; } + if(stack.getItem() instanceof ItemBlockEnergyCube) + { + GlStateManager.pushMatrix(); + EnergyCubeTier tier = ((IEnergyCube)stack.getItem()).getEnergyCubeTier(stack); + IEnergizedItem energized = (IEnergizedItem)stack.getItem(); + mc.renderEngine.bindTexture(RenderEnergyCube.baseTexture); + + GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(180F, 0.0F, 1.0F, 0.0F); + GlStateManager.translate(0.0F, -1.0F, 0.0F); + + MekanismRenderer.blendOn(); + + energyCube.render(0.0625F, tier, mc.renderEngine, true); + + for(EnumFacing side : EnumFacing.VALUES) + { + mc.renderEngine.bindTexture(RenderEnergyCube.baseTexture); + energyCube.renderSide(0.0625F, side, side == EnumFacing.NORTH ? IOState.OUTPUT : IOState.INPUT, tier, mc.renderEngine); + } + + MekanismRenderer.blendOff(); + GlStateManager.popMatrix(); + } + if(type == TransformType.GUI) { GlStateManager.scale(0.625, 0.625, 0.625); @@ -304,7 +366,15 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel if(Block.getBlockFromItem(stack.getItem()) != null) { - faceQuads.addAll(baseModel.getFaceQuads(facing)); + MachineType machineType = MachineType.get(stack); + + if(machineType != MachineType.QUANTUM_ENTANGLOPORTER && machineType != MachineType.RESISTIVE_HEATER) + { + if(!(stack.getItem() instanceof ItemBlockEnergyCube)) + { + faceQuads.addAll(baseModel.getFaceQuads(facing)); + } + } } return faceQuads; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java index bba54ec96..554b370b8 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java @@ -127,7 +127,7 @@ public class RenderConfigurableMachineR|u?AOJ~3 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 O0000w9AW diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/chemical_crystallizer.png b/src/main/resources/assets/mekanism/textures/blocks/models/chemical_crystallizer.png deleted file mode 100644 index 02805a3132a2a0d8dfc3b5d2cc9714d310b5ebac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4964 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 Rl=^kwX>|)0{{R3Up005AD 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 wf-OCoN{|mor~CiM|JULFtO+cW(HFo=1 Date: Wed, 11 May 2016 23:48:10 -0400 Subject: [PATCH 20/22] Fixed missing texture errors, fixed bounding block particles, fixed Digital Miner in-world and item render --- .../java/mekanism/client/ClientProxy.java | 2 +- .../client/model/ModelArmoredJetpack.java | 2 +- .../mekanism/client/model/ModelBalloon.java | 3 +- .../mekanism/client/model/ModelGasMask.java | 2 +- .../mekanism/client/model/ModelJetpack.java | 2 +- .../client/render/MekanismRenderer.java | 8 +- .../client/render/MinerVisualRenderer.java | 1 + .../client/render/entity/RenderFlame.java | 1 + .../entity/RenderObsidianTNTPrimed.java | 3 +- .../render/item/BakedCustomItemModel.java | 10 + .../render/item/ItemRenderingHandler.java | 489 ------------------ .../tileentity/RenderConfigurableMachine.java | 2 + .../render/tileentity/RenderTeleporter.java | 2 + .../RenderThermalEvaporationController.java | 2 +- src/main/java/mekanism/common/Mekanism.java | 1 - .../java/mekanism/common/MekanismItems.java | 2 + .../mekanism/common/block/BlockBounding.java | 18 +- .../block/states/BlockStateMachine.java | 8 +- .../tools/client/ToolsClientProxy.java | 2 +- .../mekanism/tools/common/MekanismTools.java | 1 - .../tools/common/ToolsCommonProxy.java | 2 +- .../mekanism/tools/common/ToolsItems.java | 2 + .../mekanism/blockstates/BoundingBlock.json | 4 + .../mekanism/blockstates/digital_miner.json | 2 +- 24 files changed, 50 insertions(+), 521 deletions(-) delete mode 100644 src/main/java/mekanism/client/render/item/ItemRenderingHandler.java diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 7bfaeec45..9eece4a1a 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -224,7 +224,7 @@ public class ClientProxy extends CommonProxy public static final String[] CUSTOM_RENDERS = new String[] {"fluid_tank", "bin_basic", "bin_advanced", "bin_elite", "bin_ultimate", "Jetpack", "FreeRunners", "AtomicDisassembler", "ScubaTank", "GasMask", "ArmoredJetpack", "Flamethrower", "personal_chest", "solar_neutron_activator", "chemical_dissolution_chamber", "chemical_crystallizer", "seismic_vibrator", "security_desk", - "quantum_entangloporter", "resistive_heater", "EnergyCube"}; + "quantum_entangloporter", "resistive_heater", "EnergyCube", "digital_miner"}; @Override public void loadConfiguration() diff --git a/src/main/java/mekanism/client/model/ModelArmoredJetpack.java b/src/main/java/mekanism/client/model/ModelArmoredJetpack.java index ee585604d..9ee51e70d 100644 --- a/src/main/java/mekanism/client/model/ModelArmoredJetpack.java +++ b/src/main/java/mekanism/client/model/ModelArmoredJetpack.java @@ -250,7 +250,7 @@ public class ModelArmoredJetpack extends ModelBase WingbladeL.render(size); WingbladeR.render(size); - GL11.glColor4f(1, 1, 1, 1); + MekanismRenderer.resetColor(); GL11.glDisable(GL11.GL_CULL_FACE); MekanismRenderer.glowOff(); MekanismRenderer.blendOff(); diff --git a/src/main/java/mekanism/client/model/ModelBalloon.java b/src/main/java/mekanism/client/model/ModelBalloon.java index 8605a2acd..4fcfd8baf 100644 --- a/src/main/java/mekanism/client/model/ModelBalloon.java +++ b/src/main/java/mekanism/client/model/ModelBalloon.java @@ -1,6 +1,7 @@ package mekanism.client.model; import mekanism.api.EnumColor; +import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; @@ -67,7 +68,7 @@ public class ModelBalloon extends ModelBase Balloon3.render(size); Balloonnub.render(size); - GL11.glColor3f(1, 1, 1); + MekanismRenderer.resetColor(); GlStateManager.popMatrix(); GlStateManager.pushMatrix(); diff --git a/src/main/java/mekanism/client/model/ModelGasMask.java b/src/main/java/mekanism/client/model/ModelGasMask.java index 69c038163..1069eb530 100644 --- a/src/main/java/mekanism/client/model/ModelGasMask.java +++ b/src/main/java/mekanism/client/model/ModelGasMask.java @@ -250,7 +250,7 @@ public class ModelGasMask extends ModelBase glassbackL.render(size); GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glColor4f(1, 1, 1, 1); + MekanismRenderer.resetColor(); MekanismRenderer.glowOff(); MekanismRenderer.blendOff(); diff --git a/src/main/java/mekanism/client/model/ModelJetpack.java b/src/main/java/mekanism/client/model/ModelJetpack.java index d651740cd..7a379b478 100644 --- a/src/main/java/mekanism/client/model/ModelJetpack.java +++ b/src/main/java/mekanism/client/model/ModelJetpack.java @@ -196,7 +196,7 @@ public class ModelJetpack extends ModelBase WingbladeL.render(size); WingbladeR.render(size); - GL11.glColor4f(1, 1, 1, 1); + MekanismRenderer.resetColor(); GL11.glDisable(GL11.GL_CULL_FACE); MekanismRenderer.glowOff(); MekanismRenderer.blendOff(); diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 924ef0b06..7cc50da27 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -23,7 +23,6 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemModelMesher; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; @@ -36,6 +35,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.util.Timer; import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -129,8 +129,6 @@ public class MekanismRenderer public static void registerItemRender(String domain, Item item) { - ItemModelMesher mesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher(); - if(item instanceof IMetaItem) { IMetaItem metaItem = (IMetaItem)item; @@ -144,7 +142,7 @@ public class MekanismRenderer } ModelResourceLocation loc = new ModelResourceLocation(domain + ":" + metaItem.getTexture(i), "inventory"); - mesher.register(item, i, loc); + ModelLoader.setCustomModelResourceLocation(item, i, loc); variants.add(loc); ModelBakery.addVariantName(item, domain + ":" + metaItem.getTexture(i)); } @@ -152,7 +150,7 @@ public class MekanismRenderer return; } - mesher.register(item, 0, new ModelResourceLocation(item.getRegistryName(), "inventory")); + ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(item.getRegistryName(), "inventory")); } diff --git a/src/main/java/mekanism/client/render/MinerVisualRenderer.java b/src/main/java/mekanism/client/render/MinerVisualRenderer.java index 3cdc878ee..f600be1bb 100644 --- a/src/main/java/mekanism/client/render/MinerVisualRenderer.java +++ b/src/main/java/mekanism/client/render/MinerVisualRenderer.java @@ -35,6 +35,7 @@ public final class MinerVisualRenderer GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.8F); mc.getTextureManager().bindTexture(MekanismRenderer.getBlocksTexture()); getList(new MinerRenderData(miner)).render(); + MekanismRenderer.resetColor(); MekanismRenderer.glowOff(); MekanismRenderer.blendOff(); GlStateManager.popMatrix(); diff --git a/src/main/java/mekanism/client/render/entity/RenderFlame.java b/src/main/java/mekanism/client/render/entity/RenderFlame.java index 270522156..c3e080daf 100644 --- a/src/main/java/mekanism/client/render/entity/RenderFlame.java +++ b/src/main/java/mekanism/client/render/entity/RenderFlame.java @@ -74,6 +74,7 @@ public class RenderFlame extends Render } GL11.glDisable(GL12.GL_RESCALE_NORMAL); + MekanismRenderer.resetColor(); MekanismRenderer.glowOff(); MekanismRenderer.blendOff(); GlStateManager.popMatrix(); diff --git a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java index 3073bf884..9ecec3915 100644 --- a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java +++ b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java @@ -1,5 +1,6 @@ package mekanism.client.render.entity; +import mekanism.client.render.MekanismRenderer; import mekanism.common.MekanismBlocks; import mekanism.common.entity.EntityObsidianTNT; import net.minecraft.client.Minecraft; @@ -59,7 +60,7 @@ public class RenderObsidianTNTPrimed extends Render renderer.renderBlockBrightness(MekanismBlocks.ObsidianTNT.getDefaultState(), 1.0F); GlStateManager.doPolygonOffset(0.0F, 0.0F); GlStateManager.disablePolygonOffset(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + MekanismRenderer.resetColor(); GL11.glDisable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_TEXTURE_2D); diff --git a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java index cd26301ca..0b53eca39 100644 --- a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java +++ b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java @@ -10,6 +10,7 @@ import mekanism.client.model.ModelArmoredJetpack; import mekanism.client.model.ModelAtomicDisassembler; import mekanism.client.model.ModelChemicalCrystallizer; import mekanism.client.model.ModelChemicalDissolutionChamber; +import mekanism.client.model.ModelDigitalMiner; import mekanism.client.model.ModelEnergyCube; import mekanism.client.model.ModelFlamethrower; import mekanism.client.model.ModelFreeRunners; @@ -67,6 +68,7 @@ import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.fluids.Fluid; import org.apache.commons.lang3.tuple.Pair; +import org.lwjgl.opengl.GL11; public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel { @@ -94,6 +96,7 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel public static ModelResistiveHeater resistiveHeater = new ModelResistiveHeater(); public static ModelQuantumEntangloporter quantumEntangloporter = new ModelQuantumEntangloporter(); public static ModelEnergyCube energyCube = new ModelEnergyCube(); + public static ModelDigitalMiner digitalMiner = new ModelDigitalMiner(); public BakedCustomItemModel(IBakedModel model, ItemStack s) { @@ -207,6 +210,13 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ResistiveHeater.png")); resistiveHeater.render(0.0625F, false, mc.renderEngine, true); } + else if(machineType == MachineType.DIGITAL_MINER) + { + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + GL11.glTranslatef(0.35F, 0.1F, 0.0F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "DigitalMiner.png")); + digitalMiner.render(0.022F, false, mc.renderEngine); + } return; } diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java deleted file mode 100644 index eeafb8198..000000000 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ /dev/null @@ -1,489 +0,0 @@ -package mekanism.client.render.item; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ItemRenderingHandler// implements IItemRenderer -{ - /* - private Minecraft mc = Minecraft.getMinecraft(); - - public ModelRobit robit = new ModelRobit(); - public ModelChest personalChest = new ModelChest(); - public ModelEnergyCube energyCube = new ModelEnergyCube(); - public ModelEnergyCore energyCore = new ModelEnergyCore(); - public ModelGasTank gasTank = new ModelGasTank(); - public ModelObsidianTNT obsidianTNT = new ModelObsidianTNT(); - public ModelJetpack jetpack = new ModelJetpack(); - public ModelArmoredJetpack armoredJetpack = new ModelArmoredJetpack(); - public ModelGasMask gasMask = new ModelGasMask(); - public ModelScubaTank scubaTank = new ModelScubaTank(); - public ModelFreeRunners freeRunners = new ModelFreeRunners(); - public ModelAtomicDisassembler atomicDisassembler = new ModelAtomicDisassembler(); - public ModelFlamethrower flamethrower = new ModelFlamethrower(); - - private final RenderBalloon balloonRenderer = new RenderBalloon(); - private final RenderBin binRenderer = (RenderBin)TileEntityRendererDispatcher.instance.mapSpecialRenderers.get(TileEntityBin.class); - private final RenderFluidTank portableTankRenderer = (RenderFluidTank)TileEntityRendererDispatcher.instance.mapSpecialRenderers.get(TileEntityFluidTank.class); - private final RenderItem renderItem = (RenderItem)RenderManager.instance.getEntityClassRenderObject(EntityItem.class); - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) - { - if(item.getItem() == MekanismItems.WalkieTalkie) - { - return type != ItemRenderType.INVENTORY; - } - - return true; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) - { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) - { - RenderBlocks renderBlocks = (RenderBlocks)data[0]; - - if(type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) - { - GlStateManager.translate(0.5F, 0.5F, 0.5F); - } - - if(item.getItem() instanceof IEnergyCube) - { - EnergyCubeTier tier = ((IEnergyCube)item.getItem()).getEnergyCubeTier(item); - IEnergizedItem energized = (IEnergizedItem)item.getItem(); - mc.renderEngine.bindTexture(RenderEnergyCube.baseTexture); - - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - GlStateManager.rotate(270F, 0.0F, -1.0F, 0.0F); - GlStateManager.translate(0.0F, -1.0F, 0.0F); - - MekanismRenderer.blendOn(); - - 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); - } - - MekanismRenderer.blendOff(); - - GlStateManager.pushMatrix(); - GL11.glTranslated(0.0, 1.0, 0.0); - mc.renderEngine.bindTexture(RenderEnergyCube.coreTexture); - - GL11.glShadeModel(GL11.GL_SMOOTH); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - - MekanismRenderer.glowOn(); - - EnumColor c = tier.getBaseTier().getColor(); - - GlStateManager.pushMatrix(); - GlStateManager.scale(0.4F, 0.4F, 0.4F); - GL11.glColor4f(c.getColor(0), c.getColor(1), c.getColor(2), (float)(energized.getEnergy(item)/energized.getMaxEnergy(item))); - GlStateManager.translate(0, (float)Math.sin(Math.toRadians((MekanismClient.ticksPassed + MekanismRenderer.getPartialTick()) * 3)) / 7, 0); - GlStateManager.rotate((MekanismClient.ticksPassed + MekanismRenderer.getPartialTick()) * 4, 0, 1, 0); - GlStateManager.rotate(36F + (MekanismClient.ticksPassed + MekanismRenderer.getPartialTick()) * 4, 0, 1, 1); - energyCore.render(0.0625F); - GlStateManager.popMatrix(); - - MekanismRenderer.glowOff(); - - GL11.glShadeModel(GL11.GL_FLAT); - GL11.glDisable(GL11.GL_LINE_SMOOTH); - GL11.glDisable(GL11.GL_POLYGON_SMOOTH); - GL11.glDisable(GL11.GL_BLEND); - - GlStateManager.popMatrix(); - } - else if(BasicType.get(item) == BasicType.INDUCTION_CELL || BasicType.get(item) == BasicType.INDUCTION_PROVIDER) - { - MekanismRenderer.renderCustomItem((RenderBlocks)data[0], item); - } - else if(BasicType.get(item) == BasicType.BIN) - { - GlStateManager.rotate(270, 0.0F, 1.0F, 0.0F); - MekanismRenderer.renderCustomItem((RenderBlocks)data[0], item); - GlStateManager.rotate(-270, 0.0F, 1.0F, 0.0F); - - if(binRenderer == null || binRenderer.func_147498_b()/*getFontRenderer()* / == null) - { - return; - } - - InventoryBin inv = new InventoryBin(item); - ForgeDirection side = ForgeDirection.getOrientation(2); - - String amount = ""; - ItemStack itemStack = inv.getStack(); - - if(itemStack != null) - { - amount = Integer.toString(inv.getItemCount()); - } - - MekanismRenderer.glowOn(); - - if(itemStack != null) - { - GlStateManager.pushMatrix(); - - if(!(itemStack.getItem() instanceof ItemBlock) || Block.getBlockFromItem(itemStack.getItem()).getRenderType() != 0) - { - GlStateManager.rotate(180, 0, 0, 1); - GlStateManager.translate(-1.02F, -0.2F, 0); - - if(type == ItemRenderType.INVENTORY) - { - GlStateManager.translate(-0.45F, -0.4F, 0.0F); - } - } - - if(type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON || type == ItemRenderType.ENTITY) - { - GlStateManager.translate(-0.22F, -0.2F, -0.22F); - } - - GL11.glTranslated(0.73, 0.08, 0.44); - GlStateManager.rotate(90, 0, 1, 0); - - float scale = 0.03125F; - float scaler = 0.9F; - - GlStateManager.scale(scale*scaler, scale*scaler, 0); - - TextureManager renderEngine = mc.renderEngine; - - GL11.glDisable(GL11.GL_LIGHTING); - - renderItem.renderItemAndEffectIntoGUI(binRenderer.func_147498_b()/*getFontRenderer()* /, renderEngine, itemStack, 0, 0); - - GL11.glEnable(GL11.GL_LIGHTING); - GlStateManager.popMatrix(); - } - - MekanismRenderer.glowOff(); - - if(amount != "") - { - float maxScale = 0.02F; - - GlStateManager.pushMatrix(); - - GL11.glPolygonOffset(-10, -10); - GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL); - - float displayWidth = 1 - (2 / 16); - float displayHeight = 1 - (2 / 16); - GlStateManager.translate(0, -0.31F, 0); - - if(type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON || type == ItemRenderType.ENTITY) - { - GL11.glTranslated(-0.5, -0.4, -0.5); - } - - GlStateManager.translate(0, 0.9F, 1); - GlStateManager.rotate(90, 0, 1, 0); - GlStateManager.rotate(90, 1, 0, 0); - - GlStateManager.translate(displayWidth / 2, 1F, displayHeight / 2); - GlStateManager.rotate(-90, 1, 0, 0); - - FontRenderer fontRenderer = binRenderer.func_147498_b();//getFontRenderer(); - - int requiredWidth = Math.max(fontRenderer.getStringWidth(amount), 1); - int lineHeight = fontRenderer.FONT_HEIGHT + 2; - int requiredHeight = lineHeight * 1; - float scaler = 0.4F; - float scaleX = (displayWidth / requiredWidth); - float scale = scaleX * scaler; - - if(maxScale > 0) - { - scale = Math.min(scale, maxScale); - } - - GlStateManager.scale(scale, -scale, scale); - GL11.glDepthMask(false); - - int offsetX; - int offsetY; - int realHeight = (int)Math.floor(displayHeight / scale); - int realWidth = (int)Math.floor(displayWidth / scale); - - offsetX = (realWidth - requiredWidth) / 2; - offsetY = (realHeight - requiredHeight) / 2; - - GL11.glDisable(GL11.GL_LIGHTING); - fontRenderer.drawString("\u00a7f" + amount, offsetX - (realWidth / 2), 1 + offsetY - (realHeight / 2), 1); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDepthMask(true); - GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL); - - GlStateManager.popMatrix(); - } - } - else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.GasTank) - { - GlStateManager.pushMatrix(); - - BaseTier tier = ((ItemBlockGasTank)item.getItem()).getBaseTier(item); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank" + tier.getName() + ".png")); - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - GlStateManager.rotate(90F, 0.0F, 1.0F, 0.0F); - GlStateManager.translate(0.0F, -1.0F, 0.0F); - gasTank.render(0.0625F); - - GlStateManager.popMatrix(); - } - else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.ObsidianTNT) - { - GlStateManager.pushMatrix(); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ObsidianTNT.png")); - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - GlStateManager.rotate(180F, 0.0F, -1.0F, 0.0F); - GlStateManager.translate(0.0F, -1.0F, 0.0F); - obsidianTNT.render(0.0625F); - GlStateManager.popMatrix(); - } - else if(item.getItem() instanceof ItemWalkieTalkie) - { - if(((ItemWalkieTalkie)item.getItem()).getOn(item)) - { - MekanismRenderer.glowOn(); - } - - MekanismRenderer.renderItem(item); - - if(((ItemWalkieTalkie)item.getItem()).getOn(item)) - { - MekanismRenderer.glowOff(); - } - } - else if(MachineType.get(item) == MachineType.PERSONAL_CHEST) - { - GlStateManager.pushMatrix(); - ItemBlockMachine chest = (ItemBlockMachine)item.getItem(); - - GlStateManager.rotate(90F, 0.0F, 1.0F, 0.0F); - GlStateManager.translate(-0.5F, -0.5F, -0.5F); - GlStateManager.translate(0, 1.0F, 1.0F); - GlStateManager.scale(1.0F, -1F, -1F); - - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PersonalChest.png")); - - personalChest.renderAll(); - GlStateManager.popMatrix(); - } - else if(item.getItem() instanceof ItemRobit) - { - GlStateManager.pushMatrix(); - GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F); - GlStateManager.rotate(90, 0.0F, -1.0F, 0.0F); - GlStateManager.translate(0.0F, -1.5F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Robit.png")); - robit.render(0.08F); - GlStateManager.popMatrix(); - } - else if(item.getItem() == MekanismItems.Jetpack) - { - GlStateManager.pushMatrix(); - GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F); - GlStateManager.rotate(90, 0.0F, -1.0F, 0.0F); - GlStateManager.translate(0.2F, -0.35F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Jetpack.png")); - jetpack.render(0.0625F); - GlStateManager.popMatrix(); - } - else if(item.getItem() == MekanismItems.ArmoredJetpack) - { - GlStateManager.pushMatrix(); - GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F); - GlStateManager.rotate(90, 0.0F, -1.0F, 0.0F); - GlStateManager.translate(0.2F, -0.35F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Jetpack.png")); - armoredJetpack.render(0.0625F); - GlStateManager.popMatrix(); - } - else if(item.getItem() instanceof ItemGasMask) - { - GlStateManager.pushMatrix(); - GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F); - GlStateManager.rotate(90, 0.0F, -1.0F, 0.0F); - GlStateManager.translate(0.1F, 0.2F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ScubaSet.png")); - gasMask.render(0.0625F); - GlStateManager.popMatrix(); - } - else if(item.getItem() instanceof ItemScubaTank) - { - GlStateManager.pushMatrix(); - GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F); - GlStateManager.rotate(90, 0.0F, -1.0F, 0.0F); - GlStateManager.scale(1.6F, 1.6F, 1.6F); - GlStateManager.translate(0.2F, -0.5F, 0.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ScubaSet.png")); - scubaTank.render(0.0625F); - GlStateManager.popMatrix(); - } - else if(item.getItem() instanceof ItemFreeRunners) - { - GlStateManager.pushMatrix(); - GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F); - GlStateManager.rotate(90, 0.0F, -1.0F, 0.0F); - GlStateManager.scale(2.0F, 2.0F, 2.0F); - GlStateManager.translate(0.2F, -1.43F, 0.12F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "FreeRunners.png")); - freeRunners.render(0.0625F); - GlStateManager.popMatrix(); - } - else if(item.getItem() instanceof ItemBalloon) - { - GlStateManager.pushMatrix(); - - if(type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) - { - GlStateManager.scale(2.5F, 2.5F, 2.5F); - GlStateManager.translate(0.2F, 0, 0.1F); - GlStateManager.rotate(15, -1, 0, 1); - balloonRenderer.render(((ItemBalloon)item.getItem()).getColor(item), 0, 1.9F, 0); - } - else { - balloonRenderer.render(((ItemBalloon)item.getItem()).getColor(item), 0, 1, 0); - } - - GlStateManager.popMatrix(); - } - else if(item.getItem() instanceof ItemAtomicDisassembler) - { - GlStateManager.pushMatrix(); - GlStateManager.scale(1.4F, 1.4F, 1.4F); - GlStateManager.rotate(180, 0.0F, 0.0F, 1.0F); - - if(type == ItemRenderType.EQUIPPED) - { - GlStateManager.rotate(-45, 0.0F, 1.0F, 0.0F); - GlStateManager.rotate(50, 1.0F, 0.0F, 0.0F); - GlStateManager.scale(2.0F, 2.0F, 2.0F); - GlStateManager.translate(0.0F, -0.4F, 0.4F); - } - else if(type == ItemRenderType.INVENTORY) - { - GlStateManager.rotate(225, 0.0F, 1.0F, 0.0F); - GlStateManager.rotate(45, -1.0F, 0.0F, -1.0F); - GlStateManager.scale(0.6F, 0.6F, 0.6F); - GlStateManager.translate(0.0F, -0.2F, 0.0F); - } - else { - GlStateManager.rotate(45, 0.0F, 1.0F, 0.0F); - GlStateManager.translate(0.0F, -0.7F, 0.0F); - } - - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "AtomicDisassembler.png")); - atomicDisassembler.render(0.0625F); - GlStateManager.popMatrix(); - } - else if(item.getItem() instanceof ItemPartTransmitter) - { - GlStateManager.pushMatrix(); - GL11.glTranslated(-0.5, -0.5, -0.5); - MekanismRenderer.blendOn(); - GL11.glDisable(GL11.GL_CULL_FACE); - RenderPartTransmitter.getInstance().renderItem(TransmitterType.values()[item.getItemDamage()]); - GL11.glEnable(GL11.GL_CULL_FACE); - MekanismRenderer.blendOff(); - GlStateManager.popMatrix(); - } - else if(item.getItem() instanceof ItemGlowPanel) - { - GlStateManager.pushMatrix(); - GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); - GL11.glTranslated(-0.5, -0.5, -0.5); - double d = 0.15; - GL11.glTranslated(d, d, d); - GL11.glScaled(2, 2, 2); - GL11.glTranslated(0.4-2*d, -2*d, -2*d); - GL11.glDisable(GL11.GL_CULL_FACE); - RenderHelper.disableStandardItemLighting(); - RenderGlowPanel.getInstance().renderItem(item.getItemDamage()); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glPopAttrib(); - GlStateManager.popMatrix(); - } - else if(item.getItem() instanceof ItemFlamethrower) - { - GlStateManager.pushMatrix(); - GlStateManager.rotate(160, 0.0F, 0.0F, 1.0F); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Flamethrower.png")); - - GlStateManager.translate(0.0F, -1.0F, 0.0F); - GlStateManager.rotate(135, 0.0F, 1.0F, 0.0F); - GlStateManager.rotate(-20, 0.0F, 0.0F, 1.0F); - - if(type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) - { - if(type == ItemRenderType.EQUIPPED_FIRST_PERSON) - { - GlStateManager.rotate(55, 0.0F, 1.0F, 0.0F); - } - else { - GlStateManager.translate(0.0F, 0.5F, 0.0F); - } - - GlStateManager.scale(2.5F, 2.5F, 2.5F); - GlStateManager.translate(0.0F, -1.0F, -0.5F); - } - else if(type == ItemRenderType.INVENTORY) - { - GlStateManager.translate(-0.6F, 0.0F, 0.0F); - GlStateManager.rotate(45, 0.0F, 1.0F, 0.0F); - } - - flamethrower.render(0.0625F); - GlStateManager.popMatrix(); - } - else if(MachineType.get(item) == MachineType.FLUID_TANK) - { - GlStateManager.pushMatrix(); - GlStateManager.rotate(270F, 0.0F, -1.0F, 0.0F); - 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()]; - Fluid fluid = itemMachine.getFluidStack(item) != null ? itemMachine.getFluidStack(item).getFluid() : null; - portableTankRenderer.render(tier, fluid, targetScale, false, null, -0.5, -0.5, -0.5); - GlStateManager.popMatrix(); - } - else { - if(item.getItem() instanceof ItemBlockMachine) - { - MachineType machine = MachineType.get(item); - - if(machine == MachineType.BASIC_FACTORY || machine == MachineType.ADVANCED_FACTORY || machine == MachineType.ELITE_FACTORY) - { - GlStateManager.rotate(-90F, 0.0F, 1.0F, 0.0F); - MekanismRenderer.renderCustomItem(((RenderBlocks)data[0]), item); - } - else { - RenderingRegistry.instance().renderInventoryBlock((RenderBlocks)data[0], Block.getBlockFromItem(item.getItem()), item.getItemDamage(), ClientProxy.MACHINE_RENDER_ID); - } - } - else if(item.getItem() instanceof ItemBlockBasic) - { - RenderingRegistry.instance().renderInventoryBlock((RenderBlocks)data[0], Block.getBlockFromItem(item.getItem()), item.getItemDamage(), ClientProxy.BASIC_RENDER_ID); - } - } - } - */ -} diff --git a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java index 554b370b8..8430d88a9 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java @@ -71,6 +71,8 @@ public class RenderConfigurableMachine Date: Wed, 11 May 2016 23:56:25 -0400 Subject: [PATCH 21/22] Implemented custom resistance for Refined Obsidian --- .../mekanism/common/block/BlockBasic.java | 16 ++++++++++- .../boiler/SynchronizedBoilerData.java | 2 -- .../common/tile/TileEntityBoilerCasing.java | 28 +------------------ 3 files changed, 16 insertions(+), 30 deletions(-) diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 4505152fe..dd2299c0b 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -49,6 +49,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EnumCreatureType; import net.minecraft.entity.item.EntityItem; @@ -117,7 +118,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon { super(Material.iron); setHardness(5F); - setResistance(10F); + setResistance(20F); setCreativeTab(Mekanism.tabMekanism); blockType = type; } @@ -164,6 +165,19 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon } } } + + @Override + public float getExplosionResistance(Entity entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) + { + BasicType type = BasicType.get(this, world.getBlockMetadata(x, y, z)); + + if(type == BasicType.REFINED_OBSIDIAN) + { + return 4000F; + } + + return blockResistance; + } @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java index eda394981..a22be07e3 100644 --- a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java +++ b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java @@ -48,8 +48,6 @@ public class SynchronizedBoilerData extends SynchronizedData implements IFluidContainerManager, IHeatTransfer +public class TileEntityBoilerCasing extends TileEntityMultiblock implements IHeatTransfer { /** A client-sided set of valves on this tank's structure that are currently active, used on the client for rendering fluids. */ public Set valveViewing = new HashSet(); @@ -217,7 +215,6 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock Date: Thu, 12 May 2016 15:07:54 -0400 Subject: [PATCH 22/22] Begin work on MekanismGenerators --- src/main/java/mekanism/api/Coord4D.java | 4 +- .../transporter/TransporterPathfinder.java | 2 +- .../common/tile/TileEntityBoilerCasing.java | 5 +- .../common/tile/TileEntityFluidTank.java | 6 +- ...ileEntityThermalEvaporationController.java | 8 +- .../client/BlockRenderingHandler.java | 8 +- .../client/gui/GuiBioGenerator.java | 5 +- .../client/gui/GuiGasGenerator.java | 5 +- .../client/gui/GuiHeatGenerator.java | 5 +- .../client/gui/GuiIndustrialTurbine.java | 7 +- .../client/gui/GuiNeutronCapture.java | 5 +- .../client/gui/GuiReactorController.java | 5 +- .../generators/client/gui/GuiReactorFuel.java | 5 +- .../generators/client/gui/GuiReactorHeat.java | 9 +- .../client/gui/GuiReactorLogicAdapter.java | 11 +- .../client/gui/GuiReactorStats.java | 8 +- .../client/gui/GuiSolarGenerator.java | 5 +- .../client/gui/GuiTurbineStats.java | 5 +- .../client/gui/GuiWindGenerator.java | 7 +- .../client/gui/element/GuiFuelTab.java | 1 - .../client/gui/element/GuiHeatTab.java | 1 - .../client/gui/element/GuiStatTab.java | 1 - .../client/gui/element/GuiTurbineTab.java | 6 +- .../model/ModelAdvancedSolarGenerator.java | 4 +- .../client/model/ModelHeatGenerator.java | 4 +- .../generators/client/model/ModelTurbine.java | 3 +- .../render/RenderAdvancedSolarGenerator.java | 7 +- .../client/render/RenderBioGenerator.java | 11 +- .../client/render/RenderGasGenerator.java | 7 +- .../client/render/RenderHeatGenerator.java | 9 +- .../render/RenderIndustrialTurbine.java | 22 +-- .../client/render/RenderReactor.java | 7 +- .../client/render/RenderSolarGenerator.java | 4 +- .../client/render/RenderTurbineRotor.java | 8 +- .../client/render/RenderWindGenerator.java | 8 +- .../render/item/GeneratorsItemRenderer.java | 12 +- .../generators/common/FusionReactor.java | 23 ++-- .../generators/common/GeneratorsBlocks.java | 6 +- .../generators/common/GeneratorsItems.java | 5 +- .../generators/common/MekanismGenerators.java | 8 +- .../common/block/BlockGenerator.java | 129 +++++++++--------- .../generators/common/block/BlockReactor.java | 9 +- .../content/turbine/TurbineFluidTank.java | 10 +- .../turbine/TurbineUpdateProtocol.java | 31 +++-- .../container/ContainerBioGenerator.java | 2 +- .../container/ContainerGasGenerator.java | 2 +- .../container/ContainerHeatGenerator.java | 2 +- .../container/ContainerNeutronCapture.java | 2 +- .../container/ContainerReactorController.java | 2 +- .../container/ContainerSolarGenerator.java | 2 +- .../container/ContainerWindGenerator.java | 2 +- .../common/item/ItemBlockGenerator.java | 54 ++++---- .../common/item/ItemBlockReactor.java | 6 +- .../TileEntityAdvancedSolarGenerator.java | 13 +- .../common/tile/TileEntityBioGenerator.java | 6 +- .../common/tile/TileEntityGasGenerator.java | 10 +- .../common/tile/TileEntityGenerator.java | 6 +- .../common/tile/TileEntityHeatGenerator.java | 23 ++-- .../common/tile/TileEntitySolarGenerator.java | 10 +- .../common/tile/TileEntityWindGenerator.java | 24 ++-- .../reactor/TileEntityReactorController.java | 12 +- .../TileEntityReactorLogicAdapter.java | 2 +- .../tile/reactor/TileEntityReactorPort.java | 9 +- .../tile/turbine/TileEntityTurbineCasing.java | 9 +- .../tile/turbine/TileEntityTurbineValve.java | 69 +++++----- 65 files changed, 331 insertions(+), 387 deletions(-) diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index 5a0db0f80..7b416d28a 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -208,7 +208,7 @@ public class Coord4D */ public Coord4D offset(EnumFacing side) { - return getFromSide(side, 1); + return offset(side, 1); } /** @@ -217,7 +217,7 @@ public class Coord4D * @param amount - how far to translate this Coord4D * @return translated Coord4D */ - public Coord4D getFromSide(EnumFacing side, int amount) + public Coord4D offset(EnumFacing side, int amount) { if(side == null || amount == 0) { diff --git a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java index 9b58c0879..dea0e7e8f 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java @@ -104,7 +104,7 @@ public final class TransporterPathfinder while(true) { - Coord4D coord = start.getFromSide(side, count); + Coord4D coord = start.offset(side, count); if(transportStack.canInsertToTransporter(coord.getTileEntity(worldObj), side)) { diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index 04bed3734..820268508 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -10,6 +10,7 @@ import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; import mekanism.api.Range4D; import mekanism.common.Mekanism; +import mekanism.common.PacketHandler; import mekanism.common.content.boiler.BoilerCache; import mekanism.common.content.boiler.BoilerUpdateProtocol; import mekanism.common.content.boiler.SynchronizedBoilerData; @@ -307,7 +308,7 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock 0) { - valveFluid = FluidRegistry.getFluid(ByteBufUtils.readUTF8String(dataStream)); + valveFluid = FluidRegistry.getFluid(PacketHandler.readString(dataStream)); } else { valveFluid = null; @@ -336,7 +336,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc if(dataStream.readInt() == 1) { - fluidTank.setFluid(new FluidStack(FluidRegistry.getFluid(ByteBufUtils.readUTF8String(dataStream)), dataStream.readInt())); + fluidTank.setFluid(new FluidStack(FluidRegistry.getFluid(PacketHandler.readString(dataStream)), dataStream.readInt())); } else { fluidTank.setFluid(null); diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java index fd4200816..e2f127cc8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java @@ -349,10 +349,10 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva startPoint = startPoint.offset(EnumFacing.UP); } - Coord4D test = startPoint.offset(EnumFacing.DOWN).getFromSide(right, 2); + Coord4D test = startPoint.offset(EnumFacing.DOWN).offset(right, 2); isLeftOnFace = test.getTileEntity(worldObj) instanceof TileEntityThermalEvaporationBlock; - startPoint = startPoint.getFromSide(left, isLeftOnFace ? 1 : 2); + startPoint = startPoint.offset(left, isLeftOnFace ? 1 : 2); if(!scanTopLayer(startPoint)) { @@ -390,7 +390,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva { for(int z = 0; z < 4; z++) { - Coord4D pointer = current.getFromSide(right, x).getFromSide(back, z); + Coord4D pointer = current.offset(right, x).offset(back, z); TileEntity pointerTile = pointer.getTileEntity(worldObj); int corner = getCorner(x, z); @@ -465,7 +465,7 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva { for(int z = 0; z < 4; z++) { - Coord4D pointer = current.getFromSide(right, x).getFromSide(back, z); + Coord4D pointer = current.offset(right, x).offset(back, z); TileEntity pointerTile = pointer.getTileEntity(worldObj); if((x == 1 || x == 2) && (z == 1 || z == 2)) diff --git a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java index dc4916d92..0c13e8965 100644 --- a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java +++ b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java @@ -13,15 +13,13 @@ import mekanism.generators.common.GeneratorsBlocks; import mekanism.generators.common.block.BlockGenerator.GeneratorType; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - -import net.minecraftforge.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class BlockRenderingHandler implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java index 27482a0da..e8e8fbc07 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java @@ -19,12 +19,11 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerBioGenerator; import mekanism.generators.common.tile.TileEntityBioGenerator; import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiBioGenerator extends GuiMekanism { diff --git a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java index 2eac5eef7..443527edf 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java @@ -22,12 +22,11 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerGasGenerator; import mekanism.generators.common.tile.TileEntityGasGenerator; import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiGasGenerator extends GuiMekanism { diff --git a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java index 7ce3e58a6..719bc684c 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java @@ -25,12 +25,11 @@ import mekanism.generators.common.inventory.container.ContainerHeatGenerator; import mekanism.generators.common.tile.TileEntityHeatGenerator; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiHeatGenerator extends GuiMekanism { diff --git a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java index 7fcef55fb..471e665a9 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java +++ b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java @@ -22,12 +22,11 @@ import mekanism.generators.common.content.turbine.TurbineUpdateProtocol; import mekanism.generators.common.tile.turbine.TileEntityTurbineCasing; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiIndustrialTurbine extends GuiMekanism { @@ -77,7 +76,7 @@ public class GuiIndustrialTurbine extends GuiMekanism int yAxis = (mouseY - (height - ySize) / 2); fontRendererObj.drawString(LangUtils.localize("container.inventory"), 8, (ySize - 96) + 4, 0x404040); - fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 5, 0x404040); + fontRendererObj.drawString(tileEntity.getName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getName())/2), 5, 0x404040); double energyMultiplier = (general.maxEnergyPerSteam/TurbineUpdateProtocol.MAX_BLADES)*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); diff --git a/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java b/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java index 431cf6a0c..17f1b79a2 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java +++ b/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java @@ -17,12 +17,11 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerNeutronCapture; import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture; import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiNeutronCapture extends GuiMekanism { diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java index 82e2e2dd9..1a47e2d74 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java @@ -18,12 +18,11 @@ import mekanism.generators.client.gui.element.GuiStatTab; import mekanism.generators.common.inventory.container.ContainerReactorController; import mekanism.generators.common.tile.reactor.TileEntityReactorController; import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiReactorController extends GuiMekanism { diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java index 2bef4d537..ee0479c20 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java @@ -28,13 +28,12 @@ import mekanism.generators.client.gui.element.GuiStatTab; import mekanism.generators.common.tile.reactor.TileEntityReactorController; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; 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 GuiReactorFuel extends GuiMekanism { diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java index 4fb97a72b..ae6270dcf 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java @@ -1,5 +1,6 @@ package mekanism.generators.client.gui; +import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -32,14 +33,12 @@ import mekanism.generators.client.gui.element.GuiStatTab; import mekanism.generators.common.tile.reactor.TileEntityReactorController; import net.minecraft.block.BlockStaticLiquid; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.IIcon; import net.minecraftforge.fluids.FluidTank; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiReactorHeat extends GuiMekanism { @@ -195,7 +194,7 @@ public class GuiReactorHeat extends GuiMekanism } @Override - public void mouseClicked(int mouseX, int mouseY, int button) + public void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java b/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java index 68034f5a1..d105c7e9c 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorLogicAdapter.java @@ -1,5 +1,6 @@ package mekanism.generators.client.gui; +import java.io.IOException; import java.util.ArrayList; import mekanism.api.Coord4D; @@ -15,13 +16,13 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.tile.reactor.TileEntityReactorLogicAdapter; import mekanism.generators.common.tile.reactor.TileEntityReactorLogicAdapter.ReactorLogic; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiReactorLogicAdapter extends GuiMekanism { @@ -51,7 +52,7 @@ public class GuiReactorLogicAdapter extends GuiMekanism { GlStateManager.pushMatrix(); GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), type.getRenderStack(), 27, 35 + (22*type.ordinal())); + itemRender.renderItemAndEffectIntoGUI(type.getRenderStack(), 27, 35 + (22*type.ordinal())); GL11.glDisable(GL11.GL_LIGHTING); GlStateManager.popMatrix(); @@ -107,7 +108,7 @@ public class GuiReactorLogicAdapter extends GuiMekanism } @Override - protected void mouseClicked(int mouseX, int mouseY, int button) + protected void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java index 55c3815ed..576400892 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java @@ -1,5 +1,6 @@ package mekanism.generators.client.gui; +import java.io.IOException; import java.text.NumberFormat; import java.util.ArrayList; import java.util.List; @@ -22,12 +23,11 @@ import mekanism.generators.client.gui.element.GuiFuelTab; import mekanism.generators.client.gui.element.GuiHeatTab; import mekanism.generators.common.tile.reactor.TileEntityReactorController; import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiReactorStats extends GuiMekanism { @@ -102,7 +102,7 @@ public class GuiReactorStats extends GuiMekanism } @Override - public void mouseClicked(int mouseX, int mouseY, int button) + public void mouseClicked(int mouseX, int mouseY, int button) throws IOException { super.mouseClicked(mouseX, mouseY, button); diff --git a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java index 0d5c8e7e8..cb28a3cac 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java @@ -18,12 +18,11 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerSolarGenerator; import mekanism.generators.common.tile.TileEntitySolarGenerator; import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiSolarGenerator extends GuiMekanism { diff --git a/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java b/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java index a389fde46..000a37b36 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java +++ b/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java @@ -18,12 +18,11 @@ import mekanism.generators.client.gui.element.GuiTurbineTab.TurbineTab; import mekanism.generators.common.content.turbine.TurbineUpdateProtocol; import mekanism.generators.common.tile.turbine.TileEntityTurbineCasing; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiTurbineStats extends GuiMekanism { diff --git a/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java index 08a354a64..7a145d1de 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java @@ -21,12 +21,11 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerWindGenerator; import mekanism.generators.common.tile.TileEntityWindGenerator; import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class GuiWindGenerator extends GuiMekanism { @@ -67,7 +66,7 @@ public class GuiWindGenerator extends GuiMekanism int size = 44; - if(!tileEntity.getWorld().canBlockSeeTheSky(tileEntity.getPos().getX(), tileEntity.getPos().getY()+4, tileEntity.getPos().getZ())) + if(!tileEntity.getWorld().canSeeSky(tileEntity.getPos().add(0, 4, 0))) { size += 9; fontRendererObj.drawString(EnumColor.DARK_RED + LangUtils.localize("gui.skyBlocked"), 51, size, 0x00CD00); diff --git a/src/main/java/mekanism/generators/client/gui/element/GuiFuelTab.java b/src/main/java/mekanism/generators/client/gui/element/GuiFuelTab.java index 933586472..896090223 100644 --- a/src/main/java/mekanism/generators/client/gui/element/GuiFuelTab.java +++ b/src/main/java/mekanism/generators/client/gui/element/GuiFuelTab.java @@ -11,7 +11,6 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/generators/client/gui/element/GuiHeatTab.java b/src/main/java/mekanism/generators/client/gui/element/GuiHeatTab.java index 39406ded8..60fc88f16 100644 --- a/src/main/java/mekanism/generators/client/gui/element/GuiHeatTab.java +++ b/src/main/java/mekanism/generators/client/gui/element/GuiHeatTab.java @@ -11,7 +11,6 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/generators/client/gui/element/GuiStatTab.java b/src/main/java/mekanism/generators/client/gui/element/GuiStatTab.java index 768874dea..0e7645062 100644 --- a/src/main/java/mekanism/generators/client/gui/element/GuiStatTab.java +++ b/src/main/java/mekanism/generators/client/gui/element/GuiStatTab.java @@ -11,7 +11,6 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import codechicken.lib.vec.Rectangle4i; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/generators/client/gui/element/GuiTurbineTab.java b/src/main/java/mekanism/generators/client/gui/element/GuiTurbineTab.java index 22584b8aa..33c0522b8 100644 --- a/src/main/java/mekanism/generators/client/gui/element/GuiTurbineTab.java +++ b/src/main/java/mekanism/generators/client/gui/element/GuiTurbineTab.java @@ -2,7 +2,6 @@ package mekanism.generators.client.gui.element; import mekanism.api.Coord4D; import mekanism.client.gui.IGuiWrapper; -import mekanism.client.gui.element.GuiBoilerTab.BoilerTab; import mekanism.client.gui.element.GuiElement; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; @@ -12,9 +11,8 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; 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; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiTurbineTab extends GuiElement diff --git a/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java index f6c4d7496..a3fa3b34d 100644 --- a/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java @@ -2,8 +2,8 @@ package mekanism.generators.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; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelAdvancedSolarGenerator extends ModelBase diff --git a/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java b/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java index 2a57cf5a4..7fdc24962 100644 --- a/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java @@ -5,11 +5,9 @@ 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.GlStateManager; 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; diff --git a/src/main/java/mekanism/generators/client/model/ModelTurbine.java b/src/main/java/mekanism/generators/client/model/ModelTurbine.java index d44b1f0ff..bdfed958e 100644 --- a/src/main/java/mekanism/generators/client/model/ModelTurbine.java +++ b/src/main/java/mekanism/generators/client/model/ModelTurbine.java @@ -2,8 +2,7 @@ package mekanism.generators.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - -import org.lwjgl.opengl.GL11; +import net.minecraft.client.renderer.GlStateManager; public class ModelTurbine extends ModelBase { diff --git a/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java index 0fe478efe..128ba444c 100644 --- a/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java @@ -4,11 +4,8 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelAdvancedSolarGenerator; import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -24,7 +21,7 @@ public class RenderAdvancedSolarGenerator extends TileEntitySpecialRenderer { @@ -39,7 +38,7 @@ public class RenderBioGenerator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/generators/client/render/RenderSolarGenerator.java b/src/main/java/mekanism/generators/client/render/RenderSolarGenerator.java index 2151235b0..7ee52a979 100644 --- a/src/main/java/mekanism/generators/client/render/RenderSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderSolarGenerator.java @@ -4,10 +4,8 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelSolarGenerator; import mekanism.generators.common.tile.TileEntitySolarGenerator; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; public class RenderSolarGenerator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/generators/client/render/RenderTurbineRotor.java b/src/main/java/mekanism/generators/client/render/RenderTurbineRotor.java index 553c2293d..ee75cdd70 100644 --- a/src/main/java/mekanism/generators/client/render/RenderTurbineRotor.java +++ b/src/main/java/mekanism/generators/client/render/RenderTurbineRotor.java @@ -6,14 +6,14 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelTurbine; import mekanism.generators.common.content.turbine.SynchronizedTurbineData; import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class RenderTurbineRotor extends TileEntitySpecialRenderer { @@ -24,7 +24,7 @@ public class RenderTurbineRotor extends TileEntitySpecialRenderer private static final float BASE_SPEED = 512F; @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick, int destroyStage) { renderAModelAt((TileEntityTurbineRotor)tileEntity, x, y, z, partialTick); } diff --git a/src/main/java/mekanism/generators/client/render/RenderWindGenerator.java b/src/main/java/mekanism/generators/client/render/RenderWindGenerator.java index ed6b774d0..cf711ac1e 100644 --- a/src/main/java/mekanism/generators/client/render/RenderWindGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderWindGenerator.java @@ -5,10 +5,8 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelWindGenerator; import mekanism.generators.common.tile.TileEntityWindGenerator; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; public class RenderWindGenerator extends TileEntitySpecialRenderer { @@ -21,7 +19,7 @@ public class RenderWindGenerator extends TileEntitySpecialRenderer entitiesToDie = controller.getWorldObj().getEntitiesWithinAABB(Entity.class, death_zone); + AxisAlignedBB death_zone = AxisAlignedBB.fromBounds(controller.getPos().getX() - 1, controller.getPos().getY() - 3, controller.getPos().getZ() - 1 ,controller.getPos().getX() + 2, controller.getPos().getY(), controller.getPos().getZ() + 2); + List entitiesToDie = controller.getWorld().getEntitiesWithinAABB(Entity.class, death_zone); for(Entity entity : entitiesToDie) { @@ -347,9 +347,9 @@ public class FusionReactor implements IFusionReactor formed = false; burning = burning && keepBurning; - if(!controller.getWorldObj().isRemote) + if(!controller.getWorld().isRemote) { - Mekanism.packetHandler.sendToDimension(new TileEntityMessage(Coord4D.get(controller), controller.getNetworkedData(new ArrayList())), controller.getWorldObj().provider.getDimensionId()); + Mekanism.packetHandler.sendToDimension(new TileEntityMessage(Coord4D.get(controller), controller.getNetworkedData(new ArrayList())), controller.getWorld().provider.getDimensionId()); } } @@ -385,9 +385,9 @@ public class FusionReactor implements IFusionReactor formed = true; - if(!controller.getWorldObj().isRemote) + if(!controller.getWorld().isRemote) { - Mekanism.packetHandler.sendToDimension(new TileEntityMessage(Coord4D.get(controller), controller.getNetworkedData(new ArrayList())), controller.getWorldObj().provider.getDimensionId()); + Mekanism.packetHandler.sendToDimension(new TileEntityMessage(Coord4D.get(controller), controller.getNetworkedData(new ArrayList())), controller.getWorld().provider.getDimensionId()); } } @@ -403,7 +403,7 @@ public class FusionReactor implements IFusionReactor for(int[] coords : positions) { - TileEntity tile = centre.clone().translate(coords[0], coords[1], coords[2]).getTileEntity(controller.getWorldObj()); + TileEntity tile = centre.clone().translate(coords[0], coords[1], coords[2]).getTileEntity(controller.getWorld()); if(tile instanceof IReactorBlock && ((IReactorBlock)tile).isFrame()) { @@ -431,7 +431,7 @@ public class FusionReactor implements IFusionReactor for(int[] coords : positions) { - TileEntity tile = centre.clone().translate(coords[0], coords[1], coords[2]).getTileEntity(controller.getWorldObj()); + TileEntity tile = centre.clone().translate(coords[0], coords[1], coords[2]).getTileEntity(controller.getWorld()); if(tile instanceof ILaserReceptor && !(coords[1] == 0 && (coords[0] == 0 || coords[2] == 0))) { @@ -469,9 +469,10 @@ public class FusionReactor implements IFusionReactor { for(int z = -1; x <= 1; x++) { - Block tile = centre.clone().translate(x, y, z).getBlock(controller.getWorldObj()); + Coord4D trans = centre.translate(x, y, z); + Block tile = trans.getBlock(controller.getWorld()); - if(!tile.isAir(controller.getWorldObj(), x, y, z)) + if(!tile.isAir(controller.getWorld(), trans.getPos())) { return false; } diff --git a/src/main/java/mekanism/generators/common/GeneratorsBlocks.java b/src/main/java/mekanism/generators/common/GeneratorsBlocks.java index 47a6948b3..d1806b3df 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsBlocks.java +++ b/src/main/java/mekanism/generators/common/GeneratorsBlocks.java @@ -11,9 +11,9 @@ import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder("MekanismGenerators") public class GeneratorsBlocks { - public static final Block Generator = new BlockGenerator().setBlockName("Generator"); - public static final Block Reactor = new BlockReactor().setBlockName("Reactor"); - public static final Block ReactorGlass = new BlockReactor().setBlockName("ReactorGlass"); + public static final Block Generator = new BlockGenerator().setUnlocalizedName("Generator"); + public static final Block Reactor = new BlockReactor().setUnlocalizedName("Reactor"); + public static final Block ReactorGlass = new BlockReactor().setUnlocalizedName("ReactorGlass"); public static void register() { diff --git a/src/main/java/mekanism/generators/common/GeneratorsItems.java b/src/main/java/mekanism/generators/common/GeneratorsItems.java index 7b08407fd..785458974 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsItems.java +++ b/src/main/java/mekanism/generators/common/GeneratorsItems.java @@ -5,6 +5,7 @@ import mekanism.generators.common.item.ItemHohlraum; import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; @@ -16,9 +17,9 @@ public class GeneratorsItems public static final ItemHohlraum Hohlraum = (ItemHohlraum)new ItemHohlraum().setUnlocalizedName("Hohlraum"); public static final Item TurbineBlade = new ItemMekanism() { @Override - public boolean doesSneakBypassUse(World world, int x, int y, int z, EntityPlayer player) + public boolean doesSneakBypassUse(World world, BlockPos pos, EntityPlayer player) { - return world.getTileEntity(x, y, z) instanceof TileEntityTurbineRotor; + return world.getTileEntity(pos) instanceof TileEntityTurbineRotor; } }.setUnlocalizedName("TurbineBlade"); diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index 309aac8d8..20e6e9752 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -26,13 +26,10 @@ import mekanism.generators.common.content.turbine.SynchronizedTurbineData; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.oredict.OreDictionary; -import buildcraft.api.fuels.BuildcraftFuelRegistry; -import buildcraft.api.fuels.IFuel; import net.minecraftforge.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; -import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.Mod.Instance; @@ -42,6 +39,9 @@ import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.oredict.OreDictionary; +import buildcraft.api.fuels.BuildcraftFuelRegistry; +import buildcraft.api.fuels.IFuel; @Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "9.0.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") public class MekanismGenerators implements IModule diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 86b8e5950..1138cba24 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -7,7 +7,7 @@ import java.util.Random; import mekanism.api.MekanismConfig.client; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; -import mekanism.common.CTMData; +import mekanism.client.render.ctm.CTMData; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; import mekanism.common.base.IBlockCTM; @@ -43,7 +43,7 @@ import mekanism.generators.common.tile.turbine.TileEntityTurbineVent; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -53,15 +53,17 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraft.util.EnumFacing; -import buildcraft.api.tools.IToolWrench; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import buildcraft.api.tools.IToolWrench; +import codechicken.lib.render.TextureUtils.IIconRegister; /** * Block class for handling multiple generator block IDs. @@ -132,11 +134,11 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) + public AxisAlignedBB getCollisionBoundingBox(World world, BlockPos pos, IBlockState state) { - setBlockBoundsBasedOnState(world, x, y, z); + setBlockBoundsBasedOnState(world, pos); - return super.getCollisionBoundingBoxFromPool(world, x, y, z); + return super.getCollisionBoundingBox(world, pos); } @Override @@ -163,15 +165,6 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB return BASE_ICON; } } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) - { - int meta = world.getBlockMetadata(x, y, z); - - return getIcon(side, meta); - } @Override public void onNeighborBlockChange(World world, int x, int y, int z, Block block) @@ -182,7 +175,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB if(tileEntity instanceof IMultiblock) { - ((IMultiblock)tileEntity).update(); + ((IMultiblock)tileEntity).doUpdate(); } if(tileEntity instanceof TileEntityBasicBlock) @@ -193,9 +186,9 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB } @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entityliving, ItemStack itemstack) + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase entityliving, ItemStack itemstack) { - TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z); + TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(pos); int side = MathHelper.floor_double((double)(entityliving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; int height = Math.round(entityliving.rotationPitch); @@ -234,16 +227,16 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB if(!world.isRemote && tileEntity instanceof IMultiblock) { - ((IMultiblock)tileEntity).update(); + ((IMultiblock)tileEntity).doUpdate(); } } @Override - public int getLightValue(IBlockAccess world, int x, int y, int z) + public int getLightValue(IBlockAccess world, BlockPos pos) { if(client.enableAmbientLighting) { - TileEntity tileEntity = world.getTileEntity(x, y, z); + TileEntity tileEntity = world.getTileEntity(pos); if(tileEntity instanceof IActiveState && !(tileEntity instanceof TileEntitySolarGenerator)) { @@ -265,11 +258,11 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB } @Override - public float getPlayerRelativeBlockHardness(EntityPlayer player, World world, int x, int y, int z) + public float getPlayerRelativeBlockHardness(EntityPlayer player, World world, BlockPos pos) { - TileEntity tile = world.getTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(pos); - return SecurityUtils.canAccess(player, tile) ? super.getPlayerRelativeBlockHardness(player, world, x, y, z) : 0.0F; + return SecurityUtils.canAccess(player, tile) ? super.getPlayerRelativeBlockHardness(player, world, pos) : 0.0F; } @Override @@ -284,26 +277,26 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB @Override @SideOnly(Side.CLIENT) - public void randomDisplayTick(World world, int x, int y, int z, Random random) + public void randomDisplayTick(World world, BlockPos pos, IBlockState state, Random random) { int metadata = world.getBlockMetadata(x, y, z); - TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z); + TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(pos); - if(MekanismUtils.isActive(world, x, y, z)) + if(MekanismUtils.isActive(world, pos)) { - float xRandom = (float)x + 0.5F; - float yRandom = (float)y + 0.0F + random.nextFloat() * 6.0F / 16.0F; - float zRandom = (float)z + 0.5F; + float xRandom = (float)pos.getX() + 0.5F; + float yRandom = (float)pos.getY() + 0.0F + random.nextFloat() * 6.0F / 16.0F; + float zRandom = (float)pos.getZ() + 0.5F; float iRandom = 0.52F; float jRandom = random.nextFloat() * 0.6F - 0.3F; - if(tileEntity.facing == 4) + if(tileEntity.facing == EnumFacing.WEST) { switch(GeneratorType.getFromMetadata(metadata)) { case HEAT_GENERATOR: -(??) world.spawnParticle("smoke", (double)(xRandom + iRandom), (double)yRandom, (double)(zRandom - jRandom), 0.0D, 0.0D, 0.0D); -(??) world.spawnParticle("flame", (double)(xRandom + iRandom), (double)yRandom, (double)(zRandom - jRandom), 0.0D, 0.0D, 0.0D); + world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, (double)(xRandom + iRandom), (double)yRandom, (double)(zRandom - jRandom), 0.0D, 0.0D, 0.0D); + world.spawnParticle(EnumParticleTypes.FLAME, (double)(xRandom + iRandom), (double)yRandom, (double)(zRandom - jRandom), 0.0D, 0.0D, 0.0D); break; case BIO_GENERATOR: world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, x+.25, y+.2, z+.5, 0.0D, 0.0D, 0.0D); @@ -312,7 +305,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB break; } } - else if(tileEntity.facing == 5) + else if(tileEntity.facing == EnumFacing.EAST) { switch(GeneratorType.getFromMetadata(metadata)) { @@ -327,7 +320,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB break; } } - else if(tileEntity.facing == 2) + else if(tileEntity.facing == EnumFacing.NORTH) { switch(GeneratorType.getFromMetadata(metadata)) { @@ -342,7 +335,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB break; } } - else if(tileEntity.facing == 3) + else if(tileEntity.facing == EnumFacing.SOUTH) { switch(GeneratorType.getFromMetadata(metadata)) { @@ -361,16 +354,16 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB } @Override - public boolean canPlaceBlockAt(World world, int x, int y, int z) + public boolean canPlaceBlockAt(World world, BlockPos pos) { //This method doesn't actually seem to be used in MC code... if(world.getBlockMetadata(x, y, z) == GeneratorType.ADVANCED_SOLAR_GENERATOR.meta) { - boolean canPlace = super.canPlaceBlockAt(world, x, y, z); + boolean canPlace = super.canPlaceBlockAt(world, pos); boolean nonAir = false; - nonAir |= world.isAirBlock(x, y, z); - nonAir |= world.isAirBlock(x, y+1, x); + nonAir |= world.isAirBlock(pos); + nonAir |= world.isAirBlock(pos.add(0, 1, 0)); for(int xPos=-1;xPos<=1;xPos++) { @@ -384,11 +377,11 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB } else if(world.getBlockMetadata(x, y, z) == GeneratorType.WIND_GENERATOR.meta) { - boolean canPlace = super.canPlaceBlockAt(world, x, y, z); + boolean canPlace = super.canPlaceBlockAt(world, pos); boolean nonAir = false; - for(int yPos = y+1; yPos <= y+4; yPos++) + for(int yPos = pos.getY()+1; yPos <= pos.getY()+4; yPos++) { nonAir |= world.isAirBlock(x, yPos, z); } @@ -396,13 +389,13 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB return (!nonAir) && canPlace; } - return super.canPlaceBlockAt(world, x, y, z); + return super.canPlaceBlockAt(world, pos); } @Override - public void breakBlock(World world, int x, int y, int z, Block block, int meta) + public void breakBlock(World world, BlockPos pos, IBlockState state) { - TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z); + TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(pos); if(!world.isRemote && tileEntity instanceof TileEntityTurbineRotor) { @@ -415,7 +408,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB double motionY = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; double motionZ = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; - EntityItem entityItem = new EntityItem(world, x + motionX, y + motionY, z + motionZ, new ItemStack(GeneratorsItems.TurbineBlade, amount)); + EntityItem entityItem = new EntityItem(world, pos.getX() + motionX, pos.getY() + motionY, pos.getZ() + motionZ, new ItemStack(GeneratorsItems.TurbineBlade, amount)); world.spawnEntityInWorld(entityItem); } @@ -426,18 +419,18 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB ((IBoundingBlock)tileEntity).onBreak(); } - super.breakBlock(world, x, y, z, block, meta); + super.breakBlock(world, pos, state); } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int side, float playerX, float playerY, float playerZ) + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer entityplayer, EnumFacing side, float playerX, float playerY, float playerZ) { if(world.isRemote) { return true; } - TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z); + TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(pos); int metadata = world.getBlockMetadata(x, y, z); if(entityplayer.getCurrentEquippedItem() != null) @@ -585,7 +578,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB } @Override - public boolean renderAsNormalBlock() + public boolean rendersAsNormalBlock() { return false; } @@ -642,7 +635,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB } @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) + public boolean removedByPlayer(World world, BlockPos pos, EntityPlayer player, boolean willHarvest) { if(!player.capabilities.isCreativeMode && !world.isRemote && willHarvest) { @@ -651,19 +644,19 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB double motionY = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; double motionZ = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; - EntityItem entityItem = new EntityItem(world, x + motionX, y + motionY, z + motionZ, getPickBlock(null, world, x, y, z, player)); + EntityItem entityItem = new EntityItem(world, pos.getX() + motionX, pos.getY() + motionY, pos.getZ() + motionZ, getPickBlock(null, world, pos, player)); world.spawnEntityInWorld(entityItem); } - return world.setBlockToAir(x, y, z); + return world.setBlockToAir(pos); } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) + public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) { - TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z); - ItemStack itemStack = new ItemStack(GeneratorsBlocks.Generator, 1, world.getBlockMetadata(x, y, z)); + TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(pos); + ItemStack itemStack = new ItemStack(GeneratorsBlocks.Generator, 1, world.getBlockMetadata(pos)); if(itemStack.stackTagCompound == null) { @@ -717,11 +710,11 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB return itemStack; } - public ItemStack dismantleBlock(World world, int x, int y, int z, boolean returnBlock) + public ItemStack dismantleBlock(World world, BlockPos pos, boolean returnBlock) { - ItemStack itemStack = getPickBlock(null, world, x, y, z, null); + ItemStack itemStack = getPickBlock(null, world, pos, null); - world.setBlockToAir(x, y, z); + world.setBlockToAir(pos); if(!returnBlock) { @@ -730,7 +723,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB double motionY = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; double motionZ = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; - EntityItem entityItem = new EntityItem(world, x + motionX, y + motionY, z + motionZ, itemStack); + EntityItem entityItem = new EntityItem(world, pos.getX() + motionX, pos.getY() + motionY, pos.getZ() + motionZ, itemStack); world.spawnEntityInWorld(entityItem); } @@ -739,9 +732,9 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB } @Override - public boolean isSideSolid(IBlockAccess world, int x, int y, int z, EnumFacing side) + public boolean isSideSolid(IBlockAccess world, BlockPos pos, EnumFacing side) { - int metadata = world.getBlockMetadata(x, y, z); + int metadata = world.getBlockMetadata(pos); if(metadata != GeneratorType.SOLAR_GENERATOR.meta && metadata != GeneratorType.ADVANCED_SOLAR_GENERATOR.meta && @@ -850,9 +843,9 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB } @Override - public EnumFacing[] getValidRotations(World world, int x, int y, int z) + public EnumFacing[] getValidRotations(World world, BlockPos pos) { - TileEntity tile = world.getTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(pos); EnumFacing[] valid = new EnumFacing[6]; if(tile instanceof TileEntityBasicBlock) @@ -872,9 +865,9 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB } @Override - public boolean rotateBlock(World world, int x, int y, int z, EnumFacing axis) + public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis) { - TileEntity tile = world.getTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(pos); if(tile instanceof TileEntityBasicBlock) { diff --git a/src/main/java/mekanism/generators/common/block/BlockReactor.java b/src/main/java/mekanism/generators/common/block/BlockReactor.java index 6586bd97c..d0db075be 100644 --- a/src/main/java/mekanism/generators/common/block/BlockReactor.java +++ b/src/main/java/mekanism/generators/common/block/BlockReactor.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.List; import mekanism.api.Coord4D; -import mekanism.common.CTMData; +import mekanism.client.render.ctm.CTMData; import mekanism.common.Mekanism; import mekanism.common.base.IBlockCTM; import mekanism.common.tile.TileEntityBasicBlock; @@ -23,20 +23,19 @@ import mekanism.generators.common.tile.reactor.TileEntityReactorPort; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; 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.tileentity.TileEntity; -import net.minecraft.util.IIcon; +import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraft.util.EnumFacing; -import buildcraft.api.tools.IToolWrench; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import buildcraft.api.tools.IToolWrench; +import codechicken.lib.render.TextureUtils.IIconRegister; public class BlockReactor extends BlockContainer implements IBlockCTM { diff --git a/src/main/java/mekanism/generators/common/content/turbine/TurbineFluidTank.java b/src/main/java/mekanism/generators/common/content/turbine/TurbineFluidTank.java index c66b5b5d7..795268bc7 100644 --- a/src/main/java/mekanism/generators/common/content/turbine/TurbineFluidTank.java +++ b/src/main/java/mekanism/generators/common/content/turbine/TurbineFluidTank.java @@ -30,9 +30,9 @@ public class TurbineFluidTank implements IFluidTank @Override public int fill(FluidStack resource, boolean doFill) { - if(turbine.structure != null && !turbine.getWorldObj().isRemote) + if(turbine.structure != null && !turbine.getWorld().isRemote) { - if(resource == null || resource.getFluidID() <= 0) + if(resource == null || resource.getFluid() == null) { return 0; } @@ -42,7 +42,7 @@ public class TurbineFluidTank implements IFluidTank return 0; } - if(turbine.structure.fluidStored == null || turbine.structure.fluidStored.getFluidID() <= 0) + if(turbine.structure.fluidStored == null || turbine.structure.fluidStored.getFluid() == null) { if(resource.amount <= getCapacity()) { @@ -110,9 +110,9 @@ public class TurbineFluidTank implements IFluidTank @Override public FluidStack drain(int maxDrain, boolean doDrain) { - if(turbine.structure != null && !turbine.getWorldObj().isRemote) + if(turbine.structure != null && !turbine.getWorld().isRemote) { - if(turbine.structure.fluidStored == null || turbine.structure.fluidStored.getFluidID() <= 0) + if(turbine.structure.fluidStored == null || turbine.structure.fluidStored.getFluid() == null) { return null; } diff --git a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java index e2707ac7e..ecb593808 100644 --- a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java +++ b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java @@ -20,7 +20,8 @@ import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; import mekanism.generators.common.tile.turbine.TileEntityTurbineVent; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; public class TurbineUpdateProtocol extends UpdateProtocol { @@ -35,8 +36,8 @@ public class TurbineUpdateProtocol extends UpdateProtocol structure.minLocation.yCoord; y--) { - TileEntity tile = pointer.getWorldObj().getTileEntity(centerX, y, centerZ); + TileEntity tile = pointer.getWorld().getTileEntity(new BlockPos(centerX, y, centerZ)); if(!(tile instanceof TileEntityTurbineRotor)) { @@ -153,7 +154,7 @@ public class TurbineUpdateProtocol extends UpdateProtocol= complex.yCoord) { diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java index c9b772b3e..159e3799b 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerBioGenerator.java @@ -44,7 +44,7 @@ public class ContainerBioGenerator extends Container { super.onContainerClosed(entityplayer); - tileEntity.closeInventory(); + tileEntity.closeInventory(entityplayer); tileEntity.close(entityplayer); } diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java index 94356d5eb..307b238f2 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerGasGenerator.java @@ -43,7 +43,7 @@ public class ContainerGasGenerator extends Container public void onContainerClosed(EntityPlayer entityplayer) { super.onContainerClosed(entityplayer); - tileEntity.closeInventory(); + tileEntity.closeInventory(entityplayer); tileEntity.close(entityplayer); } diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java index 019b4067d..6ddf1d154 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java @@ -42,7 +42,7 @@ public class ContainerHeatGenerator extends Container { super.onContainerClosed(entityplayer); - tileEntity.closeInventory(); + tileEntity.closeInventory(entityplayer); tileEntity.close(entityplayer); } diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerNeutronCapture.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerNeutronCapture.java index 198066124..a1035999a 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerNeutronCapture.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerNeutronCapture.java @@ -41,7 +41,7 @@ public class ContainerNeutronCapture extends Container { super.onContainerClosed(entityplayer); - tileEntity.closeInventory(); + tileEntity.closeInventory(entityplayer); tileEntity.close(entityplayer); } diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java index 17e3b6fff..c82654dfb 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerReactorController.java @@ -44,7 +44,7 @@ public class ContainerReactorController extends Container { super.onContainerClosed(entityplayer); - tileEntity.closeInventory(); + tileEntity.closeInventory(entityplayer); tileEntity.close(entityplayer); } diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java index b31ac95a9..c4f6e07d7 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java @@ -41,7 +41,7 @@ public class ContainerSolarGenerator extends Container { super.onContainerClosed(entityplayer); - tileEntity.closeInventory(); + tileEntity.closeInventory(entityplayer); tileEntity.close(entityplayer); } diff --git a/src/main/java/mekanism/generators/common/inventory/container/ContainerWindGenerator.java b/src/main/java/mekanism/generators/common/inventory/container/ContainerWindGenerator.java index c8fe3b47a..9914a6456 100644 --- a/src/main/java/mekanism/generators/common/inventory/container/ContainerWindGenerator.java +++ b/src/main/java/mekanism/generators/common/inventory/container/ContainerWindGenerator.java @@ -41,7 +41,7 @@ public class ContainerWindGenerator extends Container { super.onContainerClosed(entityplayer); - tileEntity.closeInventory(); + tileEntity.closeInventory(entityplayer); tileEntity.close(entityplayer); } diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 15fdd0d7c..a7f552217 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -1,5 +1,8 @@ package mekanism.generators.common.item; +import ic2.api.item.IElectricItemManager; +import ic2.api.item.ISpecialElectricItem; + import java.util.List; import mekanism.api.EnumColor; @@ -14,13 +17,14 @@ import mekanism.common.integration.IC2ItemManager; 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.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.SecurityUtils; import mekanism.generators.common.block.BlockGenerator.GeneratorType; - import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -28,7 +32,8 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -37,10 +42,7 @@ import net.minecraftforge.fml.common.Optional.InterfaceList; import net.minecraftforge.fml.common.Optional.Method; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; - import cofh.api.energy.IEnergyContainerItem; -import ic2.api.item.IElectricItemManager; -import ic2.api.item.ISpecialElectricItem; /** * Item class for handling multiple generator block IDs. @@ -94,12 +96,6 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp return i; } - @Override - public IIcon getIconFromDamage(int i) - { - return metaBlock.getIcon(2, i); - } - @Override public String getUnlocalizedName(ItemStack itemstack) { @@ -128,7 +124,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp { if(hasSecurity(itemstack)) { - list.add(SecurityUtils.getOwnerDisplay(entityplayer.getCommandSenderName(), getOwner(itemstack))); + list.add(SecurityUtils.getOwnerDisplay(entityplayer.getName(), getOwner(itemstack))); list.add(EnumColor.GREY + LangUtils.localize("gui.security") + ": " + SecurityUtils.getSecurityDisplay(itemstack, Side.CLIENT)); if(SecurityUtils.isOverridden(itemstack, Side.CLIENT)) @@ -165,14 +161,14 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp } @Override - public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) + public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState state) { boolean place = true; - Block block = world.getBlock(x, y, z); + Block block = world.getBlockState(pos).getBlock(); if(stack.getItemDamage() == GeneratorType.ADVANCED_SOLAR_GENERATOR.meta) { - if(!(block.isReplaceable(world, x, y, z) && world.isAirBlock(x, y+1, z))) + if(!(block.isReplaceable(world, pos) && world.isAirBlock(pos.add(0, 1, 0)))) { return false; } @@ -192,7 +188,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp } else if(stack.getItemDamage() == GeneratorType.WIND_GENERATOR.meta) { - if(!block.isReplaceable(world, x, y, z)) + if(!block.isReplaceable(world, pos)) { return false; } @@ -208,9 +204,9 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp } } - if(place && super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) + if(place && super.placeBlockAt(stack, player, world, pos, side, hitX, hitY, hitZ, state)) { - TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z); + TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(pos); if(tileEntity instanceof ISecurityTile) { @@ -224,7 +220,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp if(getOwner(stack) == null) { - security.getSecurity().setOwner(player.getCommandSenderName()); + security.getSecurity().setOwner(player.getName()); } } @@ -339,7 +335,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp @Override public void setFluidStack(FluidStack fluidStack, Object... data) { - if(fluidStack == null || fluidStack.amount == 0 || fluidStack.getFluidID() == 0) + if(fluidStack == null || fluidStack.amount == 0 || fluidStack.getFluid() == null) { return; } @@ -491,9 +487,9 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp @Override public String getOwner(ItemStack stack) { - if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("owner")) + if(stack.getTagCompound() != null && stack.getTagCompound().hasKey("owner")) { - return stack.stackTagCompound.getString("owner"); + return stack.getTagCompound().getString("owner"); } return null; @@ -502,40 +498,40 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp @Override public void setOwner(ItemStack stack, String owner) { - if(stack.stackTagCompound == null) + if(stack.getTagCompound() == null) { stack.setTagCompound(new NBTTagCompound()); } if(owner == null || owner.isEmpty()) { - stack.stackTagCompound.removeTag("owner"); + stack.getTagCompound().removeTag("owner"); return; } - stack.stackTagCompound.setString("owner", owner); + stack.getTagCompound().setString("owner", owner); } @Override public SecurityMode getSecurity(ItemStack stack) { - if(stack.stackTagCompound == null) + if(stack.getTagCompound() == null) { return SecurityMode.PUBLIC; } - return SecurityMode.values()[stack.stackTagCompound.getInteger("security")]; + return SecurityMode.values()[stack.getTagCompound().getInteger("security")]; } @Override public void setSecurity(ItemStack stack, SecurityMode mode) { - if(stack.stackTagCompound == null) + if(stack.getTagCompound() == null) { stack.setTagCompound(new NBTTagCompound()); } - stack.stackTagCompound.setInteger("security", mode.ordinal()); + stack.getTagCompound().setInteger("security", mode.ordinal()); } @Override diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java b/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java index 68db1c049..ab51f864f 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java @@ -10,13 +10,11 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import org.lwjgl.input.Keyboard; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.input.Keyboard; + public class ItemBlockReactor extends ItemBlock { public Block metaBlock; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java index f0b97ea51..fda84ad89 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java @@ -20,19 +20,20 @@ public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator i @Override public EnumSet getOutputtingSides() { - return EnumSet.of(EnumFacing.getFront(facing)); + return EnumSet.of(facing); } @Override public void onPlace() { - MekanismUtils.makeBoundingBlock(worldObj, new Coord4D(xCoord, yCoord+1, zCoord), Coord4D.get(this)); + Coord4D current = Coord4D.get(this); + MekanismUtils.makeBoundingBlock(worldObj, getPos().add(0, 1, 0), current); for(int x = -1; x <= 1; x++) { for(int z = -1; z <= 1; z++) { - MekanismUtils.makeBoundingBlock(worldObj, new Coord4D(xCoord+x, yCoord+2, zCoord+z), Coord4D.get(this)); + MekanismUtils.makeBoundingBlock(worldObj, getPos().add(x, 2, z), current); } } } @@ -40,18 +41,18 @@ public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator i @Override public void onBreak() { - worldObj.setBlockToAir(xCoord, yCoord+1, zCoord); + worldObj.setBlockToAir(getPos().add(0, 1, 0)); for(int x = -1; x <= 1; x++) { for(int z = -1; z <= 1; z++) { - worldObj.setBlockToAir(xCoord+x, yCoord+2, zCoord+z); + worldObj.setBlockToAir(getPos().add(x, 2, z)); } } invalidate(); - worldObj.setBlockToAir(xCoord, yCoord, zCoord); + worldObj.setBlockToAir(getPos()); } @Override diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index 99d74c5b9..b39376a59 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -184,9 +184,9 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui } @Override - public int[] getSlotsForFace(int side) + public int[] getSlotsForFace(EnumFacing side) { - return EnumFacing.getFront(side) == MekanismUtils.getRight(facing) ? new int[] {1} : new int[] {0}; + return side == MekanismUtils.getRight(facing) ? new int[] {1} : new int[] {0}; } @Override @@ -243,7 +243,7 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui @Override public int fill(EnumFacing from, FluidStack resource, boolean doFill) { - if(FluidRegistry.isFluidRegistered("bioethanol") && from != EnumFacing.getFront(facing)) + if(FluidRegistry.isFluidRegistered("bioethanol") && from != facing) { if(resource.getFluid() == FluidRegistry.getFluid("bioethanol")) { diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index b3f26a6f6..a5643f150 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -149,7 +149,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, int side) + public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) { if(slotID == 1) { @@ -180,9 +180,9 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH } @Override - public int[] getSlotsForFace(int side) + public int[] getSlotsForFace(EnumFacing side) { - return EnumFacing.getFront(side) == MekanismUtils.getRight(facing) ? new int[] {1} : new int[] {0}; + return side == MekanismUtils.getRight(facing) ? new int[] {1} : new int[] {0}; } @Override @@ -324,7 +324,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH @Override public boolean canReceiveGas(EnumFacing side, Gas type) { - return FuelHandler.getFuel(type) != null && side != EnumFacing.getFront(facing); + return FuelHandler.getFuel(type) != null && side != facing; } @Override @@ -348,7 +348,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH @Override public boolean canTubeConnect(EnumFacing side) { - return side != EnumFacing.getFront(facing); + return side != facing; } @Override diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index 93ac5d0d7..1d328561f 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -71,7 +71,7 @@ public abstract class TileEntityGenerator extends TileEntityNoisyElectricBlock i if(updateDelay == 0 && clientActive != isActive) { isActive = clientActive; - MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); + MekanismUtils.updateBlock(worldObj, getPos()); } } @@ -110,7 +110,7 @@ public abstract class TileEntityGenerator extends TileEntityNoisyElectricBlock i @Override public EnumSet getOutputtingSides() { - return EnumSet.of(EnumFacing.getFront(facing)); + return EnumSet.of(facing); } /** @@ -157,7 +157,7 @@ public abstract class TileEntityGenerator extends TileEntityNoisyElectricBlock i { updateDelay = general.UPDATE_DELAY; isActive = clientActive; - MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); + MekanismUtils.updateBlock(worldObj, getPos()); } } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java index 0dabb9fcf..9cb61306b 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java @@ -20,6 +20,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; +import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -73,7 +74,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu } else if(fluid != null) { - if(fluid != null && fluid.getFluidID() == FluidRegistry.LAVA.getID()) + if(fluid != null && fluid.getFluid() == FluidRegistry.LAVA) { if(lavaTank.getFluid() == null || lavaTank.getFluid().amount+fluid.amount <= lavaTank.getCapacity()) { @@ -152,7 +153,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu { if(slotID == 0) { - return getFuel(itemstack) > 0 || (FluidContainerRegistry.getFluidForFilledItem(itemstack) != null && FluidContainerRegistry.getFluidForFilledItem(itemstack).getFluidID() == FluidRegistry.LAVA.getID()); + return getFuel(itemstack) > 0 || (FluidContainerRegistry.getFluidForFilledItem(itemstack) != null && FluidContainerRegistry.getFluidForFilledItem(itemstack).getFluid() == FluidRegistry.LAVA); } else if(slotID == 1) { @@ -191,7 +192,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, int side) + public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) { if(slotID == 1) { @@ -214,7 +215,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu { Coord4D coord = Coord4D.get(this).offset(side); - if(isLava(coord.xCoord, coord.yCoord, coord.zCoord)) + if(isLava(coord.getPos())) { lavaBoost++; } @@ -228,9 +229,9 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu return (generators.heatGenerationLava * lavaBoost) + netherBoost; } - private boolean isLava(int x, int y, int z) + private boolean isLava(BlockPos pos) { - return worldObj.getBlock(x, y, z) == Blocks.lava; + return worldObj.getBlockState(pos).getBlock() == Blocks.lava; } public int getFuel(ItemStack itemstack) @@ -244,9 +245,9 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu } @Override - public int[] getSlotsForFace(int side) + public int[] getSlotsForFace(EnumFacing side) { - return EnumFacing.getFront(side) == MekanismUtils.getRight(facing) ? new int[] {1} : new int[] {0}; + return side == MekanismUtils.getRight(facing) ? new int[] {1} : new int[] {0}; } /** @@ -334,7 +335,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu @Override public int fill(EnumFacing from, FluidStack resource, boolean doFill) { - if(resource.getFluidID() == FluidRegistry.LAVA.getID() && from != EnumFacing.getFront(facing)) + if(resource.getFluid() == FluidRegistry.LAVA && from != facing) { return lavaTank.fill(resource, doFill); } @@ -357,7 +358,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu @Override public boolean canFill(EnumFacing from, Fluid fluid) { - return fluid == FluidRegistry.LAVA && from != EnumFacing.getFront(facing); + return fluid == FluidRegistry.LAVA && from != facing; } @Override @@ -369,7 +370,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu @Override public FluidTankInfo[] getTankInfo(EnumFacing from) { - if(from == EnumFacing.getFront(facing)) + if(from == facing) { return PipeUtils.EMPTY; } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java index 73838b2d7..37d14460e 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java @@ -10,8 +10,8 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; import micdoodle8.mods.galacticraft.api.world.ISolarLevel; import net.minecraft.item.ItemStack; -import net.minecraft.world.biome.BiomeGenDesert; import net.minecraft.util.EnumFacing; +import net.minecraft.world.biome.BiomeGenDesert; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -36,7 +36,7 @@ public class TileEntitySolarGenerator extends TileEntityGenerator } @Override - public int[] getSlotsForFace(int side) + public int[] getSlotsForFace(EnumFacing side) { return new int[] {0}; } @@ -63,7 +63,7 @@ public class TileEntitySolarGenerator extends TileEntityGenerator { ChargeUtils.charge(0, this); - if(worldObj.isDaytime() && ((!worldObj.isRaining() && !worldObj.isThundering()) || isDesert()) && !worldObj.provider.hasNoSky && worldObj.canBlockSeeTheSky(xCoord, yCoord+1, zCoord)) + if(worldObj.isDaytime() && ((!worldObj.isRaining() && !worldObj.isThundering()) || isDesert()) && !worldObj.provider.getHasNoSky() && worldObj.canSeeSky(getPos().add(0, 4, 0))) { seesSun = true; } @@ -84,11 +84,11 @@ public class TileEntitySolarGenerator extends TileEntityGenerator public boolean isDesert() { - return worldObj.provider.getBiomeGenForCoords(xCoord, zCoord).getBiomeClass() == BiomeGenDesert.class; + return worldObj.provider.getBiomeGenForCoords(getPos()).getBiomeClass() == BiomeGenDesert.class; } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, int side) + public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) { if(slotID == 0) { diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java index 1938b2d24..2f6ffd7c1 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java @@ -44,7 +44,7 @@ public class TileEntityWindGenerator extends TileEntityGenerator implements IBou /** Determines the current output multiplier, taking sky visibility and height into account. **/ public float getMultiplier() { - if(worldObj.canBlockSeeTheSky(xCoord, yCoord+4, zCoord)) + if(worldObj.canSeeSky(getPos().add(0, 4, 0))) { final float minY = (float)generators.windGenerationMinY; final float maxY = (float)generators.windGenerationMaxY; @@ -54,7 +54,7 @@ public class TileEntityWindGenerator extends TileEntityGenerator implements IBou final float slope = (maxG - minG) / (maxY - minY); final float intercept = minG - slope * minY; - final float clampedY = Math.min(maxY, Math.max(minY, (float)(yCoord+4))); + final float clampedY = Math.min(maxY, Math.max(minY, (float)(getPos().getY()+4))); final float toGen = slope * clampedY + intercept; return toGen / minG; @@ -108,22 +108,22 @@ public class TileEntityWindGenerator extends TileEntityGenerator implements IBou @Override public void onPlace() { - Coord4D pos = Coord4D.get(this); - MekanismUtils.makeBoundingBlock(worldObj, pos.offset(EnumFacing.UP, 1), pos); - MekanismUtils.makeBoundingBlock(worldObj, pos.offset(EnumFacing.UP, 2), pos); - MekanismUtils.makeBoundingBlock(worldObj, pos.offset(EnumFacing.UP, 3), pos); - MekanismUtils.makeBoundingBlock(worldObj, pos.offset(EnumFacing.UP, 4), pos); + Coord4D current = Coord4D.get(this); + MekanismUtils.makeBoundingBlock(worldObj, getPos().offset(EnumFacing.UP, 1), current); + MekanismUtils.makeBoundingBlock(worldObj, getPos().offset(EnumFacing.UP, 2), current); + MekanismUtils.makeBoundingBlock(worldObj, getPos().offset(EnumFacing.UP, 3), current); + MekanismUtils.makeBoundingBlock(worldObj, getPos().offset(EnumFacing.UP, 4), current); } @Override public void onBreak() { - worldObj.setBlockToAir(xCoord, yCoord+1, zCoord); - worldObj.setBlockToAir(xCoord, yCoord+2, zCoord); - worldObj.setBlockToAir(xCoord, yCoord+3, zCoord); - worldObj.setBlockToAir(xCoord, yCoord+4, zCoord); + worldObj.setBlockToAir(getPos().add(0, 1, 0)); + worldObj.setBlockToAir(getPos().add(0, 2, 0)); + worldObj.setBlockToAir(getPos().add(0, 3, 0)); + worldObj.setBlockToAir(getPos().add(0, 4, 0)); - worldObj.setBlockToAir(xCoord, yCoord, zCoord); + worldObj.setBlockToAir(getPos()); } @Override 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 2d51badcb..60065d93e 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java @@ -6,7 +6,6 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.client; -import mekanism.api.Pos3D; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; @@ -25,6 +24,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Vec3; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -263,7 +263,7 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen if(getReactor() == null) { setReactor(new FusionReactor(this)); - MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); + MekanismUtils.updateBlock(worldObj, getPos()); } ((FusionReactor)getReactor()).formed = true; @@ -282,7 +282,7 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen else if(getReactor() != null) { setReactor(null); - MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); + MekanismUtils.updateBlock(worldObj, getPos()); } } @@ -329,7 +329,7 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen { if(box == null) { - box = AxisAlignedBB.getBoundingBox(xCoord-1, yCoord-3, zCoord-1, xCoord+2, yCoord, zCoord+2); + box = AxisAlignedBB.fromBounds(getPos().getX()-1, getPos().getY()-3, getPos().getZ()-1, getPos().getX()+2, getPos().getY(), getPos().getZ()+2); } return box; @@ -372,9 +372,9 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen @Override @SideOnly(Side.CLIENT) - public Pos3D getSoundPosition() + public Vec3 getSoundPosition() { - return new Pos3D(xCoord+0.5, yCoord+0.5, zCoord+0.5); + return new Vec3(getPos()).addVector(0.5, 0.5, 0.5); } @Override diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java index ec97de5fd..8d7696989 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorLogicAdapter.java @@ -36,7 +36,7 @@ public class TileEntityReactorLogicAdapter extends TileEntityReactorBlock implem if(outputting != prevOutputting) { - worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); + worldObj.notifyBlocksOfNeighborChange(getPos(), getBlockType()); } prevOutputting = outputting; diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java index 1501d9abd..59210a33e 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java @@ -215,10 +215,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl @Override public EnumSet getOutputtingSides() { - EnumSet set = EnumSet.allOf(EnumFacing.class); - set.remove(EnumFacing.null); - - return set; + return EnumSet.allOf(EnumFacing.class); } @Override @@ -333,7 +330,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl } @Override - public int[] getSlotsForFace(int side) + public int[] getSlotsForFace(EnumFacing side) { return getReactor() != null && getReactor().isFormed() ? new int[] {0} : InventoryUtils.EMPTY; } @@ -352,7 +349,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl } @Override - public boolean canExtractItem(int slotID, ItemStack itemstack, int side) + public boolean canExtractItem(int slotID, ItemStack itemstack, EnumFacing side) { if(getReactor() != null && getReactor().isFormed() && itemstack.getItem() instanceof ItemHohlraum) { 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 43ae0b29d..981900f81 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java @@ -10,6 +10,7 @@ import mekanism.api.MekanismConfig.generators; import mekanism.api.Range4D; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.Mekanism; +import mekanism.common.PacketHandler; import mekanism.common.multiblock.MultiblockCache; import mekanism.common.multiblock.MultiblockManager; import mekanism.common.multiblock.UpdateProtocol; @@ -107,7 +108,7 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock getOutputtingSides() + public EnumSet getOutputtingSides() { if(structure != null) { - EnumSet set = EnumSet.allOf(ForgeDirection.class); - set.remove(ForgeDirection.UNKNOWN); + EnumSet set = EnumSet.allOf(EnumFacing.class); - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + for(EnumFacing side : EnumFacing.VALUES) { - if(structure.locations.contains(Coord4D.get(this).getFromSide(side))) + if(structure.locations.contains(Coord4D.get(this).offset(side))) { set.remove(side); } @@ -84,19 +83,13 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I return set; } - return EnumSet.noneOf(ForgeDirection.class); + return EnumSet.noneOf(EnumFacing.class); } @Override - public EnumSet getConsumingSides() + public EnumSet getConsumingSides() { - return EnumSet.noneOf(ForgeDirection.class); - } - - @Override - public boolean canUpdate() - { - return true; + return EnumSet.noneOf(EnumFacing.class); } @Method(modid = "IC2") @@ -104,7 +97,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I { if(!worldObj.isRemote) { - TileEntity registered = EnergyNet.instance.getTileEntity(worldObj, xCoord, yCoord, zCoord); + TileEntity registered = EnergyNet.instance.getTileEntity(worldObj, getPos()); if(registered != this) { @@ -126,7 +119,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I { if(!worldObj.isRemote) { - TileEntity registered = EnergyNet.instance.getTileEntity(worldObj, xCoord, yCoord, zCoord); + TileEntity registered = EnergyNet.instance.getTileEntity(worldObj, getPos()); if(registered instanceof IEnergyTile) { @@ -175,13 +168,13 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I } @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) + public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { return 0; } @Override - public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) + public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate) { if(getOutputtingSides().contains(from)) { @@ -199,19 +192,19 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I } @Override - public boolean canConnectEnergy(ForgeDirection from) + public boolean canConnectEnergy(EnumFacing from) { return structure != null; } @Override - public int getEnergyStored(ForgeDirection from) + public int getEnergyStored(EnumFacing from) { return (int)Math.round(getEnergy()*general.TO_TE); } @Override - public int getMaxEnergyStored(ForgeDirection from) + public int getMaxEnergyStored(EnumFacing from) { return (int)Math.round(getMaxEnergy()*general.TO_TE); } @@ -246,27 +239,27 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I @Override @Method(modid = "IC2") - public boolean isTeleporterCompatible(ForgeDirection side) + public boolean isTeleporterCompatible(EnumFacing side) { return canOutputTo(side); } @Override - public boolean canOutputTo(ForgeDirection side) + public boolean canOutputTo(EnumFacing side) { return getOutputtingSides().contains(side); } @Override @Method(modid = "IC2") - public boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction) + public boolean acceptsEnergyFrom(TileEntity emitter, EnumFacing direction) { return false; } @Override @Method(modid = "IC2") - public boolean emitsEnergyTo(TileEntity receiver, ForgeDirection direction) + public boolean emitsEnergyTo(TileEntity receiver, EnumFacing direction) { return getOutputtingSides().contains(direction) && receiver instanceof IEnergyConductor; } @@ -307,7 +300,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I } @Override - public boolean canReceiveEnergy(ForgeDirection side) + public boolean canReceiveEnergy(EnumFacing side) { return false; } @@ -321,7 +314,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I @Override @Method(modid = "IC2") - public double injectEnergy(ForgeDirection direction, double amount, double voltage) + public double injectEnergy(EnumFacing direction, double amount, double voltage) { return amount; } @@ -338,19 +331,19 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I } @Override - public double transferEnergyToAcceptor(ForgeDirection side, double amount) + public double transferEnergyToAcceptor(EnumFacing side, double amount) { return 0; } @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) + public FluidTankInfo[] getTankInfo(EnumFacing from) { return ((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) ? new FluidTankInfo[] {fluidTank.getInfo()} : PipeUtils.EMPTY; } @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) + public int fill(EnumFacing from, FluidStack resource, boolean doFill) { int filled = fluidTank.fill(resource, doFill); @@ -363,7 +356,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I } @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) + public FluidStack drain(EnumFacing from, FluidStack resource, boolean doDrain) { if(structure != null && structure.fluidStored != null) { @@ -377,7 +370,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) + public FluidStack drain(EnumFacing from, int maxDrain, boolean doDrain) { if(structure != null) { @@ -388,7 +381,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) + public boolean canFill(EnumFacing from, Fluid fluid) { if(fluid == FluidRegistry.getFluid("steam")) { @@ -399,7 +392,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) + public boolean canDrain(EnumFacing from, Fluid fluid) { return ((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)); }