From 7edbbe84a6fea17ffcd213569cc3bd7381c0e262 Mon Sep 17 00:00:00 2001 From: Xander Date: Sun, 19 Nov 2017 12:47:55 +0800 Subject: [PATCH] Work around multiparts disregarding onBlockActivated for placement by doing it ourselves. See amadornes/MCMultiPart#73 --- .../multipart/MultipartMekanism.java | 24 +++- .../common/item/ItemBlockGlowPanel.java | 14 +- .../common/item/ItemBlockMultipartAble.java | 128 ++++++++++++++++++ .../common/item/ItemBlockTransmitter.java | 17 ++- 4 files changed, 175 insertions(+), 8 deletions(-) create mode 100644 src/main/java/mekanism/common/item/ItemBlockMultipartAble.java diff --git a/src/main/java/mekanism/common/integration/multipart/MultipartMekanism.java b/src/main/java/mekanism/common/integration/multipart/MultipartMekanism.java index 346662009..d8cacf6f5 100644 --- a/src/main/java/mekanism/common/integration/multipart/MultipartMekanism.java +++ b/src/main/java/mekanism/common/integration/multipart/MultipartMekanism.java @@ -13,6 +13,7 @@ import mcmultipart.api.addon.IMCMPAddon; import mcmultipart.api.addon.MCMPAddon; import mcmultipart.api.container.IMultipartContainer; import mcmultipart.api.container.IPartInfo; +import mcmultipart.api.item.ItemBlockMultipart; import mcmultipart.api.multipart.IMultipart; import mcmultipart.api.multipart.IMultipartRegistry; import mcmultipart.api.multipart.IMultipartTile; @@ -21,6 +22,7 @@ import mcmultipart.api.multipart.MultipartOcclusionHelper; import mcmultipart.api.ref.MCMPCapabilities; import mcmultipart.api.slot.EnumCenterSlot; import mcmultipart.api.world.IMultipartBlockAccess; +import mcmultipart.multipart.MultipartRegistry; import mekanism.common.MekanismBlocks; import mekanism.common.block.BlockTransmitter; import mekanism.common.block.states.BlockStateMachine.MachineType; @@ -28,7 +30,11 @@ 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.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -36,6 +42,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ICapabilityProvider; @@ -46,6 +53,10 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @MCMPAddon public class MultipartMekanism implements IMCMPAddon { + + public static MultipartTransmitter TRANSMITTER_MP; + public static MultipartGlowPanel GLOWPANEL_MP; + @SubscribeEvent public void onAttachTile(AttachCapabilitiesEvent event) { @@ -66,10 +77,10 @@ public class MultipartMekanism implements IMCMPAddon { MinecraftForge.EVENT_BUS.register(this); - registry.registerPartWrapper(MekanismBlocks.Transmitter, new MultipartTransmitter()); - registry.registerStackWrapper(Item.getItemFromBlock(MekanismBlocks.Transmitter), s -> true, MekanismBlocks.Transmitter); - registry.registerPartWrapper(MekanismBlocks.GlowPanel, new MultipartGlowPanel()); - registry.registerStackWrapper(Item.getItemFromBlock(MekanismBlocks.GlowPanel), s -> true, MekanismBlocks.GlowPanel); + registry.registerPartWrapper(MekanismBlocks.Transmitter, TRANSMITTER_MP = new MultipartTransmitter()); + //registry.registerStackWrapper(Item.getItemFromBlock(MekanismBlocks.Transmitter), s -> true, MekanismBlocks.Transmitter); + registry.registerPartWrapper(MekanismBlocks.GlowPanel, GLOWPANEL_MP = new MultipartGlowPanel()); + //registry.registerStackWrapper(Item.getItemFromBlock(MekanismBlocks.GlowPanel), s -> true, MekanismBlocks.GlowPanel); MultipartCapabilityHelper.registerCapabilityJoiner(Capabilities.TILE_NETWORK_CAPABILITY, MultipartTileNetworkJoiner::new); } @@ -211,4 +222,9 @@ public class MultipartMekanism implements IMCMPAddon } return tile; } + + public static boolean placeMultipartBlock(Block block, ItemStack is, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState state) + { + return ItemBlockMultipart.placeAt(is, player, player.getActiveHand(), world, pos, side, hitX, hitY, hitZ, block::getStateForPlacement, is.getMetadata(), MultipartRegistry.INSTANCE.getPart(block), ((ItemBlock)is.getItem())::placeBlockAt, ItemBlockMultipart::placePartAt); + } } diff --git a/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java b/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java index e0dd8ed7b..535c39892 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java +++ b/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java @@ -2,11 +2,14 @@ package mekanism.common.item; import java.util.ArrayList; +import mcmultipart.api.multipart.IMultipart; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.base.TileNetworkList; +import mekanism.common.integration.MekanismHooks; +import mekanism.common.integration.multipart.MultipartMekanism; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityGlowPanel; import mekanism.common.util.LangUtils; @@ -14,6 +17,7 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; @@ -21,8 +25,9 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.common.Optional; -public class ItemBlockGlowPanel extends ItemBlock +public class ItemBlockGlowPanel extends ItemBlockMultipartAble { public Block metaBlock; @@ -105,4 +110,11 @@ public class ItemBlockGlowPanel extends ItemBlock { return true; } + + @Override + @Optional.Method(modid = MekanismHooks.MCMULTIPART_MOD_ID) + protected IMultipart getMultiPart() + { + return MultipartMekanism.GLOWPANEL_MP; + } } diff --git a/src/main/java/mekanism/common/item/ItemBlockMultipartAble.java b/src/main/java/mekanism/common/item/ItemBlockMultipartAble.java new file mode 100644 index 000000000..09f69dab2 --- /dev/null +++ b/src/main/java/mekanism/common/item/ItemBlockMultipartAble.java @@ -0,0 +1,128 @@ +package mekanism.common.item; + +import mcmultipart.api.container.IMultipartContainer; +import mcmultipart.api.multipart.IMultipart; +import mcmultipart.api.multipart.MultipartHelper; +import mcmultipart.api.slot.IPartSlot; +import mcmultipart.multipart.MultipartRegistry; +import mekanism.common.Mekanism; +import mekanism.common.integration.MekanismHooks; +import mekanism.common.integration.multipart.MultipartMekanism; +import net.minecraft.block.Block; +import net.minecraft.block.SoundType; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import java.util.Optional; + +/** + * Created by Thiakil on 19/11/2017. + */ +public abstract class ItemBlockMultipartAble extends ItemBlock +{ + public ItemBlockMultipartAble(Block block) + { + super(block); + } + + /** + * Reimplementation of onItemUse that will divert to MCMultipart placement functions if applicable + */ + @Override + public EnumActionResult onItemUse(EntityPlayer player, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) + { + IBlockState iblockstate = worldIn.getBlockState(pos); + Block block = iblockstate.getBlock(); + + ItemStack itemstack = player.getHeldItem(hand); + if (itemstack.isEmpty()){ + return EnumActionResult.FAIL;//WTF + } + + if (Mekanism.hooks.MCMPLoaded){ + if (!block.isReplaceable(worldIn, pos) && !hasFreeMultiPartSpot(itemstack,worldIn,pos, iblockstate, facing)){//free spot handles case of no container + pos = pos.offset(facing); + iblockstate = worldIn.getBlockState(pos); + } + } + else if (!block.isReplaceable(worldIn, pos)) + { + pos = pos.offset(facing); + } + + if (player.canPlayerEdit(pos, facing, itemstack) && mayPlace(itemstack, worldIn, pos, iblockstate, hand, facing)) + { + int i = this.getMetadata(itemstack.getMetadata()); + IBlockState iblockstate1 = this.block.getStateForPlacement(worldIn, pos, facing, hitX, hitY, hitZ, i, player, hand); + + boolean flag; + if (Mekanism.hooks.MCMPLoaded){ + flag = MultipartMekanism.placeMultipartBlock(this.block, itemstack, player, worldIn, pos, facing, hitX,hitY,hitZ, iblockstate1); + } else { + flag = placeBlockAt(itemstack, player, worldIn, pos, facing, hitX, hitY, hitZ, iblockstate1); + } + + if (flag) + { + iblockstate1 = worldIn.getBlockState(pos); + SoundType soundtype = iblockstate1.getBlock().getSoundType(iblockstate1, worldIn, pos, player); + worldIn.playSound(player, pos, soundtype.getPlaceSound(), SoundCategory.BLOCKS, (soundtype.getVolume() + 1.0F) / 2.0F, soundtype.getPitch() * 0.8F); + itemstack.shrink(1); + } + + return EnumActionResult.SUCCESS; + } + else + { + return EnumActionResult.FAIL; + } + } + + private boolean mayPlace(ItemStack itemstack, World worldIn, BlockPos pos, IBlockState state, EnumHand hand, EnumFacing facing) + { + if (!Mekanism.hooks.MCMPLoaded) + { + return worldIn.mayPlace(this.block, pos, false, facing, null); + } + return worldIn.mayPlace(this.block, pos, false, facing, null) || hasFreeMultiPartSpot(itemstack, worldIn, pos, state, facing); + } + + private boolean hasFreeMultiPartSpot(ItemStack itemstack, World worldIn, BlockPos pos, IBlockState state, EnumFacing facing){ + Optional container; + if (!Mekanism.hooks.MCMPLoaded || !(container = MultipartHelper.getContainer(worldIn, pos)).isPresent()){ + return false; + } + IMultipart multipart = getMultiPart(); + IPartSlot slot = multipart.getSlotForPlacement(worldIn, pos, state, facing, 0,0,0,null); + return container.get().canAddPart(slot, this.block.getStateForPlacement(worldIn, pos, facing, 0,0,0,itemstack.getMetadata(), null, EnumHand.MAIN_HAND)); + } + + //FQ needed because it uses java optional interface elsewhere + @net.minecraftforge.fml.common.Optional.Method(modid = MekanismHooks.MCMULTIPART_MOD_ID) + protected abstract IMultipart getMultiPart(); + + @Override + public boolean canPlaceBlockOnSide(World worldIn, BlockPos pos, EnumFacing side, EntityPlayer player, ItemStack stack) + { + return super.canPlaceBlockOnSide(worldIn, pos, side, player, stack) || (Mekanism.hooks.MCMPLoaded && MultipartHelper.getContainer(worldIn, pos).isPresent()); + } + + @Override + public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState newState) + { + if (!world.getBlockState(pos).getBlock().isReplaceable(world, pos)){ + return false; + } + return super.placeBlockAt(stack, player, world, pos, side, hitX, hitY, hitZ, newState); + } +} diff --git a/src/main/java/mekanism/common/item/ItemBlockTransmitter.java b/src/main/java/mekanism/common/item/ItemBlockTransmitter.java index 3ba63511a..a7620a9fd 100644 --- a/src/main/java/mekanism/common/item/ItemBlockTransmitter.java +++ b/src/main/java/mekanism/common/item/ItemBlockTransmitter.java @@ -3,6 +3,7 @@ package mekanism.common.item; import java.util.ArrayList; import java.util.List; +import mcmultipart.api.multipart.IMultipart; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Range4D; @@ -15,6 +16,8 @@ import mekanism.common.Tier.BaseTier; import mekanism.common.base.ITierItem; import mekanism.common.base.TileNetworkList; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; +import mekanism.common.integration.MekanismHooks; +import mekanism.common.integration.multipart.MultipartMekanism; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.transmitter.TileEntitySidedPipe; import mekanism.common.util.LangUtils; @@ -24,16 +27,17 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.settings.GameSettings; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemBlockTransmitter extends ItemBlock implements ITierItem +public class ItemBlockTransmitter extends ItemBlockMultipartAble implements ITierItem { public Block metaBlock; @@ -50,7 +54,7 @@ public class ItemBlockTransmitter extends ItemBlock implements ITierItem { return i; } - + @Override public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState state) { @@ -201,4 +205,11 @@ public class ItemBlockTransmitter extends ItemBlock implements ITierItem itemstack.getTagCompound().setInteger("tier", tier.ordinal()); } + + @Override + @Optional.Method(modid = MekanismHooks.MCMULTIPART_MOD_ID) + protected IMultipart getMultiPart() + { + return MultipartMekanism.TRANSMITTER_MP; + } }