From 1b820de08a05070909a267e17f033fcf58ac8710 Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Mon, 2 Sep 2024 23:17:17 +0200 Subject: The Great Renaming (#3014) * move kekztech to a single root dir * move detrav to a single root dir * move gtnh-lanthanides to a single root dir * move tectech and delete some gross reflection in gt++ * remove more reflection inside gt5u * delete more reflection in gt++ * fix imports * move bartworks and bwcrossmod * fix proxies * move galactigreg and ggfab * move gtneioreplugin * try to fix gt++ bee loader * apply the rename rules to BW * apply rename rules to bwcrossmod * apply rename rules to detrav scanner mod * apply rename rules to galacticgreg * apply rename rules to ggfab * apply rename rules to goodgenerator * apply rename rules to gtnh-lanthanides * apply rename rules to gt++ * apply rename rules to kekztech * apply rename rules to kubatech * apply rename rules to tectech * apply rename rules to gt apply the rename rules to gt * fix tt import * fix mui hopefully * fix coremod except intergalactic * rename assline recipe class * fix a class name i stumbled on * rename StructureUtility to GTStructureUtility to prevent conflict with structurelib * temporary rename of GTTooltipDataCache to old name * fix gt client/server proxy names --- .../crossmod/holoinventory/GTInventoryDecoder.java | 38 ++++++++++++++++++++++ .../holoinventory/GT_InventoryDecoder.java | 38 ---------------------- .../crossmod/holoinventory/HoloInventory.java | 2 +- 3 files changed, 39 insertions(+), 39 deletions(-) create mode 100644 src/main/java/gregtech/crossmod/holoinventory/GTInventoryDecoder.java delete mode 100644 src/main/java/gregtech/crossmod/holoinventory/GT_InventoryDecoder.java (limited to 'src/main/java/gregtech/crossmod/holoinventory') diff --git a/src/main/java/gregtech/crossmod/holoinventory/GTInventoryDecoder.java b/src/main/java/gregtech/crossmod/holoinventory/GTInventoryDecoder.java new file mode 100644 index 0000000000..6774a32c6d --- /dev/null +++ b/src/main/java/gregtech/crossmod/holoinventory/GTInventoryDecoder.java @@ -0,0 +1,38 @@ +package gregtech.crossmod.holoinventory; + +import static net.dries007.holoInventory.util.NBTKeys.NBT_KEY_COUNT; + +import java.util.List; + +import net.dries007.holoInventory.compat.InventoryDecoder; +import net.dries007.holoInventory.compat.InventoryDecoderRegistry; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; + +import gregtech.api.metatileentity.BaseTileEntity; + +public class GTInventoryDecoder extends InventoryDecoder { + + public GTInventoryDecoder() { + super(BaseTileEntity.class); + } + + @Override + public NBTTagList toNBT(IInventory inv) { + List items = ((BaseTileEntity) inv).getItemsForHoloGlasses(); + if (items == null) { + return InventoryDecoderRegistry.DEFAULT.toNBT(inv); + } + NBTTagList tagList = new NBTTagList(); + for (ItemStack stack : items) { + if (stack != null) { + NBTTagCompound tag = stack.writeToNBT(new NBTTagCompound()); + tag.setInteger(NBT_KEY_COUNT, stack.stackSize); + tagList.appendTag(tag); + } + } + return tagList; + } +} diff --git a/src/main/java/gregtech/crossmod/holoinventory/GT_InventoryDecoder.java b/src/main/java/gregtech/crossmod/holoinventory/GT_InventoryDecoder.java deleted file mode 100644 index 7f3651990d..0000000000 --- a/src/main/java/gregtech/crossmod/holoinventory/GT_InventoryDecoder.java +++ /dev/null @@ -1,38 +0,0 @@ -package gregtech.crossmod.holoinventory; - -import static net.dries007.holoInventory.util.NBTKeys.NBT_KEY_COUNT; - -import java.util.List; - -import net.dries007.holoInventory.compat.InventoryDecoder; -import net.dries007.holoInventory.compat.InventoryDecoderRegistry; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; - -import gregtech.api.metatileentity.BaseTileEntity; - -public class GT_InventoryDecoder extends InventoryDecoder { - - public GT_InventoryDecoder() { - super(BaseTileEntity.class); - } - - @Override - public NBTTagList toNBT(IInventory inv) { - List items = ((BaseTileEntity) inv).getItemsForHoloGlasses(); - if (items == null) { - return InventoryDecoderRegistry.DEFAULT.toNBT(inv); - } - NBTTagList tagList = new NBTTagList(); - for (ItemStack stack : items) { - if (stack != null) { - NBTTagCompound tag = stack.writeToNBT(new NBTTagCompound()); - tag.setInteger(NBT_KEY_COUNT, stack.stackSize); - tagList.appendTag(tag); - } - } - return tagList; - } -} diff --git a/src/main/java/gregtech/crossmod/holoinventory/HoloInventory.java b/src/main/java/gregtech/crossmod/holoinventory/HoloInventory.java index d7dcdcf4b5..ce3c1f74eb 100644 --- a/src/main/java/gregtech/crossmod/holoinventory/HoloInventory.java +++ b/src/main/java/gregtech/crossmod/holoinventory/HoloInventory.java @@ -5,6 +5,6 @@ import net.dries007.holoInventory.compat.InventoryDecoderRegistry; public class HoloInventory { public static void init() { - InventoryDecoderRegistry.register(new GT_InventoryDecoder()); + InventoryDecoderRegistry.register(new GTInventoryDecoder()); } } -- cgit