mirror of
https://github.com/GTNewHorizons/StorageDrawers.git
synced 2026-11-21 20:52:27 +00:00
More upgrade management work
This commit is contained in:
1 parent
5c0a20ca97
commit
8ae03cd96a
7 files changed
+108
-28
No files matched your search
@@ -4,6 +4,8 @@ itemGroup.storageDrawersSorting=Storage Drawers - Sorting
|
||||
container.drawers=Drawers
|
||||
storageDrawers.container.upgrades=Upgrades
|
||||
|
||||
storagedrawers.msg.maxUpgrades=This drawer cannot accept any more upgrades.
|
||||
|
||||
# Items
|
||||
item.upgradeTemplate.name=Upgrade Template
|
||||
item.upgrade.iron.name=Storage Upgrade (II)
|
||||
|
||||
@@ -203,19 +203,12 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH
|
||||
}
|
||||
|
||||
if (item != null && item.getItem() != null) {
|
||||
if (item.getItem() == ModItems.upgrade) {
|
||||
tileDrawers.addUpgrade(item);
|
||||
world.markBlockForUpdate(x, y, z);
|
||||
|
||||
if (player != null && !player.capabilities.isCreativeMode) {
|
||||
if (--item.stackSize <= 0)
|
||||
player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
|
||||
if (item.getItem() == ModItems.upgrade || item.getItem() == ModItems.upgradeStatus || item.getItem() == ModItems.upgradeVoid) {
|
||||
if (!tileDrawers.addUpgrade(item)) {
|
||||
player.addChatMessage(new ChatComponentTranslation("storagedrawers.msg.maxUpgrades"));
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
else if (item.getItem() == ModItems.upgradeStatus) {
|
||||
tileDrawers.addUpgrade(item);
|
||||
world.markBlockForUpdate(x, y, z);
|
||||
|
||||
if (player != null && !player.capabilities.isCreativeMode) {
|
||||
@@ -229,21 +222,10 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH
|
||||
tileDrawers.setIsLocked(!tileDrawers.isLocked());
|
||||
world.markBlockForUpdate(x, y, z);
|
||||
|
||||
return true;
|
||||
}
|
||||
else if (item.getItem() == ModItems.upgradeVoid && !tileDrawers.isVoid()) {
|
||||
tileDrawers.addUpgrade(item);
|
||||
world.markBlockForUpdate(x, y, z);
|
||||
|
||||
if (player != null && !player.capabilities.isCreativeMode) {
|
||||
if (--item.stackSize <= 0)
|
||||
player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
else if (true) {
|
||||
else if (item == null && player.isSneaking()) {
|
||||
player.openGui(StorageDrawers.instance, GuiHandler.drawersGuiID, world, x, y, z);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -153,6 +153,9 @@ public abstract class TileEntityDrawers extends TileEntity implements IDrawerGro
|
||||
if (slot == -1)
|
||||
return false;
|
||||
|
||||
upgrade = upgrade.copy();
|
||||
upgrade.stackSize = 1;
|
||||
|
||||
setUpgrade(slot, upgrade);
|
||||
return true;
|
||||
}
|
||||
@@ -161,7 +164,7 @@ public abstract class TileEntityDrawers extends TileEntity implements IDrawerGro
|
||||
slot = MathHelper.clamp_int(slot, 0, 4);
|
||||
upgrades[slot] = upgrade;
|
||||
|
||||
if (!worldObj.isRemote) {
|
||||
if (worldObj != null && !worldObj.isRemote) {
|
||||
markDirty();
|
||||
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
|
||||
}
|
||||
|
||||
@@ -102,9 +102,16 @@ public class GuiDrawers extends GuiContainer
|
||||
ContainerDrawers container = (ContainerDrawers) inventorySlots;
|
||||
List<Slot> storageSlots = container.getStorageSlots();
|
||||
for (int i = 0, n = storageSlots.size(); i < n; i++) {
|
||||
Slot slot = container.getSlot(i);
|
||||
Slot slot = storageSlots.get(i);
|
||||
drawTexturedModalRect(guiX + slot.xDisplayPosition, guiY + slot.yDisplayPosition, smDisabledX, smDisabledY, 16, 16);
|
||||
}
|
||||
|
||||
List<Slot> upgradeSlots = container.getUpgradeSlots();
|
||||
for (int i = 0, n = upgradeSlots.size(); i < n; i++) {
|
||||
Slot slot = upgradeSlots.get(i);
|
||||
if (slot instanceof SlotUpgrade && !((SlotUpgrade)slot).canTakeStack())
|
||||
drawTexturedModalRect(guiX + slot.xDisplayPosition, guiY + slot.yDisplayPosition, smDisabledX, smDisabledY, 16, 16);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -114,10 +121,17 @@ public class GuiDrawers extends GuiContainer
|
||||
ContainerDrawers container = (ContainerDrawers) inventorySlots;
|
||||
List<Slot> storageSlots = container.getStorageSlots();
|
||||
for (int i = 0, n = storageSlots.size(); i < n; i++) {
|
||||
Slot slot = container.getSlot(i);
|
||||
Slot slot = storageSlots.get(i);
|
||||
if (slot instanceof SlotStorage && slot.xDisplayPosition == x && slot.yDisplayPosition == y)
|
||||
return false;
|
||||
}
|
||||
|
||||
List<Slot> upgradeSlots = container.getUpgradeSlots();
|
||||
for (int i = 0, n = upgradeSlots.size(); i < n; i++) {
|
||||
Slot slot = upgradeSlots.get(i);
|
||||
if (slot instanceof SlotUpgrade && !((SlotUpgrade)slot).canTakeStack() && slot.xDisplayPosition == x && slot.yDisplayPosition == y)
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return super.func_146978_c(x, y, width, height, originX, originY);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.jaquadro.minecraft.storagedrawers.inventory;
|
||||
|
||||
import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers;
|
||||
import com.jaquadro.minecraft.storagedrawers.core.ModItems;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
import net.minecraft.inventory.Container;
|
||||
@@ -39,7 +40,7 @@ public class ContainerDrawers extends Container
|
||||
|
||||
upgradeSlots = new ArrayList<Slot>();
|
||||
for (int i = 0; i < 5; i++)
|
||||
upgradeSlots.add(addSlotToContainer(new Slot(upgradeInventory, i, UpgradeX + i * 18, UpgradeY)));
|
||||
upgradeSlots.add(addSlotToContainer(new SlotUpgrade(upgradeInventory, i, UpgradeX + i * 18, UpgradeY)));
|
||||
|
||||
playerSlots = new ArrayList<Slot>();
|
||||
for (int i = 0; i < 3; i++) {
|
||||
@@ -68,6 +69,10 @@ public class ContainerDrawers extends Container
|
||||
return storageSlots;
|
||||
}
|
||||
|
||||
public List<Slot> getUpgradeSlots () {
|
||||
return upgradeSlots;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canInteractWith (EntityPlayer player) {
|
||||
return storageInventory.isUseableByPlayer(player) || upgradeInventory.isUseableByPlayer(player);
|
||||
@@ -99,6 +104,19 @@ public class ContainerDrawers extends Container
|
||||
slot.onSlotChange(slotStack, itemStack);
|
||||
}
|
||||
|
||||
// Try merge inventory to upgrades
|
||||
else if (slotIndex >= inventoryStart && slotIndex < hotbarEnd && slotStack != null) {
|
||||
if (slotStack.getItem() == ModItems.upgrade || slotStack.getItem() == ModItems.upgradeStatus || slotStack.getItem() == ModItems.upgradeVoid) {
|
||||
if (!mergeItemStack(slotStack, upgradeStart, upgradeEnd, false)) {
|
||||
if (slotIndex >= inventoryStart && slotIndex < hotbarEnd) {
|
||||
if (!mergeItemStack(slotStack, hotbarStart, hotbarEnd, false))
|
||||
return null;
|
||||
} else if (slotIndex >= hotbarStart && slotIndex < hotbarEnd && !mergeItemStack(slotStack, inventoryStart, hotbarStart, false))
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Try merge stack into inventory
|
||||
else if (!mergeItemStack(slotStack, inventoryStart, hotbarEnd, false))
|
||||
return null;
|
||||
|
||||
@@ -1,8 +1,12 @@
|
||||
package com.jaquadro.minecraft.storagedrawers.inventory;
|
||||
|
||||
import com.jaquadro.minecraft.storagedrawers.StorageDrawers;
|
||||
import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer;
|
||||
import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers;
|
||||
import com.jaquadro.minecraft.storagedrawers.config.ConfigManager;
|
||||
import com.jaquadro.minecraft.storagedrawers.item.ItemUpgrade;
|
||||
import com.jaquadro.minecraft.storagedrawers.item.ItemUpgradeStatus;
|
||||
import com.jaquadro.minecraft.storagedrawers.item.ItemUpgradeVoid;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -83,9 +87,37 @@ public class InventoryUpgrade implements IInventory
|
||||
|
||||
@Override
|
||||
public boolean isItemValidForSlot (int slot, ItemStack item) {
|
||||
if (item.getItem() instanceof ItemUpgrade || item.getItem() instanceof ItemUpgradeStatus)
|
||||
if (item.getItem() instanceof ItemUpgrade || item.getItem() instanceof ItemUpgradeStatus || item.getItem() instanceof ItemUpgradeVoid)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public boolean canRemoveStorageUpgrade (int storageLevel) {
|
||||
return canRemoveStorageUpgrade(tile, storageLevel);
|
||||
}
|
||||
|
||||
private boolean canRemoveStorageUpgrade (TileEntityDrawers tile, int storageLevel) {
|
||||
int storageMult = StorageDrawers.config.getStorageUpgradeMultiplier(storageLevel);
|
||||
int effectiveStorageMult = tile.getEffectiveStorageMultiplier();
|
||||
if (effectiveStorageMult == storageMult)
|
||||
storageMult--;
|
||||
|
||||
int addedStackCapacity = storageMult * tile.getDrawerCapacity();
|
||||
|
||||
for (int i = 0; i < tile.getDrawerCount(); i++) {
|
||||
if (!tile.isDrawerEnabled(i))
|
||||
continue;
|
||||
|
||||
IDrawer drawer = tile.getDrawer(i);
|
||||
if (drawer.isEmpty())
|
||||
continue;
|
||||
|
||||
int addedItemCapacity = addedStackCapacity * drawer.getStoredItemStackSize();
|
||||
if (drawer.getMaxCapacity() - addedItemCapacity < drawer.getStoredItemCount())
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package com.jaquadro.minecraft.storagedrawers.inventory;
|
||||
|
||||
import com.jaquadro.minecraft.storagedrawers.core.ModItems;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class SlotUpgrade extends Slot
|
||||
{
|
||||
public SlotUpgrade (IInventory inventory, int index, int x, int y) {
|
||||
super(inventory, index, x, y);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canTakeStack (EntityPlayer player) {
|
||||
return canTakeStack();
|
||||
}
|
||||
|
||||
public boolean canTakeStack () {
|
||||
if (inventory instanceof InventoryUpgrade) {
|
||||
ItemStack stack = getStack();
|
||||
if (stack != null && stack.getItem() == ModItems.upgrade)
|
||||
return ((InventoryUpgrade) inventory).canRemoveStorageUpgrade(stack.getItemDamage());
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user