From 001c9a8d09f8eb2876640363935f2bbe921025da Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 22 May 2016 01:51:48 -0400 Subject: [PATCH 1/6] A few minor improvements, need to sort out capabilities for gas network --- .../render/transmitter/RenderMechanicalPipe.java | 10 +++++++--- .../java/mekanism/common/multipart/PartSidedPipe.java | 8 +++++--- .../mekanism/common/multipart/PartTransmitter.java | 5 ++++- .../java/mekanism/common/tile/TileEntityFluidTank.java | 4 ++-- .../java/mekanism/common/tile/TileEntityGasTank.java | 2 +- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java b/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java index 376b602e0..0c2c611d0 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java @@ -74,7 +74,7 @@ public class RenderMechanicalPipe extends RenderTransmitterBase MekanismRenderer.colorFluid(fluid); bindTexture(MekanismRenderer.getBlocksTexture()); - GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); + GL11.glTranslated(x, y, z); boolean gas = fluid.isGaseous(); @@ -98,6 +98,7 @@ public class RenderMechanicalPipe extends RenderTransmitterBase } else if(pipe.getConnectionType(side) != ConnectionType.NONE) { + GL11.glTranslated(0.5, 0.5, 0.5); Tessellator tessellator = Tessellator.getInstance(); WorldRenderer worldRenderer = tessellator.getWorldRenderer(); renderFluidInOut(worldRenderer, side, pipe); @@ -145,8 +146,11 @@ public class RenderMechanicalPipe extends RenderTransmitterBase toReturn.baseBlock = Blocks.water; toReturn.setTexture(MekanismRenderer.getFluidTexture(fluid, FluidType.STILL)); - toReturn.setSideRender(side, false); - toReturn.setSideRender(side.getOpposite(), false); + if(side != null) + { + toReturn.setSideRender(side, false); + toReturn.setSideRender(side.getOpposite(), false); + } DisplayInteger[] displays = new DisplayInteger[stages]; diff --git a/src/main/java/mekanism/common/multipart/PartSidedPipe.java b/src/main/java/mekanism/common/multipart/PartSidedPipe.java index 70a56c060..ae1792c08 100644 --- a/src/main/java/mekanism/common/multipart/PartSidedPipe.java +++ b/src/main/java/mekanism/common/multipart/PartSidedPipe.java @@ -963,15 +963,17 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart, @Override public boolean hasCapability(Capability capability, EnumFacing facing) { - return capability == Capabilities.CONFIGURABLE_CAPABILITY - || super.hasCapability(capability, facing); + return capability == Capabilities.CONFIGURABLE_CAPABILITY || super.hasCapability(capability, facing); } @Override public T getCapability(Capability capability, EnumFacing facing) { if(capability == Capabilities.CONFIGURABLE_CAPABILITY) - return (T) this; + { + return (T)this; + } + return super.getCapability(capability, facing); } diff --git a/src/main/java/mekanism/common/multipart/PartTransmitter.java b/src/main/java/mekanism/common/multipart/PartTransmitter.java index bf9274498..d1e3ee840 100644 --- a/src/main/java/mekanism/common/multipart/PartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/PartTransmitter.java @@ -199,7 +199,10 @@ public abstract class PartTransmitter> extends public T getCapability(Capability capability, EnumFacing side) { if(capability == Capabilities.GRID_TRANSMITTER_CAPABILITY) - return (T) getTransmitter(); + { + return (T)getTransmitter(); + } + return super.getCapability(capability, side); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java index 121795997..58f6a9c02 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java @@ -513,9 +513,9 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc @Override public boolean canFill(EnumFacing from, Fluid fluid) { - if(from == EnumFacing.DOWN) + if(from == EnumFacing.DOWN && worldObj != null && getPos() != null) { - TileEntity tile = Coord4D.get(this).offset(EnumFacing.DOWN).getTileEntity(worldObj); + TileEntity tile = worldObj.getTileEntity(getPos().offset(EnumFacing.DOWN)); if(isActive && !(tile instanceof TileEntityFluidTank)) { diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index fdafd8300..0b38ad67e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -93,7 +93,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH { if(inventory[0] != null && gasTank.getGas() != null) { - gasTank.draw(GasTransmission.addGas(inventory[0], gasTank.getGas()), true); + gasTank.draw(GasTransmission.addGas(inventory[0], gasTank.getGas()), true); } if(inventory[1] != null && (gasTank.getGas() == null || gasTank.getGas().amount < gasTank.getMaxGas())) From 18bd17dafe366621a3fbc064b7616aa24700744d Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 22 May 2016 03:29:01 -0400 Subject: [PATCH 2/6] Fixed Security Desk not invalidating --- src/main/java/mekanism/common/block/BlockBasic.java | 5 +---- .../java/mekanism/common/tile/TileEntitySecurityDesk.java | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index dd2299c0b..cea6e5be7 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -836,7 +836,7 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon { return null; } - + return BasicType.get(blockType, metadata).create(); } @@ -918,8 +918,6 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon } super.breakBlock(world, x, y, z, block, meta); - - world.removeTileEntity(x, y, z); } @Override @@ -974,7 +972,6 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon { if(!player.capabilities.isCreativeMode && !world.isRemote && willHarvest) { - float motion = 0.7F; double motionX = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; double motionY = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; diff --git a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java index e466bdcd1..bbd60a9ec 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java +++ b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java @@ -276,6 +276,8 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock implements @Override public void invalidate() { + super.invalidate(); + if(!worldObj.isRemote) { if(frequency != null) From 1e0d04ab2b28c85d298932ddc650c9a7a11f5de1 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 22 May 2016 17:58:25 -0400 Subject: [PATCH 3/6] Fixed Energy Cube output, fixed multiblock max size, fixed Electric Pump heavy water pumping --- .../java/mekanism/common/multiblock/UpdateProtocol.java | 9 +++++++-- .../mekanism/common/tile/TileEntityElectricPump.java | 2 +- .../java/mekanism/common/tile/TileEntityEnergyCube.java | 5 +++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index 4c95d0e5c..474fa76e1 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -182,7 +182,7 @@ public abstract class UpdateProtocol> volume += locations.size(); - if(Math.abs(xmax-xmin)+1 <= 18 && Math.abs(xmax-xmin)+1 <= 18 && Math.abs(zmax-zmin)+1 <= 18) + if(Math.abs(xmax-xmin)+1 <= 18 && Math.abs(ymax-ymin)+1 <= 18 && Math.abs(zmax-zmin)+1 <= 18) { if(rightBlocks && rightFrame && isHollow && isCorner) { @@ -212,8 +212,13 @@ public abstract class UpdateProtocol> } } - innerNodes.clear(); + innerNodes.clear(); iteratedNodes.add(tile); + + if(iteratedNodes.size() > 2048) + { + return; + } for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index 0320d420e..d2e78a603 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -256,7 +256,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I private boolean shouldTake(FluidStack fluid, Coord4D coord) { - if(fluid.getFluid() == FluidRegistry.WATER) + if(fluid.getFluid() == FluidRegistry.WATER || fluid.getFluid() == FluidRegistry.getFluid("heavywater")) { return general.pumpWaterSources; } diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index 355c1ebb9..a4b6e9439 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -108,6 +108,11 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo @Override public double getMaxOutput() { + if(tier == EnergyCubeTier.CREATIVE) + { + return Integer.MAX_VALUE; + } + return tier.output; } From 9c1fe98619ae80b4e4cd3527a4cbc0bd95edee1d Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 22 May 2016 18:32:12 -0400 Subject: [PATCH 4/6] Add in the missing resources for the remaining transmitters. @unpairedbracket, do you have any ideas for the colored glass of transporters? --- .../blockstates/diversion_transporter.json | 16 ++++++++++++++++ .../logistical_transporter_advanced.json | 3 +++ .../logistical_transporter_basic.json | 3 +++ .../logistical_transporter_elite.json | 3 +++ .../logistical_transporter_ultimate.json | 3 +++ .../blockstates/mechanical_pipe_advanced.json | 3 +++ .../blockstates/mechanical_pipe_basic.json | 3 +++ .../blockstates/mechanical_pipe_elite.json | 3 +++ .../blockstates/mechanical_pipe_ultimate.json | 3 +++ .../blockstates/pressurized_tube_advanced.json | 3 +++ .../blockstates/pressurized_tube_basic.json | 3 +++ .../blockstates/pressurized_tube_elite.json | 3 +++ .../blockstates/pressurized_tube_ultimate.json | 3 +++ .../blockstates/restrictive_transporter.json | 16 ++++++++++++++++ .../thermodynamic_conductor_advanced.json | 17 +++++++++++++++++ .../thermodynamic_conductor_basic.json | 16 ++++++++++++++++ .../thermodynamic_conductor_elite.json | 17 +++++++++++++++++ .../thermodynamic_conductor_ultimate.json | 17 +++++++++++++++++ .../blockstates/universal_cable_advanced.json | 3 +++ .../blockstates/universal_cable_elite.json | 3 +++ .../blockstates/universal_cable_ultimate.json | 3 +++ 21 files changed, 144 insertions(+) create mode 100644 src/main/resources/assets/mekanism/blockstates/diversion_transporter.json create mode 100644 src/main/resources/assets/mekanism/blockstates/restrictive_transporter.json create mode 100644 src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_advanced.json create mode 100644 src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_basic.json create mode 100644 src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_elite.json create mode 100644 src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_ultimate.json diff --git a/src/main/resources/assets/mekanism/blockstates/diversion_transporter.json b/src/main/resources/assets/mekanism/blockstates/diversion_transporter.json new file mode 100644 index 000000000..d3d67a8c2 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/diversion_transporter.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "#side": "mekanism:blocks/models/multipart/DiversionTransporterVertical", + "#center": "mekanism:blocks/models/multipart/DiversionTransporter" + }, + "custom": { + "flip-v": true + } + }, + "variants": { + "multipart": [{"model": "mekanism:transmitter_large.obj"}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_advanced.json b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_advanced.json index 261491ff6..ac0c9bbd4 100644 --- a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_advanced.json +++ b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_advanced.json @@ -4,6 +4,9 @@ "textures": { "#side": "mekanism:blocks/models/multipart/LogisticalTransporterVerticalAdvanced", "#center": "mekanism:blocks/models/multipart/LogisticalTransporterAdvanced" + }, + "custom": { + "flip-v": true } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_basic.json b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_basic.json index c94deabf6..c93d445b2 100644 --- a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_basic.json +++ b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_basic.json @@ -4,6 +4,9 @@ "textures": { "#side": "mekanism:blocks/models/multipart/LogisticalTransporterVerticalBasic", "#center": "mekanism:blocks/models/multipart/LogisticalTransporterBasic" + }, + "custom": { + "flip-v": true } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_elite.json b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_elite.json index 02c9213c8..9ad860b3a 100644 --- a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_elite.json +++ b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_elite.json @@ -4,6 +4,9 @@ "textures": { "#side": "mekanism:blocks/models/multipart/LogisticalTransporterVerticalElite", "#center": "mekanism:blocks/models/multipart/LogisticalTransporterElite" + }, + "custom": { + "flip-v": true } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_ultimate.json b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_ultimate.json index 53522c9ad..a729be189 100644 --- a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_ultimate.json +++ b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_ultimate.json @@ -4,6 +4,9 @@ "textures": { "#side": "mekanism:blocks/models/multipart/LogisticalTransporterVerticalUltimate", "#center": "mekanism:blocks/models/multipart/LogisticalTransporterUltimate" + }, + "custom": { + "flip-v": true } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_advanced.json b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_advanced.json index 233003357..c9b7bfa9f 100644 --- a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_advanced.json +++ b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_advanced.json @@ -4,6 +4,9 @@ "textures": { "#side": "mekanism:blocks/models/multipart/MechanicalPipeVerticalAdvanced", "#center": "mekanism:blocks/models/multipart/MechanicalPipeAdvanced" + }, + "custom": { + "flip-v": true } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_basic.json b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_basic.json index d97847430..6ea8101e7 100644 --- a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_basic.json +++ b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_basic.json @@ -4,6 +4,9 @@ "textures": { "#side": "mekanism:blocks/models/multipart/MechanicalPipeVerticalBasic", "#center": "mekanism:blocks/models/multipart/MechanicalPipeBasic" + }, + "custom": { + "flip-v": true } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_elite.json b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_elite.json index d47840173..d140f5401 100644 --- a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_elite.json +++ b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_elite.json @@ -4,6 +4,9 @@ "textures": { "#side": "mekanism:blocks/models/multipart/MechanicalPipeVerticalElite", "#center": "mekanism:blocks/models/multipart/MechanicalPipeElite" + }, + "custom": { + "flip-v": true } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_ultimate.json b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_ultimate.json index aef6f6ccd..06a5e9e21 100644 --- a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_ultimate.json +++ b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_ultimate.json @@ -4,6 +4,9 @@ "textures": { "#side": "mekanism:blocks/models/multipart/MechanicalPipeVerticalUltimate", "#center": "mekanism:blocks/models/multipart/MechanicalPipeUltimate" + }, + "custom": { + "flip-v": true } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_advanced.json b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_advanced.json index 84d07dc36..9975a886c 100644 --- a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_advanced.json +++ b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_advanced.json @@ -5,6 +5,9 @@ "textures": { "#side": "mekanism:blocks/models/multipart/PressurizedTubeVerticalAdvanced", "#center": "mekanism:blocks/models/multipart/PressurizedTubeAdvanced" + }, + "custom": { + "flip-v": true } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_basic.json b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_basic.json index 46c346579..777dc734b 100644 --- a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_basic.json +++ b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_basic.json @@ -5,6 +5,9 @@ "textures": { "#side": "mekanism:blocks/models/multipart/PressurizedTubeVerticalBasic", "#center": "mekanism:blocks/models/multipart/PressurizedTubeBasic" + }, + "custom": { + "flip-v": true } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_elite.json b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_elite.json index ee4eef09e..a6a06d623 100644 --- a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_elite.json +++ b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_elite.json @@ -5,6 +5,9 @@ "textures": { "#side": "mekanism:blocks/models/multipart/PressurizedTubeVerticalElite", "#center": "mekanism:blocks/models/multipart/PressurizedTubeElite" + }, + "custom": { + "flip-v": true } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_ultimate.json b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_ultimate.json index fa1aaa81f..9fabfdf3e 100644 --- a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_ultimate.json +++ b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_ultimate.json @@ -5,6 +5,9 @@ "textures": { "#side": "mekanism:blocks/models/multipart/PressurizedTubeVerticalUltimate", "#center": "mekanism:blocks/models/multipart/PressurizedTubeUltimate" + }, + "custom": { + "flip-v": true } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/restrictive_transporter.json b/src/main/resources/assets/mekanism/blockstates/restrictive_transporter.json new file mode 100644 index 000000000..76142e8ae --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/restrictive_transporter.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "#side": "mekanism:blocks/models/multipart/RestrictiveTransporterVertical", + "#center": "mekanism:blocks/models/multipart/RestrictiveTransporter" + }, + "custom": { + "flip-v": true + } + }, + "variants": { + "multipart": [{"model": "mekanism:transmitter_large.obj"}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_advanced.json b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_advanced.json new file mode 100644 index 000000000..b3acce8b7 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_advanced.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:transmitter_small.obj", + "textures": { + "#side": "mekanism:blocks/models/multipart/ThermodynamicConductorVerticalAdvanced", + "#center": "mekanism:blocks/models/multipart/ThermodynamicConductorAdvanced" + }, + "custom": { + "flip-v": true + } + }, + "variants": { + "multipart": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_basic.json b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_basic.json new file mode 100644 index 000000000..4acf7d9d8 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_basic.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:transmitter_small.obj", + "textures": { + "#side": "mekanism:blocks/models/multipart/ThermodynamicConductorVerticalBasic", + "#center": "mekanism:blocks/models/multipart/ThermodynamicConductorBasic" + }, + "custom": { + "flip-v": true + } + }, + "variants": { + "multipart": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_elite.json b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_elite.json new file mode 100644 index 000000000..30099d541 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_elite.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:transmitter_small.obj", + "textures": { + "#side": "mekanism:blocks/models/multipart/ThermodynamicConductorVerticalElite", + "#center": "mekanism:blocks/models/multipart/ThermodynamicConductorElite" + }, + "custom": { + "flip-v": true + } + }, + "variants": { + "multipart": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_ultimate.json b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_ultimate.json new file mode 100644 index 000000000..c63b302d8 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_ultimate.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:transmitter_small.obj", + "textures": { + "#side": "mekanism:blocks/models/multipart/ThermodynamicConductorVerticalUltimate", + "#center": "mekanism:blocks/models/multipart/ThermodynamicConductorUltimate" + }, + "custom": { + "flip-v": true + } + }, + "variants": { + "multipart": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/universal_cable_advanced.json b/src/main/resources/assets/mekanism/blockstates/universal_cable_advanced.json index 060bbb4f8..cb7dddb74 100644 --- a/src/main/resources/assets/mekanism/blockstates/universal_cable_advanced.json +++ b/src/main/resources/assets/mekanism/blockstates/universal_cable_advanced.json @@ -5,6 +5,9 @@ "textures": { "#side": "mekanism:blocks/models/multipart/UniversalCableVerticalAdvanced", "#center": "mekanism:blocks/models/multipart/UniversalCableAdvanced" + }, + "custom": { + "flip-v": true } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/universal_cable_elite.json b/src/main/resources/assets/mekanism/blockstates/universal_cable_elite.json index b24a3449f..a2bbdf881 100644 --- a/src/main/resources/assets/mekanism/blockstates/universal_cable_elite.json +++ b/src/main/resources/assets/mekanism/blockstates/universal_cable_elite.json @@ -5,6 +5,9 @@ "textures": { "#side": "mekanism:blocks/models/multipart/UniversalCableVerticalElite", "#center": "mekanism:blocks/models/multipart/UniversalCableElite" + }, + "custom": { + "flip-v": true } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/universal_cable_ultimate.json b/src/main/resources/assets/mekanism/blockstates/universal_cable_ultimate.json index 9f06b190d..44bd1853f 100644 --- a/src/main/resources/assets/mekanism/blockstates/universal_cable_ultimate.json +++ b/src/main/resources/assets/mekanism/blockstates/universal_cable_ultimate.json @@ -5,6 +5,9 @@ "textures": { "#side": "mekanism:blocks/models/multipart/UniversalCableVerticalUltimate", "#center": "mekanism:blocks/models/multipart/UniversalCableUltimate" + }, + "custom": { + "flip-v": true } }, "variants": { From 8954baac9fba45839b4be53966e751cacab2af87 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 22 May 2016 18:52:12 -0400 Subject: [PATCH 5/6] Fixed Mechanical Pipe internal rendering, add Diversion Transporter and Restrictive Transporter rendering --- .../java/mekanism/client/ClientProxy.java | 4 ++ .../transmitter/RenderMechanicalPipe.java | 1 + .../common/multipart/PartSidedPipe.java | 43 ++++++------------- 3 files changed, 17 insertions(+), 31 deletions(-) diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index abcfa8651..b8e218a52 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -129,9 +129,11 @@ import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.item.ItemSeismicReader; import mekanism.common.item.ItemWalkieTalkie; import mekanism.common.multiblock.MultiblockManager; +import mekanism.common.multipart.PartDiversionTransporter; import mekanism.common.multipart.PartLogisticalTransporter; import mekanism.common.multipart.PartMechanicalPipe; import mekanism.common.multipart.PartPressurizedTube; +import mekanism.common.multipart.PartRestrictiveTransporter; import mekanism.common.multipart.PartThermodynamicConductor; import mekanism.common.multipart.PartUniversalCable; import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage; @@ -330,6 +332,8 @@ public class ClientProxy extends CommonProxy MultipartRegistryClient.bindMultipartSpecialRenderer(PartUniversalCable.class, new RenderUniversalCable()); MultipartRegistryClient.bindMultipartSpecialRenderer(PartThermodynamicConductor.class, new RenderThermodynamicConductor()); MultipartRegistryClient.bindMultipartSpecialRenderer(PartLogisticalTransporter.class, new RenderLogisticalTransporter()); + MultipartRegistryClient.bindMultipartSpecialRenderer(PartDiversionTransporter.class, new RenderLogisticalTransporter()); + MultipartRegistryClient.bindMultipartSpecialRenderer(PartRestrictiveTransporter.class, new RenderLogisticalTransporter()); MultipartRegistryClient.bindMultipartSpecialRenderer(PartPressurizedTube.class, new RenderPressurizedTube()); } diff --git a/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java b/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java index 0c2c611d0..4eac3161b 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java @@ -103,6 +103,7 @@ public class RenderMechanicalPipe extends RenderTransmitterBase WorldRenderer worldRenderer = tessellator.getWorldRenderer(); renderFluidInOut(worldRenderer, side, pipe); tessellator.draw(); + GL11.glTranslated(-0.5, -0.5, -0.5); } } diff --git a/src/main/java/mekanism/common/multipart/PartSidedPipe.java b/src/main/java/mekanism/common/multipart/PartSidedPipe.java index ae1792c08..6856088cd 100644 --- a/src/main/java/mekanism/common/multipart/PartSidedPipe.java +++ b/src/main/java/mekanism/common/multipart/PartSidedPipe.java @@ -811,29 +811,6 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart, return sides; } -/* - public String getModelForSide(EnumFacing side, boolean internal) - { - String sideName = side.name().toLowerCase(); - String typeName = getConnectionType(side).name().toUpperCase(); - String name = sideName + typeName; - - if(internal) - { - return RenderPartTransmitter.contents_models.get(name); - } - else { - if(getTransmitterType().getSize() == Size.LARGE) - { - return RenderPartTransmitter.large_models.get(name); - } - else { - return RenderPartTransmitter.small_models.get(name); - } - } - } -*/ - @Override public boolean onSneakRightClick(EntityPlayer player, EnumFacing side) { @@ -845,9 +822,9 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart, { return false; } - else - { + else { EnumFacing hitSide = sideHit(hit.subHit + 1); + if(hitSide != null) { connectionTypes[hitSide.ordinal()] = connectionTypes[hitSide.ordinal()].next(); @@ -867,17 +844,19 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart, return true; } - private PartMOP reTrace(World world, BlockPos pos, EntityPlayer player) { - + private PartMOP reTrace(World world, BlockPos pos, EntityPlayer player) + { Vec3 start = RayTraceUtils.getStart(player); Vec3 end = RayTraceUtils.getEnd(player); RayTraceResultPart result = ((TileMultipart)world.getTileEntity(pos)).getPartContainer().collisionRayTrace(start, end); + return result == null ? null : result.hit; } protected EnumFacing sideHit(int boxIndex) { List list = new ArrayList<>(); + if(getContainer() != null) { for(EnumFacing side : EnumFacing.values()) @@ -892,6 +871,7 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart, } } if(boxIndex < list.size()) return list.get(boxIndex); + return null; } @@ -935,10 +915,12 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart, public List getVisibleGroups() { List visible = new ArrayList<>(); + for(EnumFacing side : EnumFacing.values()) { visible.add(side.getName() + getConnectionType(side).getName().toUpperCase()); } + return visible; } @@ -949,8 +931,8 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart, } @Override - public boolean canRenderInLayer(EnumWorldBlockLayer layer) { - + public boolean canRenderInLayer(EnumWorldBlockLayer layer) + { return layer == EnumWorldBlockLayer.CUTOUT; } @@ -994,11 +976,10 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart, return values()[ordinal()+1]; } + @Override public String getName() { return name().toLowerCase(); } } - - } From bc1f42805045c365312170a48e570bd26d8a913d Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 22 May 2016 19:14:45 -0400 Subject: [PATCH 6/6] (Hopefully) fixed transmitter connections on world load --- .../common/multipart/PartDiversionTransporter.java | 5 +++-- .../java/mekanism/common/multipart/PartSidedPipe.java | 10 +++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java index abf5eb044..5ac57d93b 100644 --- a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java @@ -11,6 +11,7 @@ import mekanism.common.Mekanism; import mekanism.common.content.transporter.TransporterStack; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; @@ -160,9 +161,9 @@ public class PartDiversionTransporter extends PartLogisticalTransporter } int mode = modes[side.ordinal()]; - int redstone = getWorld().isBlockIndirectlyGettingPowered(getPos()); + boolean redstone = MekanismUtils.isGettingPowered(getWorld(), new Coord4D(getPos(), getWorld())); - if((mode == 2 && redstone > 0) || (mode == 1 && redstone == 0)) + if((mode == 2 && redstone) || (mode == 1 && !redstone)) { return false; } diff --git a/src/main/java/mekanism/common/multipart/PartSidedPipe.java b/src/main/java/mekanism/common/multipart/PartSidedPipe.java index 6856088cd..42a747c8d 100644 --- a/src/main/java/mekanism/common/multipart/PartSidedPipe.java +++ b/src/main/java/mekanism/common/multipart/PartSidedPipe.java @@ -3,7 +3,6 @@ package mekanism.common.multipart; import io.netty.buffer.ByteBuf; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -41,17 +40,12 @@ import mekanism.api.transmitters.ITransmitter; import mekanism.api.transmitters.TransmissionType; import mekanism.common.MekanismItems; import mekanism.common.Tier; -import mekanism.common.Tier.CableTier; import mekanism.common.base.ITileNetwork; -import mekanism.common.block.states.BlockStateFacing; import mekanism.common.capabilities.Capabilities; -import mekanism.common.capabilities.StrictEnergyAcceptor; import mekanism.common.multipart.TransmitterType.Size; import mekanism.common.util.MekanismUtils; 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.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -78,6 +72,8 @@ import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; +import com.sun.xml.internal.bind.v2.TODO; + public abstract class PartSidedPipe extends Multipart implements IOccludingPart, /*ISlotOccludingPart, ISidedHollowConnect, JIconHitEffects, INeighborTileChange,*/ ITileNetwork, IBlockableConnection, IConfigurable, ITransmitter, ITickable { public static AxisAlignedBB[] smallSides = new AxisAlignedBB[7]; @@ -95,7 +91,7 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart, public boolean redstoneReactive = true; - public boolean forceUpdate = false; + public boolean forceUpdate = true; public ConnectionType[] connectionTypes = {ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL}; public TileEntity[] cachedAcceptors = new TileEntity[6];