Temporarily disable multipart functionality, got transmitters to work, reorganize multipart code

This commit is contained in:
aidancbrady committed 2017-03-28 22:49:29 -04:00
1 parent 89905c836b
commit 2aad738c3d
43 files changed
+283 -208

No files matched your search

+10 -10
View File
@@ -124,6 +124,8 @@ 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.BlockStateTransmitter.TransmitterStateMapper;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
import mekanism.common.entity.EntityBabySkeleton;
import mekanism.common.entity.EntityBalloon;
import mekanism.common.entity.EntityFlame;
@@ -133,21 +135,12 @@ import mekanism.common.inventory.InventoryPersonalChest;
import mekanism.common.item.ItemBlockBasic;
import mekanism.common.item.ItemBlockGasTank;
import mekanism.common.item.ItemBlockMachine;
import mekanism.common.item.ItemBlockTransmitter;
import mekanism.common.item.ItemCraftingFormula;
import mekanism.common.item.ItemPortableTeleporter;
import mekanism.common.item.ItemSeismicReader;
import mekanism.common.item.ItemWalkieTalkie;
import mekanism.common.multiblock.MultiblockManager;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterStateMapper;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterType;
import mekanism.common.multipart.ItemBlockTransmitter;
import mekanism.common.multipart.TileEntityDiversionTransporter;
import mekanism.common.multipart.TileEntityLogisticalTransporter;
import mekanism.common.multipart.TileEntityMechanicalPipe;
import mekanism.common.multipart.TileEntityPressurizedTube;
import mekanism.common.multipart.TileEntityRestrictiveTransporter;
import mekanism.common.multipart.TileEntityThermodynamicConductor;
import mekanism.common.multipart.TileEntityUniversalCable;
import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage;
import mekanism.common.tile.TileEntityAdvancedElectricMachine;
import mekanism.common.tile.TileEntityAdvancedFactory;
@@ -200,6 +193,13 @@ import mekanism.common.tile.TileEntitySeismicVibrator;
import mekanism.common.tile.TileEntitySolarNeutronActivator;
import mekanism.common.tile.TileEntityTeleporter;
import mekanism.common.tile.TileEntityThermalEvaporationController;
import mekanism.common.tile.transmitter.TileEntityDiversionTransporter;
import mekanism.common.tile.transmitter.TileEntityLogisticalTransporter;
import mekanism.common.tile.transmitter.TileEntityMechanicalPipe;
import mekanism.common.tile.transmitter.TileEntityPressurizedTube;
import mekanism.common.tile.transmitter.TileEntityRestrictiveTransporter;
import mekanism.common.tile.transmitter.TileEntityThermodynamicConductor;
import mekanism.common.tile.transmitter.TileEntityUniversalCable;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
@@ -8,8 +8,8 @@ import javax.vecmath.Matrix4f;
import mekanism.api.EnumColor;
import mekanism.client.render.ctm.CTMModelFactory;
import mekanism.common.multipart.ColorProperty;
import mekanism.common.multipart.TileEntityGlowPanel;
import mekanism.common.block.property.PropertyColor;
import mekanism.common.tile.TileEntityGlowPanel;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
@@ -70,7 +70,7 @@ public class GlowPanelModel extends OBJBakedModelBase
if(tempState != null)
{
return ((IExtendedBlockState)tempState).getValue(ColorProperty.INSTANCE).color;
return ((IExtendedBlockState)tempState).getValue(PropertyColor.INSTANCE).color;
}
return EnumColor.WHITE;
@@ -138,7 +138,7 @@ public class GlowPanelModel extends OBJBakedModelBase
if(state != null && tempState == null)
{
int hash = TileEntityGlowPanel.hash((IExtendedBlockState)state);
EnumColor color = ((IExtendedBlockState)state).getValue(ColorProperty.INSTANCE).color;
EnumColor color = ((IExtendedBlockState)state).getValue(PropertyColor.INSTANCE).color;
if(!glowPanelCache.containsKey(hash))
{
@@ -12,10 +12,10 @@ import javax.vecmath.Matrix4f;
import mekanism.api.MekanismConfig.client;
import mekanism.client.render.ctm.CTMModelFactory;
import mekanism.common.multipart.ColorProperty;
import mekanism.common.multipart.ConnectionProperty;
import mekanism.common.multipart.TileEntitySidedPipe;
import mekanism.common.multipart.TileEntitySidedPipe.ConnectionType;
import mekanism.common.block.property.PropertyColor;
import mekanism.common.block.property.PropertyConnection;
import mekanism.common.tile.transmitter.TileEntitySidedPipe;
import mekanism.common.tile.transmitter.TileEntitySidedPipe.ConnectionType;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.IBakedModel;
@@ -117,12 +117,12 @@ public class TransmitterModel extends OBJBakedModelBase
{
IExtendedBlockState extended = (IExtendedBlockState)state;
BlockRenderLayer layer = MinecraftForgeClient.getRenderLayer();
ColorProperty colorProp = extended.getValue(ColorProperty.INSTANCE);
PropertyColor colorProp = extended.getValue(PropertyColor.INSTANCE);
int color = -1;
if(colorProp != null && colorProp.color != null)
{
color = extended.getValue(ColorProperty.INSTANCE).color.ordinal();
color = extended.getValue(PropertyColor.INSTANCE).color.ordinal();
}
OBJState obj = extended.getValue(OBJProperty.INSTANCE);
@@ -132,7 +132,7 @@ public class TransmitterModel extends OBJBakedModelBase
color = -1;
}
int hash = Objects.hash(layer.ordinal(), color, ConnectionProperty.INSTANCE.valueToString(extended.getValue(ConnectionProperty.INSTANCE)));
int hash = Objects.hash(layer.ordinal(), color, PropertyConnection.INSTANCE.valueToString(extended.getValue(PropertyConnection.INSTANCE)));
if(obj.getVisibilityMap().containsKey(Group.ALL) || obj.getVisibilityMap().containsKey(Group.ALL_EXCEPT))
{
@@ -157,7 +157,7 @@ public class TransmitterModel extends OBJBakedModelBase
{
if(tempState != null)
{
ColorProperty prop = ((IExtendedBlockState)tempState).getValue(ColorProperty.INSTANCE);
PropertyColor prop = ((IExtendedBlockState)tempState).getValue(PropertyColor.INSTANCE);
if(MinecraftForgeClient.getRenderLayer() == BlockRenderLayer.TRANSLUCENT && prop != null && prop.color != null)
{
@@ -174,8 +174,8 @@ public class TransmitterModel extends OBJBakedModelBase
if(tempState != null)
{
EnumFacing side = EnumFacing.getFacingFromVector(f.getNormal().x, f.getNormal().y, f.getNormal().z);
ColorProperty prop = ((IExtendedBlockState)tempState).getValue(ColorProperty.INSTANCE);
ConnectionProperty connection = ((IExtendedBlockState)tempState).getValue(ConnectionProperty.INSTANCE);
PropertyColor prop = ((IExtendedBlockState)tempState).getValue(PropertyColor.INSTANCE);
PropertyConnection connection = ((IExtendedBlockState)tempState).getValue(PropertyConnection.INSTANCE);
boolean sideIconOverride = getIconStatus(side, connection) > 0;
if(MinecraftForgeClient.getRenderLayer() == BlockRenderLayer.TRANSLUCENT)
@@ -224,7 +224,7 @@ public class TransmitterModel extends OBJBakedModelBase
if(tempState != null)
{
EnumFacing side = EnumFacing.getFacingFromVector(f.getNormal().x, f.getNormal().y, f.getNormal().z);
ConnectionProperty connection = ((IExtendedBlockState)tempState).getValue(ConnectionProperty.INSTANCE);
PropertyConnection connection = ((IExtendedBlockState)tempState).getValue(PropertyConnection.INSTANCE);
if(groupName.endsWith("NONE") && getIconStatus(side, connection) == 2)
{
@@ -235,7 +235,7 @@ public class TransmitterModel extends OBJBakedModelBase
return false;
}
public byte getIconStatus(EnumFacing side, ConnectionProperty connection)
public byte getIconStatus(EnumFacing side, PropertyConnection connection)
{
ConnectionType type = TileEntitySidedPipe.getConnectionType(side, connection.connectionByte, connection.transmitterConnections, connection.connectionTypes);
@@ -10,8 +10,8 @@ import mekanism.client.render.MekanismRenderer.DisplayInteger;
import mekanism.client.render.MekanismRenderer.Model3D;
import mekanism.common.content.transporter.TransporterStack;
import mekanism.common.item.ItemConfigurator;
import mekanism.common.multipart.TileEntityDiversionTransporter;
import mekanism.common.multipart.TileEntityLogisticalTransporter;
import mekanism.common.tile.transmitter.TileEntityDiversionTransporter;
import mekanism.common.tile.transmitter.TileEntityLogisticalTransporter;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.common.util.TransporterUtils;
@@ -8,8 +8,8 @@ import mekanism.client.render.MekanismRenderer.DisplayInteger;
import mekanism.client.render.MekanismRenderer.FluidType;
import mekanism.client.render.MekanismRenderer.Model3D;
import mekanism.common.ColourRGBA;
import mekanism.common.multipart.TileEntityMechanicalPipe;
import mekanism.common.multipart.TileEntitySidedPipe.ConnectionType;
import mekanism.common.tile.transmitter.TileEntityMechanicalPipe;
import mekanism.common.tile.transmitter.TileEntitySidedPipe.ConnectionType;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.VertexBuffer;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -3,7 +3,7 @@ package mekanism.client.render.transmitter;
import mekanism.api.MekanismConfig.client;
import mekanism.client.render.MekanismRenderer;
import mekanism.common.ColourRGBA;
import mekanism.common.multipart.TileEntityPressurizedTube;
import mekanism.common.tile.transmitter.TileEntityPressurizedTube;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.VertexBuffer;
import net.minecraft.util.EnumFacing;
@@ -3,7 +3,7 @@ package mekanism.client.render.transmitter;
import mekanism.api.MekanismConfig.client;
import mekanism.client.render.ColourTemperature;
import mekanism.client.render.MekanismRenderer;
import mekanism.common.multipart.TileEntityThermodynamicConductor;
import mekanism.common.tile.transmitter.TileEntityThermodynamicConductor;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.VertexBuffer;
import net.minecraft.util.EnumFacing;
@@ -5,7 +5,7 @@ import java.util.Map;
import mekanism.client.render.MekanismRenderer;
import mekanism.common.ColourRGBA;
import mekanism.common.multipart.TileEntityTransmitter;
import mekanism.common.tile.transmitter.TileEntityTransmitter;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.Minecraft;
@@ -3,7 +3,7 @@ package mekanism.client.render.transmitter;
import mekanism.api.MekanismConfig.client;
import mekanism.client.render.MekanismRenderer;
import mekanism.common.ColourRGBA;
import mekanism.common.multipart.TileEntityUniversalCable;
import mekanism.common.tile.transmitter.TileEntityUniversalCable;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.VertexBuffer;
import net.minecraft.util.EnumFacing;
@@ -60,13 +60,6 @@ import mekanism.common.inventory.container.ContainerTeleporter;
import mekanism.common.inventory.container.ContainerThermalEvaporationController;
import mekanism.common.inventory.container.ContainerUpgradeManagement;
import mekanism.common.item.ItemPortableTeleporter;
import mekanism.common.multipart.TileEntityDiversionTransporter;
import mekanism.common.multipart.TileEntityLogisticalTransporter;
import mekanism.common.multipart.TileEntityMechanicalPipe;
import mekanism.common.multipart.TileEntityPressurizedTube;
import mekanism.common.multipart.TileEntityRestrictiveTransporter;
import mekanism.common.multipart.TileEntityThermodynamicConductor;
import mekanism.common.multipart.TileEntityUniversalCable;
import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage;
import mekanism.common.tile.TileEntityAdvancedElectricMachine;
import mekanism.common.tile.TileEntityAdvancedFactory;
@@ -120,6 +113,13 @@ import mekanism.common.tile.TileEntitySeismicVibrator;
import mekanism.common.tile.TileEntitySolarNeutronActivator;
import mekanism.common.tile.TileEntityTeleporter;
import mekanism.common.tile.TileEntityThermalEvaporationController;
import mekanism.common.tile.transmitter.TileEntityDiversionTransporter;
import mekanism.common.tile.transmitter.TileEntityLogisticalTransporter;
import mekanism.common.tile.transmitter.TileEntityMechanicalPipe;
import mekanism.common.tile.transmitter.TileEntityPressurizedTube;
import mekanism.common.tile.transmitter.TileEntityRestrictiveTransporter;
import mekanism.common.tile.transmitter.TileEntityThermodynamicConductor;
import mekanism.common.tile.transmitter.TileEntityUniversalCable;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -9,7 +9,7 @@ import mekanism.api.transmitters.DynamicNetwork;
import mekanism.api.transmitters.IGridTransmitter;
import mekanism.api.util.UnitDisplayUtils.TemperatureUnit;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.multipart.TransmitterImpl;
import mekanism.common.transmitters.TransmitterImpl;
//import mekanism.common.multipart.MultipartTransmitter;
import mekanism.common.util.MekanismUtils;
import net.minecraftforge.fml.common.FMLCommonHandler;
+2 -2
View File
@@ -44,6 +44,7 @@ import mekanism.common.base.IFactory.RecipeType;
import mekanism.common.base.IModule;
import mekanism.common.block.states.BlockStateMachine;
import mekanism.common.block.states.BlockStateMachine.MachineType;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.chunkloading.ChunkManager;
import mekanism.common.content.boiler.SynchronizedBoilerData;
@@ -61,9 +62,8 @@ import mekanism.common.frequency.Frequency;
import mekanism.common.frequency.FrequencyManager;
import mekanism.common.integration.MekanismHooks;
import mekanism.common.integration.OreDictManager;
import mekanism.common.integration.multipart.MultipartMekanism;
import mekanism.common.multiblock.MultiblockManager;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterType;
import mekanism.common.multipart.MultipartMekanism;
import mekanism.common.network.PacketDataRequest.DataRequestMessage;
import mekanism.common.network.PacketSimpleGui;
import mekanism.common.network.PacketTransmitterUpdate.PacketType;
@@ -10,24 +10,24 @@ import mekanism.common.block.BlockBounding;
import mekanism.common.block.BlockCardboardBox;
import mekanism.common.block.BlockEnergyCube;
import mekanism.common.block.BlockGasTank;
import mekanism.common.block.BlockGlowPanel;
import mekanism.common.block.BlockMachine;
import mekanism.common.block.BlockObsidianTNT;
import mekanism.common.block.BlockOre;
import mekanism.common.block.BlockPlastic;
import mekanism.common.block.BlockPlasticFence;
import mekanism.common.block.BlockSalt;
import mekanism.common.block.BlockTransmitter;
import mekanism.common.block.states.BlockStatePlastic.PlasticBlockType;
import mekanism.common.item.ItemBlockBasic;
import mekanism.common.item.ItemBlockCardboardBox;
import mekanism.common.item.ItemBlockEnergyCube;
import mekanism.common.item.ItemBlockGasTank;
import mekanism.common.item.ItemBlockGlowPanel;
import mekanism.common.item.ItemBlockMachine;
import mekanism.common.item.ItemBlockOre;
import mekanism.common.item.ItemBlockPlastic;
import mekanism.common.multipart.BlockGlowPanel;
import mekanism.common.multipart.BlockTransmitter;
import mekanism.common.multipart.ItemBlockGlowPanel;
import mekanism.common.multipart.ItemBlockTransmitter;
import mekanism.common.item.ItemBlockTransmitter;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import net.minecraftforge.fml.common.registry.GameRegistry;
+1 -1
View File
@@ -6,7 +6,7 @@ import java.util.ArrayList;
import java.util.List;
import mekanism.api.EnumColor;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterType;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
import mekanism.common.util.LangUtils;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.ResourceLocation;
@@ -1,11 +1,15 @@
package mekanism.common.multipart;
package mekanism.common.block;
import java.util.Random;
import mekanism.api.Coord4D;
import mekanism.common.Mekanism;
import mekanism.common.MekanismBlocks;
import mekanism.common.block.property.PropertyColor;
import mekanism.common.block.states.BlockStateFacing;
import mekanism.common.block.states.BlockStateGlowPanel;
import mekanism.common.integration.multipart.MultipartMekanism;
import mekanism.common.tile.TileEntityGlowPanel;
import net.minecraft.block.Block;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.block.material.Material;
@@ -59,14 +63,14 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider
@Override
public BlockStateContainer createBlockState()
{
return new GlowPanelBlockState(this);
return new BlockStateGlowPanel(this);
}
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos)
{
TileEntityGlowPanel tileEntity = (TileEntityGlowPanel)world.getTileEntity(pos);
return state.withProperty(BlockStateFacing.facingProperty, tileEntity.side);
return tileEntity != null ? state.withProperty(BlockStateFacing.facingProperty, tileEntity.side) : state;
}
@SideOnly(Side.CLIENT)
@@ -74,11 +78,15 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider
public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos)
{
TileEntityGlowPanel tileEntity = (TileEntityGlowPanel)world.getTileEntity(pos);
state = state.withProperty(BlockStateFacing.facingProperty, tileEntity.side);
if(state instanceof IExtendedBlockState)
if(tileEntity != null)
{
return ((IExtendedBlockState)state).withProperty(ColorProperty.INSTANCE, new ColorProperty(tileEntity.colour));
state = state.withProperty(BlockStateFacing.facingProperty, tileEntity.side);
if(state instanceof IExtendedBlockState)
{
return ((IExtendedBlockState)state).withProperty(PropertyColor.INSTANCE, new PropertyColor(tileEntity.colour));
}
}
return state;
@@ -128,7 +136,13 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos)
{
TileEntityGlowPanel tile = (TileEntityGlowPanel)world.getTileEntity(pos);
return bounds[tile.side.ordinal()];
if(tile != null)
{
return bounds[tile.side.ordinal()];
}
return super.getBoundingBox(state, world, pos);
}
@Override
@@ -158,7 +172,7 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider
@Override
public int damageDropped(IBlockState state)
{
return ((IExtendedBlockState)state).getValue(ColorProperty.INSTANCE).color.getMetaValue();
return ((IExtendedBlockState)state).getValue(PropertyColor.INSTANCE).color.getMetaValue();
}
@Override
@@ -1,5 +1,6 @@
package mekanism.common.multipart;
package mekanism.common.block;
import java.util.Arrays;
import java.util.List;
import java.util.Random;
@@ -9,9 +10,21 @@ import mekanism.common.Mekanism;
import mekanism.common.MekanismBlocks;
import mekanism.common.Tier.BaseTier;
import mekanism.common.base.ITierItem;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterType;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterType.Size;
import mekanism.common.multipart.MultipartMekanism.AdvancedRayTraceResult;
import mekanism.common.block.property.PropertyConnection;
import mekanism.common.block.states.BlockStateTransmitter;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType.Size;
import mekanism.common.integration.multipart.MultipartMekanism;
import mekanism.common.integration.multipart.MultipartMekanism.AdvancedRayTraceResult;
import mekanism.common.tile.transmitter.TileEntityDiversionTransporter;
import mekanism.common.tile.transmitter.TileEntityLogisticalTransporter;
import mekanism.common.tile.transmitter.TileEntityMechanicalPipe;
import mekanism.common.tile.transmitter.TileEntityPressurizedTube;
import mekanism.common.tile.transmitter.TileEntityRestrictiveTransporter;
import mekanism.common.tile.transmitter.TileEntitySidedPipe;
import mekanism.common.tile.transmitter.TileEntityThermodynamicConductor;
import mekanism.common.tile.transmitter.TileEntityUniversalCable;
import mekanism.common.tile.transmitter.TileEntitySidedPipe.ConnectionType;
import mekanism.common.util.MekanismUtils;
import net.minecraft.block.Block;
import net.minecraft.block.ITileEntityProvider;
@@ -38,6 +51,9 @@ import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.client.model.obj.OBJModel.OBJProperty;
import net.minecraftforge.client.model.obj.OBJModel.OBJState;
import net.minecraftforge.common.property.IExtendedBlockState;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -118,7 +134,18 @@ public class BlockTransmitter extends Block implements ITileEntityProvider
public IBlockState getExtendedState(IBlockState state, IBlockAccess w, BlockPos pos)
{
TileEntitySidedPipe tile = (TileEntitySidedPipe)w.getTileEntity(pos);
return tile.getExtendedState(state);
if(tile != null)
{
return tile.getExtendedState(state);
}
else {
ConnectionType[] typeArray = new ConnectionType[] {ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL,
ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL};
PropertyConnection connectionProp = new PropertyConnection((byte)0, (byte)0, typeArray, true);
return ((IExtendedBlockState)state).withProperty(OBJProperty.INSTANCE, new OBJState(Arrays.asList(), true)).withProperty(PropertyConnection.INSTANCE, connectionProp);
}
}
@Override
@@ -126,7 +153,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider
{
TileEntitySidedPipe pipe = (TileEntitySidedPipe)world.getTileEntity(pos);
if(pipe.getTransmitterType().getSize() == Size.SMALL)
if(pipe != null && pipe.getTransmitterType().getSize() == Size.SMALL)
{
return smallSides[6];
}
@@ -138,11 +165,15 @@ public class BlockTransmitter extends Block implements ITileEntityProvider
public void addCollisionBoxToList(IBlockState state, World world, BlockPos pos, AxisAlignedBB entityBox, List<AxisAlignedBB> collidingBoxes, @Nullable Entity entityIn, boolean b)
{
TileEntitySidedPipe tile = (TileEntitySidedPipe)world.getTileEntity(pos);
List<AxisAlignedBB> boxes = tile.getCollisionBoxes(entityBox.offset(-pos.getX(), -pos.getY(), -pos.getZ()));
for(AxisAlignedBB box : boxes)
if(tile != null)
{
collidingBoxes.add(box.offset(pos));
List<AxisAlignedBB> boxes = tile.getCollisionBoxes(entityBox.offset(-pos.getX(), -pos.getY(), -pos.getZ()));
for(AxisAlignedBB box : boxes)
{
collidingBoxes.add(box.offset(pos));
}
}
}
@@ -156,6 +187,12 @@ public class BlockTransmitter extends Block implements ITileEntityProvider
public RayTraceResult collisionRayTrace(IBlockState blockState, World world, BlockPos pos, Vec3d start, Vec3d end)
{
TileEntitySidedPipe tile = (TileEntitySidedPipe)world.getTileEntity(pos);
if(tile == null)
{
return null;
}
List<AxisAlignedBB> boxes = tile.getCollisionBoxes();
AdvancedRayTraceResult result = MultipartMekanism.collisionRayTrace(pos, start, end, boxes);
@@ -276,7 +313,14 @@ public class BlockTransmitter extends Block implements ITileEntityProvider
@Override
public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer)
{
return true;
TransmitterType type = state.getValue(BlockStateTransmitter.typeProperty);
if(layer == BlockRenderLayer.TRANSLUCENT && (type == TransmitterType.LOGISTICAL_TRANSPORTER || type == TransmitterType.DIVERSION_TRANSPORTER))
{
return true;
}
return layer == BlockRenderLayer.CUTOUT;
}
@Override
@@ -323,7 +367,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider
private static AxisAlignedBB getDefaultForTile(TileEntitySidedPipe tile)
{
if(tile.getTransmitterType().getSize() == Size.SMALL)
if(tile == null || tile.getTransmitterType().getSize() == Size.SMALL)
{
return smallDefault;
}
@@ -333,6 +377,11 @@ public class BlockTransmitter extends Block implements ITileEntityProvider
private static void setDefaultForTile(TileEntitySidedPipe tile, AxisAlignedBB box)
{
if(tile == null)
{
return;
}
if(tile.getTransmitterType().getSize() == Size.SMALL)
{
smallDefault = box;
@@ -345,6 +394,26 @@ public class BlockTransmitter extends Block implements ITileEntityProvider
@Override
public TileEntity createNewTileEntity(World worldIn, int meta)
{
TransmitterType type = TransmitterType.get(meta);
switch(type)
{
case UNIVERSAL_CABLE:
return new TileEntityUniversalCable();
case MECHANICAL_PIPE:
return new TileEntityMechanicalPipe();
case PRESSURIZED_TUBE:
return new TileEntityPressurizedTube();
case LOGISTICAL_TRANSPORTER:
return new TileEntityLogisticalTransporter();
case DIVERSION_TRANSPORTER:
return new TileEntityDiversionTransporter();
case RESTRICTIVE_TRANSPORTER:
return new TileEntityRestrictiveTransporter();
case THERMODYNAMIC_CONDUCTOR:
return new TileEntityThermodynamicConductor();
}
return null;
}
}
@@ -1,17 +1,17 @@
package mekanism.common.multipart;
package mekanism.common.block.property;
import mekanism.api.EnumColor;
import net.minecraftforge.common.property.IUnlistedProperty;
public class ColorProperty implements IUnlistedProperty<ColorProperty>
public class PropertyColor implements IUnlistedProperty<PropertyColor>
{
public static ColorProperty INSTANCE = new ColorProperty();
public static PropertyColor INSTANCE = new PropertyColor();
public EnumColor color;
public ColorProperty() {}
public PropertyColor() {}
public ColorProperty(EnumColor c)
public PropertyColor(EnumColor c)
{
color = c;
}
@@ -23,7 +23,7 @@ public class ColorProperty implements IUnlistedProperty<ColorProperty>
}
@Override
public boolean isValid(ColorProperty value)
public boolean isValid(PropertyColor value)
{
return true;
}
@@ -35,7 +35,7 @@ public class ColorProperty implements IUnlistedProperty<ColorProperty>
}
@Override
public String valueToString(ColorProperty value)
public String valueToString(PropertyColor value)
{
return color.getName();
}
@@ -1,22 +1,22 @@
package mekanism.common.multipart;
package mekanism.common.block.property;
import java.util.Arrays;
import mekanism.common.multipart.TileEntitySidedPipe.ConnectionType;
import mekanism.common.tile.transmitter.TileEntitySidedPipe.ConnectionType;
import net.minecraftforge.common.property.IUnlistedProperty;
public class ConnectionProperty implements IUnlistedProperty<ConnectionProperty>
public class PropertyConnection implements IUnlistedProperty<PropertyConnection>
{
public static ConnectionProperty INSTANCE = new ConnectionProperty();
public static PropertyConnection INSTANCE = new PropertyConnection();
public byte connectionByte;
public byte transmitterConnections;
public ConnectionType[] connectionTypes;
public boolean renderCenter;
public ConnectionProperty() {}
public PropertyConnection() {}
public ConnectionProperty(byte b, byte b1, ConnectionType[] types, boolean center)
public PropertyConnection(byte b, byte b1, ConnectionType[] types, boolean center)
{
connectionByte = b;
transmitterConnections = b1;
@@ -31,7 +31,7 @@ public class ConnectionProperty implements IUnlistedProperty<ConnectionProperty>
}
@Override
public boolean isValid(ConnectionProperty value)
public boolean isValid(PropertyConnection value)
{
return true;
}
@@ -43,7 +43,7 @@ public class ConnectionProperty implements IUnlistedProperty<ConnectionProperty>
}
@Override
public String valueToString(ConnectionProperty value)
public String valueToString(PropertyConnection value)
{
return Byte.toString(value.connectionByte) + "_" + Byte.toString(value.transmitterConnections) + "_"
+ Arrays.toString(value.connectionTypes) + "_" + value.renderCenter;
@@ -0,0 +1,15 @@
package mekanism.common.block.states;
import mekanism.common.block.BlockGlowPanel;
import mekanism.common.block.property.PropertyColor;
import net.minecraft.block.properties.IProperty;
import net.minecraftforge.common.property.ExtendedBlockState;
import net.minecraftforge.common.property.IUnlistedProperty;
public class BlockStateGlowPanel extends ExtendedBlockState
{
public BlockStateGlowPanel(BlockGlowPanel block)
{
super(block, new IProperty[] {BlockStateFacing.facingProperty}, new IUnlistedProperty[] {PropertyColor.INSTANCE});
}
}
@@ -1,7 +1,10 @@
package mekanism.common.multipart;
package mekanism.common.block.states;
import mekanism.api.transmitters.TransmissionType;
import mekanism.common.Tier.BaseTier;
import mekanism.common.block.BlockTransmitter;
import mekanism.common.block.property.PropertyColor;
import mekanism.common.block.property.PropertyConnection;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.IBlockState;
@@ -20,7 +23,7 @@ public class BlockStateTransmitter extends ExtendedBlockState
public BlockStateTransmitter(BlockTransmitter block)
{
super(block, new IProperty[] {typeProperty, tierProperty}, new IUnlistedProperty[] {OBJProperty.INSTANCE, ColorProperty.INSTANCE, ConnectionProperty.INSTANCE});
super(block, new IProperty[] {typeProperty, tierProperty}, new IUnlistedProperty[] {OBJProperty.INSTANCE, PropertyColor.INSTANCE, PropertyConnection.INSTANCE});
}
public enum TransmitterType implements IStringSerializable
@@ -13,7 +13,7 @@ import mekanism.common.Mekanism;
import mekanism.common.MekanismBlocks;
import mekanism.common.MekanismItems;
import mekanism.common.Resource;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterType;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
import mekanism.common.recipe.RecipeHandler;
import mekanism.common.util.MekanismUtils;
import net.minecraft.init.Items;
@@ -1,4 +1,4 @@
package mekanism.common.multipart;
package mekanism.common.integration.multipart;
import mcmultipart.api.multipart.IMultipart;
import mcmultipart.api.slot.EnumFaceSlot;
@@ -1,4 +1,4 @@
package mekanism.common.multipart;
package mekanism.common.integration.multipart;
import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_1;
import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_2;
@@ -48,23 +48,23 @@ public class MultipartMekanism implements IMCMPAddon
{
TileEntity tile = event.getObject();
if(tile instanceof TileEntitySidedPipe)
/*if(tile instanceof TileEntitySidedPipe)
{
register(event, "sided_pipe");
}
else if(tile instanceof TileEntityGlowPanel)
{
register(event, "glow_panel");
}
}*/
}
@Override
public void registerParts(IMultipartRegistry registry)
{
registry.registerPartWrapper(MekanismBlocks.Transmitter, new MultipartTransmitter());
/*registry.registerPartWrapper(MekanismBlocks.Transmitter, new MultipartTransmitter());
registry.registerStackWrapper(Item.getItemFromBlock(MekanismBlocks.Transmitter), s -> true, MekanismBlocks.Transmitter);
registry.registerPartWrapper(MekanismBlocks.GlowPanel, new MultipartGlowPanel());
registry.registerStackWrapper(Item.getItemFromBlock(MekanismBlocks.GlowPanel), s -> true, MekanismBlocks.GlowPanel);
registry.registerStackWrapper(Item.getItemFromBlock(MekanismBlocks.GlowPanel), s -> true, MekanismBlocks.GlowPanel);*/
}
private void register(AttachCapabilitiesEvent<TileEntity> e, String id)
@@ -1,4 +1,4 @@
package mekanism.common.multipart;
package mekanism.common.integration.multipart;
import mcmultipart.api.multipart.IMultipartTile;
import net.minecraft.tileentity.TileEntity;
@@ -1,9 +1,10 @@
package mekanism.common.multipart;
package mekanism.common.integration.multipart;
import mcmultipart.api.container.IPartInfo;
import mcmultipart.api.multipart.IMultipart;
import mcmultipart.api.slot.EnumCenterSlot;
import mcmultipart.api.slot.IPartSlot;
import mekanism.common.tile.transmitter.TileEntitySidedPipe;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.tileentity.TileEntity;
@@ -1,4 +1,4 @@
package mekanism.common.multipart;
package mekanism.common.item;
import java.util.ArrayList;
@@ -8,6 +8,7 @@ import mekanism.api.EnumColor;
import mekanism.api.Range4D;
import mekanism.common.Mekanism;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.tile.TileEntityGlowPanel;
import mekanism.common.util.LangUtils;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
@@ -1,4 +1,4 @@
package mekanism.common.multipart;
package mekanism.common.item;
import java.util.ArrayList;
import java.util.List;
@@ -13,8 +13,10 @@ import mekanism.common.Mekanism;
import mekanism.common.Tier;
import mekanism.common.Tier.BaseTier;
import mekanism.common.base.ITierItem;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterType;
import mekanism.common.block.states.BlockStateTransmitter;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.tile.transmitter.TileEntitySidedPipe;
import mekanism.common.util.LangUtils;
import mekanism.common.util.MekanismUtils;
import net.minecraft.block.Block;
@@ -21,6 +21,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.MathHelper;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.fml.common.Optional.Interface;
import net.minecraftforge.fml.common.Optional.InterfaceList;
@@ -52,8 +53,14 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec
@Override
public double getDurabilityForDisplay(ItemStack stack)
{
return getEnergy(stack)/getMaxEnergy(stack);
return 1D-(getEnergy(stack)/getMaxEnergy(stack));
}
@Override
public int getRGBDurabilityForDisplay(ItemStack stack)
{
return MathHelper.hsvToRGB(Math.max(0.0F, (float)getDurabilityForDisplay(stack)) / 3.0F, 1.0F, 1.0F);
}
@Override
public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List<String> list, boolean flag)
@@ -1,14 +0,0 @@
package mekanism.common.multipart;
import mekanism.common.block.states.BlockStateFacing;
import net.minecraft.block.properties.IProperty;
import net.minecraftforge.common.property.ExtendedBlockState;
import net.minecraftforge.common.property.IUnlistedProperty;
public class GlowPanelBlockState extends ExtendedBlockState
{
public GlowPanelBlockState(BlockGlowPanel block)
{
super(block, new IProperty[] {BlockStateFacing.facingProperty}, new IUnlistedProperty[] {ColorProperty.INSTANCE});
}
}
@@ -1,4 +1,4 @@
package mekanism.common.multipart;
package mekanism.common.tile;
import io.netty.buffer.ByteBuf;
@@ -6,6 +6,7 @@ import java.util.ArrayList;
import mekanism.api.EnumColor;
import mekanism.common.base.ITileNetwork;
import mekanism.common.block.property.PropertyColor;
import mekanism.common.block.states.BlockStateFacing;
import mekanism.common.util.MekanismUtils;
import net.minecraft.nbt.NBTTagCompound;
@@ -70,7 +71,7 @@ public class TileEntityGlowPanel extends TileEntity implements ITileNetwork
public static int hash(IExtendedBlockState state)
{
int hash = 1;
hash = 31 * hash + state.getValue(ColorProperty.INSTANCE).color.ordinal();
hash = 31 * hash + state.getValue(PropertyColor.INSTANCE).color.ordinal();
hash = 31 * hash + state.getValue(BlockStateFacing.facingProperty).ordinal();
return hash;
@@ -1,4 +1,4 @@
package mekanism.common.multipart;
package mekanism.common.tile.transmitter;
import io.netty.buffer.ByteBuf;
@@ -8,8 +8,9 @@ import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.api.Range4D;
import mekanism.common.Mekanism;
import mekanism.common.block.states.BlockStateTransmitter;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
import mekanism.common.content.transporter.TransporterStack;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterType;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.util.LangUtils;
import mekanism.common.util.MekanismUtils;
@@ -1,4 +1,4 @@
package mekanism.common.multipart;
package mekanism.common.tile.transmitter;
import io.netty.buffer.ByteBuf;
@@ -16,13 +16,16 @@ import mekanism.common.Tier;
import mekanism.common.Tier.BaseTier;
import mekanism.common.Tier.TransporterTier;
import mekanism.common.base.ILogisticalTransporter;
import mekanism.common.block.property.PropertyColor;
import mekanism.common.block.states.BlockStateTransmitter;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.content.transporter.InvStack;
import mekanism.common.content.transporter.PathfinderCache;
import mekanism.common.content.transporter.TransporterManager;
import mekanism.common.content.transporter.TransporterStack;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterType;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.transmitters.TransporterImpl;
import mekanism.common.util.InventoryUtils;
import mekanism.common.util.LangUtils;
import mekanism.common.util.MekanismUtils;
@@ -33,7 +36,6 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumFacing;
@@ -95,7 +97,7 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter<IInve
}
@Override
protected boolean isValidTransmitter(TileEntity tileEntity)
public boolean isValidTransmitter(TileEntity tileEntity)
{
ILogisticalTransporter transporter = CapabilityUtils.getCapability(tileEntity, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null);
@@ -127,7 +129,7 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter<IInve
getTransmitter().update();
}
protected void pullItems()
public void pullItems()
{
if(pullDelay == 0)
{
@@ -371,12 +373,6 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter<IInve
return getTransmitter().getColor();
}
@Override
public boolean transparencyRender()
{
return true;
}
@Override
public void onChunkUnload()
{
@@ -439,7 +435,7 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter<IInve
@Override
public IBlockState getExtendedState(IBlockState state)
{
return ((IExtendedBlockState)super.getExtendedState(state)).withProperty(ColorProperty.INSTANCE, new ColorProperty(getRenderColor()));
return ((IExtendedBlockState)super.getExtendedState(state)).withProperty(PropertyColor.INSTANCE, new PropertyColor(getRenderColor()));
}
@Override
@@ -1,4 +1,4 @@
package mekanism.common.multipart;
package mekanism.common.tile.transmitter;
import io.netty.buffer.ByteBuf;
@@ -13,8 +13,9 @@ import mekanism.common.Tier.BaseTier;
import mekanism.common.Tier.PipeTier;
import mekanism.common.base.FluidHandlerWrapper;
import mekanism.common.base.IFluidHandlerWrapper;
import mekanism.common.block.states.BlockStateTransmitter;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
import mekanism.common.capabilities.CapabilityWrapperManager;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterType;
import mekanism.common.util.PipeUtils;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@@ -36,13 +37,6 @@ public class TileEntityMechanicalPipe extends TileEntityTransmitter<IFluidHandle
public FluidTank buffer = new FluidTank(Fluid.BUCKET_VOLUME);
public FluidStack lastWrite;
public TileEntityMechanicalPipe(Tier.PipeTier pipeTier)
{
super();
tier = pipeTier;
buffer.setCapacity(getCapacity());
}
@Override
public BaseTier getBaseTier()
@@ -54,6 +48,7 @@ public class TileEntityMechanicalPipe extends TileEntityTransmitter<IFluidHandle
public void setBaseTier(BaseTier baseTier)
{
tier = Tier.PipeTier.get(baseTier);
buffer.setCapacity(getCapacity());
}
@Override
@@ -1,4 +1,4 @@
package mekanism.common.multipart;
package mekanism.common.tile.transmitter;
import io.netty.buffer.ByteBuf;
@@ -16,8 +16,9 @@ import mekanism.api.util.CapabilityUtils;
import mekanism.common.Tier;
import mekanism.common.Tier.BaseTier;
import mekanism.common.Tier.TubeTier;
import mekanism.common.block.states.BlockStateTransmitter;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterType;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
@@ -33,13 +34,6 @@ public class TileEntityPressurizedTube extends TileEntityTransmitter<IGasHandler
public GasStack lastWrite;
public TileEntityPressurizedTube(Tier.TubeTier tubeTier)
{
super();
tier = tubeTier;
buffer.setMaxGas(getCapacity());
}
@Override
public BaseTier getBaseTier()
{
@@ -50,6 +44,7 @@ public class TileEntityPressurizedTube extends TileEntityTransmitter<IGasHandler
public void setBaseTier(BaseTier baseTier)
{
tier = Tier.TubeTier.get(baseTier);
buffer.setMaxGas(getCapacity());
}
@Override
@@ -1,6 +1,7 @@
package mekanism.common.multipart;
package mekanism.common.tile.transmitter;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterType;
import mekanism.common.block.states.BlockStateTransmitter;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumFacing;
@@ -19,12 +20,6 @@ public class TileEntityRestrictiveTransporter extends TileEntityLogisticalTransp
return 1000;
}
@Override
public boolean transparencyRender()
{
return false;
}
@Override
protected EnumActionResult onConfigure(EntityPlayer player, int part, EnumFacing side)
{
@@ -1,4 +1,4 @@
package mekanism.common.multipart;
package mekanism.common.tile.transmitter;
import io.netty.buffer.ByteBuf;
@@ -18,10 +18,14 @@ import mekanism.api.util.CapabilityUtils;
import mekanism.common.Mekanism;
import mekanism.common.Tier.BaseTier;
import mekanism.common.base.ITileNetwork;
import mekanism.common.block.BlockTransmitter;
import mekanism.common.block.property.PropertyConnection;
import mekanism.common.block.states.BlockStateTransmitter;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType.Size;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterType;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterType.Size;
import mekanism.common.multipart.MultipartMekanism.AdvancedRayTraceResult;
import mekanism.common.integration.multipart.MultipartMekanism;
import mekanism.common.integration.multipart.MultipartMekanism.AdvancedRayTraceResult;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.util.MekanismUtils;
import net.minecraft.block.state.IBlockState;
@@ -126,11 +130,6 @@ public abstract class TileEntitySidedPipe extends TileEntity implements ITileNet
{
return false;
}
public boolean transparencyRender()
{
return false;
}
public byte getPossibleTransmitterConnections()
{
@@ -264,19 +263,11 @@ public abstract class TileEntitySidedPipe extends TileEntity implements ITileNet
return (byte)(currentTransmitterConnections | currentAcceptorConnections);
}
protected boolean isValidTransmitter(TileEntity tileEntity)
public boolean isValidTransmitter(TileEntity tileEntity)
{
return true;
}
/*
@Override
public boolean occlusionTest(IMultipart other)
{
return NormalOcclusionTest.apply(this, other);
}
*/
public List<AxisAlignedBB> getCollisionBoxes()
{
List<AxisAlignedBB> list = new ArrayList<>();
@@ -684,9 +675,9 @@ public abstract class TileEntitySidedPipe extends TileEntity implements ITileNet
public IBlockState getExtendedState(IBlockState state)
{
ConnectionProperty connectionProp = new ConnectionProperty(getAllCurrentConnections(), currentTransmitterConnections, connectionTypes, renderCenter());
PropertyConnection connectionProp = new PropertyConnection(getAllCurrentConnections(), currentTransmitterConnections, connectionTypes, renderCenter());
return ((IExtendedBlockState)state).withProperty(OBJProperty.INSTANCE, new OBJState(getVisibleGroups(), true)).withProperty(ConnectionProperty.INSTANCE, connectionProp);
return ((IExtendedBlockState)state).withProperty(OBJProperty.INSTANCE, new OBJState(getVisibleGroups(), true)).withProperty(PropertyConnection.INSTANCE, connectionProp);
}
public void notifyTileChange()
@@ -1,4 +1,4 @@
package mekanism.common.multipart;
package mekanism.common.tile.transmitter;
import io.netty.buffer.ByteBuf;
@@ -16,8 +16,9 @@ import mekanism.common.Mekanism;
import mekanism.common.Tier;
import mekanism.common.Tier.BaseTier;
import mekanism.common.Tier.ConductorTier;
import mekanism.common.block.states.BlockStateTransmitter;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterType;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.util.HeatUtils;
import net.minecraft.nbt.NBTTagCompound;
@@ -1,4 +1,4 @@
package mekanism.common.multipart;
package mekanism.common.tile.transmitter;
import java.util.Arrays;
import java.util.Collection;
@@ -12,6 +12,7 @@ import mekanism.api.transmitters.DynamicNetwork.NetworkClientRequest;
import mekanism.api.transmitters.IGridTransmitter;
import mekanism.api.transmitters.TransmitterNetworkRegistry;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.transmitters.TransmitterImpl;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
@@ -1,4 +1,4 @@
package mekanism.common.multipart;
package mekanism.common.tile.transmitter;
import ic2.api.energy.EnergyNet;
import ic2.api.energy.tile.IEnergySource;
@@ -20,8 +20,8 @@ import mekanism.common.Tier;
import mekanism.common.Tier.BaseTier;
import mekanism.common.Tier.CableTier;
import mekanism.common.base.EnergyAcceptorWrapper;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterType;
import mekanism.common.util.CableUtils;
import mekanism.common.util.MekanismUtils;
import net.darkhax.tesla.api.ITeslaConsumer;
@@ -41,7 +41,7 @@ import cofh.api.energy.IEnergyReceiver;
})
public class TileEntityUniversalCable extends TileEntityTransmitter<EnergyAcceptorWrapper, EnergyNetwork> implements IStrictEnergyAcceptor, IEnergyReceiver, IEnergyProvider, ITeslaConsumer
{
public Tier.CableTier tier;
public Tier.CableTier tier = CableTier.BASIC;
public double currentPower = 0;
public double lastWrite = 0;
@@ -1,4 +1,4 @@
package mekanism.common.multipart;
package mekanism.common.transmitters;
import java.util.Collection;
@@ -8,7 +8,7 @@ import mekanism.api.transmitters.IGridTransmitter;
import mekanism.api.transmitters.TransmissionType;
import mekanism.api.util.CapabilityUtils;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.transmitters.Transmitter;
import mekanism.common.tile.transmitter.TileEntityTransmitter;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
@@ -1,4 +1,4 @@
package mekanism.common.multipart;
package mekanism.common.transmitters;
import java.util.HashSet;
import java.util.Set;
@@ -15,9 +15,10 @@ import mekanism.common.capabilities.Capabilities;
import mekanism.common.content.transporter.TransporterManager;
import mekanism.common.content.transporter.TransporterStack;
import mekanism.common.content.transporter.TransporterStack.Path;
import mekanism.common.multipart.TileEntitySidedPipe.ConnectionType;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.tile.TileEntityLogisticalSorter;
import mekanism.common.tile.transmitter.TileEntityLogisticalTransporter;
import mekanism.common.tile.transmitter.TileEntitySidedPipe.ConnectionType;
import mekanism.common.util.InventoryUtils;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.TransporterUtils;
@@ -46,14 +46,14 @@ import mekanism.common.base.IModule;
import mekanism.common.base.IRedstoneControl;
import mekanism.common.base.ISideConfiguration;
import mekanism.common.base.IUpgradeTile;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
import mekanism.common.inventory.InventoryPersonalChest;
import mekanism.common.inventory.container.ContainerPersonalChest;
import mekanism.common.item.ItemBlockBasic;
import mekanism.common.item.ItemBlockEnergyCube;
import mekanism.common.item.ItemBlockGasTank;
import mekanism.common.item.ItemBlockMachine;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterType;
import mekanism.common.multipart.ItemBlockTransmitter;
import mekanism.common.item.ItemBlockTransmitter;
import mekanism.common.network.PacketPersonalChest.PersonalChestMessage;
import mekanism.common.network.PacketPersonalChest.PersonalChestPacketType;
import mekanism.common.tile.TileEntityAdvancedBoundingBlock;