Work on overhaul of transmitters

This commit is contained in:
aidancbrady committed 2017-03-28 19:32:32 -04:00
1 parent 6a42eb64e3
commit 2f705768e4
45 files changed
+1797 -1331

No files matched your search

+94 -17
View File
@@ -10,7 +10,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import mcmultipart.client.multipart.MultipartRegistryClient;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.api.MekanismConfig.client;
@@ -139,13 +138,16 @@ 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.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;
@@ -251,6 +253,7 @@ public class ClientProxy extends CommonProxy
{
public static Map<String, ModelResourceLocation> machineResources = new HashMap<String, ModelResourceLocation>();
public static Map<String, ModelResourceLocation> basicResources = new HashMap<String, ModelResourceLocation>();
public static Map<String, ModelResourceLocation> transmitterResources = new HashMap<String, ModelResourceLocation>();
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",
@@ -262,6 +265,7 @@ public class ClientProxy extends CommonProxy
private static final IStateMapper plasticMapper = new PlasticBlockStateMapper();
private static final IStateMapper fenceMapper = new PlasticFenceStateMapper();
private static final IStateMapper boxMapper = new CardboardBoxStateMapper();
private static final IStateMapper transmitterMapper = new TransmitterStateMapper();
@Override
public void loadConfiguration()
@@ -350,19 +354,18 @@ public class ClientProxy extends CommonProxy
ClientRegistry.registerTileEntity(TileEntityQuantumEntangloporter.class, "QuantumEntangloporter", new RenderQuantumEntangloporter());
ClientRegistry.registerTileEntity(TileEntityChemicalDissolutionChamber.class, "ChemicalDissolutionChamber", new RenderChemicalDissolutionChamber());
MultipartRegistryClient.bindMultipartSpecialRenderer(PartMechanicalPipe.class, new RenderMechanicalPipe());
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());
ClientRegistry.registerTileEntity(TileEntityMechanicalPipe.class, "MechanicalPipe", new RenderMechanicalPipe());
ClientRegistry.registerTileEntity(TileEntityUniversalCable.class, "UniversalCable", new RenderUniversalCable());
ClientRegistry.registerTileEntity(TileEntityThermodynamicConductor.class, "ThermodynamicConductor", new RenderThermodynamicConductor());
ClientRegistry.registerTileEntity(TileEntityLogisticalTransporter.class, "LogisticalTransporter", new RenderLogisticalTransporter());
ClientRegistry.registerTileEntity(TileEntityDiversionTransporter.class, "DiversionTransporter", new RenderLogisticalTransporter());
ClientRegistry.registerTileEntity(TileEntityRestrictiveTransporter.class, "RestrictiveTransporter", new RenderLogisticalTransporter());
ClientRegistry.registerTileEntity(TileEntityPressurizedTube.class, "PressurizedTube", new RenderPressurizedTube());
}
@Override
public void registerItemRenders()
{
registerItemRender(MekanismItems.PartTransmitter);
registerItemRender(MekanismItems.ElectricBow);
registerItemRender(MekanismItems.Dust);
registerItemRender(MekanismItems.Ingot);
@@ -412,7 +415,6 @@ public class ClientProxy extends CommonProxy
registerItemRender(MekanismItems.GaugeDropper);
registerItemRender(MekanismItems.TierInstaller);
registerItemRender(MekanismItems.OtherDust);
registerItemRender(MekanismItems.GlowPanel);
ModelBakery.registerItemVariants(MekanismItems.WalkieTalkie, ItemWalkieTalkie.OFF_MODEL);
@@ -440,12 +442,18 @@ public class ClientProxy extends CommonProxy
ModelLoader.setCustomStateMapper(MekanismBlocks.RoadPlasticBlock, plasticMapper);
ModelLoader.setCustomStateMapper(MekanismBlocks.PlasticFence, fenceMapper);
ModelLoader.setCustomStateMapper(MekanismBlocks.CardboardBox, boxMapper);
ModelLoader.setCustomStateMapper(MekanismBlocks.Transmitter, transmitterMapper);
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"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.EnergyCube), 0, new ModelResourceLocation("mekanism:EnergyCube", "inventory"));
for(int i = 0; i < EnumColor.DYES.length; i++)
{
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.GlowPanel), i, new ModelResourceLocation("mekanism:glow_panel", "inventory"));
}
for(MachineType type : MachineType.values())
{
@@ -591,6 +599,50 @@ public class ClientProxy extends CommonProxy
ModelLoader.registerItemVariants(Item.getItemFromBlock(type.blockType.getBlock()), modelsToAdd.toArray(new ModelResourceLocation[] {}));
}
for(TransmitterType type : TransmitterType.values())
{
List<ModelResourceLocation> modelsToAdd = new ArrayList<ModelResourceLocation>();
String resource = "mekanism:" + type.getName();
BaseTier tierPointer = null;
if(type.hasTiers())
{
tierPointer = BaseTier.values()[0];
resource = "mekanism:" + type.getName() + "_" + tierPointer.getName();
}
while(true)
{
if(transmitterResources.get(resource) == null)
{
String properties = "inventory";
ModelResourceLocation model = new ModelResourceLocation(resource, properties);
transmitterResources.put(resource, model);
modelsToAdd.add(model);
if(type.hasTiers())
{
if(tierPointer.ordinal() < BaseTier.values().length-1)
{
tierPointer = BaseTier.values()[tierPointer.ordinal()+1];
if(tierPointer.isObtainable())
{
resource = "mekanism:" + type.getName() + "_" + tierPointer.getName();
continue;
}
}
}
}
break;
}
ModelLoader.registerItemVariants(Item.getItemFromBlock(MekanismBlocks.Transmitter), modelsToAdd.toArray(new ModelResourceLocation[] {}));
}
for(EnumColor color : EnumColor.DYES)
{
@@ -671,6 +723,31 @@ public class ClientProxy extends CommonProxy
ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.BasicBlock), basicMesher);
ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.BasicBlock2), basicMesher);
ItemMeshDefinition transmitterMesher = new ItemMeshDefinition() {
@Override
public ModelResourceLocation getModelLocation(ItemStack stack)
{
TransmitterType type = TransmitterType.get(stack.getItemDamage());
if(type != null)
{
String resource = "mekanism:" + type.getName();
if(type.hasTiers())
{
BaseTier tier = ((ItemBlockTransmitter)stack.getItem()).getBaseTier(stack);
resource = "mekanism:" + type.getName() + "_" + tier.getName();
}
return transmitterResources.get(resource);
}
return null;
}
};
ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.Transmitter), transmitterMesher);
OBJLoader.INSTANCE.addDomain("mekanism");
}
@@ -148,6 +148,7 @@ public class MekanismJEI extends BlankModPlugin
registry.registerSubtypeInterpreter(Item.getItemFromBlock(MekanismBlocks.BasicBlock2), NBT_INTERPRETER);
registry.registerSubtypeInterpreter(Item.getItemFromBlock(MekanismBlocks.GasTank), NBT_INTERPRETER);
registry.registerSubtypeInterpreter(Item.getItemFromBlock(MekanismBlocks.CardboardBox), NBT_INTERPRETER);
registry.registerSubtypeInterpreter(Item.getItemFromBlock(MekanismBlocks.Transmitter), NBT_INTERPRETER);
}
@Override
@@ -9,7 +9,7 @@ import javax.vecmath.Matrix4f;
import mekanism.api.EnumColor;
import mekanism.client.render.ctm.CTMModelFactory;
import mekanism.common.multipart.ColorProperty;
import mekanism.common.multipart.PartGlowPanel;
import mekanism.common.multipart.TileEntityGlowPanel;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
@@ -137,7 +137,7 @@ public class GlowPanelModel extends OBJBakedModelBase
if(state != null && tempState == null)
{
int hash = PartGlowPanel.hash((IExtendedBlockState)state);
int hash = TileEntityGlowPanel.hash((IExtendedBlockState)state);
EnumColor color = ((IExtendedBlockState)state).getValue(ColorProperty.INSTANCE).color;
if(!glowPanelCache.containsKey(hash))
@@ -14,8 +14,8 @@ 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.PartSidedPipe;
import mekanism.common.multipart.PartSidedPipe.ConnectionType;
import mekanism.common.multipart.TileEntitySidedPipe;
import mekanism.common.multipart.TileEntitySidedPipe.ConnectionType;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.IBakedModel;
@@ -237,7 +237,7 @@ public class TransmitterModel extends OBJBakedModelBase
public byte getIconStatus(EnumFacing side, ConnectionProperty connection)
{
ConnectionType type = PartSidedPipe.getConnectionType(side, connection.connectionByte, connection.transmitterConnections, connection.connectionTypes);
ConnectionType type = TileEntitySidedPipe.getConnectionType(side, connection.connectionByte, connection.transmitterConnections, connection.connectionTypes);
if(type == ConnectionType.NONE)
{
@@ -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.PartDiversionTransporter;
import mekanism.common.multipart.PartLogisticalTransporter;
import mekanism.common.multipart.TileEntityDiversionTransporter;
import mekanism.common.multipart.TileEntityLogisticalTransporter;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.common.util.TransporterUtils;
@@ -30,7 +30,7 @@ import net.minecraft.world.World;
import org.lwjgl.opengl.GL11;
public class RenderLogisticalTransporter extends RenderTransmitterBase<PartLogisticalTransporter>
public class RenderLogisticalTransporter extends RenderTransmitterBase<TileEntityLogisticalTransporter>
{
private ModelTransporterBox modelBox = new ModelTransporterBox();
@@ -50,7 +50,7 @@ public class RenderLogisticalTransporter extends RenderTransmitterBase<PartLogis
}
@Override
public void renderMultipartAt(PartLogisticalTransporter transporter, double x, double y, double z, float partialTick, int destroyStage)
public void renderTileEntityAt(TileEntityLogisticalTransporter transporter, double x, double y, double z, float partialTick, int destroyStage)
{
if(client.opaqueTransmitters)
{
@@ -95,7 +95,7 @@ public class RenderLogisticalTransporter extends RenderTransmitterBase<PartLogis
}
}
if(transporter instanceof PartDiversionTransporter)
if(transporter instanceof TileEntityDiversionTransporter)
{
EntityPlayer player = mc.player;
World world = mc.player.world;
@@ -108,7 +108,7 @@ public class RenderLogisticalTransporter extends RenderTransmitterBase<PartLogis
if(obj.equals(new Coord4D(transporter.getPos(), transporter.getWorld())))
{
int mode = ((PartDiversionTransporter)transporter).modes[pos.sideHit.ordinal()];
int mode = ((TileEntityDiversionTransporter)transporter).modes[pos.sideHit.ordinal()];
pushTransporter();
@@ -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.PartMechanicalPipe;
import mekanism.common.multipart.PartSidedPipe.ConnectionType;
import mekanism.common.multipart.TileEntityMechanicalPipe;
import mekanism.common.multipart.TileEntitySidedPipe.ConnectionType;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.VertexBuffer;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -19,7 +19,7 @@ import net.minecraftforge.fluids.Fluid;
import org.lwjgl.opengl.GL11;
public class RenderMechanicalPipe extends RenderTransmitterBase<PartMechanicalPipe>
public class RenderMechanicalPipe extends RenderTransmitterBase<TileEntityMechanicalPipe>
{
private static HashMap<Integer, HashMap<Fluid, DisplayInteger[]>> cachedLiquids = new HashMap<Integer, HashMap<Fluid, DisplayInteger[]>>();
@@ -33,7 +33,7 @@ public class RenderMechanicalPipe extends RenderTransmitterBase<PartMechanicalPi
}
@Override
public void renderMultipartAt(PartMechanicalPipe pipe, double x, double y, double z, float partialTick, int destroyStage)
public void renderTileEntityAt(TileEntityMechanicalPipe pipe, double x, double y, double z, float partialTick, int destroyStage)
{
if(client.opaqueTransmitters)
{
@@ -264,7 +264,7 @@ public class RenderMechanicalPipe extends RenderTransmitterBase<PartMechanicalPi
return displays;
}
public boolean renderFluidInOut(VertexBuffer renderer, EnumFacing side, PartMechanicalPipe pipe)
public boolean renderFluidInOut(VertexBuffer renderer, EnumFacing side, TileEntityMechanicalPipe pipe)
{
if(pipe != null && pipe.getTransmitter() != null && pipe.getTransmitter().getTransmitterNetwork() != null)
{
@@ -3,14 +3,14 @@ package mekanism.client.render.transmitter;
import mekanism.api.MekanismConfig.client;
import mekanism.client.render.MekanismRenderer;
import mekanism.common.ColourRGBA;
import mekanism.common.multipart.PartPressurizedTube;
import mekanism.common.multipart.TileEntityPressurizedTube;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.VertexBuffer;
import net.minecraft.util.EnumFacing;
import org.lwjgl.opengl.GL11;
public class RenderPressurizedTube extends RenderTransmitterBase<PartPressurizedTube>
public class RenderPressurizedTube extends RenderTransmitterBase<TileEntityPressurizedTube>
{
public RenderPressurizedTube()
{
@@ -18,7 +18,7 @@ public class RenderPressurizedTube extends RenderTransmitterBase<PartPressurized
}
@Override
public void renderMultipartAt(PartPressurizedTube tube, double x, double y, double z, float partialTick, int destroyStage)
public void renderTileEntityAt(TileEntityPressurizedTube tube, double x, double y, double z, float partialTick, int destroyStage)
{
if(client.opaqueTransmitters || !tube.getTransmitter().hasTransmitterNetwork() || tube.getTransmitter().getTransmitterNetwork().refGas == null || tube.getTransmitter().getTransmitterNetwork().gasScale == 0)
{
@@ -44,7 +44,7 @@ public class RenderPressurizedTube extends RenderTransmitterBase<PartPressurized
pop();
}
public void renderGasSide(VertexBuffer renderer, EnumFacing side, PartPressurizedTube tube)
public void renderGasSide(VertexBuffer renderer, EnumFacing side, TileEntityPressurizedTube tube)
{
bindTexture(MekanismRenderer.getBlocksTexture());
renderTransparency(renderer, tube.getTransmitter().getTransmitterNetwork().refGas.getSprite(), getModelForSide(tube, side), new ColourRGBA(1.0, 1.0, 1.0, tube.currentScale));
@@ -3,14 +3,14 @@ package mekanism.client.render.transmitter;
import mekanism.api.MekanismConfig.client;
import mekanism.client.render.ColourTemperature;
import mekanism.client.render.MekanismRenderer;
import mekanism.common.multipart.PartThermodynamicConductor;
import mekanism.common.multipart.TileEntityThermodynamicConductor;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.VertexBuffer;
import net.minecraft.util.EnumFacing;
import org.lwjgl.opengl.GL11;
public class RenderThermodynamicConductor extends RenderTransmitterBase<PartThermodynamicConductor>
public class RenderThermodynamicConductor extends RenderTransmitterBase<TileEntityThermodynamicConductor>
{
public RenderThermodynamicConductor()
{
@@ -18,7 +18,7 @@ public class RenderThermodynamicConductor extends RenderTransmitterBase<PartTher
}
@Override
public void renderMultipartAt(PartThermodynamicConductor transmitter, double x, double y, double z, float partialTick, int destroyStage)
public void renderTileEntityAt(TileEntityThermodynamicConductor transmitter, double x, double y, double z, float partialTick, int destroyStage)
{
if(client.opaqueTransmitters)
{
@@ -43,7 +43,7 @@ public class RenderThermodynamicConductor extends RenderTransmitterBase<PartTher
pop();
}
public void renderHeatSide(VertexBuffer renderer, EnumFacing side, PartThermodynamicConductor cable)
public void renderHeatSide(VertexBuffer renderer, EnumFacing side, TileEntityThermodynamicConductor cable)
{
bindTexture(MekanismRenderer.getBlocksTexture());
renderTransparency(renderer, MekanismRenderer.heatIcon, getModelForSide(cable, side), ColourTemperature.fromTemperature(cable.temperature, cable.getBaseColour()));
@@ -3,10 +3,9 @@ package mekanism.client.render.transmitter;
import java.util.HashMap;
import java.util.Map;
import mcmultipart.client.multipart.MultipartSpecialRenderer;
import mekanism.client.render.MekanismRenderer;
import mekanism.common.ColourRGBA;
import mekanism.common.multipart.PartTransmitter;
import mekanism.common.multipart.TileEntityTransmitter;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.Minecraft;
@@ -14,6 +13,7 @@ import net.minecraft.client.renderer.VertexBuffer;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
@@ -27,7 +27,7 @@ import org.lwjgl.opengl.GL11;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
public abstract class RenderTransmitterBase<T extends PartTransmitter> extends MultipartSpecialRenderer<T>
public abstract class RenderTransmitterBase<T extends TileEntityTransmitter> extends TileEntitySpecialRenderer<T>
{
private static OBJModel contentsModel;
private static Map<String, IBakedModel> contentsMap = new HashMap<String, IBakedModel>();
@@ -106,7 +106,7 @@ public abstract class RenderTransmitterBase<T extends PartTransmitter> extends M
return modelParts;
}
public IBakedModel getModelForSide(PartTransmitter part, EnumFacing side)
public IBakedModel getModelForSide(TileEntityTransmitter part, EnumFacing side)
{
String sideName = side.name().toLowerCase();
String typeName = part.getConnectionType(side).name().toUpperCase();
@@ -3,14 +3,14 @@ package mekanism.client.render.transmitter;
import mekanism.api.MekanismConfig.client;
import mekanism.client.render.MekanismRenderer;
import mekanism.common.ColourRGBA;
import mekanism.common.multipart.PartUniversalCable;
import mekanism.common.multipart.TileEntityUniversalCable;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.VertexBuffer;
import net.minecraft.util.EnumFacing;
import org.lwjgl.opengl.GL11;
public class RenderUniversalCable extends RenderTransmitterBase<PartUniversalCable>
public class RenderUniversalCable extends RenderTransmitterBase<TileEntityUniversalCable>
{
public RenderUniversalCable()
{
@@ -18,7 +18,7 @@ public class RenderUniversalCable extends RenderTransmitterBase<PartUniversalCab
}
@Override
public void renderMultipartAt(PartUniversalCable cable, double x, double y, double z, float partialTick, int destroyStage)
public void renderTileEntityAt(TileEntityUniversalCable cable, double x, double y, double z, float partialTick, int destroyStage)
{
if(client.opaqueTransmitters || cable.currentPower == 0)
{
@@ -43,7 +43,7 @@ public class RenderUniversalCable extends RenderTransmitterBase<PartUniversalCab
pop();
}
public void renderEnergySide(VertexBuffer renderer, EnumFacing side, PartUniversalCable cable)
public void renderEnergySide(VertexBuffer renderer, EnumFacing side, TileEntityUniversalCable cable)
{
bindTexture(MekanismRenderer.getBlocksTexture());
renderTransparency(renderer, MekanismRenderer.energyIcon, getModelForSide(cable, side), new ColourRGBA(1.0, 1.0, 1.0, cable.currentPower));
@@ -60,6 +60,13 @@ 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;
@@ -183,6 +190,15 @@ public class CommonProxy implements IGuiProvider
GameRegistry.registerTileEntity(TileEntitySecurityDesk.class, "SecurityDesk");
GameRegistry.registerTileEntity(TileEntityQuantumEntangloporter.class, "QuantumEntangloporter");
GameRegistry.registerTileEntity(TileEntityChemicalDissolutionChamber.class, "ChemicalDissolutionChamber");
//transmitters
GameRegistry.registerTileEntity(TileEntityMechanicalPipe.class, "MechanicalPipe");
GameRegistry.registerTileEntity(TileEntityUniversalCable.class, "UniversalCable");
GameRegistry.registerTileEntity(TileEntityThermodynamicConductor.class, "ThermodynamicConductor");
GameRegistry.registerTileEntity(TileEntityLogisticalTransporter.class, "LogisticalTransporter");
GameRegistry.registerTileEntity(TileEntityPressurizedTube.class, "PressurizedTube");
GameRegistry.registerTileEntity(TileEntityDiversionTransporter.class, "DiversionTransporter");
GameRegistry.registerTileEntity(TileEntityRestrictiveTransporter.class, "RestrictiveTransporter");
}
public void handleTeleporterUpdate(PortableTeleporterMessage message) {}
@@ -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.MultipartTransmitter;
import mekanism.common.multipart.TransmitterImpl;
//import mekanism.common.multipart.MultipartTransmitter;
import mekanism.common.util.MekanismUtils;
import net.minecraftforge.fml.common.FMLCommonHandler;
@@ -82,9 +82,9 @@ public class HeatNetwork extends DynamicNetwork<IHeatTransfer, HeatNetwork>
{
for(IGridTransmitter<IHeatTransfer, HeatNetwork> transmitter : transmitters)
{
if(transmitter instanceof MultipartTransmitter && ((MultipartTransmitter)transmitter).getPart().hasCapability(Capabilities.HEAT_TRANSFER_CAPABILITY, null))
if(transmitter instanceof TransmitterImpl && ((TransmitterImpl)transmitter).getTileEntity().hasCapability(Capabilities.HEAT_TRANSFER_CAPABILITY, null))
{
IHeatTransfer heatTransmitter = (IHeatTransfer)((MultipartTransmitter)transmitter).getPart().getCapability(Capabilities.HEAT_TRANSFER_CAPABILITY, null);
IHeatTransfer heatTransmitter = (IHeatTransfer)((TransmitterImpl)transmitter).getTileEntity().getCapability(Capabilities.HEAT_TRANSFER_CAPABILITY, null);
double[] d = heatTransmitter.simulateHeat();
newHeatTransferred += d[0];
newHeatLost += d[1];
@@ -93,9 +93,9 @@ public class HeatNetwork extends DynamicNetwork<IHeatTransfer, HeatNetwork>
for(IGridTransmitter<IHeatTransfer, HeatNetwork> transmitter : transmitters)
{
if(transmitter instanceof MultipartTransmitter && ((MultipartTransmitter)transmitter).getPart().hasCapability(Capabilities.HEAT_TRANSFER_CAPABILITY, null))
if(transmitter instanceof TransmitterImpl && ((TransmitterImpl)transmitter).getTileEntity().hasCapability(Capabilities.HEAT_TRANSFER_CAPABILITY, null))
{
IHeatTransfer heatTransmitter = (IHeatTransfer)((MultipartTransmitter)transmitter).getPart().getCapability(Capabilities.HEAT_TRANSFER_CAPABILITY, null);
IHeatTransfer heatTransmitter = (IHeatTransfer)((TransmitterImpl)transmitter).getTileEntity().getCapability(Capabilities.HEAT_TRANSFER_CAPABILITY, null);
newSumTemp += heatTransmitter.applyTemperatureChange();
}
}
+43 -44
View File
@@ -10,7 +10,6 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
import mcmultipart.MCMultiPartMod;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.api.MekanismAPI;
@@ -63,6 +62,7 @@ import mekanism.common.frequency.FrequencyManager;
import mekanism.common.integration.MekanismHooks;
import mekanism.common.integration.OreDictManager;
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;
@@ -680,71 +680,71 @@ public class Mekanism
CraftingManager.getInstance().getRecipeList().add(new BinRecipe());
//Transmitters
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 0),
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getTransmitter(TransmitterType.UNIVERSAL_CABLE, BaseTier.BASIC, 8),
"SRS", Character.valueOf('S'), "ingotSteel", Character.valueOf('R'), "dustRedstone"
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 1),
"TTT", "TET", "TTT", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 0)
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getTransmitter(TransmitterType.UNIVERSAL_CABLE, BaseTier.ADVANCED, 8),
"TTT", "TET", "TTT", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('T'), MekanismUtils.getTransmitter(TransmitterType.UNIVERSAL_CABLE, BaseTier.BASIC, 1)
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 2),
"TTT", "TRT", "TTT", Character.valueOf('R'), "alloyElite", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 1)
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getTransmitter(TransmitterType.UNIVERSAL_CABLE, BaseTier.ELITE, 8),
"TTT", "TRT", "TTT", Character.valueOf('R'), "alloyElite", Character.valueOf('T'), MekanismUtils.getTransmitter(TransmitterType.UNIVERSAL_CABLE, BaseTier.ADVANCED, 1)
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 3),
"TTT", "TAT", "TTT", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 2)
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getTransmitter(TransmitterType.UNIVERSAL_CABLE, BaseTier.ULTIMATE, 8),
"TTT", "TAT", "TTT", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), MekanismUtils.getTransmitter(TransmitterType.UNIVERSAL_CABLE, BaseTier.ELITE, 1)
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 4),
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getTransmitter(TransmitterType.MECHANICAL_PIPE, BaseTier.BASIC, 8),
"SBS", Character.valueOf('S'), "ingotSteel", Character.valueOf('B'), Items.BUCKET
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 5),
"TTT", "TET", "TTT", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 4)
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getTransmitter(TransmitterType.MECHANICAL_PIPE, BaseTier.ADVANCED, 8),
"TTT", "TET", "TTT", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('T'), MekanismUtils.getTransmitter(TransmitterType.MECHANICAL_PIPE, BaseTier.BASIC, 1)
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 6),
"TTT", "TRT", "TTT", Character.valueOf('R'), "alloyElite", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 5)
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getTransmitter(TransmitterType.MECHANICAL_PIPE, BaseTier.ELITE, 8),
"TTT", "TRT", "TTT", Character.valueOf('R'), "alloyElite", Character.valueOf('T'), MekanismUtils.getTransmitter(TransmitterType.MECHANICAL_PIPE, BaseTier.ADVANCED, 1)
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 7),
"TTT", "TAT", "TTT", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 6)
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getTransmitter(TransmitterType.MECHANICAL_PIPE, BaseTier.ULTIMATE, 8),
"TTT", "TAT", "TTT", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), MekanismUtils.getTransmitter(TransmitterType.MECHANICAL_PIPE, BaseTier.ELITE, 1)
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 8),
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getTransmitter(TransmitterType.PRESSURIZED_TUBE, BaseTier.BASIC, 8),
"SGS", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), "blockGlass"
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 9),
"TTT", "TET", "TTT", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 8)
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getTransmitter(TransmitterType.PRESSURIZED_TUBE, BaseTier.ADVANCED, 8),
"TTT", "TET", "TTT", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('T'), MekanismUtils.getTransmitter(TransmitterType.PRESSURIZED_TUBE, BaseTier.BASIC, 1)
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 10),
"TTT", "TRT", "TTT", Character.valueOf('R'), "alloyElite", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 9)
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getTransmitter(TransmitterType.PRESSURIZED_TUBE, BaseTier.ELITE, 8),
"TTT", "TRT", "TTT", Character.valueOf('R'), "alloyElite", Character.valueOf('T'), MekanismUtils.getTransmitter(TransmitterType.PRESSURIZED_TUBE, BaseTier.ADVANCED, 1)
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 11),
"TTT", "TAT", "TTT", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 10)
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getTransmitter(TransmitterType.PRESSURIZED_TUBE, BaseTier.ULTIMATE, 8),
"TTT", "TAT", "TTT", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), MekanismUtils.getTransmitter(TransmitterType.PRESSURIZED_TUBE, BaseTier.ELITE, 1)
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 12),
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getTransmitter(TransmitterType.LOGISTICAL_TRANSPORTER, BaseTier.BASIC, 8),
"SCS", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC)
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 13),
"TTT", "TET", "TTT", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 12)
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getTransmitter(TransmitterType.LOGISTICAL_TRANSPORTER, BaseTier.ADVANCED, 8),
"TTT", "TET", "TTT", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('T'), MekanismUtils.getTransmitter(TransmitterType.LOGISTICAL_TRANSPORTER, BaseTier.BASIC, 1)
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 14),
"TTT", "TRT", "TTT", Character.valueOf('R'), "alloyElite", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 13)
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getTransmitter(TransmitterType.LOGISTICAL_TRANSPORTER, BaseTier.ELITE, 8),
"TTT", "TRT", "TTT", Character.valueOf('R'), "alloyElite", Character.valueOf('T'), MekanismUtils.getTransmitter(TransmitterType.LOGISTICAL_TRANSPORTER, BaseTier.ADVANCED, 1)
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 15),
"TTT", "TAT", "TTT", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 14)
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getTransmitter(TransmitterType.LOGISTICAL_TRANSPORTER, BaseTier.ULTIMATE, 8),
"TTT", "TAT", "TTT", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), MekanismUtils.getTransmitter(TransmitterType.LOGISTICAL_TRANSPORTER, BaseTier.ELITE, 1)
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 2, 16),
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getTransmitter(TransmitterType.RESTRICTIVE_TRANSPORTER, BaseTier.BASIC, 2),
"SBS", Character.valueOf('S'), "ingotSteel", Character.valueOf('B'), Blocks.IRON_BARS
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 2, 17),
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getTransmitter(TransmitterType.DIVERSION_TRANSPORTER, BaseTier.BASIC, 2),
"RRR", "SBS", "RRR", Character.valueOf('R'), "dustRedstone", Character.valueOf('S'), "ingotSteel", Character.valueOf('B'), Blocks.IRON_BARS
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 18),
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getTransmitter(TransmitterType.THERMODYNAMIC_CONDUCTOR, BaseTier.BASIC, 8),
"SCS", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), "ingotCopper"
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 19),
"TTT", "TET", "TTT", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 18)
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getTransmitter(TransmitterType.THERMODYNAMIC_CONDUCTOR, BaseTier.ADVANCED, 8),
"TTT", "TET", "TTT", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('T'), MekanismUtils.getTransmitter(TransmitterType.THERMODYNAMIC_CONDUCTOR, BaseTier.BASIC, 1)
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 20),
"TTT", "TRT", "TTT", Character.valueOf('R'), "alloyElite", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 19)
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getTransmitter(TransmitterType.THERMODYNAMIC_CONDUCTOR, BaseTier.ELITE, 8),
"TTT", "TRT", "TTT", Character.valueOf('R'), "alloyElite", Character.valueOf('T'), MekanismUtils.getTransmitter(TransmitterType.THERMODYNAMIC_CONDUCTOR, BaseTier.ADVANCED, 1)
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 21),
"TTT", "TAT", "TTT", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 20)
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getTransmitter(TransmitterType.THERMODYNAMIC_CONDUCTOR, BaseTier.ULTIMATE, 8),
"TTT", "TAT", "TTT", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), MekanismUtils.getTransmitter(TransmitterType.THERMODYNAMIC_CONDUCTOR, BaseTier.ELITE, 1)
));
//Plastic stuff
@@ -760,7 +760,7 @@ public class Mekanism
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.PlasticBlock, 4, 15),
"SSS", "S S", "SSS", Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 2)
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GlowPanel, 2, 15),
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.GlowPanel, 2, 15),
"PSP", "S S", "GSG", Character.valueOf('P'), "paneGlass", Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 2), Character.valueOf('G'), "dustGlowstone"
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.PlasticFence, 3, 15),
@@ -772,7 +772,7 @@ public class Mekanism
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.PlasticBlock, 4, i),
"SSS", "SDS", "SSS", Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 2), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GlowPanel, 2, i),
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.GlowPanel, 2, i),
"PSP", "SDS", "GSG", Character.valueOf('P'), "paneGlass", Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 2), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName, Character.valueOf('G'), "dustGlowstone"
));
}
@@ -801,8 +801,8 @@ public class Mekanism
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.ReinforcedPlasticBlock, 4, i),
" P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.ReinforcedPlasticBlock, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName
));
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GlowPanel, 4, i),
" P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismItems.GlowPanel, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.GlowPanel, 4, i),
" P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.GlowPanel, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName
));
}
@@ -1050,7 +1050,7 @@ public class Mekanism
public void registerOreDict()
{
//Add specific items to ore dictionary for recipe usage in other mods.
OreDictionary.registerOre("universalCable", new ItemStack(MekanismItems.PartTransmitter, 8, 0));
OreDictionary.registerOre("universalCable", MekanismUtils.getTransmitter(TransmitterType.UNIVERSAL_CABLE, BaseTier.BASIC, 1));
OreDictionary.registerOre("battery", MekanismItems.EnergyTablet.getUnchargedItem());
OreDictionary.registerOre("pulpWood", MekanismItems.Sawdust);
OreDictionary.registerOre("dustWood", MekanismItems.Sawdust);
@@ -1497,7 +1497,6 @@ public class Mekanism
MekanismAPI.addBoxBlacklist(Blocks.ACACIA_DOOR, OreDictionary.WILDCARD_VALUE);
MekanismAPI.addBoxBlacklist(Blocks.DARK_OAK_DOOR, OreDictionary.WILDCARD_VALUE);
MekanismAPI.addBoxBlacklist(Blocks.IRON_DOOR, OreDictionary.WILDCARD_VALUE);
MekanismAPI.addBoxBlacklist(MCMultiPartMod.multipart, OreDictionary.WILDCARD_VALUE);
BoxBlacklistParser.load();
}
@@ -24,6 +24,10 @@ import mekanism.common.item.ItemBlockGasTank;
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 net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import net.minecraftforge.fml.common.registry.GameRegistry;
@@ -40,9 +44,11 @@ public class MekanismBlocks
public static Block OreBlock = new BlockOre();
public static Block ObsidianTNT = new BlockObsidianTNT().setCreativeTab(Mekanism.tabMekanism);
public static Block EnergyCube = new BlockEnergyCube();
public static Block Transmitter = new BlockTransmitter();
public static Block BoundingBlock = (BlockBounding)new BlockBounding();
public static Block GasTank = new BlockGasTank();
public static Block CardboardBox = new BlockCardboardBox();
public static Block GlowPanel = new BlockGlowPanel();
public static Block PlasticBlock = new BlockPlastic(PlasticBlockType.PLASTIC);
public static Block SlickPlasticBlock = new BlockPlastic(PlasticBlockType.SLICK);
public static Block GlowPlasticBlock = new BlockPlastic(PlasticBlockType.GLOW);
@@ -63,10 +69,12 @@ public class MekanismBlocks
GameRegistry.register(init(MachineBlock3, "MachineBlock3"));
GameRegistry.register(init(OreBlock, "OreBlock"));
GameRegistry.register(init(EnergyCube, "EnergyCube"));
GameRegistry.register(init(Transmitter, "Transmitter"));
GameRegistry.register(init(ObsidianTNT, "ObsidianTNT"));
GameRegistry.register(init(BoundingBlock, "BoundingBlock"));
GameRegistry.register(init(GasTank, "GasTank"));
GameRegistry.register(init(CardboardBox, "CardboardBox"));
GameRegistry.register(init(GlowPanel, "GlowPanel"));
GameRegistry.register(init(PlasticBlock, "PlasticBlock"));
GameRegistry.register(init(SlickPlasticBlock, "SlickPlasticBlock"));
GameRegistry.register(init(GlowPlasticBlock, "GlowPlasticBlock"));
@@ -82,10 +90,12 @@ public class MekanismBlocks
GameRegistry.register(MekanismItems.init(new ItemBlockMachine(MachineBlock3), "MachineBlock3"));
GameRegistry.register(MekanismItems.init(new ItemBlockOre(OreBlock), "OreBlock"));
GameRegistry.register(MekanismItems.init(new ItemBlockEnergyCube(EnergyCube), "EnergyCube"));
GameRegistry.register(MekanismItems.init(new ItemBlockTransmitter(Transmitter), "Transmitter"));
GameRegistry.register(MekanismItems.init(new ItemBlock(ObsidianTNT), "ObsidianTNT"));
GameRegistry.register(MekanismItems.init(new ItemBlock(BoundingBlock), "BoundingBlock"));
GameRegistry.register(MekanismItems.init(new ItemBlockGasTank(GasTank), "GasTank"));
GameRegistry.register(MekanismItems.init(new ItemBlockCardboardBox(CardboardBox), "CardboardBox"));
GameRegistry.register(MekanismItems.init(new ItemBlockGlowPanel(GlowPanel), "GlowPanel"));
GameRegistry.register(MekanismItems.init(new ItemBlockPlastic(PlasticBlock), "PlasticBlock"));
GameRegistry.register(MekanismItems.init(new ItemBlockPlastic(SlickPlasticBlock), "SlickPlasticBlock"));
GameRegistry.register(MekanismItems.init(new ItemBlockPlastic(GlowPlasticBlock), "GlowPlasticBlock"));
@@ -33,8 +33,6 @@ import mekanism.common.item.ItemShard;
import mekanism.common.item.ItemTierInstaller;
import mekanism.common.item.ItemUpgrade;
import mekanism.common.item.ItemWalkieTalkie;
import mekanism.common.multipart.ItemGlowPanel;
import mekanism.common.multipart.ItemPartTransmitter;
import net.minecraft.item.Item;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.registry.GameRegistry;
@@ -78,8 +76,6 @@ public class MekanismItems
public static final ItemGaugeDropper GaugeDropper = (ItemGaugeDropper)new ItemGaugeDropper();
public static final Item ConfigurationCard = new ItemConfigurationCard();
public static final Item CraftingFormula = new ItemCraftingFormula();
public static final Item PartTransmitter = new ItemPartTransmitter();
public static final Item GlowPanel = new ItemGlowPanel();
public static final ItemScubaTank ScubaTank = (ItemScubaTank)new ItemScubaTank();
public static final ItemGasMask GasMask = (ItemGasMask)new ItemGasMask();
public static final ItemJetpack Jetpack = (ItemJetpack)new ItemJetpack();
@@ -104,7 +100,6 @@ public class MekanismItems
*/
public static void register()
{
GameRegistry.register(init(PartTransmitter, "MultipartTransmitter"));
GameRegistry.register(init(ElectricBow, "ElectricBow"));
GameRegistry.register(init(Dust, "Dust"));
GameRegistry.register(init(Ingot, "Ingot"));
@@ -152,7 +147,6 @@ public class MekanismItems
GameRegistry.register(init(Substrate, "Substrate"));
GameRegistry.register(init(Polyethene, "Polyethene"));
GameRegistry.register(init(BioFuel, "BioFuel"));
GameRegistry.register(init(GlowPanel, "GlowPanel"));
GameRegistry.register(init(Flamethrower, "Flamethrower"));
GameRegistry.register(init(GaugeDropper, "GaugeDropper"));
GameRegistry.register(init(TierInstaller, "TierInstaller"));
+26 -44
View File
@@ -6,7 +6,7 @@ import java.util.ArrayList;
import java.util.List;
import mekanism.api.EnumColor;
import mekanism.common.multipart.TransmitterType;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterType;
import mekanism.common.util.LangUtils;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.ResourceLocation;
@@ -249,21 +249,17 @@ public final class Tier
public static enum CableTier implements ITier
{
BASIC(3200, TransmitterType.UNIVERSAL_CABLE_BASIC),
ADVANCED(12800, TransmitterType.UNIVERSAL_CABLE_ADVANCED),
ELITE(64000, TransmitterType.UNIVERSAL_CABLE_ELITE),
ULTIMATE(320000, TransmitterType.UNIVERSAL_CABLE_ULTIMATE);
BASIC(3200),
ADVANCED(12800),
ELITE(64000),
ULTIMATE(320000);
public int cableCapacity;
private int baseCapacity;
public TransmitterType type;
private CableTier(int capacity, TransmitterType transmitterType)
private CableTier(int capacity)
{
baseCapacity = cableCapacity = capacity;
type = transmitterType;
}
@Override
@@ -306,25 +302,21 @@ public final class Tier
public static enum PipeTier implements ITier
{
BASIC(1000, 100, TransmitterType.MECHANICAL_PIPE_BASIC),
ADVANCED(4000, 400, TransmitterType.MECHANICAL_PIPE_ADVANCED),
ELITE(16000, 1600, TransmitterType.MECHANICAL_PIPE_ELITE),
ULTIMATE(64000, 6400, TransmitterType.MECHANICAL_PIPE_ULTIMATE);
BASIC(1000, 100),
ADVANCED(4000, 400),
ELITE(16000, 1600),
ULTIMATE(64000, 6400);
public int pipeCapacity;
private int baseCapacity;
public int pipePullAmount;
private int basePull;
public TransmitterType type;
private PipeTier(int capacity, int pullAmount, TransmitterType transmitterType)
private PipeTier(int capacity, int pullAmount)
{
baseCapacity = pipeCapacity = capacity;
basePull = pipePullAmount = pullAmount;
type = transmitterType;
}
@Override
@@ -370,10 +362,10 @@ public final class Tier
public static enum TubeTier implements ITier
{
BASIC(256, 64, TransmitterType.PRESSURIZED_TUBE_BASIC),
ADVANCED(1024, 256, TransmitterType.PRESSURIZED_TUBE_ADVANCED),
ELITE(4096, 1024, TransmitterType.PRESSURIZED_TUBE_ELITE),
ULTIMATE(16384, 4096, TransmitterType.PRESSURIZED_TUBE_ULTIMATE);
BASIC(256, 64),
ADVANCED(1024, 256),
ELITE(4096, 1024),
ULTIMATE(16384, 4096);
public int tubeCapacity;
private int baseCapacity;
@@ -383,12 +375,10 @@ public final class Tier
public TransmitterType type;
private TubeTier(int capacity, int pullAmount, TransmitterType transmitterType)
private TubeTier(int capacity, int pullAmount)
{
baseCapacity = tubeCapacity = capacity;
basePull = tubePullAmount = pullAmount;
type = transmitterType;
}
@Override
@@ -434,25 +424,21 @@ public final class Tier
public static enum TransporterTier implements ITier
{
BASIC(1, 5, TransmitterType.LOGISTICAL_TRANSPORTER_BASIC),
ADVANCED(16, 10, TransmitterType.LOGISTICAL_TRANSPORTER_ADVANCED),
ELITE(32, 20, TransmitterType.LOGISTICAL_TRANSPORTER_ELITE),
ULTIMATE(64, 50, TransmitterType.LOGISTICAL_TRANSPORTER_ULTIMATE);
BASIC(1, 5),
ADVANCED(16, 10),
ELITE(32, 20),
ULTIMATE(64, 50);
public int pullAmount;
private int basePull;
public int speed;
private int baseSpeed;
public TransmitterType type;
private TransporterTier(int pull, int s, TransmitterType transmitterType)
private TransporterTier(int pull, int s)
{
basePull = pullAmount = pull;
baseSpeed = speed = s;
type = transmitterType;
}
@Override
@@ -498,10 +484,10 @@ public final class Tier
public static enum ConductorTier implements ITier
{
BASIC(5, 1, 10, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_BASIC),
ADVANCED(5, 1, 400, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ADVANCED),
ELITE(5, 1, 8000, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ELITE),
ULTIMATE(5, 1, 100000, new ColourRGBA(0.2, 0.2, 0.2, 1), TransmitterType.THERMODYNAMIC_CONDUCTOR_ULTIMATE);
BASIC(5, 1, 10, new ColourRGBA(0.2, 0.2, 0.2, 1)),
ADVANCED(5, 1, 400, new ColourRGBA(0.2, 0.2, 0.2, 1)),
ELITE(5, 1, 8000, new ColourRGBA(0.2, 0.2, 0.2, 1)),
ULTIMATE(5, 1, 100000, new ColourRGBA(0.2, 0.2, 0.2, 1));
public double inverseConduction;
private double baseConduction;
@@ -513,18 +499,14 @@ public final class Tier
private double baseConductionInsulation;
public ColourRGBA baseColour;
public TransmitterType type;
private ConductorTier(double inversek, double inverseC, double insulationInversek, ColourRGBA colour, TransmitterType transmitterType)
private ConductorTier(double inversek, double inverseC, double insulationInversek, ColourRGBA colour)
{
baseConduction = inverseConduction = inversek;
baseHeatCapacity = inverseHeatCapacity = inverseC;
baseConductionInsulation = inverseConductionInsulation = insulationInversek;
baseColour = colour;
type = transmitterType;
}
@Override
@@ -257,7 +257,8 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock
if(height >= 65)
{
change = 1;
} else if(height <= -65)
}
else if(height <= -65)
{
change = 0;
}
@@ -10,9 +10,10 @@ import java.util.List;
import li.cil.oc.api.Driver;
import mekanism.api.transmitters.TransmissionType;
import mekanism.common.Mekanism;
import mekanism.common.MekanismBlocks;
import mekanism.common.MekanismItems;
import mekanism.common.Resource;
import mekanism.common.multipart.TransmitterType;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterType;
import mekanism.common.recipe.RecipeHandler;
import mekanism.common.util.MekanismUtils;
import net.minecraft.init.Items;
@@ -163,19 +164,19 @@ public final class MekanismHooks
{
if(type.getTransmission().equals(TransmissionType.ITEM))
{
FMLInterModComms.sendMessage("appliedenergistics2","add-p2p-attunement-item",new ItemStack(MekanismItems.PartTransmitter, 1, type.ordinal()));
FMLInterModComms.sendMessage("appliedenergistics2", "add-p2p-attunement-item", new ItemStack(MekanismBlocks.Transmitter, 1, type.ordinal()));
continue;
}
if(type.getTransmission().equals(TransmissionType.FLUID))
{
FMLInterModComms.sendMessage("appliedenergistics2","add-p2p-attunement-fluid",new ItemStack(MekanismItems.PartTransmitter, 1, type.ordinal()));
FMLInterModComms.sendMessage("appliedenergistics2", "add-p2p-attunement-fluid", new ItemStack(MekanismBlocks.Transmitter, 1, type.ordinal()));
continue;
}
if(type.getTransmission().equals(TransmissionType.ENERGY))
{
FMLInterModComms.sendMessage("appliedenergistics2",energyP2P,new ItemStack(MekanismItems.PartTransmitter, 1, type.ordinal()));
FMLInterModComms.sendMessage("appliedenergistics2", energyP2P, new ItemStack(MekanismBlocks.Transmitter, 1, type.ordinal()));
continue;
}
@@ -0,0 +1,205 @@
package mekanism.common.multipart;
import java.util.Random;
import mekanism.api.Coord4D;
import mekanism.common.MekanismBlocks;
import mekanism.common.block.states.BlockStateFacing;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterType.Size;
import net.minecraft.block.Block;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.EnumBlockRenderType;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
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.common.property.IExtendedBlockState;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockGlowPanel extends Block implements ITileEntityProvider
{
private static Random rand = new Random();
public static AxisAlignedBB[] bounds = new AxisAlignedBB[6];
static
{
AxisAlignedBB cuboid = new AxisAlignedBB(0.25, 0, 0.25, 0.75, 0.125, 0.75);
Vec3d fromOrigin = new Vec3d(-0.5, -0.5, -0.5);
for(EnumFacing side : EnumFacing.VALUES)
{
bounds[side.ordinal()] = MultipartMekanism.rotate(cuboid.offset(fromOrigin.xCoord, fromOrigin.yCoord, fromOrigin.zCoord), side).offset(-fromOrigin.xCoord, -fromOrigin.zCoord, -fromOrigin.zCoord);
}
}
public BlockGlowPanel()
{
super(Material.PISTON);
}
@Override
public BlockStateContainer createBlockState()
{
return new GlowPanelBlockState(this);
}
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos)
{
TileEntityGlowPanel tileEntity = (TileEntityGlowPanel)world.getTileEntity(pos);
return state.withProperty(BlockStateFacing.facingProperty, tileEntity.side);
}
@SideOnly(Side.CLIENT)
@Override
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)
{
return ((IExtendedBlockState)state).withProperty(ColorProperty.INSTANCE, new ColorProperty(tileEntity.colour));
}
return state;
}
@Override
public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos neighbor)
{
TileEntityGlowPanel tileEntity = (TileEntityGlowPanel)world.getTileEntity(pos);
if(!world.isRemote && !canStay(tileEntity))
{
float motion = 0.7F;
double motionX = (rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
double motionY = (rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
double motionZ = (rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
ItemStack stack = new ItemStack(MekanismBlocks.GlowPanel, 1, tileEntity.colour.getMetaValue());
EntityItem entityItem = new EntityItem(world, pos.getX() + motionX, pos.getY() + motionY, pos.getZ() + motionZ, stack);
world.spawnEntity(entityItem);
world.setBlockToAir(pos);
}
}
@Override
public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos neighbor)
{
TileEntityGlowPanel tileEntity = (TileEntityGlowPanel)world.getTileEntity(pos);
if(!tileEntity.getWorld().isRemote && !canStay(tileEntity))
{
float motion = 0.7F;
double motionX = (rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
double motionY = (rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
double motionZ = (rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
ItemStack stack = new ItemStack(MekanismBlocks.GlowPanel, 1, tileEntity.colour.getMetaValue());
EntityItem entityItem = new EntityItem(tileEntity.getWorld(), pos.getX() + motionX, pos.getY() + motionY, pos.getZ() + motionZ, stack);
tileEntity.getWorld().spawnEntity(entityItem);
tileEntity.getWorld().setBlockToAir(pos);
}
}
@Override
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos)
{
TileEntityGlowPanel tile = (TileEntityGlowPanel)world.getTileEntity(pos);
return bounds[tile.side.ordinal()];
}
@Override
public float getBlockHardness(IBlockState state, World world, BlockPos pos)
{
return 3.5F;
}
@Override
public boolean canPlaceBlockOnSide(World world, BlockPos pos, EnumFacing side)
{
return world.isSideSolid(pos.offset(side), side.getOpposite());
}
public static boolean canStay(TileEntityGlowPanel tileEntity)
{
Coord4D adj = new Coord4D(tileEntity.getPos().offset(tileEntity.side), tileEntity.getWorld());
return tileEntity.getWorld().isSideSolid(adj.getPos(), tileEntity.side.getOpposite());
}
@Override
public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos)
{
return 15;
}
@Override
public int damageDropped(IBlockState state)
{
return getMetaFromState(state);
}
@Override
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
{
TileEntityGlowPanel tileEntity = (TileEntityGlowPanel)world.getTileEntity(pos);
return new ItemStack(MekanismBlocks.GlowPanel, 1, tileEntity.colour.getMetaValue());
}
@Override
public TileEntity createNewTileEntity(World worldIn, int meta)
{
return new TileEntityGlowPanel();
}
@Override
public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer)
{
return true;
}
@Override
public EnumBlockRenderType getRenderType(IBlockState state)
{
return EnumBlockRenderType.MODEL;
}
@Override
public boolean isBlockNormalCube(IBlockState state)
{
return false;
}
@Override
public boolean isOpaqueCube(IBlockState state)
{
return false;
}
@Override
public boolean isFullCube(IBlockState state)
{
return false;
}
@Override
public boolean isFullBlock(IBlockState state)
{
return false;
}
}
@@ -0,0 +1,128 @@
package mekanism.common.multipart;
import mekanism.api.transmitters.TransmissionType;
import mekanism.common.Tier.BaseTier;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.client.renderer.block.statemap.StateMapperBase;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.obj.OBJModel.OBJProperty;
import net.minecraftforge.common.property.ExtendedBlockState;
import net.minecraftforge.common.property.IUnlistedProperty;
public class BlockStateTransmitter extends ExtendedBlockState
{
public static final PropertyEnum<TransmitterType> typeProperty = PropertyEnum.create("type", TransmitterType.class);
public static final PropertyEnum<BaseTier> tierProperty = PropertyEnum.create("tier", BaseTier.class);
public BlockStateTransmitter(BlockTransmitter block)
{
super(block, new IProperty[] {typeProperty, tierProperty}, new IUnlistedProperty[] {OBJProperty.INSTANCE, ColorProperty.INSTANCE, ConnectionProperty.INSTANCE});
}
public enum TransmitterType implements IStringSerializable
{
UNIVERSAL_CABLE("UniversalCable", Size.SMALL, TransmissionType.ENERGY, false, true),
MECHANICAL_PIPE("MechanicalPipe", Size.LARGE, TransmissionType.FLUID, false, true),
PRESSURIZED_TUBE("PressurizedTube", Size.SMALL, TransmissionType.GAS, false, true),
LOGISTICAL_TRANSPORTER("LogisticalTransporter", Size.LARGE, TransmissionType.ITEM, true, true),
RESTRICTIVE_TRANSPORTER("RestrictiveTransporter", Size.LARGE, TransmissionType.ITEM, false, false),
DIVERSION_TRANSPORTER("DiversionTransporter", Size.LARGE, TransmissionType.ITEM, true, false),
THERMODYNAMIC_CONDUCTOR("ThermodynamicConductor", Size.SMALL, TransmissionType.HEAT, false, true);
private String unlocalizedName;
private Size size;
private TransmissionType transmissionType;
private boolean transparencyRender;
private boolean tiers;
private TransmitterType(String name, Size s, TransmissionType type, boolean transparency, boolean b)
{
unlocalizedName = name;
size = s;
transmissionType = type;
transparencyRender = transparency;
tiers = b;
}
@Override
public String getName()
{
return name().toLowerCase();
}
public Size getSize()
{
return size;
}
public boolean hasTransparency()
{
return transparencyRender;
}
public TransmissionType getTransmission()
{
return transmissionType;
}
public boolean hasTiers()
{
return tiers;
}
public static enum Size
{
SMALL(6),
LARGE(8);
public int centerSize;
private Size(int size)
{
centerSize = size;
}
}
public static TransmitterType get(int meta)
{
return TransmitterType.values()[meta];
}
}
public static class TransmitterStateMapper extends StateMapperBase
{
@Override
protected ModelResourceLocation getModelResourceLocation(IBlockState state)
{
BlockTransmitter block = (BlockTransmitter)state.getBlock();
TransmitterType type = state.getValue(typeProperty);
StringBuilder builder = new StringBuilder();
String nameOverride = null;
if(type.tiers)
{
BaseTier tier = state.getValue(tierProperty);
if(tier == BaseTier.CREATIVE)
{
tier = BaseTier.ULTIMATE;
}
nameOverride = type.getName() + "_" + tier.getName();
}
if(builder.length() == 0)
{
builder.append("normal");
}
ResourceLocation baseLocation = new ResourceLocation("mekanism", nameOverride != null ? nameOverride : type.getName());
return new ModelResourceLocation(baseLocation, builder.toString());
}
}
}
@@ -0,0 +1,348 @@
package mekanism.common.multipart;
import java.util.List;
import java.util.Random;
import javax.annotation.Nullable;
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.util.MekanismUtils;
import net.minecraft.block.Block;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.EnumBlockRenderType;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
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.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockTransmitter extends Block implements ITileEntityProvider
{
public static AxisAlignedBB[] smallSides = new AxisAlignedBB[7];
public static AxisAlignedBB[] largeSides = new AxisAlignedBB[7];
public static AxisAlignedBB smallDefault = smallSides[6];
public static AxisAlignedBB largeDefault = largeSides[6];
static
{
smallSides[0] = new AxisAlignedBB(0.3, 0.0, 0.3, 0.7, 0.3, 0.7);
smallSides[1] = new AxisAlignedBB(0.3, 0.7, 0.3, 0.7, 1.0, 0.7);
smallSides[2] = new AxisAlignedBB(0.3, 0.3, 0.0, 0.7, 0.7, 0.3);
smallSides[3] = new AxisAlignedBB(0.3, 0.3, 0.7, 0.7, 0.7, 1.0);
smallSides[4] = new AxisAlignedBB(0.0, 0.3, 0.3, 0.3, 0.7, 0.7);
smallSides[5] = new AxisAlignedBB(0.7, 0.3, 0.3, 1.0, 0.7, 0.7);
smallSides[6] = new AxisAlignedBB(0.3, 0.3, 0.3, 0.7, 0.7, 0.7);
largeSides[0] = new AxisAlignedBB(0.25, 0.0, 0.25, 0.75, 0.25, 0.75);
largeSides[1] = new AxisAlignedBB(0.25, 0.75, 0.25, 0.75, 1.0, 0.75);
largeSides[2] = new AxisAlignedBB(0.25, 0.25, 0.0, 0.75, 0.75, 0.25);
largeSides[3] = new AxisAlignedBB(0.25, 0.25, 0.75, 0.75, 0.75, 1.0);
largeSides[4] = new AxisAlignedBB(0.0, 0.25, 0.25, 0.25, 0.75, 0.75);
largeSides[5] = new AxisAlignedBB(0.75, 0.25, 0.25, 1.0, 0.75, 0.75);
largeSides[6] = new AxisAlignedBB(0.25, 0.25, 0.25, 0.75, 0.75, 0.75);
}
public BlockTransmitter()
{
super(Material.WOOD);
}
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos)
{
TileEntity tile = worldIn.getTileEntity(pos);
if(tile instanceof TileEntitySidedPipe)
{
state = state.withProperty(BlockStateTransmitter.tierProperty, ((TileEntitySidedPipe)tile).getBaseTier());
}
return state;
}
@Override
public IBlockState getStateFromMeta(int meta)
{
TransmitterType type = TransmitterType.get(meta);
return getDefaultState().withProperty(BlockStateTransmitter.typeProperty, type);
}
@Override
public int getMetaFromState(IBlockState state)
{
TransmitterType type = state.getValue(BlockStateTransmitter.typeProperty);
return type.ordinal();
}
@Override
public float getBlockHardness(IBlockState state, World world, BlockPos pos)
{
return 3.5F;
}
@Override
public BlockStateContainer createBlockState()
{
return new BlockStateTransmitter(this);
}
@SideOnly(Side.CLIENT)
@Override
public IBlockState getExtendedState(IBlockState state, IBlockAccess w, BlockPos pos)
{
TileEntitySidedPipe tile = (TileEntitySidedPipe)w.getTileEntity(pos);
return tile.getExtendedState(state);
}
@Override
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos)
{
TileEntitySidedPipe pipe = (TileEntitySidedPipe)world.getTileEntity(pos);
if(pipe.getTransmitterType().getSize() == Size.SMALL)
{
return smallSides[6];
}
return largeSides[6];
}
@Override
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)
{
collidingBoxes.add(box.offset(pos));
}
}
@Override
public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World world, BlockPos pos)
{
return getDefaultForTile((TileEntitySidedPipe)world.getTileEntity(pos)).offset(pos);
}
@Override
public RayTraceResult collisionRayTrace(IBlockState blockState, World world, BlockPos pos, Vec3d start, Vec3d end)
{
TileEntitySidedPipe tile = (TileEntitySidedPipe)world.getTileEntity(pos);
List<AxisAlignedBB> boxes = tile.getCollisionBoxes();
AdvancedRayTraceResult result = MultipartMekanism.collisionRayTrace(pos, start, end, boxes);
if(result != null)
{
setDefaultForTile(tile, result.bounds);
}
return result != null ? result.hit : null;
}
@Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ)
{
ItemStack stack = player.getHeldItem(hand);
if(stack == null)
{
return false;
}
if(MekanismUtils.hasUsableWrench(player, pos) && player.isSneaking())
{
if(!world.isRemote)
{
dismantleBlock(state, world, pos, false);
}
return true;
}
return false;
}
@Override
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
{
TileEntitySidedPipe tileEntity = (TileEntitySidedPipe)world.getTileEntity(pos);
ItemStack itemStack = new ItemStack(MekanismBlocks.EnergyCube);
if(!itemStack.hasTagCompound())
{
itemStack.setTagCompound(new NBTTagCompound());
}
ITierItem tierItem = (ITierItem)itemStack.getItem();
tierItem.setBaseTier(itemStack, tileEntity.getBaseTier());
return itemStack;
}
public ItemStack dismantleBlock(IBlockState state, World world, BlockPos pos, boolean returnBlock)
{
ItemStack itemStack = getPickBlock(state, null, world, pos, null);
world.setBlockToAir(pos);
if(!returnBlock)
{
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;
double motionZ = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
EntityItem entityItem = new EntityItem(world, pos.getX() + motionX, pos.getY() + motionY, pos.getZ() + motionZ, itemStack);
world.spawnEntity(entityItem);
}
return itemStack;
}
@Override
@SideOnly(Side.CLIENT)
public void getSubBlocks(Item item, CreativeTabs creativetabs, NonNullList<ItemStack> list)
{
for(TransmitterType type : TransmitterType.values())
{
if(type.hasTiers())
{
for(BaseTier tier : BaseTier.values())
{
if(tier.isObtainable())
{
list.add(MekanismUtils.getTransmitter(type, tier, 1));
}
}
}
else {
list.add(MekanismUtils.getTransmitter(type, BaseTier.BASIC, 1));
}
}
}
@Override
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack)
{
TileEntitySidedPipe tile = (TileEntitySidedPipe)world.getTileEntity(pos);
tile.onAdded();
}
@Override
public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos neighbor)
{
TileEntitySidedPipe tile = (TileEntitySidedPipe)world.getTileEntity(pos);
EnumFacing side = EnumFacing.getFacingFromVector(neighbor.getX() - pos.getX(), neighbor.getY() - pos.getY(), neighbor.getZ() - pos.getZ());
tile.onNeighborBlockChange(side);
}
@Override
public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos neighbor)
{
TileEntitySidedPipe tile = (TileEntitySidedPipe)world.getTileEntity(pos);
EnumFacing side = EnumFacing.getFacingFromVector(neighbor.getX() - pos.getX(), neighbor.getY() - pos.getY(), neighbor.getZ() - pos.getZ());
tile.onNeighborTileChange(side);
}
@Override
public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer)
{
return true;
}
@Override
public EnumBlockRenderType getRenderType(IBlockState state)
{
return EnumBlockRenderType.MODEL;
}
@Override
public boolean isBlockNormalCube(IBlockState state)
{
return false;
}
@Override
public boolean isOpaqueCube(IBlockState state)
{
return false;
}
@Override
public boolean isFullCube(IBlockState state)
{
return false;
}
@Override
public boolean isFullBlock(IBlockState state)
{
return false;
}
@Override
public int quantityDropped(Random random)
{
return 0;
}
@Override
public Item getItemDropped(IBlockState state, Random random, int fortune)
{
return null;
}
private static AxisAlignedBB getDefaultForTile(TileEntitySidedPipe tile)
{
if(tile.getTransmitterType().getSize() == Size.SMALL)
{
return smallDefault;
}
return largeDefault;
}
private static void setDefaultForTile(TileEntitySidedPipe tile, AxisAlignedBB box)
{
if(tile.getTransmitterType().getSize() == Size.SMALL)
{
smallDefault = box;
return;
}
largeDefault = box;
}
@Override
public TileEntity createNewTileEntity(World worldIn, int meta)
{
return null;
}
}
@@ -2,7 +2,7 @@ package mekanism.common.multipart;
import java.util.Arrays;
import mekanism.common.multipart.PartSidedPipe.ConnectionType;
import mekanism.common.multipart.TileEntitySidedPipe.ConnectionType;
import net.minecraftforge.common.property.IUnlistedProperty;
public class ConnectionProperty implements IUnlistedProperty<ConnectionProperty>
@@ -1,6 +1,5 @@
package mekanism.common.multipart;
import mcmultipart.MCMultiPartMod;
import mekanism.common.block.states.BlockStateFacing;
import net.minecraft.block.properties.IProperty;
import net.minecraftforge.common.property.ExtendedBlockState;
@@ -8,8 +7,8 @@ import net.minecraftforge.common.property.IUnlistedProperty;
public class GlowPanelBlockState extends ExtendedBlockState
{
public GlowPanelBlockState()
public GlowPanelBlockState(BlockGlowPanel block)
{
super(MCMultiPartMod.multipart, new IProperty[] {BlockStateFacing.facingProperty}, new IUnlistedProperty[] {ColorProperty.INSTANCE});
super(block, new IProperty[] {BlockStateFacing.facingProperty}, new IUnlistedProperty[] {ColorProperty.INSTANCE});
}
}
@@ -1,14 +1,20 @@
package mekanism.common.multipart;
import mcmultipart.item.ItemMultiPart;
import mcmultipart.multipart.IMultipart;
import java.util.ArrayList;
import mcmultipart.api.multipart.IMultipart;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.api.Range4D;
import mekanism.common.Mekanism;
import mekanism.common.base.IMetaItem;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.util.LangUtils;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.NonNullList;
@@ -17,31 +23,50 @@ import net.minecraft.util.math.Vec3d;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.World;
public class ItemGlowPanel extends ItemMultiPart implements IMetaItem
public class ItemBlockGlowPanel extends ItemBlock
{
public ItemGlowPanel()
public Block metaBlock;
public ItemBlockGlowPanel(Block block)
{
super();
super(block);
metaBlock = block;
setHasSubtypes(true);
setCreativeTab(Mekanism.tabMekanism);
}
@Override
public IMultipart createPart(World world, BlockPos pos, EnumFacing orientation, Vec3d vHit, ItemStack item, EntityPlayer player)
public int getMetadata(int i)
{
EnumColor col = EnumColor.DYES[item.getItemDamage()];
return i;
}
@Override
public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState state)
{
boolean place = super.placeBlockAt(stack, player, world, pos, side, hitX, hitY, hitZ, state);
if(pos != null && orientation != null)
if(place)
{
BlockPos pos1 = pos.offset(orientation);
TileEntityGlowPanel tileEntity = (TileEntityGlowPanel)world.getTileEntity(pos);
EnumColor col = EnumColor.DYES[stack.getItemDamage()];
if(world.isSideSolid(pos1, orientation.getOpposite()))
BlockPos pos1 = pos.offset(side);
if(world.isSideSolid(pos1, side.getOpposite()))
{
return new PartGlowPanel(col, orientation);
tileEntity.setOrientation(side);
}
tileEntity.setColour(col);
if(!world.isRemote)
{
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity)));
}
}
return null;
return place;
}
@Override
@@ -80,16 +105,4 @@ public class ItemGlowPanel extends ItemMultiPart implements IMetaItem
{
return true;
}
@Override
public String getTexture(int meta)
{
return "glow_panel";
}
@Override
public int getVariants()
{
return EnumColor.DYES.length;
}
}
@@ -1,51 +1,70 @@
package mekanism.common.multipart;
import java.util.ArrayList;
import java.util.List;
import mcmultipart.item.ItemMultiPart;
import mcmultipart.multipart.IMultipart;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.api.Range4D;
import mekanism.api.transmitters.TransmissionType;
import mekanism.client.MekKeyHandler;
import mekanism.client.MekanismKeyHandler;
import mekanism.common.Mekanism;
import mekanism.common.Tier;
import mekanism.common.Tier.BaseTier;
import mekanism.common.base.IMetaItem;
import mekanism.common.base.ITierItem;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterType;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
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.settings.GameSettings;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
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 net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class ItemPartTransmitter extends ItemMultiPart implements IMetaItem
public class ItemBlockTransmitter extends ItemBlock implements ITierItem
{
public ItemPartTransmitter()
public Block metaBlock;
public ItemBlockTransmitter(Block block)
{
super();
super(block);
metaBlock = block;
setHasSubtypes(true);
setCreativeTab(Mekanism.tabMekanism);
}
@Override
public IMultipart createPart(World world, BlockPos pos, EnumFacing dir, Vec3d hit, ItemStack stack, EntityPlayer player)
public int getMetadata(int i)
{
return PartTransmitter.getPartType(TransmitterType.values()[getDamage(stack)]);
return i;
}
@Override
public int getMetadata(int damage)
public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState state)
{
return damage;
boolean place = super.placeBlockAt(stack, player, world, pos, side, hitX, hitY, hitZ, state);
if(place)
{
TileEntitySidedPipe tileEntity = (TileEntitySidedPipe)world.getTileEntity(pos);
tileEntity.setBaseTier(getBaseTier(stack));
if(!world.isRemote)
{
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), tileEntity.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tileEntity)));
}
}
return place;
}
@Override
@@ -55,7 +74,7 @@ public class ItemPartTransmitter extends ItemMultiPart implements IMetaItem
if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey))
{
TransmissionType transmission = TransmitterType.values()[itemstack.getItemDamage()].getTransmission();
BaseTier tier = TransmitterType.values()[itemstack.getItemDamage()].getTier();
BaseTier tier = getBaseTier(itemstack);
if(transmission == TransmissionType.ENERGY)
{
@@ -135,31 +154,40 @@ public class ItemPartTransmitter extends ItemMultiPart implements IMetaItem
}
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs tab, NonNullList<ItemStack> listToAddTo)
{
for(TransmitterType type : TransmitterType.values())
{
listToAddTo.add(new ItemStack(item, 1, type.ordinal()));
}
}
@Override
public String getUnlocalizedName(ItemStack stack)
{
return getUnlocalizedName() + "." + TransmitterType.values()[stack.getItemDamage()].getName();
TransmitterType type = TransmitterType.get(stack.getItemDamage());
String name = type.getName();
if(type.hasTiers())
{
BaseTier tier = getBaseTier(stack);
name = tier.getSimpleName() + name;
}
return getUnlocalizedName() + "." + name;
}
@Override
public BaseTier getBaseTier(ItemStack itemstack)
{
if(!itemstack.hasTagCompound())
{
return BaseTier.BASIC;
}
return BaseTier.values()[itemstack.getTagCompound().getInteger("tier")];
}
@Override
public String getTexture(int meta)
public void setBaseTier(ItemStack itemstack, BaseTier tier)
{
return TransmitterType.values()[meta].name().toLowerCase();
}
if(!itemstack.hasTagCompound())
{
itemstack.setTagCompound(new NBTTagCompound());
}
@Override
public int getVariants()
{
return TransmitterType.values().length;
itemstack.getTagCompound().setInteger("tier", tier.ordinal());
}
}
@@ -0,0 +1,27 @@
package mekanism.common.multipart;
import mcmultipart.api.multipart.IMultipart;
import mcmultipart.api.slot.EnumFaceSlot;
import mcmultipart.api.slot.IPartSlot;
import mekanism.common.block.states.BlockStateFacing;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
public class MultipartGlowPanel implements IMultipart
{
@Override
public IPartSlot getSlotForPlacement(World world, BlockPos pos, IBlockState state, EnumFacing facing, float hitX, float hitY,float hitZ, EntityLivingBase placer)
{
return EnumFaceSlot.values()[facing.ordinal()];
}
@Override
public IPartSlot getSlotFromWorld(IBlockAccess world, BlockPos pos, IBlockState state)
{
return EnumFaceSlot.values()[state.getValue(BlockStateFacing.facingProperty).ordinal()];
}
}
@@ -2,166 +2,110 @@ 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.Multipart;
import mcmultipart.multipart.MultipartRegistry;
import java.util.Collection;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import mcmultipart.api.addon.IMCMPAddon;
import mcmultipart.api.addon.MCMPAddon;
import mcmultipart.api.capability.MCMPCapabilities;
import mcmultipart.api.multipart.IMultipartRegistry;
import mekanism.common.MekanismBlocks;
import mekanism.common.Tier;
import mekanism.common.block.states.BlockStateMachine.MachineType;
import net.minecraft.entity.item.EntityItem;
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.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.event.AttachCapabilitiesEvent;
import net.minecraftforge.fml.common.event.FMLInterModComms;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
public class MultipartMekanism implements IPartFactory
import org.apache.commons.lang3.tuple.Pair;
@MCMPAddon
public class MultipartMekanism implements IMCMPAddon
{
public MultipartMekanism()
{
init();
MinecraftForge.EVENT_BUS.register(this);
}
@SubscribeEvent
public void onAttachTile(AttachCapabilitiesEvent<TileEntity> event)
{
TileEntity tile = event.getObject();
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.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);
}
private void register(AttachCapabilitiesEvent<TileEntity> e, String id)
{
e.addCapability(new ResourceLocation("mekanism:" + id), new ICapabilityProvider() {
private MultipartTile tile;
@Override
public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing)
{
return capability == MCMPCapabilities.MULTIPART_TILE;
}
@Nullable
@Override
public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing)
{
if(capability == MCMPCapabilities.MULTIPART_TILE)
{
if(tile == null)
{
tile = new MultipartTile(e.getObject());
}
return MCMPCapabilities.MULTIPART_TILE.cast(tile);
}
return null;
}
});
}
public void init()
{
MultipartRegistry.registerPartFactory(this, "mekanism:universal_cable_basic",
"mekanism:universal_cable_advanced", "mekanism:universal_cable_elite",
"mekanism:universal_cable_ultimate", "mekanism:mechanical_pipe",
"mekanism:mechanical_pipe_basic", "mekanism:mechanical_pipe_advanced",
"mekanism:mechanical_pipe_elite", "mekanism:mechanical_pipe_ultimate",
"mekanism:pressurized_tube_basic", "mekanism:pressurized_tube_advanced",
"mekanism:pressurized_tube_elite", "mekanism:pressurized_tube_ultimate",
"mekanism:logistical_transporter_basic", "mekanism:logistical_transporter_advanced",
"mekanism:logistical_transporter_elite", "mekanism:logistical_transporter_ultimate",
"mekanism:restrictive_transporter", "mekanism:diversion_transporter",
"mekanism:thermodynamic_conductor_basic", "mekanism:thermodynamic_conductor_advanced",
"mekanism:thermodynamic_conductor_elite", "mekanism:thermodynamic_conductor_ultimate",
"mekanism:glow_panel");
registerMicroMaterials();
}
@Override
public IMultipart createPart(ResourceLocation resource, boolean client)
{
String name = resource.toString();
if(name.equals("mekanism:universal_cable"))
{
return new PartUniversalCable(Tier.CableTier.BASIC);
}
else if(name.equals("mekanism:universal_cable_basic"))
{
return new PartUniversalCable(Tier.CableTier.BASIC);
}
else if(name.equals("mekanism:universal_cable_advanced"))
{
return new PartUniversalCable(Tier.CableTier.ADVANCED);
}
else if(name.equals("mekanism:universal_cable_elite"))
{
return new PartUniversalCable(Tier.CableTier.ELITE);
}
else if(name.equals("mekanism:universal_cable_ultimate"))
{
return new PartUniversalCable(Tier.CableTier.ULTIMATE);
}
else if(name.equals("mekanism:mechanical_pipe"))
{
return new PartMechanicalPipe(Tier.PipeTier.BASIC);
}
else if(name.equals("mekanism:mechanical_pipe_basic"))
{
return new PartMechanicalPipe(Tier.PipeTier.BASIC);
}
else if(name.equals("mekanism:mechanical_pipe_advanced"))
{
return new PartMechanicalPipe(Tier.PipeTier.ADVANCED);
}
else if(name.equals("mekanism:mechanical_pipe_elite"))
{
return new PartMechanicalPipe(Tier.PipeTier.ELITE);
}
else if(name.equals("mekanism:mechanical_pipe_ultimate"))
{
return new PartMechanicalPipe(Tier.PipeTier.ULTIMATE);
}
else if(name.equals("mekanism:pressurized_tube_basic") || name.equals("mekanism:pressurized_tube"))
{
return new PartPressurizedTube(Tier.TubeTier.BASIC);
}
else if(name.equals("mekanism:pressurized_tube_advanced"))
{
return new PartPressurizedTube(Tier.TubeTier.ADVANCED);
}
else if(name.equals("mekanism:pressurized_tube_elite"))
{
return new PartPressurizedTube(Tier.TubeTier.ELITE);
}
else if(name.equals("mekanism:pressurized_tube_ultimate"))
{
return new PartPressurizedTube(Tier.TubeTier.ULTIMATE);
}
else if(name.equals("mekanism:logistical_transporter_basic") || name.equals("mekanism:logistical_transporter"))
{
return new PartLogisticalTransporter(Tier.TransporterTier.BASIC);
}
else if(name.equals("mekanism:logistical_transporter_advanced"))
{
return new PartLogisticalTransporter(Tier.TransporterTier.ADVANCED);
}
else if(name.equals("mekanism:logistical_transporter_elite"))
{
return new PartLogisticalTransporter(Tier.TransporterTier.ELITE);
}
else if(name.equals("mekanism:logistical_transporter_ultimate"))
{
return new PartLogisticalTransporter(Tier.TransporterTier.ULTIMATE);
}
else if(name.equals("mekanism:restrictive_transporter"))
{
return new PartRestrictiveTransporter();
}
else if(name.equals("mekanism:diversion_transporter"))
{
return new PartDiversionTransporter();
}
else if(name.equals("mekanism:thermodynamic_conductor_basic"))
{
return new PartThermodynamicConductor(Tier.ConductorTier.BASIC);
}
else if(name.equals("mekanism:thermodynamic_conductor_advanced"))
{
return new PartThermodynamicConductor(Tier.ConductorTier.ADVANCED);
}
else if(name.equals("mekanism:thermodynamic_conductor_elite"))
{
return new PartThermodynamicConductor(Tier.ConductorTier.ELITE);
}
else if(name.equals("mekanism:thermodynamic_conductor_ultimate"))
{
return new PartThermodynamicConductor(Tier.ConductorTier.ULTIMATE);
}
else if(name.equals("mekanism:glow_panel"))
{
return new PartGlowPanel();
}
return null;
}
public void registerMicroMaterials()
{
for(int i = 0; i < 16; i++)
{
// MicroblockRegistry.registerMaterial(new PlasticMicroMaterial(MekanismBlocks.PlasticBlock, i), BlockMicroMaterial.materialKey(MekanismBlocks.PlasticBlock, i));
// MicroMaterialRegistry.registerMaterial(new PlasticMicroMaterial(MekanismBlocks.GlowPlasticBlock, i), BlockMicroMaterial.materialKey(MekanismBlocks.GlowPlasticBlock, i));
// MicroMaterialRegistry.registerMaterial(new PlasticMicroMaterial(MekanismBlocks.SlickPlasticBlock, i), BlockMicroMaterial.materialKey(MekanismBlocks.SlickPlasticBlock, i));
// MicroMaterialRegistry.registerMaterial(new PlasticMicroMaterial(MekanismBlocks.ReinforcedPlasticBlock, i), BlockMicroMaterial.materialKey(MekanismBlocks.ReinforcedPlasticBlock, i));
// MicroMaterialRegistry.registerMaterial(new PlasticMicroMaterial(MekanismBlocks.RoadPlasticBlock, i), BlockMicroMaterial.materialKey(MekanismBlocks.RoadPlasticBlock, i));
FMLInterModComms.sendMessage("ForgeMicroblock", "microMaterial", new ItemStack(MekanismBlocks.BasicBlock, 1, i));
if(!MachineType.get(MACHINE_BLOCK_1, i).hasModel)
@@ -179,24 +123,6 @@ public class MultipartMekanism implements IPartFactory
FMLInterModComms.sendMessage("ForgeMicroblock", "microMaterial", new ItemStack(MekanismBlocks.CardboardBox));
}
public static void dropItem(ItemStack stack, Multipart multipart)
{
EntityItem item = new EntityItem(multipart.getWorld(), multipart.getPos().getX()+0.5, multipart.getPos().getY()+0.5, multipart.getPos().getZ()+0.5, stack);
item.motionX = multipart.getWorld().rand.nextGaussian() * 0.05;
item.motionY = multipart.getWorld().rand.nextGaussian() * 0.05 + 0.2;
item.motionZ = multipart.getWorld().rand.nextGaussian() * 0.05;
item.setDefaultPickupDelay();
multipart.getWorld().spawnEntity(item);
}
public static void dropItems(Multipart multipart)
{
for(ItemStack stack : multipart.getDrops())
{
dropItem(stack, multipart);
}
}
public static AxisAlignedBB rotate(AxisAlignedBB aabb, EnumFacing side)
{
Vec3d v1 = rotate(new Vec3d(aabb.minX, aabb.minY, aabb.minZ), side);
@@ -225,4 +151,100 @@ public class MultipartMekanism implements IPartFactory
return null;
}
/* taken from MCMP */
public static Pair<Vec3d, Vec3d> getRayTraceVectors(EntityPlayer player)
{
float pitch = player.rotationPitch;
float yaw = player.rotationYaw;
Vec3d start = new Vec3d(player.posX, player.posY + player.getEyeHeight(), player.posZ);
float f1 = MathHelper.cos(-yaw * 0.017453292F - (float) Math.PI);
float f2 = MathHelper.sin(-yaw * 0.017453292F - (float) Math.PI);
float f3 = -MathHelper.cos(-pitch * 0.017453292F);
float f4 = MathHelper.sin(-pitch * 0.017453292F);
float f5 = f2 * f3;
float f6 = f1 * f3;
double d3 = 5.0D;
if(player instanceof EntityPlayerMP)
{
d3 = ((EntityPlayerMP)player).interactionManager.getBlockReachDistance();
}
Vec3d end = start.addVector(f5 * d3, f4 * d3, f6 * d3);
return Pair.of(start, end);
}
public static AdvancedRayTraceResult collisionRayTrace(BlockPos pos, Vec3d start, Vec3d end, Collection<AxisAlignedBB> boxes)
{
double minDistance = Double.POSITIVE_INFINITY;
AdvancedRayTraceResult hit = null;
int i = -1;
for(AxisAlignedBB aabb : boxes)
{
AdvancedRayTraceResult result = aabb == null ? null : collisionRayTrace(pos, start, end, aabb, i, null);
if(result != null)
{
double d = result.squareDistanceTo(start);
if(d < minDistance)
{
minDistance = d;
hit = result;
}
}
i++;
}
return hit;
}
public static AdvancedRayTraceResult collisionRayTrace(BlockPos pos, Vec3d start, Vec3d end, AxisAlignedBB bounds, int subHit, Object hitInfo)
{
RayTraceResult result = bounds.offset(pos).calculateIntercept(start, end);
if(result == null)
{
return null;
}
result = new RayTraceResult(RayTraceResult.Type.BLOCK, result.hitVec, result.sideHit, pos);
result.subHit = subHit;
result.hitInfo = hitInfo;
return new AdvancedRayTraceResult(result, bounds);
}
private static class AdvancedRayTraceResultBase<T extends RayTraceResult>
{
public final AxisAlignedBB bounds;
public final T hit;
public AdvancedRayTraceResultBase(T mop, AxisAlignedBB aabb)
{
hit = mop;
bounds = aabb;
}
public boolean valid()
{
return hit != null && bounds != null;
}
public double squareDistanceTo(Vec3d vec)
{
return hit.hitVec.squareDistanceTo(vec);
}
}
public static class AdvancedRayTraceResult extends AdvancedRayTraceResultBase<RayTraceResult>
{
public AdvancedRayTraceResult(RayTraceResult mop, AxisAlignedBB bounds)
{
super(mop, bounds);
}
}
}
@@ -0,0 +1,20 @@
package mekanism.common.multipart;
import mcmultipart.api.multipart.IMultipartTile;
import net.minecraft.tileentity.TileEntity;
public class MultipartTile implements IMultipartTile
{
private TileEntity owner;
public MultipartTile(TileEntity tile)
{
owner = tile;
}
@Override
public TileEntity getTileEntity()
{
return owner;
}
}
@@ -1,162 +1,39 @@
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;
import mekanism.api.transmitters.TransmissionType;
import mekanism.api.util.CapabilityUtils;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.transmitters.Transmitter;
import mcmultipart.api.container.IPartInfo;
import mcmultipart.api.multipart.IMultipart;
import mcmultipart.api.slot.EnumCenterSlot;
import mcmultipart.api.slot.IPartSlot;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
public class MultipartTransmitter<A, N extends DynamicNetwork<A,N>> extends Transmitter<A, N>
public class MultipartTransmitter implements IMultipart
{
public PartTransmitter<A, N> containingPart;
public MultipartTransmitter(PartTransmitter<A, N> multiPart)
@Override
public IPartSlot getSlotForPlacement(World world, BlockPos pos, IBlockState state, EnumFacing facing, float hitX, float hitY, float hitZ, EntityLivingBase placer)
{
setPart(multiPart);
return EnumCenterSlot.CENTER;
}
@Override
public int getCapacity()
public IPartSlot getSlotFromWorld(IBlockAccess world, BlockPos pos, IBlockState state)
{
return getPart().getCapacity();
}
@Override
public World world()
{
return getPart().getWorld();
}
@Override
public Coord4D coord()
{
return new Coord4D(getPart().getPos(), getPart().getWorld());
}
@Override
public Coord4D getAdjacentConnectableTransmitterCoord(EnumFacing side)
{
Coord4D sideCoord = coord().offset(side);
TileEntity potentialTransmitterTile = sideCoord.getTileEntity(world());
if(!containingPart.canConnectMutual(side))
{
return null;
}
if(CapabilityUtils.hasCapability(potentialTransmitterTile, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()))
{
IGridTransmitter transmitter = CapabilityUtils.getCapability(potentialTransmitterTile, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite());
if(TransmissionType.checkTransmissionType(transmitter, getTransmissionType()) && containingPart.isValidTransmitter(potentialTransmitterTile))
{
return sideCoord;
}
}
return null;
}
@Override
public A getAcceptor(EnumFacing side)
{
return getPart().getCachedAcceptor(side);
}
@Override
public boolean isValid()
{
IMultipartContainer cont = getPart().getContainer();
if(cont == null)
{
return false;
}
if(cont instanceof TileEntity && ((TileEntity)cont).isInvalid())
{
return false;
}
return !getPart().unloaded && coord().exists(world());
}
@Override
public N createEmptyNetwork()
{
return getPart().createNewNetwork();
}
@Override
public N getExternalNetwork(Coord4D from)
{
TileEntity tile = from.getTileEntity(world());
if(CapabilityUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, null))
{
IGridTransmitter transmitter = CapabilityUtils.getCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, null);
if(TransmissionType.checkTransmissionType(transmitter, getTransmissionType()));
{
return ((IGridTransmitter<A, N>)transmitter).getTransmitterNetwork();
}
}
return null;
}
@Override
public void takeShare()
{
containingPart.takeShare();
}
@Override
public void updateShare()
{
containingPart.updateShare();
}
@Override
public Object getBuffer()
{
return getPart().getBuffer();
}
@Override
public N mergeNetworks(Collection<N> toMerge)
{
return getPart().createNetworkByMerging(toMerge);
}
@Override
public TransmissionType getTransmissionType()
{
return getPart().getTransmissionType();
return EnumCenterSlot.CENTER;
}
@Override
public void setRequestsUpdate()
public void onPartChanged(IPartInfo part, IPartInfo otherPart)
{
containingPart.sendDesc = true;
}
public PartTransmitter<A, N> getPart()
{
return containingPart;
}
public void setPart(PartTransmitter<A, N> containingPart)
{
this.containingPart = containingPart;
}
TileEntity tile = part.getTile().getTileEntity();
if(tile instanceof TileEntitySidedPipe)
{
((TileEntitySidedPipe)tile).onPartChanged(otherPart.getPart());
}
}
}
@@ -1,211 +0,0 @@
package mekanism.common.multipart;
import java.util.Collections;
import java.util.List;
import mcmultipart.microblock.IMicroblock.IFaceMicroblock;
import mcmultipart.multipart.IMultipart;
import mcmultipart.multipart.INormallyOccludingPart;
import mcmultipart.multipart.Multipart;
import mcmultipart.multipart.PartSlot;
import mcmultipart.raytrace.PartMOP;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.common.MekanismItems;
import mekanism.common.block.states.BlockStateFacing;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
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.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.Vec3d;
import net.minecraftforge.common.property.IExtendedBlockState;
public class PartGlowPanel extends Multipart implements INormallyOccludingPart
{
public EnumColor colour = EnumColor.WHITE;
public EnumFacing side = EnumFacing.DOWN;
public static AxisAlignedBB[] bounds = new AxisAlignedBB[6];
static
{
AxisAlignedBB cuboid = new AxisAlignedBB(0.25, 0, 0.25, 0.75, 0.125, 0.75);
Vec3d fromOrigin = new Vec3d(-0.5, -0.5, -0.5);
for(EnumFacing side : EnumFacing.VALUES)
{
bounds[side.ordinal()] = MultipartMekanism.rotate(cuboid.offset(fromOrigin.xCoord, fromOrigin.yCoord, fromOrigin.zCoord), side).offset(-fromOrigin.xCoord, -fromOrigin.zCoord, -fromOrigin.zCoord);
}
}
public PartGlowPanel()
{
super();
}
public PartGlowPanel(EnumColor colour, EnumFacing side)
{
super();
setColour(colour);
setOrientation(side);
}
@Override
public void addSelectionBoxes(List<AxisAlignedBB> list)
{
list.add(bounds[side.ordinal()]);
}
@Override
public ResourceLocation getType()
{
return new ResourceLocation("mekanism:glow_panel");
}
public void setColour(EnumColor newColour)
{
colour = newColour;
}
public void setOrientation(EnumFacing newSide)
{
side = newSide;
}
@Override
public void onNeighborTileChange(EnumFacing side)
{
if(!getWorld().isRemote && !canStay())
{
MultipartMekanism.dropItem(new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue()), this);
getContainer().removePart(this);
}
}
@Override
public void onPartChanged(IMultipart other)
{
if(!getWorld().isRemote && !canStay())
{
MultipartMekanism.dropItem(new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue()), this);
getContainer().removePart(this);
}
}
@Override
public void writeUpdatePacket(PacketBuffer data)
{
data.writeInt(side.ordinal());
data.writeInt(colour.getMetaValue());
}
@Override
public void readUpdatePacket(PacketBuffer data)
{
side = EnumFacing.getFront(data.readInt());
colour = EnumColor.DYES[data.readInt()];
}
@Override
public NBTTagCompound writeToNBT(NBTTagCompound nbt)
{
nbt.setInteger("side", side.ordinal());
nbt.setInteger("colour", colour.getMetaValue());
return nbt;
}
@Override
public void readFromNBT(NBTTagCompound nbt)
{
side = EnumFacing.getFront(nbt.getInteger("side"));
colour = EnumColor.DYES[nbt.getInteger("colour")];
}
@Override
public int getLightValue()
{
return 15;
}
@Override
public void addOcclusionBoxes(List<AxisAlignedBB> list)
{
addSelectionBoxes(list);
}
@Override
public float getHardness(PartMOP partHit)
{
return 3.5F;
}
@Override
public List<ItemStack> getDrops()
{
return Collections.singletonList(getPickBlock(null, null));
}
@Override
public ItemStack getPickBlock(EntityPlayer player, PartMOP hit)
{
return new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue());
}
public boolean canStay()
{
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());
}
@Override
public ResourceLocation getModelPath()
{
return getType();
}
@Override
public BlockStateContainer createBlockState()
{
return new GlowPanelBlockState();
}
@Override
public IBlockState getActualState(IBlockState state)
{
return state.withProperty(BlockStateFacing.facingProperty, side);
}
@Override
public IBlockState getExtendedState(IBlockState state)
{
state = state.withProperty(BlockStateFacing.facingProperty, side);
if(state instanceof IExtendedBlockState)
{
return ((IExtendedBlockState)state).withProperty(ColorProperty.INSTANCE, new ColorProperty(colour));
}
return state;
}
public static int hash(IExtendedBlockState state)
{
int hash = 1;
hash = 31 * hash + state.getValue(ColorProperty.INSTANCE).color.ordinal();
hash = 31 * hash + state.getValue(BlockStateFacing.facingProperty).ordinal();
return hash;
}
@Override
public boolean shouldBreakingUseExtendedState() {
return true;
}
}
@@ -9,6 +9,7 @@ import mekanism.api.EnumColor;
import mekanism.api.Range4D;
import mekanism.common.Mekanism;
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;
@@ -16,19 +17,12 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.TextComponentString;
public class PartDiversionTransporter extends PartLogisticalTransporter
public class TileEntityDiversionTransporter extends TileEntityLogisticalTransporter
{
public int[] modes = {0, 0, 0, 0, 0, 0};
@Override
public ResourceLocation getType()
{
return new ResourceLocation("mekanism:diversion_transporter");
}
@Override
public TransmitterType getTransmitterType()
{
@@ -127,7 +121,6 @@ public class PartDiversionTransporter extends PartLogisticalTransporter
}
refreshConnections();
notifyPartUpdate();
notifyTileChange();
player.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + LangUtils.localize("tooltip.configurator.toggleDiverter") + ": " + EnumColor.RED + description));
Coord4D coord = new Coord4D(getPos(), getWorld());
@@ -0,0 +1,78 @@
package mekanism.common.multipart;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import mekanism.api.EnumColor;
import mekanism.common.base.ITileNetwork;
import mekanism.common.block.states.BlockStateFacing;
import mekanism.common.util.MekanismUtils;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.property.IExtendedBlockState;
//import net.minecraft.util.IIcon;
public class TileEntityGlowPanel extends TileEntity implements ITileNetwork
{
public EnumColor colour = EnumColor.WHITE;
public EnumFacing side = EnumFacing.DOWN;
public void setColour(EnumColor newColour)
{
colour = newColour;
}
public void setOrientation(EnumFacing newSide)
{
side = newSide;
}
@Override
public void handlePacketData(ByteBuf dataStream) throws Exception
{
side = EnumFacing.getFront(dataStream.readInt());
colour = EnumColor.DYES[dataStream.readInt()];
MekanismUtils.updateBlock(world, pos);
}
@Override
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
data.add(side.ordinal());
data.add(colour.getMetaValue());
return data;
}
@Override
public NBTTagCompound writeToNBT(NBTTagCompound nbt)
{
super.writeToNBT(nbt);
nbt.setInteger("side", side.ordinal());
nbt.setInteger("colour", colour.getMetaValue());
return nbt;
}
@Override
public void readFromNBT(NBTTagCompound nbt)
{
super.readFromNBT(nbt);
side = EnumFacing.getFront(nbt.getInteger("side"));
colour = EnumColor.DYES[nbt.getInteger("colour")];
}
public static int hash(IExtendedBlockState state)
{
int hash = 1;
hash = 31 * hash + state.getValue(ColorProperty.INSTANCE).color.ordinal();
hash = 31 * hash + state.getValue(BlockStateFacing.facingProperty).ordinal();
return hash;
}
}
@@ -8,7 +8,6 @@ import java.util.Collection;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.api.Range4D;
import mekanism.api.gas.IGasHandler;
import mekanism.api.transmitters.TransmissionType;
import mekanism.api.util.CapabilityUtils;
import mekanism.common.InventoryNetwork;
@@ -22,9 +21,11 @@ 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.util.InventoryUtils;
import mekanism.common.util.LangUtils;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.TransporterUtils;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
@@ -36,39 +37,38 @@ import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.TextComponentString;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.property.IExtendedBlockState;
import net.minecraftforge.common.util.Constants.NBT;
public class PartLogisticalTransporter extends PartTransmitter<IInventory, InventoryNetwork>
public class TileEntityLogisticalTransporter extends TileEntityTransmitter<IInventory, InventoryNetwork>
{
public Tier.TransporterTier tier = Tier.TransporterTier.BASIC;
public int pullDelay = 0;
public PartLogisticalTransporter(TransporterTier transporterTier)
public TileEntityLogisticalTransporter()
{
this();
tier = transporterTier;
transmitterDelegate = new TransporterImpl(this);
}
public PartLogisticalTransporter()
{
transmitterDelegate = new MultipartTransporter(this);
}
@Override
public ResourceLocation getType()
public BaseTier getBaseTier()
{
return new ResourceLocation("mekanism:logistical_transporter_" + tier.name().toLowerCase());
return tier.getBaseTier();
}
@Override
public void setBaseTier(BaseTier baseTier)
{
tier = Tier.TransporterTier.get(baseTier);
}
@Override
public TransmitterType getTransmitterType()
{
return tier.type;
return TransmitterType.LOGISTICAL_TRANSPORTER;
}
@Override
@@ -188,6 +188,8 @@ public class PartLogisticalTransporter extends PartTransmitter<IInventory, Inven
@Override
public void handlePacketData(ByteBuf dataStream) throws Exception
{
tier = TransporterTier.values()[dataStream.readInt()];
super.handlePacketData(dataStream);
if(getWorld().isRemote)
@@ -210,7 +212,7 @@ public class PartLogisticalTransporter extends PartTransmitter<IInventory, Inven
if(prev != getTransmitter().getColor())
{
markRenderUpdate();
MekanismUtils.updateBlock(world, pos);
}
getTransmitter().transit.clear();
@@ -248,6 +250,8 @@ public class PartLogisticalTransporter extends PartTransmitter<IInventory, Inven
@Override
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
data.add(tier.ordinal());
super.getNetworkedData(data);
data.add(0);
@@ -344,7 +348,7 @@ public class PartLogisticalTransporter extends PartTransmitter<IInventory, Inven
protected EnumActionResult onConfigure(EntityPlayer player, int part, EnumFacing side)
{
TransporterUtils.incrementColor(getTransmitter());
onPartChanged(this);
onPartChanged(null);
PathfinderCache.onChanged(new Coord4D(getPos(), getWorld()));
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(new Coord4D(getPos(), getWorld()), getNetworkedData(new ArrayList())), new Range4D(new Coord4D(getPos(), getWorld())));
player.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + LangUtils.localize("tooltip.configurator.toggleColor") + ": " + (getTransmitter().getColor() != null ? getTransmitter().getColor().getColoredName() : EnumColor.BLACK + LangUtils.localize("gui.none"))));
@@ -374,9 +378,9 @@ public class PartLogisticalTransporter extends PartTransmitter<IInventory, Inven
}
@Override
public void onRemoved()
public void onChunkUnload()
{
super.onRemoved();
super.onChunkUnload();
if(!getWorld().isRemote)
{
@@ -406,9 +410,9 @@ public class PartLogisticalTransporter extends PartTransmitter<IInventory, Inven
public void updateShare() {}
@Override
public MultipartTransporter getTransmitter()
public TransporterImpl getTransmitter()
{
return (MultipartTransporter)transmitterDelegate;
return (TransporterImpl)transmitterDelegate;
}
public double getCost()
@@ -437,22 +441,6 @@ public class PartLogisticalTransporter extends PartTransmitter<IInventory, Inven
{
return ((IExtendedBlockState)super.getExtendedState(state)).withProperty(ColorProperty.INSTANCE, new ColorProperty(getRenderColor()));
}
@Override
public void readUpdatePacket(PacketBuffer packet)
{
tier = TransporterTier.values()[packet.readInt()];
super.readUpdatePacket(packet);
}
@Override
public void writeUpdatePacket(PacketBuffer packet)
{
packet.writeInt(tier.ordinal());
super.writeUpdatePacket(packet);
}
@Override
public boolean hasCapability(Capability<?> capability, EnumFacing side)
@@ -1,5 +1,8 @@
package mekanism.common.multipart;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.Collection;
import mekanism.api.transmitters.TransmissionType;
@@ -11,12 +14,11 @@ import mekanism.common.Tier.PipeTier;
import mekanism.common.base.FluidHandlerWrapper;
import mekanism.common.base.IFluidHandlerWrapper;
import mekanism.common.capabilities.CapabilityWrapperManager;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterType;
import mekanism.common.util.PipeUtils;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
@@ -25,7 +27,7 @@ import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraftforge.fluids.capability.IFluidHandler;
public class PartMechanicalPipe extends PartTransmitter<IFluidHandler, FluidNetwork> implements IFluidHandlerWrapper
public class TileEntityMechanicalPipe extends TileEntityTransmitter<IFluidHandler, FluidNetwork> implements IFluidHandlerWrapper
{
public Tier.PipeTier tier;
@@ -35,13 +37,25 @@ public class PartMechanicalPipe extends PartTransmitter<IFluidHandler, FluidNetw
public FluidStack lastWrite;
public PartMechanicalPipe(Tier.PipeTier pipeTier)
public TileEntityMechanicalPipe(Tier.PipeTier pipeTier)
{
super();
tier = pipeTier;
buffer.setCapacity(getCapacity());
}
@Override
public BaseTier getBaseTier()
{
return tier.getBaseTier();
}
@Override
public void setBaseTier(BaseTier baseTier)
{
tier = Tier.PipeTier.get(baseTier);
}
@Override
public void update()
{
@@ -107,7 +121,7 @@ public class PartMechanicalPipe extends PartTransmitter<IFluidHandler, FluidNetw
}
@Override
public void onUnloaded()
public void onChunkUnload()
{
if(!getWorld().isRemote && getTransmitter().hasTransmitterNetwork())
{
@@ -122,7 +136,7 @@ public class PartMechanicalPipe extends PartTransmitter<IFluidHandler, FluidNetw
}
}
super.onUnloaded();
super.onChunkUnload();
}
@Override
@@ -160,12 +174,6 @@ public class PartMechanicalPipe extends PartTransmitter<IFluidHandler, FluidNetw
return nbtTags;
}
@Override
public ResourceLocation getType()
{
return new ResourceLocation("mekanism:mechanical_pipe_" + tier.name().toLowerCase());
}
@Override
public TransmissionType getTransmissionType()
{
@@ -175,7 +183,7 @@ public class PartMechanicalPipe extends PartTransmitter<IFluidHandler, FluidNetw
@Override
public TransmitterType getTransmitterType()
{
return tier.type;
return TransmitterType.MECHANICAL_PIPE;
}
@Override
@@ -310,19 +318,21 @@ public class PartMechanicalPipe extends PartTransmitter<IFluidHandler, FluidNetw
}
@Override
public void readUpdatePacket(PacketBuffer packet)
public void handlePacketData(ByteBuf dataStream) throws Exception
{
tier = PipeTier.values()[packet.readInt()];
tier = PipeTier.values()[dataStream.readInt()];
super.readUpdatePacket(packet);
super.handlePacketData(dataStream);
}
@Override
public void writeUpdatePacket(PacketBuffer packet)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
packet.writeInt(tier.ordinal());
data.add(tier.ordinal());
super.writeUpdatePacket(packet);
super.getNetworkedData(data);
return data;
}
@Override
@@ -1,5 +1,8 @@
package mekanism.common.multipart;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.Collection;
import mekanism.api.gas.Gas;
@@ -14,14 +17,13 @@ import mekanism.common.Tier;
import mekanism.common.Tier.BaseTier;
import mekanism.common.Tier.TubeTier;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterType;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.capabilities.Capability;
public class PartPressurizedTube extends PartTransmitter<IGasHandler, GasNetwork> implements IGasHandler
public class TileEntityPressurizedTube extends TileEntityTransmitter<IGasHandler, GasNetwork> implements IGasHandler
{
public Tier.TubeTier tier = Tier.TubeTier.BASIC;
@@ -31,12 +33,24 @@ public class PartPressurizedTube extends PartTransmitter<IGasHandler, GasNetwork
public GasStack lastWrite;
public PartPressurizedTube(Tier.TubeTier tubeTier)
public TileEntityPressurizedTube(Tier.TubeTier tubeTier)
{
super();
tier = tubeTier;
buffer.setMaxGas(getCapacity());
}
@Override
public BaseTier getBaseTier()
{
return tier.getBaseTier();
}
@Override
public void setBaseTier(BaseTier baseTier)
{
tier = Tier.TubeTier.get(baseTier);
}
@Override
public void update()
@@ -112,7 +126,7 @@ public class PartPressurizedTube extends PartTransmitter<IGasHandler, GasNetwork
}
@Override
public void onUnloaded()
public void onChunkUnload()
{
if(!getWorld().isRemote && getTransmitter().hasTransmitterNetwork())
{
@@ -127,7 +141,7 @@ public class PartPressurizedTube extends PartTransmitter<IGasHandler, GasNetwork
}
}
super.onUnloaded();
super.onChunkUnload();
}
@Override
@@ -165,12 +179,6 @@ public class PartPressurizedTube extends PartTransmitter<IGasHandler, GasNetwork
return nbtTags;
}
@Override
public ResourceLocation getType()
{
return new ResourceLocation("mekanism:pressurized_tube_" + tier.name().toLowerCase());
}
@Override
public TransmissionType getTransmissionType()
{
@@ -293,19 +301,21 @@ public class PartPressurizedTube extends PartTransmitter<IGasHandler, GasNetwork
}
@Override
public void readUpdatePacket(PacketBuffer packet)
public void handlePacketData(ByteBuf dataStream) throws Exception
{
tier = TubeTier.values()[packet.readInt()];
tier = TubeTier.values()[dataStream.readInt()];
super.readUpdatePacket(packet);
super.handlePacketData(dataStream);
}
@Override
public void writeUpdatePacket(PacketBuffer packet)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
packet.writeInt(tier.ordinal());
data.add(tier.ordinal());
super.writeUpdatePacket(packet);
super.getNetworkedData(data);
return data;
}
@Override
@@ -1,18 +1,12 @@
package mekanism.common.multipart;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterType;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
public class PartRestrictiveTransporter extends PartLogisticalTransporter
public class TileEntityRestrictiveTransporter extends TileEntityLogisticalTransporter
{
@Override
public ResourceLocation getType()
{
return new ResourceLocation("mekanism:restrictive_transporter");
}
@Override
public TransmitterType getTransmitterType()
{
@@ -3,65 +3,51 @@ package mekanism.common.multipart;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import mcmultipart.MCMultiPartMod;
import mcmultipart.block.TileMultipartContainer;
import mcmultipart.multipart.IMultipart;
import mcmultipart.multipart.INormallyOccludingPart;
import mcmultipart.multipart.Multipart;
import mcmultipart.multipart.OcclusionHelper;
import mcmultipart.raytrace.PartMOP;
import mcmultipart.raytrace.RayTraceUtils;
import mcmultipart.raytrace.RayTraceUtils.AdvancedRayTraceResultPart;
import mcmultipart.api.multipart.IMultipart;
import mcmultipart.api.multipart.OcclusionHelper;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.api.IConfigurable;
import mekanism.api.Range4D;
import mekanism.api.transmitters.IBlockableConnection;
import mekanism.api.transmitters.ITransmitter;
import mekanism.api.transmitters.TransmissionType;
import mekanism.api.util.CapabilityUtils;
import mekanism.common.MekanismItems;
import mekanism.common.Tier;
import mekanism.common.Mekanism;
import mekanism.common.Tier.BaseTier;
import mekanism.common.base.ITileNetwork;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.multipart.TransmitterType.Size;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterType;
import mekanism.common.multipart.BlockStateTransmitter.TransmitterType.Size;
import mekanism.common.multipart.MultipartMekanism.AdvancedRayTraceResult;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.util.MekanismUtils;
import net.minecraft.block.Block;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.ITickable;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.text.TextComponentString;
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.capabilities.Capability;
import net.minecraftforge.common.property.ExtendedBlockState;
import net.minecraftforge.common.property.IExtendedBlockState;
import net.minecraftforge.common.property.IUnlistedProperty;
import net.minecraftforge.fml.common.FMLCommonHandler;
public abstract class PartSidedPipe extends Multipart implements INormallyOccludingPart, /*ISlotOccludingPart, ISidedHollowConnect, JIconHitEffects, INeighborTileChange,*/ ITileNetwork, IBlockableConnection, IConfigurable, ITransmitter, ITickable
import org.apache.commons.lang3.tuple.Pair;
public abstract class TileEntitySidedPipe extends TileEntity implements ITileNetwork, IBlockableConnection, IConfigurable, ITransmitter, ITickable
{
public static AxisAlignedBB[] smallSides = new AxisAlignedBB[7];
public static AxisAlignedBB[] largeSides = new AxisAlignedBB[7];
public int delayTicks;
public EnumFacing testingSide = null;
@@ -81,78 +67,6 @@ public abstract class PartSidedPipe extends Multipart implements INormallyOcclud
public ConnectionType[] connectionTypes = {ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL};
public TileEntity[] cachedAcceptors = new TileEntity[6];
static
{
smallSides[0] = new AxisAlignedBB(0.3, 0.0, 0.3, 0.7, 0.3, 0.7);
smallSides[1] = new AxisAlignedBB(0.3, 0.7, 0.3, 0.7, 1.0, 0.7);
smallSides[2] = new AxisAlignedBB(0.3, 0.3, 0.0, 0.7, 0.7, 0.3);
smallSides[3] = new AxisAlignedBB(0.3, 0.3, 0.7, 0.7, 0.7, 1.0);
smallSides[4] = new AxisAlignedBB(0.0, 0.3, 0.3, 0.3, 0.7, 0.7);
smallSides[5] = new AxisAlignedBB(0.7, 0.3, 0.3, 1.0, 0.7, 0.7);
smallSides[6] = new AxisAlignedBB(0.3, 0.3, 0.3, 0.7, 0.7, 0.7);
largeSides[0] = new AxisAlignedBB(0.25, 0.0, 0.25, 0.75, 0.25, 0.75);
largeSides[1] = new AxisAlignedBB(0.25, 0.75, 0.25, 0.75, 1.0, 0.75);
largeSides[2] = new AxisAlignedBB(0.25, 0.25, 0.0, 0.75, 0.75, 0.25);
largeSides[3] = new AxisAlignedBB(0.25, 0.25, 0.75, 0.75, 0.75, 1.0);
largeSides[4] = new AxisAlignedBB(0.0, 0.25, 0.25, 0.25, 0.75, 0.75);
largeSides[5] = new AxisAlignedBB(0.75, 0.25, 0.25, 1.0, 0.75, 0.75);
largeSides[6] = new AxisAlignedBB(0.25, 0.25, 0.25, 0.75, 0.75, 0.75);
}
public static IMultipart getPartType(TransmitterType type)
{
switch(type)
{
case UNIVERSAL_CABLE_BASIC:
return new PartUniversalCable(Tier.CableTier.BASIC);
case UNIVERSAL_CABLE_ADVANCED:
return new PartUniversalCable(Tier.CableTier.ADVANCED);
case UNIVERSAL_CABLE_ELITE:
return new PartUniversalCable(Tier.CableTier.ELITE);
case UNIVERSAL_CABLE_ULTIMATE:
return new PartUniversalCable(Tier.CableTier.ULTIMATE);
case MECHANICAL_PIPE_BASIC:
return new PartMechanicalPipe(Tier.PipeTier.BASIC);
case MECHANICAL_PIPE_ADVANCED:
return new PartMechanicalPipe(Tier.PipeTier.ADVANCED);
case MECHANICAL_PIPE_ELITE:
return new PartMechanicalPipe(Tier.PipeTier.ELITE);
case MECHANICAL_PIPE_ULTIMATE:
return new PartMechanicalPipe(Tier.PipeTier.ULTIMATE);
case PRESSURIZED_TUBE_BASIC:
return new PartPressurizedTube(Tier.TubeTier.BASIC);
case PRESSURIZED_TUBE_ADVANCED:
return new PartPressurizedTube(Tier.TubeTier.ADVANCED);
case PRESSURIZED_TUBE_ELITE:
return new PartPressurizedTube(Tier.TubeTier.ELITE);
case PRESSURIZED_TUBE_ULTIMATE:
return new PartPressurizedTube(Tier.TubeTier.ULTIMATE);
case LOGISTICAL_TRANSPORTER_BASIC:
return new PartLogisticalTransporter(Tier.TransporterTier.BASIC);
case LOGISTICAL_TRANSPORTER_ADVANCED:
return new PartLogisticalTransporter(Tier.TransporterTier.ADVANCED);
case LOGISTICAL_TRANSPORTER_ELITE:
return new PartLogisticalTransporter(Tier.TransporterTier.ELITE);
case LOGISTICAL_TRANSPORTER_ULTIMATE:
return new PartLogisticalTransporter(Tier.TransporterTier.ULTIMATE);
case RESTRICTIVE_TRANSPORTER:
return new PartRestrictiveTransporter();
case DIVERSION_TRANSPORTER:
return new PartDiversionTransporter();
case THERMODYNAMIC_CONDUCTOR_BASIC:
return new PartThermodynamicConductor(Tier.ConductorTier.BASIC);
case THERMODYNAMIC_CONDUCTOR_ADVANCED:
return new PartThermodynamicConductor(Tier.ConductorTier.ADVANCED);
case THERMODYNAMIC_CONDUCTOR_ELITE:
return new PartThermodynamicConductor(Tier.ConductorTier.ELITE);
case THERMODYNAMIC_CONDUCTOR_ULTIMATE:
return new PartThermodynamicConductor(Tier.ConductorTier.ULTIMATE);
default:
return null;
}
}
public static boolean connectionMapContainsSide(byte connections, EnumFacing side)
{
byte tester = (byte)(1 << side.ordinal());
@@ -190,12 +104,19 @@ public abstract class PartSidedPipe extends Multipart implements INormallyOcclud
if(sendDesc)
{
sendUpdatePacket();
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this)));
sendDesc = false;
}
}
}
public BaseTier getBaseTier()
{
return BaseTier.BASIC;
}
public void setBaseTier(BaseTier baseTier) {}
public boolean handlesRedstone()
{
return true;
@@ -348,12 +269,6 @@ public abstract class PartSidedPipe extends Multipart implements INormallyOcclud
return true;
}
@Override
public float getHardness(PartMOP partHit)
{
return 3.5F;
}
/*
@Override
public boolean occlusionTest(IMultipart other)
@@ -361,101 +276,48 @@ public abstract class PartSidedPipe extends Multipart implements INormallyOcclud
return NormalOcclusionTest.apply(this, other);
}
*/
@Override
public void addSelectionBoxes(List<AxisAlignedBB> list)
public List<AxisAlignedBB> getCollisionBoxes()
{
if(getContainer() != null)
List<AxisAlignedBB> list = new ArrayList<>();
for(EnumFacing side : EnumFacing.values())
{
for(EnumFacing side : EnumFacing.values())
{
int ord = side.ordinal();
byte connections = getAllCurrentConnections();
int ord = side.ordinal();
byte connections = getAllCurrentConnections();
if(connectionMapContainsSide(connections, side) || side == testingSide)
{
list.add(getTransmitterType().getSize() == Size.SMALL ? smallSides[ord] : largeSides[ord]);
}
if(connectionMapContainsSide(connections, side) || side == testingSide)
{
list.add(getTransmitterType().getSize() == Size.SMALL ? BlockTransmitter.smallSides[ord] : BlockTransmitter.largeSides[ord]);
}
}
list.add(getTransmitterType().getSize() == Size.SMALL ? smallSides[6] : largeSides[6]);
list.add(getTransmitterType().getSize() == Size.SMALL ? BlockTransmitter.smallSides[6] : BlockTransmitter.largeSides[6]);
return list;
}
public abstract TransmitterType getTransmitterType();
@Override
public void addCollisionBoxes(AxisAlignedBB mask, List<AxisAlignedBB> list, Entity collidingEntity)
public List<AxisAlignedBB> getCollisionBoxes(AxisAlignedBB mask)
{
if(getContainer() != null)
List<AxisAlignedBB> list = new ArrayList<>();
for(EnumFacing side : EnumFacing.values())
{
for(EnumFacing side : EnumFacing.values())
{
int ord = side.ordinal();
byte connections = getAllCurrentConnections();
int ord = side.ordinal();
byte connections = getAllCurrentConnections();
if(connectionMapContainsSide(connections, side) || side == testingSide)
{
AxisAlignedBB box = getTransmitterType().getSize() == Size.SMALL ? smallSides[ord] : largeSides[ord];
if(box.intersectsWith(mask)) list.add(box);
}
if(connectionMapContainsSide(connections, side) || side == testingSide)
{
AxisAlignedBB box = getTransmitterType().getSize() == Size.SMALL ? BlockTransmitter.smallSides[ord] : BlockTransmitter.largeSides[ord];
if(box.intersectsWith(mask)) list.add(box);
}
}
AxisAlignedBB box = getTransmitterType().getSize() == Size.SMALL ? smallSides[6] : largeSides[6];
AxisAlignedBB box = getTransmitterType().getSize() == Size.SMALL ? BlockTransmitter.smallSides[6] : BlockTransmitter.largeSides[6];
if(box.intersectsWith(mask)) list.add(box);
return list;
}
@Override
public void addOcclusionBoxes(List<AxisAlignedBB> list)
{
addSelectionBoxes(list);
}
/*
@Override
public EnumSet<PartSlot> getSlotMask()
{
return EnumSet.of(PartSlot.CENTER);
}
@Override
public EnumSet<PartSlot> getOccludedSlots()
{
return EnumSet.of(PartSlot.CENTER); //TODO implement properly
}
@Override
public TextureAtlasSprite getBreakingIcon(Object subPart, EnumFacing side)
{
return getCenterIcon(true);
}
@Override
public TextureAtlasSprite getBrokenIcon(EnumFacing side)
{
return getCenterIcon(true);
}
@Override
public Cuboid6 getBounds()
{
return getTransmitterType().getSize() == Size.SMALL ? smallSides[6] : largeSides[6];
}
@Override
public int getHollowSize(EnumFacing side)
{
EnumFacing direction = EnumFacing.getOrientation(side);
if(connectionMapContainsSide(getAllCurrentConnections(), direction) || direction == testingSide)
{
return getTransmitterType().getSize().centerSize+1;
}
return 0;
}
*/
public abstract boolean isValidAcceptor(TileEntity tile, EnumFacing side);
@Override
@@ -494,39 +356,45 @@ public abstract class PartSidedPipe extends Multipart implements INormallyOcclud
return false;
}
testingSide = side;
/*testingSide = side; TODO occlusion
IMultipart testPart = new OcclusionHelper.NormallyOccludingPart(getTransmitterType().getSize() == Size.SMALL ? smallSides[side.ordinal()] : largeSides[side.ordinal()]);
boolean unblocked = OcclusionHelper.occlusionTest(testPart, (part) -> part==this, getContainer().getParts());//getContainer().canReplacePart(this, this);
boolean unblocked = OcclusionHelper.occlusionTest(testPart, (part) -> part == this, getContainer().getParts());//getContainer().canReplacePart(this, this);
testingSide = null;
return unblocked;
return unblocked;*/
return true;
}
@Override
public void handlePacketData(ByteBuf dataStream) throws Exception
{
if(FMLCommonHandler.instance().getEffectiveSide().isClient())
{
currentTransmitterConnections = dataStream.readByte();
currentAcceptorConnections = dataStream.readByte();
for(int i = 0; i < 6; i++)
{
connectionTypes[i] = ConnectionType.values()[dataStream.readInt()];
}
markDirty();
MekanismUtils.updateBlock(world, pos);
}
}
@Override
public void readUpdatePacket(PacketBuffer packet)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
currentTransmitterConnections = packet.readByte();
currentAcceptorConnections = packet.readByte();
data.add(currentTransmitterConnections);
data.add(currentAcceptorConnections);
for(int i = 0; i < 6; i++)
{
connectionTypes[i] = ConnectionType.values()[packet.readInt()];
}
notifyPartUpdate();
markRenderUpdate();
}
@Override
public void writeUpdatePacket(PacketBuffer packet)
{
packet.writeByte(currentTransmitterConnections);
packet.writeByte(currentAcceptorConnections);
for(int i = 0; i < 6; i++)
{
packet.writeInt(connectionTypes[i].ordinal());
data.add(connectionTypes[i].ordinal());
}
return data;
}
@Override
@@ -556,40 +424,6 @@ public abstract class PartSidedPipe extends Multipart implements INormallyOcclud
return nbtTags;
}
@Override
public boolean onActivated(EntityPlayer player, EnumHand hand, ItemStack stack, PartMOP hit)
{
if(stack == null)
{
return false;
}
if(MekanismUtils.hasUsableWrench(player, getPos()) && player.isSneaking())
{
if(!getWorld().isRemote)
{
MultipartMekanism.dropItems(this);
getContainer().removePart(this);
}
return true;
}
return false;
}
@Override
public List<ItemStack> getDrops()
{
return Collections.singletonList(getPickBlock(null, null));
}
@Override
public ItemStack getPickBlock(EntityPlayer player, PartMOP hit)
{
return new ItemStack(MekanismItems.PartTransmitter, 1, getTransmitterType().ordinal());
}
protected void onRefresh() {}
@@ -654,43 +488,38 @@ public abstract class PartSidedPipe extends Multipart implements INormallyOcclud
public abstract void onWorldSeparate();
@Override
public void onRemoved()
public void invalidate()
{
onWorldSeparate();
super.onRemoved();
super.invalidate();
}
@Override
public void onUnloaded()
public void onChunkUnload()
{
onWorldSeparate();
super.onRemoved();
super.onChunkUnload();
}
@Override
public void onAdded()
{
onWorldJoin();
super.onAdded();
refreshConnections();
}
@Override
public void onLoaded()
public void onLoad()
{
onWorldJoin();
super.onLoaded();
super.onLoad();
}
@Override
public void onNeighborTileChange(EnumFacing side)
{
refreshConnections(side);
}
@Override
public void onNeighborBlockChange(Block block)
public void onNeighborBlockChange(EnumFacing side)
{
if(handlesRedstone())
{
@@ -707,11 +536,8 @@ public abstract class PartSidedPipe extends Multipart implements INormallyOcclud
}
}
@Override
public void onPartChanged(IMultipart part)
{
super.onPartChanged(part);
byte transmittersBefore = currentTransmitterConnections;
refreshConnections();
@@ -721,15 +547,6 @@ public abstract class PartSidedPipe extends Multipart implements INormallyOcclud
}
}
@Override
public void handlePacketData(ByteBuf dataStream) throws Exception {}
@Override
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
return data;
}
public ConnectionType getConnectionType(EnumFacing side)
{
return getConnectionType(side, getAllCurrentConnections(), currentTransmitterConnections, connectionTypes);
@@ -769,7 +586,7 @@ public abstract class PartSidedPipe extends Multipart implements INormallyOcclud
{
if(!getWorld().isRemote)
{
PartMOP hit = reTrace(getWorld(), getPos(), player);
RayTraceResult hit = reTrace(getWorld(), getPos(), player);
if(hit == null)
{
@@ -797,11 +614,10 @@ public abstract class PartSidedPipe extends Multipart implements INormallyOcclud
return EnumActionResult.SUCCESS;
}
private PartMOP reTrace(World world, BlockPos pos, EntityPlayer player)
private RayTraceResult reTrace(World world, BlockPos pos, EntityPlayer player)
{
Vec3d start = RayTraceUtils.getStart(player);
Vec3d end = RayTraceUtils.getEnd(player);
AdvancedRayTraceResultPart result = ((TileMultipartContainer)world.getTileEntity(pos)).getPartContainer().collisionRayTrace(start, end);
Pair<Vec3d, Vec3d> vecs = MultipartMekanism.getRayTraceVectors(player);
AdvancedRayTraceResult result = MultipartMekanism.collisionRayTrace(getPos(), vecs.getLeft(), vecs.getRight(), getCollisionBoxes());
return result == null ? null : result.hit;
}
@@ -810,21 +626,21 @@ public abstract class PartSidedPipe extends Multipart implements INormallyOcclud
{
List<EnumFacing> list = new ArrayList<>();
if(getContainer() != null)
for(EnumFacing side : EnumFacing.values())
{
for(EnumFacing side : EnumFacing.values())
{
int ord = side.ordinal();
byte connections = getAllCurrentConnections();
int ord = side.ordinal();
byte connections = getAllCurrentConnections();
if(connectionMapContainsSide(connections, side))
{
list.add(side);
}
if(connectionMapContainsSide(connections, side))
{
list.add(side);
}
}
if(boxIndex < list.size()) return list.get(boxIndex);
if(boxIndex < list.size())
{
return list.get(boxIndex);
}
return null;
}
@@ -854,18 +670,6 @@ public abstract class PartSidedPipe extends Multipart implements INormallyOcclud
return EnumActionResult.SUCCESS;
}
@Override
public ResourceLocation getModelPath()
{
return getType();
}
@Override
public BlockStateContainer createBlockState()
{
return new ExtendedBlockState(MCMultiPartMod.multipart, new IProperty[0], new IUnlistedProperty[] {OBJProperty.INSTANCE, ColorProperty.INSTANCE, ConnectionProperty.INSTANCE});
}
public List<String> getVisibleGroups()
{
List<String> visible = new ArrayList<>();
@@ -877,8 +681,7 @@ public abstract class PartSidedPipe extends Multipart implements INormallyOcclud
return visible;
}
@Override
public IBlockState getExtendedState(IBlockState state)
{
ConnectionProperty connectionProp = new ConnectionProperty(getAllCurrentConnections(), currentTransmitterConnections, connectionTypes, renderCenter());
@@ -886,12 +689,6 @@ public abstract class PartSidedPipe extends Multipart implements INormallyOcclud
return ((IExtendedBlockState)state).withProperty(OBJProperty.INSTANCE, new OBJState(getVisibleGroups(), true)).withProperty(ConnectionProperty.INSTANCE, connectionProp);
}
@Override
public boolean canRenderInLayer(BlockRenderLayer layer)
{
return layer == BlockRenderLayer.CUTOUT || (transparencyRender() && layer == BlockRenderLayer.TRANSLUCENT);
}
public void notifyTileChange()
{
MekanismUtils.notifyLoadedNeighborsOfTileChange(getWorld(), new Coord4D(getPos(), getWorld()));
@@ -939,9 +736,4 @@ public abstract class PartSidedPipe extends Multipart implements INormallyOcclud
return name().toLowerCase();
}
}
@Override
public boolean shouldBreakingUseExtendedState() {
return true;
}
}
@@ -17,27 +17,32 @@ import mekanism.common.Tier;
import mekanism.common.Tier.BaseTier;
import mekanism.common.Tier.ConductorTier;
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;
import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.capabilities.Capability;
public class PartThermodynamicConductor extends PartTransmitter<IHeatTransfer, HeatNetwork> implements IHeatTransfer
public class TileEntityThermodynamicConductor extends TileEntityTransmitter<IHeatTransfer, HeatNetwork> implements IHeatTransfer
{
public Tier.ConductorTier tier;
public Tier.ConductorTier tier = Tier.ConductorTier.BASIC;
public double temperature = 0;
public double clientTemperature = 0;
public double heatToAbsorb = 0;
public PartThermodynamicConductor(Tier.ConductorTier conductorTier)
@Override
public BaseTier getBaseTier()
{
super();
tier = conductorTier;
return tier.getBaseTier();
}
@Override
public void setBaseTier(BaseTier baseTier)
{
tier = Tier.ConductorTier.get(baseTier);
}
@Override
@@ -73,7 +78,7 @@ public class PartThermodynamicConductor extends PartTransmitter<IHeatTransfer, H
@Override
public TransmitterType getTransmitterType()
{
return tier.type;
return TransmitterType.THERMODYNAMIC_CONDUCTOR;
}
@Override
@@ -94,12 +99,6 @@ public class PartThermodynamicConductor extends PartTransmitter<IHeatTransfer, H
return TransmissionType.HEAT;
}
@Override
public ResourceLocation getType()
{
return new ResourceLocation("mekanism:thermodynamic_conductor_" + tier.name().toLowerCase());
}
@Override
public void readFromNBT(NBTTagCompound nbtTags)
{
@@ -138,35 +137,27 @@ public class PartThermodynamicConductor extends PartTransmitter<IHeatTransfer, H
}
@Override
public void handlePacketData(ByteBuf dataStream) throws Exception
public void handlePacketData(ByteBuf dataStream) throws Exception
{
tier = ConductorTier.values()[dataStream.readInt()];
super.handlePacketData(dataStream);
temperature = dataStream.readDouble();
}
@Override
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
data.add(tier.ordinal());
super.getNetworkedData(data);
data.add(temperature);
return data;
}
@Override
public void writeUpdatePacket(PacketBuffer packet)
{
packet.writeInt(tier.ordinal());
super.writeUpdatePacket(packet);
}
@Override
public void readUpdatePacket(PacketBuffer packet)
{
tier = ConductorTier.values()[packet.readInt()];
super.readUpdatePacket(packet);
}
public ColourRGBA getBaseColour()
{
return tier.baseColour;
@@ -20,20 +20,20 @@ import net.minecraft.util.EnumHand;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.capabilities.Capability;
public abstract class PartTransmitter<A, N extends DynamicNetwork<A, N>> extends PartSidedPipe implements IAlloyInteraction
public abstract class TileEntityTransmitter<A, N extends DynamicNetwork<A, N>> extends TileEntitySidedPipe implements IAlloyInteraction
{
public MultipartTransmitter<A, N> transmitterDelegate;
public TransmitterImpl<A, N> transmitterDelegate;
public boolean unloaded = true;
public boolean dataRequest = false;
public PartTransmitter()
public TileEntityTransmitter()
{
transmitterDelegate = new MultipartTransmitter<>(this);
transmitterDelegate = new TransmitterImpl<>(this);
}
public MultipartTransmitter<A, N> getTransmitter()
public TransmitterImpl<A, N> getTransmitter()
{
return transmitterDelegate;
}
@@ -69,14 +69,14 @@ public abstract class PartTransmitter<A, N extends DynamicNetwork<A, N>> extends
}
@Override
public void onUnloaded()
public void onChunkUnload()
{
if(!getWorld().isRemote)
{
getTransmitter().takeShare();
}
super.onUnloaded();
super.onChunkUnload();
}
@Override
@@ -158,9 +158,9 @@ public abstract class PartTransmitter<A, N extends DynamicNetwork<A, N>> extends
for(Object iter : array)
{
if(iter instanceof MultipartTransmitter)
if(iter instanceof TransmitterImpl)
{
PartTransmitter t = ((MultipartTransmitter)iter).containingPart;
TileEntityTransmitter t = ((TransmitterImpl)iter).containingTile;
if(t.upgrade(tierOrdinal))
{
@@ -3,7 +3,9 @@ package mekanism.common.multipart;
import ic2.api.energy.EnergyNet;
import ic2.api.energy.tile.IEnergySource;
import ic2.api.energy.tile.IEnergyTile;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -19,15 +21,14 @@ import mekanism.common.Tier.BaseTier;
import mekanism.common.Tier.CableTier;
import mekanism.common.base.EnergyAcceptorWrapper;
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;
import net.darkhax.tesla.api.ITeslaProducer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fml.common.Optional.Interface;
import net.minecraftforge.fml.common.Optional.InterfaceList;
@@ -38,7 +39,7 @@ import cofh.api.energy.IEnergyReceiver;
@InterfaceList({
@Interface(iface = "net.darkhax.tesla.api.ITeslaConsumer", modid = "tesla")
})
public class PartUniversalCable extends PartTransmitter<EnergyAcceptorWrapper, EnergyNetwork> implements IStrictEnergyAcceptor, IEnergyReceiver, IEnergyProvider, ITeslaConsumer
public class TileEntityUniversalCable extends TileEntityTransmitter<EnergyAcceptorWrapper, EnergyNetwork> implements IStrictEnergyAcceptor, IEnergyReceiver, IEnergyProvider, ITeslaConsumer
{
public Tier.CableTier tier;
@@ -46,11 +47,17 @@ public class PartUniversalCable extends PartTransmitter<EnergyAcceptorWrapper, E
public double lastWrite = 0;
public EnergyStack buffer = new EnergyStack(0);
public PartUniversalCable(Tier.CableTier cableTier)
@Override
public BaseTier getBaseTier()
{
super();
tier = cableTier;
return tier.getBaseTier();
}
@Override
public void setBaseTier(BaseTier baseTier)
{
tier = Tier.CableTier.get(baseTier);
}
@Override
@@ -173,7 +180,7 @@ public class PartUniversalCable extends PartTransmitter<EnergyAcceptorWrapper, E
@Override
public TransmitterType getTransmitterType()
{
return tier.type;
return TransmitterType.UNIVERSAL_CABLE;
}
@Override
@@ -198,12 +205,6 @@ public class PartUniversalCable extends PartTransmitter<EnergyAcceptorWrapper, E
return nbtTags;
}
@Override
public ResourceLocation getType()
{
return new ResourceLocation("mekanism:universal_cable_" + tier.name().toLowerCase());
}
@Override
public TransmissionType getTransmissionType()
{
@@ -384,19 +385,21 @@ public class PartUniversalCable extends PartTransmitter<EnergyAcceptorWrapper, E
}
@Override
public void readUpdatePacket(PacketBuffer packet)
public void handlePacketData(ByteBuf dataStream) throws Exception
{
tier = CableTier.values()[packet.readInt()];
tier = CableTier.values()[dataStream.readInt()];
super.readUpdatePacket(packet);
super.handlePacketData(dataStream);
}
@Override
public void writeUpdatePacket(PacketBuffer packet)
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
packet.writeInt(tier.ordinal());
data.add(tier.ordinal());
super.writeUpdatePacket(packet);
super.getNetworkedData(data);
return data;
}
@Override
@@ -0,0 +1,156 @@
package mekanism.common.multipart;
import java.util.Collection;
import mekanism.api.Coord4D;
import mekanism.api.transmitters.DynamicNetwork;
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 net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
public class TransmitterImpl<A, N extends DynamicNetwork<A,N>> extends Transmitter<A, N>
{
public TileEntityTransmitter<A, N> containingTile;
public TransmitterImpl(TileEntityTransmitter<A, N> multiPart)
{
setTileEntity(multiPart);
}
@Override
public int getCapacity()
{
return getTileEntity().getCapacity();
}
@Override
public World world()
{
return getTileEntity().getWorld();
}
@Override
public Coord4D coord()
{
return new Coord4D(getTileEntity().getPos(), getTileEntity().getWorld());
}
@Override
public Coord4D getAdjacentConnectableTransmitterCoord(EnumFacing side)
{
Coord4D sideCoord = coord().offset(side);
TileEntity potentialTransmitterTile = sideCoord.getTileEntity(world());
if(!containingTile.canConnectMutual(side))
{
return null;
}
if(CapabilityUtils.hasCapability(potentialTransmitterTile, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite()))
{
IGridTransmitter transmitter = CapabilityUtils.getCapability(potentialTransmitterTile, Capabilities.GRID_TRANSMITTER_CAPABILITY, side.getOpposite());
if(TransmissionType.checkTransmissionType(transmitter, getTransmissionType()) && containingTile.isValidTransmitter(potentialTransmitterTile))
{
return sideCoord;
}
}
return null;
}
@Override
public A getAcceptor(EnumFacing side)
{
return getTileEntity().getCachedAcceptor(side);
}
@Override
public boolean isValid()
{
TileEntity cont = getTileEntity();
if(cont == null)
{
return false;
}
return !cont.isInvalid() && coord().exists(world());
}
@Override
public N createEmptyNetwork()
{
return getTileEntity().createNewNetwork();
}
@Override
public N getExternalNetwork(Coord4D from)
{
TileEntity tile = from.getTileEntity(world());
if(CapabilityUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, null))
{
IGridTransmitter transmitter = CapabilityUtils.getCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, null);
if(TransmissionType.checkTransmissionType(transmitter, getTransmissionType()));
{
return ((IGridTransmitter<A, N>)transmitter).getTransmitterNetwork();
}
}
return null;
}
@Override
public void takeShare()
{
containingTile.takeShare();
}
@Override
public void updateShare()
{
containingTile.updateShare();
}
@Override
public Object getBuffer()
{
return getTileEntity().getBuffer();
}
@Override
public N mergeNetworks(Collection<N> toMerge)
{
return getTileEntity().createNetworkByMerging(toMerge);
}
@Override
public TransmissionType getTransmissionType()
{
return getTileEntity().getTransmissionType();
}
@Override
public void setRequestsUpdate()
{
containingTile.sendDesc = true;
}
public TileEntityTransmitter<A, N> getTileEntity()
{
return containingTile;
}
public void setTileEntity(TileEntityTransmitter<A, N> containingPart)
{
this.containingTile = containingPart;
}
}
@@ -1,85 +0,0 @@
package mekanism.common.multipart;
import mekanism.api.transmitters.TransmissionType;
import mekanism.common.Tier.BaseTier;
public enum TransmitterType
{
UNIVERSAL_CABLE_BASIC("BasicUniversalCable", BaseTier.BASIC, Size.SMALL, TransmissionType.ENERGY, false, 0, 0),
UNIVERSAL_CABLE_ADVANCED("AdvancedUniversalCable", BaseTier.ADVANCED, Size.SMALL, TransmissionType.ENERGY, false, 1, 1),
UNIVERSAL_CABLE_ELITE("EliteUniversalCable", BaseTier.ELITE, Size.SMALL, TransmissionType.ENERGY, false, 2, 2),
UNIVERSAL_CABLE_ULTIMATE("UltimateUniversalCable", BaseTier.ULTIMATE, Size.SMALL, TransmissionType.ENERGY, false, 3, 3),
MECHANICAL_PIPE_BASIC("BasicMechanicalPipe", BaseTier.BASIC, Size.LARGE, TransmissionType.FLUID, false, 0, 0),
MECHANICAL_PIPE_ADVANCED("AdvancedMechanicalPipe", BaseTier.ADVANCED, Size.LARGE, TransmissionType.FLUID, false, 1, 1),
MECHANICAL_PIPE_ELITE("EliteMechanicalPipe", BaseTier.ELITE, Size.LARGE, TransmissionType.FLUID, false, 2, 2),
MECHANICAL_PIPE_ULTIMATE("UltimateMechanicalPipe", BaseTier.ULTIMATE, Size.LARGE, TransmissionType.FLUID, false, 3, 3),
PRESSURIZED_TUBE_BASIC("BasicPressurizedTube", BaseTier.BASIC, Size.SMALL, TransmissionType.GAS, false, 0, 0),
PRESSURIZED_TUBE_ADVANCED("AdvancedPressurizedTube", BaseTier.ADVANCED, Size.SMALL, TransmissionType.GAS, false, 1, 1),
PRESSURIZED_TUBE_ELITE("ElitePressurizedTube", BaseTier.ELITE, Size.SMALL, TransmissionType.GAS, false, 2, 2),
PRESSURIZED_TUBE_ULTIMATE("UltimatePressurizedTube", BaseTier.ULTIMATE, Size.SMALL, TransmissionType.GAS, false, 3, 3),
LOGISTICAL_TRANSPORTER_BASIC("BasicLogisticalTransporter", BaseTier.BASIC, Size.LARGE, TransmissionType.ITEM, true, 0, 0, 6, 10),
LOGISTICAL_TRANSPORTER_ADVANCED("AdvancedLogisticalTransporter", BaseTier.ADVANCED, Size.LARGE, TransmissionType.ITEM, true, 1, 1, 6, 10),
LOGISTICAL_TRANSPORTER_ELITE("EliteLogisticalTransporter", BaseTier.ELITE, Size.LARGE, TransmissionType.ITEM, true, 2, 2, 6, 10),
LOGISTICAL_TRANSPORTER_ULTIMATE("UltimateLogisticalTransporter", BaseTier.ULTIMATE, Size.LARGE, TransmissionType.ITEM, true, 3, 3, 6, 10),
RESTRICTIVE_TRANSPORTER("RestrictiveTransporter", BaseTier.BASIC, Size.LARGE, TransmissionType.ITEM, false, 4, 8),
DIVERSION_TRANSPORTER("DiversionTransporter", BaseTier.BASIC, Size.LARGE, TransmissionType.ITEM, true, 5, 14, 6, 10),
THERMODYNAMIC_CONDUCTOR_BASIC("BasicThermodynamicConductor", BaseTier.BASIC, Size.SMALL, TransmissionType.HEAT, false, 0, 0),
THERMODYNAMIC_CONDUCTOR_ADVANCED("AdvancedThermodynamicConductor", BaseTier.ADVANCED, Size.SMALL, TransmissionType.HEAT, false, 1, 1),
THERMODYNAMIC_CONDUCTOR_ELITE("EliteThermodynamicConductor", BaseTier.ELITE, Size.SMALL, TransmissionType.HEAT, false, 2, 2),
THERMODYNAMIC_CONDUCTOR_ULTIMATE("UltimateThermodynamicConductor", BaseTier.ULTIMATE, Size.SMALL, TransmissionType.HEAT, false, 3, 3);
private String unlocalizedName;
private Size size;
private TransmissionType transmissionType;
private boolean transparencyRender;
private int[] indexes;
private BaseTier tier;
private TransmitterType(String name, BaseTier t, Size s, TransmissionType type, boolean transparency, int... is)
{
unlocalizedName = name;
tier = t;
size = s;
transmissionType = type;
transparencyRender = transparency;
indexes = is;
}
public BaseTier getTier()
{
return tier;
}
public String getName()
{
return unlocalizedName;
}
public Size getSize()
{
return size;
}
public boolean hasTransparency()
{
return transparencyRender;
}
public TransmissionType getTransmission()
{
return transmissionType;
}
public static enum Size
{
SMALL(6),
LARGE(8);
public int centerSize;
private Size(int size)
{
centerSize = size;
}
}
}
@@ -15,7 +15,7 @@ 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.PartSidedPipe.ConnectionType;
import mekanism.common.multipart.TileEntitySidedPipe.ConnectionType;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.tile.TileEntityLogisticalSorter;
import mekanism.common.util.InventoryUtils;
@@ -26,7 +26,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
public class MultipartTransporter extends MultipartTransmitter<IInventory, InventoryNetwork> implements ILogisticalTransporter
public class TransporterImpl extends TransmitterImpl<IInventory, InventoryNetwork> implements ILogisticalTransporter
{
public HashList<TransporterStack> transit = new HashList<>();
@@ -34,7 +34,7 @@ public class MultipartTransporter extends MultipartTransmitter<IInventory, Inven
public Set<TransporterStack> needsSync = new HashSet<>();
public MultipartTransporter(PartLogisticalTransporter multiPart)
public TransporterImpl(TileEntityLogisticalTransporter multiPart)
{
super(multiPart);
}
@@ -47,7 +47,7 @@ public class MultipartTransporter extends MultipartTransmitter<IInventory, Inven
{
if(stack != null)
{
stack.progress = Math.min(100, stack.progress+getPart().tier.speed);
stack.progress = Math.min(100, stack.progress+getTileEntity().tier.speed);
}
}
}
@@ -59,7 +59,7 @@ public class MultipartTransporter extends MultipartTransmitter<IInventory, Inven
Set<TransporterStack> remove = new HashSet<TransporterStack>();
getPart().pullItems();
getTileEntity().pullItems();
for(TransporterStack stack : transit)
{
@@ -72,7 +72,7 @@ public class MultipartTransporter extends MultipartTransmitter<IInventory, Inven
}
}
stack.progress += getPart().tier.speed;
stack.progress += getTileEntity().tier.speed;
if(stack.progress > 100)
{
@@ -202,16 +202,16 @@ public class MultipartTransporter extends MultipartTransmitter<IInventory, Inven
for(TransporterStack stack : remove)
{
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord(), getPart().getSyncPacket(stack, true)), new Range4D(coord()));
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord(), getTileEntity().getSyncPacket(stack, true)), new Range4D(coord()));
transit.remove(stack);
MekanismUtils.saveChunk(getPart());
MekanismUtils.saveChunk(getTileEntity());
}
for(TransporterStack stack : needsSync)
{
if(transit.contains(stack))
{
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord(), getPart().getSyncPacket(stack, false)), new Range4D(coord()));
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord(), getTileEntity().getSyncPacket(stack, false)), new Range4D(coord()));
}
}
@@ -223,7 +223,7 @@ public class MultipartTransporter extends MultipartTransmitter<IInventory, Inven
{
EnumFacing side = stack.getSide(this);
return getPart().getConnectionType(side) == ConnectionType.NORMAL || getPart().getConnectionType(side) == ConnectionType.PUSH;
return getTileEntity().getConnectionType(side) == ConnectionType.NORMAL || getTileEntity().getConnectionType(side) == ConnectionType.PUSH;
}
private boolean recalculate(TransporterStack stack, Coord4D from)
@@ -287,8 +287,8 @@ public class MultipartTransporter extends MultipartTransmitter<IInventory, Inven
if(doEmit)
{
transit.add(stack);
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord(), getPart().getSyncPacket(stack, false)), new Range4D(coord()));
MekanismUtils.saveChunk(getPart());
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord(), getTileEntity().getSyncPacket(stack, false)), new Range4D(coord()));
MekanismUtils.saveChunk(getTileEntity());
}
return rejected;
@@ -322,8 +322,8 @@ public class MultipartTransporter extends MultipartTransmitter<IInventory, Inven
if(doEmit)
{
transit.add(stack);
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord(), getPart().getSyncPacket(stack, false)), new Range4D(coord()));
MekanismUtils.saveChunk(getPart());
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord(), getTileEntity().getSyncPacket(stack, false)), new Range4D(coord()));
MekanismUtils.saveChunk(getTileEntity());
}
return rejected;
@@ -337,8 +337,8 @@ public class MultipartTransporter extends MultipartTransmitter<IInventory, Inven
{
stack.progress = progress;
transit.add(stack);
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord(), getPart().getSyncPacket(stack, false)), new Range4D(coord()));
MekanismUtils.saveChunk(getPart());
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord(), getTileEntity().getSyncPacket(stack, false)), new Range4D(coord()));
MekanismUtils.saveChunk(getTileEntity());
}
@Override
@@ -356,46 +356,46 @@ public class MultipartTransporter extends MultipartTransmitter<IInventory, Inven
@Override
public boolean canEmitTo(TileEntity tileEntity, EnumFacing side)
{
if(!getPart().canConnect(side))
if(!getTileEntity().canConnect(side))
{
return false;
}
return getPart().getConnectionType(side) == ConnectionType.NORMAL || getPart().getConnectionType(side) == ConnectionType.PUSH;
return getTileEntity().getConnectionType(side) == ConnectionType.NORMAL || getTileEntity().getConnectionType(side) == ConnectionType.PUSH;
}
@Override
public boolean canReceiveFrom(TileEntity tileEntity, EnumFacing side)
{
if(!getPart().canConnect(side))
if(!getTileEntity().canConnect(side))
{
return false;
}
return getPart().getConnectionType(side) == ConnectionType.NORMAL;
return getTileEntity().getConnectionType(side) == ConnectionType.NORMAL;
}
@Override
public double getCost()
{
return getPart().getCost();
return getTileEntity().getCost();
}
@Override
public boolean canConnectMutual(EnumFacing side)
{
return getPart().canConnectMutual(side);
return getTileEntity().canConnectMutual(side);
}
@Override
public boolean canConnect(EnumFacing side)
{
return getPart().canConnect(side);
return getTileEntity().canConnect(side);
}
@Override
public PartLogisticalTransporter getPart()
public TileEntityLogisticalTransporter getTileEntity()
{
return (PartLogisticalTransporter)containingPart;
return (TileEntityLogisticalTransporter)containingTile;
}
}
@@ -13,7 +13,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import mcmultipart.multipart.Multipart;
import mekanism.api.Chunk3D;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
@@ -53,6 +52,8 @@ 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.network.PacketPersonalChest.PersonalChestMessage;
import mekanism.common.network.PacketPersonalChest.PersonalChestPacketType;
import mekanism.common.tile.TileEntityAdvancedBoundingBlock;
@@ -91,7 +92,6 @@ 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;
/**
@@ -351,6 +351,15 @@ public final class MekanismUtils
return stack;
}
public static ItemStack getTransmitter(TransmitterType type, BaseTier tier, int amount)
{
ItemStack stack = new ItemStack(MekanismBlocks.Transmitter, amount, type.ordinal());
ItemBlockTransmitter itemTransmitter = (ItemBlockTransmitter)stack.getItem();
itemTransmitter.setBaseTier(stack, tier);
return stack;
}
/**
* Retrieves a Factory with a defined tier and recipe type.
@@ -786,7 +795,7 @@ public final class MekanismUtils
{
if(!(world.getTileEntity(pos) instanceof IActiveState) || ((IActiveState)world.getTileEntity(pos)).renderUpdate())
{
world.markBlockRangeForRenderUpdate(pos, pos.add(1, 1, 1));
world.markBlockRangeForRenderUpdate(pos, pos);
}
if(!(world.getTileEntity(pos) instanceof IActiveState) || ((IActiveState)world.getTileEntity(pos)).lightUpdate() && client.machineEffects)
@@ -989,16 +998,6 @@ public final class MekanismUtils
tileEntity.getWorld().markChunkDirty(tileEntity.getPos(), tileEntity);
}
public static void saveChunk(Multipart multipart)
{
if(multipart == null || multipart.getWorld() == null)
{
return;
}
multipart.getWorld().markChunkDirty(multipart.getPos(), null);
}
/**
* Whether or not a certain TileEntity can function with redstone logic. Illogical to use unless the defined TileEntity implements