From 59766c69f7622309075efd577c9543a8ac24c3f9 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 29 Jun 2024 10:48:10 -0700 Subject: MultiTileEntityBlock work * Merge MultiTileEntityBlockRegistryInternal into MultiTileEntityBlock * Add a hard dep on NEID for meta extension * Use in world block meta for MuTE ID * Use one block per MuTE Registry * Add WeakTargetRef * Migrate `controller` reference for parts over to a non non cachable WeakTargetRef * Migrate controller WeakReference usage to WeakTargetRef --- .../multitileentity/interfaces/IItemUpdatable.java | 19 ------------------- .../multitileentity/interfaces/IMultiBlockPart.java | 2 -- .../multitileentity/interfaces/IMultiTileEntity.java | 5 ++--- 3 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 src/main/java/gregtech/api/multitileentity/interfaces/IItemUpdatable.java (limited to 'src/main/java/gregtech/api/multitileentity/interfaces') diff --git a/src/main/java/gregtech/api/multitileentity/interfaces/IItemUpdatable.java b/src/main/java/gregtech/api/multitileentity/interfaces/IItemUpdatable.java deleted file mode 100644 index 89d281eb27..0000000000 --- a/src/main/java/gregtech/api/multitileentity/interfaces/IItemUpdatable.java +++ /dev/null @@ -1,19 +0,0 @@ -package gregtech.api.multitileentity.interfaces; - -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -public interface IItemUpdatable { - - /** - * Updates the Data of the ItemStack. Not called every tick but instead called whenever something important happens - * to the Stack. - */ - void updateItemStack(ItemStack aStack); - - /** - * Updates the Data of the ItemStack. Not called every tick but instead called whenever something important happens - * to the Stack. - */ - void updateItemStack(ItemStack aStack, World aWorld, int aX, int aY, int aZ); -} diff --git a/src/main/java/gregtech/api/multitileentity/interfaces/IMultiBlockPart.java b/src/main/java/gregtech/api/multitileentity/interfaces/IMultiBlockPart.java index b239f4c4c0..f5bbbec7ab 100644 --- a/src/main/java/gregtech/api/multitileentity/interfaces/IMultiBlockPart.java +++ b/src/main/java/gregtech/api/multitileentity/interfaces/IMultiBlockPart.java @@ -12,8 +12,6 @@ public interface IMultiBlockPart extends IMultiTileEntity, ItemInventoryLogicHos ChunkCoordinates getTargetPos(); - void setTargetPos(ChunkCoordinates aTargetPos); - void setLockedInventoryIndex(int aIndex); int getLockedInventoryIndex(); diff --git a/src/main/java/gregtech/api/multitileentity/interfaces/IMultiTileEntity.java b/src/main/java/gregtech/api/multitileentity/interfaces/IMultiTileEntity.java index d504e34c25..b16ca8a376 100644 --- a/src/main/java/gregtech/api/multitileentity/interfaces/IMultiTileEntity.java +++ b/src/main/java/gregtech/api/multitileentity/interfaces/IMultiTileEntity.java @@ -21,7 +21,7 @@ import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.interfaces.tileentity.ICoverable; import gregtech.api.interfaces.tileentity.IDebugableTileEntity; import gregtech.api.interfaces.tileentity.ITurnable; -import gregtech.api.multitileentity.MultiTileEntityBlockRegistryInternal; +import gregtech.api.multitileentity.MultiTileEntityBlock; import gregtech.api.multitileentity.MultiTileEntityRegistry; /* @@ -169,8 +169,7 @@ public interface IMultiTileEntity extends ICoverable, ITurnable, IDebugableTileE boolean recolourBlock(ForgeDirection side, byte aColor); /** Adds to the Creative Tab. return false to prevent it from being added. */ - boolean getSubItems(MultiTileEntityBlockRegistryInternal block, Item item, CreativeTabs tab, List list, - short aID); + boolean getSubItems(MultiTileEntityBlock block, Item item, CreativeTabs tab, List list, short aID); ItemStack getPickBlock(MovingObjectPosition aTarget); -- cgit