diff --git a/build.gradle b/build.gradle index 31d5d58c3..cb591c5d6 100644 --- a/build.gradle +++ b/build.gradle @@ -65,6 +65,14 @@ repositories { name 'buildcraft' url 'https://mod-buildcraft.com/maven/' } + maven { + name 'thiakil.io' + url 'https://thiakil.github.io/maven/' + } + maven { + name 'thiakil mirror' //in case GitHub doesn't like maven being hosted in GH Pages + url 'http://maven.thiakil.com' + } } // Define properties file @@ -101,6 +109,9 @@ dependencies { deobfCompile "mcp.mobius.waila:Hwyla:${config.hwyla_version}" deobfCompile "cofh:RedstoneFlux:${config.minecraft_version}-${config.redstoneflux_version}:universal" deobfCompile "com.mod-buildcraft:buildcraft-api:${config.buildcraft_version}" + compile ("com.jaquadro.minecraft.storagedrawers:StorageDrawers:${config.minecraft_version}-${config.storagedrawers_version}:api") { + exclude module: "Chameleon" // we only use the API, which doesn't need Chameleon + } } processResources diff --git a/build.properties b/build.properties index e4bb302eb..5c03af7e5 100644 --- a/build.properties +++ b/build.properties @@ -10,3 +10,4 @@ opencomputers_version=1.7.0.24 hwyla_version=1.8.18-B32_1.12 redstoneflux_version=2.0.0.1 buildcraft_version=7.99.6 +storagedrawers_version=4.2.10 \ No newline at end of file diff --git a/src/main/java/mekanism/common/base/IEnergyWrapper.java b/src/main/java/mekanism/common/base/IEnergyWrapper.java index 37453880c..eb51e1981 100644 --- a/src/main/java/mekanism/common/base/IEnergyWrapper.java +++ b/src/main/java/mekanism/common/base/IEnergyWrapper.java @@ -28,8 +28,10 @@ import net.minecraftforge.fml.common.Optional.InterfaceList; public interface IEnergyWrapper extends IStrictEnergyStorage, IEnergyReceiver, IEnergyProvider, IEnergySink, IEnergySource, IEnergyStorage, IStrictEnergyAcceptor, IStrictEnergyOutputter, IInventory { public EnumSet getOutputtingSides(); + public boolean sideIsOutput(EnumFacing side); public EnumSet getConsumingSides(); + public boolean sideIsConsumer(EnumFacing side); public double getMaxOutput(); } diff --git a/src/main/java/mekanism/common/block/BlockGlowPanel.java b/src/main/java/mekanism/common/block/BlockGlowPanel.java index 49a17d6f5..a03315116 100644 --- a/src/main/java/mekanism/common/block/BlockGlowPanel.java +++ b/src/main/java/mekanism/common/block/BlockGlowPanel.java @@ -8,6 +8,7 @@ import mekanism.common.MekanismBlocks; import mekanism.common.block.property.PropertyColor; import mekanism.common.block.states.BlockStateFacing; import mekanism.common.block.states.BlockStateGlowPanel; +import mekanism.common.integration.multipart.MultipartMekanism; import mekanism.common.tile.TileEntityGlowPanel; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MultipartUtils; @@ -72,7 +73,7 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider @Override public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntityGlowPanel tileEntity = (TileEntityGlowPanel) MekanismUtils.getTileEntitySafe(world, pos); + TileEntityGlowPanel tileEntity = getTileEntityGlowPanel(world, pos); return tileEntity != null ? state.withProperty(BlockStateFacing.facingProperty, tileEntity.side) : state; } @@ -80,8 +81,8 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider @Override public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntityGlowPanel tileEntity = (TileEntityGlowPanel) MekanismUtils.getTileEntitySafe(world, pos); - + TileEntityGlowPanel tileEntity = getTileEntityGlowPanel(world, pos); + if(tileEntity != null) { state = state.withProperty(BlockStateFacing.facingProperty, tileEntity.side); @@ -98,10 +99,10 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider @Override public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos neighbor) { - TileEntityGlowPanel tileEntity = (TileEntityGlowPanel)world.getTileEntity(pos); + TileEntityGlowPanel tileEntity = getTileEntityGlowPanel(world, pos); - if(!world.isRemote && !canStay(tileEntity)) - { + if(tileEntity != null && !world.isRemote && !canStay(world, pos)) + { float motion = 0.7F; double motionX = (rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; double motionY = (rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; @@ -118,10 +119,10 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider @Override public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos neighbor) { - TileEntityGlowPanel tileEntity = (TileEntityGlowPanel) MekanismUtils.getTileEntitySafe(world, pos); + TileEntityGlowPanel tileEntity = getTileEntityGlowPanel(world, pos); - if(!tileEntity.getWorld().isRemote && !canStay(tileEntity)) - { + if(tileEntity != null && !tileEntity.getWorld().isRemote && !canStay(world, pos)) + { float motion = 0.7F; double motionX = (rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; double motionY = (rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; @@ -138,11 +139,11 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntity tile = MekanismUtils.getTileEntitySafe(world, pos); + TileEntityGlowPanel tileEntity = getTileEntityGlowPanel(world, pos); - if(tile != null && tile instanceof TileEntityGlowPanel) + if(tileEntity != null) { - return bounds[((TileEntityGlowPanel)tile).side.ordinal()]; + return bounds[tileEntity.side.ordinal()]; } return super.getBoundingBox(state, world, pos); @@ -154,10 +155,27 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider return world.isSideSolid(pos.offset(side.getOpposite()), side); } - public static boolean canStay(TileEntityGlowPanel tileEntity) + public static boolean canStay(IBlockAccess world, BlockPos pos) { - Coord4D adj = new Coord4D(tileEntity.getPos().offset(tileEntity.side), tileEntity.getWorld()); - return tileEntity.getWorld().isSideSolid(adj.getPos(), tileEntity.side.getOpposite()); + boolean canStay = false; + + if(Mekanism.hooks.MCMPLoaded) + { + canStay = MultipartMekanism.hasCenterSlot(world, pos); + } + + if(!canStay) + { + TileEntity tileEntity = world.getTileEntity(pos); + if(tileEntity instanceof TileEntityGlowPanel) + { + TileEntityGlowPanel glowPanel = (TileEntityGlowPanel)tileEntity; + Coord4D adj = new Coord4D(glowPanel.getPos().offset(glowPanel.side), glowPanel.getWorld()); + canStay = glowPanel.getWorld().isSideSolid(adj.getPos(), glowPanel.side.getOpposite()); + } + } + + return canStay; } @Override @@ -238,4 +256,24 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider { return false; } + + private static TileEntityGlowPanel getTileEntityGlowPanel(IBlockAccess world, BlockPos pos) + { + TileEntity tileEntity = MekanismUtils.getTileEntitySafe(world, pos); + TileEntityGlowPanel glowPanel = null; + if(tileEntity instanceof TileEntityGlowPanel) + { + glowPanel = (TileEntityGlowPanel)tileEntity; + } + else if(Mekanism.hooks.MCMPLoaded) + { + TileEntity childEntity = MultipartMekanism.unwrapTileEntity(world); + if(childEntity instanceof TileEntityGlowPanel) + { + glowPanel = (TileEntityGlowPanel)childEntity; + } + } + + return glowPanel; + } } diff --git a/src/main/java/mekanism/common/block/BlockTransmitter.java b/src/main/java/mekanism/common/block/BlockTransmitter.java index 5838e5cc3..137fb0735 100644 --- a/src/main/java/mekanism/common/block/BlockTransmitter.java +++ b/src/main/java/mekanism/common/block/BlockTransmitter.java @@ -14,6 +14,7 @@ import mekanism.common.block.property.PropertyConnection; import mekanism.common.block.states.BlockStateTransmitter; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType.Size; +import mekanism.common.integration.multipart.MultipartMekanism; import mekanism.common.tile.transmitter.TileEntityDiversionTransporter; import mekanism.common.tile.transmitter.TileEntityLogisticalTransporter; import mekanism.common.tile.transmitter.TileEntityMechanicalPipe; @@ -95,11 +96,10 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - TileEntity tile = MekanismUtils.getTileEntitySafe(worldIn, pos); - - if(tile instanceof TileEntitySidedPipe) + TileEntitySidedPipe tile = getTileEntitySidedPipe(worldIn, pos); + if(tile != null) { - state = state.withProperty(BlockStateTransmitter.tierProperty, ((TileEntitySidedPipe)tile).getBaseTier()); + state = state.withProperty(BlockStateTransmitter.tierProperty, tile.getBaseTier()); } return state; @@ -129,7 +129,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public IBlockState getExtendedState(IBlockState state, IBlockAccess w, BlockPos pos) { - TileEntitySidedPipe tile = (TileEntitySidedPipe) MekanismUtils.getTileEntitySafe(w, pos); + TileEntitySidedPipe tile = getTileEntitySidedPipe(w, pos); if(tile != null) { @@ -147,9 +147,9 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntity tile = MekanismUtils.getTileEntitySafe(world, pos); + TileEntitySidedPipe tile = getTileEntitySidedPipe(world, pos); - if(tile instanceof TileEntitySidedPipe && ((TileEntitySidedPipe)tile).getTransmitterType().getSize() == Size.SMALL) + if(tile != null && tile.getTransmitterType().getSize() == Size.SMALL) { return smallSides[6]; } @@ -160,7 +160,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public void addCollisionBoxToList(IBlockState state, World world, BlockPos pos, AxisAlignedBB entityBox, List collidingBoxes, @Nullable Entity entityIn, boolean b) { - TileEntitySidedPipe tile = (TileEntitySidedPipe)world.getTileEntity(pos); + TileEntitySidedPipe tile = getTileEntitySidedPipe(world, pos); if(tile != null) { @@ -176,13 +176,13 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World world, BlockPos pos) { - return getDefaultForTile((TileEntitySidedPipe)world.getTileEntity(pos)).offset(pos); + return getDefaultForTile(getTileEntitySidedPipe(world, pos)).offset(pos); } @Override public RayTraceResult collisionRayTrace(IBlockState blockState, World world, BlockPos pos, Vec3d start, Vec3d end) { - TileEntitySidedPipe tile = (TileEntitySidedPipe)world.getTileEntity(pos); + TileEntitySidedPipe tile = getTileEntitySidedPipe(world, pos); if(tile == null) { @@ -226,16 +226,20 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @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.Transmitter, 1, tileEntity.getTransmitterType().ordinal()); - - if(!itemStack.hasTagCompound()) + ItemStack itemStack = ItemStack.EMPTY; + TileEntitySidedPipe tileEntity = getTileEntitySidedPipe(world, pos); + if(tileEntity != null) { - itemStack.setTagCompound(new NBTTagCompound()); + itemStack = new ItemStack(MekanismBlocks.Transmitter, 1, tileEntity.getTransmitterType().ordinal()); + + if(!itemStack.hasTagCompound()) + { + itemStack.setTagCompound(new NBTTagCompound()); + } + + ITierItem tierItem = (ITierItem)itemStack.getItem(); + tierItem.setBaseTier(itemStack, tileEntity.getBaseTier()); } - - ITierItem tierItem = (ITierItem)itemStack.getItem(); - tierItem.setBaseTier(itemStack, tileEntity.getBaseTier()); return itemStack; } @@ -285,24 +289,33 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { - TileEntitySidedPipe tile = (TileEntitySidedPipe)world.getTileEntity(pos); - tile.onAdded(); + TileEntitySidedPipe tile = getTileEntitySidedPipe(world, pos); + if(tile != null) + { + 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); + TileEntitySidedPipe tile = getTileEntitySidedPipe(world, pos); + if(tile != null) + { + 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) MekanismUtils.getTileEntitySafe(world, pos); - EnumFacing side = EnumFacing.getFacingFromVector(neighbor.getX() - pos.getX(), neighbor.getY() - pos.getY(), neighbor.getZ() - pos.getZ()); - tile.onNeighborTileChange(side); + TileEntitySidedPipe tile = getTileEntitySidedPipe(world, pos); + if(tile != null) + { + EnumFacing side = EnumFacing.getFacingFromVector(neighbor.getX() - pos.getX(), neighbor.getY() - pos.getY(), neighbor.getZ() - pos.getZ()); + tile.onNeighborTileChange(side); + } } @Override @@ -423,4 +436,24 @@ public class BlockTransmitter extends Block implements ITileEntityProvider return null; } + + private static TileEntitySidedPipe getTileEntitySidedPipe(IBlockAccess world, BlockPos pos) + { + TileEntity tileEntity = MekanismUtils.getTileEntitySafe(world, pos); + TileEntitySidedPipe sidedPipe = null; + if(tileEntity instanceof TileEntitySidedPipe) + { + sidedPipe = (TileEntitySidedPipe)tileEntity; + } + else if(Mekanism.hooks.MCMPLoaded) + { + TileEntity childEntity = MultipartMekanism.unwrapTileEntity(world); + if(childEntity instanceof TileEntitySidedPipe) + { + sidedPipe = (TileEntitySidedPipe)childEntity; + } + } + + return sidedPipe; + } } diff --git a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java index 9cd40e355..cac5bb129 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java @@ -446,6 +446,9 @@ public final class TransporterPathfinder } double maxSearchDistance = start.distanceTo(finalNode) * 2; + ArrayList directionsToCheck = new ArrayList<>(); + Coord4D[] neighbors = new Coord4D[EnumFacing.VALUES.length]; + TileEntity[] neighborEntities = new TileEntity[neighbors.length]; while(!openSet.isEmpty()) { @@ -469,13 +472,34 @@ public final class TransporterPathfinder openSet.remove(currentNode); closedSet.add(currentNode); + TileEntity currentNodeTile = currentNode.getTileEntity(worldObj); + ILogisticalTransporter currentNodeTransporter = null; + if(currentNodeTile.hasCapability(Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null)) + { + currentNodeTransporter = + CapabilityUtils.getCapability(currentNodeTile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, null); + } + + directionsToCheck.clear(); for(EnumFacing direction : EnumFacing.VALUES) { Coord4D neighbor = currentNode.offset(direction); - - if(transportStack.canInsertToTransporter(neighbor.getTileEntity(worldObj), direction)) + neighbors[direction.ordinal()] = neighbor; + TileEntity neighborEntity = neighbor.getTileEntity(worldObj); + neighborEntities[direction.ordinal()] = neighborEntity; + if(currentNodeTransporter == null || currentNodeTransporter.canEmitTo(neighborEntity, direction)) { - TileEntity tile = neighbor.getTileEntity(worldObj); + directionsToCheck.add(direction); + } + } + + for(EnumFacing direction : directionsToCheck) + { + Coord4D neighbor = neighbors[direction.ordinal()]; + + if(transportStack.canInsertToTransporter(neighborEntities[direction.ordinal()], direction)) + { + TileEntity tile = neighborEntities[direction.ordinal()]; double tentativeG = gScore.get(currentNode) + CapabilityUtils.getCapability(tile, Capabilities.LOGISTICAL_TRANSPORTER_CAPABILITY, direction.getOpposite()).getCost(); if(closedSet.contains(neighbor)) @@ -494,7 +518,7 @@ public final class TransporterPathfinder openSet.add(neighbor); } } - else if(neighbor.equals(finalNode) && destChecker.isValid(transportStack, direction, neighbor.getTileEntity(worldObj))) + else if(neighbor.equals(finalNode) && destChecker.isValid(transportStack, direction, neighborEntities[direction.ordinal()])) { side = direction; results = reconstructPath(navMap, currentNode); diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index e33b3f8b4..dc02e0721 100644 --- a/src/main/java/mekanism/common/integration/MekanismHooks.java +++ b/src/main/java/mekanism/common/integration/MekanismHooks.java @@ -16,6 +16,7 @@ import mekanism.common.Resource; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.integration.computer.CCPeripheral; import mekanism.common.integration.computer.OCDriver; +import mekanism.common.integration.storagedrawer.StorageDrawerRecipeHandler; import mekanism.common.recipe.RecipeHandler; import mekanism.common.util.MekanismUtils; import net.minecraft.init.Items; @@ -80,6 +81,11 @@ public final class MekanismHooks { //loadMettallurgy(); } + + if(Loader.isModLoaded("storagedrawers")) + { + StorageDrawerRecipeHandler.register(); + } } @Method(modid = "IC2") diff --git a/src/main/java/mekanism/common/integration/forgeenergy/ForgeEnergyIntegration.java b/src/main/java/mekanism/common/integration/forgeenergy/ForgeEnergyIntegration.java index 86dfd217a..ded192cf0 100644 --- a/src/main/java/mekanism/common/integration/forgeenergy/ForgeEnergyIntegration.java +++ b/src/main/java/mekanism/common/integration/forgeenergy/ForgeEnergyIntegration.java @@ -44,13 +44,13 @@ public class ForgeEnergyIntegration implements IEnergyStorage @Override public boolean canExtract() { - return tileEntity.getOutputtingSides().contains(side); + return tileEntity.sideIsOutput(side); } @Override public boolean canReceive() { - return tileEntity.getConsumingSides().contains(side); + return tileEntity.sideIsConsumer(side); } public static int rfToForge(int rf) diff --git a/src/main/java/mekanism/common/integration/multipart/MultipartGlowPanel.java b/src/main/java/mekanism/common/integration/multipart/MultipartGlowPanel.java index 415a7e9aa..3c4a87e91 100644 --- a/src/main/java/mekanism/common/integration/multipart/MultipartGlowPanel.java +++ b/src/main/java/mekanism/common/integration/multipart/MultipartGlowPanel.java @@ -1,11 +1,23 @@ package mekanism.common.integration.multipart; +import java.util.Random; + +import mcmultipart.api.container.IPartInfo; import mcmultipart.api.multipart.IMultipart; import mcmultipart.api.slot.EnumFaceSlot; import mcmultipart.api.slot.IPartSlot; +import mekanism.api.EnumColor; +import mekanism.common.MekanismBlocks; +import mekanism.common.block.BlockGlowPanel; import mekanism.common.block.states.BlockStateFacing; +import mekanism.common.tile.TileEntityGlowPanel; +import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; +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.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -13,6 +25,8 @@ import net.minecraft.world.World; public class MultipartGlowPanel implements IMultipart { + private static Random rand = new Random(); + @Override public IPartSlot getSlotForPlacement(World world, BlockPos pos, IBlockState state, EnumFacing facing, float hitX, float hitY,float hitZ, EntityLivingBase placer) { @@ -24,4 +38,61 @@ public class MultipartGlowPanel implements IMultipart { return EnumFaceSlot.values()[state.getValue(BlockStateFacing.facingProperty).ordinal()]; } + + @Override + public void onPartPlacedBy(IPartInfo part, EntityLivingBase placer, ItemStack stack) + { + TileEntity tile = part.getTile().getTileEntity(); + if(tile instanceof TileEntityGlowPanel) + { + EnumFacing facing = EnumFacing.values()[((EnumFaceSlot)part.getSlot()).ordinal()]; + EnumColor col = EnumColor.DYES[stack.getItemDamage()]; + + TileEntityGlowPanel glowPanel = (TileEntityGlowPanel)tile; + glowPanel.setOrientation(facing); + glowPanel.setColour(col); + } + } + + @Override + public void onPartRemoved(IPartInfo part, IPartInfo otherPart) + { + TileEntity tile = part.getTile().getTileEntity(); + if(tile instanceof TileEntityGlowPanel && !BlockGlowPanel.canStay(part.getPartWorld(), part.getPartPos())) + { + 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; + + BlockPos pos = part.getPartPos(); + TileEntityGlowPanel glowPanel = (TileEntityGlowPanel)tile; + ItemStack stack = new ItemStack(MekanismBlocks.GlowPanel, 1, glowPanel.colour.getMetaValue()); + EntityItem entityItem = new EntityItem(glowPanel.getWorld(), pos.getX() + motionX, pos.getY() + motionY, pos.getZ() + motionZ, stack); + + part.getActualWorld().spawnEntity(entityItem); + part.remove(); + } + } + + @Override + public void onPartHarvested(IPartInfo part, EntityPlayer player) + { + TileEntity tile = part.getTile().getTileEntity(); + + if(tile instanceof TileEntityGlowPanel) + { + IBlockState partState = part.getState(); + partState.getBlock().removedByPlayer(partState, part.getPartWorld(), + part.getContainer().getPartPos(), player, true); + } + + IMultipart.super.onPartHarvested(part, player); + } + + @Override + public Block getBlock() + { + return MekanismBlocks.GlowPanel; + } } diff --git a/src/main/java/mekanism/common/integration/multipart/MultipartMekanism.java b/src/main/java/mekanism/common/integration/multipart/MultipartMekanism.java index 748b72089..346662009 100644 --- a/src/main/java/mekanism/common/integration/multipart/MultipartMekanism.java +++ b/src/main/java/mekanism/common/integration/multipart/MultipartMekanism.java @@ -11,16 +11,21 @@ import javax.annotation.Nullable; import mcmultipart.api.addon.IMCMPAddon; import mcmultipart.api.addon.MCMPAddon; +import mcmultipart.api.container.IMultipartContainer; import mcmultipart.api.container.IPartInfo; import mcmultipart.api.multipart.IMultipart; import mcmultipart.api.multipart.IMultipartRegistry; import mcmultipart.api.multipart.IMultipartTile; +import mcmultipart.api.multipart.MultipartCapabilityHelper; import mcmultipart.api.multipart.MultipartOcclusionHelper; import mcmultipart.api.ref.MCMPCapabilities; +import mcmultipart.api.slot.EnumCenterSlot; +import mcmultipart.api.world.IMultipartBlockAccess; import mekanism.common.MekanismBlocks; import mekanism.common.block.BlockTransmitter; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType.Size; +import mekanism.common.capabilities.Capabilities; import mekanism.common.tile.TileEntityGlowPanel; import mekanism.common.tile.transmitter.TileEntityTransmitter; import net.minecraft.item.Item; @@ -29,6 +34,8 @@ 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.world.IBlockAccess; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ICapabilityProvider; @@ -63,6 +70,7 @@ public class MultipartMekanism implements IMCMPAddon 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); + MultipartCapabilityHelper.registerCapabilityJoiner(Capabilities.TILE_NETWORK_CAPABILITY, MultipartTileNetworkJoiner::new); } private void register(AttachCapabilitiesEvent e, String id) @@ -162,4 +170,45 @@ public class MultipartMekanism implements IMCMPAddon return Collections.emptyList(); } + + static IMultipartContainer getContainer(IBlockAccess world, BlockPos pos) + { + IMultipartContainer container = null; + if(world instanceof IMultipartBlockAccess) + { + container = ((IMultipartBlockAccess) world).getPartInfo().getContainer(); + } + else + { + TileEntity possibleContainer = world.getTileEntity(pos); + if(possibleContainer instanceof IMultipartContainer) + { + container = (IMultipartContainer)possibleContainer; + } + } + + return container; + } + + public static boolean hasCenterSlot(IBlockAccess world, BlockPos pos) + { + boolean hasCenterSlot = false; + IMultipartContainer container = getContainer(world, pos); + if(container != null) + { + hasCenterSlot = container.getPart(EnumCenterSlot.CENTER).isPresent(); + } + + return hasCenterSlot; + } + + public static TileEntity unwrapTileEntity(IBlockAccess world) + { + TileEntity tile = null; + if(world instanceof IMultipartBlockAccess) + { + tile = ((IMultipartBlockAccess)world).getPartInfo().getTile().getTileEntity(); + } + return tile; + } } diff --git a/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java b/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java new file mode 100644 index 000000000..765e2135d --- /dev/null +++ b/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java @@ -0,0 +1,137 @@ +package mekanism.common.integration.multipart; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import io.netty.buffer.ByteBuf; +import mcmultipart.api.container.IMultipartContainer; +import mcmultipart.api.multipart.IMultipartTile; +import mcmultipart.api.slot.EnumFaceSlot; +import mcmultipart.api.slot.IPartSlot; +import mcmultipart.api.world.IMultipartBlockAccess; +import mekanism.common.base.ITileNetwork; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.IBlockAccess; + +/** + * Used to route {@link ITileNetwork} packets sent to multipart containers with more than one possible recipient.
+ *
+ * When MCMP is enabled single byte EnumFacing ordinal headers are added to packets sent by glow panels and + * transmitters that are then used by this class to route packets to the part attached to the appropriate side.
+ *
+ * In this case, since transmitters do not attach to a side and therefore have no matching EnumFacing the special + * value 6 is used to represent the center slot. + */ +public class MultipartTileNetworkJoiner implements ITileNetwork +{ + private final HashMap tileSideMap; + + /** + * Called by MCMP's multipart container when more than one part implements {@link ITileNetwork}.
+ *
+ * Builds an internal map of part slots to {@link ITileNetwork} implementations in order to route packets. + * @param tileList A list of the tile entities that implement {@link ITileNetwork} in the container. + */ + public MultipartTileNetworkJoiner(List tileList) + { + tileSideMap = new HashMap<>(); + IMultipartContainer container = null; + + TileEntity first = (TileEntity)tileList.get(0); + IBlockAccess world = first.getWorld(); + if(world instanceof IMultipartBlockAccess) + { + container = ((IMultipartBlockAccess)world).getPartInfo().getContainer(); + } + else + { + TileEntity worldTile = first.getWorld().getTileEntity(first.getPos()); + if(worldTile instanceof IMultipartContainer) + { + container = (IMultipartContainer)worldTile; + } + } + + if(container != null) + { + for(IPartSlot slot : container.getParts().keySet()) + { + int tileIndex = tileList.indexOf(container.getPartTile(slot).get().getTileEntity()); + if(tileIndex >= 0) + { + byte slotValue = slot instanceof EnumFaceSlot ? (byte)((EnumFaceSlot)slot).ordinal() : 6; + tileSideMap.put(slotValue, tileList.get(tileIndex)); + } + } + } + } + + @Override + public void handlePacketData(ByteBuf dataStream) throws Exception + { + while(dataStream.readableBytes() > 0) + { + byte side = dataStream.readByte(); + + ITileNetwork networkTile = tileSideMap.get(side); + if(networkTile == null) + { + break; + } + + networkTile.handlePacketData(dataStream); + } + } + + @Override + public ArrayList getNetworkedData(ArrayList data) + { + ArrayList childData = new ArrayList<>(); + for(byte slotValue : tileSideMap.keySet()) + { + tileSideMap.get(slotValue).getNetworkedData(childData); + data.addAll(childData); + childData.clear(); + } + + return data; + } + + /** + * Determines whether or not an {@link ITileNetwork} joiner is needed and, if so, adds a single byte header + * used to route packets inside multipart containers. + * @param entity The entity for which getNetworkedData is being called + * @param data The network data list + * @param facing The side this part is attached to or null for the center slot + */ + public static void addMultipartHeader(TileEntity entity, ArrayList data, EnumFacing facing) + { + int tileNetworkParts = 0; + IMultipartContainer container = MultipartMekanism.getContainer(entity.getWorld(), entity.getPos()); + if(container != null) + { + for(IPartSlot slot : container.getParts().keySet()) + { + TileEntity part = container.getPartTile(slot) + .map(multiPartTile -> multiPartTile.getTileEntity()) + .orElse(null); + + if(part instanceof ITileNetwork) + { + tileNetworkParts++; + if(tileNetworkParts > 1) + { + break; + } + } + } + } + + if(tileNetworkParts > 1) + { + data.add(0, (byte)(facing == null ? 6 : facing.ordinal())); + } + } +} diff --git a/src/main/java/mekanism/common/integration/multipart/MultipartTransmitter.java b/src/main/java/mekanism/common/integration/multipart/MultipartTransmitter.java index 947af9bbf..d897cabab 100644 --- a/src/main/java/mekanism/common/integration/multipart/MultipartTransmitter.java +++ b/src/main/java/mekanism/common/integration/multipart/MultipartTransmitter.java @@ -4,9 +4,14 @@ import mcmultipart.api.container.IPartInfo; import mcmultipart.api.multipart.IMultipart; import mcmultipart.api.slot.EnumCenterSlot; import mcmultipart.api.slot.IPartSlot; +import mekanism.common.MekanismBlocks; +import mekanism.common.Tier.BaseTier; import mekanism.common.tile.transmitter.TileEntitySidedPipe; +import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; @@ -27,6 +32,29 @@ public class MultipartTransmitter implements IMultipart return EnumCenterSlot.CENTER; } + @Override + public void onAdded(IPartInfo part) + { + TileEntity tile = part.getTile().getTileEntity(); + + if(tile instanceof TileEntitySidedPipe) + { + ((TileEntitySidedPipe)tile).onAdded(); + } + } + + @Override + public void onPartAdded(IPartInfo part, IPartInfo otherPart) + { + TileEntity tile = part.getTile().getTileEntity(); + + if(tile instanceof TileEntitySidedPipe) + { + tile.validate(); + ((TileEntitySidedPipe)tile).notifyTileChange(); + } + } + @Override public void onPartChanged(IPartInfo part, IPartInfo otherPart) { @@ -37,4 +65,42 @@ public class MultipartTransmitter implements IMultipart ((TileEntitySidedPipe)tile).onPartChanged(otherPart.getPart()); } } + + @Override + public void onPartHarvested(IPartInfo part, EntityPlayer player) + { + TileEntity tile = part.getTile().getTileEntity(); + + if(tile instanceof TileEntitySidedPipe) + { + IBlockState partState = part.getState(); + partState.getBlock().removedByPlayer(partState, part.getPartWorld(), + part.getContainer().getPartPos(), player, true); + } + + IMultipart.super.onPartHarvested(part, player); + } + + @Override + public void onPartPlacedBy(IPartInfo part, EntityLivingBase placer, ItemStack stack) + { + TileEntity tile = part.getTile().getTileEntity(); + + if(tile instanceof TileEntitySidedPipe) + { + BaseTier baseTier = BaseTier.BASIC; + if(stack.hasTagCompound()) + { + baseTier = BaseTier.values()[stack.getTagCompound().getInteger("tier")]; + } + + ((TileEntitySidedPipe)tile).setBaseTier(baseTier); + } + } + + @Override + public Block getBlock() + { + return MekanismBlocks.Transmitter; + } } diff --git a/src/main/java/mekanism/common/integration/storagedrawer/StorageDrawerRecipeHandler.java b/src/main/java/mekanism/common/integration/storagedrawer/StorageDrawerRecipeHandler.java new file mode 100644 index 000000000..47b7d45be --- /dev/null +++ b/src/main/java/mekanism/common/integration/storagedrawer/StorageDrawerRecipeHandler.java @@ -0,0 +1,55 @@ +package mekanism.common.integration.storagedrawer; + +import com.jaquadro.minecraft.storagedrawers.api.IStorageDrawersApi; +import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; +import com.jaquadro.minecraft.storagedrawers.api.registry.IRecipeHandler; +import com.jaquadro.minecraft.storagedrawers.api.registry.IRecipeHandlerRegistry; +import mekanism.common.recipe.ShapedMekanismRecipe; +import mekanism.common.recipe.ShapelessMekanismRecipe; + +import net.minecraft.item.crafting.IRecipe; + +import java.util.List; + +public class StorageDrawerRecipeHandler +{ + private StorageDrawerRecipeHandler(){} + + public static void register() + { + IStorageDrawersApi api = StorageDrawersApi.instance(); + if(api == null) + { + return; + } + IRecipeHandlerRegistry recipeHandlerRegistry = api.recipeHandlerRegistry(); + recipeHandlerRegistry.registerRecipeHandler(ShapedMekanismRecipe.class, new ShapedMekanismRecipeHandler()); + recipeHandlerRegistry.registerRecipeHandler(ShapelessMekanismRecipe.class, new ShapelessMekanismRecipeHandler()); + } + + private static class ShapedMekanismRecipeHandler implements IRecipeHandler + { + @Override + public Object[] getInputAsArray (IRecipe recipe) { + return ((ShapedMekanismRecipe) recipe).getInput(); + } + + @Override + public List getInputAsList (IRecipe recipe) { + return null; + } + } + + private static class ShapelessMekanismRecipeHandler implements IRecipeHandler + { + @Override + public Object[] getInputAsArray (IRecipe recipe) { + return null; + } + + @Override + public List getInputAsList (IRecipe recipe) { + return ((ShapelessMekanismRecipe) recipe).getInput(); + } + } +} diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index 05a36b884..5b8b3ed66 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -60,7 +60,7 @@ public class PacketConfigurationUpdate implements IMessageHandler capability, EnumFacing facing) { - if(getInv() == null || capability == Capabilities.TILE_NETWORK_CAPABILITY) + if (capability == Capabilities.TILE_NETWORK_CAPABILITY) + { + return super.hasCapability(capability, facing); + } + + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return super.hasCapability(capability, facing); } - return getInv().hasCapability(capability, facing); + return inv.hasCapability(capability, facing); } @Override public T getCapability(Capability capability, EnumFacing facing) { - if(getInv() == null || capability == Capabilities.TILE_NETWORK_CAPABILITY) + if (capability == Capabilities.TILE_NETWORK_CAPABILITY) + { + return super.getCapability(capability, facing); + } + + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return super.getCapability(capability, facing); } - return getInv().getCapability(capability, facing); + return inv.getCapability(capability, facing); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java index 636c0de80..9044ca7d9 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChargepad.java +++ b/src/main/java/mekanism/common/tile/TileEntityChargepad.java @@ -175,6 +175,11 @@ public class TileEntityChargepad extends TileEntityNoisyBlock return EnumSet.of(EnumFacing.DOWN, facing.getOpposite()); } + @Override + public boolean sideIsConsumer(EnumFacing side) { + return side == EnumFacing.DOWN || side == facing.getOpposite(); + } + @Override public boolean getActive() { diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 24e7b9caf..a25bf4769 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -1565,6 +1565,13 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I return EnumSet.of(MekanismUtils.getLeft(facing), MekanismUtils.getRight(facing), EnumFacing.DOWN); } + @Override + public boolean sideIsConsumer(EnumFacing side) + { + return side == MekanismUtils.getLeft(facing) || side == MekanismUtils.getRight(facing) || side == EnumFacing.DOWN; + } + + @Override public TileComponentSecurity getSecurity() { diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index 9ddc607d7..48301963d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -421,6 +421,12 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I return EnumSet.of(facing.getOpposite()); } + @Override + public boolean sideIsConsumer(EnumFacing side) + { + return facing.getOpposite() == side; + } + @Override public boolean canSetFacing(int side) { diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index ce9ea8eba..c6549c176 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -161,12 +161,24 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); } + @Override + public boolean sideIsConsumer(EnumFacing side) + { + return configComponent.hasSideForData(TransmissionType.ENERGY, facing, 1, side); + } + @Override public EnumSet getOutputtingSides() { return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 2); } + @Override + public boolean sideIsOutput(EnumFacing side) + { + return configComponent.hasSideForData(TransmissionType.ENERGY, facing, 2, side); + } + @Override public boolean canSetFacing(int side) { diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 21c55246d..5df3f9693 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -394,6 +394,12 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt { return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); } + + @Override + public boolean sideIsConsumer(EnumFacing side) + { + return configComponent.hasSideForData(TransmissionType.ENERGY, facing, 1, side); + } public void sortInventory() { diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java index 4258ca120..1c182c82e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java @@ -245,10 +245,10 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc public int pushUp(FluidStack fluid, boolean doFill) { Coord4D up = Coord4D.get(this).offset(EnumFacing.UP); - - if(up.getTileEntity(world) instanceof TileEntityFluidTank) + TileEntity tileEntity = up.getTileEntity(world); + if(tileEntity instanceof TileEntityFluidTank) { - IFluidHandler handler = CapabilityUtils.getCapability(up.getTileEntity(world), CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, EnumFacing.DOWN); + IFluidHandler handler = CapabilityUtils.getCapability(tileEntity, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, EnumFacing.DOWN); if(PipeUtils.canFill(handler, fluid)) { @@ -565,7 +565,7 @@ public class TileEntityFluidTank extends TileEntityContainerBlock implements IAc public boolean canFill(EnumFacing from, Fluid fluid) { TileEntity tile = world.getTileEntity(getPos().offset(EnumFacing.DOWN)); - if(from == EnumFacing.DOWN && world != null && getPos() != null) + if(from == EnumFacing.DOWN && world != null) { if(isActive && !(tile instanceof TileEntityFluidTank)) { diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index 41770eb8a..55b5e7b5d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -384,6 +384,12 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen return EnumSet.of(facing.getOpposite()); } + @Override + public boolean sideIsConsumer(EnumFacing side) + { + return facing.getOpposite() == side; + } + @Override public boolean canSetFacing(int side) { diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index 03f899970..42407d8a4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -244,7 +244,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH @Override public boolean canReceiveGas(EnumFacing side, Gas type) { - if(configComponent.getSidesForData(TransmissionType.GAS, facing, 1).contains(side)) + if(configComponent.hasSideForData(TransmissionType.GAS, facing, 1, side)) { return gasTank.canReceive(type); } diff --git a/src/main/java/mekanism/common/tile/TileEntityGlowPanel.java b/src/main/java/mekanism/common/tile/TileEntityGlowPanel.java index 39d712c7d..d10588240 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGlowPanel.java +++ b/src/main/java/mekanism/common/tile/TileEntityGlowPanel.java @@ -11,6 +11,7 @@ import mekanism.common.base.ITileNetwork; import mekanism.common.block.property.PropertyColor; import mekanism.common.block.states.BlockStateFacing; import mekanism.common.capabilities.Capabilities; +import mekanism.common.integration.multipart.MultipartTileNetworkJoiner; import mekanism.common.network.PacketDataRequest.DataRequestMessage; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; @@ -46,6 +47,11 @@ public class TileEntityGlowPanel extends TileEntity implements ITileNetwork @Override public ArrayList getNetworkedData(ArrayList data) { + if(Mekanism.hooks.MCMPLoaded) + { + MultipartTileNetworkJoiner.addMultipartHeader(this, data, side); + } + data.add(side.ordinal()); data.add(colour.getMetaValue()); @@ -73,6 +79,12 @@ public class TileEntityGlowPanel extends TileEntity implements ITileNetwork return nbt; } + + @Override + public NBTTagCompound getUpdateTag() + { + return writeToNBT(new NBTTagCompound()); + } @Override public void readFromNBT(NBTTagCompound nbt) diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index 59baacb51..86b95c23f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -102,6 +102,15 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement return EnumSet.noneOf(EnumFacing.class); } + @Override + public boolean sideIsOutput(EnumFacing side) { + if (structure != null && mode) + { + return !structure.locations.contains(Coord4D.get(this).offset(side)); + } + return false; + } + @Override public EnumSet getConsumingSides() { @@ -112,7 +121,12 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement return EnumSet.noneOf(EnumFacing.class); } - + + @Override + public boolean sideIsConsumer(EnumFacing side) { + return (structure != null && !mode); + } + @Method(modid = "IC2") public void register() { @@ -242,7 +256,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement @Method(modid = "redstoneflux") public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { - if(getConsumingSides().contains(from)) + if(sideIsConsumer(from)) { double toAdd = (int)Math.min(Math.min(getMaxInput(), getMaxEnergy()-getEnergy()), maxReceive* general.FROM_RF); @@ -262,7 +276,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement @Method(modid = "redstoneflux") public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate) { - if(getOutputtingSides().contains(from)) + if(sideIsOutput(from)) { double toSend = Math.min(getEnergy(), Math.min(getMaxOutput(), maxExtract*general.FROM_RF)); @@ -340,21 +354,21 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement @Override public boolean canOutputEnergy(EnumFacing side) { - return getOutputtingSides().contains(side); + return sideIsOutput(side); } @Override @Method(modid = "IC2") public boolean acceptsEnergyFrom(IEnergyEmitter emitter, EnumFacing direction) { - return getConsumingSides().contains(direction); + return sideIsConsumer(direction); } @Override @Method(modid = "IC2") public boolean emitsEnergyTo(IEnergyAcceptor receiver, EnumFacing direction) { - return getOutputtingSides().contains(direction) && receiver instanceof IEnergyConductor; + return sideIsOutput(direction) && receiver instanceof IEnergyConductor; } @Override @@ -395,7 +409,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement @Override public boolean canReceiveEnergy(EnumFacing side) { - return getConsumingSides().contains(side); + return sideIsConsumer(side); } @Override @@ -433,13 +447,13 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement @Override public double acceptEnergy(EnumFacing side, double amount, boolean simulate) { - if(!getConsumingSides().contains(side)) + double toUse = Math.min(Math.min(getMaxInput(), getMaxEnergy()-getEnergy()), amount); + + if(toUse < 0.0001 || (side != null && !sideIsConsumer(side))) { return 0; } - double toUse = Math.min(Math.min(getMaxInput(), getMaxEnergy()-getEnergy()), amount); - if(!simulate) { setEnergy(getEnergy() + toUse); @@ -452,14 +466,18 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement @Override public double pullEnergy(EnumFacing side, double amount, boolean simulate) { - if(!getOutputtingSides().contains(side)) + double toGive = Math.min(getEnergy(), amount); + + if(toGive < 0.0001 || (side != null && !sideIsOutput(side))) { return 0; } - double toGive = Math.min(getEnergy(), amount); - setEnergy(getEnergy() - toGive); - + if (!simulate) + { + setEnergy(getEnergy() - toGive); + } + return toGive; } @@ -517,8 +535,8 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement || capability == Capabilities.ENERGY_OUTPUTTER_CAPABILITY || capability == Capabilities.TESLA_HOLDER_CAPABILITY || capability == Capabilities.CONFIGURABLE_CAPABILITY - || (capability == Capabilities.TESLA_CONSUMER_CAPABILITY && getConsumingSides().contains(facing)) - || (capability == Capabilities.TESLA_PRODUCER_CAPABILITY && getOutputtingSides().contains(facing)) + || (capability == Capabilities.TESLA_CONSUMER_CAPABILITY && sideIsConsumer(facing)) + || (capability == Capabilities.TESLA_PRODUCER_CAPABILITY && sideIsOutput(facing)) || capability == CapabilityEnergy.ENERGY || super.hasCapability(capability, facing); } @@ -536,8 +554,8 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement } if(capability == Capabilities.TESLA_HOLDER_CAPABILITY - || (capability == Capabilities.TESLA_CONSUMER_CAPABILITY && getConsumingSides().contains(facing)) - || (capability == Capabilities.TESLA_PRODUCER_CAPABILITY && getOutputtingSides().contains(facing))) + || (capability == Capabilities.TESLA_CONSUMER_CAPABILITY && sideIsConsumer(facing)) + || (capability == Capabilities.TESLA_PRODUCER_CAPABILITY && sideIsOutput(facing))) { return (T)teslaManager.getWrapper(this, facing); } diff --git a/src/main/java/mekanism/common/tile/TileEntityLaser.java b/src/main/java/mekanism/common/tile/TileEntityLaser.java index 720666852..2ab5706e5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaser.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaser.java @@ -123,7 +123,12 @@ public class TileEntityLaser extends TileEntityNoisyBlock implements IActiveStat { return EnumSet.of(facing.getOpposite()); } - + + @Override + public boolean sideIsConsumer(EnumFacing side) { + return side == facing.getOpposite(); + } + @Override public void setActive(boolean active) { diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java index 3be4ba8e4..3040715d3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java @@ -196,6 +196,11 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement public double pullEnergy(EnumFacing side, double amount, boolean simulate) { double toGive = Math.min(getEnergy(), amount); + + if (toGive < 0.0001) + { + return 0; + } if(!simulate) { diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index ce830d93d..69c2cc5aa 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -558,6 +558,11 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen return EnumSet.noneOf(EnumFacing.class); } + @Override + public boolean sideIsConsumer(EnumFacing side) { + return false; + } + @Override public boolean canSetFacing(int facing) { diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index a872f0900..e13bf5c89 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -184,7 +184,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityOperationalMachine i for(TransmissionType transmission : configComponent.transmissions) { - factory.configComponent.setConfig(transmission, configComponent.getConfig(transmission)); + factory.configComponent.setConfig(transmission, configComponent.getConfig(transmission).asByteArray()); factory.configComponent.setEjecting(transmission, configComponent.isEjecting(transmission)); } diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index b11ef18d6..4459b21cc 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -372,12 +372,30 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp return !hasFrequency() ? nothing : configComponent.getSidesForData(TransmissionType.ENERGY, facing, 2); } + @Override + public boolean sideIsOutput(EnumFacing side) { + if (!hasFrequency()) + { + return false; + } + return configComponent.hasSideForData(TransmissionType.ENERGY, facing, 2, side); + } + @Override public EnumSet getConsumingSides() { return !hasFrequency() ? nothing : configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); } + @Override + public boolean sideIsConsumer(EnumFacing side) { + if (!hasFrequency()) + { + return false; + } + return configComponent.hasSideForData(TransmissionType.ENERGY, facing, 1, side); + } + @Override public double getMaxOutput() { diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java index be6675b40..951ead305 100644 --- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -129,7 +129,12 @@ public class TileEntityResistiveHeater extends TileEntityNoisyBlock implements I { return EnumSet.of(MekanismUtils.getLeft(facing), MekanismUtils.getRight(facing)); } - + + @Override + public boolean sideIsConsumer(EnumFacing side) { + return side == MekanismUtils.getLeft(facing) || side == MekanismUtils.getRight(facing); + } + @Override public boolean canSetFacing(int side) { diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index 3c67dec50..57a1902c7 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -213,6 +213,11 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement return EnumSet.of(facing.getOpposite()); } + @Override + public boolean sideIsConsumer(EnumFacing side) { + return side == facing.getOpposite(); + } + @Override public void setControlType(RedstoneControl type) { diff --git a/src/main/java/mekanism/common/tile/component/SideConfig.java b/src/main/java/mekanism/common/tile/component/SideConfig.java new file mode 100644 index 000000000..7424d7f0b --- /dev/null +++ b/src/main/java/mekanism/common/tile/component/SideConfig.java @@ -0,0 +1,63 @@ +package mekanism.common.tile.component; + +import net.minecraft.util.EnumFacing; + +import java.util.Observable; +import java.util.Observer; + +public class SideConfig +{ + private byte[] directions = new byte[EnumFacing.VALUES.length]; + private Observable observable = new Observable(); + + public SideConfig() {} + + public SideConfig(byte[] b) + { + this(b[0], b[1], b[2], b[3], b[4], b[5]); + assert b.length == EnumFacing.VALUES.length; + } + + public SideConfig(byte d, byte u, byte n, byte s, byte w, byte e) + { + setDirections(d, u, n, s, w, e); + } + + public void setDirections(byte d, byte u, byte n, byte s, byte w, byte e) + { + directions[0] = d; + directions[1] = u; + directions[2] = n; + directions[3] = s; + directions[4] = w; + directions[5] = e; + + observable.notifyObservers(this); + } + + public byte get(EnumFacing f) + { + return directions[f.ordinal()]; + } + + public byte[] asByteArray() + { + return directions; + } + + public void set(EnumFacing f, byte value) + { + directions[f.ordinal()] = value; + observable.notifyObservers(this); + } + + public void addObserver(Observer o) + { + observable.addObserver(o); + } + + public void deleteObserver(Observer o) + { + observable.deleteObserver(o); + } +} diff --git a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java index bf192963c..5e8e65a9b 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java @@ -25,12 +25,12 @@ public class TileComponentConfig implements ITileComponent public TileEntityContainerBlock tileEntity; - public Map sideConfigs = new HashMap(); - public Map> sideOutputs = new HashMap>(); - public Map ejecting = new HashMap(); - public Map canEject = new HashMap(); + private Map sideConfigs = new HashMap<>(); + private Map> sideOutputs = new HashMap<>(); + private Map ejecting = new HashMap<>(); + private Map canEject = new HashMap<>(); - public List transmissions = new ArrayList(); + public List transmissions = new ArrayList<>(); public TileComponentConfig(TileEntityContainerBlock tile, TransmissionType... types) { @@ -59,43 +59,53 @@ public class TileComponentConfig implements ITileComponent transmissions.add(type); } - sideOutputs.put(type.ordinal(), new ArrayList()); - ejecting.put(type.ordinal(), false); - canEject.put(type.ordinal(), true); + sideOutputs.put(type, new ArrayList<>()); + ejecting.put(type, false); + canEject.put(type, true); } - + public EnumSet getSidesForData(TransmissionType type, EnumFacing facing, int dataIndex) { EnumSet ret = EnumSet.noneOf(EnumFacing.class); + SideConfig config = getConfig(type); + EnumFacing[] translatedFacings = MekanismUtils.getBaseOrientations(facing); - for(EnumFacing f : EnumFacing.VALUES) + for(EnumFacing sideToCheck : EnumFacing.values()) { - EnumFacing side = MekanismUtils.getBaseOrientation(f, facing); - - if(getConfig(type)[side.ordinal()] == dataIndex) + if(config.get(translatedFacings[sideToCheck.ordinal()]) == dataIndex) { - ret.add(f); + ret.add(sideToCheck); } } return ret; } + + public boolean hasSideForData(TransmissionType type, EnumFacing facing, int dataIndex, EnumFacing sideToTest) + { + if(sideToTest == null) + { + return false; + } + EnumFacing[] translatedFacings = MekanismUtils.getBaseOrientations(facing); + return getConfig(type).get(translatedFacings[sideToTest.ordinal()]) == dataIndex; + } public void setCanEject(TransmissionType type, boolean eject) { - canEject.put(type.ordinal(), eject); + canEject.put(type, eject); } public boolean canEject(TransmissionType type) { - return canEject.get(type.ordinal()); + return canEject.get(type); } public void fillConfig(TransmissionType type, int data) { byte sideData = (byte)data; - setConfig(type, new byte[] {sideData, sideData, sideData, sideData, sideData, sideData}); + setConfig(type, sideData, sideData, sideData, sideData, sideData, sideData); } public void setIOConfig(TransmissionType type) @@ -115,25 +125,31 @@ public class TileComponentConfig implements ITileComponent fillConfig(type, 1); setCanEject(type, false); } - + public void setConfig(TransmissionType type, byte[] config) { - sideConfigs.put(type.ordinal(), config); + assert config.length == EnumFacing.VALUES.length; + setConfig(type, config[0], config[1], config[2], config[3], config[4], config[5]); + } + + public void setConfig(TransmissionType type, byte d, byte u, byte n, byte s, byte w, byte e) + { + sideConfigs.put(type, new SideConfig(d, u, n, s, w, e)); } public void addOutput(TransmissionType type, SideData data) { - sideOutputs.get(type.ordinal()).add(data); + sideOutputs.get(type).add(data); } public ArrayList getOutputs(TransmissionType type) { - return sideOutputs.get(type.ordinal()); + return sideOutputs.get(type); } - public byte[] getConfig(TransmissionType type) + public SideConfig getConfig(TransmissionType type) { - return sideConfigs.get(type.ordinal()); + return sideConfigs.get(type); } public SideData getOutput(TransmissionType type, EnumFacing side, EnumFacing facing) @@ -152,8 +168,9 @@ public class TileComponentConfig implements ITileComponent { return EMPTY; } - - int index = getConfig(type)[side.ordinal()]; + + SideConfig sideConfig = getConfig(type); + int index = sideConfig.get(side); if(index == -1) { @@ -161,7 +178,8 @@ public class TileComponentConfig implements ITileComponent } else if(index > getOutputs(type).size()-1) { - index = getConfig(type)[side.ordinal()] = 0; + sideConfig.set(side, (byte) 0); + index = 0; } return getOutputs(type).get(index); @@ -184,8 +202,8 @@ public class TileComponentConfig implements ITileComponent { if(nbtTags.getByteArray("config" + type.ordinal()).length > 0) { - sideConfigs.put(type.ordinal(), nbtTags.getByteArray("config" + type.ordinal())); - ejecting.put(type.ordinal(), nbtTags.getBoolean("ejecting" + type.ordinal())); + sideConfigs.put(type, new SideConfig(nbtTags.getByteArray("config" + type.ordinal()))); + ejecting.put(type, nbtTags.getBoolean("ejecting" + type.ordinal())); } } } @@ -207,9 +225,9 @@ public class TileComponentConfig implements ITileComponent { byte[] array = new byte[6]; dataStream.readBytes(array); - - sideConfigs.put(type.ordinal(), array); - ejecting.put(type.ordinal(), dataStream.readBoolean()); + + sideConfigs.put(type, new SideConfig(array)); + ejecting.put(type, dataStream.readBoolean()); } } @@ -218,8 +236,8 @@ public class TileComponentConfig implements ITileComponent { for(TransmissionType type : transmissions) { - nbtTags.setByteArray("config" + type.ordinal(), sideConfigs.get(type.ordinal())); - nbtTags.setBoolean("ejecting" + type.ordinal(), ejecting.get(type.ordinal())); + nbtTags.setByteArray("config" + type.ordinal(), sideConfigs.get(type).asByteArray()); + nbtTags.setBoolean("ejecting" + type.ordinal(), ejecting.get(type)); } nbtTags.setBoolean("sideDataStored", true); @@ -237,8 +255,8 @@ public class TileComponentConfig implements ITileComponent for(TransmissionType type : transmissions) { - data.add(sideConfigs.get(type.ordinal())); - data.add(ejecting.get(type.ordinal())); + data.add(sideConfigs.get(type).asByteArray()); + data.add(ejecting.get(type)); } } @@ -247,12 +265,12 @@ public class TileComponentConfig implements ITileComponent public boolean isEjecting(TransmissionType type) { - return ejecting.get(type.ordinal()); + return ejecting.get(type); } public void setEjecting(TransmissionType type, boolean eject) { - ejecting.put(type.ordinal(), eject); + ejecting.put(type, eject); MekanismUtils.saveChunk(tileEntity); } } diff --git a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java index 0610c9d72..6d49e2873 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java @@ -153,13 +153,18 @@ public class TileComponentEjector implements ITileComponent List outputSides = new ArrayList(); ISideConfiguration configurable = (ISideConfiguration)tileEntity; - for(int i = 0; i < configurable.getConfig().getConfig(type).length; i++) + SideConfig sideConfig = configurable.getConfig().getConfig(type); + ArrayList outputs = configurable.getConfig().getOutputs(type); + + EnumFacing[] facings = MekanismUtils.getBaseOrientations(tileEntity.facing); + + for(int i = 0; i < EnumFacing.VALUES.length; i++) { - EnumFacing side = MekanismUtils.getBaseOrientation(EnumFacing.getFront(i), tileEntity.facing); - - if(configurable.getConfig().getConfig(type)[side.ordinal()] == configurable.getConfig().getOutputs(type).indexOf(data)) + EnumFacing side = facings[i]; + + if(sideConfig.get(side) == outputs.indexOf(data)) { - outputSides.add(EnumFacing.getFront(i)); + outputSides.add(EnumFacing.VALUES[i]); } } diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/prefab/TileEntityAdvancedElectricMachine.java index fe3ceccd1..2b1a0d75d 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityAdvancedElectricMachine.java @@ -60,10 +60,10 @@ public abstract class TileEntityAdvancedElectricMachine, * The foundation of all machines - a simple tile entity with a facing, active state, initialized state, sound effect, and animated texture. * @param soundPath - location of the sound effect * @param name - full name of this machine - * @param location - GUI texture path of this machine - * @param perTick - the energy this machine consumes every tick in it's active state - * @param baseTicksRequired - how many ticks it takes to run a cycle * @param maxEnergy - how much energy this machine can store + * @param baseTicksRequired - how many ticks it takes to run a cycle */ public TileEntityBasicMachine(String soundPath, String name, double maxEnergy, double baseEnergyUsage, int upgradeSlot, int baseTicksRequired, ResourceLocation location) { @@ -48,6 +46,11 @@ public abstract class TileEntityBasicMachine, return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); } + @Override + public boolean sideIsConsumer(EnumFacing side) { + return configComponent.hasSideForData(TransmissionType.ENERGY, facing, 1, side); + } + @Override public int[] getSlotsForFace(EnumFacing side) { diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java index 2aaca7c34..7f08fc028 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java @@ -107,12 +107,22 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i return EnumSet.noneOf(EnumFacing.class); } + @Override + public boolean sideIsOutput(EnumFacing side) { + return false; + } + @Override public EnumSet getConsumingSides() { return EnumSet.allOf(EnumFacing.class); } + @Override + public boolean sideIsConsumer(EnumFacing side) { + return true; + } + @Override public double getMaxOutput() { @@ -238,7 +248,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Method(modid = "redstoneflux") public boolean canConnectEnergy(EnumFacing from) { - return getConsumingSides().contains(from) || getOutputtingSides().contains(from); + return sideIsConsumer(from) || sideIsOutput(from); } @Override @@ -288,27 +298,27 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Method(modid = "IC2") public boolean isTeleporterCompatible(EnumFacing side) { - return getOutputtingSides().contains(side); + return sideIsOutput(side); } @Override public boolean canOutputEnergy(EnumFacing side) { - return getOutputtingSides().contains(side); + return sideIsOutput(side); } @Override @Method(modid = "IC2") public boolean acceptsEnergyFrom(IEnergyEmitter emitter, EnumFacing direction) { - return getConsumingSides().contains(direction); + return sideIsConsumer(direction); } @Override @Method(modid = "IC2") public boolean emitsEnergyTo(IEnergyAcceptor receiver, EnumFacing direction) { - return getOutputtingSides().contains(direction) && receiver instanceof IEnergyConductor; + return sideIsOutput(direction) && receiver instanceof IEnergyConductor; } @Override @@ -349,7 +359,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Override public boolean canReceiveEnergy(EnumFacing side) { - return getConsumingSides().contains(side); + return sideIsConsumer(side); } @Override @@ -383,12 +393,12 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Override public double acceptEnergy(EnumFacing side, double amount, boolean simulate) { - if(!(getConsumingSides().contains(side) || side == null)) + double toUse = Math.min(getMaxEnergy()-getEnergy(), amount); + + if(toUse < 0.0001 || (side != null && !sideIsConsumer(side))) { return 0; } - - double toUse = Math.min(getMaxEnergy()-getEnergy(), amount); if(!simulate) { @@ -401,13 +411,13 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Override public double pullEnergy(EnumFacing side, double amount, boolean simulate) { - if(!(getOutputtingSides().contains(side) || side == null)) + double toGive = Math.min(getEnergy(), amount); + + if(toGive < 0.0001 || (side != null && !sideIsOutput(side))) { return 0; } - double toGive = Math.min(getEnergy(), amount); - if(!simulate) { setEnergy(getEnergy() - toGive); @@ -423,8 +433,8 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i || capability == Capabilities.ENERGY_ACCEPTOR_CAPABILITY || capability == Capabilities.ENERGY_OUTPUTTER_CAPABILITY || capability == Capabilities.TESLA_HOLDER_CAPABILITY - || (capability == Capabilities.TESLA_CONSUMER_CAPABILITY && getConsumingSides().contains(facing)) - || (capability == Capabilities.TESLA_PRODUCER_CAPABILITY && getOutputtingSides().contains(facing)) + || (capability == Capabilities.TESLA_CONSUMER_CAPABILITY && sideIsConsumer(facing)) + || (capability == Capabilities.TESLA_PRODUCER_CAPABILITY && sideIsOutput(facing)) || capability == CapabilityEnergy.ENERGY || super.hasCapability(capability, facing); } @@ -442,8 +452,8 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } if(capability == Capabilities.TESLA_HOLDER_CAPABILITY - || (capability == Capabilities.TESLA_CONSUMER_CAPABILITY && getConsumingSides().contains(facing)) - || (capability == Capabilities.TESLA_PRODUCER_CAPABILITY && getOutputtingSides().contains(facing))) + || (capability == Capabilities.TESLA_CONSUMER_CAPABILITY && sideIsConsumer(facing)) + || (capability == Capabilities.TESLA_PRODUCER_CAPABILITY && sideIsOutput(facing))) { return (T)teslaManager.getWrapper(this, facing); } diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityElectricMachine.java b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricMachine.java index 527ffe57b..51601ce5f 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityElectricMachine.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricMachine.java @@ -101,7 +101,7 @@ public abstract class TileEntityElectricMachine getSyncPacket(TransporterStack stack, boolean kill) { ArrayList data = new ArrayList(); + + if(Mekanism.hooks.MCMPLoaded) + { + MultipartTileNetworkJoiner.addMultipartHeader(this, data, null); + } data.add(1); data.add(kill); @@ -344,7 +350,7 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter())), 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")))); return EnumActionResult.SUCCESS; diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java b/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java index 8932c5072..8cf268e16 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java @@ -22,6 +22,7 @@ import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType.Size; import mekanism.common.capabilities.Capabilities; import mekanism.common.integration.multipart.MultipartMekanism; +import mekanism.common.integration.multipart.MultipartTileNetworkJoiner; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.CapabilityUtils; import mekanism.common.util.MekanismUtils; @@ -373,6 +374,11 @@ public abstract class TileEntitySidedPipe extends TileEntity implements ITileNet @Override public ArrayList getNetworkedData(ArrayList data) { + if(Mekanism.hooks.MCMPLoaded) + { + MultipartTileNetworkJoiner.addMultipartHeader(this, data, null); + } + data.add(currentTransmitterConnections); data.add(currentAcceptorConnections); @@ -412,6 +418,14 @@ public abstract class TileEntitySidedPipe extends TileEntity implements ITileNet return nbtTags; } + @Override + public NBTTagCompound getUpdateTag() + { + NBTTagCompound nbtTags = super.getUpdateTag(); + nbtTags.setInteger("tier", getBaseTier().ordinal()); + return nbtTags; + } + protected void onRefresh() {} public void refreshConnections() @@ -481,6 +495,13 @@ public abstract class TileEntitySidedPipe extends TileEntity implements ITileNet super.invalidate(); } + @Override + public void validate() + { + onWorldJoin(); + super.validate(); + } + @Override public void onChunkUnload() { @@ -615,7 +636,6 @@ public abstract class TileEntitySidedPipe extends TileEntity implements ITileNet for(EnumFacing side : EnumFacing.values()) { - int ord = side.ordinal(); byte connections = getAllCurrentConnections(); if(connectionMapContainsSide(connections, side)) diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityTransmitter.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityTransmitter.java index 0b30468c7..b3f4bc1f1 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityTransmitter.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityTransmitter.java @@ -28,6 +28,8 @@ public abstract class TileEntityTransmitter> e public boolean unloaded = true; public boolean dataRequest = false; + + private N lastClientNetwork = null; public TileEntityTransmitter() { @@ -50,6 +52,10 @@ public abstract class TileEntityTransmitter> e { TransmitterNetworkRegistry.registerOrphanTransmitter(getTransmitter()); } + else if(lastClientNetwork != null) + { + getTransmitter().setTransmitterNetwork(lastClientNetwork); + } unloaded = false; } @@ -90,6 +96,7 @@ public abstract class TileEntityTransmitter> e TransmitterNetworkRegistry.invalidateTransmitter(getTransmitter()); } else { + lastClientNetwork = getTransmitter().getTransmitterNetwork(); getTransmitter().setTransmitterNetwork(null); } } diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java index eaa11274c..006ec4a3b 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java @@ -295,13 +295,13 @@ public class TileEntityUniversalCable extends TileEntityTransmitter outputs = config.getConfig().getOutputs(type); + SideConfig sideConfig = config.getConfig().getConfig(type); + int max = outputs.size() - 1; + int current = outputs.indexOf(outputs.get(sideConfig.get(direction))); if(current < max) { - config.getConfig().getConfig(type)[side] = (byte)(current+1); + sideConfig.set(direction, (byte) (current+1)); } else if(current == max) { - config.getConfig().getConfig(type)[side] = 0; + sideConfig.set(direction, (byte) 0); } - TileEntity tile = (TileEntity)config; - + assert config instanceof TileEntity; + TileEntity tile = (TileEntity) config; tile.markDirty(); } @@ -573,19 +590,21 @@ public final class MekanismUtils */ public static void decrementOutput(ISideConfiguration config, TransmissionType type, EnumFacing direction) { - int side = direction.ordinal(); - int max = config.getConfig().getOutputs(type).size()-1; - int current = config.getConfig().getOutputs(type).indexOf(config.getConfig().getOutputs(type).get(config.getConfig().getConfig(type)[side])); + ArrayList outputs = config.getConfig().getOutputs(type); + SideConfig sideConfig = config.getConfig().getConfig(type); + int max = outputs.size()-1; + int current = outputs.indexOf(outputs.get(sideConfig.get(direction))); if(current > 0) { - config.getConfig().getConfig(type)[side] = (byte)(current-1); + sideConfig.set(direction, (byte)(current - 1)); } else if(current == 0) { - config.getConfig().getConfig(type)[side] = (byte)max; + sideConfig.set(direction, (byte)max); } + assert config instanceof TileEntity; TileEntity tile = (TileEntity)config; tile.markDirty(); } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java index 6f0ba6784..98aa47409 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java @@ -25,6 +25,11 @@ public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator i return EnumSet.of(facing); } + @Override + public boolean sideIsOutput(EnumFacing side) { + return side == facing; + } + @Override public void onPlace() { diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index 08c1f5a29..db1b03243 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -122,12 +122,22 @@ public abstract class TileEntityGenerator extends TileEntityNoisyBlock implement return EnumSet.noneOf(EnumFacing.class); } + @Override + public boolean sideIsConsumer(EnumFacing side) { + return false; + } + @Override public EnumSet getOutputtingSides() { return EnumSet.of(facing); } + @Override + public boolean sideIsOutput(EnumFacing side) { + return side == facing; + } + /** * Whether or not this generator can operate. * @return if the generator can operate diff --git a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java index 3eeb6aa83..b87916689 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java @@ -194,6 +194,11 @@ public class TileEntitySolarGenerator extends TileEntityGenerator return EnumSet.of(EnumFacing.getFront(0)); } + @Override + public boolean sideIsOutput(EnumFacing side) { + return side == EnumFacing.DOWN; + } + @Override public boolean renderUpdate() { diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java index 6f92bf465..3f423e422 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java @@ -82,12 +82,22 @@ public abstract class TileEntityReactorBlock extends TileEntityElectricBlock return EnumSet.noneOf(EnumFacing.class); } + @Override + public boolean sideIsOutput(EnumFacing side) { + return false; + } + @Override public EnumSet getConsumingSides() { return EnumSet.noneOf(EnumFacing.class); } - + + @Override + public boolean sideIsConsumer(EnumFacing side) { + return false; + } + @Override public void onChunkUnload() { diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java index 5495c540c..85895f821 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java @@ -290,12 +290,22 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl return EnumSet.allOf(EnumFacing.class); } + @Override + public boolean sideIsOutput(EnumFacing side) { + return true; + } + @Override public EnumSet getConsumingSides() { return EnumSet.noneOf(EnumFacing.class); } + @Override + public boolean sideIsConsumer(EnumFacing side) { + return false; + } + @Override public double getMaxOutput() { diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java index ee1a81822..b11e99aea 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java @@ -77,7 +77,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I { if(structure != null) { - EnumSet set = EnumSet.allOf(EnumFacing.class); + EnumSet set = EnumSet.allOf(EnumFacing.class); for(EnumFacing side : EnumFacing.VALUES) { @@ -93,11 +93,25 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I return EnumSet.noneOf(EnumFacing.class); } + @Override + public boolean sideIsOutput(EnumFacing side) { + if (structure != null) + { + return !structure.locations.contains(Coord4D.get(this).offset(side)); + } + return false; + } + @Override public EnumSet getConsumingSides() { return EnumSet.noneOf(EnumFacing.class); } + + @Override + public boolean sideIsConsumer(EnumFacing side) { + return false; + } @Method(modid = "IC2") public void register() @@ -185,7 +199,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I @Method(modid = "redstoneflux") public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate) { - if(getOutputtingSides().contains(from)) + if(sideIsOutput(from)) { double toSend = Math.min(getEnergy(), Math.min(getMaxOutput(), maxExtract*general.FROM_RF)); @@ -259,7 +273,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I @Override public boolean canOutputEnergy(EnumFacing side) { - return getOutputtingSides().contains(side); + return sideIsOutput(side); } @Override @@ -273,7 +287,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I @Method(modid = "IC2") public boolean emitsEnergyTo(IEnergyAcceptor receiver, EnumFacing direction) { - return getOutputtingSides().contains(direction) && receiver instanceof IEnergyConductor; + return sideIsOutput(direction) && receiver instanceof IEnergyConductor; } @Override @@ -351,13 +365,13 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I @Override public double pullEnergy(EnumFacing side, double amount, boolean simulate) { - if(!getOutputtingSides().contains(side)) + double toGive = Math.min(getEnergy(), amount); + + if(toGive < 0.0001 || (side != null && !sideIsOutput(side))) { return 0; } - double toGive = Math.min(getEnergy(), amount); - if(!simulate) { setEnergy(getEnergy() - toGive); @@ -478,7 +492,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I || capability == Capabilities.ENERGY_STORAGE_CAPABILITY || capability == Capabilities.ENERGY_OUTPUTTER_CAPABILITY || capability == Capabilities.TESLA_HOLDER_CAPABILITY - || (capability == Capabilities.TESLA_PRODUCER_CAPABILITY && getOutputtingSides().contains(facing)) + || (capability == Capabilities.TESLA_PRODUCER_CAPABILITY && sideIsOutput(facing)) || capability == CapabilityEnergy.ENERGY) { return true; @@ -507,7 +521,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I } if(capability == Capabilities.TESLA_HOLDER_CAPABILITY - || (capability == Capabilities.TESLA_PRODUCER_CAPABILITY && getOutputtingSides().contains(facing))) + || (capability == Capabilities.TESLA_PRODUCER_CAPABILITY && sideIsOutput(facing))) { return (T)teslaManager.getWrapper(this, facing); }