From c8aaeba7cb478381c7867b4a68ee2e54039857cf Mon Sep 17 00:00:00 2001 From: Quantumlyy Date: Thu, 7 Dec 2023 19:08:06 +0100 Subject: [PATCH] edit frame and product slots --- .../magicbees/client/gui/ContainerMagicApiary.java | 4 ++-- .../tileentity/TileEntityMagicApiary.java | 14 +++----------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/main/java/magicbees/client/gui/ContainerMagicApiary.java b/src/main/java/magicbees/client/gui/ContainerMagicApiary.java index dceb545..caae7d3 100644 --- a/src/main/java/magicbees/client/gui/ContainerMagicApiary.java +++ b/src/main/java/magicbees/client/gui/ContainerMagicApiary.java @@ -19,8 +19,8 @@ public class ContainerMagicApiary extends ContainerMB { // Constants private static final int SLOT_QUEEN = 0; private static final int SLOT_DRONE = 1; - private static final int SLOT_FRAME_START = 2; - private static final int SLOT_INVENTORY_START = 5; + private static final int SLOT_FRAME_START = 9; + private static final int SLOT_INVENTORY_START = 2; private static final int SLOT_FRAME_COUNT = 3; private static final int SLOT_INVENTORY_COUNT = 7; diff --git a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java index 59d0772..d6c579c 100644 --- a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java +++ b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java @@ -6,7 +6,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; @@ -475,9 +474,9 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory public static final int SLOT_QUEEN = 0; public static final int SLOT_DRONE = 1; - public static final int SLOT_FRAME_START = 2; + public static final int SLOT_FRAME_START = 9; public static final int SLOT_FRAME_COUNT = 3; - public static final int SLOT_PRODUCTS_START = 5; + public static final int SLOT_PRODUCTS_START = 2; public static final int SLOT_PRODUCTS_COUNT = 7; private final TileEntityMagicApiary magicApiary; @@ -559,14 +558,7 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory } public boolean canExtractItem(int slot, ItemStack itemStack, int side) { - switch (slot) { - case SLOT_FRAME_START: - case SLOT_FRAME_START + 1: - case SLOT_FRAME_START + 2: - return false; - default: - return true; - } + return slot >= SLOT_FRAME_START && slot <= SLOT_FRAME_START + 2; } public int getInventoryStackLimit() {