From 6782ef152c6f71905575ee46c4fc9b537c1c9862 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 25 Nov 2015 20:40:13 +0000 Subject: [PATCH] Bauble Case. --- .../client/gui/{bag => }/SlotLocked.java | 2 +- .../client/gui/bag/ContainerFlowerBag.java | 1 + .../client/gui/box/ContainerBaubleBox.java | 122 +++++++++++++ .../botania/client/gui/box/GuiBaubleBox.java | 53 ++++++ .../client/gui/box/InventoryBaubleBox.java | 160 ++++++++++++++++++ .../botania/client/gui/box/SlotAnyBauble.java | 40 +++++ .../botania/client/lib/LibResources.java | 1 + .../common/core/BotaniaCreativeTab.java | 1 + .../botania/common/item/ItemBaubleBox.java | 76 +++++++++ .../vazkii/botania/common/item/ModItems.java | 2 + .../vazkii/botania/common/lib/LibGuiIDs.java | 1 + .../botania/common/lib/LibItemNames.java | 1 + .../botania/common/network/GuiHandler.java | 6 + .../resources/assets/botania/lang/en_US.lang | 1 + .../assets/botania/textures/gui/baubleBox.png | Bin 0 -> 18808 bytes .../textures/items/{unused => }/baubleBox.png | Bin 16 files changed, 466 insertions(+), 1 deletion(-) rename src/main/java/vazkii/botania/client/gui/{bag => }/SlotLocked.java (95%) create mode 100644 src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java create mode 100644 src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java create mode 100644 src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java create mode 100644 src/main/java/vazkii/botania/client/gui/box/SlotAnyBauble.java create mode 100644 src/main/java/vazkii/botania/common/item/ItemBaubleBox.java create mode 100644 src/main/resources/assets/botania/textures/gui/baubleBox.png rename src/main/resources/assets/botania/textures/items/{unused => }/baubleBox.png (100%) diff --git a/src/main/java/vazkii/botania/client/gui/bag/SlotLocked.java b/src/main/java/vazkii/botania/client/gui/SlotLocked.java similarity index 95% rename from src/main/java/vazkii/botania/client/gui/bag/SlotLocked.java rename to src/main/java/vazkii/botania/client/gui/SlotLocked.java index 6ba8e937d..72b7ccadd 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/SlotLocked.java +++ b/src/main/java/vazkii/botania/client/gui/SlotLocked.java @@ -8,7 +8,7 @@ * * File Created @ [Sep 6, 2015, 1:11:25 AM (GMT)] */ -package vazkii.botania.client.gui.bag; +package vazkii.botania.client.gui; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java index 6cd2ca8aa..9a9de171b 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java @@ -10,6 +10,7 @@ */ package vazkii.botania.client.gui.bag; +import vazkii.botania.client.gui.SlotLocked; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java new file mode 100644 index 000000000..24d54be75 --- /dev/null +++ b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java @@ -0,0 +1,122 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [25/11/2015, 19:59:06 (GMT)] + */ +package vazkii.botania.client.gui.box; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import vazkii.botania.api.mana.IManaItem; +import vazkii.botania.client.gui.SlotLocked; +import baubles.api.BaubleType; +import baubles.api.IBauble; +import baubles.common.container.InventoryBaubles; +import baubles.common.container.SlotBauble; +import baubles.common.lib.PlayerHandler; + +public class ContainerBaubleBox extends Container { + + InventoryBaubleBox baubleBoxInv; + InventoryBaubles baubles; + + public ContainerBaubleBox(EntityPlayer player) { + int i; + int j; + + int slot = player.inventory.currentItem; + IInventory playerInv = player.inventory; + baubleBoxInv = new InventoryBaubleBox(player, slot); + + baubles = new InventoryBaubles(player); + baubles.setEventHandler(this); + if(!player.worldObj.isRemote) + baubles.stackList = PlayerHandler.getPlayerBaubles(player).stackList; + + addSlotToContainer(new SlotBauble(baubles, BaubleType.AMULET, 0, 8, 8 + 0 * 18)); + addSlotToContainer(new SlotBauble(baubles, BaubleType.RING, 1, 8, 8 + 1 * 18)); + addSlotToContainer(new SlotBauble(baubles, BaubleType.RING, 2, 8, 8 + 2 * 18)); + addSlotToContainer(new SlotBauble(baubles, BaubleType.BELT, 3, 8, 8 + 3 * 18)); + + for(i = 0; i < 4; ++i) + for(j = 0; j < 6; ++j) { + int k = j + i * 6; + addSlotToContainer(new SlotAnyBauble(baubleBoxInv, k, 62 + j * 18, 8 + i * 18)); + } + + for(i = 0; i < 3; ++i) + for(j = 0; j < 9; ++j) + addSlotToContainer(new Slot(playerInv, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); + + for(i = 0; i < 9; ++i) { + if(player.inventory.currentItem == i) + addSlotToContainer(new SlotLocked(playerInv, i, 8 + i * 18, 142)); + else addSlotToContainer(new Slot(playerInv, i, 8 + i * 18, 142)); + } + + } + + @Override + public boolean canInteractWith(EntityPlayer player) { + boolean can = baubleBoxInv.isUseableByPlayer(player); + if(!can) + onContainerClosed(player); + + return can; + } + + @Override + public void onContainerClosed(EntityPlayer player) { + super.onContainerClosed(player); + baubleBoxInv.pushInventory(); + + if(!player.worldObj.isRemote) + PlayerHandler.setPlayerBaubles(player, baubles); + } + + @Override + public void putStacksInSlots(ItemStack[] p_75131_1_) { + baubles.blockEvents = true; + super.putStacksInSlots(p_75131_1_); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int p_82846_2_) { + ItemStack itemstack = null; + Slot slot = (Slot)inventorySlots.get(p_82846_2_); + + if(slot != null && slot.getHasStack()) { + ItemStack itemstack1 = slot.getStack(); + itemstack = itemstack1.copy(); + + System.out.println(p_82846_2_ + " " + itemstack); + if(p_82846_2_ < 28) { + if(!mergeItemStack(itemstack1, 28, 64, true)) + return null; + } else { + if(itemstack1 != null && (itemstack1.getItem() instanceof IBauble || itemstack1.getItem() instanceof IManaItem) && !mergeItemStack(itemstack1, 4, 28, false)) + return null; + } + + if(itemstack1.stackSize == 0) + slot.putStack((ItemStack)null); + else slot.onSlotChanged(); + + if(itemstack1.stackSize == itemstack.stackSize) + return null; + + slot.onPickupFromSlot(p_82846_1_, itemstack1); + } + + return itemstack; + } + +} diff --git a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java new file mode 100644 index 000000000..250c1086c --- /dev/null +++ b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java @@ -0,0 +1,53 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [25/11/2015, 19:59:11 (GMT)] + */ +package vazkii.botania.client.gui.box; + +import net.minecraft.client.gui.inventory.GuiInventory; +import net.minecraft.client.renderer.InventoryEffectRenderer; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; + +import vazkii.botania.client.lib.LibResources; + +public class GuiBaubleBox extends InventoryEffectRenderer { + + private static final ResourceLocation texture = new ResourceLocation(LibResources.GUI_BAUBLE_BOX); + + public GuiBaubleBox(EntityPlayer player) { + super(new ContainerBaubleBox(player)); + } + + @Override + protected boolean checkHotbarKeys(int p_146983_1_) { + return false; + } + + @Override + protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.getTextureManager().bindTexture(texture); + int k = (width - xSize) / 2; + int l = (height - ySize) / 2; + drawTexturedModalRect(k, l, 0, 0, xSize, ySize); + + for(int i1 = 0; i1 < 4; ++i1) { + Slot slot = (Slot) inventorySlots.inventorySlots.get(i1); + if(slot.getHasStack() && slot.getSlotStackLimit() == 1) + drawTexturedModalRect(k+slot.xDisplayPosition, l+slot.yDisplayPosition, 200, 0, 16, 16); + } + + GuiInventory.func_147046_a(this.guiLeft + 43, this.guiTop + 61, 20, (float)(this.guiLeft + 43 - p_146976_2_), (float)(this.guiTop + 45 - 30 - p_146976_3_), this.mc.thePlayer); + } + +} diff --git a/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java new file mode 100644 index 000000000..415eee637 --- /dev/null +++ b/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java @@ -0,0 +1,160 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [25/11/2015, 19:59:16 (GMT)] + */ +package vazkii.botania.client.gui.box; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import vazkii.botania.common.item.ItemBaubleBox; +import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lib.LibItemNames; + +public class InventoryBaubleBox implements IInventory { + + private static final ItemStack[] FALLBACK_INVENTORY = new ItemStack[16]; + + EntityPlayer player; + int slot; + ItemStack[] stacks = null; + + boolean invPushed = false; + ItemStack storedInv = null; + + public InventoryBaubleBox(EntityPlayer player, int slot) { + this.player = player; + this.slot = slot; + } + + public static boolean isBaubleBox(ItemStack stack) { + return stack != null && stack.getItem() == ModItems.baubleBox; + } + + ItemStack getStack() { + ItemStack stack = player.inventory.getStackInSlot(slot); + if(stack != null) + storedInv = stack; + return stack; + } + + ItemStack[] getInventory() { + if(stacks != null) + return stacks; + + ItemStack stack = getStack(); + if(isBaubleBox(getStack())) { + stacks = ItemBaubleBox.loadStacks(stack); + return stacks; + } + + return FALLBACK_INVENTORY; + } + + public void pushInventory() { + if(invPushed) + return; + + ItemStack stack = getStack(); + if(stack == null) + stack = storedInv; + + if(stack != null) { + ItemStack[] inv = getInventory(); + ItemBaubleBox.setStacks(stack, inv); + } + + invPushed = true; + } + + @Override + public int getSizeInventory() { + return 16; + } + + @Override + public ItemStack getStackInSlot(int i) { + return getInventory()[i]; + } + + @Override + public ItemStack decrStackSize(int i, int j) { + ItemStack[] inventorySlots = getInventory(); + if (inventorySlots[i] != null) { + ItemStack stackAt; + + if (inventorySlots[i].stackSize <= j) { + stackAt = inventorySlots[i]; + inventorySlots[i] = null; + return stackAt; + } else { + stackAt = inventorySlots[i].splitStack(j); + + if (inventorySlots[i].stackSize == 0) + inventorySlots[i] = null; + + return stackAt; + } + } + + return null; + } + + @Override + public ItemStack getStackInSlotOnClosing(int i) { + return getStackInSlot(i); + } + + @Override + public void setInventorySlotContents(int slot, ItemStack itemstack) { + ItemStack[] inventorySlots = getInventory(); + inventorySlots[slot] = itemstack; + } + + @Override + public int getInventoryStackLimit() { + return isBaubleBox(getStack()) ? 64 : 0; + } + + @Override + public boolean isUseableByPlayer(EntityPlayer entityplayer) { + return isBaubleBox(getStack()); + } + + @Override + public boolean isItemValidForSlot(int i, ItemStack itemstack) { + return isBaubleBox(getStack()); + } + + @Override + public boolean hasCustomInventoryName() { + return false; + } + + @Override + public void openInventory() { + // NO-OP + } + + @Override + public void closeInventory() { + // NO-OP + } + + @Override + public String getInventoryName() { + return LibItemNames.BAUBLE_BOX; + } + + @Override + public void markDirty() { + // NO-OP + } + +} diff --git a/src/main/java/vazkii/botania/client/gui/box/SlotAnyBauble.java b/src/main/java/vazkii/botania/client/gui/box/SlotAnyBauble.java new file mode 100644 index 000000000..60d7493b9 --- /dev/null +++ b/src/main/java/vazkii/botania/client/gui/box/SlotAnyBauble.java @@ -0,0 +1,40 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [25/11/2015, 19:59:22 (GMT)] + */ +package vazkii.botania.client.gui.box; + +import baubles.api.IBauble; +import net.minecraft.inventory.Slot; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import vazkii.botania.api.mana.IManaItem; +import vazkii.botania.client.gui.bag.InventoryFlowerBag; +import vazkii.botania.common.block.ModBlocks; + +public class SlotAnyBauble extends Slot { + + InventoryBaubleBox inv; + + public SlotAnyBauble(InventoryBaubleBox p_i1824_1_, int p_i1824_2_, int p_i1824_3_, int p_i1824_4_) { + super(p_i1824_1_, p_i1824_2_, p_i1824_3_, p_i1824_4_); + inv = p_i1824_1_; + } + + @Override + public void onSlotChange(ItemStack oldStack, ItemStack newStack) { + inv.setInventorySlotContents(slotNumber, newStack); + } + + @Override + public boolean isItemValid(ItemStack stack) { + return stack.getItem() instanceof IBauble || stack.getItem() instanceof IManaItem; + } + +} diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index 66a38d5e6..b6237a71c 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -44,6 +44,7 @@ public final class LibResources { public static final String GUI_NEI_BLANK = PREFIX_GUI + "neiBlank.png"; public static final String GUI_NEI_BREWERY = PREFIX_GUI + "neiBrewery.png"; public static final String GUI_FLOWER_BAG = PREFIX_GUI + "flowerBag.png"; + public static final String GUI_BAUBLE_BOX = PREFIX_GUI + "baubleBox.png"; public static final String GUI_HUD_ICONS = PREFIX_GUI + "hudIcons.png"; public static final String GUI_STENCIL = PREFIX_GUI + "stencil.png"; diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 999859b1b..f41f62e15 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -224,6 +224,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.aesirRing); } + addItem(ModItems.baubleBox); addItem(ModItems.tinyPlanet); addBlock(ModBlocks.tinyPlanet); addItem(ModItems.manaRing); diff --git a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java new file mode 100644 index 000000000..e702b3f60 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java @@ -0,0 +1,76 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [25/11/2015, 19:46:11 (GMT)] + */ +package vazkii.botania.common.item; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityChest; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.event.entity.player.EntityItemPickupEvent; +import vazkii.botania.common.Botania; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.core.helper.InventoryHelper; +import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.lib.LibGuiIDs; +import vazkii.botania.common.lib.LibItemNames; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; + +public class ItemBaubleBox extends ItemMod { + + private static final String TAG_ITEMS = "InvItems"; + private static final String TAG_SLOT = "Slot"; + + public ItemBaubleBox() { + setUnlocalizedName(LibItemNames.BAUBLE_BOX); + setMaxStackSize(1); + } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + player.openGui(Botania.instance, LibGuiIDs.BAUBLE_BOX, world, 0, 0, 0); + return stack; + } + + + public static ItemStack[] loadStacks(ItemStack stack) { + NBTTagList var2 = ItemNBTHelper.getList(stack, TAG_ITEMS, 10, false); + ItemStack[] inventorySlots = new ItemStack[36]; + for(int var3 = 0; var3 < var2.tagCount(); ++var3) { + NBTTagCompound var4 = var2.getCompoundTagAt(var3); + byte var5 = var4.getByte(TAG_SLOT); + if(var5 >= 0 && var5 < inventorySlots.length) + inventorySlots[var5] = ItemStack.loadItemStackFromNBT(var4); + } + + return inventorySlots; + } + + public static void setStacks(ItemStack stack, ItemStack[] inventorySlots) { + NBTTagList var2 = new NBTTagList(); + for(int var3 = 0; var3 < inventorySlots.length; ++var3) + if(inventorySlots[var3] != null) { + NBTTagCompound var4 = new NBTTagCompound(); + var4.setByte(TAG_SLOT, (byte)var3); + inventorySlots[var3].writeToNBT(var4); + var2.appendTag(var4); + } + + ItemNBTHelper.setList(stack, TAG_ITEMS, var2); + } + +} diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 3b2820435..d0b7114cf 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -268,6 +268,7 @@ public final class ModItems { public static Item gaiaHead; public static Item sextant; public static Item speedUpBelt; + public static Item baubleBox; public static void init() { lexicon = new ItemLexicon(); @@ -417,6 +418,7 @@ public final class ModItems { gaiaHead = new ItemGaiaHead(); sextant = new ItemSextant(); speedUpBelt = new ItemSpeedUpBelt(); + baubleBox = new ItemBaubleBox(); OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { diff --git a/src/main/java/vazkii/botania/common/lib/LibGuiIDs.java b/src/main/java/vazkii/botania/common/lib/LibGuiIDs.java index d0f003b19..fefcb749a 100644 --- a/src/main/java/vazkii/botania/common/lib/LibGuiIDs.java +++ b/src/main/java/vazkii/botania/common/lib/LibGuiIDs.java @@ -15,5 +15,6 @@ public final class LibGuiIDs { public static final int LEXICON = 0; public static final int CRAFTING_HALO = 1; public static final int FLOWER_BAG = 2; + public static final int BAUBLE_BOX = 3; } diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index babdeb8e7..5351f3a84 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -160,6 +160,7 @@ public final class LibItemNames { public static final String GAIA_HEAD = "gaiaHead"; public static final String SEXTANT = "sextant"; public static final String SPEED_UP_BELT = "speedUpBelt"; + public static final String BAUBLE_BOX = "baubleBox"; public static final String[] LENS_NAMES = new String[] { "lensNormal", diff --git a/src/main/java/vazkii/botania/common/network/GuiHandler.java b/src/main/java/vazkii/botania/common/network/GuiHandler.java index c33d580f6..0dd9fea9f 100644 --- a/src/main/java/vazkii/botania/common/network/GuiHandler.java +++ b/src/main/java/vazkii/botania/common/network/GuiHandler.java @@ -14,6 +14,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import vazkii.botania.client.gui.bag.ContainerFlowerBag; import vazkii.botania.client.gui.bag.GuiFlowerBag; +import vazkii.botania.client.gui.box.ContainerBaubleBox; +import vazkii.botania.client.gui.box.GuiBaubleBox; import vazkii.botania.client.gui.crafting.ContainerCraftingHalo; import vazkii.botania.client.gui.crafting.GuiCraftingHalo; import vazkii.botania.client.gui.lexicon.GuiLexicon; @@ -29,6 +31,8 @@ public class GuiHandler implements IGuiHandler { return new ContainerCraftingHalo(player.inventory, world); case LibGuiIDs.FLOWER_BAG : return new ContainerFlowerBag(player); + case LibGuiIDs.BAUBLE_BOX : + return new ContainerBaubleBox(player); } return null; @@ -44,6 +48,8 @@ public class GuiHandler implements IGuiHandler { return new GuiCraftingHalo(player.inventory, world); case LibGuiIDs.FLOWER_BAG : return new GuiFlowerBag(player); + case LibGuiIDs.BAUBLE_BOX : + return new GuiBaubleBox(player); } return null; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 4f0bfae46..76ab3da09 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1633,6 +1633,7 @@ item.botania:manaweaveBoots.name=Manaweave Boots item.botania:gaiaHead.name=Gaia Guardian's Head item.botania:sextant.name=Worldshaper's Sextant item.botania:speedUpBelt.name=Planestrider's Sash +item.botania:baubleBox.name=Bauble Case # BREW NAMES botania.brew.fallback=Fallback diff --git a/src/main/resources/assets/botania/textures/gui/baubleBox.png b/src/main/resources/assets/botania/textures/gui/baubleBox.png new file mode 100644 index 0000000000000000000000000000000000000000..8a819dd2591ab862429aae76d31d12af228d1744 GIT binary patch literal 18808 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/items/unused/baubleBox.png b/src/main/resources/assets/botania/textures/items/baubleBox.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/unused/baubleBox.png rename to src/main/resources/assets/botania/textures/items/baubleBox.png