Merge branch '1.8.9' of github.com:aidancbrady/Mekanism into 1.8.9

This commit is contained in:
Ben Spiers committed 2016-05-23 01:20:36 +01:00
commit 55fe80e87e
33 files changed
+200 -54

No files matched your search

@@ -129,9 +129,11 @@ import mekanism.common.item.ItemPortableTeleporter;
import mekanism.common.item.ItemSeismicReader;
import mekanism.common.item.ItemWalkieTalkie;
import mekanism.common.multiblock.MultiblockManager;
import mekanism.common.multipart.PartDiversionTransporter;
import mekanism.common.multipart.PartLogisticalTransporter;
import mekanism.common.multipart.PartMechanicalPipe;
import mekanism.common.multipart.PartPressurizedTube;
import mekanism.common.multipart.PartRestrictiveTransporter;
import mekanism.common.multipart.PartThermodynamicConductor;
import mekanism.common.multipart.PartUniversalCable;
import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage;
@@ -330,6 +332,8 @@ public class ClientProxy extends CommonProxy
MultipartRegistryClient.bindMultipartSpecialRenderer(PartUniversalCable.class, new RenderUniversalCable());
MultipartRegistryClient.bindMultipartSpecialRenderer(PartThermodynamicConductor.class, new RenderThermodynamicConductor());
MultipartRegistryClient.bindMultipartSpecialRenderer(PartLogisticalTransporter.class, new RenderLogisticalTransporter());
MultipartRegistryClient.bindMultipartSpecialRenderer(PartDiversionTransporter.class, new RenderLogisticalTransporter());
MultipartRegistryClient.bindMultipartSpecialRenderer(PartRestrictiveTransporter.class, new RenderLogisticalTransporter());
MultipartRegistryClient.bindMultipartSpecialRenderer(PartPressurizedTube.class, new RenderPressurizedTube());
}
@@ -73,7 +73,7 @@ public class RenderMechanicalPipe extends RenderTransmitterBase<PartMechanicalPi
MekanismRenderer.colorFluid(fluid);
bindTexture(MekanismRenderer.getBlocksTexture());
GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5);
GL11.glTranslated(x, y, z);
boolean gas = fluid.isGaseous();
@@ -97,10 +97,12 @@ public class RenderMechanicalPipe extends RenderTransmitterBase<PartMechanicalPi
}
else if(pipe.getConnectionType(side) != ConnectionType.NONE)
{
GL11.glTranslated(0.5, 0.5, 0.5);
Tessellator tessellator = Tessellator.getInstance();
WorldRenderer worldRenderer = tessellator.getWorldRenderer();
renderFluidInOut(worldRenderer, side, pipe);
tessellator.draw();
GL11.glTranslated(-0.5, -0.5, -0.5);
}
}
@@ -144,8 +146,11 @@ public class RenderMechanicalPipe extends RenderTransmitterBase<PartMechanicalPi
toReturn.baseBlock = Blocks.water;
toReturn.setTexture(MekanismRenderer.getFluidTexture(fluid, FluidType.STILL));
toReturn.setSideRender(side, false);
toReturn.setSideRender(side.getOpposite(), false);
if(side != null)
{
toReturn.setSideRender(side, false);
toReturn.setSideRender(side.getOpposite(), false);
}
DisplayInteger[] displays = new DisplayInteger[stages];
@@ -850,8 +850,6 @@ public abstract class BlockBasic extends Block implements ICTMBlock
}
super.breakBlock(world, pos, state);
world.removeTileEntity(pos);
}
@Override
@@ -183,7 +183,7 @@ public abstract class UpdateProtocol<T extends SynchronizedData<T>>
volume += locations.size();
if(Math.abs(xmax-xmin)+1 <= 18 && Math.abs(xmax-xmin)+1 <= 18 && Math.abs(zmax-zmin)+1 <= 18)
if(Math.abs(xmax-xmin)+1 <= 18 && Math.abs(ymax-ymin)+1 <= 18 && Math.abs(zmax-zmin)+1 <= 18)
{
if(rightBlocks && rightFrame && isHollow && isCorner)
{
@@ -215,6 +215,11 @@ public abstract class UpdateProtocol<T extends SynchronizedData<T>>
innerNodes.clear();
iteratedNodes.add(coord);
if(iteratedNodes.size() > 2048)
{
return;
}
for(EnumFacing side : EnumFacing.VALUES)
{
@@ -11,6 +11,7 @@ import mekanism.common.Mekanism;
import mekanism.common.content.transporter.TransporterStack;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.util.LangUtils;
import mekanism.common.util.MekanismUtils;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
@@ -160,9 +161,9 @@ public class PartDiversionTransporter extends PartLogisticalTransporter
}
int mode = modes[side.ordinal()];
int redstone = getWorld().isBlockIndirectlyGettingPowered(getPos());
boolean redstone = MekanismUtils.isGettingPowered(getWorld(), new Coord4D(getPos(), getWorld()));
if((mode == 2 && redstone > 0) || (mode == 1 && redstone == 0))
if((mode == 2 && redstone) || (mode == 1 && !redstone))
{
return false;
}
@@ -3,7 +3,6 @@ package mekanism.common.multipart;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -41,17 +40,12 @@ import mekanism.api.transmitters.ITransmitter;
import mekanism.api.transmitters.TransmissionType;
import mekanism.common.MekanismItems;
import mekanism.common.Tier;
import mekanism.common.Tier.CableTier;
import mekanism.common.base.ITileNetwork;
import mekanism.common.block.states.BlockStateFacing;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.capabilities.StrictEnergyAcceptor;
import mekanism.common.multipart.TransmitterType.Size;
import mekanism.common.util.MekanismUtils;
import net.minecraft.block.Block;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyBool;
import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.BlockState;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -78,6 +72,8 @@ import net.minecraftforge.common.property.ExtendedBlockState;
import net.minecraftforge.common.property.IExtendedBlockState;
import net.minecraftforge.common.property.IUnlistedProperty;
import com.sun.xml.internal.bind.v2.TODO;
public abstract class PartSidedPipe extends Multipart implements IOccludingPart, /*ISlotOccludingPart, ISidedHollowConnect, JIconHitEffects, INeighborTileChange,*/ ITileNetwork, IBlockableConnection, IConfigurable, ITransmitter, ITickable
{
public static AxisAlignedBB[] smallSides = new AxisAlignedBB[7];
@@ -95,7 +91,7 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart,
public boolean redstoneReactive = true;
public boolean forceUpdate = false;
public boolean forceUpdate = true;
public ConnectionType[] connectionTypes = {ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL};
public TileEntity[] cachedAcceptors = new TileEntity[6];
@@ -811,29 +807,6 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart,
return sides;
}
/*
public String getModelForSide(EnumFacing side, boolean internal)
{
String sideName = side.name().toLowerCase();
String typeName = getConnectionType(side).name().toUpperCase();
String name = sideName + typeName;
if(internal)
{
return RenderPartTransmitter.contents_models.get(name);
}
else {
if(getTransmitterType().getSize() == Size.LARGE)
{
return RenderPartTransmitter.large_models.get(name);
}
else {
return RenderPartTransmitter.small_models.get(name);
}
}
}
*/
@Override
public boolean onSneakRightClick(EntityPlayer player, EnumFacing side)
{
@@ -845,9 +818,9 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart,
{
return false;
}
else
{
else {
EnumFacing hitSide = sideHit(hit.subHit + 1);
if(hitSide != null)
{
connectionTypes[hitSide.ordinal()] = connectionTypes[hitSide.ordinal()].next();
@@ -867,17 +840,19 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart,
return true;
}
private PartMOP reTrace(World world, BlockPos pos, EntityPlayer player) {
private PartMOP reTrace(World world, BlockPos pos, EntityPlayer player)
{
Vec3 start = RayTraceUtils.getStart(player);
Vec3 end = RayTraceUtils.getEnd(player);
RayTraceResultPart result = ((TileMultipart)world.getTileEntity(pos)).getPartContainer().collisionRayTrace(start, end);
return result == null ? null : result.hit;
}
protected EnumFacing sideHit(int boxIndex)
{
List<EnumFacing> list = new ArrayList<>();
if(getContainer() != null)
{
for(EnumFacing side : EnumFacing.values())
@@ -892,6 +867,7 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart,
}
}
if(boxIndex < list.size()) return list.get(boxIndex);
return null;
}
@@ -935,10 +911,12 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart,
public List<String> getVisibleGroups()
{
List<String> visible = new ArrayList<>();
for(EnumFacing side : EnumFacing.values())
{
visible.add(side.getName() + getConnectionType(side).getName().toUpperCase());
}
return visible;
}
@@ -949,8 +927,8 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart,
}
@Override
public boolean canRenderInLayer(EnumWorldBlockLayer layer) {
public boolean canRenderInLayer(EnumWorldBlockLayer layer)
{
return layer == EnumWorldBlockLayer.CUTOUT;
}
@@ -963,15 +941,17 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart,
@Override
public boolean hasCapability(Capability<?> capability, EnumFacing facing)
{
return capability == Capabilities.CONFIGURABLE_CAPABILITY
|| super.hasCapability(capability, facing);
return capability == Capabilities.CONFIGURABLE_CAPABILITY || super.hasCapability(capability, facing);
}
@Override
public <T> T getCapability(Capability<T> capability, EnumFacing facing)
{
if(capability == Capabilities.CONFIGURABLE_CAPABILITY)
return (T) this;
{
return (T)this;
}
return super.getCapability(capability, facing);
}
@@ -992,11 +972,10 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart,
return values()[ordinal()+1];
}
@Override
public String getName()
{
return name().toLowerCase();
}
}
}
@@ -199,7 +199,10 @@ public abstract class PartTransmitter<A, N extends DynamicNetwork<A, N>> extends
public <T> T getCapability(Capability<T> capability, EnumFacing side)
{
if(capability == Capabilities.GRID_TRANSMITTER_CAPABILITY)
return (T) getTransmitter();
{
return (T)getTransmitter();
}
return super.getCapability(capability, side);
}
}
@@ -257,7 +257,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I
private boolean shouldTake(FluidStack fluid, Coord4D coord)
{
if(fluid.getFluid() == FluidRegistry.WATER)
if(fluid.getFluid() == FluidRegistry.WATER || fluid.getFluid() == FluidRegistry.getFluid("heavywater"))
{
return general.pumpWaterSources;
}
@@ -109,6 +109,11 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo
@Override
public double getMaxOutput()
{
if(tier == EnergyCubeTier.CREATIVE)
{
return Integer.MAX_VALUE;
}
return tier.output;
}
@@ -513,9 +513,9 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc
@Override
public boolean canFill(EnumFacing from, Fluid fluid)
{
if(from == EnumFacing.DOWN)
if(from == EnumFacing.DOWN && worldObj != null && getPos() != null)
{
TileEntity tile = Coord4D.get(this).offset(EnumFacing.DOWN).getTileEntity(worldObj);
TileEntity tile = worldObj.getTileEntity(getPos().offset(EnumFacing.DOWN));
if(isActive && !(tile instanceof TileEntityFluidTank))
{
@@ -93,7 +93,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH
{
if(inventory[0] != null && gasTank.getGas() != null)
{
gasTank.draw(GasTransmission.addGas(inventory[0], gasTank.getGas()), true);
gasTank.draw(GasTransmission.addGas(inventory[0], gasTank.getGas()), true);
}
if(inventory[1] != null && (gasTank.getGas() == null || gasTank.getGas().amount < gasTank.getMaxGas()))
@@ -276,6 +276,8 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock implements
@Override
public void invalidate()
{
super.invalidate();
if(!worldObj.isRemote)
{
if(frequency != null)