Removed unused mtl and obj commands, got heat network (and conductors) working with capabilities

This commit is contained in:
aidancbrady committed 2016-05-24 18:47:43 -04:00
1 parent 3bd0ff271c
commit fa46db4ce6
19 files changed
+179 -232

No files matched your search

@@ -7,6 +7,8 @@ import mekanism.api.IHeatTransfer;
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.MultipartTransmitter;
import mekanism.common.util.MekanismUtils;
import net.minecraftforge.fml.common.FMLCommonHandler;
@@ -77,26 +79,22 @@ public class HeatNetwork extends DynamicNetwork<IHeatTransfer, HeatNetwork>
{
for(IGridTransmitter<IHeatTransfer, HeatNetwork> transmitter : transmitters)
{
/*
if(transmitter instanceof MultipartTransmitter && ((MultipartTransmitter)transmitter).getPart() instanceof IHeatTransfer)
if(transmitter instanceof MultipartTransmitter && ((MultipartTransmitter)transmitter).getPart().hasCapability(Capabilities.HEAT_TRANSFER_CAPABILITY, null))
{
IHeatTransfer heatTransmitter = (IHeatTransfer)((MultipartTransmitter)transmitter).getPart();
IHeatTransfer heatTransmitter = (IHeatTransfer)((MultipartTransmitter)transmitter).getPart().getCapability(Capabilities.HEAT_TRANSFER_CAPABILITY, null);
double[] d = heatTransmitter.simulateHeat();
newHeatTransferred += d[0];
newHeatLost += d[1];
}
*/
}
for(IGridTransmitter<IHeatTransfer, HeatNetwork> transmitter : transmitters)
{
/*
if(transmitter instanceof MultipartTransmitter && ((MultipartTransmitter)transmitter).getPart() instanceof IHeatTransfer)
if(transmitter instanceof MultipartTransmitter && ((MultipartTransmitter)transmitter).getPart().hasCapability(Capabilities.HEAT_TRANSFER_CAPABILITY, null))
{
IHeatTransfer heatTransmitter = (IHeatTransfer)((MultipartTransmitter)transmitter).getPart();
IHeatTransfer heatTransmitter = (IHeatTransfer)((MultipartTransmitter)transmitter).getPart().getCapability(Capabilities.HEAT_TRANSFER_CAPABILITY, null);
newSumTemp += heatTransmitter.applyTemperatureChange();
}
*/
}
}
+1 -1
View File
@@ -1308,7 +1308,7 @@ public class Mekanism
MekanismBlocks.register();
//Set up multiparts
MinecraftForge.EVENT_BUS.register(new MultipartMekanism());
new MultipartMekanism();
Mekanism.proxy.preInit();
@@ -52,24 +52,29 @@ public class ItemNetworkReader extends ItemEnergized
player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Buffer: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkBuffer()));
player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Throughput: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkFlow()));
player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Capacity: " + EnumColor.DARK_GREY + transmitter.getTransmitterNetworkCapacity()));
if(transmitter instanceof IHeatTransfer)
player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Temperature: " + EnumColor.DARK_GREY + ((IHeatTransfer)transmitter).getTemp() + "K above ambient"));
if(MekanismUtils.hasCapability(tileEntity, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite()))
{
IHeatTransfer transfer = MekanismUtils.getCapability(tileEntity, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite());
player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Temperature: " + EnumColor.DARK_GREY + transfer.getTemp() + "K above ambient"));
}
player.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------"));
return true;
}
else if(tileEntity instanceof IHeatTransfer)
else if(MekanismUtils.hasCapability(tileEntity, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite()))
{
if(drain) setEnergy(stack, getEnergy(stack)-ENERGY_PER_USE);
IHeatTransfer transfer = MekanismUtils.getCapability(tileEntity, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite());
player.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------"));
player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Temperature: " + EnumColor.DARK_GREY + ((IHeatTransfer)tileEntity).getTemp() + "K above ambient"));
player.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Temperature: " + EnumColor.DARK_GREY + transfer.getTemp() + "K above ambient"));
player.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------"));
return true;
}
else
{
else {
if(drain) setEnergy(stack, getEnergy(stack)-ENERGY_PER_USE);
Set<DynamicNetwork> iteratedNetworks = new HashSet<>();
@@ -1,73 +0,0 @@
package mekanism.common.multipart;
import java.util.List;
import mcmultipart.client.multipart.ISmartMultipartModel;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.resources.model.IBakedModel;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.client.model.ISmartBlockModel;
/**
* Created by ben on 21/05/16.
*/
public class BlockToMultipartModel implements ISmartMultipartModel
{
ISmartBlockModel parent;
public BlockToMultipartModel(ISmartBlockModel model)
{
parent = model;
}
@Override
public IBakedModel handlePartState(IBlockState state)
{
return parent.handleBlockState(state);
}
@Override
public List<BakedQuad> getFaceQuads(EnumFacing facing)
{
return parent.getFaceQuads(facing);
}
@Override
public List<BakedQuad> getGeneralQuads()
{
return parent.getGeneralQuads();
}
@Override
public boolean isAmbientOcclusion()
{
return parent.isAmbientOcclusion();
}
@Override
public boolean isGui3d()
{
return parent.isGui3d();
}
@Override
public boolean isBuiltInRenderer()
{
return parent.isBuiltInRenderer();
}
@Override
public TextureAtlasSprite getParticleTexture()
{
return parent.getParticleTexture();
}
@Override
public ItemCameraTransforms getItemCameraTransforms()
{
return parent.getItemCameraTransforms();
}
}
@@ -11,9 +11,7 @@ import mekanism.common.Tier;
import mekanism.common.block.states.BlockStateMachine.MachineType;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.event.ModelBakeEvent;
import net.minecraftforge.fml.common.event.FMLInterModComms;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
public class MultipartMekanism implements IPartFactory
{
@@ -192,33 +190,4 @@ public class MultipartMekanism implements IPartFactory
dropItem(stack, multipart);
}
}
@SubscribeEvent
public void onModelBake(ModelBakeEvent event)
{
/*String[] names = new String[] {
"mekanism:universal_cable_basic", "mekanism:universal_cable_advanced",
"mekanism:universal_cable_elite", "mekanism:universal_cable_ultimate",
"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"};
for(String s : names)
{
ModelResourceLocation mrl = new ModelResourceLocation(s, "multipart");
IBakedModel model = event.modelRegistry.getObject(mrl);
if(model instanceof ISmartBlockModel)
{
System.out.println(model.getClass());
event.modelRegistry.putObject(mrl, new BlockToMultipartModel((ISmartBlockModel)model));
}
}*/
}
}
@@ -1,21 +1,29 @@
package mekanism.common.multipart;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.Collection;
import mekanism.api.Coord4D;
import mekanism.api.IHeatTransfer;
import mekanism.api.Range4D;
import mekanism.api.transmitters.TransmissionType;
import mekanism.common.ColourRGBA;
import mekanism.common.HeatNetwork;
import mekanism.common.Mekanism;
import mekanism.common.Tier;
import mekanism.common.Tier.BaseTier;
import mekanism.common.Tier.ConductorTier;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.util.HeatUtils;
import mekanism.common.util.MekanismUtils;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.PacketBuffer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.Capability;
public class PartThermodynamicConductor extends PartTransmitter<IHeatTransfer, HeatNetwork> implements IHeatTransfer
{
@@ -24,8 +32,6 @@ public class PartThermodynamicConductor extends PartTransmitter<IHeatTransfer, H
public double temperature = 0;
public double clientTemperature = 0;
public double heatToAbsorb = 0;
public boolean renderUpdate;
public PartThermodynamicConductor(Tier.ConductorTier conductorTier)
{
@@ -72,7 +78,13 @@ public class PartThermodynamicConductor extends PartTransmitter<IHeatTransfer, H
@Override
public boolean isValidAcceptor(TileEntity tile, EnumFacing side)
{
return tile instanceof IHeatTransfer && ((IHeatTransfer)tile).canConnectHeat(side.getOpposite());
if(MekanismUtils.hasCapability(tile, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite()))
{
IHeatTransfer transfer = MekanismUtils.getCapability(tile, Capabilities.HEAT_TRANSFER_CAPABILITY, side.getOpposite());
return transfer.canConnectHeat(side.getOpposite());
}
return false;
}
@Override
@@ -105,41 +117,38 @@ public class PartThermodynamicConductor extends PartTransmitter<IHeatTransfer, H
public void sendTemp()
{
renderUpdate = true;
sendUpdatePacket();
Coord4D coord = new Coord4D(getPos(), getWorld());
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(coord, getNetworkedData(new ArrayList())), new Range4D(coord));
}
@Override
public void handlePacketData(ByteBuf dataStream) throws Exception
{
temperature = dataStream.readDouble();
}
@Override
public ArrayList<Object> getNetworkedData(ArrayList<Object> data)
{
data.add(temperature);
return data;
}
@Override
public void writeUpdatePacket(PacketBuffer packet)
{
if(renderUpdate)
{
packet.writeBoolean(true);
packet.writeDouble(temperature);
renderUpdate = false;
}
else {
packet.writeBoolean(false);
super.writeUpdatePacket(packet);
packet.writeInt(tier.ordinal());
}
packet.writeInt(tier.ordinal());
super.writeUpdatePacket(packet);
}
@Override
public void readUpdatePacket(PacketBuffer packet)
{
if(packet.readBoolean())
{
temperature = packet.readDouble();
}
else {
super.readUpdatePacket(packet);
tier = ConductorTier.values()[packet.readInt()];
}
tier = ConductorTier.values()[packet.readInt()];
super.readUpdatePacket(packet);
}
public ColourRGBA getBaseColour()
@@ -214,6 +223,23 @@ public class PartThermodynamicConductor extends PartTransmitter<IHeatTransfer, H
return null;
}
@Override
public boolean hasCapability(Capability<?> capability, EnumFacing side)
{
return capability == Capabilities.HEAT_TRANSFER_CAPABILITY || super.hasCapability(capability, side);
}
@Override
public <T> T getCapability(Capability<T> capability, EnumFacing side)
{
if(capability == Capabilities.HEAT_TRANSFER_CAPABILITY)
{
return (T)this;
}
return super.getCapability(capability, side);
}
@Override
public boolean upgrade(int tierOrdinal)
{
@@ -10,6 +10,7 @@ import mekanism.common.base.ITileNetwork;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.util.MekanismUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.server.MinecraftServer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
@@ -23,7 +24,14 @@ public class PacketTileEntity implements IMessageHandler<TileEntityMessage, IMes
@Override
public IMessage onMessage(TileEntityMessage message, MessageContext context)
{
TileEntity tileEntity = message.coord4D.getTileEntity(PacketHandler.getPlayer(context).worldObj);
EntityPlayer player = PacketHandler.getPlayer(context);
if(player == null)
{
return null;
}
TileEntity tileEntity = message.coord4D.getTileEntity(player.worldObj);
if(MekanismUtils.hasCapability(tileEntity, Capabilities.TILE_NETWORK_CAPABILITY, null))
{
@@ -11,6 +11,7 @@ import mekanism.api.IHeatTransfer;
import mekanism.api.Range4D;
import mekanism.common.Mekanism;
import mekanism.common.PacketHandler;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.content.boiler.BoilerCache;
import mekanism.common.content.boiler.BoilerUpdateProtocol;
import mekanism.common.content.boiler.SynchronizedBoilerData;
@@ -22,6 +23,7 @@ import mekanism.common.util.MekanismUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.common.FMLCommonHandler;
@@ -407,6 +409,23 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock<SynchronizedBoi
return null;
}
@Override
public boolean hasCapability(Capability<?> capability, EnumFacing side)
{
return capability == Capabilities.HEAT_TRANSFER_CAPABILITY || super.hasCapability(capability, side);
}
@Override
public <T> T getCapability(Capability<T> capability, EnumFacing side)
{
if(capability == Capabilities.HEAT_TRANSFER_CAPABILITY)
{
return (T)this;
}
return super.getCapability(capability, side);
}
@Override
public String getName()
{
@@ -21,6 +21,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityFurnace;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fml.common.FMLCommonHandler;
public class TileEntityFuelwoodHeater extends TileEntityContainerBlock implements IHeatTransfer, ISecurityTile, IActiveState
@@ -278,6 +279,23 @@ public class TileEntityFuelwoodHeater extends TileEntityContainerBlock implement
return null;
}
@Override
public boolean hasCapability(Capability<?> capability, EnumFacing side)
{
return capability == Capabilities.HEAT_TRANSFER_CAPABILITY || super.hasCapability(capability, side);
}
@Override
public <T> T getCapability(Capability<T> capability, EnumFacing side)
{
if(capability == Capabilities.HEAT_TRANSFER_CAPABILITY)
{
return (T)this;
}
return super.getCapability(capability, side);
}
@Override
public TileComponentSecurity getSecurity()
{
@@ -661,13 +661,14 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp
public boolean hasCapability(Capability<?> capability, EnumFacing side)
{
return capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY
|| super.hasCapability(capability, side);
|| capability == Capabilities.HEAT_TRANSFER_CAPABILITY || super.hasCapability(capability, side);
}
@Override
public <T> T getCapability(Capability<T> capability, EnumFacing side)
{
if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY)
if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY
|| capability == Capabilities.HEAT_TRANSFER_CAPABILITY)
{
return (T)this;
}
@@ -24,6 +24,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fml.common.FMLCommonHandler;
public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock implements IHeatTransfer, IComputerIntegration, IRedstoneControl, ISecurityTile
@@ -270,6 +271,23 @@ public class TileEntityResistiveHeater extends TileEntityNoisyElectricBlock impl
return null;
}
@Override
public boolean hasCapability(Capability<?> capability, EnumFacing side)
{
return capability == Capabilities.HEAT_TRANSFER_CAPABILITY || super.hasCapability(capability, side);
}
@Override
public <T> T getCapability(Capability<T> capability, EnumFacing side)
{
if(capability == Capabilities.HEAT_TRANSFER_CAPABILITY)
{
return (T)this;
}
return super.getCapability(capability, side);
}
@Override
public void setActive(boolean active)
{
@@ -2,8 +2,10 @@ package mekanism.common.tile;
import mekanism.api.Coord4D;
import mekanism.api.IHeatTransfer;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.util.PipeUtils;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
@@ -149,4 +151,21 @@ public class TileEntityThermalEvaporationValve extends TileEntityThermalEvaporat
{
return null;
}
@Override
public boolean hasCapability(Capability<?> capability, EnumFacing side)
{
return capability == Capabilities.HEAT_TRANSFER_CAPABILITY || super.hasCapability(capability, side);
}
@Override
public <T> T getCapability(Capability<T> capability, EnumFacing side)
{
if(capability == Capabilities.HEAT_TRANSFER_CAPABILITY)
{
return (T)this;
}
return super.getCapability(capability, side);
}
}
@@ -24,6 +24,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityFurnace;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
@@ -467,4 +468,21 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu
return null;
}
@Override
public boolean hasCapability(Capability<?> capability, EnumFacing side)
{
return capability == Capabilities.HEAT_TRANSFER_CAPABILITY || super.hasCapability(capability, side);
}
@Override
public <T> T getCapability(Capability<T> capability, EnumFacing side)
{
if(capability == Capabilities.HEAT_TRANSFER_CAPABILITY)
{
return (T)this;
}
return super.getCapability(capability, side);
}
}
@@ -168,13 +168,14 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl
public boolean hasCapability(Capability<?> capability, EnumFacing side)
{
return capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY
|| super.hasCapability(capability, side);
|| capability == Capabilities.HEAT_TRANSFER_CAPABILITY || super.hasCapability(capability, side);
}
@Override
public <T> T getCapability(Capability<T> capability, EnumFacing side)
{
if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY)
if(capability == Capabilities.GAS_HANDLER_CAPABILITY || capability == Capabilities.TUBE_CONNECTION_CAPABILITY
|| capability == Capabilities.HEAT_TRANSFER_CAPABILITY)
{
return (T)this;
}