From b0d211582c9eb29a80b2bdb46c60064ff337ea81 Mon Sep 17 00:00:00 2001 From: Chris Anderson Date: Wed, 28 Jun 2017 16:20:08 -0600 Subject: [PATCH 01/22] Fix MCMP ClassCastException and usability Fixes #4492 --- .../common/block/BlockTransmitter.java | 104 ++++++++++++------ .../multipart/MultipartGlowPanel.java | 7 ++ .../multipart/MultipartMekanism.java | 22 ++++ .../multipart/MultipartTransmitter.java | 40 +++++++ .../tile/transmitter/TileEntitySidedPipe.java | 7 ++ .../transmitter/TileEntityTransmitter.java | 7 ++ 6 files changed, 154 insertions(+), 33 deletions(-) diff --git a/src/main/java/mekanism/common/block/BlockTransmitter.java b/src/main/java/mekanism/common/block/BlockTransmitter.java index 7b094a3fd..0419b9011 100644 --- a/src/main/java/mekanism/common/block/BlockTransmitter.java +++ b/src/main/java/mekanism/common/block/BlockTransmitter.java @@ -2,6 +2,7 @@ package mekanism.common.block; import java.util.Arrays; import java.util.List; +import java.util.Optional; import java.util.Random; import javax.annotation.Nullable; @@ -14,6 +15,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 +97,10 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - TileEntity tile = worldIn.getTileEntity(pos); - - if(tile instanceof TileEntitySidedPipe) + Optional tile = getTileEntitySidedPipe(worldIn.getTileEntity(pos)); + if(tile.isPresent()) { - state = state.withProperty(BlockStateTransmitter.tierProperty, ((TileEntitySidedPipe)tile).getBaseTier()); + state = state.withProperty(BlockStateTransmitter.tierProperty, tile.get().getBaseTier()); } return state; @@ -129,11 +130,11 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public IBlockState getExtendedState(IBlockState state, IBlockAccess w, BlockPos pos) { - TileEntitySidedPipe tile = (TileEntitySidedPipe)w.getTileEntity(pos); + Optional tile = getTileEntitySidedPipe(w.getTileEntity(pos)); - if(tile != null) + if(tile.isPresent()) { - return tile.getExtendedState(state); + return tile.get().getExtendedState(state); } else { ConnectionType[] typeArray = new ConnectionType[] {ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL, @@ -147,9 +148,9 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntity tile = world.getTileEntity(pos); + Optional tile = getTileEntitySidedPipe(world.getTileEntity(pos)); - if(tile instanceof TileEntitySidedPipe && ((TileEntitySidedPipe)tile).getTransmitterType().getSize() == Size.SMALL) + if(tile.isPresent() && tile.get().getTransmitterType().getSize() == Size.SMALL) { return smallSides[6]; } @@ -160,11 +161,11 @@ 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); + Optional tile = getTileEntitySidedPipe(world.getTileEntity(pos)); - if(tile != null) + if(tile.isPresent()) { - List boxes = tile.getCollisionBoxes(entityBox.offset(-pos.getX(), -pos.getY(), -pos.getZ())); + List boxes = tile.get().getCollisionBoxes(entityBox.offset(-pos.getX(), -pos.getY(), -pos.getZ())); for(AxisAlignedBB box : boxes) { @@ -176,25 +177,25 @@ 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.getTileEntity(pos)).orElse(null)).offset(pos); } @Override public RayTraceResult collisionRayTrace(IBlockState blockState, World world, BlockPos pos, Vec3d start, Vec3d end) { - TileEntitySidedPipe tile = (TileEntitySidedPipe)world.getTileEntity(pos); + Optional tile = getTileEntitySidedPipe(world.getTileEntity(pos)); - if(tile == null) + if(!tile.isPresent()) { return null; } - List boxes = tile.getCollisionBoxes(); + List boxes = tile.get().getCollisionBoxes(); AdvancedRayTraceResult result = MultipartUtils.collisionRayTrace(pos, start, end, boxes); if(result != null && result.valid()) { - setDefaultForTile(tile, result.bounds); + setDefaultForTile(tile.get(), result.bounds); } return result != null ? result.hit : null; @@ -226,16 +227,24 @@ 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; + Optional tileEntity = getTileEntitySidedPipe(world.getTileEntity(pos)); + if(!tileEntity.isPresent()) { - itemStack.setTagCompound(new NBTTagCompound()); + itemStack = ItemStack.EMPTY; + } + else + { + itemStack = new ItemStack(MekanismBlocks.Transmitter, 1, tileEntity.get().getTransmitterType().ordinal()); + + if(!itemStack.hasTagCompound()) + { + itemStack.setTagCompound(new NBTTagCompound()); + } + + ITierItem tierItem = (ITierItem)itemStack.getItem(); + tierItem.setBaseTier(itemStack, tileEntity.get().getBaseTier()); } - - ITierItem tierItem = (ITierItem)itemStack.getItem(); - tierItem.setBaseTier(itemStack, tileEntity.getBaseTier()); return itemStack; } @@ -286,24 +295,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(); + Optional tile = getTileEntitySidedPipe(world.getTileEntity(pos)); + if(tile.isPresent()) + { + tile.get().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); + Optional tile = getTileEntitySidedPipe(world.getTileEntity(pos)); + if(tile.isPresent()) + { + EnumFacing side = EnumFacing.getFacingFromVector(neighbor.getX() - pos.getX(), neighbor.getY() - pos.getY(), neighbor.getZ() - pos.getZ()); + tile.get().onNeighborBlockChange(side); + } } @Override public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos neighbor) { - TileEntitySidedPipe tile = (TileEntitySidedPipe)world.getTileEntity(pos); - EnumFacing side = EnumFacing.getFacingFromVector(neighbor.getX() - pos.getX(), neighbor.getY() - pos.getY(), neighbor.getZ() - pos.getZ()); - tile.onNeighborTileChange(side); + Optional tile = getTileEntitySidedPipe(world.getTileEntity(pos)); + if(tile.isPresent()) + { + EnumFacing side = EnumFacing.getFacingFromVector(neighbor.getX() - pos.getX(), neighbor.getY() - pos.getY(), neighbor.getZ() - pos.getZ()); + tile.get().onNeighborTileChange(side); + } } @Override @@ -424,4 +442,24 @@ public class BlockTransmitter extends Block implements ITileEntityProvider return null; } + + private Optional getTileEntitySidedPipe(TileEntity entity) + { + if(entity instanceof TileEntitySidedPipe) + { + return Optional.of((TileEntitySidedPipe)entity); + } + else if(Mekanism.hooks.MCMPLoaded && MultipartMekanism.isMultiPartContainer(entity)) + { + for(TileEntity childEntity : MultipartMekanism.getTileEntities(entity)) + { + if(childEntity instanceof TileEntitySidedPipe) + { + return Optional.of((TileEntitySidedPipe)childEntity); + } + } + } + + return Optional.empty(); + } } diff --git a/src/main/java/mekanism/common/integration/multipart/MultipartGlowPanel.java b/src/main/java/mekanism/common/integration/multipart/MultipartGlowPanel.java index 415a7e9aa..7a41b2b8a 100644 --- a/src/main/java/mekanism/common/integration/multipart/MultipartGlowPanel.java +++ b/src/main/java/mekanism/common/integration/multipart/MultipartGlowPanel.java @@ -3,7 +3,9 @@ package mekanism.common.integration.multipart; import mcmultipart.api.multipart.IMultipart; import mcmultipart.api.slot.EnumFaceSlot; import mcmultipart.api.slot.IPartSlot; +import mekanism.common.MekanismBlocks; import mekanism.common.block.states.BlockStateFacing; +import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.EnumFacing; @@ -24,4 +26,9 @@ public class MultipartGlowPanel implements IMultipart { return EnumFaceSlot.values()[state.getValue(BlockStateFacing.facingProperty).ordinal()]; } + + @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..b88c945ce 100644 --- a/src/main/java/mekanism/common/integration/multipart/MultipartMekanism.java +++ b/src/main/java/mekanism/common/integration/multipart/MultipartMekanism.java @@ -3,14 +3,17 @@ package mekanism.common.integration.multipart; import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_1; import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_2; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.stream.Collectors; import javax.annotation.Nonnull; 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; @@ -162,4 +165,23 @@ public class MultipartMekanism implements IMCMPAddon return Collections.emptyList(); } + + public static boolean isMultiPartContainer(TileEntity entity) + { + return entity instanceof IMultipartContainer; + } + + public static Collection getTileEntities(TileEntity container) + { + if(container instanceof IMultipartContainer) + { + return ((IMultipartContainer)container).getParts().values().stream() + .map(partInfo -> partInfo.getPart()) + .filter(part -> part instanceof MultipartTile) + .map(part -> ((MultipartTile)part).getTileEntity()) + .collect(Collectors.toList()); + } + + return new ArrayList(); + } } diff --git a/src/main/java/mekanism/common/integration/multipart/MultipartTransmitter.java b/src/main/java/mekanism/common/integration/multipart/MultipartTransmitter.java index 947af9bbf..94b0beeaf 100644 --- a/src/main/java/mekanism/common/integration/multipart/MultipartTransmitter.java +++ b/src/main/java/mekanism/common/integration/multipart/MultipartTransmitter.java @@ -4,7 +4,9 @@ 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.tile.transmitter.TileEntitySidedPipe; +import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.tileentity.TileEntity; @@ -27,6 +29,28 @@ 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).onPartChanged(null); + } + } + + @Override + public void onPartAdded(IPartInfo part, IPartInfo otherPart) + { + TileEntity tile = part.getTile().getTileEntity(); + + if(tile instanceof TileEntitySidedPipe) + { + tile.validate(); + } + } + @Override public void onPartChanged(IPartInfo part, IPartInfo otherPart) { @@ -37,4 +61,20 @@ public class MultipartTransmitter implements IMultipart ((TileEntitySidedPipe)tile).onPartChanged(otherPart.getPart()); } } + + @Override + public void onPartRemoved(IPartInfo part, IPartInfo otherPart) + { + TileEntity tile = part.getTile().getTileEntity(); + + if(tile instanceof TileEntitySidedPipe) + { + ((TileEntitySidedPipe)tile).onPartChanged(otherPart.getPart()); + } + } + + @Override + public Block getBlock() { + return MekanismBlocks.Transmitter; + } } diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java b/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java index 261fd2c3d..a12465463 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java @@ -481,6 +481,13 @@ public abstract class TileEntitySidedPipe extends TileEntity implements ITileNet super.invalidate(); } + @Override + public void validate() + { + onWorldJoin(); + super.validate(); + } + @Override public void onChunkUnload() { 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); } } From 0a519ca1e7c46af911595c13a283a6e0a6ffd1df Mon Sep 17 00:00:00 2001 From: Chris Anderson Date: Sun, 2 Jul 2017 17:04:02 -0600 Subject: [PATCH 02/22] Fix issue with transmitters in multiparts not dropping items when harvested --- .../integration/multipart/MultipartTransmitter.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/integration/multipart/MultipartTransmitter.java b/src/main/java/mekanism/common/integration/multipart/MultipartTransmitter.java index 94b0beeaf..4f48cf92c 100644 --- a/src/main/java/mekanism/common/integration/multipart/MultipartTransmitter.java +++ b/src/main/java/mekanism/common/integration/multipart/MultipartTransmitter.java @@ -9,6 +9,7 @@ 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.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; @@ -63,14 +64,18 @@ public class MultipartTransmitter implements IMultipart } @Override - public void onPartRemoved(IPartInfo part, IPartInfo otherPart) + public void onPartHarvested(IPartInfo part, EntityPlayer player) { TileEntity tile = part.getTile().getTileEntity(); if(tile instanceof TileEntitySidedPipe) { - ((TileEntitySidedPipe)tile).onPartChanged(otherPart.getPart()); + IBlockState partState = part.getState(); + partState.getBlock().removedByPlayer(partState, part.getPartWorld(), + part.getContainer().getPartPos(), player, true); } + + IMultipart.super.onPartHarvested(part, player); } @Override From cd8cbf43b1fdfbc794613896926177731c6ef564 Mon Sep 17 00:00:00 2001 From: Chris Anderson Date: Tue, 18 Jul 2017 01:14:35 -0600 Subject: [PATCH 03/22] Commit changes based on feedback --- .../common/block/BlockTransmitter.java | 76 +++++++++---------- .../multipart/MultipartMekanism.java | 20 +++-- .../multipart/MultipartTransmitter.java | 2 +- 3 files changed, 50 insertions(+), 48 deletions(-) diff --git a/src/main/java/mekanism/common/block/BlockTransmitter.java b/src/main/java/mekanism/common/block/BlockTransmitter.java index 0419b9011..a02bda69f 100644 --- a/src/main/java/mekanism/common/block/BlockTransmitter.java +++ b/src/main/java/mekanism/common/block/BlockTransmitter.java @@ -97,10 +97,10 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - Optional tile = getTileEntitySidedPipe(worldIn.getTileEntity(pos)); - if(tile.isPresent()) + TileEntitySidedPipe tile = getTileEntitySidedPipe(worldIn.getTileEntity(pos)); + if(tile != null) { - state = state.withProperty(BlockStateTransmitter.tierProperty, tile.get().getBaseTier()); + state = state.withProperty(BlockStateTransmitter.tierProperty, tile.getBaseTier()); } return state; @@ -130,11 +130,11 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public IBlockState getExtendedState(IBlockState state, IBlockAccess w, BlockPos pos) { - Optional tile = getTileEntitySidedPipe(w.getTileEntity(pos)); + TileEntitySidedPipe tile = getTileEntitySidedPipe(w.getTileEntity(pos)); - if(tile.isPresent()) + if(tile != null) { - return tile.get().getExtendedState(state); + return tile.getExtendedState(state); } else { ConnectionType[] typeArray = new ConnectionType[] {ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL, @@ -148,9 +148,9 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { - Optional tile = getTileEntitySidedPipe(world.getTileEntity(pos)); + TileEntitySidedPipe tile = getTileEntitySidedPipe(world.getTileEntity(pos)); - if(tile.isPresent() && tile.get().getTransmitterType().getSize() == Size.SMALL) + if(tile != null && tile.getTransmitterType().getSize() == Size.SMALL) { return smallSides[6]; } @@ -161,11 +161,11 @@ 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) { - Optional tile = getTileEntitySidedPipe(world.getTileEntity(pos)); + TileEntitySidedPipe tile = getTileEntitySidedPipe(world.getTileEntity(pos)); - if(tile.isPresent()) + if(tile != null) { - List boxes = tile.get().getCollisionBoxes(entityBox.offset(-pos.getX(), -pos.getY(), -pos.getZ())); + List boxes = tile.getCollisionBoxes(entityBox.offset(-pos.getX(), -pos.getY(), -pos.getZ())); for(AxisAlignedBB box : boxes) { @@ -177,25 +177,25 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World world, BlockPos pos) { - return getDefaultForTile(getTileEntitySidedPipe(world.getTileEntity(pos)).orElse(null)).offset(pos); + return getDefaultForTile(getTileEntitySidedPipe(world.getTileEntity(pos))).offset(pos); } @Override public RayTraceResult collisionRayTrace(IBlockState blockState, World world, BlockPos pos, Vec3d start, Vec3d end) { - Optional tile = getTileEntitySidedPipe(world.getTileEntity(pos)); + TileEntitySidedPipe tile = getTileEntitySidedPipe(world.getTileEntity(pos)); - if(!tile.isPresent()) + if(tile == null) { return null; } - List boxes = tile.get().getCollisionBoxes(); + List boxes = tile.getCollisionBoxes(); AdvancedRayTraceResult result = MultipartUtils.collisionRayTrace(pos, start, end, boxes); if(result != null && result.valid()) { - setDefaultForTile(tile.get(), result.bounds); + setDefaultForTile(tile, result.bounds); } return result != null ? result.hit : null; @@ -227,15 +227,11 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { - ItemStack itemStack; - Optional tileEntity = getTileEntitySidedPipe(world.getTileEntity(pos)); - if(!tileEntity.isPresent()) + ItemStack itemStack = ItemStack.EMPTY; + TileEntitySidedPipe tileEntity = getTileEntitySidedPipe(world.getTileEntity(pos)); + if(tileEntity != null) { - itemStack = ItemStack.EMPTY; - } - else - { - itemStack = new ItemStack(MekanismBlocks.Transmitter, 1, tileEntity.get().getTransmitterType().ordinal()); + itemStack = new ItemStack(MekanismBlocks.Transmitter, 1, tileEntity.getTransmitterType().ordinal()); if(!itemStack.hasTagCompound()) { @@ -243,7 +239,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider } ITierItem tierItem = (ITierItem)itemStack.getItem(); - tierItem.setBaseTier(itemStack, tileEntity.get().getBaseTier()); + tierItem.setBaseTier(itemStack, tileEntity.getBaseTier()); } return itemStack; @@ -295,32 +291,32 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { - Optional tile = getTileEntitySidedPipe(world.getTileEntity(pos)); - if(tile.isPresent()) + TileEntitySidedPipe tile = getTileEntitySidedPipe(world.getTileEntity(pos)); + if(tile != null) { - tile.get().onAdded(); + tile.onAdded(); } } @Override public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos neighbor) { - Optional tile = getTileEntitySidedPipe(world.getTileEntity(pos)); - if(tile.isPresent()) + TileEntitySidedPipe tile = getTileEntitySidedPipe(world.getTileEntity(pos)); + if(tile != null) { EnumFacing side = EnumFacing.getFacingFromVector(neighbor.getX() - pos.getX(), neighbor.getY() - pos.getY(), neighbor.getZ() - pos.getZ()); - tile.get().onNeighborBlockChange(side); + tile.onNeighborBlockChange(side); } } @Override public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos neighbor) { - Optional tile = getTileEntitySidedPipe(world.getTileEntity(pos)); - if(tile.isPresent()) + TileEntitySidedPipe tile = getTileEntitySidedPipe(world.getTileEntity(pos)); + if(tile != null) { EnumFacing side = EnumFacing.getFacingFromVector(neighbor.getX() - pos.getX(), neighbor.getY() - pos.getY(), neighbor.getZ() - pos.getZ()); - tile.get().onNeighborTileChange(side); + tile.onNeighborTileChange(side); } } @@ -443,23 +439,25 @@ public class BlockTransmitter extends Block implements ITileEntityProvider return null; } - private Optional getTileEntitySidedPipe(TileEntity entity) + private TileEntitySidedPipe getTileEntitySidedPipe(TileEntity entity) { + TileEntitySidedPipe tileEntity = null; if(entity instanceof TileEntitySidedPipe) { - return Optional.of((TileEntitySidedPipe)entity); + tileEntity = (TileEntitySidedPipe)entity; } else if(Mekanism.hooks.MCMPLoaded && MultipartMekanism.isMultiPartContainer(entity)) { - for(TileEntity childEntity : MultipartMekanism.getTileEntities(entity)) + for(TileEntity childEntity : MultipartMekanism.getMekanismTileEntities(entity)) { if(childEntity instanceof TileEntitySidedPipe) { - return Optional.of((TileEntitySidedPipe)childEntity); + tileEntity = (TileEntitySidedPipe)childEntity; + break; } } } - return Optional.empty(); + return tileEntity; } } diff --git a/src/main/java/mekanism/common/integration/multipart/MultipartMekanism.java b/src/main/java/mekanism/common/integration/multipart/MultipartMekanism.java index b88c945ce..5de3dbab5 100644 --- a/src/main/java/mekanism/common/integration/multipart/MultipartMekanism.java +++ b/src/main/java/mekanism/common/integration/multipart/MultipartMekanism.java @@ -6,7 +6,6 @@ import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHIN import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.stream.Collectors; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -171,17 +170,22 @@ public class MultipartMekanism implements IMCMPAddon return entity instanceof IMultipartContainer; } - public static Collection getTileEntities(TileEntity container) + public static Collection getMekanismTileEntities(TileEntity container) { + ArrayList entities = new ArrayList<>(); + if(container instanceof IMultipartContainer) { - return ((IMultipartContainer)container).getParts().values().stream() - .map(partInfo -> partInfo.getPart()) - .filter(part -> part instanceof MultipartTile) - .map(part -> ((MultipartTile)part).getTileEntity()) - .collect(Collectors.toList()); + for(IPartInfo partInfo : ((IMultipartContainer)container).getParts().values()) + { + IMultipartTile partTile = partInfo.getTile(); + if(partTile instanceof MultipartTile) + { + entities.add(((MultipartTile)partTile).getTileEntity()); + } + } } - return new ArrayList(); + return entities; } } diff --git a/src/main/java/mekanism/common/integration/multipart/MultipartTransmitter.java b/src/main/java/mekanism/common/integration/multipart/MultipartTransmitter.java index 4f48cf92c..d17656e59 100644 --- a/src/main/java/mekanism/common/integration/multipart/MultipartTransmitter.java +++ b/src/main/java/mekanism/common/integration/multipart/MultipartTransmitter.java @@ -37,7 +37,7 @@ public class MultipartTransmitter implements IMultipart if(tile instanceof TileEntitySidedPipe) { - ((TileEntitySidedPipe)tile).onPartChanged(null); + ((TileEntitySidedPipe)tile).onAdded(); } } From a34bceac00e9a2c5654c9865a96f8fe98e219288 Mon Sep 17 00:00:00 2001 From: Chris Anderson Date: Sat, 22 Jul 2017 05:13:08 -0600 Subject: [PATCH 04/22] Enhancements and improvements to MCMP functionality - Refactored retrieval of tile entities to take advantage of MCMP world wrapping - Added fixes for glow panels - Added single byte ordinal headers to handlePacketData in possible multipart tiles so that packets can be correctly routed - Added MultipartTileNetworkJoiner to route ITileNetwork packets when multiple network tiles are in the same multipart (i.e. glow panel attached to a transmitter) --- .../mekanism/common/block/BlockGlowPanel.java | 66 +++++++++++---- .../common/block/BlockTransmitter.java | 43 +++++----- .../multipart/MultipartGlowPanel.java | 66 ++++++++++++++- .../multipart/MultipartMekanism.java | 51 ++++++++---- .../multipart/MultipartTileNetworkJoiner.java | 83 +++++++++++++++++++ .../multipart/MultipartTransmitter.java | 23 ++++- .../common/tile/TileEntityGlowPanel.java | 16 ++++ .../TileEntityLogisticalTransporter.java | 15 ++++ .../transmitter/TileEntityMechanicalPipe.java | 11 +++ .../TileEntityPressurizedTube.java | 11 +++ .../tile/transmitter/TileEntitySidedPipe.java | 8 ++ .../TileEntityThermodynamicConductor.java | 10 +++ .../transmitter/TileEntityUniversalCable.java | 11 +++ 13 files changed, 358 insertions(+), 56 deletions(-) create mode 100644 src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java diff --git a/src/main/java/mekanism/common/block/BlockGlowPanel.java b/src/main/java/mekanism/common/block/BlockGlowPanel.java index 0480378b6..ab805fa58 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.MultipartUtils; import net.minecraft.block.Block; @@ -71,7 +72,7 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider @Override public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntityGlowPanel tileEntity = (TileEntityGlowPanel)world.getTileEntity(pos); + TileEntityGlowPanel tileEntity = getTileEntityGlowPanel(world, pos); return tileEntity != null ? state.withProperty(BlockStateFacing.facingProperty, tileEntity.side) : state; } @@ -79,7 +80,7 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider @Override public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntityGlowPanel tileEntity = (TileEntityGlowPanel)world.getTileEntity(pos); + TileEntityGlowPanel tileEntity = getTileEntityGlowPanel(world, pos); if(tileEntity != null) { @@ -97,10 +98,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; @@ -117,10 +118,10 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider @Override public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos neighbor) { - TileEntityGlowPanel tileEntity = (TileEntityGlowPanel)world.getTileEntity(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; @@ -137,11 +138,11 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntity tile = world.getTileEntity(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); @@ -153,10 +154,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 @@ -237,4 +255,24 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider { return false; } + + private static TileEntityGlowPanel getTileEntityGlowPanel(IBlockAccess world, BlockPos pos) + { + TileEntity tileEntity = world.getTileEntity(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 a02bda69f..27b4910b1 100644 --- a/src/main/java/mekanism/common/block/BlockTransmitter.java +++ b/src/main/java/mekanism/common/block/BlockTransmitter.java @@ -2,7 +2,6 @@ package mekanism.common.block; import java.util.Arrays; import java.util.List; -import java.util.Optional; import java.util.Random; import javax.annotation.Nullable; @@ -97,7 +96,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { - TileEntitySidedPipe tile = getTileEntitySidedPipe(worldIn.getTileEntity(pos)); + TileEntitySidedPipe tile = getTileEntitySidedPipe(worldIn, pos); if(tile != null) { state = state.withProperty(BlockStateTransmitter.tierProperty, tile.getBaseTier()); @@ -130,7 +129,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public IBlockState getExtendedState(IBlockState state, IBlockAccess w, BlockPos pos) { - TileEntitySidedPipe tile = getTileEntitySidedPipe(w.getTileEntity(pos)); + TileEntitySidedPipe tile = getTileEntitySidedPipe(w, pos); if(tile != null) { @@ -148,7 +147,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntitySidedPipe tile = getTileEntitySidedPipe(world.getTileEntity(pos)); + TileEntitySidedPipe tile = getTileEntitySidedPipe(world, pos); if(tile != null && tile.getTransmitterType().getSize() == Size.SMALL) { @@ -161,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 = getTileEntitySidedPipe(world.getTileEntity(pos)); + TileEntitySidedPipe tile = getTileEntitySidedPipe(world, pos); if(tile != null) { @@ -177,13 +176,13 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World world, BlockPos pos) { - return getDefaultForTile(getTileEntitySidedPipe(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 = getTileEntitySidedPipe(world.getTileEntity(pos)); + TileEntitySidedPipe tile = getTileEntitySidedPipe(world, pos); if(tile == null) { @@ -228,7 +227,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) { ItemStack itemStack = ItemStack.EMPTY; - TileEntitySidedPipe tileEntity = getTileEntitySidedPipe(world.getTileEntity(pos)); + TileEntitySidedPipe tileEntity = getTileEntitySidedPipe(world, pos); if(tileEntity != null) { itemStack = new ItemStack(MekanismBlocks.Transmitter, 1, tileEntity.getTransmitterType().ordinal()); @@ -291,7 +290,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { - TileEntitySidedPipe tile = getTileEntitySidedPipe(world.getTileEntity(pos)); + TileEntitySidedPipe tile = getTileEntitySidedPipe(world, pos); if(tile != null) { tile.onAdded(); @@ -301,7 +300,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos neighbor) { - TileEntitySidedPipe tile = getTileEntitySidedPipe(world.getTileEntity(pos)); + TileEntitySidedPipe tile = getTileEntitySidedPipe(world, pos); if(tile != null) { EnumFacing side = EnumFacing.getFacingFromVector(neighbor.getX() - pos.getX(), neighbor.getY() - pos.getY(), neighbor.getZ() - pos.getZ()); @@ -312,7 +311,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider @Override public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos neighbor) { - TileEntitySidedPipe tile = getTileEntitySidedPipe(world.getTileEntity(pos)); + TileEntitySidedPipe tile = getTileEntitySidedPipe(world, pos); if(tile != null) { EnumFacing side = EnumFacing.getFacingFromVector(neighbor.getX() - pos.getX(), neighbor.getY() - pos.getY(), neighbor.getZ() - pos.getZ()); @@ -439,25 +438,23 @@ public class BlockTransmitter extends Block implements ITileEntityProvider return null; } - private TileEntitySidedPipe getTileEntitySidedPipe(TileEntity entity) + private static TileEntitySidedPipe getTileEntitySidedPipe(IBlockAccess world, BlockPos pos) { - TileEntitySidedPipe tileEntity = null; - if(entity instanceof TileEntitySidedPipe) + TileEntity tileEntity = world.getTileEntity(pos); + TileEntitySidedPipe sidedPipe = null; + if(tileEntity instanceof TileEntitySidedPipe) { - tileEntity = (TileEntitySidedPipe)entity; + sidedPipe = (TileEntitySidedPipe)tileEntity; } - else if(Mekanism.hooks.MCMPLoaded && MultipartMekanism.isMultiPartContainer(entity)) + else if(Mekanism.hooks.MCMPLoaded) { - for(TileEntity childEntity : MultipartMekanism.getMekanismTileEntities(entity)) + TileEntity childEntity = MultipartMekanism.unwrapTileEntity(world); + if(childEntity instanceof TileEntitySidedPipe) { - if(childEntity instanceof TileEntitySidedPipe) - { - tileEntity = (TileEntitySidedPipe)childEntity; - break; - } + sidedPipe = (TileEntitySidedPipe)childEntity; } } - return tileEntity; + return sidedPipe; } } diff --git a/src/main/java/mekanism/common/integration/multipart/MultipartGlowPanel.java b/src/main/java/mekanism/common/integration/multipart/MultipartGlowPanel.java index 7a41b2b8a..3c4a87e91 100644 --- a/src/main/java/mekanism/common/integration/multipart/MultipartGlowPanel.java +++ b/src/main/java/mekanism/common/integration/multipart/MultipartGlowPanel.java @@ -1,13 +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; @@ -15,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) { @@ -28,7 +40,59 @@ public class MultipartGlowPanel implements IMultipart } @Override - public Block getBlock() { + 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 5de3dbab5..2d6de8905 100644 --- a/src/main/java/mekanism/common/integration/multipart/MultipartMekanism.java +++ b/src/main/java/mekanism/common/integration/multipart/MultipartMekanism.java @@ -3,7 +3,6 @@ package mekanism.common.integration.multipart; import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_1; import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_2; -import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -17,12 +16,16 @@ 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; @@ -31,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; @@ -65,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) @@ -165,27 +171,38 @@ public class MultipartMekanism implements IMCMPAddon return Collections.emptyList(); } - public static boolean isMultiPartContainer(TileEntity entity) + public static boolean hasCenterSlot(IBlockAccess world, BlockPos pos) { - return entity instanceof IMultipartContainer; - } - - public static Collection getMekanismTileEntities(TileEntity container) - { - ArrayList entities = new ArrayList<>(); - - if(container instanceof IMultipartContainer) + IMultipartContainer container = null; + if(world instanceof IMultipartBlockAccess) { - for(IPartInfo partInfo : ((IMultipartContainer)container).getParts().values()) + container = ((IMultipartBlockAccess) world).getPartInfo().getContainer(); + } + else + { + TileEntity possibleContainer = world.getTileEntity(pos); + if(possibleContainer instanceof IMultipartContainer) { - IMultipartTile partTile = partInfo.getTile(); - if(partTile instanceof MultipartTile) - { - entities.add(((MultipartTile)partTile).getTileEntity()); - } + container = (IMultipartContainer)possibleContainer; } } - return entities; + boolean hasCenterSlot = false; + 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..ea24d7fcc --- /dev/null +++ b/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java @@ -0,0 +1,83 @@ +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.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.world.IBlockAccess; + +public class MultipartTileNetworkJoiner implements ITileNetwork +{ + private final HashMap tileSideMap; + + 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) + { + dataStream.markReaderIndex(); + byte side = dataStream.readByte(); + dataStream.resetReaderIndex(); + + ITileNetwork networkTile = tileSideMap.get(side); + if(networkTile == null) + { + break; + } + + networkTile.handlePacketData(dataStream); + } + } + + @Override + public ArrayList getNetworkedData(ArrayList data) + { + for(byte slotValue : tileSideMap.keySet()) + { + tileSideMap.get(slotValue).getNetworkedData(data); + } + + return data; + } +} diff --git a/src/main/java/mekanism/common/integration/multipart/MultipartTransmitter.java b/src/main/java/mekanism/common/integration/multipart/MultipartTransmitter.java index d17656e59..d897cabab 100644 --- a/src/main/java/mekanism/common/integration/multipart/MultipartTransmitter.java +++ b/src/main/java/mekanism/common/integration/multipart/MultipartTransmitter.java @@ -5,11 +5,13 @@ 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; @@ -49,6 +51,7 @@ public class MultipartTransmitter implements IMultipart if(tile instanceof TileEntitySidedPipe) { tile.validate(); + ((TileEntitySidedPipe)tile).notifyTileChange(); } } @@ -79,7 +82,25 @@ public class MultipartTransmitter implements IMultipart } @Override - public Block getBlock() { + 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/tile/TileEntityGlowPanel.java b/src/main/java/mekanism/common/tile/TileEntityGlowPanel.java index 39d712c7d..9fc3554f9 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGlowPanel.java +++ b/src/main/java/mekanism/common/tile/TileEntityGlowPanel.java @@ -37,6 +37,11 @@ public class TileEntityGlowPanel extends TileEntity implements ITileNetwork @Override public void handlePacketData(ByteBuf dataStream) throws Exception { + if(Mekanism.hooks.MCMPLoaded) + { + dataStream.readByte(); + } + side = EnumFacing.getFront(dataStream.readInt()); colour = EnumColor.DYES[dataStream.readInt()]; @@ -46,6 +51,11 @@ public class TileEntityGlowPanel extends TileEntity implements ITileNetwork @Override public ArrayList getNetworkedData(ArrayList data) { + if(Mekanism.hooks.MCMPLoaded) + { + data.add((byte)side.ordinal()); + } + data.add(side.ordinal()); data.add(colour.getMetaValue()); @@ -73,6 +83,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/transmitter/TileEntityLogisticalTransporter.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java index 34e490d9e..499ff5aa0 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java @@ -184,6 +184,11 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter getNetworkedData(ArrayList data) { + if(Mekanism.hooks.MCMPLoaded) + { + data.add((byte)6); + } + data.add(0); super.getNetworkedData(data); @@ -271,6 +281,11 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter getSyncPacket(TransporterStack stack, boolean kill) { ArrayList data = new ArrayList(); + + if(Mekanism.hooks.MCMPLoaded) + { + data.add((byte)6); + } data.add(1); data.add(kill); diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java index a6813e86f..a40bf05a9 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import java.util.Collection; import mekanism.api.transmitters.TransmissionType; +import mekanism.common.Mekanism; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.PipeTier; @@ -314,6 +315,11 @@ public class TileEntityMechanicalPipe extends TileEntityTransmitter getNetworkedData(ArrayList data) { + if(Mekanism.hooks.MCMPLoaded) + { + data.add((byte)6); + } + data.add(tier.ordinal()); super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java index ba66073c3..a164a4de0 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java @@ -10,6 +10,7 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.api.gas.IGasHandler; import mekanism.api.transmitters.TransmissionType; +import mekanism.common.Mekanism; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.TubeTier; @@ -298,6 +299,11 @@ public class TileEntityPressurizedTube extends TileEntityTransmitter getNetworkedData(ArrayList data) { + if(Mekanism.hooks.MCMPLoaded) + { + data.add((byte)6); + } + data.add(tier.ordinal()); super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java b/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java index a12465463..9b84b96d5 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java @@ -412,6 +412,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() diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java index fbc28cd84..e12d82f44 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java @@ -140,6 +140,11 @@ public class TileEntityThermodynamicConductor extends TileEntityTransmitter getNetworkedData(ArrayList data) { + if(Mekanism.hooks.MCMPLoaded) + { + data.add((byte)6); + } + data.add(tier.ordinal()); super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java index 6fddbf4c4..574d4f077 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java @@ -13,6 +13,7 @@ import mekanism.api.energy.EnergyStack; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.transmitters.TransmissionType; +import mekanism.common.Mekanism; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.CableTier; @@ -392,6 +393,11 @@ public class TileEntityUniversalCable extends TileEntityTransmitter getNetworkedData(ArrayList data) { + if(Mekanism.hooks.MCMPLoaded) + { + data.add((byte)6); + } + data.add(tier.ordinal()); super.getNetworkedData(data); From 4691f83274d8a5d7dc8afe6eba6152128ef9ac36 Mon Sep 17 00:00:00 2001 From: Chris Anderson Date: Sat, 22 Jul 2017 21:47:10 -0600 Subject: [PATCH 05/22] Add JavaDoc to MultipartTileNetworkJoiner --- .../multipart/MultipartTileNetworkJoiner.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java b/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java index ea24d7fcc..166e4d4fc 100644 --- a/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java +++ b/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java @@ -13,10 +13,25 @@ import mekanism.common.base.ITileNetwork; import net.minecraft.tileentity.TileEntity; 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<>(); From 3815945d1efc4db3a3da7928cc868e1e4d5949a7 Mon Sep 17 00:00:00 2001 From: Xander Date: Sun, 23 Jul 2017 12:50:43 +0800 Subject: [PATCH 06/22] Fix handling of consumable item fluid containers. Fixes #4539. Also added some null checks. --- .../common/util/FluidContainerUtils.java | 53 ++++++++++++------- 1 file changed, 35 insertions(+), 18 deletions(-) diff --git a/src/main/java/mekanism/common/util/FluidContainerUtils.java b/src/main/java/mekanism/common/util/FluidContainerUtils.java index 330829f5f..7fa9616a0 100644 --- a/src/main/java/mekanism/common/util/FluidContainerUtils.java +++ b/src/main/java/mekanism/common/util/FluidContainerUtils.java @@ -27,40 +27,46 @@ public final class FluidContainerUtils public static FluidStack extractFluid(FluidTank tileTank, TileEntityContainerBlock tile, int slotID, FluidChecker checker) { - FluidStack ret = extractFluid(tileTank.getCapacity()-tileTank.getFluidAmount(), tile.inventory.get(slotID), checker); - tile.inventory.set(slotID, FluidUtil.getFluidHandler(tile.inventory.get(slotID)).getContainer()); + IFluidHandlerItem handler = FluidUtil.getFluidHandler(tile.inventory.get(slotID)); + FluidStack ret = null; + if (handler != null) + { + ret = extractFluid(tileTank.getCapacity() - tileTank.getFluidAmount(), handler, checker); + tile.inventory.set(slotID, handler.getContainer()); + } return ret; } - public static FluidStack extractFluid(int needed, ItemStack container, FluidChecker checker) + public static FluidStack extractFluid(int needed, IFluidHandlerItem handler, FluidChecker checker) { - IFluidHandlerItem handler = FluidUtil.getFluidHandler(container); + if (handler == null) + { + return null; + } + + FluidStack fluidStack = handler.drain(Integer.MAX_VALUE, false); - if(handler == null || FluidUtil.getFluidContained(container) == null) + if(fluidStack == null) { return null; } - if(checker != null && !checker.isValid(FluidUtil.getFluidContained(container).getFluid())) + if(checker != null && !checker.isValid(fluidStack.getFluid())) { return null; } - FluidStack ret = handler.drain(needed, true); - - return ret; + return handler.drain(needed, true); } public static int insertFluid(FluidTank tileTank, ItemStack container) { - return insertFluid(tileTank.getFluid(), container); + return insertFluid(tileTank.getFluid(), FluidUtil.getFluidHandler(container)); } - public static int insertFluid(FluidStack fluid, ItemStack container) + public static int insertFluid(FluidStack fluid, IFluidHandler handler) { - IFluidHandler handler = FluidUtil.getFluidHandler(container); - - if(fluid == null) + if(fluid == null || handler == null) { return 0; } @@ -79,8 +85,13 @@ public final class FluidContainerUtils { ItemStack inputCopy = StackUtils.size(inventory.get(inSlot).copy(), 1); - int drained = insertFluid(stack, inputCopy); - inputCopy = FluidUtil.getFluidHandler(inputCopy).getContainer(); + IFluidHandlerItem handler = FluidUtil.getFluidHandler(inputCopy); + int drained = 0; + if (handler != null) + { + drained = insertFluid(stack, handler); + inputCopy = handler.getContainer(); + } if(!inventory.get(outSlot).isEmpty() && (!ItemHandlerHelper.canItemStacksStack(inventory.get(outSlot), inputCopy) || inventory.get(outSlot).getCount() == inventory.get(outSlot).getMaxStackSize())) { @@ -120,8 +131,14 @@ public final class FluidContainerUtils { final Fluid storedFinal = stored != null ? stored.getFluid() : null; final ItemStack input = StackUtils.size(inventory.get(inSlot).copy(), 1); + final IFluidHandlerItem handler = FluidUtil.getFluidHandler(input); + + if (handler == null) + { + return stored; + } - FluidStack ret = extractFluid(needed, input, new FluidChecker() { + FluidStack ret = extractFluid(needed, handler, new FluidChecker() { @Override public boolean isValid(Fluid f) { @@ -129,7 +146,7 @@ public final class FluidContainerUtils } }); - ItemStack inputCopy = FluidUtil.getFluidHandler(input).getContainer(); + ItemStack inputCopy = handler.getContainer(); if(FluidUtil.getFluidContained(inputCopy) == null && !inputCopy.isEmpty()) { From 8d55f5996b4f18f579d18cfbf5103817c0ab0218 Mon Sep 17 00:00:00 2001 From: Chris Anderson Date: Sun, 23 Jul 2017 15:56:22 -0600 Subject: [PATCH 07/22] Refactoring multipart packet routing * Added addMultipartHeader to MultipartTileNetworkJoiner to determine whether a header is needed and add it if necessary * Moved individual header addition in transmitter implementations to TileEntitySidedPipe --- .../multipart/MultipartMekanism.java | 8 +++- .../multipart/MultipartTileNetworkJoiner.java | 43 +++++++++++++++++-- .../common/tile/TileEntityGlowPanel.java | 8 +--- .../TileEntityLogisticalTransporter.java | 15 ++----- .../transmitter/TileEntityMechanicalPipe.java | 11 ----- .../TileEntityPressurizedTube.java | 11 ----- .../tile/transmitter/TileEntitySidedPipe.java | 7 ++- .../TileEntityThermodynamicConductor.java | 10 ----- .../transmitter/TileEntityUniversalCable.java | 11 ----- 9 files changed, 57 insertions(+), 67 deletions(-) diff --git a/src/main/java/mekanism/common/integration/multipart/MultipartMekanism.java b/src/main/java/mekanism/common/integration/multipart/MultipartMekanism.java index 2d6de8905..346662009 100644 --- a/src/main/java/mekanism/common/integration/multipart/MultipartMekanism.java +++ b/src/main/java/mekanism/common/integration/multipart/MultipartMekanism.java @@ -171,7 +171,7 @@ public class MultipartMekanism implements IMCMPAddon return Collections.emptyList(); } - public static boolean hasCenterSlot(IBlockAccess world, BlockPos pos) + static IMultipartContainer getContainer(IBlockAccess world, BlockPos pos) { IMultipartContainer container = null; if(world instanceof IMultipartBlockAccess) @@ -187,7 +187,13 @@ public class MultipartMekanism implements IMCMPAddon } } + 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(); diff --git a/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java b/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java index 166e4d4fc..4a4a72af3 100644 --- a/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java +++ b/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java @@ -6,11 +6,13 @@ 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; /** @@ -24,7 +26,7 @@ import net.minecraft.world.IBlockAccess; */ public class MultipartTileNetworkJoiner implements ITileNetwork { - private final HashMap tileSideMap; + private final HashMap tileSideMap; /** * Called by MCMP's multipart container when more than one part implements {@link ITileNetwork}.
@@ -71,9 +73,7 @@ public class MultipartTileNetworkJoiner implements ITileNetwork { while(dataStream.readableBytes() > 0) { - dataStream.markReaderIndex(); byte side = dataStream.readByte(); - dataStream.resetReaderIndex(); ITileNetwork networkTile = tileSideMap.get(side); if(networkTile == null) @@ -88,11 +88,46 @@ public class MultipartTileNetworkJoiner implements ITileNetwork @Override public ArrayList getNetworkedData(ArrayList data) { + ArrayList childData = new ArrayList<>(); for(byte slotValue : tileSideMap.keySet()) { - tileSideMap.get(slotValue).getNetworkedData(data); + 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) + { + data.add(0, (byte)(facing == null ? 6 : facing.ordinal())); + } + } } diff --git a/src/main/java/mekanism/common/tile/TileEntityGlowPanel.java b/src/main/java/mekanism/common/tile/TileEntityGlowPanel.java index 9fc3554f9..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; @@ -37,11 +38,6 @@ public class TileEntityGlowPanel extends TileEntity implements ITileNetwork @Override public void handlePacketData(ByteBuf dataStream) throws Exception { - if(Mekanism.hooks.MCMPLoaded) - { - dataStream.readByte(); - } - side = EnumFacing.getFront(dataStream.readInt()); colour = EnumColor.DYES[dataStream.readInt()]; @@ -53,7 +49,7 @@ public class TileEntityGlowPanel extends TileEntity implements ITileNetwork { if(Mekanism.hooks.MCMPLoaded) { - data.add((byte)side.ordinal()); + MultipartTileNetworkJoiner.addMultipartHeader(this, data, side); } data.add(side.ordinal()); diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java index 499ff5aa0..b1eafdea8 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java @@ -21,6 +21,7 @@ import mekanism.common.content.transporter.PathfinderCache; import mekanism.common.content.transporter.TransitRequest; import mekanism.common.content.transporter.TransitRequest.TransitResponse; import mekanism.common.content.transporter.TransporterStack; +import mekanism.common.integration.multipart.MultipartTileNetworkJoiner; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.transmitters.TransporterImpl; import mekanism.common.transmitters.grid.InventoryNetwork; @@ -184,11 +185,6 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter getNetworkedData(ArrayList data) { - if(Mekanism.hooks.MCMPLoaded) - { - data.add((byte)6); - } - data.add(0); super.getNetworkedData(data); @@ -284,7 +275,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/TileEntityMechanicalPipe.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java index a40bf05a9..a6813e86f 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java @@ -6,7 +6,6 @@ import java.util.ArrayList; import java.util.Collection; import mekanism.api.transmitters.TransmissionType; -import mekanism.common.Mekanism; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.PipeTier; @@ -315,11 +314,6 @@ public class TileEntityMechanicalPipe extends TileEntityTransmitter getNetworkedData(ArrayList data) { - if(Mekanism.hooks.MCMPLoaded) - { - data.add((byte)6); - } - data.add(tier.ordinal()); super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java index a164a4de0..ba66073c3 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java @@ -10,7 +10,6 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.api.gas.IGasHandler; import mekanism.api.transmitters.TransmissionType; -import mekanism.common.Mekanism; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.TubeTier; @@ -299,11 +298,6 @@ public class TileEntityPressurizedTube extends TileEntityTransmitter getNetworkedData(ArrayList data) { - if(Mekanism.hooks.MCMPLoaded) - { - data.add((byte)6); - } - data.add(tier.ordinal()); super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java b/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java index 9b84b96d5..e619fbdc6 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); @@ -630,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/TileEntityThermodynamicConductor.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java index e12d82f44..fbc28cd84 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java @@ -140,11 +140,6 @@ public class TileEntityThermodynamicConductor extends TileEntityTransmitter getNetworkedData(ArrayList data) { - if(Mekanism.hooks.MCMPLoaded) - { - data.add((byte)6); - } - data.add(tier.ordinal()); super.getNetworkedData(data); diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java index 574d4f077..6fddbf4c4 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java @@ -13,7 +13,6 @@ import mekanism.api.energy.EnergyStack; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.transmitters.TransmissionType; -import mekanism.common.Mekanism; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.CableTier; @@ -393,11 +392,6 @@ public class TileEntityUniversalCable extends TileEntityTransmitter getNetworkedData(ArrayList data) { - if(Mekanism.hooks.MCMPLoaded) - { - data.add((byte)6); - } - data.add(tier.ordinal()); super.getNetworkedData(data); From 491a03cf63a24895df54eeef0c11a0c31ed04eff Mon Sep 17 00:00:00 2001 From: Richard Carter Date: Sun, 23 Jul 2017 19:00:20 -0400 Subject: [PATCH 08/22] TileEntityFluidTank: call getTileEntity once, not twice Another tiny performance improvement. Showed up when profiling. --- .../java/mekanism/common/tile/TileEntityFluidTank.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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)) { From 0c0411979d6044e4edf7f4571eac492d234dd616 Mon Sep 17 00:00:00 2001 From: Richard Carter Date: Sun, 23 Jul 2017 16:50:02 -0400 Subject: [PATCH 09/22] Add sideIsOutput and sideIsConsumer methods getOutputtingSides and getConsumingSides both have to construct an EnumSet, but most usages only immediately call contains() on the EnumSet and then discard it. Improve performance by adding a method that can test a side and return a boolean, avoiding the EnumSet creation. --- .../mekanism/common/base/IEnergyWrapper.java | 2 ++ .../forgeenergy/ForgeEnergyIntegration.java | 4 +-- .../common/tile/TileEntityChargepad.java | 5 +++ .../common/tile/TileEntityEnergyCube.java | 10 ++++++ .../common/tile/TileEntityInductionPort.java | 36 +++++++++++++------ .../mekanism/common/tile/TileEntityLaser.java | 7 +++- .../tile/TileEntityLogisticalSorter.java | 5 +++ .../tile/TileEntityQuantumEntangloporter.java | 18 ++++++++++ .../tile/TileEntityResistiveHeater.java | 7 +++- .../tile/TileEntitySeismicVibrator.java | 5 +++ .../tile/prefab/TileEntityBasicMachine.java | 9 +++-- .../tile/prefab/TileEntityElectricBlock.java | 30 ++++++++++------ .../TileEntityAdvancedSolarGenerator.java | 5 +++ .../common/tile/TileEntityGenerator.java | 10 ++++++ .../common/tile/TileEntitySolarGenerator.java | 5 +++ .../tile/reactor/TileEntityReactorBlock.java | 12 ++++++- .../tile/reactor/TileEntityReactorPort.java | 10 ++++++ .../tile/turbine/TileEntityTurbineValve.java | 26 ++++++++++---- 18 files changed, 171 insertions(+), 35 deletions(-) diff --git a/src/main/java/mekanism/common/base/IEnergyWrapper.java b/src/main/java/mekanism/common/base/IEnergyWrapper.java index d4e25adab..9c231c4e6 100644 --- a/src/main/java/mekanism/common/base/IEnergyWrapper.java +++ b/src/main/java/mekanism/common/base/IEnergyWrapper.java @@ -25,8 +25,10 @@ import cofh.api.energy.IEnergyReceiver; 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/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/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java index d769bfe39..51540ed55 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/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index ce9ea8eba..89ad3cfd4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -161,12 +161,22 @@ 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/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index ff671f414..c7150965e 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() { @@ -241,7 +255,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement @Override 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); @@ -260,7 +274,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement @Override 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)); @@ -335,21 +349,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 @@ -390,7 +404,7 @@ public class TileEntityInductionPort extends TileEntityInductionCasing implement @Override public boolean canReceiveEnergy(EnumFacing side) { - return getConsumingSides().contains(side); + return sideIsConsumer(side); } @Override @@ -512,8 +526,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); } @@ -531,8 +545,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/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/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/prefab/TileEntityBasicMachine.java b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicMachine.java index e72b39745..1e94bf290 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicMachine.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicMachine.java @@ -30,10 +30,8 @@ public abstract class TileEntityBasicMachine, * 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 c5b417fb9..c39030fea 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() { @@ -235,7 +245,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Override public boolean canConnectEnergy(EnumFacing from) { - return getConsumingSides().contains(from) || getOutputtingSides().contains(from); + return sideIsConsumer(from) || sideIsOutput(from); } @Override @@ -283,27 +293,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 @@ -344,7 +354,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Override public boolean canReceiveEnergy(EnumFacing side) { - return getConsumingSides().contains(side); + return sideIsConsumer(side); } @Override @@ -418,8 +428,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); } @@ -437,8 +447,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/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 2a60e490a..7d973fb07 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 0753b2951..f7ddb4cbb 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() @@ -183,7 +197,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I @Override 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)); @@ -254,7 +268,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I @Override public boolean canOutputEnergy(EnumFacing side) { - return getOutputtingSides().contains(side); + return sideIsOutput(side); } @Override @@ -268,7 +282,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 @@ -473,7 +487,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; @@ -502,7 +516,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); } From a9b023a6b2c40eaf0cec2576f1ced2091462a8c4 Mon Sep 17 00:00:00 2001 From: Richard Carter Date: Sun, 23 Jul 2017 16:55:13 -0400 Subject: [PATCH 10/22] acceptEnergy/pullEnergy: return 0 if machine is full or empty Prior to this change, the machines always updated their energy, which involved a side check and a chunk markDirty; even if the machine is receiving or giving 0 energy. Right upfront, check if the machine needs no energy or has none to give, and if so return 0. I observed greatly increased server tick performance after this change. --- .../common/tile/TileEntityInductionPort.java | 18 +++++++++++------- .../common/tile/TileEntityLaserAmplifier.java | 5 +++++ .../tile/prefab/TileEntityElectricBlock.java | 12 ++++++------ .../transmitter/TileEntityUniversalCable.java | 6 +++--- .../tile/turbine/TileEntityTurbineValve.java | 6 +++--- 5 files changed, 28 insertions(+), 19 deletions(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index c7150965e..d14643187 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -442,13 +442,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); @@ -461,14 +461,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; } 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/prefab/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java index c39030fea..637d0a596 100644 --- a/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java @@ -388,12 +388,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) { @@ -406,13 +406,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); diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java index 6fddbf4c4..4a5245bc2 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java @@ -287,13 +287,13 @@ public class TileEntityUniversalCable extends TileEntityTransmitter Date: Sun, 23 Jul 2017 16:59:05 -0400 Subject: [PATCH 11/22] TileEntityAdvancedBoundingBlock calls getInv twice as much as needed getInv is a non-trivial getter and doesn't need to be called twice in all of these methods. Refactor the methods to only call it once. --- .../tile/TileEntityAdvancedBoundingBlock.java | 190 +++++++++++------- 1 file changed, 112 insertions(+), 78 deletions(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java index c7bfee78f..8b89794a4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java @@ -32,89 +32,97 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp @Override public boolean isEmpty() { - if(getInv() == null) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return true; } - return getInv().isEmpty(); + return inv.isEmpty(); } @Override public int getSizeInventory() { - if(getInv() == null) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return 0; } - return getInv().getSizeInventory(); + return inv.getSizeInventory(); } @Override public ItemStack getStackInSlot(int i) { - if(getInv() == null) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return ItemStack.EMPTY; } - return getInv().getStackInSlot(i); + return inv.getStackInSlot(i); } @Override public ItemStack decrStackSize(int i, int j) { - if(getInv() == null) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return ItemStack.EMPTY; } - return getInv().decrStackSize(i, j); + return inv.decrStackSize(i, j); } @Override public ItemStack removeStackFromSlot(int i) { - if(getInv() == null) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return ItemStack.EMPTY; } - return getInv().removeStackFromSlot(i); + return inv.removeStackFromSlot(i); } @Override public void setInventorySlotContents(int i, ItemStack itemstack) { - if(getInv() == null) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return; } - getInv().setInventorySlotContents(i, itemstack); + inv.setInventorySlotContents(i, itemstack); } @Override public String getName() { - if(getInv() == null) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return "null"; } - return getInv().getName(); + return inv.getName(); } @Override public boolean hasCustomName() { - if(getInv() == null) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return false; } - return getInv().hasCustomName(); + return inv.hasCustomName(); } @Override @@ -126,56 +134,61 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp @Override public int getInventoryStackLimit() { - if(getInv() == null) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return 0; } - return getInv().getInventoryStackLimit(); + return inv.getInventoryStackLimit(); } @Override public boolean isUsableByPlayer(EntityPlayer entityplayer) { - if(getInv() == null) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return false; } - return getInv().isUsableByPlayer(entityplayer); + return inv.isUsableByPlayer(entityplayer); } @Override public void openInventory(EntityPlayer player) { - if(getInv() == null) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return; } - getInv().openInventory(player); + inv.openInventory(player); } @Override public void closeInventory(EntityPlayer player) { - if(getInv() == null) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return; } - getInv().closeInventory(player); + inv.closeInventory(player); } @Override public boolean isItemValidForSlot(int i, ItemStack itemstack) { - if(getInv() == null) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return false; } - return getInv().canBoundInsert(getPos(), i, itemstack); + return inv.canBoundInsert(getPos(), i, itemstack); } @Override @@ -202,12 +215,13 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp @Override public int[] getSlotsForFace(EnumFacing side) { - if(getInv() == null) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return InventoryUtils.EMPTY; } - return getInv().getBoundSlots(getPos(), side); + return inv.getBoundSlots(getPos(), side); } @Override @@ -219,137 +233,138 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp @Override public boolean canExtractItem(int i, ItemStack itemstack, EnumFacing side) { - if(getInv() == null) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return false; } - return getInv().canBoundExtract(getPos(), i, itemstack, side); + return inv.canBoundExtract(getPos(), i, itemstack, side); } @Override @Method(modid = "IC2") public boolean acceptsEnergyFrom(IEnergyEmitter emitter, EnumFacing direction) { - if(getInv() == null) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return false; } - return getInv().acceptsEnergyFrom(emitter, direction); + return inv.acceptsEnergyFrom(emitter, direction); } @Override public int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate) { - if(getInv() == null || !canReceiveEnergy(from)) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null || !canReceiveEnergy(from)) { return 0; } - return getInv().receiveEnergy(from, maxReceive, simulate); + return inv.receiveEnergy(from, maxReceive, simulate); } @Override public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate) { - if(getInv() == null) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return 0; } - return getInv().extractEnergy(from, maxExtract, simulate); + return inv.extractEnergy(from, maxExtract, simulate); } @Override public boolean canConnectEnergy(EnumFacing from) { - if(getInv() == null) - { - return false; - } - return canReceiveEnergy(from); } @Override public int getEnergyStored(EnumFacing from) { - if(getInv() == null) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return 0; } - return getInv().getEnergyStored(from); + return inv.getEnergyStored(from); } @Override public int getMaxEnergyStored(EnumFacing from) { - if(getInv() == null) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return 0; } - return getInv().getMaxEnergyStored(from); + return inv.getMaxEnergyStored(from); } @Override public double acceptEnergy(EnumFacing side, double amount, boolean simulate) { - if(getInv() == null || !canReceiveEnergy(side)) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null || !canReceiveEnergy(side)) { return 0; } - return getInv().acceptEnergy(side, amount, simulate); + return inv.acceptEnergy(side, amount, simulate); } @Override public boolean canReceiveEnergy(EnumFacing side) { - if(getInv() == null) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return false; } - return getInv().canBoundReceiveEnergy(getPos(), side); + return inv.canBoundReceiveEnergy(getPos(), side); } @Override @Method(modid = "IC2") public double getDemandedEnergy() { - if(getInv() == null) - { - return 0; - } - - return getInv().getDemandedEnergy(); + IAdvancedBoundingBlock inv = getInv(); + return inv == null ? 0 : inv.getDemandedEnergy(); } @Override @Method(modid = "IC2") public double injectEnergy(EnumFacing directionFrom, double amount, double voltage) { - if(getInv() == null || !canReceiveEnergy(directionFrom)) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null || !canReceiveEnergy(directionFrom)) { return amount; } - return getInv().injectEnergy(directionFrom, amount, voltage); + return inv.injectEnergy(directionFrom, amount, voltage); } @Override @Method(modid = "IC2") public int getSinkTier() { - if(getInv() == null) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return 0; } - return getInv().getSinkTier(); + return inv.getSinkTier(); } public IAdvancedBoundingBlock getInv() @@ -367,7 +382,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp return null; } - return (IAdvancedBoundingBlock)new Coord4D(mainPos, world).getTileEntity(world); + return (IAdvancedBoundingBlock) tile; } @Override @@ -375,9 +390,10 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp { super.onPower(); - if(getInv() != null) + IAdvancedBoundingBlock inv = getInv(); + if(inv != null) { - getInv().onPower(); + inv.onPower(); } } @@ -386,86 +402,104 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp { super.onNoPower(); - if(getInv() != null) + IAdvancedBoundingBlock inv = getInv(); + if(inv != null) { - getInv().onNoPower(); + inv.onNoPower(); } } @Override public String[] getMethods() { - if(getInv() == null) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return new String[] {}; } - return getInv().getMethods(); + return inv.getMethods(); } @Override public Object[] invoke(int method, Object[] arguments) throws Exception { - if(getInv() == null) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return new Object[] {}; } - return getInv().invoke(method, arguments); + return inv.invoke(method, arguments); } @Override public NBTTagCompound getConfigurationData(NBTTagCompound nbtTags) { - if(getInv() == null) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return new NBTTagCompound(); } - return getInv().getConfigurationData(nbtTags); + return inv.getConfigurationData(nbtTags); } @Override public void setConfigurationData(NBTTagCompound nbtTags) { - if(getInv() == null) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return; } - getInv().setConfigurationData(nbtTags); + inv.setConfigurationData(nbtTags); } @Override public String getDataType() { - if(getInv() == null) + IAdvancedBoundingBlock inv = getInv(); + if(inv == null) { return "null"; } - return getInv().getDataType(); + return inv.getDataType(); } @Override public boolean hasCapability(Capability 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); } } From bc3274825afbd0340c31df811e8fa01ed3f34016 Mon Sep 17 00:00:00 2001 From: Richard Carter Date: Sun, 23 Jul 2017 17:04:24 -0400 Subject: [PATCH 12/22] Some performance-oriented refactoring of TileComponentConfig Add new type "SideConfig" which is observable, this could come in handy later. Add hasSideForData method in componentConfig, which is much more efficient than calling getSidesForData().contains. Refactor duplicate calls to getConfig into single instances. getConfig is a nontrivial method. --- .../network/PacketConfigurationUpdate.java | 2 +- .../common/tile/TileEntityGasTank.java | 2 +- .../tile/TileEntityMetallurgicInfuser.java | 2 +- .../common/tile/component/SideConfig.java | 56 ++++++++++++ .../tile/component/TileComponentConfig.java | 87 +++++++++++-------- .../tile/component/TileComponentEjector.java | 15 ++-- .../TileEntityAdvancedElectricMachine.java | 8 +- .../prefab/TileEntityElectricMachine.java | 2 +- .../mekanism/common/util/MekanismUtils.java | 59 ++++++++----- 9 files changed, 163 insertions(+), 70 deletions(-) create mode 100644 src/main/java/mekanism/common/tile/component/SideConfig.java 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 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,48 @@ 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(int i = 0; i < EnumFacing.VALUES.length; i++) { - EnumFacing side = MekanismUtils.getBaseOrientation(f, facing); - - if(getConfig(type)[side.ordinal()] == dataIndex) + if(config.get(translatedFacings[i]) == dataIndex) { - ret.add(f); + ret.add(translatedFacings[i]); } } return ret; } + + public boolean hasSideForData(TransmissionType type, EnumFacing facing, int dataIndex, EnumFacing sideToTest) + { + return getConfig(type).get(sideToTest) == 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 +120,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 +163,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 +173,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 +197,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 +220,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 +231,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 +250,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 +260,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 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(); } @@ -578,19 +595,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(); } From 7ce1ac4d421add8bb49f85e84d1b62dee5ec442b Mon Sep 17 00:00:00 2001 From: Chris Anderson Date: Sun, 23 Jul 2017 19:02:49 -0600 Subject: [PATCH 13/22] Update addMultipartHeader to stop counting ITileNetwork implementations after 2 --- .../integration/multipart/MultipartTileNetworkJoiner.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java b/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java index 4a4a72af3..765e2135d 100644 --- a/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java +++ b/src/main/java/mekanism/common/integration/multipart/MultipartTileNetworkJoiner.java @@ -121,6 +121,10 @@ public class MultipartTileNetworkJoiner implements ITileNetwork if(part instanceof ITileNetwork) { tileNetworkParts++; + if(tileNetworkParts > 1) + { + break; + } } } } From 7db697213c813422f8711e54e0e79c8086943344 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 23 Jul 2017 18:02:49 -0700 Subject: [PATCH 14/22] Minor cleanup --- .../common/tile/component/SideConfig.java | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/main/java/mekanism/common/tile/component/SideConfig.java b/src/main/java/mekanism/common/tile/component/SideConfig.java index 2c88127a6..7424d7f0b 100644 --- a/src/main/java/mekanism/common/tile/component/SideConfig.java +++ b/src/main/java/mekanism/common/tile/component/SideConfig.java @@ -5,15 +5,15 @@ import net.minecraft.util.EnumFacing; import java.util.Observable; import java.util.Observer; -public class SideConfig { +public class SideConfig +{ private byte[] directions = new byte[EnumFacing.VALUES.length]; private Observable observable = new Observable(); - public SideConfig() - { - } + public SideConfig() {} - public SideConfig(byte[] b) { + public SideConfig(byte[] b) + { this(b[0], b[1], b[2], b[3], b[4], b[5]); assert b.length == EnumFacing.VALUES.length; } @@ -23,34 +23,41 @@ public class SideConfig { setDirections(d, u, n, s, w, e); } - public void setDirections(byte d, byte u, byte n, byte s, byte w, byte 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) { + public byte get(EnumFacing f) + { return directions[f.ordinal()]; } - public byte[] asByteArray() { + public byte[] asByteArray() + { return directions; } - public void set(EnumFacing f, byte value) { + public void set(EnumFacing f, byte value) + { directions[f.ordinal()] = value; observable.notifyObservers(this); } - public void addObserver(Observer o) { + public void addObserver(Observer o) + { observable.addObserver(o); } - public void deleteObserver(Observer o) { + public void deleteObserver(Observer o) + { observable.deleteObserver(o); } } From 77e46985ac243728b3210edcac2592852149d628 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 23 Jul 2017 20:58:01 -0700 Subject: [PATCH 15/22] Fix crash --- .../java/mekanism/common/tile/TileEntityEnergyCube.java | 6 ++++-- .../mekanism/common/tile/component/TileComponentConfig.java | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index 89ad3cfd4..c6549c176 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -162,7 +162,8 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo } @Override - public boolean sideIsConsumer(EnumFacing side) { + public boolean sideIsConsumer(EnumFacing side) + { return configComponent.hasSideForData(TransmissionType.ENERGY, facing, 1, side); } @@ -173,7 +174,8 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements ICo } @Override - public boolean sideIsOutput(EnumFacing side) { + public boolean sideIsOutput(EnumFacing side) + { return configComponent.hasSideForData(TransmissionType.ENERGY, facing, 2, side); } diff --git a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java index da90931cf..682f2dafb 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java @@ -83,6 +83,11 @@ public class TileComponentConfig implements ITileComponent public boolean hasSideForData(TransmissionType type, EnumFacing facing, int dataIndex, EnumFacing sideToTest) { + if(sideToTest == null) + { + return false; + } + return getConfig(type).get(sideToTest) == dataIndex; } From 10550f656ae9de89c3a762cee14c10f0566778d7 Mon Sep 17 00:00:00 2001 From: Tom Elfring Date: Mon, 24 Jul 2017 20:04:54 +0200 Subject: [PATCH 16/22] Add StorageDrawer compat. Adds feature #4558 NOTE: This is not needed in 1.12 --- .../api/IStorageDrawersApi.java | 23 ++++ .../storagedrawers/api/StorageDrawersApi.java | 30 +++++ .../api/config/IAddonConfig.java | 21 ++++ .../api/config/IBlockConfig.java | 14 +++ .../api/config/IIntegrationConfig.java | 6 + .../api/config/IUserConfig.java | 18 +++ .../api/config/package-info.java | 5 + .../api/event/DrawerPopulatedEvent.java | 19 +++ .../api/event/package-info.java | 5 + .../api/pack/BlockConfiguration.java | 42 +++++++ .../storagedrawers/api/pack/BlockType.java | 7 ++ .../storagedrawers/api/pack/TextureType.java | 13 ++ .../storagedrawers/api/pack/package-info.java | 5 + .../storagedrawers/api/package-info.java | 4 + .../api/registry/IIngredientHandler.java | 22 ++++ .../api/registry/IRecipeHandler.java | 36 ++++++ .../api/registry/IRecipeHandlerRegistry.java | 12 ++ .../api/registry/IRenderRegistry.java | 8 ++ .../api/registry/IWailaRegistry.java | 6 + .../api/registry/IWailaTooltipHandler.java | 8 ++ .../api/registry/package-info.java | 5 + .../api/render/IRenderLabel.java | 9 ++ .../api/render/package-info.java | 5 + .../api/security/ISecurityProvider.java | 13 ++ .../api/storage/EnumBasicDrawer.java | 72 +++++++++++ .../storagedrawers/api/storage/IDrawer.java | 119 ++++++++++++++++++ .../api/storage/IDrawerGeometry.java | 8 ++ .../api/storage/IDrawerGroup.java | 26 ++++ .../api/storage/IDrawerGroupInteractive.java | 18 +++ .../api/storage/IFractionalDrawer.java | 28 +++++ .../api/storage/INetworked.java | 5 + .../api/storage/IPriorityGroup.java | 10 ++ .../api/storage/ISmartGroup.java | 20 +++ .../api/storage/attribute/IItemLockable.java | 21 ++++ .../api/storage/attribute/IProtectable.java | 38 ++++++ .../api/storage/attribute/IQuantifiable.java | 16 +++ .../api/storage/attribute/ISealable.java | 16 +++ .../api/storage/attribute/IShroudable.java | 16 +++ .../api/storage/attribute/IVoidable.java | 9 ++ .../api/storage/attribute/LockAttribute.java | 37 ++++++ .../api/storage/attribute/package-info.java | 5 + .../api/storage/package-info.java | 5 + .../common/integration/MekanismHooks.java | 6 + .../StorageDrawerRecipeHandler.java | 55 ++++++++ 44 files changed, 866 insertions(+) create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/IStorageDrawersApi.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/StorageDrawersApi.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IAddonConfig.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IBlockConfig.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IIntegrationConfig.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IUserConfig.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/package-info.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/DrawerPopulatedEvent.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/package-info.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockConfiguration.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockType.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/TextureType.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/package-info.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/package-info.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IIngredientHandler.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandler.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandlerRegistry.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRenderRegistry.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaRegistry.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaTooltipHandler.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/package-info.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/IRenderLabel.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/package-info.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/security/ISecurityProvider.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/EnumBasicDrawer.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawer.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGeometry.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroup.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroupInteractive.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IFractionalDrawer.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/INetworked.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IPriorityGroup.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/ISmartGroup.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IItemLockable.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IProtectable.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IQuantifiable.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/ISealable.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IShroudable.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IVoidable.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/LockAttribute.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/package-info.java create mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/package-info.java create mode 100644 src/main/java/mekanism/common/integration/storagedrawer/StorageDrawerRecipeHandler.java diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/IStorageDrawersApi.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/IStorageDrawersApi.java new file mode 100644 index 000000000..7e0eb580e --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/IStorageDrawersApi.java @@ -0,0 +1,23 @@ +package com.jaquadro.minecraft.storagedrawers.api; + +import com.jaquadro.minecraft.storagedrawers.api.config.IUserConfig; +import com.jaquadro.minecraft.storagedrawers.api.registry.IRecipeHandlerRegistry; +import com.jaquadro.minecraft.storagedrawers.api.registry.IRenderRegistry; +import com.jaquadro.minecraft.storagedrawers.api.registry.IWailaRegistry; + +public interface IStorageDrawersApi +{ + /** + * Recipe handlers are used to make custom recipes compatible with compacting drawers. + */ + IRecipeHandlerRegistry recipeHandlerRegistry (); + + IRenderRegistry renderRegistry (); + + IWailaRegistry wailaRegistry (); + + /** + * User-managed configuration for the Storage Drawers mod. + */ + IUserConfig userConfig (); +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/StorageDrawersApi.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/StorageDrawersApi.java new file mode 100644 index 000000000..b078c8062 --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/StorageDrawersApi.java @@ -0,0 +1,30 @@ +package com.jaquadro.minecraft.storagedrawers.api; + +/** + * Entry point for the public API. + */ +public class StorageDrawersApi +{ + private static IStorageDrawersApi instance; + + public static final String VERSION = "1.10.2-1.3.0"; + + /** + * API entry point. + * + * @return The {@link IStorageDrawersApi} instance or null if the API or Storage Drawers is unavailable. + */ + public static IStorageDrawersApi instance () { + if (instance == null) { + try { + Class classApi = Class.forName( "com.jaquadro.minecraft.storagedrawers.core.Api" ); + instance = (IStorageDrawersApi) classApi.getField("instance").get(null); + } + catch (Throwable t) { + return null; + } + } + + return instance; + } +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IAddonConfig.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IAddonConfig.java new file mode 100644 index 000000000..ca1757971 --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IAddonConfig.java @@ -0,0 +1,21 @@ +package com.jaquadro.minecraft.storagedrawers.api.config; + +public interface IAddonConfig +{ + /** + * Gets whether the user has configured a preference for addon packs to hide their blocks and items from Vanilla + * creative tabs. + */ + boolean showAddonItemsNEI (); + + /** + * Gets whether the user has configured a preference for addon packs to hide their blocks and items from NEI. + */ + boolean showAddonItemsVanilla (); + + /** + * Gets whether the user has configured a preference for addon packs to provide their blocks and items through + * their own vanilla tab. + */ + boolean addonItemsUseSeparateTab (); +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IBlockConfig.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IBlockConfig.java new file mode 100644 index 000000000..f4101e790 --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IBlockConfig.java @@ -0,0 +1,14 @@ +package com.jaquadro.minecraft.storagedrawers.api.config; + +import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration; + +public interface IBlockConfig +{ + String getBlockConfigName (BlockConfiguration blockConfig); + + boolean isBlockEnabled (String blockConfigName); + + int getBlockRecipeOutput (String blockConfigName); + + int getBaseCapacity (String blockConfigName); +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IIntegrationConfig.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IIntegrationConfig.java new file mode 100644 index 000000000..28d9f132c --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IIntegrationConfig.java @@ -0,0 +1,6 @@ +package com.jaquadro.minecraft.storagedrawers.api.config; + +public interface IIntegrationConfig +{ + boolean isRefinedRelocationEnabled (); +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IUserConfig.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IUserConfig.java new file mode 100644 index 000000000..f8aa5e538 --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IUserConfig.java @@ -0,0 +1,18 @@ +package com.jaquadro.minecraft.storagedrawers.api.config; + +/** + * The main hub for user-managed mod configuration. + */ +public interface IUserConfig +{ + /** + * Configuration options related to third party addon packs for Storage Drawers. + */ + @Deprecated + IAddonConfig addonConfig (); + + /** + * Configuration options related to individual blocks. + */ + IBlockConfig blockConfig (); +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/package-info.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/package-info.java new file mode 100644 index 000000000..4a83dca8e --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/package-info.java @@ -0,0 +1,5 @@ +@API(owner = "StorageDrawersAPI", provides = "StorageDrawersAPI|config", apiVersion = StorageDrawersApi.VERSION) +package com.jaquadro.minecraft.storagedrawers.api.config; + +import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; +import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/DrawerPopulatedEvent.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/DrawerPopulatedEvent.java new file mode 100644 index 000000000..e82953e94 --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/DrawerPopulatedEvent.java @@ -0,0 +1,19 @@ +package com.jaquadro.minecraft.storagedrawers.api.event; + +import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; +import net.minecraftforge.fml.common.eventhandler.Event; + +/** + * This event is called when a drawer has been bound to a new item. This is + * and opportunity for mods to cache extended data with the drawer. + * + * This event is also called when the drawer is changed to empty. + */ +public class DrawerPopulatedEvent extends Event +{ + public final IDrawer drawer; + + public DrawerPopulatedEvent (IDrawer drawer) { + this.drawer = drawer; + } +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/package-info.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/package-info.java new file mode 100644 index 000000000..517ce1760 --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/package-info.java @@ -0,0 +1,5 @@ +@API(owner = "StorageDrawersAPI", provides = "StorageDrawersAPI|event", apiVersion = StorageDrawersApi.VERSION) +package com.jaquadro.minecraft.storagedrawers.api.event; + +import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; +import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockConfiguration.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockConfiguration.java new file mode 100644 index 000000000..f0c121e2a --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockConfiguration.java @@ -0,0 +1,42 @@ +package com.jaquadro.minecraft.storagedrawers.api.pack; + +import com.jaquadro.minecraft.storagedrawers.api.storage.EnumBasicDrawer; + +public enum BlockConfiguration +{ + BasicFull1(BlockType.Drawers, EnumBasicDrawer.FULL1), + BasicFull2(BlockType.Drawers, EnumBasicDrawer.FULL2), + BasicFull4(BlockType.Drawers, EnumBasicDrawer.FULL4), + BasicHalf2(BlockType.Drawers, EnumBasicDrawer.HALF2), + BasicHalf4(BlockType.Drawers, EnumBasicDrawer.HALF4), + Trim(BlockType.Trim, null); + + private final BlockType type; + private final EnumBasicDrawer drawer; + + BlockConfiguration (BlockType type, EnumBasicDrawer drawer) { + this.type = type; + this.drawer = drawer; + } + + public BlockType getBlockType () { + return type; + } + + public int getDrawerCount () { + return (drawer != null) ? drawer.getDrawerCount() : 0; + } + + public boolean isHalfDepth () { + return (drawer != null) && drawer.isHalfDepth(); + } + + public static BlockConfiguration by (BlockType type, EnumBasicDrawer drawer) { + for (BlockConfiguration config : values()) { + if (config.type == type && config.drawer == drawer) + return config; + } + + return null; + } +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockType.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockType.java new file mode 100644 index 000000000..f54d4ce8b --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockType.java @@ -0,0 +1,7 @@ +package com.jaquadro.minecraft.storagedrawers.api.pack; + +public enum BlockType +{ + Drawers, + Trim +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/TextureType.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/TextureType.java new file mode 100644 index 000000000..92ca51df3 --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/TextureType.java @@ -0,0 +1,13 @@ +package com.jaquadro.minecraft.storagedrawers.api.pack; + +public enum TextureType +{ + Front1, + Front2, + Front4, + Side, + SideVSplit, + SideHSplit, + TrimBorder, + TrimBlock +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/package-info.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/package-info.java new file mode 100644 index 000000000..2c7367e85 --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/package-info.java @@ -0,0 +1,5 @@ +@API(owner = "StorageDrawersAPI", provides = "StorageDrawersAPI|pack", apiVersion = StorageDrawersApi.VERSION) +package com.jaquadro.minecraft.storagedrawers.api.pack; + +import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; +import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/package-info.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/package-info.java new file mode 100644 index 000000000..86d7280fa --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/package-info.java @@ -0,0 +1,4 @@ +@API(owner = "StorageDrawers", provides = "StorageDrawersAPI", apiVersion = StorageDrawersApi.VERSION) +package com.jaquadro.minecraft.storagedrawers.api; + +import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IIngredientHandler.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IIngredientHandler.java new file mode 100644 index 000000000..0f33fd5c6 --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IIngredientHandler.java @@ -0,0 +1,22 @@ +package com.jaquadro.minecraft.storagedrawers.api.registry; + +import net.minecraft.item.ItemStack; + +import javax.annotation.Nonnull; + +/** + * Ingredient handlers are used to get ItemStacks from ingredients in custom IRecipe implementations. If you have + * registered an IRecipeHandler that returns lists of objects that aren't ItemStacks, then you will need to + * implement an ingredient handler for those objects. + */ +public interface IIngredientHandler +{ + /** + * Gets an ItemStack from an object that represents an ingredient in an IRecipe. + * + * @param object An ingredient object. + * @return An ItemStack for the given ingredient. + */ + @Nonnull + ItemStack getItemStack (Object object); +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandler.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandler.java new file mode 100644 index 000000000..d4311ea8a --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandler.java @@ -0,0 +1,36 @@ +package com.jaquadro.minecraft.storagedrawers.api.registry; + +import net.minecraft.item.crafting.IRecipe; + +import java.util.List; + +/** + * Recipe handlers are used by compacting drawers to find more-compressed forms of blocks and items. If your recipe + * to craft compressed items is a custom IRecipe implementation, you will need to register a handler for it. + */ +public interface IRecipeHandler +{ + /** + * Get the recipe ingredient list as an array of objects (usually used for shaped recipes). + * If your array does not contain ItemStack objects, you will need to register an {@link IIngredientHandler} to + * get an ItemStack from them. + * + * If you would prefer to return a List, return null in this method and implement {@link #getInputAsList}. + * + * @param recipe An instance of a custom {@link IRecipe}. + * @return An array of ItemStacks or objects with a registered {@link IIngredientHandler}. + */ + Object[] getInputAsArray (IRecipe recipe); + + /** + * Get the recipe ingredient list as a list of objects (usually used for shapeless recipes). + * If your list does not contain ItemStack objects, you will need to register an {@link IIngredientHandler} to + * get an ItemStack from them. + * + * If you would prefer to return an array, return null in this method and implement {@link #getInputAsArray}. + * + * @param recipe An instance of a custom {@link IRecipe}. + * @return A list of ItemStacks or objects with a registered {@link IIngredientHandler}. + */ + List getInputAsList (IRecipe recipe); +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandlerRegistry.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandlerRegistry.java new file mode 100644 index 000000000..b83d5347c --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandlerRegistry.java @@ -0,0 +1,12 @@ +package com.jaquadro.minecraft.storagedrawers.api.registry; + +public interface IRecipeHandlerRegistry +{ + void registerRecipeHandler (Class clazz, IRecipeHandler handler); + + void registerIngredientHandler (Class clazz, IIngredientHandler handler); + + IRecipeHandler getRecipeHandler (Class clazz); + + IIngredientHandler getIngredientHandler (Class clazz); +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRenderRegistry.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRenderRegistry.java new file mode 100644 index 000000000..cfa4543a1 --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRenderRegistry.java @@ -0,0 +1,8 @@ +package com.jaquadro.minecraft.storagedrawers.api.registry; + +import com.jaquadro.minecraft.storagedrawers.api.render.IRenderLabel; + +public interface IRenderRegistry +{ + void registerPreLabelRenderHandler (IRenderLabel renderHandler); +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaRegistry.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaRegistry.java new file mode 100644 index 000000000..a4ee9874a --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaRegistry.java @@ -0,0 +1,6 @@ +package com.jaquadro.minecraft.storagedrawers.api.registry; + +public interface IWailaRegistry +{ + void registerTooltipHandler (IWailaTooltipHandler handler); +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaTooltipHandler.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaTooltipHandler.java new file mode 100644 index 000000000..d0f3328c6 --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaTooltipHandler.java @@ -0,0 +1,8 @@ +package com.jaquadro.minecraft.storagedrawers.api.registry; + +import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; + +public interface IWailaTooltipHandler +{ + String transformItemName (IDrawer drawer, String defaultName); +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/package-info.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/package-info.java new file mode 100644 index 000000000..75fe1f250 --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/package-info.java @@ -0,0 +1,5 @@ +@API(owner = "StorageDrawersAPI", provides = "StorageDrawersAPI|registry", apiVersion = StorageDrawersApi.VERSION) +package com.jaquadro.minecraft.storagedrawers.api.registry; + +import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; +import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/IRenderLabel.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/IRenderLabel.java new file mode 100644 index 000000000..500030aa0 --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/IRenderLabel.java @@ -0,0 +1,9 @@ +package com.jaquadro.minecraft.storagedrawers.api.render; + +import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; +import net.minecraft.tileentity.TileEntity; + +public interface IRenderLabel +{ + void render (TileEntity tileEntity, IDrawerGroup drawerGroup, int slot, float brightness, float partialTickTime); +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/package-info.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/package-info.java new file mode 100644 index 000000000..76e937caa --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/package-info.java @@ -0,0 +1,5 @@ +@API(owner = "StorageDrawersAPI", provides = "StorageDrawersAPI|render", apiVersion = StorageDrawersApi.VERSION) +package com.jaquadro.minecraft.storagedrawers.api.render; + +import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; +import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/security/ISecurityProvider.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/security/ISecurityProvider.java new file mode 100644 index 000000000..66752c0c4 --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/security/ISecurityProvider.java @@ -0,0 +1,13 @@ +package com.jaquadro.minecraft.storagedrawers.api.security; + +import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IProtectable; +import com.mojang.authlib.GameProfile; + +public interface ISecurityProvider +{ + String getProviderID (); + + boolean hasOwnership (GameProfile profile, IProtectable target); + + boolean hasAccess (GameProfile profile, IProtectable target); +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/EnumBasicDrawer.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/EnumBasicDrawer.java new file mode 100644 index 000000000..93117ba7b --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/EnumBasicDrawer.java @@ -0,0 +1,72 @@ +package com.jaquadro.minecraft.storagedrawers.api.storage; + +import net.minecraft.util.IStringSerializable; + +import javax.annotation.Nonnull; + +public enum EnumBasicDrawer implements IDrawerGeometry, IStringSerializable +{ + FULL1(0, 1, false, "full1", "fulldrawers1"), + FULL2(1, 2, false, "full2", "fulldrawers2"), + FULL4(2, 4, false, "full4", "fulldrawers4"), + HALF2(3, 2, true, "half2", "halfdrawers2"), + HALF4(4, 4, true, "half4", "halfdrawers4"); + + private static final EnumBasicDrawer[] META_LOOKUP; + + private final int meta; + private final int drawerCount; + private final boolean halfDepth; + private final String name; + private final String unlocalizedName; + + EnumBasicDrawer (int meta, int drawerCount, boolean halfDepth, String name, String unlocalizedName) { + this.meta = meta; + this.name = name; + this.drawerCount = drawerCount; + this.halfDepth = halfDepth; + this.unlocalizedName = unlocalizedName; + } + + public int getMetadata () { + return meta; + } + + @Override + public int getDrawerCount () { + return drawerCount; + } + + @Override + public boolean isHalfDepth () { + return halfDepth; + } + + public String getUnlocalizedName () { + return unlocalizedName; + } + + public static EnumBasicDrawer byMetadata (int meta) { + if (meta < 0 || meta >= META_LOOKUP.length) + meta = 0; + return META_LOOKUP[meta]; + } + + @Override + public String toString () { + return getName(); + } + + @Override + @Nonnull + public String getName () { + return name; + } + + static { + META_LOOKUP = new EnumBasicDrawer[values().length]; + for (EnumBasicDrawer upgrade : values()) { + META_LOOKUP[upgrade.getMetadata()] = upgrade; + } + } +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawer.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawer.java new file mode 100644 index 000000000..851eb6f45 --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawer.java @@ -0,0 +1,119 @@ +package com.jaquadro.minecraft.storagedrawers.api.storage; + +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import javax.annotation.Nonnull; + +public interface IDrawer +{ + /** + * Gets an ItemStack of size 1 representing the type, metadata, and tags of the stored items. + * The returned ItemStack should not be modified for any reason. Make a copy if you need to store or modify it. + */ + @Nonnull + ItemStack getStoredItemPrototype (); + + /** + * Sets the type of the stored item and initializes it to the given amount. Any existing item will be replaced. + * + * @param itemPrototype An ItemStack representing the type, metadata, and tags of the item to store. + * @param amount The amount to initialize the stored item count to. + * @return The IDrawer actually set with the prototype. Some drawer groups can redirect a set operation to another member. + */ + IDrawer setStoredItem (@Nonnull ItemStack itemPrototype, int amount); + + /** + * Gets the number of items stored in this drawer. + */ + int getStoredItemCount (); + + /** + * Sets the number of items stored in this drawer. Triggers syncing of inventories and client data. + * Setting a drawer's count to 0 may also result in the item type being cleared, depending in implementation. + * + * @param amount The new amount of items stored in this drawer. + */ + void setStoredItemCount (int amount); + + /** + * Gets the maximum number of items that can be stored in this drawer. + * This value will vary depending on the max stack size of the stored item type. + */ + int getMaxCapacity (); + + /** + * Gets the maximum number of items that could be stored in this drawer if it held the given item. + * + * @param itemPrototype The item type to query. + */ + int getMaxCapacity (@Nonnull ItemStack itemPrototype); + + /** + * Gets the maxmimum number of items that could be stored in this drawer for a standard item stack size + * of 64. + */ + int getDefaultMaxCapacity (); + + /** + * Gets the number of items that could still be added to this drawer before it is full. + */ + int getRemainingCapacity (); + + /** + * Gets the max stack size of the item type stored in this drawer. Convenience method. + */ + int getStoredItemStackSize (); + + /** + * Gets whether or not an item of the given type and data can be stored in this drawer. + * + * Stack size and available capacity are not considered. For drawers that are not empty, this + * method can allow ore-dictionary compatible items to be accepted into the drawer, as defined by what + * the drawer considers to be an equivalent item. + * For drawers that are empty, locking status is considered. + * + * @param itemPrototype An ItemStack representing the type, metadata, and tags of an item. + */ + boolean canItemBeStored (@Nonnull ItemStack itemPrototype); + + /** + * Gets whether or not an item of the given type and data can be extracted from this drawer. + * + * This is intended to allow outbound ore-dictionary conversions of compatible items, as defined by what + * the drawer considers to be an equivalent item. + * + * @param itemPrototype An ItemStack representing the type, metadata, and tags of an item. + */ + boolean canItemBeExtracted (@Nonnull ItemStack itemPrototype); + + /** + * Gets whether or not the drawer has items. + * A drawer set with an item type and 0 count is not considered empty. + */ + boolean isEmpty (); + + /** + * Gets auxiliary data that has been associated with this drawer. + * + * @param key The key used to identify the data. + * @return An opaque object that was previously stored. + */ + Object getExtendedData (String key); + + /** + * Stores auxiliary data with this drawer, mainly for use in integration. + * @param key The key to identify the data with. + * @param data The data to store. + */ + void setExtendedData (String key, Object data); + + /** + * Called when a component attribute of a drawer (such as lock or void) changes state. + */ + void attributeChanged (); + + void writeToNBT (NBTTagCompound tag); + + void readFromNBT (NBTTagCompound tag); +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGeometry.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGeometry.java new file mode 100644 index 000000000..1dae92ad0 --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGeometry.java @@ -0,0 +1,8 @@ +package com.jaquadro.minecraft.storagedrawers.api.storage; + +public interface IDrawerGeometry +{ + boolean isHalfDepth (); + + int getDrawerCount (); +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroup.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroup.java new file mode 100644 index 000000000..bc54eb6bf --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroup.java @@ -0,0 +1,26 @@ +package com.jaquadro.minecraft.storagedrawers.api.storage; + +public interface IDrawerGroup +{ + /** + * Gets the number of drawers contained within this group. + */ + int getDrawerCount (); + + /** + * Gets the drawer at the given slot within this group. + */ + IDrawer getDrawer (int slot); + + /** + * Gets the drawer at the given slot within this group only if it is enabled. + */ + IDrawer getDrawerIfEnabled (int slot); + + /** + * Gets whether the drawer in the given slot is usable. + */ + boolean isDrawerEnabled (int slot); + + boolean markDirtyIfNeeded (); +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroupInteractive.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroupInteractive.java new file mode 100644 index 000000000..362b11b2b --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroupInteractive.java @@ -0,0 +1,18 @@ +package com.jaquadro.minecraft.storagedrawers.api.storage; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +import javax.annotation.Nonnull; + +public interface IDrawerGroupInteractive extends IDrawerGroup +{ + @Nonnull + ItemStack takeItemsFromSlot (int slot, int count); + + int putItemsIntoSlot (int slot, @Nonnull ItemStack stack, int count); + + int interactPutCurrentItemIntoSlot (int slot, EntityPlayer player); + + int interactPutCurrentInventoryIntoSlot (int slot, EntityPlayer player); +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IFractionalDrawer.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IFractionalDrawer.java new file mode 100644 index 000000000..bd87a808b --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IFractionalDrawer.java @@ -0,0 +1,28 @@ +package com.jaquadro.minecraft.storagedrawers.api.storage; + +/** + * Represents a drawer with items that are a fractional component of another item within the drawer group. Compacting + * Drawers are a primary example of this drawer type. + */ +public interface IFractionalDrawer extends IDrawer +{ + /** + * Gets the storage ratio between the held item and the most compressed item within the drawer group. + * + * For example, most ingots have a conversion rate of 9 compared to metal blocks, and nuggets a rate of 81. + * Actual conversion rates are implementation-defined. + */ + int getConversionRate (); + + /** + * Gets the number of items left in the drawer if the maximum number of equivalent compressed items had been removed. + * The equivalency is determined by the next compression tier, and not necessarily the conversion rate. + */ + int getStoredItemRemainder (); + + /** + * Gets whether or not the stored item represents the smallest granularity of material that can be stored within + * the drawer group. + */ + boolean isSmallestUnit (); +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/INetworked.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/INetworked.java new file mode 100644 index 000000000..fba20d40a --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/INetworked.java @@ -0,0 +1,5 @@ +package com.jaquadro.minecraft.storagedrawers.api.storage; + +public interface INetworked +{ +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IPriorityGroup.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IPriorityGroup.java new file mode 100644 index 000000000..97b293e27 --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IPriorityGroup.java @@ -0,0 +1,10 @@ +package com.jaquadro.minecraft.storagedrawers.api.storage; + + +public interface IPriorityGroup +{ + /** + * Gets the list of available drawer slots in priority order. + */ + int[] getAccessibleDrawerSlots (); +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/ISmartGroup.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/ISmartGroup.java new file mode 100644 index 000000000..8795d77a8 --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/ISmartGroup.java @@ -0,0 +1,20 @@ +package com.jaquadro.minecraft.storagedrawers.api.storage; + +import net.minecraft.item.ItemStack; + +import javax.annotation.Nonnull; + +public interface ISmartGroup +{ + /** + * Gets a lazy enumeration of all slots that will accept at least one item of the given stack, ordered by + * insertion preference. + */ + Iterable enumerateDrawersForInsertion (@Nonnull ItemStack stack, boolean strict); + + /** + * Gets a lazy enumeration of all slots that will provide at least one item of the given stack, ordered by + * extraction preference. + */ + Iterable enumerateDrawersForExtraction (@Nonnull ItemStack stack, boolean strict); +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IItemLockable.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IItemLockable.java new file mode 100644 index 000000000..684822e65 --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IItemLockable.java @@ -0,0 +1,21 @@ +package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; + +public interface IItemLockable +{ + /** + * Gets whether or not a drawer or group is locked for the given lock attribute. + */ + boolean isItemLocked (LockAttribute attr); + + /** + * Gets whether or not the lock state can be changed for the given lock attribute. + * If this method returns false, isItemLocked may still return true. + */ + boolean canItemLock (LockAttribute attr); + + /** + * Sets the lock state of a drawer or group for the given lock attribute. + * If canItemLock returns false, this is a no-op. + */ + void setItemLocked (LockAttribute attr, boolean isLocked); +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IProtectable.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IProtectable.java new file mode 100644 index 000000000..c378c04a9 --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IProtectable.java @@ -0,0 +1,38 @@ +package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; + +import com.jaquadro.minecraft.storagedrawers.api.security.ISecurityProvider; +import net.minecraft.world.ILockableContainer; + +import java.util.UUID; + +public interface IProtectable +{ + /** + * Gets the owner of the drawer, or null if there is no owner. + */ + UUID getOwner (); + + /** + * Sets the owner of the drawer. Set to null to set no owner. + * @return false if the operation is not supported, true otherwise. + */ + boolean setOwner (UUID owner); + + /** + * Gets the provider managing security for the target. + * @return null to use the default provider, which enforces strict owner access. + */ + ISecurityProvider getSecurityProvider (); + + /** + * Gets the lockable interface if it exists on the protected drawer. + * @return A lockable interface, or null if lockable is not supported. + */ + ILockableContainer getLockableContainer (); + + /** + * Sets the provider managing security for the target. Set to null for default provider. + * @return false if the operation is not supported, true otherwise. + */ + boolean setSecurityProvider (ISecurityProvider provder); +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IQuantifiable.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IQuantifiable.java new file mode 100644 index 000000000..1e37e82cb --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IQuantifiable.java @@ -0,0 +1,16 @@ +package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; + +public interface IQuantifiable +{ + /** + * Gets whether or not the drawer has the quantified attribute. + * The quantified attribute instructs the drawer to render its numerical quantity. + */ + boolean isShowingQuantity (); + + /** + * Sets whether or not the drawer is currently quantified. + * @return false if the operation is not supported, true otherwise. + */ + boolean setIsShowingQuantity (boolean state); +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/ISealable.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/ISealable.java new file mode 100644 index 000000000..7330780e1 --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/ISealable.java @@ -0,0 +1,16 @@ +package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; + +public interface ISealable +{ + /** + * Gets whether or not the drawer has the sealed attribute. + * A sealed drawer cannot be interacted with, and when broken will retain all of its items and upgrades. + */ + boolean isSealed (); + + /** + * Sets whether or not the drawer is currently sealed. + * @return false if the operation is not supported, true otherwise. + */ + boolean setIsSealed (boolean state); +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IShroudable.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IShroudable.java new file mode 100644 index 000000000..b7f0bf035 --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IShroudable.java @@ -0,0 +1,16 @@ +package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; + +public interface IShroudable +{ + /** + * Gets whether or not the drawer has the shrouded attribute. + * The shrouded attribute instructs the drawer to not render its item label. + */ + boolean isShrouded (); + + /** + * Sets whether or not the drawer is currently shrouded. + * @return false if the operation is not supported, true otherwise. + */ + boolean setIsShrouded (boolean state); +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IVoidable.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IVoidable.java new file mode 100644 index 000000000..9fc580635 --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IVoidable.java @@ -0,0 +1,9 @@ +package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; + +public interface IVoidable +{ + /** + * Gets whether or not the drawer has a voiding attribute. + */ + boolean isVoid (); +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/LockAttribute.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/LockAttribute.java new file mode 100644 index 000000000..cb726b411 --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/LockAttribute.java @@ -0,0 +1,37 @@ +package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; + +import java.util.EnumSet; + +public enum LockAttribute +{ + LOCK_POPULATED, + LOCK_EMPTY; + + public int getFlagValue () { + return 1 << ordinal(); + } + + public static int getBitfield (EnumSet attributes) { + int value = 0; + if (attributes == null) + return value; + + for (LockAttribute attr : attributes) + value |= attr.getFlagValue(); + + return value; + } + + public static EnumSet getEnumSet (int bitfield) { + if (bitfield == 0) + return null; + + EnumSet set = EnumSet.noneOf(LockAttribute.class); + for (LockAttribute attr : values()) { + if ((bitfield & attr.getFlagValue()) != 0) + set.add(attr); + } + + return set; + } +} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/package-info.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/package-info.java new file mode 100644 index 000000000..cbcb916aa --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/package-info.java @@ -0,0 +1,5 @@ +@API(owner = "StorageDrawersAPI", provides = "StorageDrawersAPI|storage-attribute", apiVersion = StorageDrawersApi.VERSION) +package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; + +import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; +import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/package-info.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/package-info.java new file mode 100644 index 000000000..c9539a2ae --- /dev/null +++ b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/package-info.java @@ -0,0 +1,5 @@ +@API(owner = "StorageDrawersAPI", provides = "StorageDrawersAPI|storage", apiVersion = StorageDrawersApi.VERSION) +package com.jaquadro.minecraft.storagedrawers.api.storage; + +import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; +import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index 80756f125..1db17a590 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; @@ -78,6 +79,11 @@ public final class MekanismHooks { //loadMettallurgy(); } + + if(Loader.isModLoaded("storagedrawers")) + { + StorageDrawerRecipeHandler.register(); + } } @Method(modid = "IC2") 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(); + } + } +} From e3de87ff45304bd81720217c6c0f24ca5df28117 Mon Sep 17 00:00:00 2001 From: Chris Anderson Date: Mon, 24 Jul 2017 19:05:20 -0600 Subject: [PATCH 17/22] Fixes #4560 --- .../mekanism/common/tile/component/TileComponentConfig.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java index da90931cf..06931a2f2 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java @@ -83,7 +83,8 @@ public class TileComponentConfig implements ITileComponent public boolean hasSideForData(TransmissionType type, EnumFacing facing, int dataIndex, EnumFacing sideToTest) { - return getConfig(type).get(sideToTest) == dataIndex; + EnumFacing[] translatedFacings = MekanismUtils.getBaseOrientations(facing); + return getConfig(type).get(translatedFacings[sideToTest.ordinal()]) == dataIndex; } public void setCanEject(TransmissionType type, boolean eject) From ba83e8d3575b17ab18298c122647052f62eb9517 Mon Sep 17 00:00:00 2001 From: Chris Anderson Date: Mon, 24 Jul 2017 20:28:07 -0600 Subject: [PATCH 18/22] Fix issue with entities not sending energy on sides correctly --- .../mekanism/common/tile/component/TileComponentConfig.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java index c41caaafb..5e8e65a9b 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java @@ -70,11 +70,11 @@ public class TileComponentConfig implements ITileComponent SideConfig config = getConfig(type); EnumFacing[] translatedFacings = MekanismUtils.getBaseOrientations(facing); - for(int i = 0; i < EnumFacing.VALUES.length; i++) + for(EnumFacing sideToCheck : EnumFacing.values()) { - if(config.get(translatedFacings[i]) == dataIndex) + if(config.get(translatedFacings[sideToCheck.ordinal()]) == dataIndex) { - ret.add(translatedFacings[i]); + ret.add(sideToCheck); } } From 39d4985113031e8c65b517da72609bd89e64678b Mon Sep 17 00:00:00 2001 From: Chris Anderson Date: Tue, 25 Jul 2017 00:51:30 -0600 Subject: [PATCH 19/22] Fixes #4437 Add checks to TransporterPathfinder to make sure the current node is able to emit to the side(s) we're about to check. --- .../transporter/TransporterPathfinder.java | 32 ++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) 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); From 40aa8b2f7744814bb3fc4cff5eb04e2c2d8b071a Mon Sep 17 00:00:00 2001 From: Xander Date: Tue, 25 Jul 2017 15:23:52 +0800 Subject: [PATCH 20/22] Add Storage Drawer maven --- build.gradle | 11 ++ build.properties | 1 + .../api/IStorageDrawersApi.java | 23 ---- .../storagedrawers/api/StorageDrawersApi.java | 30 ----- .../api/config/IAddonConfig.java | 21 ---- .../api/config/IBlockConfig.java | 14 --- .../api/config/IIntegrationConfig.java | 6 - .../api/config/IUserConfig.java | 18 --- .../api/config/package-info.java | 5 - .../api/event/DrawerPopulatedEvent.java | 19 --- .../api/event/package-info.java | 5 - .../api/pack/BlockConfiguration.java | 42 ------- .../storagedrawers/api/pack/BlockType.java | 7 -- .../storagedrawers/api/pack/TextureType.java | 13 -- .../storagedrawers/api/pack/package-info.java | 5 - .../storagedrawers/api/package-info.java | 4 - .../api/registry/IIngredientHandler.java | 22 ---- .../api/registry/IRecipeHandler.java | 36 ------ .../api/registry/IRecipeHandlerRegistry.java | 12 -- .../api/registry/IRenderRegistry.java | 8 -- .../api/registry/IWailaRegistry.java | 6 - .../api/registry/IWailaTooltipHandler.java | 8 -- .../api/registry/package-info.java | 5 - .../api/render/IRenderLabel.java | 9 -- .../api/render/package-info.java | 5 - .../api/security/ISecurityProvider.java | 13 -- .../api/storage/EnumBasicDrawer.java | 72 ----------- .../storagedrawers/api/storage/IDrawer.java | 119 ------------------ .../api/storage/IDrawerGeometry.java | 8 -- .../api/storage/IDrawerGroup.java | 26 ---- .../api/storage/IDrawerGroupInteractive.java | 18 --- .../api/storage/IFractionalDrawer.java | 28 ----- .../api/storage/INetworked.java | 5 - .../api/storage/IPriorityGroup.java | 10 -- .../api/storage/ISmartGroup.java | 20 --- .../api/storage/attribute/IItemLockable.java | 21 ---- .../api/storage/attribute/IProtectable.java | 38 ------ .../api/storage/attribute/IQuantifiable.java | 16 --- .../api/storage/attribute/ISealable.java | 16 --- .../api/storage/attribute/IShroudable.java | 16 --- .../api/storage/attribute/IVoidable.java | 9 -- .../api/storage/attribute/LockAttribute.java | 37 ------ .../api/storage/attribute/package-info.java | 5 - .../api/storage/package-info.java | 5 - 44 files changed, 12 insertions(+), 805 deletions(-) delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/IStorageDrawersApi.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/StorageDrawersApi.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IAddonConfig.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IBlockConfig.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IIntegrationConfig.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IUserConfig.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/package-info.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/DrawerPopulatedEvent.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/package-info.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockConfiguration.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockType.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/TextureType.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/package-info.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/package-info.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IIngredientHandler.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandler.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandlerRegistry.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRenderRegistry.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaRegistry.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaTooltipHandler.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/package-info.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/IRenderLabel.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/package-info.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/security/ISecurityProvider.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/EnumBasicDrawer.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawer.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGeometry.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroup.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroupInteractive.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IFractionalDrawer.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/INetworked.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IPriorityGroup.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/ISmartGroup.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IItemLockable.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IProtectable.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IQuantifiable.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/ISealable.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IShroudable.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IVoidable.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/LockAttribute.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/package-info.java delete mode 100644 src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/package-info.java diff --git a/build.gradle b/build.gradle index 11dc58195..8ae2d65e7 100644 --- a/build.gradle +++ b/build.gradle @@ -61,6 +61,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 @@ -95,6 +103,9 @@ dependencies { compile "li.cil.oc:OpenComputers:MC${config.minecraft_version}-${config.opencomputers_version}:api" deobfCompile "mcp.mobius.waila:Hwyla:${config.hwyla_version}" 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 d85a5e3de..5661c1a73 100644 --- a/build.properties +++ b/build.properties @@ -9,3 +9,4 @@ invtweak_version=1.62+beta.89 opencomputers_version=1.7.0.24 hwyla_version=1.8.13-B26_1.11 buildcraft_version=7.99.6 +storagedrawers_version=4.2.10 \ No newline at end of file diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/IStorageDrawersApi.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/IStorageDrawersApi.java deleted file mode 100644 index 7e0eb580e..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/IStorageDrawersApi.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api; - -import com.jaquadro.minecraft.storagedrawers.api.config.IUserConfig; -import com.jaquadro.minecraft.storagedrawers.api.registry.IRecipeHandlerRegistry; -import com.jaquadro.minecraft.storagedrawers.api.registry.IRenderRegistry; -import com.jaquadro.minecraft.storagedrawers.api.registry.IWailaRegistry; - -public interface IStorageDrawersApi -{ - /** - * Recipe handlers are used to make custom recipes compatible with compacting drawers. - */ - IRecipeHandlerRegistry recipeHandlerRegistry (); - - IRenderRegistry renderRegistry (); - - IWailaRegistry wailaRegistry (); - - /** - * User-managed configuration for the Storage Drawers mod. - */ - IUserConfig userConfig (); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/StorageDrawersApi.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/StorageDrawersApi.java deleted file mode 100644 index b078c8062..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/StorageDrawersApi.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api; - -/** - * Entry point for the public API. - */ -public class StorageDrawersApi -{ - private static IStorageDrawersApi instance; - - public static final String VERSION = "1.10.2-1.3.0"; - - /** - * API entry point. - * - * @return The {@link IStorageDrawersApi} instance or null if the API or Storage Drawers is unavailable. - */ - public static IStorageDrawersApi instance () { - if (instance == null) { - try { - Class classApi = Class.forName( "com.jaquadro.minecraft.storagedrawers.core.Api" ); - instance = (IStorageDrawersApi) classApi.getField("instance").get(null); - } - catch (Throwable t) { - return null; - } - } - - return instance; - } -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IAddonConfig.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IAddonConfig.java deleted file mode 100644 index ca1757971..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IAddonConfig.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.config; - -public interface IAddonConfig -{ - /** - * Gets whether the user has configured a preference for addon packs to hide their blocks and items from Vanilla - * creative tabs. - */ - boolean showAddonItemsNEI (); - - /** - * Gets whether the user has configured a preference for addon packs to hide their blocks and items from NEI. - */ - boolean showAddonItemsVanilla (); - - /** - * Gets whether the user has configured a preference for addon packs to provide their blocks and items through - * their own vanilla tab. - */ - boolean addonItemsUseSeparateTab (); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IBlockConfig.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IBlockConfig.java deleted file mode 100644 index f4101e790..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IBlockConfig.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.config; - -import com.jaquadro.minecraft.storagedrawers.api.pack.BlockConfiguration; - -public interface IBlockConfig -{ - String getBlockConfigName (BlockConfiguration blockConfig); - - boolean isBlockEnabled (String blockConfigName); - - int getBlockRecipeOutput (String blockConfigName); - - int getBaseCapacity (String blockConfigName); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IIntegrationConfig.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IIntegrationConfig.java deleted file mode 100644 index 28d9f132c..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IIntegrationConfig.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.config; - -public interface IIntegrationConfig -{ - boolean isRefinedRelocationEnabled (); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IUserConfig.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IUserConfig.java deleted file mode 100644 index f8aa5e538..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/IUserConfig.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.config; - -/** - * The main hub for user-managed mod configuration. - */ -public interface IUserConfig -{ - /** - * Configuration options related to third party addon packs for Storage Drawers. - */ - @Deprecated - IAddonConfig addonConfig (); - - /** - * Configuration options related to individual blocks. - */ - IBlockConfig blockConfig (); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/package-info.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/package-info.java deleted file mode 100644 index 4a83dca8e..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/config/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@API(owner = "StorageDrawersAPI", provides = "StorageDrawersAPI|config", apiVersion = StorageDrawersApi.VERSION) -package com.jaquadro.minecraft.storagedrawers.api.config; - -import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; -import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/DrawerPopulatedEvent.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/DrawerPopulatedEvent.java deleted file mode 100644 index e82953e94..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/DrawerPopulatedEvent.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.event; - -import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; -import net.minecraftforge.fml.common.eventhandler.Event; - -/** - * This event is called when a drawer has been bound to a new item. This is - * and opportunity for mods to cache extended data with the drawer. - * - * This event is also called when the drawer is changed to empty. - */ -public class DrawerPopulatedEvent extends Event -{ - public final IDrawer drawer; - - public DrawerPopulatedEvent (IDrawer drawer) { - this.drawer = drawer; - } -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/package-info.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/package-info.java deleted file mode 100644 index 517ce1760..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@API(owner = "StorageDrawersAPI", provides = "StorageDrawersAPI|event", apiVersion = StorageDrawersApi.VERSION) -package com.jaquadro.minecraft.storagedrawers.api.event; - -import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; -import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockConfiguration.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockConfiguration.java deleted file mode 100644 index f0c121e2a..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockConfiguration.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.pack; - -import com.jaquadro.minecraft.storagedrawers.api.storage.EnumBasicDrawer; - -public enum BlockConfiguration -{ - BasicFull1(BlockType.Drawers, EnumBasicDrawer.FULL1), - BasicFull2(BlockType.Drawers, EnumBasicDrawer.FULL2), - BasicFull4(BlockType.Drawers, EnumBasicDrawer.FULL4), - BasicHalf2(BlockType.Drawers, EnumBasicDrawer.HALF2), - BasicHalf4(BlockType.Drawers, EnumBasicDrawer.HALF4), - Trim(BlockType.Trim, null); - - private final BlockType type; - private final EnumBasicDrawer drawer; - - BlockConfiguration (BlockType type, EnumBasicDrawer drawer) { - this.type = type; - this.drawer = drawer; - } - - public BlockType getBlockType () { - return type; - } - - public int getDrawerCount () { - return (drawer != null) ? drawer.getDrawerCount() : 0; - } - - public boolean isHalfDepth () { - return (drawer != null) && drawer.isHalfDepth(); - } - - public static BlockConfiguration by (BlockType type, EnumBasicDrawer drawer) { - for (BlockConfiguration config : values()) { - if (config.type == type && config.drawer == drawer) - return config; - } - - return null; - } -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockType.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockType.java deleted file mode 100644 index f54d4ce8b..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockType.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.pack; - -public enum BlockType -{ - Drawers, - Trim -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/TextureType.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/TextureType.java deleted file mode 100644 index 92ca51df3..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/TextureType.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.pack; - -public enum TextureType -{ - Front1, - Front2, - Front4, - Side, - SideVSplit, - SideHSplit, - TrimBorder, - TrimBlock -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/package-info.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/package-info.java deleted file mode 100644 index 2c7367e85..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@API(owner = "StorageDrawersAPI", provides = "StorageDrawersAPI|pack", apiVersion = StorageDrawersApi.VERSION) -package com.jaquadro.minecraft.storagedrawers.api.pack; - -import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; -import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/package-info.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/package-info.java deleted file mode 100644 index 86d7280fa..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -@API(owner = "StorageDrawers", provides = "StorageDrawersAPI", apiVersion = StorageDrawersApi.VERSION) -package com.jaquadro.minecraft.storagedrawers.api; - -import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IIngredientHandler.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IIngredientHandler.java deleted file mode 100644 index 0f33fd5c6..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IIngredientHandler.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.registry; - -import net.minecraft.item.ItemStack; - -import javax.annotation.Nonnull; - -/** - * Ingredient handlers are used to get ItemStacks from ingredients in custom IRecipe implementations. If you have - * registered an IRecipeHandler that returns lists of objects that aren't ItemStacks, then you will need to - * implement an ingredient handler for those objects. - */ -public interface IIngredientHandler -{ - /** - * Gets an ItemStack from an object that represents an ingredient in an IRecipe. - * - * @param object An ingredient object. - * @return An ItemStack for the given ingredient. - */ - @Nonnull - ItemStack getItemStack (Object object); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandler.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandler.java deleted file mode 100644 index d4311ea8a..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandler.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.registry; - -import net.minecraft.item.crafting.IRecipe; - -import java.util.List; - -/** - * Recipe handlers are used by compacting drawers to find more-compressed forms of blocks and items. If your recipe - * to craft compressed items is a custom IRecipe implementation, you will need to register a handler for it. - */ -public interface IRecipeHandler -{ - /** - * Get the recipe ingredient list as an array of objects (usually used for shaped recipes). - * If your array does not contain ItemStack objects, you will need to register an {@link IIngredientHandler} to - * get an ItemStack from them. - * - * If you would prefer to return a List, return null in this method and implement {@link #getInputAsList}. - * - * @param recipe An instance of a custom {@link IRecipe}. - * @return An array of ItemStacks or objects with a registered {@link IIngredientHandler}. - */ - Object[] getInputAsArray (IRecipe recipe); - - /** - * Get the recipe ingredient list as a list of objects (usually used for shapeless recipes). - * If your list does not contain ItemStack objects, you will need to register an {@link IIngredientHandler} to - * get an ItemStack from them. - * - * If you would prefer to return an array, return null in this method and implement {@link #getInputAsArray}. - * - * @param recipe An instance of a custom {@link IRecipe}. - * @return A list of ItemStacks or objects with a registered {@link IIngredientHandler}. - */ - List getInputAsList (IRecipe recipe); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandlerRegistry.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandlerRegistry.java deleted file mode 100644 index b83d5347c..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandlerRegistry.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.registry; - -public interface IRecipeHandlerRegistry -{ - void registerRecipeHandler (Class clazz, IRecipeHandler handler); - - void registerIngredientHandler (Class clazz, IIngredientHandler handler); - - IRecipeHandler getRecipeHandler (Class clazz); - - IIngredientHandler getIngredientHandler (Class clazz); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRenderRegistry.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRenderRegistry.java deleted file mode 100644 index cfa4543a1..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRenderRegistry.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.registry; - -import com.jaquadro.minecraft.storagedrawers.api.render.IRenderLabel; - -public interface IRenderRegistry -{ - void registerPreLabelRenderHandler (IRenderLabel renderHandler); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaRegistry.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaRegistry.java deleted file mode 100644 index a4ee9874a..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaRegistry.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.registry; - -public interface IWailaRegistry -{ - void registerTooltipHandler (IWailaTooltipHandler handler); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaTooltipHandler.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaTooltipHandler.java deleted file mode 100644 index d0f3328c6..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaTooltipHandler.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.registry; - -import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; - -public interface IWailaTooltipHandler -{ - String transformItemName (IDrawer drawer, String defaultName); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/package-info.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/package-info.java deleted file mode 100644 index 75fe1f250..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@API(owner = "StorageDrawersAPI", provides = "StorageDrawersAPI|registry", apiVersion = StorageDrawersApi.VERSION) -package com.jaquadro.minecraft.storagedrawers.api.registry; - -import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; -import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/IRenderLabel.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/IRenderLabel.java deleted file mode 100644 index 500030aa0..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/IRenderLabel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.render; - -import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; -import net.minecraft.tileentity.TileEntity; - -public interface IRenderLabel -{ - void render (TileEntity tileEntity, IDrawerGroup drawerGroup, int slot, float brightness, float partialTickTime); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/package-info.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/package-info.java deleted file mode 100644 index 76e937caa..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@API(owner = "StorageDrawersAPI", provides = "StorageDrawersAPI|render", apiVersion = StorageDrawersApi.VERSION) -package com.jaquadro.minecraft.storagedrawers.api.render; - -import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; -import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/security/ISecurityProvider.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/security/ISecurityProvider.java deleted file mode 100644 index 66752c0c4..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/security/ISecurityProvider.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.security; - -import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IProtectable; -import com.mojang.authlib.GameProfile; - -public interface ISecurityProvider -{ - String getProviderID (); - - boolean hasOwnership (GameProfile profile, IProtectable target); - - boolean hasAccess (GameProfile profile, IProtectable target); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/EnumBasicDrawer.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/EnumBasicDrawer.java deleted file mode 100644 index 93117ba7b..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/EnumBasicDrawer.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage; - -import net.minecraft.util.IStringSerializable; - -import javax.annotation.Nonnull; - -public enum EnumBasicDrawer implements IDrawerGeometry, IStringSerializable -{ - FULL1(0, 1, false, "full1", "fulldrawers1"), - FULL2(1, 2, false, "full2", "fulldrawers2"), - FULL4(2, 4, false, "full4", "fulldrawers4"), - HALF2(3, 2, true, "half2", "halfdrawers2"), - HALF4(4, 4, true, "half4", "halfdrawers4"); - - private static final EnumBasicDrawer[] META_LOOKUP; - - private final int meta; - private final int drawerCount; - private final boolean halfDepth; - private final String name; - private final String unlocalizedName; - - EnumBasicDrawer (int meta, int drawerCount, boolean halfDepth, String name, String unlocalizedName) { - this.meta = meta; - this.name = name; - this.drawerCount = drawerCount; - this.halfDepth = halfDepth; - this.unlocalizedName = unlocalizedName; - } - - public int getMetadata () { - return meta; - } - - @Override - public int getDrawerCount () { - return drawerCount; - } - - @Override - public boolean isHalfDepth () { - return halfDepth; - } - - public String getUnlocalizedName () { - return unlocalizedName; - } - - public static EnumBasicDrawer byMetadata (int meta) { - if (meta < 0 || meta >= META_LOOKUP.length) - meta = 0; - return META_LOOKUP[meta]; - } - - @Override - public String toString () { - return getName(); - } - - @Override - @Nonnull - public String getName () { - return name; - } - - static { - META_LOOKUP = new EnumBasicDrawer[values().length]; - for (EnumBasicDrawer upgrade : values()) { - META_LOOKUP[upgrade.getMetadata()] = upgrade; - } - } -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawer.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawer.java deleted file mode 100644 index 851eb6f45..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawer.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import javax.annotation.Nonnull; - -public interface IDrawer -{ - /** - * Gets an ItemStack of size 1 representing the type, metadata, and tags of the stored items. - * The returned ItemStack should not be modified for any reason. Make a copy if you need to store or modify it. - */ - @Nonnull - ItemStack getStoredItemPrototype (); - - /** - * Sets the type of the stored item and initializes it to the given amount. Any existing item will be replaced. - * - * @param itemPrototype An ItemStack representing the type, metadata, and tags of the item to store. - * @param amount The amount to initialize the stored item count to. - * @return The IDrawer actually set with the prototype. Some drawer groups can redirect a set operation to another member. - */ - IDrawer setStoredItem (@Nonnull ItemStack itemPrototype, int amount); - - /** - * Gets the number of items stored in this drawer. - */ - int getStoredItemCount (); - - /** - * Sets the number of items stored in this drawer. Triggers syncing of inventories and client data. - * Setting a drawer's count to 0 may also result in the item type being cleared, depending in implementation. - * - * @param amount The new amount of items stored in this drawer. - */ - void setStoredItemCount (int amount); - - /** - * Gets the maximum number of items that can be stored in this drawer. - * This value will vary depending on the max stack size of the stored item type. - */ - int getMaxCapacity (); - - /** - * Gets the maximum number of items that could be stored in this drawer if it held the given item. - * - * @param itemPrototype The item type to query. - */ - int getMaxCapacity (@Nonnull ItemStack itemPrototype); - - /** - * Gets the maxmimum number of items that could be stored in this drawer for a standard item stack size - * of 64. - */ - int getDefaultMaxCapacity (); - - /** - * Gets the number of items that could still be added to this drawer before it is full. - */ - int getRemainingCapacity (); - - /** - * Gets the max stack size of the item type stored in this drawer. Convenience method. - */ - int getStoredItemStackSize (); - - /** - * Gets whether or not an item of the given type and data can be stored in this drawer. - * - * Stack size and available capacity are not considered. For drawers that are not empty, this - * method can allow ore-dictionary compatible items to be accepted into the drawer, as defined by what - * the drawer considers to be an equivalent item. - * For drawers that are empty, locking status is considered. - * - * @param itemPrototype An ItemStack representing the type, metadata, and tags of an item. - */ - boolean canItemBeStored (@Nonnull ItemStack itemPrototype); - - /** - * Gets whether or not an item of the given type and data can be extracted from this drawer. - * - * This is intended to allow outbound ore-dictionary conversions of compatible items, as defined by what - * the drawer considers to be an equivalent item. - * - * @param itemPrototype An ItemStack representing the type, metadata, and tags of an item. - */ - boolean canItemBeExtracted (@Nonnull ItemStack itemPrototype); - - /** - * Gets whether or not the drawer has items. - * A drawer set with an item type and 0 count is not considered empty. - */ - boolean isEmpty (); - - /** - * Gets auxiliary data that has been associated with this drawer. - * - * @param key The key used to identify the data. - * @return An opaque object that was previously stored. - */ - Object getExtendedData (String key); - - /** - * Stores auxiliary data with this drawer, mainly for use in integration. - * @param key The key to identify the data with. - * @param data The data to store. - */ - void setExtendedData (String key, Object data); - - /** - * Called when a component attribute of a drawer (such as lock or void) changes state. - */ - void attributeChanged (); - - void writeToNBT (NBTTagCompound tag); - - void readFromNBT (NBTTagCompound tag); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGeometry.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGeometry.java deleted file mode 100644 index 1dae92ad0..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGeometry.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage; - -public interface IDrawerGeometry -{ - boolean isHalfDepth (); - - int getDrawerCount (); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroup.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroup.java deleted file mode 100644 index bc54eb6bf..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroup.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage; - -public interface IDrawerGroup -{ - /** - * Gets the number of drawers contained within this group. - */ - int getDrawerCount (); - - /** - * Gets the drawer at the given slot within this group. - */ - IDrawer getDrawer (int slot); - - /** - * Gets the drawer at the given slot within this group only if it is enabled. - */ - IDrawer getDrawerIfEnabled (int slot); - - /** - * Gets whether the drawer in the given slot is usable. - */ - boolean isDrawerEnabled (int slot); - - boolean markDirtyIfNeeded (); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroupInteractive.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroupInteractive.java deleted file mode 100644 index 362b11b2b..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroupInteractive.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -import javax.annotation.Nonnull; - -public interface IDrawerGroupInteractive extends IDrawerGroup -{ - @Nonnull - ItemStack takeItemsFromSlot (int slot, int count); - - int putItemsIntoSlot (int slot, @Nonnull ItemStack stack, int count); - - int interactPutCurrentItemIntoSlot (int slot, EntityPlayer player); - - int interactPutCurrentInventoryIntoSlot (int slot, EntityPlayer player); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IFractionalDrawer.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IFractionalDrawer.java deleted file mode 100644 index bd87a808b..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IFractionalDrawer.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage; - -/** - * Represents a drawer with items that are a fractional component of another item within the drawer group. Compacting - * Drawers are a primary example of this drawer type. - */ -public interface IFractionalDrawer extends IDrawer -{ - /** - * Gets the storage ratio between the held item and the most compressed item within the drawer group. - * - * For example, most ingots have a conversion rate of 9 compared to metal blocks, and nuggets a rate of 81. - * Actual conversion rates are implementation-defined. - */ - int getConversionRate (); - - /** - * Gets the number of items left in the drawer if the maximum number of equivalent compressed items had been removed. - * The equivalency is determined by the next compression tier, and not necessarily the conversion rate. - */ - int getStoredItemRemainder (); - - /** - * Gets whether or not the stored item represents the smallest granularity of material that can be stored within - * the drawer group. - */ - boolean isSmallestUnit (); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/INetworked.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/INetworked.java deleted file mode 100644 index fba20d40a..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/INetworked.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage; - -public interface INetworked -{ -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IPriorityGroup.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IPriorityGroup.java deleted file mode 100644 index 97b293e27..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IPriorityGroup.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage; - - -public interface IPriorityGroup -{ - /** - * Gets the list of available drawer slots in priority order. - */ - int[] getAccessibleDrawerSlots (); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/ISmartGroup.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/ISmartGroup.java deleted file mode 100644 index 8795d77a8..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/ISmartGroup.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage; - -import net.minecraft.item.ItemStack; - -import javax.annotation.Nonnull; - -public interface ISmartGroup -{ - /** - * Gets a lazy enumeration of all slots that will accept at least one item of the given stack, ordered by - * insertion preference. - */ - Iterable enumerateDrawersForInsertion (@Nonnull ItemStack stack, boolean strict); - - /** - * Gets a lazy enumeration of all slots that will provide at least one item of the given stack, ordered by - * extraction preference. - */ - Iterable enumerateDrawersForExtraction (@Nonnull ItemStack stack, boolean strict); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IItemLockable.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IItemLockable.java deleted file mode 100644 index 684822e65..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IItemLockable.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; - -public interface IItemLockable -{ - /** - * Gets whether or not a drawer or group is locked for the given lock attribute. - */ - boolean isItemLocked (LockAttribute attr); - - /** - * Gets whether or not the lock state can be changed for the given lock attribute. - * If this method returns false, isItemLocked may still return true. - */ - boolean canItemLock (LockAttribute attr); - - /** - * Sets the lock state of a drawer or group for the given lock attribute. - * If canItemLock returns false, this is a no-op. - */ - void setItemLocked (LockAttribute attr, boolean isLocked); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IProtectable.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IProtectable.java deleted file mode 100644 index c378c04a9..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IProtectable.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; - -import com.jaquadro.minecraft.storagedrawers.api.security.ISecurityProvider; -import net.minecraft.world.ILockableContainer; - -import java.util.UUID; - -public interface IProtectable -{ - /** - * Gets the owner of the drawer, or null if there is no owner. - */ - UUID getOwner (); - - /** - * Sets the owner of the drawer. Set to null to set no owner. - * @return false if the operation is not supported, true otherwise. - */ - boolean setOwner (UUID owner); - - /** - * Gets the provider managing security for the target. - * @return null to use the default provider, which enforces strict owner access. - */ - ISecurityProvider getSecurityProvider (); - - /** - * Gets the lockable interface if it exists on the protected drawer. - * @return A lockable interface, or null if lockable is not supported. - */ - ILockableContainer getLockableContainer (); - - /** - * Sets the provider managing security for the target. Set to null for default provider. - * @return false if the operation is not supported, true otherwise. - */ - boolean setSecurityProvider (ISecurityProvider provder); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IQuantifiable.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IQuantifiable.java deleted file mode 100644 index 1e37e82cb..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IQuantifiable.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; - -public interface IQuantifiable -{ - /** - * Gets whether or not the drawer has the quantified attribute. - * The quantified attribute instructs the drawer to render its numerical quantity. - */ - boolean isShowingQuantity (); - - /** - * Sets whether or not the drawer is currently quantified. - * @return false if the operation is not supported, true otherwise. - */ - boolean setIsShowingQuantity (boolean state); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/ISealable.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/ISealable.java deleted file mode 100644 index 7330780e1..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/ISealable.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; - -public interface ISealable -{ - /** - * Gets whether or not the drawer has the sealed attribute. - * A sealed drawer cannot be interacted with, and when broken will retain all of its items and upgrades. - */ - boolean isSealed (); - - /** - * Sets whether or not the drawer is currently sealed. - * @return false if the operation is not supported, true otherwise. - */ - boolean setIsSealed (boolean state); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IShroudable.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IShroudable.java deleted file mode 100644 index b7f0bf035..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IShroudable.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; - -public interface IShroudable -{ - /** - * Gets whether or not the drawer has the shrouded attribute. - * The shrouded attribute instructs the drawer to not render its item label. - */ - boolean isShrouded (); - - /** - * Sets whether or not the drawer is currently shrouded. - * @return false if the operation is not supported, true otherwise. - */ - boolean setIsShrouded (boolean state); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IVoidable.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IVoidable.java deleted file mode 100644 index 9fc580635..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IVoidable.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; - -public interface IVoidable -{ - /** - * Gets whether or not the drawer has a voiding attribute. - */ - boolean isVoid (); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/LockAttribute.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/LockAttribute.java deleted file mode 100644 index cb726b411..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/LockAttribute.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; - -import java.util.EnumSet; - -public enum LockAttribute -{ - LOCK_POPULATED, - LOCK_EMPTY; - - public int getFlagValue () { - return 1 << ordinal(); - } - - public static int getBitfield (EnumSet attributes) { - int value = 0; - if (attributes == null) - return value; - - for (LockAttribute attr : attributes) - value |= attr.getFlagValue(); - - return value; - } - - public static EnumSet getEnumSet (int bitfield) { - if (bitfield == 0) - return null; - - EnumSet set = EnumSet.noneOf(LockAttribute.class); - for (LockAttribute attr : values()) { - if ((bitfield & attr.getFlagValue()) != 0) - set.add(attr); - } - - return set; - } -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/package-info.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/package-info.java deleted file mode 100644 index cbcb916aa..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@API(owner = "StorageDrawersAPI", provides = "StorageDrawersAPI|storage-attribute", apiVersion = StorageDrawersApi.VERSION) -package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; - -import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; -import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/package-info.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/package-info.java deleted file mode 100644 index c9539a2ae..000000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@API(owner = "StorageDrawersAPI", provides = "StorageDrawersAPI|storage", apiVersion = StorageDrawersApi.VERSION) -package com.jaquadro.minecraft.storagedrawers.api.storage; - -import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; -import net.minecraftforge.fml.common.API; \ No newline at end of file From 90cf4cea0849e9937b703789449933c62f87400b Mon Sep 17 00:00:00 2001 From: Chris Anderson Date: Tue, 25 Jul 2017 11:06:48 -0600 Subject: [PATCH 21/22] Add config caching overrides to TileEntityFactory --- src/main/java/mekanism/common/tile/TileEntityFactory.java | 6 ++++++ 1 file changed, 6 insertions(+) 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() { From 341e11da7009aa077ff3c2240c504ec586d0a0fd Mon Sep 17 00:00:00 2001 From: Tom Elfring Date: Wed, 26 Jul 2017 10:17:00 +0200 Subject: [PATCH 22/22] Fix config caching of pump, miner and plenisher. Fixes 4560. --- .../java/mekanism/common/tile/TileEntityDigitalMiner.java | 7 +++++++ .../java/mekanism/common/tile/TileEntityElectricPump.java | 6 ++++++ .../mekanism/common/tile/TileEntityFluidicPlenisher.java | 6 ++++++ 3 files changed, 19 insertions(+) diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 7d56ed0a0..602769200 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -1566,6 +1566,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/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) {