From a1dad33c00cfb0b7425d8fa5e3c2e91478662447 Mon Sep 17 00:00:00 2001 From: James Mitchell Date: Tue, 2 Sep 2014 18:37:32 -0700 Subject: [PATCH 01/49] Fix Crash if changing from Trade to Player in Letter and then closing --- api | 2 +- src/main/java/forestry/core/network/ClassMap.java | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/api b/api index 6720bd4ae..64f872275 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit 6720bd4aee8e7951ec3b0a6c4c5aaca4af136d82 +Subproject commit 64f872275aa429cd0af5c545843bb6f21ea14025 diff --git a/src/main/java/forestry/core/network/ClassMap.java b/src/main/java/forestry/core/network/ClassMap.java index bac3e53c8..d22e4b926 100755 --- a/src/main/java/forestry/core/network/ClassMap.java +++ b/src/main/java/forestry/core/network/ClassMap.java @@ -76,10 +76,13 @@ public class ClassMap { } for (Field member : gameProfileMember) { GameProfile profile = (GameProfile) member.get(obj); - intPayload[index.intIndex] = (int) (profile.getId().getMostSignificantBits() >>> 32); - intPayload[index.intIndex + 1] = (int) profile.getId().getMostSignificantBits(); - intPayload[index.intIndex + 2] = (int) (profile.getId().getLeastSignificantBits() >>> 32); - intPayload[index.intIndex + 3] = (int) profile.getId().getLeastSignificantBits(); + UUID profileID = profile.getId(); + if (profileID == null) + profileID = new UUID(0,0); + intPayload[index.intIndex] = (int) profileID.getMostSignificantBits() >>> 32; + intPayload[index.intIndex + 1] = (int) profileID.getMostSignificantBits(); + intPayload[index.intIndex + 2] = (int) profileID.getLeastSignificantBits() >>> 32; + intPayload[index.intIndex + 3] = (int) profileID.getLeastSignificantBits(); index.intIndex += 4; stringPayload[index.stringIndex] = profile.getName(); index.stringIndex++; From d05dbd7f9438255ed9f5a2de412d3cdb63027072 Mon Sep 17 00:00:00 2001 From: James Mitchell Date: Tue, 2 Sep 2014 19:15:33 -0700 Subject: [PATCH 02/49] Make sure post offices are saved and loaded properly. Fixes #141 --- src/main/java/forestry/mail/PostOffice.java | 13 ++++--------- src/main/java/forestry/mail/PostRegistry.java | 2 ++ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/java/forestry/mail/PostOffice.java b/src/main/java/forestry/mail/PostOffice.java index c75ffe303..f13220ee7 100755 --- a/src/main/java/forestry/mail/PostOffice.java +++ b/src/main/java/forestry/mail/PostOffice.java @@ -47,6 +47,10 @@ public class PostOffice extends WorldSavedData implements IPostOffice { super(s); } + public void setWorld(World world) { + refreshActiveTradeStations(world); + } + @Override public void readFromNBT(NBTTagCompound nbttagcompound) { for (int i = 0; i < collectedPostage.length; i++) { @@ -67,9 +71,6 @@ public class PostOffice extends WorldSavedData implements IPostOffice { @Override public LinkedHashMap getActiveTradeStations(World world) { - if (activeTradeStations == null) - refreshActiveTradeStations(world); - return this.activeTradeStations; } @@ -101,18 +102,12 @@ public class PostOffice extends WorldSavedData implements IPostOffice { @Override public void registerTradeStation(ITradeStation trade) { - if (activeTradeStations == null) - return; - if (!activeTradeStations.containsKey(trade.getAddress())) activeTradeStations.put(trade.getAddress(), trade); } @Override public void deregisterTradeStation(ITradeStation trade) { - if (activeTradeStations == null) - return; - activeTradeStations.remove(trade.getAddress()); } diff --git a/src/main/java/forestry/mail/PostRegistry.java b/src/main/java/forestry/mail/PostRegistry.java index d9a5c9c04..e8ee1b03e 100755 --- a/src/main/java/forestry/mail/PostRegistry.java +++ b/src/main/java/forestry/mail/PostRegistry.java @@ -151,6 +151,8 @@ public class PostRegistry implements IPostRegistry { world.setItemData(PostOffice.SAVE_NAME, office); } + office.setWorld(world); + cachedPostOffice = office; return office; } From 9e3569d0cd437f4ac3e71b933261db51289bb396 Mon Sep 17 00:00:00 2001 From: James Mitchell Date: Tue, 2 Sep 2014 23:12:01 -0700 Subject: [PATCH 03/49] Rework analyzer guis to be wider. close #132 --- .../apiculture/gui/ContainerBeealyzer.java | 67 +--------- .../forestry/apiculture/gui/GuiBeealyzer.java | 3 - .../apiculture/items/ItemBeealyzer.java | 30 +---- .../gui/ContainerTreealyzer.java | 70 +--------- .../arboriculture/gui/GuiTreealyzer.java | 3 - .../arboriculture/items/ItemTreealyzer.java | 30 +---- .../forestry/core/gui/ContainerAlyzer.java | 83 ++++++++++++ .../java/forestry/core/gui/GuiAlyzer.java | 121 +++++++++--------- .../forestry/core/gui/slots/SlotCustom.java | 16 +-- .../forestry/core/utils/AlyzerInventory.java | 45 +++++++ .../gui/ContainerFlutterlyzer.java | 66 +--------- .../lepidopterology/gui/GuiFlutterlyzer.java | 3 - .../items/ItemFlutterlyzer.java | 30 +---- .../forestry/textures/gui/beealyzer.png | Bin 3389 -> 1964 bytes 14 files changed, 219 insertions(+), 348 deletions(-) create mode 100644 src/main/java/forestry/core/gui/ContainerAlyzer.java create mode 100644 src/main/java/forestry/core/utils/AlyzerInventory.java diff --git a/src/main/java/forestry/apiculture/gui/ContainerBeealyzer.java b/src/main/java/forestry/apiculture/gui/ContainerBeealyzer.java index 60b9b493c..e2d562dc8 100755 --- a/src/main/java/forestry/apiculture/gui/ContainerBeealyzer.java +++ b/src/main/java/forestry/apiculture/gui/ContainerBeealyzer.java @@ -10,74 +10,17 @@ ******************************************************************************/ package forestry.apiculture.gui; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; - +import forestry.core.gui.ContainerAlyzer; +import forestry.core.config.ForestryItem; import forestry.apiculture.items.ItemBeeGE; import forestry.apiculture.items.ItemBeealyzer.BeealyzerInventory; -import forestry.core.config.ForestryItem; -import forestry.core.gui.ContainerItemInventory; -import forestry.core.gui.slots.SlotCustom; -import forestry.core.proxy.Proxies; -public class ContainerBeealyzer extends ContainerItemInventory { +import net.minecraft.entity.player.InventoryPlayer; - BeealyzerInventory inventory; +public class ContainerBeealyzer extends ContainerAlyzer { public ContainerBeealyzer(InventoryPlayer inventoryplayer, BeealyzerInventory inventory) { - super(inventory, inventoryplayer.player); - - this.inventory = inventory; - - // Energy - this.addSlot(new SlotCustom(inventory, BeealyzerInventory.SLOT_ENERGY, 172, 8, new Object[] { ForestryItem.honeydew, ForestryItem.honeyDrop })); - - // Bee to analyze - this.addSlot(new SlotCustom(inventory, BeealyzerInventory.SLOT_SPECIMEN, 172, 26, new Object[] { ItemBeeGE.class })); - - // Analyzed bee - this.addSlot(new SlotCustom(inventory, BeealyzerInventory.SLOT_ANALYZE_1, 172, 57, new Object[] { ItemBeeGE.class })); - this.addSlot(new SlotCustom(inventory, BeealyzerInventory.SLOT_ANALYZE_2, 172, 75, new Object[] { ItemBeeGE.class })); - this.addSlot(new SlotCustom(inventory, BeealyzerInventory.SLOT_ANALYZE_3, 172, 93, new Object[] { ItemBeeGE.class })); - this.addSlot(new SlotCustom(inventory, BeealyzerInventory.SLOT_ANALYZE_4, 172, 111, new Object[] { ItemBeeGE.class })); - this.addSlot(new SlotCustom(inventory, BeealyzerInventory.SLOT_ANALYZE_5, 172, 129, new Object[] { ItemBeeGE.class })); - - // Player inventory - for (int i1 = 0; i1 < 3; i1++) - for (int l1 = 0; l1 < 9; l1++) - addSecuredSlot(inventoryplayer, l1 + i1 * 9 + 9, 18 + l1 * 18, 156 + i1 * 18); - // Player hotbar - for (int j1 = 0; j1 < 9; j1++) - addSecuredSlot(inventoryplayer, j1, 18 + j1 * 18, 214); - - } - - @Override - public void onContainerClosed(EntityPlayer entityplayer) { - - if (!Proxies.common.isSimulating(entityplayer.worldObj)) - return; - - // Last slot is the energy slot, so we don't save that one. - for (int i = 0; i < inventory.getSizeInventory(); i++) { - if (i == BeealyzerInventory.SLOT_ENERGY) - continue; - ItemStack stack = inventory.getStackInSlot(i); - if (stack == null) - continue; - - Proxies.common.dropItemPlayer(entityplayer, stack); - inventory.setInventorySlotContents(i, null); - } - - inventory.onGuiSaved(entityplayer); - - } - - @Override - protected boolean isAcceptedItem(EntityPlayer player, ItemStack stack) { - return true; + super(inventoryplayer, inventory, new Object[] { ForestryItem.honeydew, ForestryItem.honeyDrop }, new Object[] { ItemBeeGE.class }); } } diff --git a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java index 1f38a8a3d..b677a3247 100755 --- a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java +++ b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java @@ -41,9 +41,6 @@ public class GuiBeealyzer extends GuiAlyzer { super(AlleleManager.alleleRegistry.getSpeciesRoot("rootBees"), player, new ContainerBeealyzer(player.inventory, inventory), inventory, 1, inventory.getSizeInventory()); - xSize = 196; - ySize = 238; - ArrayList beeList = new ArrayList(); ((ItemBeeGE) ForestryItem.beeDroneGE.item()).addCreativeItems(beeList, false); for (ItemStack beeStack : beeList) diff --git a/src/main/java/forestry/apiculture/items/ItemBeealyzer.java b/src/main/java/forestry/apiculture/items/ItemBeealyzer.java index 1fa0bcab4..fc74aa51b 100755 --- a/src/main/java/forestry/apiculture/items/ItemBeealyzer.java +++ b/src/main/java/forestry/apiculture/items/ItemBeealyzer.java @@ -10,10 +10,10 @@ ******************************************************************************/ package forestry.apiculture.items; +import forestry.core.utils.AlyzerInventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; import forestry.api.apiculture.IBee; @@ -27,22 +27,11 @@ import forestry.core.interfaces.IHintSource; import forestry.core.items.ItemInventoried; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; -import forestry.core.utils.ItemInventory; import forestry.plugins.PluginApiculture; public class ItemBeealyzer extends ItemInventoried { - public static class BeealyzerInventory extends ItemInventory implements IErrorSource, IHintSource { - - public static final int SLOT_SPECIMEN = 0; - public static final int SLOT_ANALYZE_1 = 1; - public static final int SLOT_ANALYZE_2 = 2; - public static final int SLOT_ANALYZE_3 = 3; - public static final int SLOT_ANALYZE_4 = 4; - public static final int SLOT_ANALYZE_5 = 6; - public static final int SLOT_ENERGY = 5; - - EntityPlayer player; + public static class BeealyzerInventory extends AlyzerInventory implements IErrorSource, IHintSource { public BeealyzerInventory(EntityPlayer player) { super(ItemBeealyzer.class, 7); @@ -54,21 +43,6 @@ public class ItemBeealyzer extends ItemInventoried { this.player = player; } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - - NBTTagList nbttaglist = new NBTTagList(); - for (int i = SLOT_ENERGY; i < SLOT_ENERGY + 1; i++) - if (inventoryStacks[i] != null) { - NBTTagCompound nbttagcompound1 = new NBTTagCompound(); - nbttagcompound1.setByte("Slot", (byte) i); - inventoryStacks[i].writeToNBT(nbttagcompound1); - nbttaglist.appendTag(nbttagcompound1); - } - nbttagcompound.setTag("Items", nbttaglist); - - } - private boolean isEnergy(ItemStack itemstack) { if (itemstack == null || itemstack.stackSize <= 0) return false; diff --git a/src/main/java/forestry/arboriculture/gui/ContainerTreealyzer.java b/src/main/java/forestry/arboriculture/gui/ContainerTreealyzer.java index 742414e68..b0e1ec589 100755 --- a/src/main/java/forestry/arboriculture/gui/ContainerTreealyzer.java +++ b/src/main/java/forestry/arboriculture/gui/ContainerTreealyzer.java @@ -10,77 +10,19 @@ ******************************************************************************/ package forestry.arboriculture.gui; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; - -import org.apache.commons.lang3.ArrayUtils; - -import forestry.api.genetics.AlleleManager; +import forestry.core.gui.ContainerAlyzer; +import forestry.core.config.ForestryItem; import forestry.arboriculture.items.ItemGermlingGE; import forestry.arboriculture.items.ItemTreealyzer.TreealyzerInventory; -import forestry.core.config.ForestryItem; -import forestry.core.gui.ContainerItemInventory; -import forestry.core.gui.slots.SlotCustom; -import forestry.core.proxy.Proxies; -public class ContainerTreealyzer extends ContainerItemInventory { +import net.minecraft.entity.player.InventoryPlayer; + +public class ContainerTreealyzer extends ContainerAlyzer { TreealyzerInventory inventory; public ContainerTreealyzer(InventoryPlayer inventoryplayer, TreealyzerInventory inventory) { - super(inventory, inventoryplayer.player); - - this.inventory = inventory; - - // Energy - this.addSlot(new SlotCustom(inventory, TreealyzerInventory.SLOT_ENERGY, 172, 8, new Object[] { ForestryItem.honeydew, ForestryItem.honeyDrop })); - - // Tree to analyze - this.addSlot(new SlotCustom(inventory, TreealyzerInventory.SLOT_SPECIMEN, 172, 26, ArrayUtils.addAll(AlleleManager.ersatzSaplings.keySet().toArray(new Object[0]), ItemGermlingGE.class))); - - // Analyzed tree - this.addSlot(new SlotCustom(inventory, TreealyzerInventory.SLOT_ANALYZE_1, 172, 57, new Object[] { ItemGermlingGE.class })); - this.addSlot(new SlotCustom(inventory, TreealyzerInventory.SLOT_ANALYZE_2, 172, 75, new Object[] { ItemGermlingGE.class })); - this.addSlot(new SlotCustom(inventory, TreealyzerInventory.SLOT_ANALYZE_3, 172, 93, new Object[] { ItemGermlingGE.class })); - this.addSlot(new SlotCustom(inventory, TreealyzerInventory.SLOT_ANALYZE_4, 172, 111, new Object[] { ItemGermlingGE.class })); - this.addSlot(new SlotCustom(inventory, TreealyzerInventory.SLOT_ANALYZE_5, 172, 129, new Object[] { ItemGermlingGE.class })); - - // Player inventory - for (int i1 = 0; i1 < 3; i1++) - for (int l1 = 0; l1 < 9; l1++) - addSecuredSlot(inventoryplayer, l1 + i1 * 9 + 9, 18 + l1 * 18, 156 + i1 * 18); - // Player hotbar - for (int j1 = 0; j1 < 9; j1++) - addSecuredSlot(inventoryplayer, j1, 18 + j1 * 18, 214); - - } - - @Override - public void onContainerClosed(EntityPlayer entityplayer) { - - if (!Proxies.common.isSimulating(entityplayer.worldObj)) - return; - - // Last slot is the energy slot, so we don't save that one. - for (int i = 0; i < inventory.getSizeInventory(); i++) { - if (i == TreealyzerInventory.SLOT_ENERGY) - continue; - ItemStack stack = inventory.getStackInSlot(i); - if (stack == null) - continue; - - Proxies.common.dropItemPlayer(entityplayer, stack); - inventory.setInventorySlotContents(i, null); - } - - inventory.onGuiSaved(entityplayer); - - } - - @Override - protected boolean isAcceptedItem(EntityPlayer player, ItemStack stack) { - return true; + super(inventoryplayer, inventory, new Object[] { ForestryItem.honeydew, ForestryItem.honeyDrop }, new Object[] { ItemGermlingGE.class }); } } diff --git a/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java b/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java index cc91b1848..87e44b527 100755 --- a/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java +++ b/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java @@ -46,9 +46,6 @@ public class GuiTreealyzer extends GuiAlyzer { super(AlleleManager.alleleRegistry.getSpeciesRoot("rootTrees"), player, new ContainerTreealyzer(player.inventory, inventory), inventory, 1, inventory.getSizeInventory()); - xSize = 196; - ySize = 238; - ArrayList treeList = new ArrayList(); ((ItemGermlingGE) ForestryItem.sapling.item()).addCreativeItems(treeList, false); for (ItemStack beeStack : treeList) diff --git a/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java b/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java index 95004f75e..15a63b279 100755 --- a/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java +++ b/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java @@ -13,9 +13,9 @@ package forestry.arboriculture.items; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; +import forestry.core.utils.AlyzerInventory; import forestry.api.arboriculture.ITree; import forestry.api.core.ForestryAPI; import forestry.api.core.Tabs; @@ -27,22 +27,12 @@ import forestry.core.interfaces.IHintSource; import forestry.core.items.ItemInventoried; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; -import forestry.core.utils.ItemInventory; import forestry.core.utils.Utils; import forestry.plugins.PluginArboriculture; public class ItemTreealyzer extends ItemInventoried { - public static class TreealyzerInventory extends ItemInventory implements IErrorSource, IHintSource { - - public final static int SLOT_SPECIMEN = 0; - public final static int SLOT_ANALYZE_1 = 1; - public final static int SLOT_ANALYZE_2 = 2; - public final static int SLOT_ANALYZE_3 = 3; - public final static int SLOT_ANALYZE_4 = 4; - public final static int SLOT_ANALYZE_5 = 6; - public final static int SLOT_ENERGY = 5; - EntityPlayer player; + public static class TreealyzerInventory extends AlyzerInventory implements IErrorSource, IHintSource { public TreealyzerInventory(EntityPlayer player) { super(ItemTreealyzer.class, 7); @@ -54,22 +44,6 @@ public class ItemTreealyzer extends ItemInventoried { this.player = player; } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - - NBTTagList nbttaglist = new NBTTagList(); - for (int i = SLOT_ENERGY; i < SLOT_ENERGY + 1; i++) { - if (inventoryStacks[i] != null) { - NBTTagCompound nbttagcompound1 = new NBTTagCompound(); - nbttagcompound1.setByte("Slot", (byte) i); - inventoryStacks[i].writeToNBT(nbttagcompound1); - nbttaglist.appendTag(nbttagcompound1); - } - } - nbttagcompound.setTag("Items", nbttaglist); - - } - private boolean isEnergy(ItemStack itemstack) { if (itemstack == null || itemstack.stackSize <= 0) return false; diff --git a/src/main/java/forestry/core/gui/ContainerAlyzer.java b/src/main/java/forestry/core/gui/ContainerAlyzer.java new file mode 100644 index 000000000..b8ff5010d --- /dev/null +++ b/src/main/java/forestry/core/gui/ContainerAlyzer.java @@ -0,0 +1,83 @@ +package forestry.core.gui; + +import forestry.core.gui.slots.SlotCustom; +import forestry.core.proxy.Proxies; +import forestry.core.utils.AlyzerInventory; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; + +public class ContainerAlyzer extends ContainerItemInventory { + + private AlyzerInventory inventory; + + protected ContainerAlyzer(InventoryPlayer inventoryplayer, AlyzerInventory inventory, Object[] acceptedEnergy, Object[] acceptedSpecimens) { + super(inventory, inventoryplayer.player); + + this.inventory = inventory; + + final int xPosLeftSlots = 222; + + // Energy + this.addSlot(new SlotCustom(inventory, inventory.SLOT_ENERGY, xPosLeftSlots, 8, acceptedEnergy)); + + // Bee to analyze + this.addSlot(new SlotCustom(inventory, inventory.SLOT_SPECIMEN, xPosLeftSlots, 26, acceptedSpecimens)); + + // Analyzed bee + this.addSlot(new SlotCustom(inventory, inventory.SLOT_ANALYZE_1, xPosLeftSlots, 57, acceptedSpecimens)); + this.addSlot(new SlotCustom(inventory, inventory.SLOT_ANALYZE_2, xPosLeftSlots, 75, acceptedSpecimens)); + this.addSlot(new SlotCustom(inventory, inventory.SLOT_ANALYZE_3, xPosLeftSlots, 93, acceptedSpecimens)); + this.addSlot(new SlotCustom(inventory, inventory.SLOT_ANALYZE_4, xPosLeftSlots, 111, acceptedSpecimens)); + this.addSlot(new SlotCustom(inventory, inventory.SLOT_ANALYZE_5, xPosLeftSlots, 129, acceptedSpecimens)); + + final int xPosPlayerInv = 43; + final int xSpacePlayerInv = 18; + final int yPosPlayerInv= 156; + final int ySpacePlayerInv = 18; + + // Player inventory + for (int i1 = 0; i1 < 3; i1++) { + for (int l1 = 0; l1 < 9; l1++) { + int slot = l1 + i1 * 9 + 9; + int x = xPosPlayerInv + (l1 * xSpacePlayerInv); + int y = yPosPlayerInv + (i1 * ySpacePlayerInv); + addSecuredSlot(inventoryplayer, slot, x, y); + } + } + // Player hotbar + for (int j1 = 0; j1 < 9; j1++) { + int x = xPosPlayerInv + (j1 * xSpacePlayerInv); + addSecuredSlot(inventoryplayer, j1, x, 214); + } + + } + + @Override + public void onContainerClosed(EntityPlayer entityplayer) { + + if (!Proxies.common.isSimulating(entityplayer.worldObj)) + return; + + // Last slot is the energy slot, so we don't save that one. + for (int i = 0; i < inventory.getSizeInventory(); i++) { + if (i == inventory.SLOT_ENERGY) + continue; + ItemStack stack = inventory.getStackInSlot(i); + if (stack == null) + continue; + + Proxies.common.dropItemPlayer(entityplayer, stack); + inventory.setInventorySlotContents(i, null); + } + + inventory.onGuiSaved(entityplayer); + } + + @Override + protected boolean isAcceptedItem(EntityPlayer player, ItemStack stack) { + return true; + } + +} diff --git a/src/main/java/forestry/core/gui/GuiAlyzer.java b/src/main/java/forestry/core/gui/GuiAlyzer.java index c828d1537..23541ffe4 100755 --- a/src/main/java/forestry/core/gui/GuiAlyzer.java +++ b/src/main/java/forestry/core/gui/GuiAlyzer.java @@ -43,8 +43,8 @@ import forestry.core.utils.StringUtil; public abstract class GuiAlyzer extends GuiForestry { protected static final int COLUMN_0 = 12; - protected static final int COLUMN_1 = 52; - protected static final int COLUMN_2 = 108; + protected static final int COLUMN_1 = 85; + protected static final int COLUMN_2 = 150; protected IInventory inventory; protected ISpeciesRoot speciesRoot; @@ -55,6 +55,9 @@ public abstract class GuiAlyzer extends GuiForestry { public GuiAlyzer(ISpeciesRoot speciesRoot, EntityPlayer player, ContainerForestry container, IInventory inventory, int pageMax, int pageSize) { super(Defaults.TEXTURE_PATH_GUI + "/beealyzer.png", container); + xSize = 246; + ySize = 238; + this.inventory = inventory; this.speciesRoot = speciesRoot; this.breedingTracker = speciesRoot.getBreedingTracker(player.worldObj, player.getGameProfile()); @@ -94,8 +97,8 @@ public abstract class GuiAlyzer extends GuiForestry { int columnwidth = column2 - column1 - 16; RenderHelper.enableStandardItemLighting(); - drawItemStack(iconStacks.get(primary.getUID()), adjustToFactor(guiLeft + column1 + columnwidth + 2), adjustToFactor(guiTop + getLineY())); - drawItemStack(iconStacks.get(secondary.getUID()), adjustToFactor(guiLeft + column2 + columnwidth + 4), adjustToFactor(guiTop + getLineY())); + drawItemStack(iconStacks.get(primary.getUID()), adjustToFactor(guiLeft + column1 + columnwidth - 4), adjustToFactor(guiTop + getLineY())); + drawItemStack(iconStacks.get(secondary.getUID()), adjustToFactor(guiLeft + column2 + columnwidth - 2), adjustToFactor(guiTop + getLineY())); RenderHelper.disableStandardItemLighting(); String primaryName; @@ -151,9 +154,9 @@ public abstract class GuiAlyzer extends GuiForestry { continue; drawLine(group.getScientific(), x, group.getLevel().getColour()); - drawLine(group.getLevel().name(), 130, group.getLevel().getColour()); + drawLine(group.getLevel().name(), 155, group.getLevel().getColour()); newLine(); - x += 8; + x += 10; } // Add the species name @@ -162,7 +165,7 @@ public abstract class GuiAlyzer extends GuiForestry { binomial = group.getScientific().substring(0, 1) + ". " + binomial.toLowerCase(Locale.ENGLISH); drawLine(binomial, x, 0xebae85); - drawLine("SPECIES", 130, 0xebae85); + drawLine("SPECIES", 155, 0xebae85); newLine(); newLine(); @@ -179,7 +182,7 @@ public abstract class GuiAlyzer extends GuiForestry { drawSplitLine(StringUtil.localize("gui.alyzer.nodescription"), 12, 156, 0x666666); else { String tokens[] = description.split("\\|"); - drawSplitLine(tokens[0], 12, 152, 0x666666); + drawSplitLine(tokens[0], 12, 202, 0x666666); if (tokens.length > 1) fontRendererObj.drawStringWithShadow("- " + tokens[1], adjustToFactor(guiLeft + 160) - fontRendererObj.getStringWidth("- " + tokens[1]), adjustToFactor(guiTop + 145 - 14), 0x99cc32); @@ -222,7 +225,7 @@ public abstract class GuiAlyzer extends GuiForestry { } x += columnWidth; - if (x > 150) { + if (x > columnWidth * 4) { x = 0; newLine(); newLine(); @@ -254,30 +257,29 @@ public abstract class GuiAlyzer extends GuiForestry { adjustToFactor(guiTop) + getLineY()); */ - int line = 0; - int column = 196; + int line = 247; + int column = 100; switch (EnumMutateChance.rateChance(combination.getBaseChance())) { - case HIGHEST: - column = 226; - line = 9; - break; - case HIGHER: - column = 211; - line = 9; - break; - case HIGH: - line = 9; - break; - case NORMAL: - column = 226; - break; - case LOW: - column = 211; - break; - case LOWEST: - default: - break; + case HIGHEST: + column = 100; + break; + case HIGHER: + column = 100 + 15; + break; + case HIGH: + column = 100 + 15 * 2; + break; + case NORMAL: + column = 100 + 15 * 3; + break; + case LOW: + column = 100 + 15 * 4; + break; + case LOWEST: + column = 100 + 15 * 5; + default: + break; } Proxies.common.bindTexture(textureFile); @@ -289,35 +291,34 @@ public abstract class GuiAlyzer extends GuiForestry { // Question marks Proxies.common.bindTexture(textureFile); - drawTexturedModalRect(adjustToFactor(guiLeft) + x, adjustToFactor(guiTop) + getLineY(), 196, 18, 16, 16); + drawTexturedModalRect(adjustToFactor(guiLeft) + x, adjustToFactor(guiTop) + getLineY(), 78, 240, 16, 16); Proxies.common.bindTexture(textureFile); - drawTexturedModalRect(adjustToFactor(guiLeft) + x + 32, adjustToFactor(guiTop) + getLineY(), 196, 18, 16, 16); + drawTexturedModalRect(adjustToFactor(guiLeft) + x + 32, adjustToFactor(guiTop) + getLineY(), 78, 240, 16, 16); - int line = 0; - int column = 196; + int line = 247; + int column = 100; switch (EnumMutateChance.rateChance(combination.getBaseChance())) { - case HIGHEST: - column = 226; - line = 9; - break; - case HIGHER: - column = 211; - line = 9; - break; - case HIGH: - line = 9; - break; - case NORMAL: - column = 226; - break; - case LOW: - column = 211; - break; - case LOWEST: - default: - break; + case HIGHEST: + column = 100; + break; + case HIGHER: + column = 100 + 15; + break; + case HIGH: + column = 100 + 15 * 2; + break; + case NORMAL: + column = 100 + 15 * 3; + break; + case LOW: + column = 100 + 15 * 4; + break; + case LOWEST: + column = 100 + 15 * 5; + default: + break; } // Probability arrow @@ -367,22 +368,22 @@ public abstract class GuiAlyzer extends GuiForestry { private void drawDownSymbol(int x, int y) { Proxies.common.bindTexture(textureFile); - drawTexturedModalRect((int) ((guiLeft + x) * (1 / factor)), (int) ((guiTop + getLineY()) * (1 / factor)), 196, 34, 15, 9); + drawTexturedModalRect((int) ((guiLeft + x) * (1 / factor)), (int) ((guiTop + getLineY()) * (1 / factor)), 0, 247, 15, 9); } private void drawUpSymbol(int x, int y) { Proxies.common.bindTexture(textureFile); - drawTexturedModalRect((int) ((guiLeft + x) * (1 / factor)), (int) ((guiTop + getLineY()) * (1 / factor)), 211, 34, 15, 9); + drawTexturedModalRect((int) ((guiLeft + x) * (1 / factor)), (int) ((guiTop + getLineY()) * (1 / factor)), 15, 247, 15, 9); } private void drawBothSymbol(int x, int y) { Proxies.common.bindTexture(textureFile); - drawTexturedModalRect((int) ((guiLeft + x) * (1 / factor)), (int) ((guiTop + getLineY()) * (1 / factor)), 226, 34, 15, 9); + drawTexturedModalRect((int) ((guiLeft + x) * (1 / factor)), (int) ((guiTop + getLineY()) * (1 / factor)), 30, 247, 15, 9); } private void drawNoneSymbol(int x, int y) { Proxies.common.bindTexture(textureFile); - drawTexturedModalRect((int) ((guiLeft + x) * (1 / factor)), (int) ((guiTop + getLineY()) * (1 / factor)), 241, 34, 15, 9); + drawTexturedModalRect((int) ((guiLeft + x) * (1 / factor)), (int) ((guiTop + getLineY()) * (1 / factor)), 45, 247, 15, 9); } protected void drawFertilityInfo(int fertility, int x, int textColor, int texOffset) { @@ -390,7 +391,7 @@ public abstract class GuiAlyzer extends GuiForestry { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); Proxies.common.bindTexture(textureFile); - drawTexturedModalRect((int) ((guiLeft + x + 19) * (1 / factor)), (int) ((guiTop + getLineY()) * (1 / factor)), 196, 43 + texOffset, 12, 9); + drawTexturedModalRect((int) ((guiLeft + x + 19) * (1 / factor)), (int) ((guiTop + getLineY()) * (1 / factor)), 60, 240 + texOffset, 12, 8); drawLine(Integer.toString(fertility) + " x", x, textColor); } diff --git a/src/main/java/forestry/core/gui/slots/SlotCustom.java b/src/main/java/forestry/core/gui/slots/SlotCustom.java index d0881973a..e7624ccd1 100755 --- a/src/main/java/forestry/core/gui/slots/SlotCustom.java +++ b/src/main/java/forestry/core/gui/slots/SlotCustom.java @@ -42,8 +42,8 @@ public class SlotCustom extends SlotForestry { private ICrafter crafter; private String blockedTexture = "slots/blocked"; - public SlotCustom(IInventory iinventory, int i, int j, int k, boolean exclusion) { - super(iinventory, i, j, k); + public SlotCustom(IInventory iinventory, int slotIndex, int xPos, int yPos, boolean exclusion) { + super(iinventory, slotIndex, xPos, yPos); items = new Object[0]; this.exclusion = exclusion; } @@ -52,17 +52,17 @@ public class SlotCustom extends SlotForestry { this(iinventory, i, j, k, items.toArray()); }*/ - public SlotCustom(IInventory iinventory, Collection items, int i, int j, int k) { - this(iinventory, i, j, k, items.toArray()); + public SlotCustom(IInventory iinventory, Collection items, int slotIndex, int xPos, int yPos) { + this(iinventory, slotIndex, xPos, yPos, items.toArray()); } - public SlotCustom(IInventory iinventory, int i, int j, int k, boolean exclusion, Object... items) { - this(iinventory, i, j, k, items); + public SlotCustom(IInventory iinventory, int slotIndex, int xPos, int yPos, boolean exclusion, Object... items) { + this(iinventory, slotIndex, xPos, yPos, items); this.exclusion = exclusion; } - public SlotCustom(IInventory iinventory, int i, int j, int k, Object... items) { - super(iinventory, i, j, k); + public SlotCustom(IInventory iinventory, int slotIndex, int xPos, int yPos, Object... items) { + super(iinventory, slotIndex, xPos, yPos); this.items = items; } diff --git a/src/main/java/forestry/core/utils/AlyzerInventory.java b/src/main/java/forestry/core/utils/AlyzerInventory.java new file mode 100644 index 000000000..398ab4764 --- /dev/null +++ b/src/main/java/forestry/core/utils/AlyzerInventory.java @@ -0,0 +1,45 @@ +package forestry.core.utils; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; + +public class AlyzerInventory extends ItemInventory { + + public static final int SLOT_SPECIMEN = 0; + public static final int SLOT_ANALYZE_1 = 1; + public static final int SLOT_ANALYZE_2 = 2; + public static final int SLOT_ANALYZE_3 = 3; + public static final int SLOT_ANALYZE_4 = 4; + public static final int SLOT_ANALYZE_5 = 6; + public static final int SLOT_ENERGY = 5; + + protected EntityPlayer player; + + public AlyzerInventory(Class itemClass, int slots) { + super(itemClass, slots); + } + + public AlyzerInventory(Class itemClass, int size, ItemStack itemstack) { + super(itemClass, size, itemstack); + } + + @Override + public void writeToNBT(NBTTagCompound nbttagcompound) { + + NBTTagList nbttaglist = new NBTTagList(); + for (int i = SLOT_ENERGY; i < SLOT_ENERGY + 1; i++) { + if (inventoryStacks[i] != null) { + NBTTagCompound nbttagcompound1 = new NBTTagCompound(); + nbttagcompound1.setByte("Slot", (byte) i); + inventoryStacks[i].writeToNBT(nbttagcompound1); + nbttaglist.appendTag(nbttagcompound1); + } + } + nbttagcompound.setTag("Items", nbttaglist); + + } + +} diff --git a/src/main/java/forestry/lepidopterology/gui/ContainerFlutterlyzer.java b/src/main/java/forestry/lepidopterology/gui/ContainerFlutterlyzer.java index 176de6ebb..d6d755837 100755 --- a/src/main/java/forestry/lepidopterology/gui/ContainerFlutterlyzer.java +++ b/src/main/java/forestry/lepidopterology/gui/ContainerFlutterlyzer.java @@ -10,75 +10,19 @@ ******************************************************************************/ package forestry.lepidopterology.gui; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; - +import forestry.core.gui.ContainerAlyzer; import forestry.core.config.ForestryItem; -import forestry.core.gui.ContainerItemInventory; -import forestry.core.gui.slots.SlotCustom; -import forestry.core.proxy.Proxies; import forestry.lepidopterology.items.ItemButterflyGE; import forestry.lepidopterology.items.ItemFlutterlyzer.FlutterlyzerInventory; -public class ContainerFlutterlyzer extends ContainerItemInventory { +import net.minecraft.entity.player.InventoryPlayer; + +public class ContainerFlutterlyzer extends ContainerAlyzer { FlutterlyzerInventory inventory; public ContainerFlutterlyzer(InventoryPlayer inventoryplayer, FlutterlyzerInventory inventory) { - super(inventory, inventoryplayer.player); - - this.inventory = inventory; - - // Energy - this.addSlot(new SlotCustom(inventory, FlutterlyzerInventory.SLOT_ENERGY, 172, 8, new Object[] { ForestryItem.honeydew, ForestryItem.honeyDrop })); - - // Bee to analyze - this.addSlot(new SlotCustom(inventory, FlutterlyzerInventory.SLOT_SPECIMEN, 172, 26, new Object[] { ItemButterflyGE.class, Blocks.sapling })); - - // Analyzed bee - this.addSlot(new SlotCustom(inventory, FlutterlyzerInventory.SLOT_ANALYZE_1, 172, 57, new Object[] { ItemButterflyGE.class })); - this.addSlot(new SlotCustom(inventory, FlutterlyzerInventory.SLOT_ANALYZE_2, 172, 75, new Object[] { ItemButterflyGE.class })); - this.addSlot(new SlotCustom(inventory, FlutterlyzerInventory.SLOT_ANALYZE_3, 172, 93, new Object[] { ItemButterflyGE.class })); - this.addSlot(new SlotCustom(inventory, FlutterlyzerInventory.SLOT_ANALYZE_4, 172, 111, new Object[] { ItemButterflyGE.class })); - this.addSlot(new SlotCustom(inventory, FlutterlyzerInventory.SLOT_ANALYZE_5, 172, 129, new Object[] { ItemButterflyGE.class })); - - // Player inventory - for (int i1 = 0; i1 < 3; i1++) - for (int l1 = 0; l1 < 9; l1++) - addSecuredSlot(inventoryplayer, l1 + i1 * 9 + 9, 18 + l1 * 18, 156 + i1 * 18); - // Player hotbar - for (int j1 = 0; j1 < 9; j1++) - addSecuredSlot(inventoryplayer, j1, 18 + j1 * 18, 214); - - } - - @Override - public void onContainerClosed(EntityPlayer entityplayer) { - - if (!Proxies.common.isSimulating(entityplayer.worldObj)) - return; - - // Last slot is the energy slot, so we don't save that one. - for (int i = 0; i < inventory.getSizeInventory(); i++) { - if (i == FlutterlyzerInventory.SLOT_ENERGY) - continue; - ItemStack stack = inventory.getStackInSlot(i); - if (stack == null) - continue; - - Proxies.common.dropItemPlayer(entityplayer, stack); - inventory.setInventorySlotContents(i, null); - } - - inventory.onGuiSaved(entityplayer); - - } - - @Override - protected boolean isAcceptedItem(EntityPlayer player, ItemStack stack) { - return true; + super(inventoryplayer, inventory, new Object[] { ForestryItem.honeydew, ForestryItem.honeyDrop }, new Object[] { ItemButterflyGE.class }); } } diff --git a/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java b/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java index b26f67053..95ad3d08d 100755 --- a/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java +++ b/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java @@ -45,9 +45,6 @@ public class GuiFlutterlyzer extends GuiAlyzer { super(AlleleManager.alleleRegistry.getSpeciesRoot("rootButterflies"), player, new ContainerFlutterlyzer(player.inventory, inventory), inventory, 1, inventory.getSizeInventory()); - xSize = 196; - ySize = 238; - ArrayList butterflyList = new ArrayList(); ((ItemButterflyGE) ForestryItem.butterflyGE.item()).addCreativeItems(butterflyList, false); for (ItemStack butterflyStack : butterflyList) diff --git a/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java b/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java index 9d56cfbd9..8d037ae50 100755 --- a/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java +++ b/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java @@ -13,9 +13,9 @@ package forestry.lepidopterology.items; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; +import forestry.core.utils.AlyzerInventory; import forestry.api.core.ForestryAPI; import forestry.api.core.Tabs; import forestry.api.lepidopterology.IButterfly; @@ -27,21 +27,11 @@ import forestry.core.interfaces.IHintSource; import forestry.core.items.ItemInventoried; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; -import forestry.core.utils.ItemInventory; import forestry.plugins.PluginLepidopterology; public class ItemFlutterlyzer extends ItemInventoried { - public static class FlutterlyzerInventory extends ItemInventory implements IErrorSource, IHintSource { - - public final static int SLOT_SPECIMEN = 0; - public final static int SLOT_ANALYZE_1 = 1; - public final static int SLOT_ANALYZE_2 = 2; - public final static int SLOT_ANALYZE_3 = 3; - public final static int SLOT_ANALYZE_4 = 4; - public final static int SLOT_ANALYZE_5 = 6; - public final static int SLOT_ENERGY = 5; - EntityPlayer player; + public static class FlutterlyzerInventory extends AlyzerInventory implements IErrorSource, IHintSource { public FlutterlyzerInventory(EntityPlayer player) { super(ItemFlutterlyzer.class, 7); @@ -53,22 +43,6 @@ public class ItemFlutterlyzer extends ItemInventoried { this.player = player; } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - - NBTTagList nbttaglist = new NBTTagList(); - for (int i = SLOT_ENERGY; i < SLOT_ENERGY + 1; i++) { - if (inventoryStacks[i] != null) { - NBTTagCompound nbttagcompound1 = new NBTTagCompound(); - nbttagcompound1.setByte("Slot", (byte) i); - inventoryStacks[i].writeToNBT(nbttagcompound1); - nbttaglist.appendTag(nbttagcompound1); - } - } - nbttagcompound.setTag("Items", nbttaglist); - - } - private boolean isEnergy(ItemStack itemstack) { if (itemstack == null || itemstack.stackSize <= 0) return false; diff --git a/src/main/resources/assets/forestry/textures/gui/beealyzer.png b/src/main/resources/assets/forestry/textures/gui/beealyzer.png index 726c4c757ea3f0de31cc8f185cdd32df9bf6301b..4bc31f73c98308d23246785b2f643e6cf355c42a 100755 GIT binary patch literal 1964 zcmaJ>3s4hR6n!C40ZR!~lq!^Eg_)-nf5f5)?TO;>riPN5@VA<0s}^B5SyXMXqMPw(Lr7bv|V8?iVUWZ zg|X<6D77*jk>Mr`5po3KS{|Q|L`8A7p zOz(dZn^h|bjGKX(af?X{FD`ecYb!z`GhrGMH>q&EXrzki`8bK2^Kk-^Wkw;ag?gh7 zx0>05`AVfE*=Qy;MlF^sk3}H^N3YjO#E}YN0xwD?5JV*K`HD!fFj^2T6DXqPa=t*w zix|PmajnIG8Oaf>ZVW3Q7wc*T0|9rIVvF*eE?dCTyFO@#L2&58LlOxm8f}W$Ejt z8J$-`)Dp&2AGe^Opml3>kc!zBdKOX#k{M~4&>eSxMeF}4fM4#`WO;(h*82Rumw6A5 zNjukgPvqgn!=OXpCmaxo0o`XH4Sx~fkK>@-d&3^Yt4 z{P!~5pcP4z{}`yj1XLxn1iE$3rL_-$AAN~&N*C?033LunNvoyQD>t$XWP8H|N#a{c zBKLHXCzVXESs(=E-xJr2kHA4GhO!Jpi-dy#QnNY z&LDdB>@z3Cin?P{D(ge}aAClZ-i29cz|mO8dY7t)Ex0UXbT=)D`?a4f0Qr;hTcIe& zzDpoJ6pFNhHF2}1)mzF`697n}PTHy8{1+B?UVq%R>Fa7o#hcw=$ul2|4s?c=ZUF~1 zb0>Bz^8lylZM$-(wOvWn%X;Z64mfhd zP#jHOY@hJ+9Cr4%jzmw!)$69aLDX^Osj8B%zM1`bA$pg6MHEbxfXzwNEqbrOk?6M9 zH~a21>i90ln_aoAC}i!dA1M0=#LiwS zuR_BpaZH}~Y0*;Jfkyg!-7IE+ZeSn!Q{VHOhnH0?U#hiP98%guQ1EC{dE}$E09VD6 M6>0KAiP@$90Fx1~v;Y7A literal 3389 zcmZ`+c|25Y8-8YqLH4m^9lS^)^1d%2CVPpj*|LQSFS0Alj7m**k|g#}=-94LBa0gmpx@=(M4**-+?g6_i%O(gdG6tM9(q;U#56yZ+ zbX?-JH~{-!p42&E5i&IQ>C7desRNzVDa-Uf(E~GWMw~$w28uWTDrN5%_@~@-f`9ES zDnRk>aH`gvl=tl$JxSW`@BaS&T#mP8@u6=9f&C$KuL%5Diqt9M1hz`9?XzTA^K$%+ zllF~AThJvd!`Fj?E?%74d0iHCp-EIBMgRVQ*6PxOsqo-c;Y6u7M{sV-R!%G{OT1d? zCEXKMZxr!UWwSjZS?tTCgB0~r?JXffoB63UPcaj~KgFYkBna4<_5%|a*(Nx4A|=@l z6pkd7FXYFM>-WFu?lv4W#&V4^9rOg}>ir^jIJ=UIiexxB(=swxExYvOSclM6<=mZT zldVpuWqN)`K8{@Y!1T}2orrNpEtXGuGYQX~r;*8a(w}+Z;q*or^|0jfbiH?9gb_4( z7-eeLUDVIF!aVA~UgJOUuJ~!1z#vaK+Xks25R}0#kGC;xt2t>uE-iiW`t|8oPpDLC z7bWGCqzrF#T-I9See!3M8~e-9s7wup+#y1K3%y?{?W zJqa!_eN*{+E_O4Ah=q|HU!3J|jk4rUp5u#mv;G2@YnB=8AC3`;XuVp)!SONs?OSb@ zbR^(-p8j?wyWNNXah6~njdk68UU{A-hl2y+DANrbQ@0S@+x|oX$B$t#ngaqP<(L)e zI7p|mnD+Rqmfx~8V!f#nY%&#S`QbfD)V^=soJ$4i!FTuRG5PA~ZHL#{2yAiG*oJRy z0m4)*B0F6*f-YkOfIWKSLS}Jsq{cuQ0>uSC4NE94A+K9^6=A;#Mo7(&*-P&4w{?)b ztQNfG87%w2sX}%<#h(;4;;D*d1Z`mxS^h_GW6l&#@uo(G+5`+Bqz-R8TSn*i720;x z2d%y^>0_;BBgg=*a*IRNMu?UsuFsVrg1VPTLxNLQpE^w)tU@XDl=0(@+GQExX7!}E zKBS>gk^q*G@cst&{doK#YzVSpu~rUF8<}nGHjD@W25zW7ifAh@*%BLrA25cY>jpOI z_3Xf4@UEuCWu1dKRnT0p?}0F$S==Kx%CT)ba|hFY1^}_>F%<`5&4YLsu~2*J^=Dsh z0j$R)ZNl$L>ozWTkWYMeXP`({6GnJnVsR*OVQFoMv#a#Sbu?My-qP0UXzU@V4!39F zImD+D3Dq>x&`zB;W`3OSizUFk3urzg-Sg@jAOKw-bU=bG!Ptm#zrU*JM!o?Y6j=*? zYYTYp&1_Q2xA?jKT=s_@2Ugf4C=P09c-gS34SkXWD$a!iR&-+?+^c6}Gcrw&>hXi) z?B+cu)L;<6!3~FJ)4?+@MJ17`a7=YyL~NLUj~)-1*aHKmQJVNuulVq_jnt{>4PM8g z<%<)`-s-ttJIzOpdSunAUdmm`RCc}^;XGJnmHmWR*gc_xtFU>H#parM2x*V{17Ld@ zT}SRLtfZXtr#`@0;kql!r1{%@*w7Tuzf10;^Cr?FZFQ2rr_OEiqClP>bI%)v%d!`8 zY3*jIO|7kA5~d_tseSw8hUJ(Uz2BwA$KgCHAQnmdFr~}wo35^mx1)w4W7b`~n2?a% z6#W{KN=A~NUP&tF;>`Cm%<(fkTDT-<|-^4?jyj^fD_i|W8IN9BX} zwITIbBNU1jddK{9tGx$p2A}Fi6AzD&N@8T!8SQGSVn0}?EBUOsDay>85y-5N8J(JD ziD&71RTC_1J4x583%NJe5+}{h$j0=2HS?O+1|~%#1P>}!zJr0Hina5 zE|-+jm_V~W$~wB|Ag=s;7RS`B(EZb46n|r}&ufX!k*f+OL9pi~z#uGotW-E+x_nEy zCEFIi;bZwBdAN+!S}f&1BNvY0UinVw?bwvTEh&Lap2V=NV1LwC-MosXGud+?NWhhA zefZ|+Yl%4H&&%taiSC?tLqD#lFIB?MWQiuWuqb)82XD}c^wr3;8jix93^~X0j?2L0 z8x0zZ%eZw)sAx2?Yb{<_$#LbwNki(wP(8^jhEG51Uamg*y|vnz8wa8CM78I5qHfr**EQ9R&|B}}4vX_mi;8k5 zvOHal^ts)&@0dlyLxzn_+a}zY(wkuqjVn{sjVHrT7Y-;2`{2}j#x8EI-S1S4V_#mg z>0tW1$(;YP1P7NW+?R)Jv+c?LJzU?xe1W`~E~J4gut|p|C2Li-q=EHY2-fAb7jNRp zBfaG7Y@lck*}}VnA1xubmaW#O)JJ=)WTuq*^G$SfhubbX_KJ(gYkXRj%IdHT$|jfh zMn#XTs?Q&PTWZ}|fWS_xMHn1G^lLcoSUNHm@+H-*pKG1zE3ZQTs3Ao^^;*cG(+kKy z)aTo1S3OyLL^`{D;UJAULS-ICo9^BopwSu`mE9XD?#*bBX3PC!#)o{hYk-=qOji+> z1_Y4` n~N|MukRJ>~0;#}HQt+}BCb9xzfj+;RJhs!N2Ons3bC&KP6w_Q8AQz9R} z;OwXW5M7D1GHv0He7h-D% zG}V_rA_6BZITMFt%lW>K#Hu1e#fi6JtJnjP8ySv1mRp-X)#y1aJ}YeTE#)0~hu0in zyy#;Ief5HYD9|iTd5-bbM7Pb{6sn~dQ!{d z7LMQ${<&@roLcSZ-p57K0l0cP-^~5l7wJ>Pfa&KCk)S719>YvlgFj)|yBX?Mqb~MB zF)mLMeu7~D;P}l4#yv!dgR6UkK`e+N2eIqViJ9=eYGW3q12DORoJ1&eY~IpGPU2sC z#30D8)FCEfM#S$_Q2>YhMLI$9*#Xq;iE3^RHAF8AKt2`rVaM%oK}d0sV7iM;kjK1R zpGCC^>_u9^0RD&%JkjGF-b@qlX3jxiPaSCYVns$}?XgZsa|d&pdnv*A_kkfi91vKb z%#4@Q96F&_9{~VJ5x2e8A*ukY_e6pN1{w$kQ1BIA!fUc2039FFb&k@Q9u|Rw9?Wd8}8CZXRzw4z-#4N6>kJ>NlXUj7* zzka=6Q*1fr{FAN=BBx=ynH^^(AQ;(xaKn!3+$Q$hZfZmv<4kqglpb>QqP!ytMy?Y1_4pg zcy+xZizqintBx1*D(Z`#*Wt}HMqp6e#51)$}t&VD?AK z78t+k%1u#VYmn{IaF0C>D-}FaA;CdeZc*tMj)<|3sC+i#W2Fixq8R3&XU^$`6zJ-| zGx@*zgb@Ent-tUg5;84u*qA%_eK~~G;EKi`9nSjMtkWO{PdGS8z3H11*BXa?{8Jmh z>yhxAI-wc%XIb)4zfewGelm+fE{g{t&ol2y{1WFYaZDpz$@oZ&%O@Uwd*)x1Np8E8 zRo=!?yb$ERUv>%gtD^JQ4#N-SCue45P2FN~ ztwNYEvWt8zxY_0e>&ea5&Ma8(6`R=U-2L(SKU>4s9pi)O;6Px-zH4z(*I1`a%jw#` E0Cu{_AOHXW From 0487cba4092eb8d3a5e1756f7bcfd21fba84dc68 Mon Sep 17 00:00:00 2001 From: James Mitchell Date: Wed, 3 Sep 2014 17:18:03 -0700 Subject: [PATCH 04/49] Updated Forge to Latest based on recommendation of #minecraftforge on IRC --- application.properties | 2 +- src/main/java/forestry/Forestry.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application.properties b/application.properties index 67cdae7af..e6eb8fe42 100644 --- a/application.properties +++ b/application.properties @@ -1,5 +1,5 @@ mcversion=1.7.10 -forgeversion=10.13.0.1180 +forgeversion=10.13.0.1208 version_major=3 version_minor=0 version_patch=0 diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index 31b23ff2b..54d912251 100755 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -49,7 +49,7 @@ import net.minecraft.item.Item; modid = Defaults.MOD, name = "Forestry", version = Version.VERSION, - dependencies = "required-after:Forge@[10.13.0.1180,);" + dependencies = "required-after:Forge@[10.13.0.1208,);" + "after:Buildcraft|Core;" + "after:ExtrabiomesXL;" + "after:BiomesOPlenty;" From f556633a806bf6ca0ec645ff47306ef50c035c44 Mon Sep 17 00:00:00 2001 From: James Mitchell Date: Wed, 3 Sep 2014 17:20:58 -0700 Subject: [PATCH 05/49] Cleaned up new wider alyzer GUIs. Realignment of centered text, nudging some things a pixel over, and some minor unification of shared functions. Due to #132 --- lang | 2 +- .../forestry/apiculture/gui/GuiBeealyzer.java | 47 ++--------------- .../arboriculture/gui/GuiTreealyzer.java | 31 +----------- .../forestry/core/gui/ContainerAlyzer.java | 2 +- .../java/forestry/core/gui/GuiAlyzer.java | 50 +++++++++++++++++-- .../lepidopterology/gui/GuiFlutterlyzer.java | 31 +----------- 6 files changed, 55 insertions(+), 108 deletions(-) diff --git a/lang b/lang index 37b482690..4428eb0b0 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 37b482690038b2d1c56a97bf99bc3dfcd50bd0a4 +Subproject commit 4428eb0b03e63eb75c3343e7a1d8e932f6669dd0 diff --git a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java index b677a3247..eee45d1fd 100755 --- a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java +++ b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java @@ -41,6 +41,8 @@ public class GuiBeealyzer extends GuiAlyzer { super(AlleleManager.alleleRegistry.getSpeciesRoot("rootBees"), player, new ContainerBeealyzer(player.inventory, inventory), inventory, 1, inventory.getSizeInventory()); + guiName = "gui.beealyzer"; + ArrayList beeList = new ArrayList(); ((ItemBeeGE) ForestryItem.beeDroneGE.item()).addCreativeItems(beeList, false); for (ItemStack beeStack : beeList) @@ -93,45 +95,6 @@ public class GuiBeealyzer extends GuiAlyzer { } - private void drawAnalyticsOverview() { - - startPage(); - - newLine(); - String title = StringUtil.localize("gui.beealyzer").toUpperCase(); - drawCenteredLine(title, 8, 158); - newLine(); - - fontRendererObj.drawSplitString(StringUtil.localize("gui.beealyzer.help"), (int) ((guiLeft + COLUMN_0 + 4) * (1 / factor)), - (int) ((guiTop + 42) * (1 / factor)), (int) (158 * (1 / factor)), fontColor.get("gui.screen")); - newLine(); - newLine(); - newLine(); - newLine(); - - drawLine(StringUtil.localize("gui.beealyzer.overview") + ":", COLUMN_0 + 4); - newLine(); - drawLine("I : " + StringUtil.localize("gui.general"), COLUMN_0 + 4); - newLine(); - drawLine("II : " + StringUtil.localize("gui.environment"), COLUMN_0 + 4); - newLine(); - drawLine("III: " + StringUtil.localize("gui.produce"), COLUMN_0 + 4); - newLine(); - drawLine("IV : " + StringUtil.localize("gui.evolution"), COLUMN_0 + 4); - - newLine(); - - String mode = breedingTracker.getModeName(); - if (mode != null && !mode.isEmpty()) { - newLine(); - String rules = StringUtil.localize("gui.beealyzer.behaviour") + ": " + StringUtil.capitalize(mode); - drawLine(rules, 8 + getCenteredOffset(title, 158), fontColor.get("gui.beealyzer.binomial")); - } - - endPage(); - - } - private void drawAnalyticsPage1(IBee bee, EnumBeeType type) { startPage(COLUMN_0, COLUMN_1, COLUMN_2); @@ -265,16 +228,14 @@ public class GuiBeealyzer extends GuiAlyzer { if (!bee.isNatural()) displayText = "bees.stock.ignoble"; displayText = StringUtil.localize(displayText); - // int offset = (int)(((158 - fontRendererObj.getStringWidth(origin)) / 2)*(1/factor)); - drawCenteredLine(displayText, 8, 158, fontColor.get("gui.beealyzer.binomial"));; + drawCenteredLine(displayText, 8, 208, fontColor.get("gui.beealyzer.binomial")); } if (bee.getGeneration() >= 0) { newLine(); displayText = StringUtil.localizeAndFormat("gui.beealyzer.generations", bee.getGeneration()); - // offset = (int)(((158 - fontRendererObj.getStringWidth(origin)) / 2)*(1/factor)); - drawCenteredLine(displayText, 8, 158, fontColor.get("gui.beealyzer.binomial")); + drawCenteredLine(displayText, 8, 208, fontColor.get("gui.beealyzer.binomial")); } endPage(); diff --git a/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java b/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java index 87e44b527..6d55ed488 100755 --- a/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java +++ b/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java @@ -46,6 +46,8 @@ public class GuiTreealyzer extends GuiAlyzer { super(AlleleManager.alleleRegistry.getSpeciesRoot("rootTrees"), player, new ContainerTreealyzer(player.inventory, inventory), inventory, 1, inventory.getSizeInventory()); + guiName = "gui.treealyzer"; + ArrayList treeList = new ArrayList(); ((ItemGermlingGE) ForestryItem.sapling.item()).addCreativeItems(treeList, false); for (ItemStack beeStack : treeList) @@ -96,35 +98,6 @@ public class GuiTreealyzer extends GuiAlyzer { } - private void drawAnalyticsOverview() { - - startPage(); - - newLine(); - String title = StringUtil.localize("gui.treealyzer").toUpperCase(); - drawCenteredLine(title, 8, 158); - newLine(); - - fontRendererObj.drawSplitString(StringUtil.localize("gui.treealyzer.help"), (int) ((guiLeft + COLUMN_0 + 4) * (1 / factor)), - (int) ((guiTop + 42) * (1 / factor)), (int) (158 * (1 / factor)), fontColor.get("gui.screen")); - newLine(); - newLine(); - newLine(); - newLine(); - - drawLine(StringUtil.localize("gui.treealyzer.overview") + ":", COLUMN_0 + 4); - newLine(); - drawLine("I : " + StringUtil.localize("gui.general"), COLUMN_0 + 4); - newLine(); - drawLine("II : " + StringUtil.localize("gui.environment"), COLUMN_0 + 4); - newLine(); - drawLine("III: " + StringUtil.localize("gui.produce"), COLUMN_0 + 4); - newLine(); - drawLine("IV : " + StringUtil.localize("gui.evolution"), COLUMN_0 + 4); - - endPage(); - } - private void drawAnalyticsPage1(ITree tree, EnumGermlingType type) { startPage(COLUMN_0, COLUMN_1, COLUMN_2); diff --git a/src/main/java/forestry/core/gui/ContainerAlyzer.java b/src/main/java/forestry/core/gui/ContainerAlyzer.java index b8ff5010d..1b5af9f50 100644 --- a/src/main/java/forestry/core/gui/ContainerAlyzer.java +++ b/src/main/java/forestry/core/gui/ContainerAlyzer.java @@ -17,7 +17,7 @@ public class ContainerAlyzer extends ContainerItemInventory { this.inventory = inventory; - final int xPosLeftSlots = 222; + final int xPosLeftSlots = 223; // Energy this.addSlot(new SlotCustom(inventory, inventory.SLOT_ENERGY, xPosLeftSlots, 8, acceptedEnergy)); diff --git a/src/main/java/forestry/core/gui/GuiAlyzer.java b/src/main/java/forestry/core/gui/GuiAlyzer.java index 23541ffe4..07e47727a 100755 --- a/src/main/java/forestry/core/gui/GuiAlyzer.java +++ b/src/main/java/forestry/core/gui/GuiAlyzer.java @@ -50,6 +50,8 @@ public abstract class GuiAlyzer extends GuiForestry { protected ISpeciesRoot speciesRoot; protected IBreedingTracker breedingTracker; + protected String guiName; + protected HashMap iconStacks = new HashMap(); public GuiAlyzer(ISpeciesRoot speciesRoot, EntityPlayer player, ContainerForestry container, IInventory inventory, int pageMax, int pageSize) { @@ -127,6 +129,44 @@ public abstract class GuiAlyzer extends GuiForestry { } } + protected void drawAnalyticsOverview() { + + startPage(); + + newLine(); + String title = StringUtil.localize(guiName).toUpperCase(); + drawCenteredLine(title, 8, 208); + newLine(); + + fontRendererObj.drawSplitString(StringUtil.localize(guiName + ".help"), (int) ((guiLeft + COLUMN_0 + 4) * (1 / factor)), + (int) ((guiTop + 42) * (1 / factor)), (int) (195 * (1 / factor)), fontColor.get("gui.screen")); + newLine(); + newLine(); + newLine(); + newLine(); + + drawLine(StringUtil.localize("gui.alyzer.overview") + ":", COLUMN_0 + 4); + newLine(); + drawLine("I : " + StringUtil.localize("gui.general"), COLUMN_0 + 4); + newLine(); + drawLine("II : " + StringUtil.localize("gui.environment"), COLUMN_0 + 4); + newLine(); + drawLine("III: " + StringUtil.localize("gui.produce"), COLUMN_0 + 4); + newLine(); + drawLine("IV : " + StringUtil.localize("gui.evolution"), COLUMN_0 + 4); + + newLine(); + + String mode = breedingTracker.getModeName(); + if (mode != null && !mode.isEmpty()) { + newLine(); + String rules = StringUtil.localize(guiName + ".behaviour") + ": " + StringUtil.capitalize(mode); + drawCenteredLine(rules, 8, 208, fontColor.get(guiName + ".binomial")); + } + + endPage(); + } + protected final void drawAnalyticsPageClassification(IIndividual individual) { startPage(); @@ -172,19 +212,19 @@ public abstract class GuiAlyzer extends GuiForestry { drawLine(StringUtil.localize("gui.alyzer.authority") + ": " + individual.getGenome().getPrimary().getAuthority(), 12); if (AlleleManager.alleleRegistry.isBlacklisted(individual.getIdent())) { String extinct = ">> " + StringUtil.localize("gui.alyzer.extinct").toUpperCase() + " <<"; - fontRendererObj.drawStringWithShadow(extinct, adjustToFactor(guiLeft + 160) - fontRendererObj.getStringWidth(extinct), + fontRendererObj.drawStringWithShadow(extinct, adjustToFactor(guiLeft + 208) - fontRendererObj.getStringWidth(extinct), adjustToFactor(guiTop + getLineY()), fontColor.get("gui.beealyzer.dominant")); } newLine(); String description = individual.getGenome().getPrimary().getDescription(); if (description == null || description.isEmpty()) - drawSplitLine(StringUtil.localize("gui.alyzer.nodescription"), 12, 156, 0x666666); + drawSplitLine(StringUtil.localize("gui.alyzer.nodescription"), 12, 208, 0x666666); else { String tokens[] = description.split("\\|"); - drawSplitLine(tokens[0], 12, 202, 0x666666); + drawSplitLine(tokens[0], 12, 208, 0x666666); if (tokens.length > 1) - fontRendererObj.drawStringWithShadow("- " + tokens[1], adjustToFactor(guiLeft + 160) - fontRendererObj.getStringWidth("- " + tokens[1]), + fontRendererObj.drawStringWithShadow("- " + tokens[1], adjustToFactor(guiLeft + 208) - fontRendererObj.getStringWidth("- " + tokens[1]), adjustToFactor(guiTop + 145 - 14), 0x99cc32); } @@ -391,7 +431,7 @@ public abstract class GuiAlyzer extends GuiForestry { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); Proxies.common.bindTexture(textureFile); - drawTexturedModalRect((int) ((guiLeft + x + 19) * (1 / factor)), (int) ((guiTop + getLineY()) * (1 / factor)), 60, 240 + texOffset, 12, 8); + drawTexturedModalRect((int) ((guiLeft + x + 14) * (1 / factor)), (int) ((guiTop + getLineY()) * (1 / factor)), 60, 240 + texOffset, 12, 8); drawLine(Integer.toString(fertility) + " x", x, textColor); } diff --git a/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java b/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java index 95ad3d08d..fc117ca51 100755 --- a/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java +++ b/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java @@ -45,6 +45,8 @@ public class GuiFlutterlyzer extends GuiAlyzer { super(AlleleManager.alleleRegistry.getSpeciesRoot("rootButterflies"), player, new ContainerFlutterlyzer(player.inventory, inventory), inventory, 1, inventory.getSizeInventory()); + guiName = "gui.flutterlyzer"; + ArrayList butterflyList = new ArrayList(); ((ItemButterflyGE) ForestryItem.butterflyGE.item()).addCreativeItems(butterflyList, false); for (ItemStack butterflyStack : butterflyList) @@ -94,35 +96,6 @@ public class GuiFlutterlyzer extends GuiAlyzer { } - private void drawAnalyticsOverview() { - - startPage(); - - newLine(); - String title = StringUtil.localize("gui.flutterlyzer").toUpperCase(); - drawCenteredLine(title, 8, 158); - newLine(); - - fontRendererObj.drawSplitString(StringUtil.localize("gui.flutterlyzer.help"), (int) ((guiLeft + COLUMN_0 + 4) * (1 / factor)), - (int) ((guiTop + 42) * (1 / factor)), (int) (158 * (1 / factor)), fontColor.get("gui.screen")); - newLine(); - newLine(); - newLine(); - newLine(); - - drawLine(StringUtil.localize("gui.beealyzer.overview") + ":", COLUMN_0 + 4); - newLine(); - drawLine("I : " + StringUtil.localize("gui.general"), COLUMN_0 + 4); - newLine(); - drawLine("II : " + StringUtil.localize("gui.environment"), COLUMN_0 + 4); - newLine(); - drawLine("III: " + StringUtil.localize("gui.produce"), COLUMN_0 + 4); - newLine(); - drawLine("IV : " + StringUtil.localize("gui.evolution"), COLUMN_0 + 4); - - endPage(); - } - private void drawAnalyticsPage1(IButterfly butterfly) { startPage(COLUMN_0, COLUMN_1, COLUMN_2); From 7556f1d597c3ed15e8fec1b78c58afb487243a42 Mon Sep 17 00:00:00 2001 From: James Mitchell Date: Wed, 3 Sep 2014 18:20:41 -0700 Subject: [PATCH 06/49] Fixed alyzers showing unlocalized string instead of gui.alyzer.nodescription --- src/main/java/forestry/core/gui/GuiAlyzer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/forestry/core/gui/GuiAlyzer.java b/src/main/java/forestry/core/gui/GuiAlyzer.java index 07e47727a..5ec00934f 100755 --- a/src/main/java/forestry/core/gui/GuiAlyzer.java +++ b/src/main/java/forestry/core/gui/GuiAlyzer.java @@ -21,6 +21,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import org.apache.commons.lang3.StringUtils; import org.lwjgl.opengl.GL11; import forestry.api.apiculture.EnumBeeChromosome; @@ -218,7 +219,7 @@ public abstract class GuiAlyzer extends GuiForestry { newLine(); String description = individual.getGenome().getPrimary().getDescription(); - if (description == null || description.isEmpty()) + if (StringUtils.isBlank(description) || description.startsWith("for.description.")) drawSplitLine(StringUtil.localize("gui.alyzer.nodescription"), 12, 208, 0x666666); else { String tokens[] = description.split("\\|"); From a62764a5ee444bdb4025f482496a0ad48fd5e1e0 Mon Sep 17 00:00:00 2001 From: James Mitchell Date: Thu, 14 Aug 2014 00:16:46 -0700 Subject: [PATCH 07/49] Fixed typo in addRGBComponents --- src/main/java/forestry/core/utils/Utils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/forestry/core/utils/Utils.java b/src/main/java/forestry/core/utils/Utils.java index 7aa851825..2a123d77d 100755 --- a/src/main/java/forestry/core/utils/Utils.java +++ b/src/main/java/forestry/core/utils/Utils.java @@ -320,7 +320,7 @@ public class Utils { public static int addRGBComponents(int colour, int r, int g, int b) { r = ((colour & 0xff0000) >> 16) + r; - g = ((colour & 0xff00) >> 8) + b; + g = ((colour & 0xff00) >> 8) + g; b = ((colour & 0xff)) + b; r = r <= 255 ? r : 255; From 17a7f1331efb21b1f95dc77eb8a57f0112b35ea4 Mon Sep 17 00:00:00 2001 From: James Mitchell Date: Wed, 3 Sep 2014 21:41:00 -0700 Subject: [PATCH 08/49] Refined IC2 plugin Now handles missing rubber components more granularly. One missing rubber component will not prevent others from working. Closes #101 --- src/main/java/forestry/plugins/PluginIC2.java | 46 +++++++++++-------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/src/main/java/forestry/plugins/PluginIC2.java b/src/main/java/forestry/plugins/PluginIC2.java index 251c8b33e..550580c7e 100755 --- a/src/main/java/forestry/plugins/PluginIC2.java +++ b/src/main/java/forestry/plugins/PluginIC2.java @@ -144,32 +144,40 @@ public class PluginIC2 implements IPlugin { private void initRubberChain() { treetap = IC2Items.getItem("treetap"); - resin = IC2Items.getItem("resin"); rubberwood = IC2Items.getItem("rubberWood"); - rubbersapling = IC2Items.getItem("rubberSapling"); - rubberleaves = IC2Items.getItem("rubberLeaves"); + + resin = IC2Items.getItem("resin"); + if (resin != null) + RecipeManagers.centrifugeManager.addRecipe(20, ForestryItem.propolis.getItemStack(), resin); + else + Proxies.log.fine("Missing IC2 resin, skipping centrifuge recipe for propolis to resin."); + fuelcanFilled = IC2Items.getItem("filledFuelCan"); fuelcanEmpty = IC2Items.getItem("fuelCan"); - if (treetap == null || resin == null || rubberwood == null || rubbersapling == null || rubberleaves == null || fuelcanFilled == null - || fuelcanEmpty == null) { - Proxies.log - .fine("Any of the following IC2 blocks and items could not be found: resin, rubber wood, saplings or leaves, filled fuel cans, empty fuel cans. Skipped adding rubber chain."); - return; + if (fuelcanEmpty != null && fuelcanFilled != null) { + ItemStack fuelcanStack = new ItemStack(fuelcanFilled.getItem(), 1, 0); + NBTTagCompound compound = new NBTTagCompound(); + compound.setInteger("value", 15288); + fuelcanStack.setTagCompound(compound); + RecipeManagers.bottlerManager.addRecipe(20, LiquidHelper.getLiquid(Defaults.LIQUID_ETHANOL, Defaults.BOTTLER_FUELCAN_VOLUME), fuelcanEmpty, fuelcanStack); + } else { + Proxies.log.fine("Missing IC2 fuelcanEmpty or fuelcanFilled, skipping bottler recipe for ethanol to filled fuel can."); } - // Add extra recipes - RecipeManagers.centrifugeManager.addRecipe(20, ForestryItem.propolis.getItemStack(), resin); - ItemStack fuelcanStack = new ItemStack(fuelcanFilled.getItem(), 1, 0); - NBTTagCompound compound = new NBTTagCompound(); - compound.setInteger("value", 15288); - fuelcanStack.setTagCompound(compound); - RecipeManagers.bottlerManager.addRecipe(20, LiquidHelper.getLiquid(Defaults.LIQUID_ETHANOL, Defaults.BOTTLER_FUELCAN_VOLUME), fuelcanEmpty, fuelcanStack); + rubbersapling = IC2Items.getItem("rubberSapling"); + if (rubbersapling != null) { + RecipeUtil.injectLeveledRecipe(rubbersapling, GameMode.getGameMode().getIntegerSetting("fermenter.yield.sapling"), Defaults.LIQUID_BIOMASS); + BackpackManager.backpackItems[2].add(rubbersapling); + } else { + Proxies.log.fine("Missing IC2 rubber sapling, skipping fermenter recipe for converting rubber sapling to biomass."); + } - RecipeUtil.injectLeveledRecipe(rubbersapling, GameMode.getGameMode().getIntegerSetting("fermenter.yield.sapling"), Defaults.LIQUID_BIOMASS); + rubberleaves = IC2Items.getItem("rubberLeaves"); + if (rubberleaves != null) + BackpackManager.backpackItems[2].add(rubberleaves); + else + Proxies.log.fine("Missing IC2 rubber leaves"); - // Add backpack items - BackpackManager.backpackItems[2].add(rubbersapling); - BackpackManager.backpackItems[2].add(rubberleaves); // Rubber wood is added via ore dictionary. } From a7c1de56f2ab5e04b8c5b9fbc84f486fd4216e09 Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 3 Sep 2014 23:54:25 -0700 Subject: [PATCH 09/49] Fixed Forestry Tile localization keys closes #166 --- .../forestry/apiculture/CommandBeekeepingMode.java | 5 ++++- .../apiculture/gadgets/TileAlvearyClimatiser.java | 2 +- .../gadgets/TileAlvearyHygroregulator.java | 2 +- .../apiculture/gadgets/TileAlvearyPlain.java | 2 +- .../apiculture/gadgets/TileAlvearySieve.java | 2 +- .../apiculture/gadgets/TileAlvearyStabiliser.java | 2 +- .../apiculture/gadgets/TileAlvearySwarmer.java | 2 +- .../forestry/apiculture/gadgets/TileApiary.java | 2 +- .../forestry/apiculture/gadgets/TileBeehouse.java | 2 +- .../java/forestry/apiculture/gui/GuiAlveary.java | 2 +- .../apiculture/gui/GuiAlvearyHygroregulator.java | 2 +- .../java/forestry/apiculture/gui/GuiApiary.java | 2 +- .../java/forestry/apiculture/items/ItemBeeGE.java | 5 ++++- .../java/forestry/core/gadgets/TileAnalyzer.java | 2 +- .../java/forestry/core/gadgets/TileEscritoire.java | 2 +- src/main/java/forestry/core/gui/GuiAnalyzer.java | 2 +- src/main/java/forestry/core/utils/StringUtil.java | 14 ++++++-------- .../java/forestry/energy/gadgets/EngineBronze.java | 5 +---- .../java/forestry/energy/gadgets/EngineCopper.java | 5 +---- .../java/forestry/energy/gadgets/EngineTin.java | 5 +---- .../forestry/energy/gadgets/MachineGenerator.java | 2 +- .../java/forestry/energy/gui/GuiEngineBronze.java | 4 +++- .../java/forestry/energy/gui/GuiEngineCopper.java | 4 +++- .../java/forestry/energy/gui/GuiEngineTin.java | 4 +++- .../java/forestry/energy/gui/GuiGenerator.java | 2 +- .../forestry/factory/gadgets/MachineBottler.java | 2 +- .../forestry/factory/gadgets/MachineCarpenter.java | 2 +- .../factory/gadgets/MachineCentrifuge.java | 2 +- .../factory/gadgets/MachineFabricator.java | 2 +- .../forestry/factory/gadgets/MachineFermenter.java | 2 +- .../forestry/factory/gadgets/MachineMoistener.java | 2 +- .../forestry/factory/gadgets/MachineRaintank.java | 2 +- .../forestry/factory/gadgets/MachineSqueezer.java | 2 +- .../forestry/factory/gadgets/MachineStill.java | 2 +- .../forestry/factory/gadgets/MillRainmaker.java | 2 +- .../forestry/factory/gadgets/TileWorktable.java | 2 +- src/main/java/forestry/factory/gui/GuiBottler.java | 2 +- .../java/forestry/factory/gui/GuiCarpenter.java | 2 +- .../java/forestry/factory/gui/GuiCentrifuge.java | 2 +- .../java/forestry/factory/gui/GuiFabricator.java | 2 +- .../java/forestry/factory/gui/GuiFermenter.java | 2 +- .../java/forestry/factory/gui/GuiMoistener.java | 2 +- .../java/forestry/factory/gui/GuiRaintank.java | 2 +- .../java/forestry/factory/gui/GuiSqueezer.java | 2 +- src/main/java/forestry/factory/gui/GuiStill.java | 2 +- .../java/forestry/factory/gui/GuiWorktable.java | 2 +- .../java/forestry/mail/gadgets/MachineMailbox.java | 2 +- .../forestry/mail/gadgets/MachinePhilatelist.java | 2 +- .../java/forestry/mail/gadgets/MachineTrader.java | 2 +- src/main/java/forestry/mail/gui/GuiTrader.java | 2 +- 50 files changed, 67 insertions(+), 66 deletions(-) diff --git a/src/main/java/forestry/apiculture/CommandBeekeepingMode.java b/src/main/java/forestry/apiculture/CommandBeekeepingMode.java index b55eebc72..2125b5756 100755 --- a/src/main/java/forestry/apiculture/CommandBeekeepingMode.java +++ b/src/main/java/forestry/apiculture/CommandBeekeepingMode.java @@ -204,7 +204,10 @@ public class CommandBeekeepingMode extends CommandMC { private void listModes(ICommandSender sender, String[] arguments) { World world = getWorld(sender, arguments); - sendChatMessage(sender, StringUtil.localize("chat.bees.command.mode.current").replaceAll("%MODE", PluginApiculture.beeInterface.getBeekeepingMode(world).getName()).replaceAll("%WORLD", String.valueOf(world.getWorldInfo().getSaveVersion()))); + String message = StringUtil.localize("chat.bees.command.mode.current"); + message = message.replaceAll("%MODE", PluginApiculture.beeInterface.getBeekeepingMode(world).getName()); + message = message.replaceAll("%WORLD", String.valueOf(world.getWorldInfo().getSaveVersion())); + sendChatMessage(sender, message); String help = ""; for (IBeekeepingMode mode : PluginApiculture.beeInterface.getBeekeepingModes()) { diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyClimatiser.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyClimatiser.java index b9d31566d..d39ee437a 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyClimatiser.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyClimatiser.java @@ -138,7 +138,7 @@ public abstract class TileAlvearyClimatiser extends TileAlveary implements IPowe @Override public String getInventoryName() { - return "tile.alveary.climatiser"; + return "alveary.climatiser"; } /* NETWORK */ diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java index 325e2c70c..5f3f290b3 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java @@ -77,7 +77,7 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory @Override public String getInventoryName() { - return "tile.alveary.5"; + return "alveary.5.name"; } /* UPDATING */ diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java index 104284e46..3f0a80c3e 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java @@ -582,7 +582,7 @@ public class TileAlvearyPlain extends TileAlveary implements ISidedInventory, IS @Override public String getInventoryName() { - return "alveary.0"; + return "alveary.0.name"; } @Override diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java index 9c79627fc..1a793fb6c 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java @@ -47,7 +47,7 @@ public class TileAlvearySieve extends TileAlveary implements ICrafter, IBeeListe @Override public String getInventoryName() { - return "tile.alveary.7"; + return "alveary.7.name"; } @Override diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyStabiliser.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyStabiliser.java index 1b0ff3200..165fd1b27 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyStabiliser.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyStabiliser.java @@ -48,7 +48,7 @@ public class TileAlvearyStabiliser extends TileAlveary implements IBeeModifier { @Override public String getInventoryName() { - return "tile.alveary.6"; + return "alveary.6.name"; } @Override diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java index b05f393fb..600d0c43d 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java @@ -267,7 +267,7 @@ public class TileAlvearySwarmer extends TileAlveary implements ISpecialInventory @Override public String getInventoryName() { - return "tile.alveary.2"; + return "alveary.2.name"; } @Override diff --git a/src/main/java/forestry/apiculture/gadgets/TileApiary.java b/src/main/java/forestry/apiculture/gadgets/TileApiary.java index 9c0693ff8..2bc0257e8 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileApiary.java +++ b/src/main/java/forestry/apiculture/gadgets/TileApiary.java @@ -30,7 +30,7 @@ public class TileApiary extends TileBeehouse implements ISidedInventory { @Override public String getInventoryName() { - return "apiculture.0"; + return "apiculture.0.name"; } @Override diff --git a/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java b/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java index 3e4f38665..3fc870ee2 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java +++ b/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java @@ -70,7 +70,7 @@ public class TileBeehouse extends TileBase implements IBeeHousing, IClimatised { @Override public String getInventoryName() { - return "apiculture.2"; + return "apiculture.2.name"; } @Override diff --git a/src/main/java/forestry/apiculture/gui/GuiAlveary.java b/src/main/java/forestry/apiculture/gui/GuiAlveary.java index 85da7f1d4..af6ca04ad 100755 --- a/src/main/java/forestry/apiculture/gui/GuiAlveary.java +++ b/src/main/java/forestry/apiculture/gui/GuiAlveary.java @@ -30,7 +30,7 @@ public class GuiAlveary extends GuiForestry { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String title = StringUtil.localize("tile." + tile.getInventoryName()); + String title = StringUtil.localizeTile(tile.getInventoryName()); this.fontRendererObj.drawString(title, getCenteredOffset(title), 6, fontColor.get("gui.title")); } diff --git a/src/main/java/forestry/apiculture/gui/GuiAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/gui/GuiAlvearyHygroregulator.java index 3d5266c5d..f941c1767 100755 --- a/src/main/java/forestry/apiculture/gui/GuiAlvearyHygroregulator.java +++ b/src/main/java/forestry/apiculture/gui/GuiAlvearyHygroregulator.java @@ -29,7 +29,7 @@ public class GuiAlvearyHygroregulator extends GuiForestry { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localize("tile.for." + tile.getInventoryName()); + String name = StringUtil.localizeTile(tile.getInventoryName()); this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); } diff --git a/src/main/java/forestry/apiculture/items/ItemBeeGE.java b/src/main/java/forestry/apiculture/items/ItemBeeGE.java index 90b484238..be2a1768c 100755 --- a/src/main/java/forestry/apiculture/items/ItemBeeGE.java +++ b/src/main/java/forestry/apiculture/items/ItemBeeGE.java @@ -77,7 +77,10 @@ public class ItemBeeGE extends ItemGE { if(StatCollector.canTranslate("for." + customBeeKey)){ return StringUtil.localize(customBeeKey); } - return StringUtil.localize("bees.grammar." + type.getName()).replaceAll("%SPECIES", individual.getDisplayName()).replaceAll("%TYPE", StringUtil.localize("bees.grammar." + type.getName() + ".type")); + String beeGrammar = StringUtil.localize("bees.grammar." + type.getName()); + String beeSpecies = individual.getDisplayName(); + String beeType = StringUtil.localize("bees.grammar." + type.getName() + ".type"); + return beeGrammar.replaceAll("%SPECIES", beeSpecies).replaceAll("%TYPE", beeType); } @SuppressWarnings({ "rawtypes", "unchecked" }) diff --git a/src/main/java/forestry/core/gadgets/TileAnalyzer.java b/src/main/java/forestry/core/gadgets/TileAnalyzer.java index 514e82d40..14e2635b9 100755 --- a/src/main/java/forestry/core/gadgets/TileAnalyzer.java +++ b/src/main/java/forestry/core/gadgets/TileAnalyzer.java @@ -76,7 +76,7 @@ public class TileAnalyzer extends TileBase implements ISpecialInventory, ISidedI @Override public String getInventoryName() { - return StringUtil.localize("core.0"); + return "core.0.name"; } /* GUI */ diff --git a/src/main/java/forestry/core/gadgets/TileEscritoire.java b/src/main/java/forestry/core/gadgets/TileEscritoire.java index 735c59cd7..2a279e0e9 100755 --- a/src/main/java/forestry/core/gadgets/TileEscritoire.java +++ b/src/main/java/forestry/core/gadgets/TileEscritoire.java @@ -47,7 +47,7 @@ public class TileEscritoire extends TileBase implements ISidedInventory, IRender private final InventoryAdapter inventory; @Override public String getInventoryName() { - return StringUtil.localize("core.1"); + return "core.1.name"; } public TileEscritoire() { diff --git a/src/main/java/forestry/core/gui/GuiAnalyzer.java b/src/main/java/forestry/core/gui/GuiAnalyzer.java index 8c3775b5c..6d04a6851 100755 --- a/src/main/java/forestry/core/gui/GuiAnalyzer.java +++ b/src/main/java/forestry/core/gui/GuiAnalyzer.java @@ -30,7 +30,7 @@ public class GuiAnalyzer extends GuiForestry { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String title = StringUtil.localize("tile.for." + tile.getInventoryName()); + String title = StringUtil.localizeTile(tile.getInventoryName()); this.fontRendererObj.drawString(title, getCenteredOffset(title), 6, fontColor.get("gui.title")); } diff --git a/src/main/java/forestry/core/utils/StringUtil.java b/src/main/java/forestry/core/utils/StringUtil.java index f459b8af0..69590976a 100755 --- a/src/main/java/forestry/core/utils/StringUtil.java +++ b/src/main/java/forestry/core/utils/StringUtil.java @@ -19,17 +19,15 @@ import net.minecraft.util.StatCollector; public class StringUtil { public static String localize(String key) { - return StatCollector.translateToLocal("for." + key).replace("\\n", "\n").replace("@", "%").replace("\\%", "@"); + return StatCollector.translateToLocal("for." + key); + } + + public static String localizeTile(String key) { + return StatCollector.translateToLocal("tile.for." + key); } public static String localizeAndFormat(String key, Object... args) { - String text = StringUtil.localize(key); - - try { - return String.format(text, args); - } catch (IllegalFormatException ex) { - return "Format error: " + text; - } + return localizeAndFormatRaw("for." + key, args); } /** diff --git a/src/main/java/forestry/energy/gadgets/EngineBronze.java b/src/main/java/forestry/energy/gadgets/EngineBronze.java index c8cdf1801..8efcc62fb 100755 --- a/src/main/java/forestry/energy/gadgets/EngineBronze.java +++ b/src/main/java/forestry/energy/gadgets/EngineBronze.java @@ -405,12 +405,9 @@ public class EngineBronze extends Engine implements ISpecialInventory, ILiquidTa return super.isUseableByPlayer(player); } - /** - * TODO: just a specialsource workaround - */ @Override public String getInventoryName() { - return super.getInventoryName(); + return "engine.2.name"; } /** diff --git a/src/main/java/forestry/energy/gadgets/EngineCopper.java b/src/main/java/forestry/energy/gadgets/EngineCopper.java index 7a0e74f6c..4612eb923 100755 --- a/src/main/java/forestry/energy/gadgets/EngineCopper.java +++ b/src/main/java/forestry/energy/gadgets/EngineCopper.java @@ -397,12 +397,9 @@ public class EngineCopper extends Engine implements ISpecialInventory, ISidedInv return super.isUseableByPlayer(player); } - /** - * TODO: just a specialsource workaround - */ @Override public String getInventoryName() { - return super.getInventoryName(); + return "engine.1.name"; } /** diff --git a/src/main/java/forestry/energy/gadgets/EngineTin.java b/src/main/java/forestry/energy/gadgets/EngineTin.java index a1f74ec75..690803635 100755 --- a/src/main/java/forestry/energy/gadgets/EngineTin.java +++ b/src/main/java/forestry/energy/gadgets/EngineTin.java @@ -311,12 +311,9 @@ public class EngineTin extends Engine implements ISocketable, IInventory { return super.isUseableByPlayer(player); } - /** - * TODO: just a specialsource workaround - */ @Override public String getInventoryName() { - return super.getInventoryName(); + return "engine.0.name"; } /** diff --git a/src/main/java/forestry/energy/gadgets/MachineGenerator.java b/src/main/java/forestry/energy/gadgets/MachineGenerator.java index 77444dba4..2dc316e37 100755 --- a/src/main/java/forestry/energy/gadgets/MachineGenerator.java +++ b/src/main/java/forestry/energy/gadgets/MachineGenerator.java @@ -65,7 +65,7 @@ public class MachineGenerator extends TileBase implements ISpecialInventory, ILi @Override public String getInventoryName() { - return StringUtil.localize("engine.3"); + return "engine.3.name"; } @Override diff --git a/src/main/java/forestry/energy/gui/GuiEngineBronze.java b/src/main/java/forestry/energy/gui/GuiEngineBronze.java index 5b0374c0a..c26e22287 100755 --- a/src/main/java/forestry/energy/gui/GuiEngineBronze.java +++ b/src/main/java/forestry/energy/gui/GuiEngineBronze.java @@ -31,6 +31,8 @@ import forestry.energy.gadgets.EngineBronze; public class GuiEngineBronze extends GuiEngine { + EngineBronze tile; + protected class BiogasSlot extends Widget { EngineBronze engine; @@ -106,7 +108,7 @@ public class GuiEngineBronze extends GuiEngine { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localize("tile.for.engine.2"); + String name = StringUtil.localizeTile(tile.getInventoryName()); this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); } diff --git a/src/main/java/forestry/energy/gui/GuiEngineCopper.java b/src/main/java/forestry/energy/gui/GuiEngineCopper.java index bea21fa42..f0082e58b 100755 --- a/src/main/java/forestry/energy/gui/GuiEngineCopper.java +++ b/src/main/java/forestry/energy/gui/GuiEngineCopper.java @@ -18,6 +18,8 @@ import forestry.energy.gadgets.EngineCopper; public class GuiEngineCopper extends GuiEngine { + EngineCopper tile; + public GuiEngineCopper(InventoryPlayer inventory, EngineCopper tile) { super(Defaults.TEXTURE_PATH_GUI + "/peatengine.png", new ContainerEngineCopper(inventory, tile), tile); } @@ -25,7 +27,7 @@ public class GuiEngineCopper extends GuiEngine { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localize("tile.for.engine.1"); + String name = StringUtil.localizeTile(tile.getInventoryName()); this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); this.fontRendererObj.drawString("Inventory", 8, this.ySize - 96 + 2, fontColor.get("gui.title")); } diff --git a/src/main/java/forestry/energy/gui/GuiEngineTin.java b/src/main/java/forestry/energy/gui/GuiEngineTin.java index 0a6d2035c..7aca755dc 100755 --- a/src/main/java/forestry/energy/gui/GuiEngineTin.java +++ b/src/main/java/forestry/energy/gui/GuiEngineTin.java @@ -20,6 +20,8 @@ import forestry.energy.gadgets.EngineTin; public class GuiEngineTin extends GuiEngine { + EngineTin tile; + public GuiEngineTin(InventoryPlayer inventory, EngineTin tile) { super(Defaults.TEXTURE_PATH_GUI + "/electricalengine.png", new ContainerEngineTin(inventory, tile), tile); widgetManager.add(new SocketWidget(this.widgetManager, 30, 40, tile, 0)); @@ -28,7 +30,7 @@ public class GuiEngineTin extends GuiEngine { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localize("tile.for.engine.0"); + String name = StringUtil.localizeTile(tile.getInventoryName()); this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); } diff --git a/src/main/java/forestry/energy/gui/GuiGenerator.java b/src/main/java/forestry/energy/gui/GuiGenerator.java index c2a4f01f4..e4fdafb93 100755 --- a/src/main/java/forestry/energy/gui/GuiGenerator.java +++ b/src/main/java/forestry/energy/gui/GuiGenerator.java @@ -28,7 +28,7 @@ public class GuiGenerator extends GuiForestry { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String title = StringUtil.localize("tile.for." + tile.getInventoryName()); + String title = StringUtil.localizeTile(tile.getInventoryName()); this.fontRendererObj.drawString(title, getCenteredOffset(title), 6, fontColor.get("gui.title")); } diff --git a/src/main/java/forestry/factory/gadgets/MachineBottler.java b/src/main/java/forestry/factory/gadgets/MachineBottler.java index 2b9c0a6e3..0dba330d5 100755 --- a/src/main/java/forestry/factory/gadgets/MachineBottler.java +++ b/src/main/java/forestry/factory/gadgets/MachineBottler.java @@ -166,7 +166,7 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq @Override public String getInventoryName() { - return "factory.0"; + return "factory.0.name"; } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java index 5e30b7f43..913c7803f 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java @@ -237,7 +237,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL @Override public String getInventoryName() { - return "factory.1"; + return "factory.1.name"; } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java index 294d09bf3..3133ca12b 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java +++ b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java @@ -148,7 +148,7 @@ public class MachineCentrifuge extends TilePowered implements ISidedInventory, I @Override public String getInventoryName() { - return "factory.2"; + return "factory.2.name"; } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineFabricator.java b/src/main/java/forestry/factory/gadgets/MachineFabricator.java index 989e27820..07e67d597 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFabricator.java +++ b/src/main/java/forestry/factory/gadgets/MachineFabricator.java @@ -246,7 +246,7 @@ public class MachineFabricator extends TilePowered implements ICrafter, ISpecial @Override public String getInventoryName() { - return "factory2.0"; + return "factory2.0.name"; } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineFermenter.java b/src/main/java/forestry/factory/gadgets/MachineFermenter.java index fc0ec9bbd..7a1f8c962 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFermenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineFermenter.java @@ -198,7 +198,7 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL @Override public String getInventoryName() { - return "factory.3"; + return "factory.3.name"; } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineMoistener.java b/src/main/java/forestry/factory/gadgets/MachineMoistener.java index 6ef2d0c4a..25285b966 100755 --- a/src/main/java/forestry/factory/gadgets/MachineMoistener.java +++ b/src/main/java/forestry/factory/gadgets/MachineMoistener.java @@ -145,7 +145,7 @@ public class MachineMoistener extends TilePowered implements ISpecialInventory, @Override public String getInventoryName() { - return "factory.4"; + return "factory.4.name"; } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineRaintank.java b/src/main/java/forestry/factory/gadgets/MachineRaintank.java index b8b327b24..4310b170b 100755 --- a/src/main/java/forestry/factory/gadgets/MachineRaintank.java +++ b/src/main/java/forestry/factory/gadgets/MachineRaintank.java @@ -70,7 +70,7 @@ public class MachineRaintank extends TileBase implements ISidedInventory, ILiqui @Override public String getInventoryName() { - return "factory2.1"; + return "factory2.1.name"; } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java index da55534c1..fc2e30d33 100755 --- a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java +++ b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java @@ -154,7 +154,7 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I @Override public String getInventoryName() { - return "factory.5"; + return "factory.5.name"; } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineStill.java b/src/main/java/forestry/factory/gadgets/MachineStill.java index f972240f5..ac1a20fd9 100755 --- a/src/main/java/forestry/factory/gadgets/MachineStill.java +++ b/src/main/java/forestry/factory/gadgets/MachineStill.java @@ -133,7 +133,7 @@ public class MachineStill extends TilePowered implements ISpecialInventory, ISid @Override public String getInventoryName() { - return "factory.6"; + return "factory.6.name"; } @Override diff --git a/src/main/java/forestry/factory/gadgets/MillRainmaker.java b/src/main/java/forestry/factory/gadgets/MillRainmaker.java index 75a349c33..f4a5f0784 100755 --- a/src/main/java/forestry/factory/gadgets/MillRainmaker.java +++ b/src/main/java/forestry/factory/gadgets/MillRainmaker.java @@ -34,7 +34,7 @@ public class MillRainmaker extends Mill implements ISpecialInventory { @Override public String getInventoryName() { - return "Rainmaker"; + return "factory.7.name"; } @Override diff --git a/src/main/java/forestry/factory/gadgets/TileWorktable.java b/src/main/java/forestry/factory/gadgets/TileWorktable.java index 693e93499..6deedda88 100755 --- a/src/main/java/forestry/factory/gadgets/TileWorktable.java +++ b/src/main/java/forestry/factory/gadgets/TileWorktable.java @@ -374,7 +374,7 @@ public class TileWorktable extends TileBase implements ICrafter { @Override public String getInventoryName() { - return "factory2.2"; + return "factory2.2.name"; } @Override diff --git a/src/main/java/forestry/factory/gui/GuiBottler.java b/src/main/java/forestry/factory/gui/GuiBottler.java index a2ff20397..23e4ac39a 100755 --- a/src/main/java/forestry/factory/gui/GuiBottler.java +++ b/src/main/java/forestry/factory/gui/GuiBottler.java @@ -28,7 +28,7 @@ public class GuiBottler extends GuiForestry { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localize("tile.for." + tile.getInventoryName()); + String name = StringUtil.localizeTile(tile.getInventoryName()); this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); } diff --git a/src/main/java/forestry/factory/gui/GuiCarpenter.java b/src/main/java/forestry/factory/gui/GuiCarpenter.java index 102cf0666..e99f5ccf8 100755 --- a/src/main/java/forestry/factory/gui/GuiCarpenter.java +++ b/src/main/java/forestry/factory/gui/GuiCarpenter.java @@ -36,7 +36,7 @@ public class GuiCarpenter extends GuiForestry { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localize("tile.for." + tile.getInventoryName()); + String name = StringUtil.localizeTile(tile.getInventoryName()); this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); } diff --git a/src/main/java/forestry/factory/gui/GuiCentrifuge.java b/src/main/java/forestry/factory/gui/GuiCentrifuge.java index 254c8d720..7bbb4d708 100755 --- a/src/main/java/forestry/factory/gui/GuiCentrifuge.java +++ b/src/main/java/forestry/factory/gui/GuiCentrifuge.java @@ -26,7 +26,7 @@ public class GuiCentrifuge extends GuiForestry { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localize("tile.for." + tile.getInventoryName()); + String name = StringUtil.localizeTile(tile.getInventoryName()); this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); } diff --git a/src/main/java/forestry/factory/gui/GuiFabricator.java b/src/main/java/forestry/factory/gui/GuiFabricator.java index 626bd509f..3e78bf001 100755 --- a/src/main/java/forestry/factory/gui/GuiFabricator.java +++ b/src/main/java/forestry/factory/gui/GuiFabricator.java @@ -29,7 +29,7 @@ public class GuiFabricator extends GuiForestry { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localize("tile.for." + tile.getInventoryName()); + String name = StringUtil.localizeTile(tile.getInventoryName()); this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); } diff --git a/src/main/java/forestry/factory/gui/GuiFermenter.java b/src/main/java/forestry/factory/gui/GuiFermenter.java index 23ca2d97f..f040c761e 100755 --- a/src/main/java/forestry/factory/gui/GuiFermenter.java +++ b/src/main/java/forestry/factory/gui/GuiFermenter.java @@ -29,7 +29,7 @@ public class GuiFermenter extends GuiForestry { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localize("tile.for." + tile.getInventoryName()); + String name = StringUtil.localizeTile(tile.getInventoryName()); this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); } diff --git a/src/main/java/forestry/factory/gui/GuiMoistener.java b/src/main/java/forestry/factory/gui/GuiMoistener.java index 8b0b118dc..b445ecff1 100755 --- a/src/main/java/forestry/factory/gui/GuiMoistener.java +++ b/src/main/java/forestry/factory/gui/GuiMoistener.java @@ -28,7 +28,7 @@ public class GuiMoistener extends GuiForestry { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localize("tile.for." + tile.getInventoryName()); + String name = StringUtil.localizeTile(tile.getInventoryName()); this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); } diff --git a/src/main/java/forestry/factory/gui/GuiRaintank.java b/src/main/java/forestry/factory/gui/GuiRaintank.java index 044ed9a07..5a62fe33c 100755 --- a/src/main/java/forestry/factory/gui/GuiRaintank.java +++ b/src/main/java/forestry/factory/gui/GuiRaintank.java @@ -28,7 +28,7 @@ public class GuiRaintank extends GuiForestry { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localize("tile.for." + tile.getInventoryName()); + String name = StringUtil.localizeTile(tile.getInventoryName()); this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); } diff --git a/src/main/java/forestry/factory/gui/GuiSqueezer.java b/src/main/java/forestry/factory/gui/GuiSqueezer.java index c09c07dc1..f70c95a43 100755 --- a/src/main/java/forestry/factory/gui/GuiSqueezer.java +++ b/src/main/java/forestry/factory/gui/GuiSqueezer.java @@ -28,7 +28,7 @@ public class GuiSqueezer extends GuiForestry { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localize("tile.for." + tile.getInventoryName()); + String name = StringUtil.localizeTile(tile.getInventoryName()); this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); } diff --git a/src/main/java/forestry/factory/gui/GuiStill.java b/src/main/java/forestry/factory/gui/GuiStill.java index 74f8f437c..4e01269e5 100755 --- a/src/main/java/forestry/factory/gui/GuiStill.java +++ b/src/main/java/forestry/factory/gui/GuiStill.java @@ -29,7 +29,7 @@ public class GuiStill extends GuiForestry { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localize("tile.for." + tile.getInventoryName()); + String name = StringUtil.localizeTile(tile.getInventoryName()); this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); } diff --git a/src/main/java/forestry/factory/gui/GuiWorktable.java b/src/main/java/forestry/factory/gui/GuiWorktable.java index a909d4913..5bb3ded17 100755 --- a/src/main/java/forestry/factory/gui/GuiWorktable.java +++ b/src/main/java/forestry/factory/gui/GuiWorktable.java @@ -141,7 +141,7 @@ public class GuiWorktable extends GuiForestry { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localize("tile.for." + tile.getInventoryName()); + String name = StringUtil.localizeTile(tile.getInventoryName()); this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); } } diff --git a/src/main/java/forestry/mail/gadgets/MachineMailbox.java b/src/main/java/forestry/mail/gadgets/MachineMailbox.java index e289970e9..ff44c9159 100755 --- a/src/main/java/forestry/mail/gadgets/MachineMailbox.java +++ b/src/main/java/forestry/mail/gadgets/MachineMailbox.java @@ -52,7 +52,7 @@ public class MachineMailbox extends TileBase implements IMailContainer, ISpecial @Override public String getInventoryName() { - return "mail.0"; + return "mail.0.name"; } /* GUI */ diff --git a/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java b/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java index 27531aa05..f334336b9 100755 --- a/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java +++ b/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java @@ -37,7 +37,7 @@ public class MachinePhilatelist extends TileBase implements IInventory { @Override public String getInventoryName() { - return "mail.2"; + return "mail.2.name"; } @Override diff --git a/src/main/java/forestry/mail/gadgets/MachineTrader.java b/src/main/java/forestry/mail/gadgets/MachineTrader.java index 661d463f7..7256c2950 100755 --- a/src/main/java/forestry/mail/gadgets/MachineTrader.java +++ b/src/main/java/forestry/mail/gadgets/MachineTrader.java @@ -49,7 +49,7 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided @Override public String getInventoryName() { - return "mail.1"; + return "mail.1.name"; } @Override diff --git a/src/main/java/forestry/mail/gui/GuiTrader.java b/src/main/java/forestry/mail/gui/GuiTrader.java index f32521eba..73a2ba613 100755 --- a/src/main/java/forestry/mail/gui/GuiTrader.java +++ b/src/main/java/forestry/mail/gui/GuiTrader.java @@ -33,7 +33,7 @@ public class GuiTrader extends GuiForestry { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localize("tile.for." + tile.getInventoryName()); + String name = StringUtil.localizeTile(tile.getInventoryName()); this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.mail.text")); } From 5df35847b043a84e781fa68ab414338f57dda420 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 4 Sep 2014 00:24:41 -0700 Subject: [PATCH 10/49] Put back formatting helpers for string localization #166 --- src/main/java/forestry/core/utils/StringUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/forestry/core/utils/StringUtil.java b/src/main/java/forestry/core/utils/StringUtil.java index 69590976a..f8b44e465 100755 --- a/src/main/java/forestry/core/utils/StringUtil.java +++ b/src/main/java/forestry/core/utils/StringUtil.java @@ -19,11 +19,11 @@ import net.minecraft.util.StatCollector; public class StringUtil { public static String localize(String key) { - return StatCollector.translateToLocal("for." + key); + return StatCollector.translateToLocal("for." + key).replace("\\n", "\n").replace("@", "%").replace("\\%", "@"); } public static String localizeTile(String key) { - return StatCollector.translateToLocal("tile.for." + key); + return StatCollector.translateToLocal("tile.for." + key).replace("\\n", "\n").replace("@", "%").replace("\\%", "@"); } public static String localizeAndFormat(String key, Object... args) { From fdb0471fc4374151262da45ebb7bf96b2aeabff5 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 4 Sep 2014 00:55:11 -0700 Subject: [PATCH 11/49] Fixed missing crate names #165 --- src/main/java/forestry/core/items/ItemCrated.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/forestry/core/items/ItemCrated.java b/src/main/java/forestry/core/items/ItemCrated.java index d244a7935..1a20d8510 100755 --- a/src/main/java/forestry/core/items/ItemCrated.java +++ b/src/main/java/forestry/core/items/ItemCrated.java @@ -81,13 +81,13 @@ public class ItemCrated extends Item implements IGenericCrate { return itemstack; } -// @Override -// public String getItemStackDisplayName(ItemStack itemstack) { -// if (contained != null) -// return StringUtil.localize("item.crated.adj") + " " + Proxies.common.getDisplayName(contained); -// else -// return StringUtil.localize("item.crated.unknown"); -// } + @Override + public String getItemStackDisplayName(ItemStack itemstack) { + if (contained != null) + return StringUtil.localize("item.crated.adj") + " " + Proxies.common.getDisplayName(contained); + else + return StringUtil.localize("item.crated.unknown"); + } @SideOnly(Side.CLIENT) @Override From 59198640ffde41fdad8196c1977c5c51bbe55bee Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 4 Sep 2014 01:38:57 -0700 Subject: [PATCH 12/49] Added localization for Unknown Queen #165 --- lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang b/lang index 4428eb0b0..927eb4b2f 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 4428eb0b03e63eb75c3343e7a1d8e932f6669dd0 +Subproject commit 927eb4b2f206259de73f9e7e98a4d8c4b8827711 From 9d2a5f5407291185280e97117a604b2255f85e23 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 4 Sep 2014 02:52:56 -0700 Subject: [PATCH 13/49] Updated to latest Buildcraft, 6.0.18 #165 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b90a1b73e..1dea9f73e 100755 --- a/build.gradle +++ b/build.gradle @@ -73,7 +73,7 @@ configurations { dependencies { compile 'net.industrial-craft:industrialcraft-2:2.2.575-experimental:api' - buildcraft 'com.mod-buildcraft:buildcraft:6.0.17:dev' + buildcraft 'com.mod-buildcraft:buildcraft:6.0.18:dev' } processResources { From 0ac108ced1f0ad8fcf8475cffe91fc448a08185d Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 4 Sep 2014 02:54:07 -0700 Subject: [PATCH 14/49] Eliminated some buildcraft facades that should not exist #165 --- src/main/java/forestry/apiculture/gadgets/BlockAlveary.java | 4 +++- src/main/java/forestry/apiculture/gadgets/BlockBeehives.java | 3 +++ .../java/forestry/apiculture/gadgets/TileAlvearyPlain.java | 2 ++ src/main/java/forestry/core/gadgets/BlockResource.java | 4 +++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/forestry/apiculture/gadgets/BlockAlveary.java b/src/main/java/forestry/apiculture/gadgets/BlockAlveary.java index f0ad0afec..9b3013afb 100755 --- a/src/main/java/forestry/apiculture/gadgets/BlockAlveary.java +++ b/src/main/java/forestry/apiculture/gadgets/BlockAlveary.java @@ -147,6 +147,8 @@ public class BlockAlveary extends BlockStructure { return icons[BOTTOM]; switch (metadata) { + case TileAlvearyPlain.BLOCK_META: + return icons[PLAIN]; case 1: return icons[ENTRANCE]; case TileAlvearySwarmer.BLOCK_META: @@ -162,7 +164,7 @@ public class BlockAlveary extends BlockStructure { case TileAlvearySieve.BLOCK_META: return icons[SIEVE]; default: - return icons[PLAIN]; + return null; } } diff --git a/src/main/java/forestry/apiculture/gadgets/BlockBeehives.java b/src/main/java/forestry/apiculture/gadgets/BlockBeehives.java index 1bdf838ca..7d59381b4 100755 --- a/src/main/java/forestry/apiculture/gadgets/BlockBeehives.java +++ b/src/main/java/forestry/apiculture/gadgets/BlockBeehives.java @@ -155,6 +155,9 @@ public class BlockBeehives extends BlockContainer { @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int i, int j) { + if (j == 0 || j >= 8) + return null; + if (i == 0 || i == 1) { if (j * 2 < icons.length && icons[j * 2] != null) return icons[j * 2]; diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java index 3f0a80c3e..ce821da83 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java @@ -54,6 +54,8 @@ public class TileAlvearyPlain extends TileAlveary implements ISidedInventory, IS public static final int SLOT_DRONE = 1; public static final int SLOT_PRODUCT_1 = 2; public static final int SLOT_PRODUCTION_COUNT = 7; + public static final int BLOCK_META = 0; + // / MEMBERS protected IBeekeepingLogic beekeepingLogic; protected int biomeId; diff --git a/src/main/java/forestry/core/gadgets/BlockResource.java b/src/main/java/forestry/core/gadgets/BlockResource.java index ef3897802..66fd7b3ff 100755 --- a/src/main/java/forestry/core/gadgets/BlockResource.java +++ b/src/main/java/forestry/core/gadgets/BlockResource.java @@ -101,8 +101,10 @@ public class BlockResource extends Block { return iconApatite; else if (j == 1) return iconCopper; - else + else if (j == 2) return iconTin; + else + return null; } } From df423474e98ca7d772dbfe14e18143c2ab2dae2f Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 4 Sep 2014 12:59:23 -0700 Subject: [PATCH 15/49] Removed remaining invalid buildcraft facades #165 --- .../java/forestry/core/gadgets/BlockBase.java | 2 +- .../java/forestry/core/gadgets/BlockSoil.java | 6 ++++-- .../farming/gadgets/BlockMushroom.java | 18 +++++++++++++++--- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/main/java/forestry/core/gadgets/BlockBase.java b/src/main/java/forestry/core/gadgets/BlockBase.java index 3ec79d988..dfc1dcd99 100755 --- a/src/main/java/forestry/core/gadgets/BlockBase.java +++ b/src/main/java/forestry/core/gadgets/BlockBase.java @@ -242,7 +242,7 @@ public class BlockBase extends BlockForestry { @Override public IIcon getIcon(int side, int metadata) { if (metadata >= definitions.size() || definitions.get(metadata) == null) - metadata = 0; + return null; return definitions.get(metadata).getBlockTextureFromSideAndMetadata(side, metadata); } diff --git a/src/main/java/forestry/core/gadgets/BlockSoil.java b/src/main/java/forestry/core/gadgets/BlockSoil.java index 3eecb210f..d475e9a55 100755 --- a/src/main/java/forestry/core/gadgets/BlockSoil.java +++ b/src/main/java/forestry/core/gadgets/BlockSoil.java @@ -248,7 +248,7 @@ public class BlockSoil extends Block { public IIcon getIcon(int i, int j) { int meta = j; - int type = meta & 0x03; + int type = meta & 0x0f; int maturity = meta >> 2; if (type == 1) @@ -256,8 +256,10 @@ public class BlockSoil extends Block { return iconBogEarth; else return iconPeat; - else + else if (type == 0) return iconHumus; + else + return null; } } diff --git a/src/main/java/forestry/farming/gadgets/BlockMushroom.java b/src/main/java/forestry/farming/gadgets/BlockMushroom.java index bb47886ae..fe83c8d50 100755 --- a/src/main/java/forestry/farming/gadgets/BlockMushroom.java +++ b/src/main/java/forestry/farming/gadgets/BlockMushroom.java @@ -11,12 +11,15 @@ package forestry.farming.gadgets; import java.util.ArrayList; +import java.util.List; import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockSapling; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; @@ -106,6 +109,13 @@ public class BlockMushroom extends BlockSapling { } /* ICONS */ + @SideOnly(Side.CLIENT) + @Override + public void getSubBlocks(Item item, CreativeTabs tab, List list) { + list.add(new ItemStack(item, 1, 0)); + list.add(new ItemStack(item, 1, 1)); + } + @SideOnly(Side.CLIENT) @Override public void registerBlockIcons(IIconRegister register) { @@ -114,11 +124,13 @@ public class BlockMushroom extends BlockSapling { @SideOnly(Side.CLIENT) @Override public IIcon getIcon(int side, int meta) { - int type = meta & 0x03; - if (type > 0) + int type = meta & 0x0f; + if (type == 0) + return Blocks.brown_mushroom.getIcon(side, meta); + else if (type == 1) return Blocks.red_mushroom.getIcon(side, meta); else - return Blocks.brown_mushroom.getIcon(side, meta); + return null; } } From 5f53385aaaea27447d2a90b8be447eabc4ec4797 Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Thu, 4 Sep 2014 16:52:11 -0700 Subject: [PATCH 16/49] Fix broken item remappings. --- lang | 2 +- src/main/java/forestry/Forestry.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lang b/lang index 927eb4b2f..bdcaf528c 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 927eb4b2f206259de73f9e7e98a4d8c4b8827711 +Subproject commit bdcaf528cc7066eb18a6b73c2ce754fcc126306a diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index 54d912251..1948983f6 100755 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -121,15 +121,15 @@ public class Forestry { Proxies.log.warning("Remapping item " + mapping.name + " to " + StringUtil.cleanBlockName(block)); continue; } - if (mapping.name.equals("builderBackpack")) + if (mapping.name.contains("builderBackpack")) mapping.remap(ForestryItem.builderBackpack.item()); - if (mapping.name.equals("builderBackpackT2")) + if (mapping.name.contains("builderBackpackT2")) mapping.remap(ForestryItem.builderBackpackT2.item()); - if (mapping.name.equals("adventurerBackpack")) + if (mapping.name.contains("adventurerBackpack")) mapping.remap(ForestryItem.adventurerBackpack.item()); - if (mapping.name.equals("adventurerBackpackT2")) + if (mapping.name.contains("adventurerBackpackT2")) mapping.remap(ForestryItem.adventurerBackpackT2.item()); - if (mapping.name.equals("shortMead")) + if (mapping.name.contains("shortMead")) mapping.remap(ForestryItem.beverage.item()); } } From 45bef1204aaf50b6f588107258243b2bf0ab6545 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 4 Sep 2014 21:05:59 -0700 Subject: [PATCH 17/49] Change to forge 1207 for cauldron #167 --- application.properties | 2 +- src/main/java/forestry/Forestry.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application.properties b/application.properties index e6eb8fe42..fcd208741 100644 --- a/application.properties +++ b/application.properties @@ -1,5 +1,5 @@ mcversion=1.7.10 -forgeversion=10.13.0.1208 +forgeversion=10.13.0.1207 version_major=3 version_minor=0 version_patch=0 diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index 1948983f6..1310468a8 100755 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -49,7 +49,7 @@ import net.minecraft.item.Item; modid = Defaults.MOD, name = "Forestry", version = Version.VERSION, - dependencies = "required-after:Forge@[10.13.0.1208,);" + dependencies = "required-after:Forge@[10.13.0.1207,);" + "after:Buildcraft|Core;" + "after:ExtrabiomesXL;" + "after:BiomesOPlenty;" From e6b1fa36f2c7c85e8c5838ae4db0a532530cfba5 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 4 Sep 2014 23:54:24 -0700 Subject: [PATCH 18/49] Added missing localization keys #165 --- lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang b/lang index bdcaf528c..5c56c1ae5 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit bdcaf528cc7066eb18a6b73c2ce754fcc126306a +Subproject commit 5c56c1ae54def72db931d2c01a31a7d6cd100207 From 75e6046dd7c2d8fca9fbc5d1d3931335fcb7363d Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 5 Sep 2014 00:29:54 -0700 Subject: [PATCH 19/49] Fixed forestry mushrooms always having brown icons instead of brown and red. --- src/main/java/forestry/core/items/ItemForestryBlock.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/forestry/core/items/ItemForestryBlock.java b/src/main/java/forestry/core/items/ItemForestryBlock.java index 1a003bf76..9aba23515 100755 --- a/src/main/java/forestry/core/items/ItemForestryBlock.java +++ b/src/main/java/forestry/core/items/ItemForestryBlock.java @@ -10,9 +10,12 @@ ******************************************************************************/ package forestry.core.items; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; public class ItemForestryBlock extends ItemBlock { @@ -31,6 +34,12 @@ public class ItemForestryBlock extends ItemBlock { return field_150939_a; } + @SideOnly(Side.CLIENT) + @Override + public IIcon getIconFromDamage(int meta) { + return this.getBlock().getIcon(1, meta); + } + @Override public String getUnlocalizedName(ItemStack itemstack) { return getBlock().getUnlocalizedName() + "." + itemstack.getItemDamage(); From 4051d7c686c1c91daefaa062c9b6effba00e2380 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 5 Sep 2014 00:31:29 -0700 Subject: [PATCH 20/49] Stopped unused wood types from showing up in NEI --- src/main/java/forestry/arboriculture/gadgets/BlockLog.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockLog.java b/src/main/java/forestry/arboriculture/gadgets/BlockLog.java index 65e2b9802..f5a88ba25 100755 --- a/src/main/java/forestry/arboriculture/gadgets/BlockLog.java +++ b/src/main/java/forestry/arboriculture/gadgets/BlockLog.java @@ -124,6 +124,9 @@ public class BlockLog extends Block implements IWoodTyped { int oriented = meta & 12; WoodType type = getWoodType(getTypeFromMeta(meta)); + if (type == null) + return null; + switch (oriented) { case 4: if (side > 3) @@ -195,7 +198,7 @@ public class BlockLog extends Block implements IWoodTyped { if(meta + cat.ordinal() * 4 < WoodType.VALUES.length) return WoodType.VALUES[meta + cat.ordinal() * 4]; else - return WoodType.LARCH; + return null; } @Override From 46f538b39f972de31674ba068c739dbb0076155e Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 5 Sep 2014 00:32:47 -0700 Subject: [PATCH 21/49] Only register plugin crates if they exist --- .../java/forestry/plugins/PluginCore.java | 7 ----- src/main/java/forestry/plugins/PluginIC2.java | 31 +++++++++++++++++-- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/main/java/forestry/plugins/PluginCore.java b/src/main/java/forestry/plugins/PluginCore.java index e75a3e390..6cf7a60a0 100755 --- a/src/main/java/forestry/plugins/PluginCore.java +++ b/src/main/java/forestry/plugins/PluginCore.java @@ -354,9 +354,6 @@ public class PluginCore extends NativePlugin implements IFuelHandler { ForestryItem.cratedWheat.registerItem(new ItemCrated(new ItemStack(Items.wheat)), "cratedWheat"); ForestryItem.cratedMycelium.registerItem(new ItemCrated(new ItemStack(Blocks.mycelium)), "cratedMycelium"); ForestryItem.cratedMulch.registerItem(new ItemCrated(ForestryItem.mulch.getItemStack()), "cratedMulch"); - ForestryItem.cratedSilver.registerItem(new ItemCrated(), "cratedSilver"); - ForestryItem.cratedBrass.registerItem(new ItemCrated(), "cratedBrass"); - ForestryItem.cratedNikolite.registerItem(new ItemCrated(), "cratedNikolite"); ForestryItem.cratedCookies.registerItem(new ItemCrated(new ItemStack(Items.cookie)), "cratedCookies"); ForestryItem.cratedRedstone.registerItem(new ItemCrated(new ItemStack(Items.redstone)), "cratedRedstone"); ForestryItem.cratedLapis.registerItem(new ItemCrated(new ItemStack(Items.dye, 1, 4)), "cratedLapis"); @@ -365,10 +362,6 @@ public class PluginCore extends NativePlugin implements IFuelHandler { ForestryItem.cratedGlowstone.registerItem(new ItemCrated(new ItemStack(Items.glowstone_dust)), "cratedGlowstone"); ForestryItem.cratedApples.registerItem(new ItemCrated(new ItemStack(Items.apple)), "cratedApples"); ForestryItem.cratedNetherwart.registerItem(new ItemCrated(new ItemStack(Items.nether_wart)), "cratedNetherwart"); - ForestryItem.cratedResin.registerItem(new ItemCrated(), "cratedResin"); - ForestryItem.cratedRubber.registerItem(new ItemCrated(), "cratedRubber"); - ForestryItem.cratedScrap.registerItem(new ItemCrated(), "cratedScrap"); - ForestryItem.cratedUUM.registerItem(new ItemCrated(), "cratedUUM"); ForestryItem.cratedPhosphor.registerItem(new ItemCrated(ForestryItem.phosphor.getItemStack()), "cratedPhosphor"); ForestryItem.cratedAsh.registerItem(new ItemCrated(ForestryItem.ash.getItemStack()), "cratedAsh"); ForestryItem.cratedCharcoal.registerItem(new ItemCrated(new ItemStack(Items.coal, 1, 1)), "cratedCharcoal"); diff --git a/src/main/java/forestry/plugins/PluginIC2.java b/src/main/java/forestry/plugins/PluginIC2.java index 550580c7e..229e39e52 100755 --- a/src/main/java/forestry/plugins/PluginIC2.java +++ b/src/main/java/forestry/plugins/PluginIC2.java @@ -59,6 +59,9 @@ public class PluginIC2 implements IPlugin { public static ItemStack waterCell; public static ItemStack rubber; public static ItemStack scrap; + public static ItemStack silver; + public static ItemStack brass; + public static ItemStack uuMatter; public static int fuelcanMeta; public PluginIC2() { @@ -182,22 +185,44 @@ public class PluginIC2 implements IPlugin { } private void initCrates() { - resin = IC2Items.getItem("resin"); - rubber = IC2Items.getItem("rubber"); - scrap = IC2Items.getItem("scrap"); // Add crates for the IC2 items that exist. + + resin = IC2Items.getItem("resin"); if (resin != null) { + ForestryItem.cratedResin.registerItem(new ItemCrated(), "cratedResin"); ((ItemCrated) ForestryItem.cratedResin.item()).setContained(ForestryItem.cratedResin.getItemStack(), resin); } + rubber = IC2Items.getItem("rubber"); if (rubber != null) { + ForestryItem.cratedRubber.registerItem(new ItemCrated(), "cratedRubber"); ((ItemCrated) ForestryItem.cratedRubber.item()).setContained(ForestryItem.cratedRubber.getItemStack(), rubber); } + scrap = IC2Items.getItem("scrap"); if (scrap != null) { + ForestryItem.cratedScrap.registerItem(new ItemCrated(), "cratedScrap"); ((ItemCrated) ForestryItem.cratedScrap.item()).setContained(ForestryItem.cratedScrap.getItemStack(), scrap); } + + uuMatter = IC2Items.getItem("matter"); + if (uuMatter != null) { + ForestryItem.cratedUUM.registerItem(new ItemCrated(), "cratedUUM"); + ((ItemCrated) ForestryItem.cratedUUM.item()).setContained(ForestryItem.cratedUUM.getItemStack(), uuMatter); + } + + silver = IC2Items.getItem("silverIngot"); + if (silver != null) { + ForestryItem.cratedSilver.registerItem(new ItemCrated(), "cratedSilver"); + ((ItemCrated) ForestryItem.cratedSilver.item()).setContained(ForestryItem.cratedSilver.getItemStack(), silver); + } + + brass = IC2Items.getItem("bronzeIngot"); + if (brass != null) { + ForestryItem.cratedBrass.registerItem(new ItemCrated(), "cratedBrass"); + ((ItemCrated) ForestryItem.cratedBrass.item()).setContained(ForestryItem.cratedBrass.getItemStack(), brass); + } } private void registerBackpackItems() { From 6517659d2064d85781f005772912bc6d1394bdf5 Mon Sep 17 00:00:00 2001 From: EoD Date: Fri, 5 Sep 2014 09:27:35 +0200 Subject: [PATCH 22/49] Fixing broken item remapping again Followup of 5f53385aaaea27447d2a90b8be447eabc4ec4797 and hopefully finally fixes ForestryMC/ForestryMC#133 --- src/main/java/forestry/Forestry.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index 1310468a8..a48076d0b 100755 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -119,18 +119,22 @@ public class Forestry { if (block != null) { mapping.remap(Item.getItemFromBlock(block)); Proxies.log.warning("Remapping item " + mapping.name + " to " + StringUtil.cleanBlockName(block)); - continue; - } - if (mapping.name.contains("builderBackpack")) + } else if (mapping.name.equals("Forestry:builderBackpack")) { mapping.remap(ForestryItem.builderBackpack.item()); - if (mapping.name.contains("builderBackpackT2")) + Proxies.log.warning("Remapping item " + mapping.name + " to " + ForestryItem.builderBackpack.name()); + } else if (mapping.name.equals("Forestry:builderBackpackT2")) { mapping.remap(ForestryItem.builderBackpackT2.item()); - if (mapping.name.contains("adventurerBackpack")) + Proxies.log.warning("Remapping item " + mapping.name + " to " + ForestryItem.builderBackpackT2.name()); + } else if (mapping.name.equals("Forestry:adventurerBackpack")) { mapping.remap(ForestryItem.adventurerBackpack.item()); - if (mapping.name.contains("adventurerBackpackT2")) + Proxies.log.warning("Remapping item " + mapping.name + " to " + ForestryItem.adventurerBackpack.name()); + } else if (mapping.name.equals("Forestry:adventurerBackpackT2")) { mapping.remap(ForestryItem.adventurerBackpackT2.item()); - if (mapping.name.contains("shortMead")) + Proxies.log.warning("Remapping item " + mapping.name + " to " + ForestryItem.adventurerBackpackT2.name()); + } else if (mapping.name.equals("Forestry:shortMead")) { mapping.remap(ForestryItem.beverage.item()); + Proxies.log.warning("Remapping item " + mapping.name + " to " + ForestryItem.beverage.name()); + } } } } From 35a4abdff586cbf651305fc81b816413538750f6 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 5 Sep 2014 01:22:33 -0700 Subject: [PATCH 23/49] Fixed invalid logs showing up in NEI --- src/main/java/forestry/arboriculture/gadgets/BlockLog.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockLog.java b/src/main/java/forestry/arboriculture/gadgets/BlockLog.java index f5a88ba25..b9cee942b 100755 --- a/src/main/java/forestry/arboriculture/gadgets/BlockLog.java +++ b/src/main/java/forestry/arboriculture/gadgets/BlockLog.java @@ -103,6 +103,7 @@ public class BlockLog extends Block implements IWoodTyped { @Override public void getSubBlocks(Item item, CreativeTabs par2CreativeTabs, List itemList) { if(cat == LogCat.CAT6) { + itemList.add(new ItemStack(this, 1, 0)); return; } From 4976734ccc040e6295b9e05a8b96be9da8310701 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 6 Sep 2014 00:35:20 -0700 Subject: [PATCH 24/49] Fix Locking worktable recipes makes certain icons invisible closes #159 --- src/main/java/forestry/factory/gui/GuiWorktable.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/forestry/factory/gui/GuiWorktable.java b/src/main/java/forestry/factory/gui/GuiWorktable.java index 5bb3ded17..23639fc60 100755 --- a/src/main/java/forestry/factory/gui/GuiWorktable.java +++ b/src/main/java/forestry/factory/gui/GuiWorktable.java @@ -58,6 +58,7 @@ public class GuiWorktable extends GuiForestry { //RenderHelper.disableStandardItemLighting(); GL11.glDisable(GL11.GL_DEPTH_TEST); + GL11.glEnable(GL11.GL_BLEND); if (worktable.getMemory().isLocked(slotNumber)) { manager.gui.setZLevel(110f); From 13af9910598f5f5500aac576b48d0ea006c1a0b8 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 6 Sep 2014 00:37:17 -0700 Subject: [PATCH 25/49] Minor organization of PluginIC2 --- src/main/java/forestry/plugins/PluginIC2.java | 71 ++++++++++--------- 1 file changed, 38 insertions(+), 33 deletions(-) diff --git a/src/main/java/forestry/plugins/PluginIC2.java b/src/main/java/forestry/plugins/PluginIC2.java index 229e39e52..a247d5bd2 100755 --- a/src/main/java/forestry/plugins/PluginIC2.java +++ b/src/main/java/forestry/plugins/PluginIC2.java @@ -104,16 +104,6 @@ public class PluginIC2 implements IPlugin { // Remove some items from the recycler registerBackpackItems(); - - if (rubbersapling != null && resin != null) { - String imc = String.format("farmArboreal@%s.%s.%s.%s", - GameData.getBlockRegistry().getNameForObject(StackUtils.getBlock(rubbersapling)), - rubbersapling.getItemDamage(), - GameData.getItemRegistry().getNameForObject(resin.getItem()), - resin.getItemDamage()); - Proxies.log.finest("Sending IMC '%s'.", imc); - FMLInterModComms.sendMessage(Defaults.MOD, "add-farmable-sapling", imc); - } } private void initFermentation() { @@ -131,18 +121,23 @@ public class PluginIC2 implements IPlugin { private void initLiquidContainers() { emptyCell = IC2Items.getItem("cell"); - lavaCell = IC2Items.getItem("lavaCell"); - waterCell = IC2Items.getItem("waterCell"); - if (emptyCell == null || lavaCell == null || waterCell == null) { - Proxies.log.fine("Any of the following IC2 items could not be found: empty cell, water cell, lava cell. Skipped adding IC2 liquid containers."); + if (emptyCell == null) { + Proxies.log.fine("IC2 empty cell could not be found. Skipped adding IC2 liquid containers."); return; } - LiquidHelper.injectTinContainer(Defaults.LIQUID_LAVA, Defaults.BUCKET_VOLUME, lavaCell, emptyCell); - LiquidHelper.injectTinContainer(Defaults.LIQUID_WATER, Defaults.BUCKET_VOLUME, waterCell, emptyCell); - if (GameMode.getGameMode().getStackSetting("recipe.output.bogearth.can").stackSize > 0) - Proxies.common - .addRecipe(GameMode.getGameMode().getStackSetting("recipe.output.bogearth.can"), "#Y#", "YXY", "#Y#", '#', Blocks.dirt, 'X', waterCell, 'Y', Blocks.sand); + lavaCell = IC2Items.getItem("lavaCell"); + if (lavaCell != null) + LiquidHelper.injectTinContainer(Defaults.LIQUID_LAVA, Defaults.BUCKET_VOLUME, lavaCell, emptyCell); + + waterCell = IC2Items.getItem("waterCell"); + if (waterCell != null) { + LiquidHelper.injectTinContainer(Defaults.LIQUID_WATER, Defaults.BUCKET_VOLUME, waterCell, emptyCell); + + ItemStack bogEarthCan = GameMode.getGameMode().getStackSetting("recipe.output.bogearth.can"); + if (bogEarthCan.stackSize > 0) + Proxies.common.addRecipe(bogEarthCan, "#Y#", "YXY", "#Y#", '#', Blocks.dirt, 'X', waterCell, 'Y', Blocks.sand); + } } private void initRubberChain() { @@ -155,6 +150,30 @@ public class PluginIC2 implements IPlugin { else Proxies.log.fine("Missing IC2 resin, skipping centrifuge recipe for propolis to resin."); + rubbersapling = IC2Items.getItem("rubberSapling"); + if (rubbersapling != null) { + RecipeUtil.injectLeveledRecipe(rubbersapling, GameMode.getGameMode().getIntegerSetting("fermenter.yield.sapling"), Defaults.LIQUID_BIOMASS); + BackpackManager.backpackItems[2].add(rubbersapling); + } else { + Proxies.log.fine("Missing IC2 rubber sapling, skipping fermenter recipe for converting rubber sapling to biomass."); + } + + if (rubbersapling != null && resin != null) { + String saplingName = GameData.getBlockRegistry().getNameForObject(StackUtils.getBlock(rubbersapling)); + String resinName = GameData.getItemRegistry().getNameForObject(resin.getItem()); + String imc = String.format("farmArboreal@%s.%s.%s.%s", + saplingName, rubbersapling.getItemDamage(), + resinName, resin.getItemDamage()); + Proxies.log.finest("Sending IMC '%s'.", imc); + FMLInterModComms.sendMessage(Defaults.MOD, "add-farmable-sapling", imc); + } + + rubberleaves = IC2Items.getItem("rubberLeaves"); + if (rubberleaves != null) + BackpackManager.backpackItems[2].add(rubberleaves); + else + Proxies.log.fine("Missing IC2 rubber leaves"); + fuelcanFilled = IC2Items.getItem("filledFuelCan"); fuelcanEmpty = IC2Items.getItem("fuelCan"); if (fuelcanEmpty != null && fuelcanFilled != null) { @@ -167,20 +186,6 @@ public class PluginIC2 implements IPlugin { Proxies.log.fine("Missing IC2 fuelcanEmpty or fuelcanFilled, skipping bottler recipe for ethanol to filled fuel can."); } - rubbersapling = IC2Items.getItem("rubberSapling"); - if (rubbersapling != null) { - RecipeUtil.injectLeveledRecipe(rubbersapling, GameMode.getGameMode().getIntegerSetting("fermenter.yield.sapling"), Defaults.LIQUID_BIOMASS); - BackpackManager.backpackItems[2].add(rubbersapling); - } else { - Proxies.log.fine("Missing IC2 rubber sapling, skipping fermenter recipe for converting rubber sapling to biomass."); - } - - rubberleaves = IC2Items.getItem("rubberLeaves"); - if (rubberleaves != null) - BackpackManager.backpackItems[2].add(rubberleaves); - else - Proxies.log.fine("Missing IC2 rubber leaves"); - // Rubber wood is added via ore dictionary. } From 2f104c4149a59efefa385aee24423f2af0d25e01 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 6 Sep 2014 02:18:01 -0700 Subject: [PATCH 26/49] Update localization for de_DE and ko_KR --- lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang b/lang index 5c56c1ae5..98a31f2a6 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 5c56c1ae54def72db931d2c01a31a7d6cd100207 +Subproject commit 98a31f2a68d6861aef5eb7c4a3047acea5c5e6a7 From 32c3f923e0ea25c49446457c3d6d4dc614537fc2 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 7 Sep 2014 15:13:37 -0700 Subject: [PATCH 27/49] Fix exception when requesting ItemWoodBlock's unlocalized name when using the oredict metadata. closes #171 --- src/main/java/forestry/arboriculture/items/ItemWoodBlock.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/forestry/arboriculture/items/ItemWoodBlock.java b/src/main/java/forestry/arboriculture/items/ItemWoodBlock.java index d7b4edb70..62387fae2 100755 --- a/src/main/java/forestry/arboriculture/items/ItemWoodBlock.java +++ b/src/main/java/forestry/arboriculture/items/ItemWoodBlock.java @@ -34,6 +34,8 @@ public class ItemWoodBlock extends ItemForestryBlock { IWoodTyped block = (IWoodTyped) getBlock(); int meta = itemstack.getItemDamage(); WoodType woodType = block.getWoodType(meta); + if (woodType == null) + return null; return "tile.for." + block.getBlockKind() + "." + woodType.ordinal(); } return super.getUnlocalizedName(itemstack); From 14c38acb90d0b51c148a83a9eb0383b4c087b057 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 7 Sep 2014 16:08:12 -0700 Subject: [PATCH 28/49] Fix Opening Engine GUI crashes game closes #172 --- .../java/forestry/energy/gui/GuiEngineBronze.java | 9 +++++---- .../java/forestry/energy/gui/GuiEngineCopper.java | 8 +++++--- .../java/forestry/energy/gui/GuiEngineTin.java | 14 ++++++++++---- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/src/main/java/forestry/energy/gui/GuiEngineBronze.java b/src/main/java/forestry/energy/gui/GuiEngineBronze.java index c26e22287..6d503383f 100755 --- a/src/main/java/forestry/energy/gui/GuiEngineBronze.java +++ b/src/main/java/forestry/energy/gui/GuiEngineBronze.java @@ -31,8 +31,6 @@ import forestry.energy.gadgets.EngineBronze; public class GuiEngineBronze extends GuiEngine { - EngineBronze tile; - protected class BiogasSlot extends Widget { EngineBronze engine; @@ -105,6 +103,10 @@ public class GuiEngineBronze extends GuiEngine { widgetManager.add(new BiogasSlot(this.widgetManager, 30, 47, tile)); } + protected EngineBronze getEngine() { + return (EngineBronze)tile; + } + @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { super.drawGuiContainerForegroundLayer(mouseX, mouseY); @@ -115,9 +117,8 @@ public class GuiEngineBronze extends GuiEngine { @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); - EngineBronze engine = (EngineBronze) tile; - int temp = engine.getOperatingTemperatureScaled(16); + int temp = getEngine().getOperatingTemperatureScaled(16); if (temp > 16) temp = 16; if (temp > 0) diff --git a/src/main/java/forestry/energy/gui/GuiEngineCopper.java b/src/main/java/forestry/energy/gui/GuiEngineCopper.java index f0082e58b..16ceee26e 100755 --- a/src/main/java/forestry/energy/gui/GuiEngineCopper.java +++ b/src/main/java/forestry/energy/gui/GuiEngineCopper.java @@ -18,12 +18,14 @@ import forestry.energy.gadgets.EngineCopper; public class GuiEngineCopper extends GuiEngine { - EngineCopper tile; - public GuiEngineCopper(InventoryPlayer inventory, EngineCopper tile) { super(Defaults.TEXTURE_PATH_GUI + "/peatengine.png", new ContainerEngineCopper(inventory, tile), tile); } + protected EngineCopper getEngine() { + return (EngineCopper)tile; + } + @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { super.drawGuiContainerForegroundLayer(mouseX, mouseY); @@ -35,8 +37,8 @@ public class GuiEngineCopper extends GuiEngine { @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); - EngineCopper engine = (EngineCopper) tile; + EngineCopper engine = getEngine(); int progress; if (engine.isBurning()) { progress = engine.getBurnTimeRemainingScaled(12); diff --git a/src/main/java/forestry/energy/gui/GuiEngineTin.java b/src/main/java/forestry/energy/gui/GuiEngineTin.java index 7aca755dc..396988c40 100755 --- a/src/main/java/forestry/energy/gui/GuiEngineTin.java +++ b/src/main/java/forestry/energy/gui/GuiEngineTin.java @@ -20,13 +20,15 @@ import forestry.energy.gadgets.EngineTin; public class GuiEngineTin extends GuiEngine { - EngineTin tile; - public GuiEngineTin(InventoryPlayer inventory, EngineTin tile) { super(Defaults.TEXTURE_PATH_GUI + "/electricalengine.png", new ContainerEngineTin(inventory, tile), tile); widgetManager.add(new SocketWidget(this.widgetManager, 30, 40, tile, 0)); } + protected EngineTin getEngine() { + return (EngineTin)tile; + } + @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { super.drawGuiContainerForegroundLayer(mouseX, mouseY); @@ -37,9 +39,13 @@ public class GuiEngineTin extends GuiEngine { @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); - EngineTin engine = (EngineTin) tile; - drawHealthMeter(guiLeft + 74, guiTop + 25, engine.getStorageScaled(46), engine.rateLevel(engine.getStorageScaled(100))); + EngineTin engine = getEngine(); + int storageHeight = engine.getStorageScaled(46); + int storageMaxHeight = engine.getStorageScaled(100); + EnumTankLevel rated = engine.rateLevel(storageMaxHeight); + + drawHealthMeter(guiLeft + 74, guiTop + 25, storageHeight, rated); } private void drawHealthMeter(int x, int y, int height, EnumTankLevel rated) { From 85b40719381881057f0c89998ad93223d2a83f83 Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 8 Sep 2014 01:08:43 -0700 Subject: [PATCH 29/49] Fixed worktable being unable to craft related recipes after one has been saved Closes #156 --- .../java/forestry/core/utils/StackUtils.java | 5 ++- .../factory/gadgets/TileWorktable.java | 44 ++++++++++--------- .../factory/gui/ContainerWorktable.java | 16 +++++-- 3 files changed, 39 insertions(+), 26 deletions(-) diff --git a/src/main/java/forestry/core/utils/StackUtils.java b/src/main/java/forestry/core/utils/StackUtils.java index a46e2a1dc..b97d593a8 100755 --- a/src/main/java/forestry/core/utils/StackUtils.java +++ b/src/main/java/forestry/core/utils/StackUtils.java @@ -193,7 +193,7 @@ public class StackUtils { * without decreasing the source stack. * * @param stack - * @param i + * @param amount * @return */ public static ItemStack createSplitStack(ItemStack stack, int amount) { @@ -309,6 +309,9 @@ public class StackUtils { if (isIdenticalItem(base, comparison)) return true; + if (base == null || comparison == null) + return false; + if (oreDictionary) { int[] idsBase = OreDictionary.getOreIDs(base); for (int idBase : idsBase) { diff --git a/src/main/java/forestry/factory/gadgets/TileWorktable.java b/src/main/java/forestry/factory/gadgets/TileWorktable.java index 6deedda88..334194814 100755 --- a/src/main/java/forestry/factory/gadgets/TileWorktable.java +++ b/src/main/java/forestry/factory/gadgets/TileWorktable.java @@ -120,7 +120,7 @@ public class TileWorktable extends TileBase implements ICrafter { @Override public ItemStack getCraftingResult(InventoryCrafting inventorycrafting) { if (updateCachedIRecipe()) - return cachedRecipe.getRecipeOutput(); + return cachedRecipe.getCraftingResult(inventorycrafting); return null; } @@ -198,23 +198,15 @@ public class TileWorktable extends TileBase implements ICrafter { return lastUpdate; } - public Recipe getOrCreateRecipe(World world, InventoryCrafting crafting) { - - Recipe memory = getMemorized(crafting, world); - if (memory != null) { - return memory; - } - - return new Recipe(crafting); - } - - public void memorizeRecipe(World world, Recipe recipe) { + public void memorizeRecipe(World world, Recipe recipe, InventoryCrafting crafting) { lastUpdate = world.getTotalWorldTime(); recipe.updateLastUse(world); - if (recipes.contains(recipe)) - return; + Recipe memory = getMemorized(crafting, world); + if (memory != null) + recipes.remove(memory); + if (recipes.size() < 8) { recipes.add(recipe); return; @@ -361,6 +353,7 @@ public class TileWorktable extends TileBase implements ICrafter { } /* MEMBERS */ private Recipe currentRecipe; + private InventoryCrafting currentCrafting; private final RecipeMemory memorized; private final TileInventoryAdapter craftingInventory; private final TileInventoryAdapter accessibleInventory; @@ -447,13 +440,19 @@ public class TileWorktable extends TileBase implements ICrafter { public void setRecipe(InventoryCrafting crafting) { IRecipe recipe = RECIPE_BRIDGE.getRecipe(crafting, worldObj); - currentRecipe = recipe != null ? memorized.getOrCreateRecipe(worldObj, crafting) : null; - updateCraftResult(); + if (recipe == null) { + currentRecipe = null; + currentCrafting = null; + } else { + currentRecipe = new Recipe(crafting); + currentCrafting = crafting; + } + updateCraftResult(currentCrafting); } - private void updateCraftResult() { + private void updateCraftResult(InventoryCrafting inventorycrafting) { if (currentRecipe != null) { - ItemStack result = currentRecipe.getCraftingResult(null); + ItemStack result = currentRecipe.getCraftingResult(inventorycrafting); if (result != null) { craftingInventory.setInventorySlotContents(SLOT_CRAFTING_RESULT, result.copy()); return; @@ -467,7 +466,10 @@ public class TileWorktable extends TileBase implements ICrafter { // Need at least one matched set if (currentRecipe == null) return false; - return StackUtils.containsSets(currentRecipe.getMatrix().getStacks(SLOT_CRAFTING_1, 9), accessibleInventory.getStacks(SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT), currentRecipe.getRecipeOutput(), true, true) > 0; + + ItemStack[] set = currentRecipe.getMatrix().getStacks(); + ItemStack[] stock = accessibleInventory.getStacks(); + return StackUtils.containsSets(set, stock, currentRecipe.getRecipeOutput(), true, true) > 0; } private void removeResources(EntityPlayer player) { @@ -511,9 +513,9 @@ public class TileWorktable extends TileBase implements ICrafter { return null; if (Proxies.common.isSimulating(worldObj)) - memorized.memorizeRecipe(worldObj, currentRecipe); + memorized.memorizeRecipe(worldObj, currentRecipe, currentCrafting); removeResources(player); - updateCraftResult(); + updateCraftResult(currentCrafting); return currentRecipe.getRecipeOutput().copy(); } diff --git a/src/main/java/forestry/factory/gui/ContainerWorktable.java b/src/main/java/forestry/factory/gui/ContainerWorktable.java index 9ffcab696..15d74c5a1 100755 --- a/src/main/java/forestry/factory/gui/ContainerWorktable.java +++ b/src/main/java/forestry/factory/gui/ContainerWorktable.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.factory.gui; +import forestry.core.utils.StackUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCraftResult; @@ -25,6 +26,7 @@ import forestry.core.network.PacketPayload; import forestry.core.network.PacketUpdate; import forestry.core.proxy.Proxies; import forestry.factory.gadgets.TileWorktable; +import net.minecraft.item.ItemStack; public class ContainerWorktable extends ContainerForestry implements IContainerCrafting, IGuiSelectable { @@ -91,10 +93,16 @@ public class ContainerWorktable extends ContainerForestry implements IContainerC @Override public void onCraftMatrixChanged(IInventory iinventory, int slot) { -// craftingInventory.setInventorySlotContents(slot, iinventory.getStackInSlot(slot)); - if (slot < craftMatrix.getSizeInventory()) - craftMatrix.setInventorySlotContents(slot, iinventory.getStackInSlot(slot)); - updateRecipe(); + if (slot >= craftMatrix.getSizeInventory()) + return; + + ItemStack stack = iinventory.getStackInSlot(slot); + ItemStack currentStack = craftMatrix.getStackInSlot(slot); + + if (!StackUtils.isIdenticalItem(stack, currentStack)) { + craftMatrix.setInventorySlotContents(slot, stack); + updateRecipe(); + } } private void updateMatrix() { From 987799d103a2489944d17635c060bb599a4527c3 Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 8 Sep 2014 02:20:23 -0700 Subject: [PATCH 30/49] Combine Trade Station buffer inventories into one #170 --- src/main/java/forestry/mail/TradeStation.java | 15 ++++++++------- .../forestry/mail/gadgets/MachineTrader.java | 18 +++++++----------- .../forestry/mail/gui/ContainerTrader.java | 14 ++++++-------- .../forestry/textures/gui/mailtrader.png | Bin 1842 -> 1645 bytes 4 files changed, 21 insertions(+), 26 deletions(-) diff --git a/src/main/java/forestry/mail/TradeStation.java b/src/main/java/forestry/mail/TradeStation.java index bae1dd188..a097560e4 100755 --- a/src/main/java/forestry/mail/TradeStation.java +++ b/src/main/java/forestry/mail/TradeStation.java @@ -40,17 +40,18 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve // / CONSTANTS public static final String SAVE_NAME = "TradePO_"; - public static final short SLOT_SIZE = 39; public static final short SLOT_TRADEGOOD = 0; + public static final short SLOT_TRADEGOOD_COUNT = 1; public static final short SLOT_EXCHANGE_1 = 1; public static final short SLOT_EXCHANGE_COUNT = 4; public static final short SLOT_LETTERS_1 = 5; public static final short SLOT_LETTERS_COUNT = 6; public static final short SLOT_STAMPS_1 = 11; public static final short SLOT_STAMPS_COUNT = 4; - public static final short SLOT_INPUTBUF_1 = 15; - public static final short SLOT_OUTPUTBUF_1 = 27; - public static final short SLOT_BUFFER_COUNT = 12; + public static final short SLOT_BUFFER = 15; + public static final short SLOT_BUFFER_COUNT = 30; + public static final short SLOT_SIZE = SLOT_TRADEGOOD_COUNT + SLOT_EXCHANGE_COUNT + SLOT_LETTERS_COUNT + SLOT_STAMPS_COUNT + SLOT_BUFFER_COUNT; + // / MEMBER private GameProfile owner; private MailAddress address; @@ -235,7 +236,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve if (stack == null) continue; - inventory.tryAddStack(stack.copy(), SLOT_OUTPUTBUF_1, SLOT_BUFFER_COUNT, false); + inventory.tryAddStack(stack.copy(), SLOT_BUFFER, SLOT_BUFFER_COUNT, false); } } @@ -275,7 +276,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve // How many orders are fillable? int itemCount = 0; - for (ItemStack stack : inventory.getStacks(SLOT_INPUTBUF_1, SLOT_BUFFER_COUNT)) { + for (ItemStack stack : inventory.getStacks(SLOT_BUFFER, SLOT_BUFFER_COUNT)) { if (stack != null && stack.isItemEqual(tradegood) && ItemStack.areItemStackTagsEqual(stack, tradegood)) itemCount += stack.stackSize; } @@ -302,7 +303,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve for (int j = 0; j < filled; j++) { int toRemove = inventory.getStackInSlot(SLOT_TRADEGOOD).stackSize; - for (int i = SLOT_INPUTBUF_1; i < SLOT_INPUTBUF_1 + SLOT_BUFFER_COUNT; i++) { + for (int i = SLOT_BUFFER; i < SLOT_BUFFER + SLOT_BUFFER_COUNT; i++) { ItemStack buffer = inventory.getStackInSlot(i); if (buffer == null) continue; diff --git a/src/main/java/forestry/mail/gadgets/MachineTrader.java b/src/main/java/forestry/mail/gadgets/MachineTrader.java index 7256c2950..5f4a4faac 100755 --- a/src/main/java/forestry/mail/gadgets/MachineTrader.java +++ b/src/main/java/forestry/mail/gadgets/MachineTrader.java @@ -95,7 +95,7 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided if (worldObj.getTotalWorldTime() % 40 * 10 != 0) return; - if (!hasPaperMin(0.0f) || !hasInputBufMin(0.0f)) { + if (!hasPaperMin(0.0f) || !hasBufMin(0.0f)) { setErrorState(EnumErrorCode.NORESOURCE); return; } @@ -132,12 +132,8 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided return percentOccupied(TradeStation.SLOT_LETTERS_1, TradeStation.SLOT_LETTERS_COUNT) > percentage; } - public boolean hasInputBufMin(float percentage) { - return percentOccupied(TradeStation.SLOT_INPUTBUF_1, TradeStation.SLOT_BUFFER_COUNT) > percentage; - } - - public boolean hasOutputBufMin(float percentage) { - return percentOccupied(TradeStation.SLOT_OUTPUTBUF_1, TradeStation.SLOT_BUFFER_COUNT) > percentage; + public boolean hasBufMin(float percentage) { + return percentOccupied(TradeStation.SLOT_BUFFER, TradeStation.SLOT_BUFFER_COUNT) > percentage; } public boolean hasPostageMin(int postage) { @@ -231,7 +227,7 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided if (!tradegood.isItemEqual(stack)) return 0; - return StackUtils.addToInventory(stack, inventory, doAdd, TradeStation.SLOT_INPUTBUF_1, TradeStation.SLOT_BUFFER_COUNT); + return StackUtils.addToInventory(stack, inventory, doAdd, TradeStation.SLOT_BUFFER, TradeStation.SLOT_BUFFER_COUNT); } @Override @@ -242,7 +238,7 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided ItemStack product = null; IInventory inventory = getOrCreateTradeInventory(); - for (int i = TradeStation.SLOT_OUTPUTBUF_1; i < TradeStation.SLOT_OUTPUTBUF_1 + TradeStation.SLOT_BUFFER_COUNT; i++) { + for (int i = TradeStation.SLOT_BUFFER; i < TradeStation.SLOT_BUFFER + TradeStation.SLOT_BUFFER_COUNT; i++) { ItemStack stackSlot = inventory.getStackInSlot(i); if (stackSlot == null) continue; @@ -278,7 +274,7 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided if(!super.canTakeStackFromSide(slotIndex, itemstack, side)) return false; - if(slotIndex >= TradeStation.SLOT_OUTPUTBUF_1 && slotIndex < TradeStation.SLOT_OUTPUTBUF_1 + TradeStation.SLOT_BUFFER_COUNT) + if(slotIndex >= TradeStation.SLOT_BUFFER && slotIndex < TradeStation.SLOT_BUFFER + TradeStation.SLOT_BUFFER_COUNT) return true; return false; @@ -298,7 +294,7 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided return itemstack.getItem() instanceof IStamps; } - if (slotIndex >= TradeStation.SLOT_INPUTBUF_1 && slotIndex < TradeStation.SLOT_BUFFER_COUNT) { + if (slotIndex >= TradeStation.SLOT_BUFFER && slotIndex < TradeStation.SLOT_BUFFER_COUNT) { IInventory inventory = getOrCreateTradeInventory(); ItemStack tradegood = inventory.getStackInSlot(TradeStation.SLOT_TRADEGOOD); if(tradegood == null) diff --git a/src/main/java/forestry/mail/gui/ContainerTrader.java b/src/main/java/forestry/mail/gui/ContainerTrader.java index 26bdb81d1..158cab840 100755 --- a/src/main/java/forestry/mail/gui/ContainerTrader.java +++ b/src/main/java/forestry/mail/gui/ContainerTrader.java @@ -51,15 +51,13 @@ public class ContainerTrader extends ContainerForestry { for (int j = 0; j < 2; j++) addSlot(new SlotCustom(inventory, TradeStation.SLOT_LETTERS_1 + j + i * 2, 15 + j * 18, 73 + i * 18, new Object[] { Items.paper })); - // Input buffer - for (int i = 0; i < 6; i++) - for (int j = 0; j < 2; j++) - addSlot(new Slot(inventory, TradeStation.SLOT_INPUTBUF_1 + j + i * 2, 123 + j * 18, 19 + i * 18)); + // Buffer + final int bufRows = 6; + final int bufCols = 5; + for (int i = 0; i < bufRows; i++) + for (int j = 0; j < bufCols; j++) + addSlot(new Slot(inventory, TradeStation.SLOT_BUFFER + j + i * bufCols, 123 + j * 18, 19 + i * 18)); - // Output buffer - for (int i = 0; i < 6; i++) - for (int j = 0; j < 2; j++) - addSlot(new SlotClosed(inventory, TradeStation.SLOT_OUTPUTBUF_1 + j + i * 2, 177 + j * 18, 19 + i * 18)); // Player inventory for (int i = 0; i < 3; i++) diff --git a/src/main/resources/assets/forestry/textures/gui/mailtrader.png b/src/main/resources/assets/forestry/textures/gui/mailtrader.png index 534268b95e0be9d429f39660485e0b36df1deb36..38f6623d9fea1e72cb029ba38d2544526b4f32ff 100755 GIT binary patch literal 1645 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5FjO4;u=vBoS#-wo>-L1;Fyx1 zl&avFo0y&&l$w}QS$HzlhJk@uDKjLZB*NFnDmgz_FA=0huOhbqsGEVo#=fE;F*!T6 zL?J0PJu}Z%>HY5gN(z}Nwo2iqz6QPp&Z!xh9#uuD!Bu`C$yM3OmMKd1b_zBXRzL%C zQ%e#RDspr3imfVamB8j&0ofp7eI*63l9Fs&C5WRUd;=7m^NUgyO!bU)lMM_F70k@^ z3{6bU%nWrDj0_Bo^bLT>OxMuF%GAut$Xo#mlz_GsrKDK}xwt{?0`hE?GD=Dctn~HE z%ggo3jrH=2()A53EiFN27#ZmTRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab zT4JjNbScCOxdm`z^NOLt1Pn0!io^naLp=kKmtYEgeeo;J&4sHjE(uCSxEHIz#UYgi zsro^w#rdU0$-sz9QwCX8VC7ttnpl!w6q28x0}I7~jQo=P;*9(P1?ONh1`yp;U% zVok7mUtcTFyyB9?yyR3*7h5Hu33{2CDON5PCeCKg=9b3h#=uZ_HL-9pG;=g}ax-!> zGH`Y=HiYSQ$xklLP0cHT=}kfCb;PL`loWCcfHu3N7G;*DrnnX5=PH1`Y?X=IE#^4Q zgX&Ge?G_81di8;h(Fa8=QbfaqfT;(>geO}d2cGa#^MI+n2$-xJb>7_tW(marpAc8; zfCitm#c7>)%sfHa%-X*ps9@8dKYw1mdiC??&;S4bA9>Gj2bAD03GxdDa-o31%b)QR z0|V1sPZ!6Kid%1PKlE!h5MjHJr=a!z|AD+2D;7sf^te@3zmuQrHLLKL?gzt57T+dj z$E-5>_WZ`x}Cj5tl_8H^Sy3J z(m>{c!p{s0Ynk_??oYdsy=0p5gO1J#Vl(#5e0h53zgi0+$p=RFO;W!b2ipnBCYS}6 z*T37LJHhwL)Eobu#gNE_p|Zblrk{c%4Twx>Av?p znFNVBY_qc(r|Gw>6W?>$q@FQNd1LegBZIpk|Nkk=3wAI};8=U6%t_rzoBwo0XMj!v zZ|8-m29dW;8Kw?gWtxAkw4aij%Iekfh;hvx*}m&c+QJJXx*xQ;teAHB!SCaaQ4j8~ zW47Z~b-K8Y<@6jjWp$^A4A<104n`%^Dv9tc_<8%G(M>_c5eXm2312Y?986YY` zl$NlfOEL&40^A6)Ofo3xvXwZtXDU_}0`knj#^eOU$GqE}c?}K1Rl8 zg)nJ%oJ_4jthS`GGZG?&-Kd$2F(IpH*sIQI+q0eSJ@@^1?)yIXdH(NxekZ&=X*%>03dV-0lXI4v10`xbF(;K+GZe>8oxp(T7hmfDwv(SFV&axP>XhqD=Q8F z!mYUn5}%DwqDCBt?%|Akrlm*Hhb}v_S?IIm!T! zSuMO46Kx@FCGa{}Y#X5q4oE~X$;xfXv!QC%&BN-Y^ujFug;s@l4fIvtVyp2^$oaDBPb+^&7v;E{<17aQIoHqr;Y zzDT##i~Zk()lGFjdf;NlMba?=iDN_S9V%xwDkpVo75*Og8C*ogd%pzRIdk6lrVwFR_vX|{>u%<$yw&Ey3nl8Ue^DNg3G6(lT;#K`f~C!WpC4JV7W-2gd-h^e+U%4m2uUA$sU8@b={zKr}PVPsZt1!6#jN!ghV8zANQ}C2lyI42G3+1cM@HI&~Qqnm>KDmF_H<#Bm`ds z*Re=;I|-k+VZzIkW*R!`3#08iH4wJhHH%}}^RleJ$*}_*Y0W|QTvEa%I` z@q@*DGjP3QT-I9d*r%H0N#|ohkf2}XbvQ90!Ja^PBw0UlprWWA`?X&=JGWA+WA|P0 zsjE$pWo6;^h5R~t9_4ZcFFg~M7%~5bh(!zB+U59;f_+iZ(J~VN+xgn4iQu87vkzlT z^;Qq~x&OaHJ{1iT(nb=Paj;{K?nWSLgXafzm@jM;c&lX9Z9fgu;$Ct}PpyQ4 zc`=bk!F@SYA_yAbBo5PI(EY9`vBB8tHrXkdxMnTa;Z_a=LI5kzxYV4MM2o7@MQq{& zS4QM7;@6fI;vSMhXZq4^Xf-~MwWW_AVQ^PD1oFj_V6s{^F%dpK{m|~qH4Z=ROj_q% z@qN!mCwm61FjrxvbaRj`2TRAMVrkqSR(VDjv>k)QeI@Y^MQ$2#V^ZUuvW46kwzu%t zA?lr`$0I&es)YxMgY`8}qi{Lcyu<}>Vv>m{g=7PV=TG94xe!&3zwD_--(miXolm0v z3y^!KGT|XXdmsgKr6e;Gwr<66DtyXcQYaYci{$#;MUV^4l-of96D;<~^02#?GAY|J zA9x4%$pA-l+lTlx7XscQxY~~!E-YDX`8fnXcl8OCa0t4QMuxmidc!;K7iF4# Date: Mon, 8 Sep 2014 02:21:13 -0700 Subject: [PATCH 31/49] Add send and receive strings to Trade Station GUI #170 --- lang | 2 +- src/main/java/forestry/mail/gui/GuiTrader.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lang b/lang index 98a31f2a6..7e3f048c0 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 98a31f2a68d6861aef5eb7c4a3047acea5c5e6a7 +Subproject commit 7e3f048c0e226df569c1b9db159543a189be64b5 diff --git a/src/main/java/forestry/mail/gui/GuiTrader.java b/src/main/java/forestry/mail/gui/GuiTrader.java index 73a2ba613..74713a204 100755 --- a/src/main/java/forestry/mail/gui/GuiTrader.java +++ b/src/main/java/forestry/mail/gui/GuiTrader.java @@ -35,6 +35,12 @@ public class GuiTrader extends GuiForestry { super.drawGuiContainerForegroundLayer(mouseX, mouseY); String name = StringUtil.localizeTile(tile.getInventoryName()); this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.mail.text")); + + String receive = StringUtil.localize("gui.mail.receive"); + this.fontRendererObj.drawString(receive, getCenteredOffset(receive, 70) + 51, 45, fontColor.get("gui.mail.text")); + + String send = StringUtil.localize("gui.mail.send"); + this.fontRendererObj.drawString(send, getCenteredOffset(send, 70) + 51, 99, fontColor.get("gui.mail.text")); } @Override From c167661e0510eb85b079fcff01a01a1c0f5680be Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 8 Sep 2014 02:38:38 -0700 Subject: [PATCH 32/49] fixed a couple missing methods --- src/main/java/forestry/mail/triggers/TriggerBuffer.java | 2 +- src/main/java/forestry/mail/triggers/TriggerLowInput.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/forestry/mail/triggers/TriggerBuffer.java b/src/main/java/forestry/mail/triggers/TriggerBuffer.java index bff411e0c..2e5b0a8a1 100755 --- a/src/main/java/forestry/mail/triggers/TriggerBuffer.java +++ b/src/main/java/forestry/mail/triggers/TriggerBuffer.java @@ -39,7 +39,7 @@ public class TriggerBuffer extends Trigger { if (!(tile instanceof MachineTrader)) return false; - return ((MachineTrader) tile).hasOutputBufMin(threshold); + return ((MachineTrader) tile).hasBufMin(threshold); } } diff --git a/src/main/java/forestry/mail/triggers/TriggerLowInput.java b/src/main/java/forestry/mail/triggers/TriggerLowInput.java index 001f1aa19..1917bb522 100755 --- a/src/main/java/forestry/mail/triggers/TriggerLowInput.java +++ b/src/main/java/forestry/mail/triggers/TriggerLowInput.java @@ -39,6 +39,6 @@ public class TriggerLowInput extends Trigger { if (!(tile instanceof MachineTrader)) return false; - return !((MachineTrader) tile).hasInputBufMin(threshold); + return !((MachineTrader) tile).hasBufMin(threshold); } } From ea1f3f0ee479d66b70b14d132310bee6325899a4 Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 8 Sep 2014 03:09:55 -0700 Subject: [PATCH 33/49] Properly fixed Trade Station buffer triggers --- .../forestry/mail/gadgets/MachineTrader.java | 26 ++++++++++++------- .../forestry/mail/triggers/TriggerBuffer.java | 2 +- .../mail/triggers/TriggerLowInput.java | 2 +- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/main/java/forestry/mail/gadgets/MachineTrader.java b/src/main/java/forestry/mail/gadgets/MachineTrader.java index 5f4a4faac..ac02b47ea 100755 --- a/src/main/java/forestry/mail/gadgets/MachineTrader.java +++ b/src/main/java/forestry/mail/gadgets/MachineTrader.java @@ -95,7 +95,7 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided if (worldObj.getTotalWorldTime() % 40 * 10 != 0) return; - if (!hasPaperMin(0.0f) || !hasBufMin(0.0f)) { + if (!hasPaperMin(0.0f) || !hasInputBufMin(0.0f)) { setErrorState(EnumErrorCode.NORESOURCE); return; } @@ -113,27 +113,35 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided return address.isValid(); } - private float percentOccupied(int startSlot, int countSlots) { - int max = 0; + private float percentOccupied(int startSlot, int countSlots, ItemStack item) { + int max = countSlots * 64; int avail = 0; IInventory tradeInventory = this.getOrCreateTradeInventory(); for (int i = startSlot; i < startSlot + countSlots; i++) { - max += 64; - if (tradeInventory.getStackInSlot(i) == null) + ItemStack itemInSlot = tradeInventory.getStackInSlot(i); + if (itemInSlot == null || (item != null && !StackUtils.isIdenticalItem(itemInSlot, item))) continue; - avail += tradeInventory.getStackInSlot(i).stackSize; + avail += itemInSlot.stackSize; } return ((float) avail / (float) max); } public boolean hasPaperMin(float percentage) { - return percentOccupied(TradeStation.SLOT_LETTERS_1, TradeStation.SLOT_LETTERS_COUNT) > percentage; + return percentOccupied(TradeStation.SLOT_LETTERS_1, TradeStation.SLOT_LETTERS_COUNT, new ItemStack(Items.paper)) > percentage; } - public boolean hasBufMin(float percentage) { - return percentOccupied(TradeStation.SLOT_BUFFER, TradeStation.SLOT_BUFFER_COUNT) > percentage; + public boolean hasInputBufMin(float percentage) { + IInventory inventory = getOrCreateTradeInventory(); + ItemStack tradegood = inventory.getStackInSlot(TradeStation.SLOT_TRADEGOOD); + if (tradegood == null) + return true; + return percentOccupied(TradeStation.SLOT_BUFFER, TradeStation.SLOT_BUFFER_COUNT, tradegood) > percentage; + } + + public boolean hasOutputBufMin(float percentage) { + return percentOccupied(TradeStation.SLOT_BUFFER, TradeStation.SLOT_BUFFER_COUNT, null) > percentage; } public boolean hasPostageMin(int postage) { diff --git a/src/main/java/forestry/mail/triggers/TriggerBuffer.java b/src/main/java/forestry/mail/triggers/TriggerBuffer.java index 2e5b0a8a1..bff411e0c 100755 --- a/src/main/java/forestry/mail/triggers/TriggerBuffer.java +++ b/src/main/java/forestry/mail/triggers/TriggerBuffer.java @@ -39,7 +39,7 @@ public class TriggerBuffer extends Trigger { if (!(tile instanceof MachineTrader)) return false; - return ((MachineTrader) tile).hasBufMin(threshold); + return ((MachineTrader) tile).hasOutputBufMin(threshold); } } diff --git a/src/main/java/forestry/mail/triggers/TriggerLowInput.java b/src/main/java/forestry/mail/triggers/TriggerLowInput.java index 1917bb522..001f1aa19 100755 --- a/src/main/java/forestry/mail/triggers/TriggerLowInput.java +++ b/src/main/java/forestry/mail/triggers/TriggerLowInput.java @@ -39,6 +39,6 @@ public class TriggerLowInput extends Trigger { if (!(tile instanceof MachineTrader)) return false; - return !((MachineTrader) tile).hasBufMin(threshold); + return !((MachineTrader) tile).hasInputBufMin(threshold); } } From 7ee9f5dd955f4fbe3d5a801266d74173d275ea35 Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 8 Sep 2014 17:40:58 -0700 Subject: [PATCH 34/49] Clearer error message for the Trade Station #170 --- lang | 2 +- .../java/forestry/core/EnumErrorCode.java | 20 +++- .../forestry/mail/gadgets/MachineTrader.java | 103 ++++++++++++++---- .../mail/triggers/TriggerLowPaper.java | 4 +- .../java/forestry/plugins/PluginMail.java | 8 +- .../textures/items/errors/noPaper.png | Bin 0 -> 1040 bytes .../textures/items/errors/notPostpaid.png | Bin 458 -> 0 bytes 7 files changed, 107 insertions(+), 30 deletions(-) create mode 100644 src/main/resources/assets/forestry/textures/items/errors/noPaper.png delete mode 100755 src/main/resources/assets/forestry/textures/items/errors/notPostpaid.png diff --git a/lang b/lang index 7e3f048c0..92402cb0d 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 7e3f048c0e226df569c1b9db159543a189be64b5 +Subproject commit 92402cb0d104dd5cc25d7e720cb76487d1dc5953 diff --git a/src/main/java/forestry/core/EnumErrorCode.java b/src/main/java/forestry/core/EnumErrorCode.java index 0efcfb27e..64d96143b 100755 --- a/src/main/java/forestry/core/EnumErrorCode.java +++ b/src/main/java/forestry/core/EnumErrorCode.java @@ -66,7 +66,7 @@ public enum EnumErrorCode { NOHONEY("noHoney", 22), - NOTPOSTPAID("notPostpaid", 23), + NOTPOSTPAID("notPostpaid", "noStamps", 23), NORECIPIENT("noRecipient", 24), @@ -86,14 +86,28 @@ public enum EnumErrorCode { CIRCUITMISMATCH("circuitMismatch", 26), - NOLIQUID("noLiquid", 29); + NOLIQUID("noLiquid", 29), + + NOPAPER("noPaper", 30), + + NOSTAMPSNOPAPER("noStampsNoPaper", "noStamps", 31), + + NOSUPPLIES("noSupplies", "noResource", 32), + + NOTRADE("noTrade", "noResource", 33); private String name; + private String iconName; @SideOnly(Side.CLIENT) private IIcon icon; private EnumErrorCode(String name, int iconIndex) { + this(name, name, iconIndex); + } + + private EnumErrorCode(String name, String iconName, int iconIndex) { this.name = name; + this.iconName = iconName; } public String getDescription() { @@ -106,7 +120,7 @@ public enum EnumErrorCode { @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister register) { - icon = TextureManager.getInstance().registerTex(register, "errors/" + name); + icon = TextureManager.getInstance().registerTex(register, "errors/" + iconName); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/forestry/mail/gadgets/MachineTrader.java b/src/main/java/forestry/mail/gadgets/MachineTrader.java index ac02b47ea..c0bb66cd8 100755 --- a/src/main/java/forestry/mail/gadgets/MachineTrader.java +++ b/src/main/java/forestry/mail/gadgets/MachineTrader.java @@ -89,18 +89,51 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided } /* UPDATING */ + + /** + * The trade station should show errors for missing stamps and paper first. + * Once it is able to send letters, it should display other error states. + */ @Override public void updateServerSide() { - if (worldObj.getTotalWorldTime() % 40 * 10 != 0) + if (!isLinked() || worldObj.getTotalWorldTime() % 4 != 0) return; - if (!hasPaperMin(0.0f) || !hasInputBufMin(0.0f)) { - setErrorState(EnumErrorCode.NORESOURCE); + EnumErrorCode errorCode = EnumErrorCode.OK; + + if (!hasPostageMin(3)) + errorCode = EnumErrorCode.NOSTAMPS; + + if (!hasPaperMin(2)) { + if (errorCode == EnumErrorCode.NOSTAMPS) + errorCode = EnumErrorCode.NOSTAMPSNOPAPER; + else + errorCode = EnumErrorCode.NOPAPER; + } + + if (errorCode != EnumErrorCode.OK) { + setErrorState(errorCode); return; } - if (!hasPostageMin(3)) { // Assumes that the trade station owner should have a notice. - setErrorState(EnumErrorCode.NOSTAMPS); + + IInventory inventory = getOrCreateTradeInventory(); + ItemStack tradeGood = inventory.getStackInSlot(TradeStation.SLOT_TRADEGOOD); + + if (tradeGood == null) { + setErrorState(EnumErrorCode.NOTRADE); + return; + } + + boolean hasRequest = hasItemCount(TradeStation.SLOT_EXCHANGE_1, TradeStation.SLOT_EXCHANGE_COUNT, null, 1); + if (!hasRequest) { + setErrorState(EnumErrorCode.NOTRADE); + return; + } + + boolean hasSupplies = hasItemCount(TradeStation.SLOT_BUFFER, TradeStation.SLOT_BUFFER_COUNT, tradeGood, tradeGood.stackSize); + if(!hasSupplies) { + setErrorState(EnumErrorCode.NOSUPPLIES); return; } @@ -113,31 +146,60 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided return address.isValid(); } - private float percentOccupied(int startSlot, int countSlots, ItemStack item) { - int max = countSlots * 64; - int avail = 0; + /** + * Returns true if there are 'itemCount' of 'item' in the inventory + * wildcard when item == null, counts all types of items + */ + private boolean hasItemCount(int startSlot, int countSlots, ItemStack item, int itemCount) { + int count = 0; IInventory tradeInventory = this.getOrCreateTradeInventory(); for (int i = startSlot; i < startSlot + countSlots; i++) { ItemStack itemInSlot = tradeInventory.getStackInSlot(i); - if (itemInSlot == null || (item != null && !StackUtils.isIdenticalItem(itemInSlot, item))) + if (itemInSlot == null) continue; - avail += itemInSlot.stackSize; + if (item == null || StackUtils.isIdenticalItem(itemInSlot, item)) + count += itemInSlot.stackSize; + if (count >= itemCount) + return true; } - return ((float) avail / (float) max); + return false; } - public boolean hasPaperMin(float percentage) { - return percentOccupied(TradeStation.SLOT_LETTERS_1, TradeStation.SLOT_LETTERS_COUNT, new ItemStack(Items.paper)) > percentage; + /** + * Returns the percentage of the inventory that is occupied by 'item' + * if item == null, returns the percentage occupied by all kinds of items + */ + private float percentOccupied(int startSlot, int countSlots, ItemStack item) { + int count = 0; + int total = 0; + + IInventory tradeInventory = this.getOrCreateTradeInventory(); + for (int i = startSlot; i < startSlot + countSlots; i++) { + ItemStack itemInSlot = tradeInventory.getStackInSlot(i); + if (itemInSlot == null) { + total += 64; + } else { + total += itemInSlot.getMaxStackSize(); + if (item == null || StackUtils.isIdenticalItem(itemInSlot, item)) + count += itemInSlot.stackSize; + } + } + + return ((float)count / (float)total); + } + + public boolean hasPaperMin(int count) { + return hasItemCount(TradeStation.SLOT_LETTERS_1, TradeStation.SLOT_LETTERS_COUNT, new ItemStack(Items.paper), count); } public boolean hasInputBufMin(float percentage) { IInventory inventory = getOrCreateTradeInventory(); - ItemStack tradegood = inventory.getStackInSlot(TradeStation.SLOT_TRADEGOOD); - if (tradegood == null) + ItemStack tradeGood = inventory.getStackInSlot(TradeStation.SLOT_TRADEGOOD); + if (tradeGood == null) return true; - return percentOccupied(TradeStation.SLOT_BUFFER, TradeStation.SLOT_BUFFER_COUNT, tradegood) > percentage; + return percentOccupied(TradeStation.SLOT_BUFFER, TradeStation.SLOT_BUFFER_COUNT, tradeGood) > percentage; } public boolean hasOutputBufMin(float percentage) { @@ -157,9 +219,11 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided continue; posted += ((IStamps) stamp.getItem()).getPostage(stamp).getValue() * stamp.stackSize; + if (posted >= postage) + return true; } - return posted >= postage; + return false; } /* ADDRESS */ @@ -188,7 +252,6 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided this.address = address; PostManager.postRegistry.getOrCreateTradeStation(worldObj, getOwnerProfile(), address); setErrorState(EnumErrorCode.OK); - sendNetworkUpdate(); } else this.address = address; } @@ -409,8 +472,8 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided @Override public LinkedList getCustomTriggers() { LinkedList res = new LinkedList(); - res.add(PluginMail.lowPaper25); - res.add(PluginMail.lowPaper10); + res.add(PluginMail.lowPaper64); + res.add(PluginMail.lowPaper32); res.add(PluginMail.lowInput25); res.add(PluginMail.lowInput10); res.add(PluginMail.lowPostage40); diff --git a/src/main/java/forestry/mail/triggers/TriggerLowPaper.java b/src/main/java/forestry/mail/triggers/TriggerLowPaper.java index 3d9402c1c..f2e374310 100755 --- a/src/main/java/forestry/mail/triggers/TriggerLowPaper.java +++ b/src/main/java/forestry/mail/triggers/TriggerLowPaper.java @@ -21,9 +21,9 @@ import forestry.mail.gadgets.MachineTrader; public class TriggerLowPaper extends Trigger { - float threshold; + int threshold; - public TriggerLowPaper(String tag, float threshold) { + public TriggerLowPaper(String tag, int threshold) { super(tag, "lowPaper"); this.threshold = threshold; } diff --git a/src/main/java/forestry/plugins/PluginMail.java b/src/main/java/forestry/plugins/PluginMail.java index 22b471e6e..048371773 100755 --- a/src/main/java/forestry/plugins/PluginMail.java +++ b/src/main/java/forestry/plugins/PluginMail.java @@ -65,8 +65,8 @@ public class PluginMail extends NativePlugin { @SidedProxy(clientSide = "forestry.mail.proxy.ClientProxyMail", serverSide = "forestry.mail.proxy.ProxyMail") public static ProxyMail proxy; public static Trigger triggerHasMail; - public static Trigger lowPaper25; - public static Trigger lowPaper10; + public static Trigger lowPaper64; + public static Trigger lowPaper32; public static Trigger lowPostage40; public static Trigger lowPostage20; public static Trigger lowInput25; @@ -90,8 +90,8 @@ public class PluginMail extends NativePlugin { new TickHandlerMailClient(); triggerHasMail = new TriggerHasMail(); - lowPaper25 = new TriggerLowPaper("mail.lowPaper.25", 0.25f); - lowPaper10 = new TriggerLowPaper("mail.lowPaper.10", 0.1f); + lowPaper64 = new TriggerLowPaper("mail.lowPaper.64", 64); + lowPaper32 = new TriggerLowPaper("mail.lowPaper.32", 32); lowPostage40 = new TriggerLowStamps("mail.lowStamps.40", 40); lowPostage20 = new TriggerLowStamps("mail.lowStamps.20", 20); lowInput25 = new TriggerLowInput("mail.lowInput.25", 0.25f); diff --git a/src/main/resources/assets/forestry/textures/items/errors/noPaper.png b/src/main/resources/assets/forestry/textures/items/errors/noPaper.png new file mode 100644 index 0000000000000000000000000000000000000000..da8fb928b3e30926cda32581bd6a799521574066 GIT binary patch literal 1040 zcmaJ=O-$2J9B%{-Ap%}BiivragP5>(-ABhN1?IZJ;yTAR!!CYw?SnO=eYJhKvI|Ox zQ7&@uX5zt{#u(y(i!mnLj90UR2M;PSAtoM7Jm_J*j%|2wHf`V6@AvzEzWdqC%s~He zKSfaksaYvU#$(>s*F*lJzM(uBPT@om=g|VLDmJ8I8Y)4MGL%J_gNn9t^DUg9s2*A` z6md~b3o0@g#ltYJVG%Y(O-#9#qE;XVCAg@YBK`f<8ye`ENY965zih=}S)Z-hFkj0Q z)LKQ2YV_13m~aImU_h(@*H|(g!4>JIu0ZDAHcNvh1Xo0Q->IUU1#x6U5N3it)z5K& z=NT>(=6P-m1pHip^^=$PaUmhh3xNn|Jv6aqYYRe7O15l~l}MK{wgi@~R;x@k$RK-> z<)YE3rx6JF2*T&Am{@UrrZdu3kf5X5x`lOQ0#8vXp=B)6#MAu{467q+I;}L3gt4w- zu^i*~LTUqL`TtPE=%5{(g9rZpQ`jl2Sdh&@2QAwwDcr({XUY=dHdHXO3kWT>vzRR- zjGQvEKs?Wb(Rtm}P}Mo##LKdfG99d#DojZtO%xbi*Mv}VJQfT|iC`oaw@CMR(@xuxMW^whNxI!8ZM~Wf?~p4oluZ{Bjns6#Ufo12?! zG#bx+rN`vxFwSN2WZ9s8Zx4Fcub7fz1^2`HgFF4y*}nMKdSmrR^!O8CW>+7qN ckzc(hse83UpDSBi3b8?@5*g{m#T#pX06Qa2r2qf` literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forestry/textures/items/errors/notPostpaid.png b/src/main/resources/assets/forestry/textures/items/errors/notPostpaid.png deleted file mode 100755 index 2f373319d52d9bf2c8724bc7b29ae7c7a9ea319e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 458 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFur)B-u21s;*b3=G^tAk28_ZrvZCV3MbcV+hCfF9wqT4wd~ljqgkS7p`M;7TY%eg#*kB|B^K>qT{Gk8(j>8n z-5u4>UnwgvxAr(PoJcS;FiSIYuwY_%A|Wgh<=u4?Xq#$@YeY#(Vo9o1a#1RfVlXl= zG}1LN*EKQ-F*LL?HLx-@);2J*GBD71aulc@NkeXaN@iLmNQ1GifuXLEd5Dn_NP`Jb zgCS6ZAp=i6P=hkahP2F_)V##pRI3sogP|ZXJyow#-_R^J9?Yx&F|%(Z6@V=8boFyt I=akR{0R4rHK>z>% From 476576ae5540e789dfc7b8ecef748d3d5eebc953 Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 8 Sep 2014 17:41:33 -0700 Subject: [PATCH 35/49] Changed Trade Station GUI to have paper-shaped slots #170 --- .../forestry/textures/gui/mailtrader.png | Bin 1645 -> 1795 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/forestry/textures/gui/mailtrader.png b/src/main/resources/assets/forestry/textures/gui/mailtrader.png index 38f6623d9fea1e72cb029ba38d2544526b4f32ff..24263d3f61359691cd78941b5b137ab1244ead9c 100755 GIT binary patch delta 1048 zcmaFM)6BQQjVapH$;r~#%-GP_+{wt$(AC7k*wMh!(#g%-&CJNn)x=Oqp(3}y*VoD= zKe;qFHLt|e#a0O@qL-4HVg=P}ghTJ-g-nL>5H&__xYT@Pl7*@eZ{CKY#xJ|9`rE6ZhnW%#!uY z#-1*YAr-gY+`e5j+dzahK$s)<=YRgZob*daKKUN;I(zMsceL!7-Uv^&ir4QiJpFMoIMS2d z;$^1I{qlDr8dg%#J^xppZ}_>k)|Po+*r(+OVtg8RuGTF0R6Kp^57Pv_YYjVBn=W{* zSrGHdkMY^f)D5dOFMRI3@UQLrg|q1mlfAx)RA|eXUH$(rAdID6i9y9_>P^2ArI5;~ zXR1z-4BA2qqZ$<7x~-5(;Mgs?@AZN%_f*Hu06B-JWfu8dA!<&M-4D84GPI{3jNd;$ zh3n7u-wpP?LJPN8A2geO@QI5C-vTp1uGvgqI|C#fzTbXmcC*jLLn(##hM0q7eQcep zmSBQ>^W9Y{%reFYUQbP^Z}_)bmP8SWq1zLh!EGxWQ z9x-GIFWkbfwn}*64SuzEelC+3>T>?r&HQ*V#7}8Tx#Sw3mQQ&tTEdF673&!oq@H?2 zd$+u+G}W*Y+@;RlJCDheVYSdgg@)430KNmKTr^k{N|mNCe&}`4V0vKP>A`ehJJ7qv z3#1?v*n!p=?#_*S3584OqM*iz0S<}E^|&1myO<&otrqy z{`XzzH$h4O*O<0c*SFk!5SSs{kXF5ot=b+*63jf{%y7&0P|gR95Tz6@bV*>u2`L6+ zh$;wvx+wz`U2;gT8AEdA1`i&Fh6^9>vqUUQiancU&d)e)<@1m48K-IP)GcQyxjWgA kO=+?N8;cZ2em$!M!}3M!jdp(@z6BZN>FVdQ&MBb@0ASUHTL1t6 delta 908 zcmZqXd&{%IjVap2!o=Ck+1%3D+}Oa-(AC7k#n8;r+{w+z&B(yn#n@0up(3}y*VoD= zKe;qFHLt|e#a0O@qL-4HVg=Rfh(qt>g-nL>P&MYb)O=);g{iT?rAC+8*|1UP-CYI- z2E_oM5LfGf2A{OWX`Oe>JVStD*8UAa1)Ki-`Sa@4tDirA{{R2~$a{Xf$qSh!>zU?y zx;TbZ+?PBbA9Qq15Sy`Y=F8JN|J7OuNj@;TZ<6}mIM_}|Ho+{oy#Cz| z-3h)|rr!APEYEm&Xarj&unRyLEnO!vL-$s|b3 zVVj-RI8DE0o%o*1CiRSI${V8}7#Z9R`TtK@Ua*5<0>|1j^<_@#PTKsZD>?&o8hAS| zL^X)Kb;>Yx;40JnbEW;1+*DStmPd?h_Q>{KXVMm47}5Qp&1J>3%MX4ZcZ_;)e;uW_93p@oACEne)oC<&Y?nl4!3bbQt{%c{h-H8%2~k?Y zijak}gcN~MgCXkCvd4@aD7tdPWd(Fe2Q3{TW(I{9|MZ!9YPYRBw#v0(V}9lT^$f}K xJCCU|%+iBtn0%8>VDbYtP9SELYPvq1ftkUFkyUe_-Kqm1C7!N+F6*2UngBW Date: Mon, 8 Sep 2014 23:32:39 -0700 Subject: [PATCH 36/49] Fixed Peat Bog and Humus texture issues Closes #174 --- lang | 2 +- .../java/forestry/core/gadgets/BlockSoil.java | 93 +++++++++++-------- .../forestry/core/items/ItemSoilBlock.java | 21 +++++ .../java/forestry/plugins/PluginCore.java | 3 +- 4 files changed, 76 insertions(+), 43 deletions(-) create mode 100644 src/main/java/forestry/core/items/ItemSoilBlock.java diff --git a/lang b/lang index 92402cb0d..1d9203714 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 92402cb0d104dd5cc25d7e720cb76487d1dc5953 +Subproject commit 1d9203714896d97a704dc36fbadc2a9196606045 diff --git a/src/main/java/forestry/core/gadgets/BlockSoil.java b/src/main/java/forestry/core/gadgets/BlockSoil.java index d475e9a55..0fba88efc 100755 --- a/src/main/java/forestry/core/gadgets/BlockSoil.java +++ b/src/main/java/forestry/core/gadgets/BlockSoil.java @@ -47,7 +47,11 @@ import forestry.core.render.TextureManager; */ public class BlockSoil extends Block { - private final int degradeDelimiter = 3; + public enum SoilType { + HUMUS, BOG_EARTH, PEAT; + } + + private static final int degradeDelimiter = 3; public BlockSoil() { super(Material.sand); @@ -66,16 +70,15 @@ public class BlockSoil extends Block { public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { ArrayList ret = new ArrayList(); - int type = (metadata & 0x03); - int maturity = metadata >> 2; + SoilType type = getTypeFromMeta(metadata); - if (maturity >= this.degradeDelimiter && type == 1) { + if (type == SoilType.PEAT) { ret.add(ForestryItem.peat.getItemStack()); ret.add(new ItemStack(Blocks.dirt)); - } else if (type == 0) + } else if (type == SoilType.HUMUS) ret.add(new ItemStack(Blocks.dirt)); else - ret.add(new ItemStack(this, 1, type)); + ret.add(new ItemStack(this, 1, SoilType.BOG_EARTH.ordinal())); return ret; } @@ -91,14 +94,13 @@ public class BlockSoil extends Block { return; int meta = world.getBlockMetadata(i, j, k); - int type = (meta & 0x03); - if (type == 0) + SoilType type = getTypeFromMeta(meta); + + if (type == SoilType.HUMUS) updateTickHumus(world, i, j, k, random); - else if (type == 1) + else if (type == SoilType.BOG_EARTH) updateTickBogEarth(world, i, j, k, random); - else - Proxies.log.warning(this.getClass() + " with unknown type " + type + " encountered."); } private void updateTickHumus(World world, int i, int j, int k, Random random) { @@ -155,17 +157,17 @@ public class BlockSoil extends Block { int type = meta & 0x03; int grade = meta >> 2; - // Increment (de)gradation - grade++; + // Increment (de)gradation + grade++; - // Repackage in format TTGG - meta = (grade << 2 | type); + // Repackage in format TTGG + meta = (grade << 2 | type); - if (grade >= this.degradeDelimiter) - world.setBlock(i, j, k, Blocks.sand, 0, Defaults.FLAG_BLOCK_SYNCH); - else - world.setBlockMetadataWithNotify(i, j, k, meta, Defaults.FLAG_BLOCK_SYNCH); - world.markBlockForUpdate(i, j, k); + if (grade >= this.degradeDelimiter) + world.setBlock(i, j, k, Blocks.sand, 0, Defaults.FLAG_BLOCK_SYNCH); + else + world.setBlockMetadataWithNotify(i, j, k, meta, Defaults.FLAG_BLOCK_SYNCH); + world.markBlockForUpdate(i, j, k); } public static boolean isMoistened(World world, int x, int y, int z) { @@ -192,15 +194,15 @@ public class BlockSoil extends Block { int type = meta & 0x03; int maturity = meta >> 2; - if (maturity >= this.degradeDelimiter) - return; + if (maturity >= this.degradeDelimiter) + return; - // Increment (de)gradation - maturity++; + // Increment (de)gradation + maturity++; - meta = (maturity << 2 | type); - world.setBlockMetadataWithNotify(i, j, k, meta, Defaults.FLAG_BLOCK_SYNCH); - world.markBlockForUpdate(i, j, k); + meta = (maturity << 2 | type); + world.setBlockMetadataWithNotify(i, j, k, meta, Defaults.FLAG_BLOCK_SYNCH); + world.markBlockForUpdate(i, j, k); } @Override @@ -210,8 +212,9 @@ public class BlockSoil extends Block { return false; int meta = world.getBlockMetadata(x, y, z); + SoilType type = getTypeFromMeta(meta); - return (meta & 0x03) == 0; + return type == SoilType.HUMUS; } @Override @@ -219,6 +222,19 @@ public class BlockSoil extends Block { return false; } + public static SoilType getTypeFromMeta(int meta) { + int type = meta & 0x03; + int maturity = meta >> 2; + + if (type == 1) + if (maturity < degradeDelimiter) + return SoilType.BOG_EARTH; + else + return SoilType.PEAT; + else + return SoilType.HUMUS; + } + // / CREATIVE INVENTORY @SuppressWarnings({ "rawtypes", "unchecked" }) @Override @@ -245,21 +261,16 @@ public class BlockSoil extends Block { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(int i, int j) { + public IIcon getIcon(int side, int meta) { - int meta = j; - int type = meta & 0x0f; - int maturity = meta >> 2; + SoilType type = getTypeFromMeta(meta); - if (type == 1) - if (maturity < this.degradeDelimiter) - return iconBogEarth; - else - return iconPeat; - else if (type == 0) - return iconHumus; - else - return null; + switch (type) { + case HUMUS: return iconHumus; + case BOG_EARTH: return iconBogEarth; + case PEAT: return iconPeat; + } + return null; } } diff --git a/src/main/java/forestry/core/items/ItemSoilBlock.java b/src/main/java/forestry/core/items/ItemSoilBlock.java new file mode 100644 index 000000000..e4f5f50d1 --- /dev/null +++ b/src/main/java/forestry/core/items/ItemSoilBlock.java @@ -0,0 +1,21 @@ +package forestry.core.items; + +import forestry.core.gadgets.BlockSoil; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; + +public class ItemSoilBlock extends ItemForestryBlock { + + public ItemSoilBlock(Block block) { + super(block); + } + + @Override + public String getUnlocalizedName(ItemStack itemstack) { + if (this.getBlock() instanceof BlockSoil) { + BlockSoil.SoilType soilType = BlockSoil.getTypeFromMeta(itemstack.getItemDamage()); + return getBlock().getUnlocalizedName() + "." + soilType.ordinal(); + } + return super.getUnlocalizedName(itemstack); + } +} diff --git a/src/main/java/forestry/plugins/PluginCore.java b/src/main/java/forestry/plugins/PluginCore.java index 6cf7a60a0..e48d8e6ac 100755 --- a/src/main/java/forestry/plugins/PluginCore.java +++ b/src/main/java/forestry/plugins/PluginCore.java @@ -64,6 +64,7 @@ import forestry.core.items.ItemAssemblyKit; import forestry.core.items.ItemCrated; import forestry.core.items.ItemForestry; import forestry.core.items.ItemForestryBlock; +import forestry.core.items.ItemSoilBlock; import forestry.core.items.ItemForestryPickaxe; import forestry.core.items.ItemForestryShovel; import forestry.core.items.ItemFruit; @@ -111,7 +112,7 @@ public class PluginCore extends NativePlugin implements IFuelHandler { definitionEscritoire = ((BlockBase) ForestryBlock.core.block()).addDefinition(new MachineDefinition(Defaults.DEFINITION_ESCRITOIRE_META, "forestry.Escritoire", TileEscritoire.class, Proxies.render.getRenderEscritoire())); - ForestryBlock.soil.registerBlock(new BlockSoil(), ItemForestryBlock.class, "soil"); + ForestryBlock.soil.registerBlock(new BlockSoil(), ItemSoilBlock.class, "soil"); ForestryBlock.soil.block().setHarvestLevel("shovel", 0, 0); ForestryBlock.soil.block().setHarvestLevel("shovel", 0, 1); From 235ead50111cb10f5b225789b9ef419c337e0664 Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 8 Sep 2014 23:33:21 -0700 Subject: [PATCH 37/49] Fixed rotated logs having wrong localized name --- src/main/java/forestry/arboriculture/gadgets/BlockLog.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockLog.java b/src/main/java/forestry/arboriculture/gadgets/BlockLog.java index b9cee942b..2054ed499 100755 --- a/src/main/java/forestry/arboriculture/gadgets/BlockLog.java +++ b/src/main/java/forestry/arboriculture/gadgets/BlockLog.java @@ -124,7 +124,7 @@ public class BlockLog extends Block implements IWoodTyped { int oriented = meta & 12; - WoodType type = getWoodType(getTypeFromMeta(meta)); + WoodType type = getWoodType(meta); if (type == null) return null; @@ -161,7 +161,7 @@ public class BlockLog extends Block implements IWoodTyped { /* PROPERTIES */ @Override public float getBlockHardness(World world, int x, int y, int z) { - return getWoodType(getTypeFromMeta(world.getBlockMetadata(x, y, z))).getHardness(); + return getWoodType(world.getBlockMetadata(x, y, z)).getHardness(); } @Override @@ -196,6 +196,7 @@ public class BlockLog extends Block implements IWoodTyped { @Override public WoodType getWoodType(int meta) { + meta = getTypeFromMeta(meta); if(meta + cat.ordinal() * 4 < WoodType.VALUES.length) return WoodType.VALUES[meta + cat.ordinal() * 4]; else From 7e6b68a504bbf9ce72dd79eebdc50c141f58b72c Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 9 Sep 2014 00:54:36 -0700 Subject: [PATCH 38/49] Generalized ItemSoilBlock to ItemTypedBlock --- src/main/java/forestry/core/IItemTyped.java | 5 ++++ .../java/forestry/core/gadgets/BlockSoil.java | 5 ++-- .../forestry/core/items/ItemSoilBlock.java | 21 ------------- .../forestry/core/items/ItemTypedBlock.java | 30 +++++++++++++++++++ .../java/forestry/plugins/PluginCore.java | 4 +-- 5 files changed, 40 insertions(+), 25 deletions(-) create mode 100644 src/main/java/forestry/core/IItemTyped.java delete mode 100644 src/main/java/forestry/core/items/ItemSoilBlock.java create mode 100644 src/main/java/forestry/core/items/ItemTypedBlock.java diff --git a/src/main/java/forestry/core/IItemTyped.java b/src/main/java/forestry/core/IItemTyped.java new file mode 100644 index 000000000..c53101f1c --- /dev/null +++ b/src/main/java/forestry/core/IItemTyped.java @@ -0,0 +1,5 @@ +package forestry.core; + +public interface IItemTyped { + public Enum getTypeFromMeta(int meta); +} diff --git a/src/main/java/forestry/core/gadgets/BlockSoil.java b/src/main/java/forestry/core/gadgets/BlockSoil.java index 0fba88efc..e7cf3721e 100755 --- a/src/main/java/forestry/core/gadgets/BlockSoil.java +++ b/src/main/java/forestry/core/gadgets/BlockSoil.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; +import forestry.core.IItemTyped; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -45,7 +46,7 @@ import forestry.core.render.TextureManager; * @author * */ -public class BlockSoil extends Block { +public class BlockSoil extends Block implements IItemTyped { public enum SoilType { HUMUS, BOG_EARTH, PEAT; @@ -222,7 +223,7 @@ public class BlockSoil extends Block { return false; } - public static SoilType getTypeFromMeta(int meta) { + public SoilType getTypeFromMeta(int meta) { int type = meta & 0x03; int maturity = meta >> 2; diff --git a/src/main/java/forestry/core/items/ItemSoilBlock.java b/src/main/java/forestry/core/items/ItemSoilBlock.java deleted file mode 100644 index e4f5f50d1..000000000 --- a/src/main/java/forestry/core/items/ItemSoilBlock.java +++ /dev/null @@ -1,21 +0,0 @@ -package forestry.core.items; - -import forestry.core.gadgets.BlockSoil; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - -public class ItemSoilBlock extends ItemForestryBlock { - - public ItemSoilBlock(Block block) { - super(block); - } - - @Override - public String getUnlocalizedName(ItemStack itemstack) { - if (this.getBlock() instanceof BlockSoil) { - BlockSoil.SoilType soilType = BlockSoil.getTypeFromMeta(itemstack.getItemDamage()); - return getBlock().getUnlocalizedName() + "." + soilType.ordinal(); - } - return super.getUnlocalizedName(itemstack); - } -} diff --git a/src/main/java/forestry/core/items/ItemTypedBlock.java b/src/main/java/forestry/core/items/ItemTypedBlock.java new file mode 100644 index 000000000..556ee28b5 --- /dev/null +++ b/src/main/java/forestry/core/items/ItemTypedBlock.java @@ -0,0 +1,30 @@ +package forestry.core.items; + +import forestry.core.IItemTyped; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; + +/** + * For blocks whose type depends on metadata. + * This allows control over which localized name maps to which meta value. + */ +public class ItemTypedBlock extends ItemForestryBlock { + + public ItemTypedBlock(Block block) { + super(block); + } + + @Override + public String getUnlocalizedName(ItemStack itemstack) { + Block block = getBlock(); + if (block instanceof IItemTyped) { + IItemTyped blockTyped = (IItemTyped)block; + Enum type = blockTyped.getTypeFromMeta(itemstack.getItemDamage()); + if (type != null) + return getBlock().getUnlocalizedName() + "." + type.ordinal(); + else + return null; + } + return super.getUnlocalizedName(itemstack); + } +} diff --git a/src/main/java/forestry/plugins/PluginCore.java b/src/main/java/forestry/plugins/PluginCore.java index e48d8e6ac..d1ede8490 100755 --- a/src/main/java/forestry/plugins/PluginCore.java +++ b/src/main/java/forestry/plugins/PluginCore.java @@ -64,7 +64,7 @@ import forestry.core.items.ItemAssemblyKit; import forestry.core.items.ItemCrated; import forestry.core.items.ItemForestry; import forestry.core.items.ItemForestryBlock; -import forestry.core.items.ItemSoilBlock; +import forestry.core.items.ItemTypedBlock; import forestry.core.items.ItemForestryPickaxe; import forestry.core.items.ItemForestryShovel; import forestry.core.items.ItemFruit; @@ -112,7 +112,7 @@ public class PluginCore extends NativePlugin implements IFuelHandler { definitionEscritoire = ((BlockBase) ForestryBlock.core.block()).addDefinition(new MachineDefinition(Defaults.DEFINITION_ESCRITOIRE_META, "forestry.Escritoire", TileEscritoire.class, Proxies.render.getRenderEscritoire())); - ForestryBlock.soil.registerBlock(new BlockSoil(), ItemSoilBlock.class, "soil"); + ForestryBlock.soil.registerBlock(new BlockSoil(), ItemTypedBlock.class, "soil"); ForestryBlock.soil.block().setHarvestLevel("shovel", 0, 0); ForestryBlock.soil.block().setHarvestLevel("shovel", 0, 1); From 21fb6bb1c07b96d31359fc45f077df003d4f9cd3 Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 9 Sep 2014 01:13:08 -0700 Subject: [PATCH 39/49] Fixed mushroom textures when in a multifarm closes #98 --- .../farming/gadgets/BlockMushroom.java | 33 ++++++++++++++----- .../java/forestry/plugins/PluginFarming.java | 4 +-- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/src/main/java/forestry/farming/gadgets/BlockMushroom.java b/src/main/java/forestry/farming/gadgets/BlockMushroom.java index fe83c8d50..366b6a6ce 100755 --- a/src/main/java/forestry/farming/gadgets/BlockMushroom.java +++ b/src/main/java/forestry/farming/gadgets/BlockMushroom.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; +import forestry.core.IItemTyped; import net.minecraft.block.Block; import net.minecraft.block.BlockSapling; import net.minecraft.client.renderer.texture.IIconRegister; @@ -32,7 +33,11 @@ import forestry.core.config.Defaults; import forestry.core.proxy.Proxies; import forestry.farming.worldgen.WorldGenBigMushroom; -public class BlockMushroom extends BlockSapling { +public class BlockMushroom extends BlockSapling implements IItemTyped { + + public enum MushroomType { + BROWN, RED; + } private final WorldGenerator[] generators; private final ItemStack[] drops; @@ -56,8 +61,9 @@ public class BlockMushroom extends BlockSapling { public ArrayList getDrops(World world, int X, int Y, int Z, int metadata, int fortune) { ArrayList ret = new ArrayList(); - int type = metadata & 0x03; - ret.add(drops[type]); + MushroomType type = getTypeFromMeta(metadata); + + ret.add(drops[type.ordinal()]); return ret; } @@ -74,13 +80,13 @@ public class BlockMushroom extends BlockSapling { return; int meta = world.getBlockMetadata(i, j, k); - int type = meta & 0x03; + MushroomType type = getTypeFromMeta(meta); int maturity = meta >> 2; tickGermling(world, i, j, k, random, type, maturity); } - private void tickGermling(World world, int i, int j, int k, Random random, int type, int maturity) { + private void tickGermling(World world, int i, int j, int k, Random random, MushroomType type, int maturity) { int lightvalue = world.getBlockLightValue(i, j + 1, k); @@ -90,7 +96,7 @@ public class BlockMushroom extends BlockSapling { if (maturity != 3) { maturity = 3; int matX = maturity << 2; - int meta = (matX | type); + int meta = (matX | type.ordinal()); world.setBlockMetadataWithNotify(i, j, k, meta, Defaults.FLAG_BLOCK_SYNCH); } else if (lightvalue <= 7) func_149878_d(world, i, j, k, random); @@ -108,6 +114,14 @@ public class BlockMushroom extends BlockSapling { world.setBlock(i, j, k, this, type, 0); } + @Override + public MushroomType getTypeFromMeta(int meta) { + meta %= 3; + if (meta >= MushroomType.values().length) + return null; + return MushroomType.values()[meta]; + } + /* ICONS */ @SideOnly(Side.CLIENT) @Override @@ -124,10 +138,11 @@ public class BlockMushroom extends BlockSapling { @SideOnly(Side.CLIENT) @Override public IIcon getIcon(int side, int meta) { - int type = meta & 0x0f; - if (type == 0) + MushroomType type = getTypeFromMeta(meta); + + if (type == MushroomType.BROWN) return Blocks.brown_mushroom.getIcon(side, meta); - else if (type == 1) + else if (type == MushroomType.RED) return Blocks.red_mushroom.getIcon(side, meta); else return null; diff --git a/src/main/java/forestry/plugins/PluginFarming.java b/src/main/java/forestry/plugins/PluginFarming.java index b5980eb2c..801cb5224 100755 --- a/src/main/java/forestry/plugins/PluginFarming.java +++ b/src/main/java/forestry/plugins/PluginFarming.java @@ -40,7 +40,7 @@ import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; import forestry.core.interfaces.IOreDictionaryHandler; import forestry.core.interfaces.ISaveEventHandler; -import forestry.core.items.ItemForestryBlock; +import forestry.core.items.ItemTypedBlock; import forestry.core.proxy.Proxies; import forestry.core.triggers.Trigger; import forestry.core.utils.ShapedRecipeCustom; @@ -107,7 +107,7 @@ public class PluginFarming extends NativePlugin { Farmables.farmInterface = new FarmHelper(); - ForestryBlock.mushroom.registerBlock(new BlockMushroom(), ItemForestryBlock.class, "mushroom"); + ForestryBlock.mushroom.registerBlock(new BlockMushroom(), ItemTypedBlock.class, "mushroom"); Farmables.farmables.put("farmArboreal", new ArrayList()); Farmables.farmables.get("farmArboreal").add(new FarmableVanillaSapling()); From 94e580cb909475ea98ee28fd6a573bfac5961e37 Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 9 Sep 2014 01:41:34 -0700 Subject: [PATCH 40/49] Fixed broken "low soil" buildcraft trigger closes #71 --- src/main/java/forestry/core/utils/InventoryAdapter.java | 2 +- src/main/java/forestry/farming/triggers/TriggerLowSoil.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/forestry/core/utils/InventoryAdapter.java b/src/main/java/forestry/core/utils/InventoryAdapter.java index e037d953f..52701e50e 100755 --- a/src/main/java/forestry/core/utils/InventoryAdapter.java +++ b/src/main/java/forestry/core/utils/InventoryAdapter.java @@ -193,7 +193,7 @@ public class InventoryAdapter implements IInventory, INBTTagable { if (stack == null) continue; - if (StackUtils.equals(Blocks.air, queried)) { + if (StackUtils.equals(Blocks.bedrock, queried)) { itemCount += stack.stackSize; continue; } diff --git a/src/main/java/forestry/farming/triggers/TriggerLowSoil.java b/src/main/java/forestry/farming/triggers/TriggerLowSoil.java index 632475f96..80b2a91f6 100755 --- a/src/main/java/forestry/farming/triggers/TriggerLowSoil.java +++ b/src/main/java/forestry/farming/triggers/TriggerLowSoil.java @@ -56,9 +56,9 @@ public class TriggerLowSoil extends Trigger { return false; ItemStack filter; - if (parameter == null || parameter.getItemStack() == null) - filter = new ItemStack(Blocks.air, threshold, -1); - else { + if (parameter == null || parameter.getItemStack() == null) { + filter = new ItemStack(Blocks.bedrock, threshold); + } else { filter = parameter.getItemStack().copy(); filter.stackSize = threshold; } From 7a11925dd5b9c53a1126245eff4b922802fb344f Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 9 Sep 2014 01:49:21 -0700 Subject: [PATCH 41/49] Added localization for the Farm multiblock's gui title --- lang | 2 +- src/main/java/forestry/farming/gui/GuiFarm.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lang b/lang index 1d9203714..4204c1c2b 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 1d9203714896d97a704dc36fbadc2a9196606045 +Subproject commit 4204c1c2bbc668447f0914f79469d390e730637e diff --git a/src/main/java/forestry/farming/gui/GuiFarm.java b/src/main/java/forestry/farming/gui/GuiFarm.java index f79759599..4de688b67 100755 --- a/src/main/java/forestry/farming/gui/GuiFarm.java +++ b/src/main/java/forestry/farming/gui/GuiFarm.java @@ -148,7 +148,7 @@ public class GuiFarm extends GuiForestry { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String title = StringUtil.localize("Farm"); + String title = StringUtil.localize("gui.farm.title"); this.fontRendererObj.drawString(title, getCenteredOffset(title), 6, fontColor.get("gui.title")); } From 9299db28a7ff13ab662a439777f6319f19b81144 Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 9 Sep 2014 03:29:47 -0700 Subject: [PATCH 42/49] Fix Natura integration with multifarms closes #142 --- .../java/forestry/plugins/PluginNatura.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/forestry/plugins/PluginNatura.java b/src/main/java/forestry/plugins/PluginNatura.java index 61a45fcf0..5ccf0fba9 100755 --- a/src/main/java/forestry/plugins/PluginNatura.java +++ b/src/main/java/forestry/plugins/PluginNatura.java @@ -12,7 +12,9 @@ package forestry.plugins; import java.util.ArrayList; +import cpw.mods.fml.common.registry.GameData; import net.minecraft.block.Block; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import cpw.mods.fml.common.event.FMLInterModComms; @@ -33,6 +35,7 @@ public class PluginNatura extends NativePlugin { public static Block leavesNatura; public static Block saplingNatura; + public static Block saplingNaturaRare; @Override public boolean isAvailable() { @@ -47,9 +50,20 @@ public class PluginNatura extends NativePlugin { logWillow = GameRegistry.findBlock(NATURA, "willow"); leavesNatura = GameRegistry.findBlock(NATURA, "floraleaves"); saplingNatura = GameRegistry.findBlock(NATURA, "florasapling"); - + saplingNaturaRare = GameRegistry.findBlock(NATURA, "Rare Sapling"); + + ArrayList saplingItemKeys = new ArrayList(); + if(saplingNatura != null) - FMLInterModComms.sendMessage(Defaults.MOD, "add-farmable-sapling", String.format("farmArboreal@%s.-1", saplingNatura)); + saplingItemKeys.add("florasapling"); + if(saplingNaturaRare != null) + saplingItemKeys.add("Rare Sapling"); + + for (String key : saplingItemKeys) { + Item saplingItem = GameRegistry.findItem(NATURA, key); + String saplingName = GameData.getItemRegistry().getNameForObject(saplingItem); + FMLInterModComms.sendMessage(Defaults.MOD, "add-farmable-sapling", String.format("farmArboreal@%s.-1", saplingName)); + } } @Override protected void registerItems() {} From 9d8e572ac8296569c9a5f8ce72d26eee09f8de59 Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 9 Sep 2014 13:43:59 -0700 Subject: [PATCH 43/49] Re-Split Trade Station inventories to work better with automation #170 --- src/main/java/forestry/mail/TradeStation.java | 14 ++++++++------ .../forestry/mail/gadgets/MachineTrader.java | 14 +++++++------- .../forestry/mail/gui/ContainerTrader.java | 10 ++++++---- .../forestry/textures/gui/mailtrader.png | Bin 1795 -> 1800 bytes 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/src/main/java/forestry/mail/TradeStation.java b/src/main/java/forestry/mail/TradeStation.java index a097560e4..e5bcdeb36 100755 --- a/src/main/java/forestry/mail/TradeStation.java +++ b/src/main/java/forestry/mail/TradeStation.java @@ -48,9 +48,11 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve public static final short SLOT_LETTERS_COUNT = 6; public static final short SLOT_STAMPS_1 = 11; public static final short SLOT_STAMPS_COUNT = 4; - public static final short SLOT_BUFFER = 15; - public static final short SLOT_BUFFER_COUNT = 30; - public static final short SLOT_SIZE = SLOT_TRADEGOOD_COUNT + SLOT_EXCHANGE_COUNT + SLOT_LETTERS_COUNT + SLOT_STAMPS_COUNT + SLOT_BUFFER_COUNT; + public static final short SLOT_RECEIVE_BUFFER = 15; + public static final short SLOT_RECEIVE_BUFFER_COUNT = 15; + public static final short SLOT_SEND_BUFFER = 30; + public static final short SLOT_SEND_BUFFER_COUNT = 10; + public static final short SLOT_SIZE = SLOT_TRADEGOOD_COUNT + SLOT_EXCHANGE_COUNT + SLOT_LETTERS_COUNT + SLOT_STAMPS_COUNT + SLOT_RECEIVE_BUFFER_COUNT + SLOT_SEND_BUFFER_COUNT; // / MEMBER private GameProfile owner; @@ -236,7 +238,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve if (stack == null) continue; - inventory.tryAddStack(stack.copy(), SLOT_BUFFER, SLOT_BUFFER_COUNT, false); + inventory.tryAddStack(stack.copy(), SLOT_RECEIVE_BUFFER, SLOT_RECEIVE_BUFFER_COUNT, false); } } @@ -276,7 +278,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve // How many orders are fillable? int itemCount = 0; - for (ItemStack stack : inventory.getStacks(SLOT_BUFFER, SLOT_BUFFER_COUNT)) { + for (ItemStack stack : inventory.getStacks(SLOT_SEND_BUFFER, SLOT_SEND_BUFFER_COUNT)) { if (stack != null && stack.isItemEqual(tradegood) && ItemStack.areItemStackTagsEqual(stack, tradegood)) itemCount += stack.stackSize; } @@ -303,7 +305,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve for (int j = 0; j < filled; j++) { int toRemove = inventory.getStackInSlot(SLOT_TRADEGOOD).stackSize; - for (int i = SLOT_BUFFER; i < SLOT_BUFFER + SLOT_BUFFER_COUNT; i++) { + for (int i = SLOT_SEND_BUFFER; i < SLOT_SEND_BUFFER + SLOT_SEND_BUFFER_COUNT; i++) { ItemStack buffer = inventory.getStackInSlot(i); if (buffer == null) continue; diff --git a/src/main/java/forestry/mail/gadgets/MachineTrader.java b/src/main/java/forestry/mail/gadgets/MachineTrader.java index c0bb66cd8..7ab544f70 100755 --- a/src/main/java/forestry/mail/gadgets/MachineTrader.java +++ b/src/main/java/forestry/mail/gadgets/MachineTrader.java @@ -131,7 +131,7 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided return; } - boolean hasSupplies = hasItemCount(TradeStation.SLOT_BUFFER, TradeStation.SLOT_BUFFER_COUNT, tradeGood, tradeGood.stackSize); + boolean hasSupplies = hasItemCount(TradeStation.SLOT_SEND_BUFFER, TradeStation.SLOT_SEND_BUFFER_COUNT, tradeGood, tradeGood.stackSize); if(!hasSupplies) { setErrorState(EnumErrorCode.NOSUPPLIES); return; @@ -199,11 +199,11 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided ItemStack tradeGood = inventory.getStackInSlot(TradeStation.SLOT_TRADEGOOD); if (tradeGood == null) return true; - return percentOccupied(TradeStation.SLOT_BUFFER, TradeStation.SLOT_BUFFER_COUNT, tradeGood) > percentage; + return percentOccupied(TradeStation.SLOT_SEND_BUFFER, TradeStation.SLOT_SEND_BUFFER_COUNT, tradeGood) > percentage; } public boolean hasOutputBufMin(float percentage) { - return percentOccupied(TradeStation.SLOT_BUFFER, TradeStation.SLOT_BUFFER_COUNT, null) > percentage; + return percentOccupied(TradeStation.SLOT_RECEIVE_BUFFER, TradeStation.SLOT_RECEIVE_BUFFER_COUNT, null) > percentage; } public boolean hasPostageMin(int postage) { @@ -298,7 +298,7 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided if (!tradegood.isItemEqual(stack)) return 0; - return StackUtils.addToInventory(stack, inventory, doAdd, TradeStation.SLOT_BUFFER, TradeStation.SLOT_BUFFER_COUNT); + return StackUtils.addToInventory(stack, inventory, doAdd, TradeStation.SLOT_SEND_BUFFER, TradeStation.SLOT_SEND_BUFFER_COUNT); } @Override @@ -309,7 +309,7 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided ItemStack product = null; IInventory inventory = getOrCreateTradeInventory(); - for (int i = TradeStation.SLOT_BUFFER; i < TradeStation.SLOT_BUFFER + TradeStation.SLOT_BUFFER_COUNT; i++) { + for (int i = TradeStation.SLOT_RECEIVE_BUFFER; i < TradeStation.SLOT_RECEIVE_BUFFER + TradeStation.SLOT_RECEIVE_BUFFER_COUNT; i++) { ItemStack stackSlot = inventory.getStackInSlot(i); if (stackSlot == null) continue; @@ -345,7 +345,7 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided if(!super.canTakeStackFromSide(slotIndex, itemstack, side)) return false; - if(slotIndex >= TradeStation.SLOT_BUFFER && slotIndex < TradeStation.SLOT_BUFFER + TradeStation.SLOT_BUFFER_COUNT) + if(slotIndex >= TradeStation.SLOT_RECEIVE_BUFFER && slotIndex < TradeStation.SLOT_RECEIVE_BUFFER + TradeStation.SLOT_RECEIVE_BUFFER_COUNT) return true; return false; @@ -365,7 +365,7 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided return itemstack.getItem() instanceof IStamps; } - if (slotIndex >= TradeStation.SLOT_BUFFER && slotIndex < TradeStation.SLOT_BUFFER_COUNT) { + if (slotIndex >= TradeStation.SLOT_SEND_BUFFER && slotIndex < TradeStation.SLOT_SEND_BUFFER_COUNT) { IInventory inventory = getOrCreateTradeInventory(); ItemStack tradegood = inventory.getStackInSlot(TradeStation.SLOT_TRADEGOOD); if(tradegood == null) diff --git a/src/main/java/forestry/mail/gui/ContainerTrader.java b/src/main/java/forestry/mail/gui/ContainerTrader.java index 158cab840..415d3f2f1 100755 --- a/src/main/java/forestry/mail/gui/ContainerTrader.java +++ b/src/main/java/forestry/mail/gui/ContainerTrader.java @@ -51,13 +51,15 @@ public class ContainerTrader extends ContainerForestry { for (int j = 0; j < 2; j++) addSlot(new SlotCustom(inventory, TradeStation.SLOT_LETTERS_1 + j + i * 2, 15 + j * 18, 73 + i * 18, new Object[] { Items.paper })); - // Buffer - final int bufRows = 6; + // Buffers final int bufCols = 5; - for (int i = 0; i < bufRows; i++) + for (int i = 0; i < 3; i++) for (int j = 0; j < bufCols; j++) - addSlot(new Slot(inventory, TradeStation.SLOT_BUFFER + j + i * bufCols, 123 + j * 18, 19 + i * 18)); + addSlot(new Slot(inventory, TradeStation.SLOT_RECEIVE_BUFFER + j + i * bufCols, 123 + j * 18, 19 + i * 18)); + for (int i = 0; i < 2; i++) + for (int j = 0; j < bufCols; j++) + addSlot(new Slot(inventory, TradeStation.SLOT_SEND_BUFFER + j + i * bufCols, 123 + j * 18, (19 + (18 * 4)) + i * 18)); // Player inventory for (int i = 0; i < 3; i++) diff --git a/src/main/resources/assets/forestry/textures/gui/mailtrader.png b/src/main/resources/assets/forestry/textures/gui/mailtrader.png index 24263d3f61359691cd78941b5b137ab1244ead9c..9cc2bcb9bb5b85900b65d1f0e588ee8d9353ea55 100755 GIT binary patch delta 1036 zcmZqX>)_kq&J=BKVPRr!YG7<(>S}1{YT{_&YT;;LZtP-c?rdRfVyvW4kz3&FYvq!k zT$-DjSK{ens{|C$OUX>JGKJ_h#HDxgA|^wK`6jNo)F>$wmjtDzS*74K-^2}<-pP8* zPApF+Oyr$h!t7pe;pyTSQgQ3eorgh>3?x_svb1;K{$Bq;^hV@V2GiDzot8fzpILs{ zlh1ed9kKGyHmchzSH6ArQgx>;*PBhp{~P(mGv0W*Epf&)#xe#Jupqx-VWjqNvw7RE zyNAwWeelOWPA-%YMG3?0v&{7jU-&*m?K%5l#i`A67^8h!d>S9C7yl{XvtJ)JiSb@v zxy_Rw|2FZ^xnJWWhve>$`M-E>?B9Am{lIgteE%&}>d7$pS*^R3rFDeyFB0k9Re-?bOW|A%IJ+9-vUw`YL>Z*5O zX>eI#bi329Ma%#69v2Pn1Xm>y_JG|2UbC65dOzG_yue6s6|2OhZHKQiI7cXbS?VY1 z-`y;=v+&d-dV$HcIW zH{e+O_4tWiEEY!+yr-r#1hZA_7UD7Z_xgW*#bO|1-}kybVV-Of-F5xm%AHIRhX3vu zFL+y4vHN;MK9|e3YH^FN|C0BvX}QnVeX!5GZT=1ct!(ph9y4bKEB1)#9IT96PEV}K zK2zOf&lWJ5LzO8+)v1x8v@<})Ay-L+Enq%JD&rbYmq`r!a{ufzdh8uMdoOp0x>M!$ zgQx0UH1ZWgW^&x*VPv?V;a;`vzjDaetbin?kg2U|evK*(p`8H&2X?t=uqUJ{O<~$# zCAjO-^o6rsUKGW*J!jgXF1Yi`^oK>KeOiPV-g&hsEjwV_8F0+?L!XPrGqW9Lf?bgu zYkgaC+89ds0)WPT{~x*Q_w*%*RFG3Iz2L6$8Mc0>*$gJPH=Ex0jg~|h8045Pyc0}o zc3&u@7>v*eWhn?w;+V;VA>27({aK(v4q9)_IM5|0aCIMHVBnDbuXMmh^t$lXHQP80 z{B8UHGZ^@v%>BpYaGiJZMK+1a57;Y-numWMpXQYGPsRXkcmSX5{8-VyL80kz3&FYvq!k zT$-DjSK{ens{|C$OUX>JGKJ_h!lifeA|^wK`9^NI)F>$wmjtDzS*74M-vF21$$HFA zEXfZer%o_r^TOxe3;)`_UpSlIFxl&yNQJhH+13C50>W67>KRm= zrrz``Q3|PydZy|W$)GK?FsecEt=kHz1diRJ`(7{Ta!+;a43KkpT4s^Y6{6-8+5Mo) zB}04q!TA02Q@H+Y|J`8UE3|Nn^+B`g2cNiT@GUSCJd{#+ zZ-_Za*2mVlY6&LDH{V^Q!YpHa;PupmhWd|t&wun%wG#XPB5O~`%M{};_pVnYs{q|` zEZDRJoTaaJ&vhcS6j2qR%8%bxKDUtndPMQ$M&f2=ycH# zT%aY$#j?V?d zG^CzE>ZwPxcgwp&%?*GUpU= z+2}plxrw9ff8T|E6Ql%ijcH4Di_Ogkff>RLY1P}rXdjfKp2i=`~}hSh>N2hoRxZ$NMZ1%aUTxW|=ciTlxIsd&X&+J9Wz$ pO72d+$R;!S0UMVTM}9r41jF)0?2UGRAHD^dvd$@?2>?@oc Date: Tue, 9 Sep 2014 14:43:15 -0700 Subject: [PATCH 44/49] Added Trade Station warning for full inventory #170 --- .../forestry/core/utils/InventoryAdapter.java | 17 ++++++++++++----- src/main/java/forestry/mail/TradeStation.java | 9 ++++++++- .../forestry/mail/gadgets/MachineTrader.java | 7 +++++++ 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/main/java/forestry/core/utils/InventoryAdapter.java b/src/main/java/forestry/core/utils/InventoryAdapter.java index 52701e50e..70737cc71 100755 --- a/src/main/java/forestry/core/utils/InventoryAdapter.java +++ b/src/main/java/forestry/core/utils/InventoryAdapter.java @@ -76,17 +76,20 @@ public class InventoryAdapter implements IInventory, INBTTagable { } public boolean tryAddStacksCopy(ItemStack[] stacks, boolean all) { + return tryAddStacksCopy(stacks, 0, this.getSizeInventory(), all); + } + + public boolean tryAddStacksCopy(ItemStack[] stacks, int startSlot, int slots, boolean all) { - boolean addedAll = true; for (ItemStack stack : stacks) { if (stack == null) continue; - if (!tryAddStack(stack.copy(), all)) - addedAll = false; + if (!tryAddStack(stack.copy(), startSlot, slots, all)) + return false; } - return addedAll; + return true; } public boolean tryAddStacks(ItemStack[] stacks, boolean all) { @@ -121,7 +124,11 @@ public class InventoryAdapter implements IInventory, INBTTagable { } public boolean tryAddStack(ItemStack stack, int startSlot, int slots, boolean all, boolean doAdd) { - return addStack(stack, startSlot, slots, all, doAdd) > 0; + int added = addStack(stack, startSlot, slots, all, doAdd); + if (all) + return added == stack.stackSize; + else + return added > 0; } public int addStack(ItemStack stack, boolean all, boolean doAdd) { diff --git a/src/main/java/forestry/mail/TradeStation.java b/src/main/java/forestry/mail/TradeStation.java index e5bcdeb36..1a06a78c5 100755 --- a/src/main/java/forestry/mail/TradeStation.java +++ b/src/main/java/forestry/mail/TradeStation.java @@ -286,13 +286,20 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve return (int) Math.floor(itemCount / tradegood.stackSize); } + public boolean canReceivePayment() { + InventoryAdapter test = inventory.copy(); + ItemStack [] payment = inventory.getStacks(SLOT_EXCHANGE_1, SLOT_EXCHANGE_COUNT); + + return test.tryAddStacksCopy(payment, SLOT_RECEIVE_BUFFER, SLOT_RECEIVE_BUFFER_COUNT, true); + } + private int countStorablePayment(int max, ItemStack[] exchange) { InventoryAdapter test = inventory.copy(); int count = 0; for (int i = 0; i < max; i++) { - if (test.tryAddStacksCopy(exchange, true)) + if (test.tryAddStacksCopy(exchange, SLOT_RECEIVE_BUFFER, SLOT_RECEIVE_BUFFER_COUNT, true)) count++; else break; diff --git a/src/main/java/forestry/mail/gadgets/MachineTrader.java b/src/main/java/forestry/mail/gadgets/MachineTrader.java index 7ab544f70..f9ee30bb1 100755 --- a/src/main/java/forestry/mail/gadgets/MachineTrader.java +++ b/src/main/java/forestry/mail/gadgets/MachineTrader.java @@ -137,6 +137,13 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided return; } + if (inventory instanceof TradeStation) { + if (!((TradeStation)inventory).canReceivePayment()) { + setErrorState(EnumErrorCode.NOSPACE); + return; + } + } + setErrorState(EnumErrorCode.OK); } From 36da6efa91fbd75a82e49ce225be6004513a8fc2 Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 10 Sep 2014 03:43:16 -0700 Subject: [PATCH 45/49] Fix-up of the Mail system Fixed several crashes and bugs. Tested by sending mail and trading with multiple real accounts and a server. closes #176 --- api | 2 +- .../java/forestry/core/network/PacketIds.java | 2 +- src/main/java/forestry/mail/CommandMail.java | 1 - .../java/forestry/mail/EnumAddressee.java | 30 ---- src/main/java/forestry/mail/Letter.java | 28 +-- src/main/java/forestry/mail/MailAddress.java | 163 ++++++++++++++++++ src/main/java/forestry/mail/POBox.java | 6 +- .../java/forestry/mail/PacketHandlerMail.java | 13 +- src/main/java/forestry/mail/PostOffice.java | 15 +- src/main/java/forestry/mail/PostRegistry.java | 34 ++-- .../java/forestry/mail/PostalCarrier.java | 8 +- src/main/java/forestry/mail/TradeStation.java | 10 +- .../forestry/mail/gadgets/MachineMailbox.java | 23 ++- .../forestry/mail/gadgets/MachineTrader.java | 13 +- .../forestry/mail/gui/ContainerCatalogue.java | 15 +- .../forestry/mail/gui/ContainerLetter.java | 77 ++++++--- .../forestry/mail/gui/ContainerMailbox.java | 7 +- .../forestry/mail/gui/ContainerTradeName.java | 9 +- .../forestry/mail/gui/ContainerTrader.java | 5 +- .../java/forestry/mail/gui/GuiCatalogue.java | 4 +- .../java/forestry/mail/gui/GuiLetter.java | 39 ++--- .../java/forestry/mail/gui/GuiTrader.java | 1 - .../mail/network/PacketLetterInfo.java | 126 ++++++++++++++ .../mail/network/PacketTradeInfo.java | 82 --------- .../forestry/mail/proxy/ClientProxyMail.java | 9 +- .../java/forestry/mail/proxy/ProxyMail.java | 4 +- .../java/forestry/plugins/PluginMail.java | 2 +- 27 files changed, 470 insertions(+), 258 deletions(-) delete mode 100755 src/main/java/forestry/mail/EnumAddressee.java create mode 100644 src/main/java/forestry/mail/MailAddress.java create mode 100644 src/main/java/forestry/mail/network/PacketLetterInfo.java delete mode 100755 src/main/java/forestry/mail/network/PacketTradeInfo.java diff --git a/api b/api index 64f872275..210e7d410 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit 64f872275aa429cd0af5c545843bb6f21ea14025 +Subproject commit 210e7d410222fe74d20e3c3b994fda0419615d3a diff --git a/src/main/java/forestry/core/network/PacketIds.java b/src/main/java/forestry/core/network/PacketIds.java index 5139f513a..acc395720 100755 --- a/src/main/java/forestry/core/network/PacketIds.java +++ b/src/main/java/forestry/core/network/PacketIds.java @@ -42,7 +42,7 @@ public class PacketIds { public static final int LETTER_RECIPIENT = 80; public static final int LETTER_TEXT = 81; public static final int TRADING_ADDRESS_SET = 82; - public static final int TRADING_INFO = 83; + public static final int LETTER_INFO = 83; public static final int POBOX_INFO = 85; public static final int POBOX_INFO_REQUEST = 86; diff --git a/src/main/java/forestry/mail/CommandMail.java b/src/main/java/forestry/mail/CommandMail.java index 0fb18a23c..d0cd4ed6b 100755 --- a/src/main/java/forestry/mail/CommandMail.java +++ b/src/main/java/forestry/mail/CommandMail.java @@ -12,7 +12,6 @@ package forestry.mail; import java.util.List; -import forestry.api.mail.MailAddress; import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; import net.minecraft.command.WrongUsageException; diff --git a/src/main/java/forestry/mail/EnumAddressee.java b/src/main/java/forestry/mail/EnumAddressee.java deleted file mode 100755 index 30aa2b2d1..000000000 --- a/src/main/java/forestry/mail/EnumAddressee.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.mail; - -import java.util.Locale; - -public enum EnumAddressee { - PLAYER, TRADER; - - public static EnumAddressee fromString(String ident) { - for(EnumAddressee addr : values()) { - if(addr.toString().equals(ident)) - return addr; - } - - return null; - } - - public static String asString(EnumAddressee addressee) { - return addressee.toString().toLowerCase(Locale.ENGLISH); - } -} diff --git a/src/main/java/forestry/mail/Letter.java b/src/main/java/forestry/mail/Letter.java index 515cc3be9..62641f252 100755 --- a/src/main/java/forestry/mail/Letter.java +++ b/src/main/java/forestry/mail/Letter.java @@ -19,7 +19,7 @@ import net.minecraft.nbt.NBTTagCompound; import forestry.api.core.INBTTagable; import forestry.api.mail.ILetter; import forestry.api.mail.IStamps; -import forestry.api.mail.MailAddress; +import forestry.api.mail.IMailAddress; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.StringUtil; import org.apache.commons.lang3.StringUtils; @@ -32,15 +32,15 @@ public class Letter implements ILetter, INBTTagable { private boolean isProcessed = false; - private MailAddress sender; - private MailAddress[] recipient; + private IMailAddress sender; + private IMailAddress[] recipient; private String text; private InventoryAdapter inventory = new InventoryAdapter(22, "INV"); - public Letter(MailAddress sender, MailAddress recipient) { + public Letter(IMailAddress sender, IMailAddress recipient) { this.sender = sender; - this.recipient = new MailAddress[] { recipient }; + this.recipient = new IMailAddress[] { recipient }; } public Letter(NBTTagCompound nbttagcompound) { @@ -191,7 +191,7 @@ public class Letter implements ILetter, INBTTagable { if (getRecipients().length <= 0) return false; - MailAddress recipient = getRecipients()[0]; + IMailAddress recipient = getRecipients()[0]; if (recipient == null) return false; @@ -202,36 +202,36 @@ public class Letter implements ILetter, INBTTagable { } @Override - public void setSender(MailAddress address) { + public void setSender(IMailAddress address) { this.sender = address; } @Override - public MailAddress getSender() { + public IMailAddress getSender() { return sender; } - public void setRecipients(MailAddress[] recipients) { + public void setRecipients(IMailAddress[] recipients) { this.recipient = recipients; } @Override - public void setRecipient(MailAddress address) { + public void setRecipient(IMailAddress address) { if (address == null) - this.recipient = new MailAddress[] {}; + this.recipient = new IMailAddress[] {}; else - this.recipient = new MailAddress[] { address }; + this.recipient = new IMailAddress[] { address }; } @Override - public MailAddress[] getRecipients() { + public IMailAddress[] getRecipients() { return recipient; } @Override public String getRecipientString() { String recipientString = ""; - for (MailAddress address : recipient) { + for (IMailAddress address : recipient) { if (recipientString.length() > 0) recipientString += ", "; recipientString += address.getName(); diff --git a/src/main/java/forestry/mail/MailAddress.java b/src/main/java/forestry/mail/MailAddress.java new file mode 100644 index 000000000..def51aada --- /dev/null +++ b/src/main/java/forestry/mail/MailAddress.java @@ -0,0 +1,163 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.mail; + +import java.util.Locale; +import java.util.UUID; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTUtil; +import net.minecraft.world.World; +import net.minecraft.entity.player.EntityPlayer; + +import com.mojang.authlib.GameProfile; + +import forestry.api.core.INBTTagable; +import forestry.core.proxy.Proxies; +import forestry.core.network.EntityNetData; +import forestry.api.mail.EnumAddressee; +import forestry.api.mail.IMailAddress; + +public class MailAddress implements INBTTagable, IMailAddress { + @EntityNetData + private EnumAddressee type; + @EntityNetData + private GameProfile gameProfile; // gameProfile is a fake GameProfile for traders, and real for players + + private static final MailAddress invalidAddress = new MailAddress(); + + public MailAddress() { + this.type = EnumAddressee.INVALID; + this.gameProfile = new GameProfile(new UUID(0,0), ""); + } + + public MailAddress(GameProfile gameProfile) { + if (gameProfile == null) + throw new IllegalArgumentException("gameProfile must not be null"); + + this.type = EnumAddressee.PLAYER; + this.gameProfile = gameProfile; + } + + public MailAddress(String name) { + if (name == null) + throw new IllegalArgumentException("name must not be null"); + + this.type = EnumAddressee.TRADER; + this.gameProfile = new GameProfile(new UUID(0,0), name); + } + + public MailAddress(IMailAddress address) { + this.type = address.getType(); + if (type == EnumAddressee.TRADER) { + String name = address.getName(); + this.gameProfile = new GameProfile(new UUID(0, 0), name); + } else if (type == EnumAddressee.PLAYER) { + this.gameProfile = address.getPlayerProfile(); + } + } + + public EnumAddressee getType() { + return type; + } + + public String getName() { + return gameProfile.getName(); + } + + @Override + public String toString() { + String name = getName().toLowerCase(Locale.ENGLISH); + if (isPlayer()) { + return type + "-" + name + "-" + gameProfile.getId(); + } else { + return type + "-" + name; + } + } + + @Override + public boolean equals(Object o) { + if (!(o instanceof MailAddress)) + return false; + + MailAddress address = (MailAddress)o; + return address.gameProfile.equals(gameProfile); + } + + @Override + public int hashCode() { + return gameProfile.hashCode(); + } + + public boolean isPlayer() { + return type == EnumAddressee.PLAYER; + } + + public boolean isValid() { + return type != EnumAddressee.INVALID; + } + + @Override + public void readFromNBT(NBTTagCompound nbttagcompound) { + type = EnumAddressee.INVALID; + if(nbttagcompound.hasKey("TP")) { + String typeName = nbttagcompound.getString("TP"); + type = EnumAddressee.fromString(typeName); + } + + if (!isValid()) { + gameProfile = invalidAddress.gameProfile; + } else if(nbttagcompound.hasKey("profile")) { + NBTTagCompound profileTag = nbttagcompound.getCompoundTag("profile"); + gameProfile = NBTUtil.func_152459_a(profileTag); + } + } + + @Override + public void writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound.setString("TP", type.toString()); + + if (gameProfile != null) { + NBTTagCompound profileNbt = new NBTTagCompound(); + NBTUtil.func_152460_a(profileNbt, gameProfile); + nbttagcompound.setTag("profile", profileNbt); + } + } + + public static MailAddress loadFromNBT(NBTTagCompound nbttagcompound) { + MailAddress address = new MailAddress(); + address.readFromNBT(nbttagcompound); + return address; + } + + public EntityPlayer getPlayer(World world) { + if (!this.isPlayer()) + return null; + + return world.getPlayerEntityByName(this.gameProfile.getName()); + } + + public boolean isClientPlayer(World world) { + if (!this.isPlayer()) + return false; + + EntityPlayer addressPlayer = this.getPlayer(world); + EntityPlayer clientPlayer = Proxies.common.getPlayer(); + + return addressPlayer != null && clientPlayer != null && clientPlayer.equals(addressPlayer); + } + + public GameProfile getPlayerProfile() { + if (!this.isPlayer()) + return null; + return gameProfile; + } +} diff --git a/src/main/java/forestry/mail/POBox.java b/src/main/java/forestry/mail/POBox.java index 261ce5e3e..5fbc694f2 100755 --- a/src/main/java/forestry/mail/POBox.java +++ b/src/main/java/forestry/mail/POBox.java @@ -10,7 +10,6 @@ ******************************************************************************/ package forestry.mail; -import forestry.api.mail.MailAddress; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -19,6 +18,7 @@ import net.minecraft.world.WorldSavedData; import forestry.api.mail.ILetter; import forestry.api.mail.PostManager; +import forestry.api.mail.IMailAddress; import forestry.core.utils.InventoryAdapter; public class POBox extends WorldSavedData implements IInventory { @@ -26,10 +26,10 @@ public class POBox extends WorldSavedData implements IInventory { public static final String SAVE_NAME = "POBox_"; public static final short SLOT_SIZE = 84; - private MailAddress address; + private IMailAddress address; private final InventoryAdapter letters = new InventoryAdapter(SLOT_SIZE, "Letters"); - public POBox(MailAddress address) { + public POBox(IMailAddress address) { super(SAVE_NAME + address); if (!address.isPlayer()) { throw new IllegalArgumentException("POBox address must be a player"); diff --git a/src/main/java/forestry/mail/PacketHandlerMail.java b/src/main/java/forestry/mail/PacketHandlerMail.java index 9678186cd..d971f9446 100755 --- a/src/main/java/forestry/mail/PacketHandlerMail.java +++ b/src/main/java/forestry/mail/PacketHandlerMail.java @@ -12,7 +12,6 @@ package forestry.mail; import java.io.DataInputStream; -import forestry.api.mail.MailAddress; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; @@ -24,7 +23,7 @@ import forestry.mail.gui.ContainerCatalogue; import forestry.mail.gui.ContainerLetter; import forestry.mail.gui.ContainerTradeName; import forestry.mail.network.PacketPOBoxInfo; -import forestry.mail.network.PacketTradeInfo; +import forestry.mail.network.PacketLetterInfo; import forestry.plugins.PluginMail; public class PacketHandlerMail implements IPacketHandler { @@ -36,10 +35,10 @@ public class PacketHandlerMail implements IPacketHandler { PacketUpdate packet; switch (packetID) { - case PacketIds.TRADING_INFO: - PacketTradeInfo packetT = new PacketTradeInfo(); + case PacketIds.LETTER_INFO: + PacketLetterInfo packetT = new PacketLetterInfo(); packetT.readData(data); - onTradeInfo(packetT); + onLetterInfo(packetT); break; case PacketIds.POBOX_INFO: PacketPOBoxInfo packetP = new PacketPOBoxInfo(); @@ -70,11 +69,11 @@ public class PacketHandlerMail implements IPacketHandler { } } - private void onTradeInfo(PacketTradeInfo packet) { + private void onLetterInfo(PacketLetterInfo packet) { Container container = Proxies.common.getClientInstance().thePlayer.openContainer; if (container instanceof ContainerLetter) { - ((ContainerLetter) container).handleTradeInfoUpdate(packet); + ((ContainerLetter) container).handleLetterInfoUpdate(packet); } else if(container instanceof ContainerCatalogue) { ((ContainerCatalogue) container).handleTradeInfoUpdate(packet); } diff --git a/src/main/java/forestry/mail/PostOffice.java b/src/main/java/forestry/mail/PostOffice.java index f13220ee7..422cfaed3 100755 --- a/src/main/java/forestry/mail/PostOffice.java +++ b/src/main/java/forestry/mail/PostOffice.java @@ -12,15 +12,12 @@ package forestry.mail; import java.io.File; import java.util.LinkedHashMap; -import java.util.UUID; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraft.world.WorldSavedData; -import com.mojang.authlib.GameProfile; - import forestry.api.mail.EnumPostage; import forestry.api.mail.ILetter; import forestry.api.mail.IPostOffice; @@ -28,8 +25,8 @@ import forestry.api.mail.IPostalCarrier; import forestry.api.mail.IPostalState; import forestry.api.mail.IStamps; import forestry.api.mail.ITradeStation; -import forestry.api.mail.MailAddress; import forestry.api.mail.PostManager; +import forestry.api.mail.IMailAddress; import forestry.core.config.ForestryItem; public class PostOffice extends WorldSavedData implements IPostOffice { @@ -67,15 +64,15 @@ public class PostOffice extends WorldSavedData implements IPostOffice { } /* TRADE STATION MANAGMENT */ - private LinkedHashMap activeTradeStations; + private LinkedHashMap activeTradeStations; @Override - public LinkedHashMap getActiveTradeStations(World world) { + public LinkedHashMap getActiveTradeStations(World world) { return this.activeTradeStations; } private void refreshActiveTradeStations(World world) { - activeTradeStations = new LinkedHashMap(); + activeTradeStations = new LinkedHashMap(); if (world == null || world.getSaveHandler() == null) return; File worldSave = world.getSaveHandler().getMapFileFromName("dummy"); @@ -161,8 +158,8 @@ public class PostOffice extends WorldSavedData implements IPostOffice { return EnumDeliveryState.NOT_MAILABLE; IPostalState state = EnumDeliveryState.NOT_MAILABLE; - for (MailAddress address : letter.getRecipients()) { - IPostalCarrier carrier = PostManager.postRegistry.getCarrier(address.getType()); + for (IMailAddress address : letter.getRecipients()) { + IPostalCarrier carrier = PostManager.postRegistry.getCarrier(address.getType().toString()); if (carrier == null) continue; state = carrier.deliverLetter(world, this, address, itemstack, doLodge); diff --git a/src/main/java/forestry/mail/PostRegistry.java b/src/main/java/forestry/mail/PostRegistry.java index e8ee1b03e..6e9a730bf 100755 --- a/src/main/java/forestry/mail/PostRegistry.java +++ b/src/main/java/forestry/mail/PostRegistry.java @@ -25,8 +25,8 @@ import forestry.api.mail.IPostOffice; import forestry.api.mail.IPostRegistry; import forestry.api.mail.IPostalCarrier; import forestry.api.mail.ITradeStation; -import forestry.api.mail.MailAddress; import forestry.api.mail.PostManager; +import forestry.api.mail.IMailAddress; import forestry.core.config.ForestryItem; import forestry.mail.items.ItemLetter; import forestry.plugins.PluginMail; @@ -34,8 +34,8 @@ import forestry.plugins.PluginMail; public class PostRegistry implements IPostRegistry { public static PostOffice cachedPostOffice; - public static HashMap cachedPOBoxes = new HashMap(); - public static HashMap cachedTradeStations = new HashMap(); + public static HashMap cachedPOBoxes = new HashMap(); + public static HashMap cachedTradeStations = new HashMap(); /** * @param world the Minecraft world the PO box will be in @@ -43,11 +43,11 @@ public class PostRegistry implements IPostRegistry { * @return true if the passed address is valid for PO Boxes. */ @Override - public boolean isValidPOBox(World world, MailAddress address) { + public boolean isValidPOBox(World world, IMailAddress address) { return address.isPlayer() && address.getName().matches("^[a-zA-Z0-9]+$"); } - public static POBox getPOBox(World world, MailAddress address) { + public static POBox getPOBox(World world, IMailAddress address) { if (cachedPOBoxes.containsKey(address)) return cachedPOBoxes.get(address); @@ -58,7 +58,7 @@ public class PostRegistry implements IPostRegistry { return pobox; } - public static POBox getOrCreatePOBox(World world, MailAddress address) { + public static POBox getOrCreatePOBox(World world, IMailAddress address) { POBox pobox = getPOBox(world, address); if (pobox == null) { @@ -78,7 +78,7 @@ public class PostRegistry implements IPostRegistry { * @return true if the passed address can be an address for a trade station */ @Override - public boolean isValidTradeAddress(World world, MailAddress address) { + public boolean isValidTradeAddress(World world, IMailAddress address) { return !address.isPlayer() && address.getName().matches("^[a-zA-Z0-9]+$"); } @@ -88,12 +88,12 @@ public class PostRegistry implements IPostRegistry { * @return true if the trade address has not yet been used before. */ @Override - public boolean isAvailableTradeAddress(World world, MailAddress address) { + public boolean isAvailableTradeAddress(World world, IMailAddress address) { return getTradeStation(world, address) == null; } @Override - public TradeStation getTradeStation(World world, MailAddress address) { + public TradeStation getTradeStation(World world, IMailAddress address) { if (cachedTradeStations.containsKey(address)) return (TradeStation)cachedTradeStations.get(address); @@ -110,7 +110,7 @@ public class PostRegistry implements IPostRegistry { } @Override - public TradeStation getOrCreateTradeStation(World world, GameProfile owner, MailAddress address) { + public TradeStation getOrCreateTradeStation(World world, GameProfile owner, IMailAddress address) { TradeStation trade = getTradeStation(world, address); if (trade == null) { @@ -125,7 +125,7 @@ public class PostRegistry implements IPostRegistry { } @Override - public void deleteTradeStation(World world, MailAddress address) { + public void deleteTradeStation(World world, IMailAddress address) { TradeStation trade = getTradeStation(world, address); if (trade == null) return; @@ -157,6 +157,16 @@ public class PostRegistry implements IPostRegistry { return office; } + @Override + public IMailAddress getMailAddress(GameProfile gameProfile) { + return new MailAddress(gameProfile); + } + + @Override + public IMailAddress getMailAddress(String traderName) { + return new MailAddress(traderName); + } + /* CARRIER */ private final HashMap carriers = new HashMap(); @@ -177,7 +187,7 @@ public class PostRegistry implements IPostRegistry { /* LETTERS */ @Override - public ILetter createLetter(MailAddress sender, MailAddress recipient) { + public ILetter createLetter(IMailAddress sender, IMailAddress recipient) { return new Letter(sender, recipient); } diff --git a/src/main/java/forestry/mail/PostalCarrier.java b/src/main/java/forestry/mail/PostalCarrier.java index c53b43740..fc68c13b9 100755 --- a/src/main/java/forestry/mail/PostalCarrier.java +++ b/src/main/java/forestry/mail/PostalCarrier.java @@ -20,8 +20,6 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import com.mojang.authlib.GameProfile; - import forestry.core.render.TextureManager; import forestry.core.utils.StringUtil; import forestry.plugins.PluginMail; @@ -55,14 +53,14 @@ public class PostalCarrier implements IPostalCarrier { } @Override - public IPostalState deliverLetter(World world, IPostOffice office, MailAddress recipient, ItemStack letterstack, boolean doDeliver) { + public IPostalState deliverLetter(World world, IPostOffice office, IMailAddress recipient, ItemStack letterstack, boolean doDeliver) { if(type == EnumAddressee.TRADER) return handleTradeLetter(world, office, recipient, letterstack, doDeliver); else return storeInPOBox(world, office, recipient, letterstack, doDeliver); } - private IPostalState handleTradeLetter(World world, IPostOffice office, MailAddress recipient, ItemStack letterstack, boolean doLodge) { + private IPostalState handleTradeLetter(World world, IPostOffice office, IMailAddress recipient, ItemStack letterstack, boolean doLodge) { IPostalState state = EnumDeliveryState.NOT_MAILABLE; ITradeStation trade = PostManager.postRegistry.getTradeStation(world, recipient); @@ -74,7 +72,7 @@ public class PostalCarrier implements IPostalCarrier { return state; } - private EnumDeliveryState storeInPOBox(World world, IPostOffice office, MailAddress recipient, ItemStack letterstack, boolean doLodge) { + private EnumDeliveryState storeInPOBox(World world, IPostOffice office, IMailAddress recipient, ItemStack letterstack, boolean doLodge) { POBox pobox = PostRegistry.getPOBox(world, recipient); if (pobox == null) diff --git a/src/main/java/forestry/mail/TradeStation.java b/src/main/java/forestry/mail/TradeStation.java index 1a06a78c5..677ada2ec 100755 --- a/src/main/java/forestry/mail/TradeStation.java +++ b/src/main/java/forestry/mail/TradeStation.java @@ -28,9 +28,9 @@ import forestry.api.mail.ILetter; import forestry.api.mail.IPostalState; import forestry.api.mail.IStamps; import forestry.api.mail.ITradeStation; -import forestry.api.mail.MailAddress; import forestry.api.mail.PostManager; import forestry.api.mail.TradeStationInfo; +import forestry.api.mail.IMailAddress; import forestry.core.config.ForestryItem; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.StackUtils; @@ -56,13 +56,13 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve // / MEMBER private GameProfile owner; - private MailAddress address; + private IMailAddress address; private boolean isVirtual = false; private boolean isInvalid = false; private final InventoryAdapter inventory = new InventoryAdapter(SLOT_SIZE, "INV"); // / CONSTRUCTORS - public TradeStation(GameProfile owner, MailAddress address) { + public TradeStation(GameProfile owner, IMailAddress address) { super(SAVE_NAME + address); if (address.isPlayer()) { throw new IllegalArgumentException("TradeStation address must not be a player"); @@ -76,7 +76,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve } @Override - public MailAddress getAddress() { + public IMailAddress getAddress() { return this.address; } @@ -163,7 +163,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve /* ILETTERHANDLER */ @Override - public IPostalState handleLetter(World world, MailAddress recipient, ItemStack letterstack, boolean doLodge) { + public IPostalState handleLetter(World world, IMailAddress recipient, ItemStack letterstack, boolean doLodge) { boolean sendOwnerNotice = doLodge && owner != null; diff --git a/src/main/java/forestry/mail/gadgets/MachineMailbox.java b/src/main/java/forestry/mail/gadgets/MachineMailbox.java index ff44c9159..d95031745 100755 --- a/src/main/java/forestry/mail/gadgets/MachineMailbox.java +++ b/src/main/java/forestry/mail/gadgets/MachineMailbox.java @@ -12,6 +12,7 @@ package forestry.mail.gadgets; import java.util.LinkedList; +import com.mojang.authlib.GameProfile; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; @@ -26,8 +27,8 @@ import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; import forestry.api.mail.ILetter; import forestry.api.mail.IPostalState; -import forestry.api.mail.MailAddress; import forestry.api.mail.PostManager; +import forestry.api.mail.IMailAddress; import forestry.core.config.Config; import forestry.core.gadgets.TileBase; @@ -86,17 +87,21 @@ public class MachineMailbox extends TileBase implements IMailContainer, ISpecial /* MAIL HANDLING */ public IInventory getOrCreateMailInventory() { + return getOrCreateMailInventory(null); + } + public IInventory getOrCreateMailInventory(EntityPlayer player) { - // Handle client side - if (!Proxies.common.isSimulating(worldObj)) + GameProfile playerProfile; + if (player != null) { + playerProfile = player.getGameProfile(); + } else { + playerProfile = getOwnerProfile(); + } + + if (playerProfile == null) return new InventoryAdapter(POBox.SLOT_SIZE, "Letters"); - EntityPlayer player = Proxies.common.getPlayer(); - - if (player == null || player.getGameProfile() == null) - return new InventoryAdapter(POBox.SLOT_SIZE, "Letters"); - - MailAddress address = new MailAddress(player.getGameProfile()); + IMailAddress address = PostManager.postRegistry.getMailAddress(playerProfile); return PostRegistry.getOrCreatePOBox(worldObj, address); } diff --git a/src/main/java/forestry/mail/gadgets/MachineTrader.java b/src/main/java/forestry/mail/gadgets/MachineTrader.java index f9ee30bb1..0bd02ad59 100755 --- a/src/main/java/forestry/mail/gadgets/MachineTrader.java +++ b/src/main/java/forestry/mail/gadgets/MachineTrader.java @@ -12,7 +12,6 @@ package forestry.mail.gadgets; import java.util.LinkedList; -import forestry.api.mail.MailAddress; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; @@ -28,6 +27,8 @@ import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; import forestry.api.mail.IStamps; import forestry.api.mail.PostManager; +import forestry.api.mail.IMailAddress; +import forestry.mail.MailAddress; import forestry.core.EnumErrorCode; import forestry.core.gadgets.TileBase; import forestry.core.network.EntityNetData; @@ -41,7 +42,7 @@ import forestry.plugins.PluginMail; public class MachineTrader extends TileBase implements ISpecialInventory, ISidedInventory { @EntityNetData - public MailAddress address; + private MailAddress address; public MachineTrader() { address = new MailAddress(); @@ -234,11 +235,11 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided } /* ADDRESS */ - public MailAddress getAddress() { + public IMailAddress getAddress() { return address; } - public void setAddress(MailAddress address) { + public void setAddress(IMailAddress address) { if (address == null) throw new NullPointerException("address must not be null"); @@ -256,11 +257,11 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided return; } - this.address = address; + this.address = new MailAddress(address); PostManager.postRegistry.getOrCreateTradeStation(worldObj, getOwnerProfile(), address); setErrorState(EnumErrorCode.OK); } else - this.address = address; + this.address = new MailAddress(address); } /* TRADING */ diff --git a/src/main/java/forestry/mail/gui/ContainerCatalogue.java b/src/main/java/forestry/mail/gui/ContainerCatalogue.java index 1b4e27641..85341d988 100755 --- a/src/main/java/forestry/mail/gui/ContainerCatalogue.java +++ b/src/main/java/forestry/mail/gui/ContainerCatalogue.java @@ -15,26 +15,27 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Set; -import forestry.api.mail.MailAddress; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ICrafting; import forestry.api.mail.ITradeStation; import forestry.api.mail.PostManager; import forestry.api.mail.TradeStationInfo; +import forestry.api.mail.IMailAddress; +import forestry.api.mail.EnumAddressee; +import forestry.mail.network.PacketLetterInfo; +import forestry.mail.EnumStationState; import forestry.core.gui.ContainerForestry; import forestry.core.gui.IGuiSelectable; import forestry.core.network.PacketIds; import forestry.core.network.PacketPayload; import forestry.core.network.PacketUpdate; import forestry.core.proxy.Proxies; -import forestry.mail.EnumStationState; -import forestry.mail.network.PacketTradeInfo; public class ContainerCatalogue extends ContainerForestry implements IGuiSelectable { private final EntityPlayer player; - private final LinkedHashMap stations; + private final LinkedHashMap stations; private TradeStationInfo currentTrade = null; private Iterator iterator = null; @@ -57,7 +58,7 @@ public class ContainerCatalogue extends ContainerForestry implements IGuiSelecta this.player = player; // Filter out any trade stations which do not actually offer anything. - stations = new LinkedHashMap(); + stations = new LinkedHashMap(); rebuildStationsList(); } @@ -183,7 +184,7 @@ public class ContainerCatalogue extends ContainerForestry implements IGuiSelecta needsSynch = true; } - public void handleTradeInfoUpdate(PacketTradeInfo packet) { + public void handleTradeInfoUpdate(PacketLetterInfo packet) { setTradeInfo(packet.tradeInfo); } @@ -207,7 +208,7 @@ public class ContainerCatalogue extends ContainerForestry implements IGuiSelecta crafter.sendProgressBarUpdate(this, 2, currentFilter); } - Proxies.net.sendToPlayer(new PacketTradeInfo(PacketIds.TRADING_INFO, currentTrade), player); + Proxies.net.sendToPlayer(new PacketLetterInfo(PacketIds.LETTER_INFO, EnumAddressee.TRADER, currentTrade, null), player); needsSynch = false; } } diff --git a/src/main/java/forestry/mail/gui/ContainerLetter.java b/src/main/java/forestry/mail/gui/ContainerLetter.java index a21c26b3a..27d4b47b8 100755 --- a/src/main/java/forestry/mail/gui/ContainerLetter.java +++ b/src/main/java/forestry/mail/gui/ContainerLetter.java @@ -11,17 +11,23 @@ package forestry.mail.gui; import java.util.Iterator; -import java.util.Locale; +import java.util.UUID; +import org.apache.commons.lang3.StringUtils; + +import com.mojang.authlib.GameProfile; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; + import forestry.api.mail.ILetter; import forestry.api.mail.IPostalCarrier; import forestry.api.mail.ITradeStation; -import forestry.api.mail.MailAddress; +import forestry.api.mail.IMailAddress; import forestry.api.mail.PostManager; import forestry.api.mail.TradeStationInfo; +import forestry.api.mail.EnumAddressee; import forestry.core.gui.ContainerItemInventory; import forestry.core.gui.slots.SlotClosed; import forestry.core.gui.slots.SlotCustom; @@ -29,17 +35,16 @@ import forestry.core.network.PacketIds; import forestry.core.network.PacketPayload; import forestry.core.network.PacketUpdate; import forestry.core.proxy.Proxies; -import forestry.mail.EnumAddressee; import forestry.mail.Letter; import forestry.mail.items.ItemLetter; import forestry.mail.items.ItemLetter.LetterInventory; import forestry.mail.items.ItemStamps; -import forestry.mail.network.PacketTradeInfo; +import forestry.mail.network.PacketLetterInfo; public class ContainerLetter extends ContainerItemInventory { private final LetterInventory letterInventory; - private String carrier = EnumAddressee.PLAYER.toString().toLowerCase(Locale.ENGLISH); + private EnumAddressee carrier = EnumAddressee.PLAYER; private TradeStationInfo tradeInfo = null; public ContainerLetter(EntityPlayer player, LetterInventory inventory) { @@ -91,8 +96,10 @@ public class ContainerLetter extends ContainerItemInventory { if (Proxies.common.isSimulating(entityplayer.worldObj)) { ILetter letter = letterInventory.getLetter(); - if (!letter.isProcessed()) - letter.setSender(new MailAddress(entityplayer.getGameProfile())); + if (!letter.isProcessed()) { + IMailAddress sender = PostManager.postRegistry.getMailAddress(entityplayer.getGameProfile()); + letter.setSender(sender); + } } super.onContainerClosed(entityplayer); @@ -107,11 +114,11 @@ public class ContainerLetter extends ContainerItemInventory { return letterInventory.getLetter(); } - public void setCarrierType(String type) { + public void setCarrierType(EnumAddressee type) { this.carrier = type; } - public String getCarrierType() { + public EnumAddressee getCarrierType() { return this.carrier; } @@ -128,39 +135,50 @@ public class ContainerLetter extends ContainerItemInventory { else postal = PostManager.postRegistry.getRegisteredCarriers().values().iterator().next(); - setCarrierType(postal.getUID()); + EnumAddressee type = EnumAddressee.fromString(postal.getUID()); + setCarrierType(type); } - public void setRecipient(MailAddress address) { - if (address == null) + public void setRecipient(String recipientName, EnumAddressee type) { + if (StringUtils.isBlank(recipientName) || type == EnumAddressee.INVALID) return; - - getLetter().setRecipient(address); - carrier = address.getType(); // / Send to server - PacketPayload payload = new PacketPayload(0, 0, 2); - payload.stringPayload[0] = getRecipient().getName(); - payload.stringPayload[1] = this.carrier; + PacketPayload payload = new PacketPayload(0,0,2); + payload.stringPayload[0] = recipientName; + payload.stringPayload[1] = type.toString(); PacketUpdate packet = new PacketUpdate(PacketIds.LETTER_RECIPIENT, payload); Proxies.net.sendToServer(packet); } public void handleSetRecipient(EntityPlayer player, PacketUpdate packet) { - String identifierName = packet.payload.stringPayload[0]; - String type = packet.payload.stringPayload[1]; - MailAddress recipient = MailAddress.makeMailAddress(identifierName, type); + String recipientName = packet.payload.stringPayload[0]; + String typeName = packet.payload.stringPayload[1]; + + EnumAddressee type = EnumAddressee.fromString(typeName); + IMailAddress recipient; + if (type == EnumAddressee.PLAYER) { + GameProfile gameProfile = MinecraftServer.getServer().func_152358_ax().func_152655_a(recipientName); + if (gameProfile == null) + gameProfile = new GameProfile(new UUID(0, 0), recipientName); + recipient = PostManager.postRegistry.getMailAddress(gameProfile); + } else if (type == EnumAddressee.TRADER) { + recipient = PostManager.postRegistry.getMailAddress(recipientName); + } else { + return; + } + getLetter().setRecipient(recipient); // Update the trading info updateTradeInfo(player.worldObj, recipient); - // Update trade info on client - Proxies.net.sendToPlayer(new PacketTradeInfo(PacketIds.TRADING_INFO, tradeInfo), player); + // Update info on client + Proxies.net.sendToPlayer(new PacketLetterInfo(PacketIds.LETTER_INFO, type, tradeInfo, recipient), player); } - public MailAddress getRecipient() { + public IMailAddress getRecipient() { if (getLetter().getRecipients().length > 0) return getLetter().getRecipients()[0]; else @@ -188,7 +206,7 @@ public class ContainerLetter extends ContainerItemInventory { } /* Managing Trade info */ - public void updateTradeInfo(World world, MailAddress address) { + public void updateTradeInfo(World world, IMailAddress address) { // Updating is done by the server. if (!Proxies.common.isSimulating(world)) return; @@ -203,8 +221,13 @@ public class ContainerLetter extends ContainerItemInventory { setTradeInfo(station.getTradeInfo()); } - public void handleTradeInfoUpdate(PacketTradeInfo packet) { - this.setTradeInfo(packet.tradeInfo); + public void handleLetterInfoUpdate(PacketLetterInfo packet) { + carrier = packet.type; + if (packet.type == EnumAddressee.PLAYER) { + getLetter().setRecipient(packet.address); + } else if (packet.type == EnumAddressee.TRADER) { + this.setTradeInfo(packet.tradeInfo); + } } public TradeStationInfo getTradeInfo() { diff --git a/src/main/java/forestry/mail/gui/ContainerMailbox.java b/src/main/java/forestry/mail/gui/ContainerMailbox.java index 6d697647a..68620e852 100755 --- a/src/main/java/forestry/mail/gui/ContainerMailbox.java +++ b/src/main/java/forestry/mail/gui/ContainerMailbox.java @@ -10,7 +10,7 @@ ******************************************************************************/ package forestry.mail.gui; -import forestry.api.mail.MailAddress; +import forestry.api.mail.PostManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; @@ -22,6 +22,7 @@ import forestry.core.gui.slots.SlotClosed; import forestry.core.proxy.Proxies; import forestry.mail.POBox; import forestry.mail.gadgets.MachineMailbox; +import forestry.api.mail.IMailAddress; import forestry.plugins.PluginMail; public class ContainerMailbox extends ContainerForestry { @@ -35,7 +36,7 @@ public class ContainerMailbox extends ContainerForestry { // Mailbox contents this.mailbox = tile; - IInventory inv = mailbox.getOrCreateMailInventory(); + IInventory inv = mailbox.getOrCreateMailInventory(player.player); if (inv instanceof POBox) mailinventory = (POBox) inv; @@ -58,7 +59,7 @@ public class ContainerMailbox extends ContainerForestry { ItemStack stack = super.slotClick(slotIndex, button, par3, player); if (Proxies.common.isSimulating(player.worldObj) && mailinventory != null) { - MailAddress address = new MailAddress(mailbox.getOwnerProfile()); + IMailAddress address = PostManager.postRegistry.getMailAddress(mailbox.getOwnerProfile()); PluginMail.proxy.setPOBoxInfo(mailbox.getWorldObj(), address, mailinventory.getPOBoxInfo()); } diff --git a/src/main/java/forestry/mail/gui/ContainerTradeName.java b/src/main/java/forestry/mail/gui/ContainerTradeName.java index ee3f34d3d..b97913f2e 100755 --- a/src/main/java/forestry/mail/gui/ContainerTradeName.java +++ b/src/main/java/forestry/mail/gui/ContainerTradeName.java @@ -20,7 +20,8 @@ import forestry.core.network.PacketUpdate; import forestry.core.proxy.Proxies; import forestry.core.utils.InventoryAdapter; import forestry.mail.gadgets.MachineTrader; -import forestry.api.mail.MailAddress; +import forestry.api.mail.PostManager; +import forestry.api.mail.IMailAddress; import org.apache.commons.lang3.StringUtils; @@ -35,7 +36,7 @@ public class ContainerTradeName extends ContainerForestry { isLinked = machine.isLinked(); } - public MailAddress getAddress() { + public IMailAddress getAddress() { return machine.getAddress(); } @@ -50,13 +51,13 @@ public class ContainerTradeName extends ContainerForestry { PacketUpdate packet = new PacketUpdate(PacketIds.TRADING_ADDRESS_SET, payload); Proxies.net.sendToServer(packet); - MailAddress address = new MailAddress(addressName); + IMailAddress address = PostManager.postRegistry.getMailAddress(addressName); machine.setAddress(address); } public void handleSetAddress(PacketUpdate packet) { String addressName = packet.payload.stringPayload[0]; - MailAddress address = new MailAddress(addressName); + IMailAddress address = PostManager.postRegistry.getMailAddress(addressName); machine.setAddress(address); } diff --git a/src/main/java/forestry/mail/gui/ContainerTrader.java b/src/main/java/forestry/mail/gui/ContainerTrader.java index 415d3f2f1..ea85064cb 100755 --- a/src/main/java/forestry/mail/gui/ContainerTrader.java +++ b/src/main/java/forestry/mail/gui/ContainerTrader.java @@ -16,12 +16,11 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import forestry.core.gui.ContainerForestry; -import forestry.core.gui.slots.SlotClosed; import forestry.core.gui.slots.SlotCustom; import forestry.mail.TradeStation; import forestry.mail.gadgets.MachineTrader; import forestry.mail.items.ItemStamps; -import forestry.api.mail.MailAddress; +import forestry.api.mail.IMailAddress; public class ContainerTrader extends ContainerForestry { @@ -75,7 +74,7 @@ public class ContainerTrader extends ContainerForestry { return machine.isLinked(); } - public MailAddress getAddress() { + public IMailAddress getAddress() { return machine.getAddress(); } diff --git a/src/main/java/forestry/mail/gui/GuiCatalogue.java b/src/main/java/forestry/mail/gui/GuiCatalogue.java index 95b19e5ed..3fc16135e 100755 --- a/src/main/java/forestry/mail/gui/GuiCatalogue.java +++ b/src/main/java/forestry/mail/gui/GuiCatalogue.java @@ -23,7 +23,7 @@ import forestry.core.config.SessionVars; import forestry.core.gadgets.TileForestry; import forestry.core.gui.GuiForestry; import forestry.core.utils.StringUtil; -import forestry.mail.EnumAddressee; +import forestry.api.mail.EnumAddressee; public class GuiCatalogue extends GuiForestry { @@ -136,7 +136,7 @@ public class GuiCatalogue extends GuiForestry { TradeStationInfo info = container.getTradeInfo(); if(info != null) { SessionVars.setStringVar("mail.letter.recipient", info.address.getName()); - SessionVars.setStringVar("mail.letter.addressee", EnumAddressee.asString(EnumAddressee.TRADER)); + SessionVars.setStringVar("mail.letter.addressee", EnumAddressee.TRADER.toString()); } mc.displayGuiScreen((GuiScreen)null); break; diff --git a/src/main/java/forestry/mail/gui/GuiLetter.java b/src/main/java/forestry/mail/gui/GuiLetter.java index 881585196..65fb85f71 100755 --- a/src/main/java/forestry/mail/gui/GuiLetter.java +++ b/src/main/java/forestry/mail/gui/GuiLetter.java @@ -20,7 +20,7 @@ import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import forestry.api.mail.IPostalCarrier; -import forestry.api.mail.MailAddress; +import forestry.api.mail.IMailAddress; import forestry.api.mail.PostManager; import forestry.core.config.Defaults; import forestry.core.config.SessionVars; @@ -30,7 +30,7 @@ import forestry.core.gui.GuiTextBox; import forestry.core.gui.widgets.Widget; import forestry.core.proxy.Proxies; import forestry.core.utils.StringUtil; -import forestry.mail.EnumAddressee; +import forestry.api.mail.EnumAddressee; import forestry.mail.items.ItemLetter.LetterInventory; public class GuiLetter extends GuiForestry { @@ -48,7 +48,7 @@ public class GuiLetter extends GuiForestry { GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0F); //mc.renderEngine.bindTexture(Defaults.TEXTURE_PATH_GUI + "/letter.png"); - IPostalCarrier carrier = PostManager.postRegistry.getCarrier(container.getCarrierType()); + IPostalCarrier carrier = PostManager.postRegistry.getCarrier(container.getCarrierType().toString()); if(carrier != null) drawTexturedModelRectFromIcon(startX + xPos, startY + yPos - 5, carrier.getIcon(), 26, 26); @@ -56,7 +56,7 @@ public class GuiLetter extends GuiForestry { @Override protected String getLegacyTooltip(EntityPlayer player) { - return StringUtil.localize("gui.addressee." + container.getCarrierType().toLowerCase(Locale.ENGLISH)); + return StringUtil.localize("gui.addressee." + container.getCarrierType().toString()); } @Override @@ -95,10 +95,9 @@ public class GuiLetter extends GuiForestry { Keyboard.enableRepeatEvents(true); address = new GuiTextField(this.fontRendererObj, guiLeft + 46, guiTop + 13, 93, 13); - MailAddress recipient = container.getRecipient(); + IMailAddress recipient = container.getRecipient(); if (recipient != null) { address.setText(recipient.getName()); - setRecipient(recipient); } text = new GuiTextBox(this.fontRendererObj, guiLeft + 17, guiTop + 31, 122, 57); @@ -158,8 +157,8 @@ public class GuiLetter extends GuiForestry { if (addressFocus != address.isFocused()) { String recipient = this.address.getText(); if (StringUtils.isNotBlank(recipient)) { - MailAddress recipientAddress = MailAddress.makeMailAddress(recipient, container.getCarrierType()); - setRecipient(recipientAddress); + EnumAddressee recipientType = container.getCarrierType(); + setRecipient(recipient, recipientType); } } addressFocus = address.isFocused(); @@ -174,7 +173,7 @@ public class GuiLetter extends GuiForestry { fontRendererObj.drawSplitString(text.getText(), guiLeft + 20, guiTop + 34, 119, fontColor.get("gui.mail.lettertext")); } else { address.drawTextBox(); - if (container.getCarrierType().equals(EnumAddressee.TRADER.toString().toLowerCase(Locale.ENGLISH))) + if (container.getCarrierType() == EnumAddressee.TRADER) drawTradePreview(guiLeft + 18, guiTop + 32); else text.drawTextBox(); @@ -215,9 +214,9 @@ public class GuiLetter extends GuiForestry { @Override public void onGuiClosed() { - MailAddress recipientAddress = MailAddress.makeMailAddress(this.address.getText(), container.getCarrierType()); - - setRecipient(recipientAddress); + String recipientName = this.address.getText(); + EnumAddressee recipientType = container.getCarrierType(); + setRecipient(recipientName, recipientType); setText(); Keyboard.enableRepeatEvents(false); super.onGuiClosed(); @@ -233,24 +232,24 @@ public class GuiLetter extends GuiForestry { return; String recipient = SessionVars.getStringVar("mail.letter.recipient"); - String type = SessionVars.getStringVar("mail.letter.addressee"); + String typeName = SessionVars.getStringVar("mail.letter.addressee"); - if (recipient != null && type != null) { + if (StringUtils.isNotBlank(recipient) && StringUtils.isNotBlank(typeName)) { address.setText(recipient); - MailAddress recipientAddress = MailAddress.makeMailAddress(recipient, type); - setRecipient(recipientAddress); + + EnumAddressee type = EnumAddressee.fromString(typeName); + setRecipient(recipient, type); } SessionVars.clearStringVar("mail.letter.recipient"); SessionVars.clearStringVar("mail.letter.addressee"); } - private void setRecipient(MailAddress recipientAddress) { - if (this.isProcessedLetter || recipientAddress == null) + private void setRecipient(String recipientName, EnumAddressee type) { + if (this.isProcessedLetter || StringUtils.isBlank(recipientName) || type == null || type == EnumAddressee.INVALID) return; - container.setRecipient(recipientAddress); - container.updateTradeInfo(this.mc.theWorld, recipientAddress); + container.setRecipient(recipientName, type); } private void setText() { diff --git a/src/main/java/forestry/mail/gui/GuiTrader.java b/src/main/java/forestry/mail/gui/GuiTrader.java index 74713a204..23d4c3c36 100755 --- a/src/main/java/forestry/mail/gui/GuiTrader.java +++ b/src/main/java/forestry/mail/gui/GuiTrader.java @@ -16,7 +16,6 @@ import forestry.core.config.Defaults; import forestry.core.gui.GuiForestry; import forestry.core.utils.StringUtil; import forestry.mail.gadgets.MachineTrader; -import forestry.api.mail.MailAddress; public class GuiTrader extends GuiForestry { diff --git a/src/main/java/forestry/mail/network/PacketLetterInfo.java b/src/main/java/forestry/mail/network/PacketLetterInfo.java new file mode 100644 index 000000000..cc9ace882 --- /dev/null +++ b/src/main/java/forestry/mail/network/PacketLetterInfo.java @@ -0,0 +1,126 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.mail.network; + +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.UUID; + +import net.minecraft.item.ItemStack; +import com.mojang.authlib.GameProfile; + +import forestry.api.mail.TradeStationInfo; +import forestry.api.mail.IMailAddress; +import forestry.api.mail.EnumAddressee; +import forestry.api.mail.PostManager; +import forestry.core.network.ForestryPacket; +import forestry.mail.EnumStationState; + +public class PacketLetterInfo extends ForestryPacket { + + public EnumAddressee type; + public TradeStationInfo tradeInfo; + public IMailAddress address; + + public PacketLetterInfo() { + } + + public PacketLetterInfo(int id, EnumAddressee type, TradeStationInfo info, IMailAddress address) { + super(id); + this.type = type; + if (type == EnumAddressee.TRADER) + this.tradeInfo = info; + else if (type == EnumAddressee.PLAYER) + this.address = address; + } + + @Override + public void writeData(DataOutputStream data) throws IOException { + + if (type == null || type == EnumAddressee.INVALID) { + data.writeShort(-1); + return; + } + + data.writeShort(0); + + data.writeUTF(type.toString()); + + if (type == EnumAddressee.PLAYER) { + + if (address == null) { + data.writeShort(-1); + return; + } + data.writeShort(0); + + GameProfile profile = address.getPlayerProfile(); + + data.writeLong(profile.getId().getMostSignificantBits()); + data.writeLong(profile.getId().getLeastSignificantBits()); + data.writeUTF(profile.getName()); + + } else if (type == EnumAddressee.TRADER) { + + if (tradeInfo == null) { + data.writeShort(-1); + return; + } + + data.writeShort(0); + + data.writeUTF(tradeInfo.address.getName()); + + data.writeLong(tradeInfo.owner.getId().getMostSignificantBits()); + data.writeLong(tradeInfo.owner.getId().getLeastSignificantBits()); + data.writeUTF(tradeInfo.owner.getName()); + + writeItemStack(tradeInfo.tradegood, data); + data.writeShort(tradeInfo.required.length); + for (int i = 0; i < tradeInfo.required.length; i++) + writeItemStack(tradeInfo.required[i], data); + data.writeShort(tradeInfo.state.ordinal()); + } + } + + @Override + public void readData(DataInputStream data) throws IOException { + + if (data.readShort() < 0) + return; + + type = EnumAddressee.fromString(data.readUTF()); + + if (type == EnumAddressee.PLAYER) { + if (data.readShort() < 0) + return; + GameProfile player = new GameProfile(new UUID(data.readLong(), data.readLong()), data.readUTF()); + this.address = PostManager.postRegistry.getMailAddress(player); + + } else if (type == EnumAddressee.TRADER) { + if (data.readShort() < 0) + return; + IMailAddress address = PostManager.postRegistry.getMailAddress(data.readUTF()); + GameProfile owner = new GameProfile(new UUID(data.readLong(), data.readLong()), data.readUTF()); + ItemStack tradegood; + ItemStack[] required; + + tradegood = readItemStack(data); + required = new ItemStack[data.readShort()]; + for (int i = 0; i < required.length; i++) + required[i] = readItemStack(data); + + this.tradeInfo = new TradeStationInfo(address, owner, tradegood, required, EnumStationState.values()[data.readShort()]); + } + } + +} diff --git a/src/main/java/forestry/mail/network/PacketTradeInfo.java b/src/main/java/forestry/mail/network/PacketTradeInfo.java deleted file mode 100755 index 63ba14da3..000000000 --- a/src/main/java/forestry/mail/network/PacketTradeInfo.java +++ /dev/null @@ -1,82 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.mail.network; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.util.UUID; - -import forestry.api.mail.MailAddress; -import net.minecraft.item.ItemStack; - -import com.mojang.authlib.GameProfile; - -import forestry.api.mail.TradeStationInfo; -import forestry.core.network.ForestryPacket; -import forestry.mail.EnumStationState; - -public class PacketTradeInfo extends ForestryPacket { - - public TradeStationInfo tradeInfo; - - public PacketTradeInfo() { - } - - public PacketTradeInfo(int id, TradeStationInfo info) { - super(id); - this.tradeInfo = info; - } - - @Override - public void writeData(DataOutputStream data) throws IOException { - - if (tradeInfo == null) { - data.writeShort(-1); - return; - } - - data.writeShort(0); - - data.writeUTF(tradeInfo.address.getName()); - - data.writeLong(tradeInfo.owner.getId().getMostSignificantBits()); - data.writeLong(tradeInfo.owner.getId().getLeastSignificantBits()); - data.writeUTF(tradeInfo.owner.getName()); - - writeItemStack(tradeInfo.tradegood, data); - data.writeShort(tradeInfo.required.length); - for (int i = 0; i < tradeInfo.required.length; i++) - writeItemStack(tradeInfo.required[i], data); - data.writeShort(tradeInfo.state.ordinal()); - } - - @Override - public void readData(DataInputStream data) throws IOException { - - short isNotNull = data.readShort(); - if (isNotNull < 0) - return; - - MailAddress address = new MailAddress(data.readUTF()); - GameProfile owner = new GameProfile(new UUID(data.readLong(), data.readLong()), data.readUTF()); - ItemStack tradegood; - ItemStack[] required; - - tradegood = readItemStack(data); - required = new ItemStack[data.readShort()]; - for (int i = 0; i < required.length; i++) - required[i] = readItemStack(data); - - this.tradeInfo = new TradeStationInfo(address, owner, tradegood, required, EnumStationState.values()[data.readShort()]); - } - -} diff --git a/src/main/java/forestry/mail/proxy/ClientProxyMail.java b/src/main/java/forestry/mail/proxy/ClientProxyMail.java index 48ce4c1ae..7ffa4b197 100755 --- a/src/main/java/forestry/mail/proxy/ClientProxyMail.java +++ b/src/main/java/forestry/mail/proxy/ClientProxyMail.java @@ -10,7 +10,7 @@ ******************************************************************************/ package forestry.mail.proxy; -import forestry.api.mail.MailAddress; +import com.mojang.authlib.GameProfile; import net.minecraft.world.World; import forestry.core.network.ForestryPacket; @@ -20,6 +20,8 @@ import forestry.mail.POBox; import forestry.mail.POBoxInfo; import forestry.mail.PostRegistry; import forestry.mail.gui.GuiMailboxInfo; +import forestry.api.mail.IMailAddress; +import forestry.api.mail.PostManager; public class ClientProxyMail extends ProxyMail { @@ -38,7 +40,8 @@ public class ClientProxyMail extends ProxyMail { if (!Proxies.common.isSimulating(Proxies.common.getRenderWorld())) Proxies.net.sendToServer(new ForestryPacket(PacketIds.POBOX_INFO_REQUEST)); else { - MailAddress address = new MailAddress(Proxies.common.getClientInstance().thePlayer.getGameProfile()); + GameProfile profile = Proxies.common.getClientInstance().thePlayer.getGameProfile(); + IMailAddress address = PostManager.postRegistry.getMailAddress(profile); POBox pobox = PostRegistry.getPOBox(Proxies.common.getRenderWorld(), address); if (pobox != null) setPOBoxInfo(Proxies.common.getRenderWorld(), address, pobox.getPOBoxInfo()); @@ -46,7 +49,7 @@ public class ClientProxyMail extends ProxyMail { } @Override - public void setPOBoxInfo(World world, MailAddress address, POBoxInfo info) { + public void setPOBoxInfo(World world, IMailAddress address, POBoxInfo info) { if (address.isClientPlayer(world)) GuiMailboxInfo.instance.setPOBoxInfo(info); } diff --git a/src/main/java/forestry/mail/proxy/ProxyMail.java b/src/main/java/forestry/mail/proxy/ProxyMail.java index 523c21694..36fb92b10 100755 --- a/src/main/java/forestry/mail/proxy/ProxyMail.java +++ b/src/main/java/forestry/mail/proxy/ProxyMail.java @@ -10,7 +10,6 @@ ******************************************************************************/ package forestry.mail.proxy; -import forestry.api.mail.MailAddress; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; @@ -18,6 +17,7 @@ import forestry.core.network.PacketIds; import forestry.core.proxy.Proxies; import forestry.mail.POBoxInfo; import forestry.mail.network.PacketPOBoxInfo; +import forestry.api.mail.IMailAddress; public class ProxyMail { @@ -27,7 +27,7 @@ public class ProxyMail { public void resetMailboxInfo() { } - public void setPOBoxInfo(World world, MailAddress address, POBoxInfo info) { + public void setPOBoxInfo(World world, IMailAddress address, POBoxInfo info) { EntityPlayer player = address.getPlayer(world); if (player != null) Proxies.net.sendToPlayer(new PacketPOBoxInfo(PacketIds.POBOX_INFO, info), player); diff --git a/src/main/java/forestry/plugins/PluginMail.java b/src/main/java/forestry/plugins/PluginMail.java index 048371773..0329b1ea7 100755 --- a/src/main/java/forestry/plugins/PluginMail.java +++ b/src/main/java/forestry/plugins/PluginMail.java @@ -38,7 +38,7 @@ import forestry.core.triggers.Trigger; import forestry.core.utils.LiquidHelper; import forestry.core.utils.ShapedRecipeCustom; import forestry.mail.CommandMail; -import forestry.mail.EnumAddressee; +import forestry.api.mail.EnumAddressee; import forestry.mail.GuiHandlerMail; import forestry.mail.PacketHandlerMail; import forestry.mail.PostRegistry; From 488d08616b43c50820445713465f1c1bba293f52 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 11 Sep 2014 02:34:07 -0700 Subject: [PATCH 46/49] Fixes #44. abstract method "getInventoryName" overriding vanilla method and getting remapped. Cleaned up Tile names and created GuiForestryTitled for GUIs that have their name as the title. --- .../gadgets/TileAlvearyClimatiser.java | 4 --- .../gadgets/TileAlvearyHygroregulator.java | 2 +- .../apiculture/gadgets/TileAlvearyPlain.java | 2 +- .../apiculture/gadgets/TileAlvearySieve.java | 4 --- .../gadgets/TileAlvearyStabiliser.java | 4 --- .../gadgets/TileAlvearySwarmer.java | 2 +- .../apiculture/gadgets/TileApiary.java | 2 +- .../apiculture/gadgets/TileBeehouse.java | 5 --- .../forestry/apiculture/gui/GuiAlveary.java | 12 ++----- .../gui/GuiAlvearyHygroregulator.java | 14 ++------ .../forestry/apiculture/gui/GuiApiary.java | 12 ++----- .../forestry/core/gadgets/TileAnalyzer.java | 2 +- .../java/forestry/core/gadgets/TileBase.java | 5 --- .../forestry/core/gadgets/TileEscritoire.java | 2 +- .../forestry/core/gadgets/TileForestry.java | 9 ++++- .../forestry/core/gadgets/TileMachine.java | 4 +-- .../core/gadgets/TileNaturalistChest.java | 2 +- .../java/forestry/core/gui/GuiAnalyzer.java | 10 +----- .../java/forestry/core/gui/GuiForestry.java | 4 --- .../forestry/core/gui/GuiForestryTitled.java | 34 +++++++++++++++++++ .../forestry/energy/gadgets/EngineBronze.java | 2 +- .../forestry/energy/gadgets/EngineCopper.java | 2 +- .../forestry/energy/gadgets/EngineTin.java | 2 +- .../energy/gadgets/MachineGenerator.java | 2 +- .../java/forestry/energy/gui/GuiEngine.java | 4 +-- .../forestry/energy/gui/GuiEngineBronze.java | 7 ---- .../forestry/energy/gui/GuiEngineCopper.java | 8 ----- .../forestry/energy/gui/GuiEngineTin.java | 7 ---- .../forestry/energy/gui/GuiGenerator.java | 12 ++----- .../factory/gadgets/MachineBottler.java | 2 +- .../factory/gadgets/MachineCarpenter.java | 2 +- .../factory/gadgets/MachineCentrifuge.java | 2 +- .../factory/gadgets/MachineFabricator.java | 2 +- .../factory/gadgets/MachineFermenter.java | 2 +- .../factory/gadgets/MachineMoistener.java | 2 +- .../factory/gadgets/MachineRaintank.java | 2 +- .../factory/gadgets/MachineSqueezer.java | 2 +- .../factory/gadgets/MachineStill.java | 2 +- .../factory/gadgets/MillRainmaker.java | 2 +- .../factory/gadgets/TileWorktable.java | 5 --- .../java/forestry/factory/gui/GuiBottler.java | 12 ++----- .../forestry/factory/gui/GuiCarpenter.java | 12 ++----- .../forestry/factory/gui/GuiCentrifuge.java | 12 ++----- .../forestry/factory/gui/GuiFabricator.java | 12 ++----- .../forestry/factory/gui/GuiFermenter.java | 12 ++----- .../forestry/factory/gui/GuiMoistener.java | 12 ++----- .../forestry/factory/gui/GuiRaintank.java | 12 ++----- .../forestry/factory/gui/GuiSqueezer.java | 12 ++----- .../java/forestry/factory/gui/GuiStill.java | 12 ++----- .../forestry/factory/gui/GuiWorktable.java | 12 ++----- .../forestry/farming/gadgets/TileFarm.java | 5 --- .../forestry/farming/gadgets/TileHatch.java | 5 +++ .../forestry/mail/gadgets/MachineMailbox.java | 2 +- .../mail/gadgets/MachinePhilatelist.java | 2 +- .../forestry/mail/gadgets/MachineTrader.java | 2 +- .../java/forestry/mail/gui/GuiTrader.java | 2 +- 56 files changed, 107 insertions(+), 237 deletions(-) create mode 100644 src/main/java/forestry/core/gui/GuiForestryTitled.java diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyClimatiser.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyClimatiser.java index d39ee437a..75f3648fb 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyClimatiser.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyClimatiser.java @@ -136,10 +136,6 @@ public abstract class TileAlvearyClimatiser extends TileAlveary implements IPowe nbttagcompound.setInteger("Heating", transferTime); } - @Override - public String getInventoryName() { - return "alveary.climatiser"; - } /* NETWORK */ @Override diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java index 5f3f290b3..49d1764d2 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java @@ -77,7 +77,7 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory @Override public String getInventoryName() { - return "alveary.5.name"; + return getUnlocalizedName(); } /* UPDATING */ diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java index ce821da83..35f2c398c 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java @@ -584,7 +584,7 @@ public class TileAlvearyPlain extends TileAlveary implements ISidedInventory, IS @Override public String getInventoryName() { - return "alveary.0.name"; + return getUnlocalizedName(); } @Override diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java index 1a793fb6c..59108854a 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java @@ -45,10 +45,6 @@ public class TileAlvearySieve extends TileAlveary implements ICrafter, IBeeListe player.openGui(ForestryAPI.instance, GuiId.AlvearySieveGUI.ordinal(), worldObj, xCoord, yCoord, zCoord); } - @Override - public String getInventoryName() { - return "alveary.7.name"; - } @Override public boolean hasFunction() { diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyStabiliser.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyStabiliser.java index 165fd1b27..a2da88c4c 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyStabiliser.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyStabiliser.java @@ -46,10 +46,6 @@ public class TileAlvearyStabiliser extends TileAlveary implements IBeeModifier { ((IAlvearyComponent)getCentralTE()).registerBeeModifier(this); } - @Override - public String getInventoryName() { - return "alveary.6.name"; - } @Override public boolean hasFunction() { diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java index 600d0c43d..a7339d22f 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java @@ -267,7 +267,7 @@ public class TileAlvearySwarmer extends TileAlveary implements ISpecialInventory @Override public String getInventoryName() { - return "alveary.2.name"; + return getUnlocalizedName(); } @Override diff --git a/src/main/java/forestry/apiculture/gadgets/TileApiary.java b/src/main/java/forestry/apiculture/gadgets/TileApiary.java index 2bc0257e8..ca2d2f098 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileApiary.java +++ b/src/main/java/forestry/apiculture/gadgets/TileApiary.java @@ -30,7 +30,7 @@ public class TileApiary extends TileBeehouse implements ISidedInventory { @Override public String getInventoryName() { - return "apiculture.0.name"; + return getUnlocalizedName(); } @Override diff --git a/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java b/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java index 3fc870ee2..74d68a435 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java +++ b/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java @@ -68,11 +68,6 @@ public class TileBeehouse extends TileBase implements IBeeHousing, IClimatised { logic = PluginApiculture.beeInterface.createBeekeepingLogic(this); } - @Override - public String getInventoryName() { - return "apiculture.2.name"; - } - @Override public void openGui(EntityPlayer player, TileBase tile) { player.openGui(ForestryAPI.instance, GuiId.BeehouseGUI.ordinal(), worldObj, xCoord, yCoord, zCoord); diff --git a/src/main/java/forestry/apiculture/gui/GuiAlveary.java b/src/main/java/forestry/apiculture/gui/GuiAlveary.java index af6ca04ad..4285f6889 100755 --- a/src/main/java/forestry/apiculture/gui/GuiAlveary.java +++ b/src/main/java/forestry/apiculture/gui/GuiAlveary.java @@ -14,12 +14,11 @@ import net.minecraft.entity.player.InventoryPlayer; import forestry.apiculture.gadgets.TileAlvearyPlain; import forestry.core.config.Defaults; -import forestry.core.gui.GuiForestry; +import forestry.core.gui.GuiForestryTitled; import forestry.core.utils.EnumTankLevel; -import forestry.core.utils.StringUtil; import forestry.core.utils.Utils; -public class GuiAlveary extends GuiForestry { +public class GuiAlveary extends GuiForestryTitled { public GuiAlveary(InventoryPlayer inventory, TileAlvearyPlain tile) { super(Defaults.TEXTURE_PATH_GUI + "/alveary.png", new ContainerAlveary(inventory, tile), tile); @@ -27,13 +26,6 @@ public class GuiAlveary extends GuiForestry { ySize = 190; } - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String title = StringUtil.localizeTile(tile.getInventoryName()); - this.fontRendererObj.drawString(title, getCenteredOffset(title), 6, fontColor.get("gui.title")); - } - @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); diff --git a/src/main/java/forestry/apiculture/gui/GuiAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/gui/GuiAlvearyHygroregulator.java index f941c1767..6a7c16190 100755 --- a/src/main/java/forestry/apiculture/gui/GuiAlvearyHygroregulator.java +++ b/src/main/java/forestry/apiculture/gui/GuiAlvearyHygroregulator.java @@ -14,23 +14,15 @@ import net.minecraft.entity.player.InventoryPlayer; import forestry.apiculture.gadgets.TileAlvearyHygroregulator; import forestry.core.config.Defaults; -import forestry.core.gui.GuiForestry; +import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; -import forestry.core.utils.StringUtil; -public class GuiAlvearyHygroregulator extends GuiForestry { +public class GuiAlvearyHygroregulator extends GuiForestryTitled { public GuiAlvearyHygroregulator(InventoryPlayer inventory, TileAlvearyHygroregulator tile) { - super(Defaults.TEXTURE_PATH_GUI + "/hygroregulator.png", new ContainerAlvearyHygroregulator(inventory, tile)); + super(Defaults.TEXTURE_PATH_GUI + "/hygroregulator.png", new ContainerAlvearyHygroregulator(inventory, tile), tile); widgetManager.add(new TankWidget(this.widgetManager, 104, 17, 0)); } - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localizeTile(tile.getInventoryName()); - this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); - } - } diff --git a/src/main/java/forestry/apiculture/gui/GuiApiary.java b/src/main/java/forestry/apiculture/gui/GuiApiary.java index 806e08045..1a73b16a3 100755 --- a/src/main/java/forestry/apiculture/gui/GuiApiary.java +++ b/src/main/java/forestry/apiculture/gui/GuiApiary.java @@ -15,12 +15,11 @@ import net.minecraft.entity.player.InventoryPlayer; import forestry.apiculture.gadgets.TileApiary; import forestry.apiculture.gadgets.TileBeehouse; import forestry.core.config.Defaults; -import forestry.core.gui.GuiForestry; +import forestry.core.gui.GuiForestryTitled; import forestry.core.utils.EnumTankLevel; -import forestry.core.utils.StringUtil; import forestry.core.utils.Utils; -public class GuiApiary extends GuiForestry { +public class GuiApiary extends GuiForestryTitled { public GuiApiary(InventoryPlayer inventory, TileApiary tile) { super(Defaults.TEXTURE_PATH_GUI + "/apiary.png", new ContainerApiary(inventory, tile, true), tile); @@ -34,13 +33,6 @@ public class GuiApiary extends GuiForestry { ySize = 190; } - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localizeTile(tile.getInventoryName()); - this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); - } - @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); diff --git a/src/main/java/forestry/core/gadgets/TileAnalyzer.java b/src/main/java/forestry/core/gadgets/TileAnalyzer.java index 14e2635b9..03052832f 100755 --- a/src/main/java/forestry/core/gadgets/TileAnalyzer.java +++ b/src/main/java/forestry/core/gadgets/TileAnalyzer.java @@ -76,7 +76,7 @@ public class TileAnalyzer extends TileBase implements ISpecialInventory, ISidedI @Override public String getInventoryName() { - return "core.0.name"; + return getUnlocalizedName(); } /* GUI */ diff --git a/src/main/java/forestry/core/gadgets/TileBase.java b/src/main/java/forestry/core/gadgets/TileBase.java index 2c169207a..142d83671 100755 --- a/src/main/java/forestry/core/gadgets/TileBase.java +++ b/src/main/java/forestry/core/gadgets/TileBase.java @@ -21,11 +21,6 @@ import forestry.core.utils.Utils; public abstract class TileBase extends TileForestry implements IHintSource { - @Override - public String getInventoryName() { - return null; - } - @Override public boolean isOwnable() { return true; diff --git a/src/main/java/forestry/core/gadgets/TileEscritoire.java b/src/main/java/forestry/core/gadgets/TileEscritoire.java index 2a279e0e9..6fdde0480 100755 --- a/src/main/java/forestry/core/gadgets/TileEscritoire.java +++ b/src/main/java/forestry/core/gadgets/TileEscritoire.java @@ -47,7 +47,7 @@ public class TileEscritoire extends TileBase implements ISidedInventory, IRender private final InventoryAdapter inventory; @Override public String getInventoryName() { - return "core.1.name"; + return getUnlocalizedName(); } public TileEscritoire() { diff --git a/src/main/java/forestry/core/gadgets/TileForestry.java b/src/main/java/forestry/core/gadgets/TileForestry.java index 516e81316..ffd3bc9d9 100755 --- a/src/main/java/forestry/core/gadgets/TileForestry.java +++ b/src/main/java/forestry/core/gadgets/TileForestry.java @@ -297,7 +297,14 @@ public abstract class TileForestry extends TileEntity implements INetworkedEntit } /* NAME */ - public abstract String getInventoryName(); + + /** + * Gets the tile's unlocalized name, based on the block at the location of this entity (client-only). + */ + public String getUnlocalizedName() { + String blockUnlocalizedName = getBlockType().getUnlocalizedName().replace("tile.for.",""); + return blockUnlocalizedName + "." + getBlockMetadata() + ".name"; + } public boolean hasCustomInventoryName() { return true; diff --git a/src/main/java/forestry/core/gadgets/TileMachine.java b/src/main/java/forestry/core/gadgets/TileMachine.java index 3b0fb6e24..2cb47a929 100755 --- a/src/main/java/forestry/core/gadgets/TileMachine.java +++ b/src/main/java/forestry/core/gadgets/TileMachine.java @@ -42,7 +42,7 @@ import forestry.plugins.PluginEnergy; import forestry.plugins.PluginFactory; import forestry.plugins.PluginMail; -public class TileMachine extends TileForestry implements ISpecialInventory, IClimatised, IHintSource { +public abstract class TileMachine extends TileForestry implements ISpecialInventory, IClimatised, IHintSource { public TileMachine() { } @@ -301,7 +301,7 @@ public class TileMachine extends TileForestry implements ISpecialInventory, ICli @Override public String getInventoryName() { - return "[Unknown]"; + return getUnlocalizedName(); } @Override diff --git a/src/main/java/forestry/core/gadgets/TileNaturalistChest.java b/src/main/java/forestry/core/gadgets/TileNaturalistChest.java index ab4b1fe25..152f0fa8c 100755 --- a/src/main/java/forestry/core/gadgets/TileNaturalistChest.java +++ b/src/main/java/forestry/core/gadgets/TileNaturalistChest.java @@ -37,7 +37,7 @@ public abstract class TileNaturalistChest extends TileBase implements IInventory @Override public String getInventoryName() { - return StringUtil.localize("tile.mill.3"); + return getUnlocalizedName(); } @Override diff --git a/src/main/java/forestry/core/gui/GuiAnalyzer.java b/src/main/java/forestry/core/gui/GuiAnalyzer.java index 6d04a6851..f03f2b9d4 100755 --- a/src/main/java/forestry/core/gui/GuiAnalyzer.java +++ b/src/main/java/forestry/core/gui/GuiAnalyzer.java @@ -16,10 +16,9 @@ import forestry.core.config.Defaults; import forestry.core.gadgets.TileAnalyzer; import forestry.core.gui.widgets.TankWidget; import forestry.core.utils.EnumTankLevel; -import forestry.core.utils.StringUtil; import forestry.core.utils.Utils; -public class GuiAnalyzer extends GuiForestry { +public class GuiAnalyzer extends GuiForestryTitled { public GuiAnalyzer(InventoryPlayer inventory, TileAnalyzer tile) { super(Defaults.TEXTURE_PATH_GUI + "/alyzer.png", new ContainerAnalyzer(inventory, tile), tile); @@ -27,13 +26,6 @@ public class GuiAnalyzer extends GuiForestry { widgetManager.add(new TankWidget(this.widgetManager, 95, 24, 0)); } - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String title = StringUtil.localizeTile(tile.getInventoryName()); - this.fontRendererObj.drawString(title, getCenteredOffset(title), 6, fontColor.get("gui.title")); - } - @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); diff --git a/src/main/java/forestry/core/gui/GuiForestry.java b/src/main/java/forestry/core/gui/GuiForestry.java index 2cbc6a857..874b0c391 100755 --- a/src/main/java/forestry/core/gui/GuiForestry.java +++ b/src/main/java/forestry/core/gui/GuiForestry.java @@ -53,10 +53,6 @@ public abstract class GuiForestry extends GuiContainer { public ResourceLocation textureFile; protected FontColour fontColor; - public GuiForestry(ContainerForestry container) { - this("", container); - } - public GuiForestry(String texture, ContainerForestry container) { this(new ResourceLocation("forestry", texture), container, null); } diff --git a/src/main/java/forestry/core/gui/GuiForestryTitled.java b/src/main/java/forestry/core/gui/GuiForestryTitled.java new file mode 100644 index 000000000..41d9e9df8 --- /dev/null +++ b/src/main/java/forestry/core/gui/GuiForestryTitled.java @@ -0,0 +1,34 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.gui; + +import net.minecraft.util.ResourceLocation; + +import forestry.core.gadgets.TileForestry; +import forestry.core.utils.StringUtil; + +public abstract class GuiForestryTitled extends GuiForestry { + + public GuiForestryTitled(String texture, ContainerForestry container, Object inventory) { + super(texture, container, inventory); + } + + public GuiForestryTitled(ResourceLocation texture, ContainerForestry container, Object inventory) { + super(texture, container, inventory); + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + String name = StringUtil.localizeTile(tile.getUnlocalizedName()); + this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); + } +} diff --git a/src/main/java/forestry/energy/gadgets/EngineBronze.java b/src/main/java/forestry/energy/gadgets/EngineBronze.java index 8efcc62fb..cb0728de6 100755 --- a/src/main/java/forestry/energy/gadgets/EngineBronze.java +++ b/src/main/java/forestry/energy/gadgets/EngineBronze.java @@ -407,7 +407,7 @@ public class EngineBronze extends Engine implements ISpecialInventory, ILiquidTa @Override public String getInventoryName() { - return "engine.2.name"; + return getUnlocalizedName(); } /** diff --git a/src/main/java/forestry/energy/gadgets/EngineCopper.java b/src/main/java/forestry/energy/gadgets/EngineCopper.java index 4612eb923..eb371b303 100755 --- a/src/main/java/forestry/energy/gadgets/EngineCopper.java +++ b/src/main/java/forestry/energy/gadgets/EngineCopper.java @@ -399,7 +399,7 @@ public class EngineCopper extends Engine implements ISpecialInventory, ISidedInv @Override public String getInventoryName() { - return "engine.1.name"; + return getUnlocalizedName(); } /** diff --git a/src/main/java/forestry/energy/gadgets/EngineTin.java b/src/main/java/forestry/energy/gadgets/EngineTin.java index 690803635..b138b889f 100755 --- a/src/main/java/forestry/energy/gadgets/EngineTin.java +++ b/src/main/java/forestry/energy/gadgets/EngineTin.java @@ -313,7 +313,7 @@ public class EngineTin extends Engine implements ISocketable, IInventory { @Override public String getInventoryName() { - return "engine.0.name"; + return getUnlocalizedName(); } /** diff --git a/src/main/java/forestry/energy/gadgets/MachineGenerator.java b/src/main/java/forestry/energy/gadgets/MachineGenerator.java index 2dc316e37..bab24cd96 100755 --- a/src/main/java/forestry/energy/gadgets/MachineGenerator.java +++ b/src/main/java/forestry/energy/gadgets/MachineGenerator.java @@ -65,7 +65,7 @@ public class MachineGenerator extends TileBase implements ISpecialInventory, ILi @Override public String getInventoryName() { - return "engine.3.name"; + return getUnlocalizedName(); } @Override diff --git a/src/main/java/forestry/energy/gui/GuiEngine.java b/src/main/java/forestry/energy/gui/GuiEngine.java index 60e8dd175..5646a44a3 100755 --- a/src/main/java/forestry/energy/gui/GuiEngine.java +++ b/src/main/java/forestry/energy/gui/GuiEngine.java @@ -15,12 +15,12 @@ package forestry.energy.gui; import forestry.core.gadgets.Engine; import forestry.core.gui.ContainerForestry; -import forestry.core.gui.GuiForestry; +import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.Ledger; import forestry.core.render.TextureManager; import forestry.core.utils.StringUtil; -public abstract class GuiEngine extends GuiForestry { +public abstract class GuiEngine extends GuiForestryTitled { protected class EngineLedger extends Ledger { diff --git a/src/main/java/forestry/energy/gui/GuiEngineBronze.java b/src/main/java/forestry/energy/gui/GuiEngineBronze.java index 6d503383f..c73d78556 100755 --- a/src/main/java/forestry/energy/gui/GuiEngineBronze.java +++ b/src/main/java/forestry/energy/gui/GuiEngineBronze.java @@ -107,13 +107,6 @@ public class GuiEngineBronze extends GuiEngine { return (EngineBronze)tile; } - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localizeTile(tile.getInventoryName()); - this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); - } - @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); diff --git a/src/main/java/forestry/energy/gui/GuiEngineCopper.java b/src/main/java/forestry/energy/gui/GuiEngineCopper.java index 16ceee26e..df8193097 100755 --- a/src/main/java/forestry/energy/gui/GuiEngineCopper.java +++ b/src/main/java/forestry/energy/gui/GuiEngineCopper.java @@ -26,14 +26,6 @@ public class GuiEngineCopper extends GuiEngine { return (EngineCopper)tile; } - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localizeTile(tile.getInventoryName()); - this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); - this.fontRendererObj.drawString("Inventory", 8, this.ySize - 96 + 2, fontColor.get("gui.title")); - } - @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); diff --git a/src/main/java/forestry/energy/gui/GuiEngineTin.java b/src/main/java/forestry/energy/gui/GuiEngineTin.java index 396988c40..f1942c073 100755 --- a/src/main/java/forestry/energy/gui/GuiEngineTin.java +++ b/src/main/java/forestry/energy/gui/GuiEngineTin.java @@ -29,13 +29,6 @@ public class GuiEngineTin extends GuiEngine { return (EngineTin)tile; } - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localizeTile(tile.getInventoryName()); - this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); - } - @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); diff --git a/src/main/java/forestry/energy/gui/GuiGenerator.java b/src/main/java/forestry/energy/gui/GuiGenerator.java index e4fdafb93..673f10fd4 100755 --- a/src/main/java/forestry/energy/gui/GuiGenerator.java +++ b/src/main/java/forestry/energy/gui/GuiGenerator.java @@ -13,25 +13,17 @@ package forestry.energy.gui; import net.minecraft.entity.player.InventoryPlayer; import forestry.core.config.Defaults; -import forestry.core.gui.GuiForestry; +import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; -import forestry.core.utils.StringUtil; import forestry.energy.gadgets.MachineGenerator; -public class GuiGenerator extends GuiForestry { +public class GuiGenerator extends GuiForestryTitled { public GuiGenerator(InventoryPlayer inventory, MachineGenerator tile) { super(Defaults.TEXTURE_PATH_GUI + "/generator.png", new ContainerGenerator(inventory, tile), tile); widgetManager.add(new TankWidget(this.widgetManager, 49, 17, 0)); } - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String title = StringUtil.localizeTile(tile.getInventoryName()); - this.fontRendererObj.drawString(title, getCenteredOffset(title), 6, fontColor.get("gui.title")); - } - @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); diff --git a/src/main/java/forestry/factory/gadgets/MachineBottler.java b/src/main/java/forestry/factory/gadgets/MachineBottler.java index 0dba330d5..d0e21c0f6 100755 --- a/src/main/java/forestry/factory/gadgets/MachineBottler.java +++ b/src/main/java/forestry/factory/gadgets/MachineBottler.java @@ -166,7 +166,7 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq @Override public String getInventoryName() { - return "factory.0.name"; + return getUnlocalizedName(); } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java index 913c7803f..dff58d5a9 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java @@ -237,7 +237,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL @Override public String getInventoryName() { - return "factory.1.name"; + return getUnlocalizedName(); } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java index 3133ca12b..7f1a308ce 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java +++ b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java @@ -148,7 +148,7 @@ public class MachineCentrifuge extends TilePowered implements ISidedInventory, I @Override public String getInventoryName() { - return "factory.2.name"; + return getUnlocalizedName(); } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineFabricator.java b/src/main/java/forestry/factory/gadgets/MachineFabricator.java index 07e67d597..b48331af8 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFabricator.java +++ b/src/main/java/forestry/factory/gadgets/MachineFabricator.java @@ -246,7 +246,7 @@ public class MachineFabricator extends TilePowered implements ICrafter, ISpecial @Override public String getInventoryName() { - return "factory2.0.name"; + return getUnlocalizedName(); } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineFermenter.java b/src/main/java/forestry/factory/gadgets/MachineFermenter.java index 7a1f8c962..de78cb441 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFermenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineFermenter.java @@ -198,7 +198,7 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL @Override public String getInventoryName() { - return "factory.3.name"; + return getUnlocalizedName(); } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineMoistener.java b/src/main/java/forestry/factory/gadgets/MachineMoistener.java index 25285b966..95fb05177 100755 --- a/src/main/java/forestry/factory/gadgets/MachineMoistener.java +++ b/src/main/java/forestry/factory/gadgets/MachineMoistener.java @@ -145,7 +145,7 @@ public class MachineMoistener extends TilePowered implements ISpecialInventory, @Override public String getInventoryName() { - return "factory.4.name"; + return getUnlocalizedName(); } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineRaintank.java b/src/main/java/forestry/factory/gadgets/MachineRaintank.java index 4310b170b..bd0612c9a 100755 --- a/src/main/java/forestry/factory/gadgets/MachineRaintank.java +++ b/src/main/java/forestry/factory/gadgets/MachineRaintank.java @@ -70,7 +70,7 @@ public class MachineRaintank extends TileBase implements ISidedInventory, ILiqui @Override public String getInventoryName() { - return "factory2.1.name"; + return getUnlocalizedName(); } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java index fc2e30d33..ea78aff6c 100755 --- a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java +++ b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java @@ -154,7 +154,7 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I @Override public String getInventoryName() { - return "factory.5.name"; + return getUnlocalizedName(); } @Override diff --git a/src/main/java/forestry/factory/gadgets/MachineStill.java b/src/main/java/forestry/factory/gadgets/MachineStill.java index ac1a20fd9..e8ba3949b 100755 --- a/src/main/java/forestry/factory/gadgets/MachineStill.java +++ b/src/main/java/forestry/factory/gadgets/MachineStill.java @@ -133,7 +133,7 @@ public class MachineStill extends TilePowered implements ISpecialInventory, ISid @Override public String getInventoryName() { - return "factory.6.name"; + return getUnlocalizedName(); } @Override diff --git a/src/main/java/forestry/factory/gadgets/MillRainmaker.java b/src/main/java/forestry/factory/gadgets/MillRainmaker.java index f4a5f0784..3bbab49e7 100755 --- a/src/main/java/forestry/factory/gadgets/MillRainmaker.java +++ b/src/main/java/forestry/factory/gadgets/MillRainmaker.java @@ -34,7 +34,7 @@ public class MillRainmaker extends Mill implements ISpecialInventory { @Override public String getInventoryName() { - return "factory.7.name"; + return getUnlocalizedName(); } @Override diff --git a/src/main/java/forestry/factory/gadgets/TileWorktable.java b/src/main/java/forestry/factory/gadgets/TileWorktable.java index 334194814..a507e0b5c 100755 --- a/src/main/java/forestry/factory/gadgets/TileWorktable.java +++ b/src/main/java/forestry/factory/gadgets/TileWorktable.java @@ -365,11 +365,6 @@ public class TileWorktable extends TileBase implements ICrafter { memorized = new RecipeMemory(); } - @Override - public String getInventoryName() { - return "factory2.2.name"; - } - @Override public void openGui(EntityPlayer player, TileBase tile) { player.openGui(ForestryAPI.instance, GuiId.WorktableGUI.ordinal(), player.worldObj, xCoord, yCoord, zCoord); diff --git a/src/main/java/forestry/factory/gui/GuiBottler.java b/src/main/java/forestry/factory/gui/GuiBottler.java index 23e4ac39a..fd24dc271 100755 --- a/src/main/java/forestry/factory/gui/GuiBottler.java +++ b/src/main/java/forestry/factory/gui/GuiBottler.java @@ -13,25 +13,17 @@ package forestry.factory.gui; import net.minecraft.entity.player.InventoryPlayer; import forestry.core.config.Defaults; -import forestry.core.gui.GuiForestry; +import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; -import forestry.core.utils.StringUtil; import forestry.factory.gadgets.MachineBottler; -public class GuiBottler extends GuiForestry { +public class GuiBottler extends GuiForestryTitled { public GuiBottler(InventoryPlayer inventory, MachineBottler processor) { super(Defaults.TEXTURE_PATH_GUI + "/bottler.png", new ContainerBottler(inventory, processor), processor); widgetManager.add(new TankWidget(this.widgetManager, 53, 17, 0)); } - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localizeTile(tile.getInventoryName()); - this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); - } - @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); diff --git a/src/main/java/forestry/factory/gui/GuiCarpenter.java b/src/main/java/forestry/factory/gui/GuiCarpenter.java index e99f5ccf8..655e8df89 100755 --- a/src/main/java/forestry/factory/gui/GuiCarpenter.java +++ b/src/main/java/forestry/factory/gui/GuiCarpenter.java @@ -13,12 +13,11 @@ package forestry.factory.gui; import net.minecraft.entity.player.InventoryPlayer; import forestry.core.config.Defaults; -import forestry.core.gui.GuiForestry; +import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; -import forestry.core.utils.StringUtil; import forestry.factory.gadgets.MachineCarpenter; -public class GuiCarpenter extends GuiForestry { +public class GuiCarpenter extends GuiForestryTitled { public GuiCarpenter(InventoryPlayer inventory, MachineCarpenter tile) { super(Defaults.TEXTURE_PATH_GUI + "/carpenter.png", new ContainerCarpenter(inventory, tile), tile); @@ -33,13 +32,6 @@ public class GuiCarpenter extends GuiForestry { inventorySlots.onContainerClosed(mc.thePlayer); } - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localizeTile(tile.getInventoryName()); - this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); - } - @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); diff --git a/src/main/java/forestry/factory/gui/GuiCentrifuge.java b/src/main/java/forestry/factory/gui/GuiCentrifuge.java index 7bbb4d708..dde1b62c8 100755 --- a/src/main/java/forestry/factory/gui/GuiCentrifuge.java +++ b/src/main/java/forestry/factory/gui/GuiCentrifuge.java @@ -13,23 +13,15 @@ package forestry.factory.gui; import net.minecraft.entity.player.InventoryPlayer; import forestry.core.config.Defaults; -import forestry.core.gui.GuiForestry; -import forestry.core.utils.StringUtil; +import forestry.core.gui.GuiForestryTitled; import forestry.factory.gadgets.MachineCentrifuge; -public class GuiCentrifuge extends GuiForestry { +public class GuiCentrifuge extends GuiForestryTitled { public GuiCentrifuge(InventoryPlayer inventory, MachineCentrifuge tile) { super(Defaults.TEXTURE_PATH_GUI + "/centrifuge.png", new ContainerCentrifuge(inventory, tile), tile); } - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localizeTile(tile.getInventoryName()); - this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); - } - @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); diff --git a/src/main/java/forestry/factory/gui/GuiFabricator.java b/src/main/java/forestry/factory/gui/GuiFabricator.java index 3e78bf001..e15044361 100755 --- a/src/main/java/forestry/factory/gui/GuiFabricator.java +++ b/src/main/java/forestry/factory/gui/GuiFabricator.java @@ -13,12 +13,11 @@ package forestry.factory.gui; import net.minecraft.entity.player.InventoryPlayer; import forestry.core.config.Defaults; -import forestry.core.gui.GuiForestry; +import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.ReservoirWidget; -import forestry.core.utils.StringUtil; import forestry.factory.gadgets.MachineFabricator; -public class GuiFabricator extends GuiForestry { +public class GuiFabricator extends GuiForestryTitled { public GuiFabricator(InventoryPlayer player, MachineFabricator tile) { super(Defaults.TEXTURE_PATH_GUI + "/fabricator.png", new ContainerFabricator(player, tile), tile); @@ -26,13 +25,6 @@ public class GuiFabricator extends GuiForestry { widgetManager.add(new ReservoirWidget(this.widgetManager, 26, 48, 0)); } - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localizeTile(tile.getInventoryName()); - this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); - } - @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); diff --git a/src/main/java/forestry/factory/gui/GuiFermenter.java b/src/main/java/forestry/factory/gui/GuiFermenter.java index f040c761e..1d51ba00b 100755 --- a/src/main/java/forestry/factory/gui/GuiFermenter.java +++ b/src/main/java/forestry/factory/gui/GuiFermenter.java @@ -13,12 +13,11 @@ package forestry.factory.gui; import net.minecraft.entity.player.InventoryPlayer; import forestry.core.config.Defaults; -import forestry.core.gui.GuiForestry; +import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; -import forestry.core.utils.StringUtil; import forestry.factory.gadgets.MachineFermenter; -public class GuiFermenter extends GuiForestry { +public class GuiFermenter extends GuiForestryTitled { public GuiFermenter(InventoryPlayer inventory, MachineFermenter tile) { super(Defaults.TEXTURE_PATH_GUI + "/fermenter.png", new ContainerFermenter(inventory, tile), tile); @@ -26,13 +25,6 @@ public class GuiFermenter extends GuiForestry { widgetManager.add(new TankWidget(this.widgetManager, 125, 19, 1)); } - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localizeTile(tile.getInventoryName()); - this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); - } - @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); diff --git a/src/main/java/forestry/factory/gui/GuiMoistener.java b/src/main/java/forestry/factory/gui/GuiMoistener.java index b445ecff1..e4fbd864d 100755 --- a/src/main/java/forestry/factory/gui/GuiMoistener.java +++ b/src/main/java/forestry/factory/gui/GuiMoistener.java @@ -13,25 +13,17 @@ package forestry.factory.gui; import net.minecraft.entity.player.InventoryPlayer; import forestry.core.config.Defaults; -import forestry.core.gui.GuiForestry; +import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; -import forestry.core.utils.StringUtil; import forestry.factory.gadgets.MachineMoistener; -public class GuiMoistener extends GuiForestry { +public class GuiMoistener extends GuiForestryTitled { public GuiMoistener(InventoryPlayer inventory, MachineMoistener tile) { super(Defaults.TEXTURE_PATH_GUI + "/moistener.png", new ContainerMoistener(inventory, tile), tile); widgetManager.add(new TankWidget(this.widgetManager, 16, 16, 0)); } - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localizeTile(tile.getInventoryName()); - this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); - } - @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); diff --git a/src/main/java/forestry/factory/gui/GuiRaintank.java b/src/main/java/forestry/factory/gui/GuiRaintank.java index 5a62fe33c..02a93a01c 100755 --- a/src/main/java/forestry/factory/gui/GuiRaintank.java +++ b/src/main/java/forestry/factory/gui/GuiRaintank.java @@ -13,25 +13,17 @@ package forestry.factory.gui; import net.minecraft.entity.player.InventoryPlayer; import forestry.core.config.Defaults; -import forestry.core.gui.GuiForestry; +import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; -import forestry.core.utils.StringUtil; import forestry.factory.gadgets.MachineRaintank; -public class GuiRaintank extends GuiForestry { +public class GuiRaintank extends GuiForestryTitled { public GuiRaintank(InventoryPlayer inventory, MachineRaintank tile) { super(Defaults.TEXTURE_PATH_GUI + "/raintank.png", new ContainerRaintank(inventory, tile), tile); widgetManager.add(new TankWidget(this.widgetManager, 53, 17, 0)); } - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localizeTile(tile.getInventoryName()); - this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); - } - @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); diff --git a/src/main/java/forestry/factory/gui/GuiSqueezer.java b/src/main/java/forestry/factory/gui/GuiSqueezer.java index f70c95a43..93797d6ec 100755 --- a/src/main/java/forestry/factory/gui/GuiSqueezer.java +++ b/src/main/java/forestry/factory/gui/GuiSqueezer.java @@ -13,25 +13,17 @@ package forestry.factory.gui; import net.minecraft.entity.player.InventoryPlayer; import forestry.core.config.Defaults; -import forestry.core.gui.GuiForestry; +import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; -import forestry.core.utils.StringUtil; import forestry.factory.gadgets.MachineSqueezer; -public class GuiSqueezer extends GuiForestry { +public class GuiSqueezer extends GuiForestryTitled { public GuiSqueezer(InventoryPlayer inventory, MachineSqueezer tile) { super(Defaults.TEXTURE_PATH_GUI + "/squeezer.png", new ContainerSqueezer(inventory, tile), tile); widgetManager.add(new TankWidget(this.widgetManager, 85, 15, 0)); } - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localizeTile(tile.getInventoryName()); - this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); - } - @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); diff --git a/src/main/java/forestry/factory/gui/GuiStill.java b/src/main/java/forestry/factory/gui/GuiStill.java index 4e01269e5..2fcb8cd1f 100755 --- a/src/main/java/forestry/factory/gui/GuiStill.java +++ b/src/main/java/forestry/factory/gui/GuiStill.java @@ -13,12 +13,11 @@ package forestry.factory.gui; import net.minecraft.entity.player.InventoryPlayer; import forestry.core.config.Defaults; -import forestry.core.gui.GuiForestry; +import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.widgets.TankWidget; -import forestry.core.utils.StringUtil; import forestry.factory.gadgets.MachineStill; -public class GuiStill extends GuiForestry { +public class GuiStill extends GuiForestryTitled { public GuiStill(InventoryPlayer inventory, MachineStill tile) { super(Defaults.TEXTURE_PATH_GUI + "/still.png", new ContainerStill(inventory, tile), tile); @@ -26,13 +25,6 @@ public class GuiStill extends GuiForestry { widgetManager.add(new TankWidget(this.widgetManager, 125, 15, 1)); } - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localizeTile(tile.getInventoryName()); - this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); - } - @Override protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); diff --git a/src/main/java/forestry/factory/gui/GuiWorktable.java b/src/main/java/forestry/factory/gui/GuiWorktable.java index 23639fc60..e14044014 100755 --- a/src/main/java/forestry/factory/gui/GuiWorktable.java +++ b/src/main/java/forestry/factory/gui/GuiWorktable.java @@ -19,7 +19,7 @@ import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; import forestry.core.config.Defaults; -import forestry.core.gui.GuiForestry; +import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.WidgetManager; import forestry.core.gui.widgets.Widget; import forestry.core.proxy.Proxies; @@ -28,7 +28,7 @@ import forestry.core.render.TextureManager; import forestry.core.utils.StringUtil; import forestry.factory.gadgets.TileWorktable; -public class GuiWorktable extends GuiForestry { +public class GuiWorktable extends GuiForestryTitled { private class MemorizedSlot extends Widget { @@ -118,7 +118,7 @@ public class GuiWorktable extends GuiForestry { protected ContainerWorktable container; public GuiWorktable(EntityPlayer player, TileWorktable tile) { - super(Defaults.TEXTURE_PATH_GUI + "/worktable.png", new ContainerWorktable(player, tile)); + super(Defaults.TEXTURE_PATH_GUI + "/worktable.png", new ContainerWorktable(player, tile), tile); ySize = 218; worktable = tile; @@ -139,10 +139,4 @@ public class GuiWorktable extends GuiForestry { widgetManager.add(new MemorizedSlot(widgetManager, 128, 20, 7)); } - @Override - protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localizeTile(tile.getInventoryName()); - this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title")); - } } diff --git a/src/main/java/forestry/farming/gadgets/TileFarm.java b/src/main/java/forestry/farming/gadgets/TileFarm.java index 82076a604..63f87ea2d 100755 --- a/src/main/java/forestry/farming/gadgets/TileFarm.java +++ b/src/main/java/forestry/farming/gadgets/TileFarm.java @@ -349,11 +349,6 @@ public abstract class TileFarm extends TileForestry implements IFarmComponent { public void removeListener(IFarmListener listener) { } - @Override - public String getInventoryName() { - return "Farm"; - } - /* INTERACTION */ @Override public boolean isUseableByPlayer(EntityPlayer player) { diff --git a/src/main/java/forestry/farming/gadgets/TileHatch.java b/src/main/java/forestry/farming/gadgets/TileHatch.java index 59a52c946..d8ba476f7 100755 --- a/src/main/java/forestry/farming/gadgets/TileHatch.java +++ b/src/main/java/forestry/farming/gadgets/TileHatch.java @@ -240,6 +240,11 @@ public class TileHatch extends TileFarm implements ISidedInventory { public void closeInventory() { } + @Override + public String getInventoryName() { + return getUnlocalizedName(); + } + /** * TODO: just a specialsource workaround */ diff --git a/src/main/java/forestry/mail/gadgets/MachineMailbox.java b/src/main/java/forestry/mail/gadgets/MachineMailbox.java index d95031745..6e6645d13 100755 --- a/src/main/java/forestry/mail/gadgets/MachineMailbox.java +++ b/src/main/java/forestry/mail/gadgets/MachineMailbox.java @@ -53,7 +53,7 @@ public class MachineMailbox extends TileBase implements IMailContainer, ISpecial @Override public String getInventoryName() { - return "mail.0.name"; + return getUnlocalizedName(); } /* GUI */ diff --git a/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java b/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java index f334336b9..5352cf720 100755 --- a/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java +++ b/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java @@ -37,7 +37,7 @@ public class MachinePhilatelist extends TileBase implements IInventory { @Override public String getInventoryName() { - return "mail.2.name"; + return getUnlocalizedName(); } @Override diff --git a/src/main/java/forestry/mail/gadgets/MachineTrader.java b/src/main/java/forestry/mail/gadgets/MachineTrader.java index 0bd02ad59..2b9812530 100755 --- a/src/main/java/forestry/mail/gadgets/MachineTrader.java +++ b/src/main/java/forestry/mail/gadgets/MachineTrader.java @@ -50,7 +50,7 @@ public class MachineTrader extends TileBase implements ISpecialInventory, ISided @Override public String getInventoryName() { - return "mail.1.name"; + return getUnlocalizedName(); } @Override diff --git a/src/main/java/forestry/mail/gui/GuiTrader.java b/src/main/java/forestry/mail/gui/GuiTrader.java index 23d4c3c36..4ce91a6b3 100755 --- a/src/main/java/forestry/mail/gui/GuiTrader.java +++ b/src/main/java/forestry/mail/gui/GuiTrader.java @@ -32,7 +32,7 @@ public class GuiTrader extends GuiForestry { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { super.drawGuiContainerForegroundLayer(mouseX, mouseY); - String name = StringUtil.localizeTile(tile.getInventoryName()); + String name = StringUtil.localizeTile(tile.getUnlocalizedName()); this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.mail.text")); String receive = StringUtil.localize("gui.mail.receive"); From a73fd60d1fad2260c819420348c22ea6a754f46b Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 12 Sep 2014 01:55:49 -0700 Subject: [PATCH 47/49] Replace Worktable's book with a small X --- lang | 2 +- .../factory/gadgets/TileWorktable.java | 12 +++-- .../factory/gui/ContainerWorktable.java | 4 ++ .../forestry/factory/gui/GuiWorktable.java | 47 ++++++------------ .../forestry/textures/gui/worktable.png | Bin 2120 -> 1540 bytes 5 files changed, 29 insertions(+), 36 deletions(-) diff --git a/lang b/lang index 4204c1c2b..6a0217f4a 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 4204c1c2bbc668447f0914f79469d390e730637e +Subproject commit 6a0217f4ae1594a1e82ca61303242b1161cdd724 diff --git a/src/main/java/forestry/factory/gadgets/TileWorktable.java b/src/main/java/forestry/factory/gadgets/TileWorktable.java index a507e0b5c..6ae55cde3 100755 --- a/src/main/java/forestry/factory/gadgets/TileWorktable.java +++ b/src/main/java/forestry/factory/gadgets/TileWorktable.java @@ -193,6 +193,7 @@ public class TileWorktable extends TileBase implements ICrafter { private LinkedList recipes = new LinkedList(); private long lastUpdate; + public final int capacity = 9; public long getLastUpdate() { return lastUpdate; @@ -204,10 +205,13 @@ public class TileWorktable extends TileBase implements ICrafter { recipe.updateLastUse(world); Recipe memory = getMemorized(crafting, world); - if (memory != null) - recipes.remove(memory); + if (memory != null) { + int index = recipes.indexOf(memory); + recipes.set(index, recipe); + return; + } - if (recipes.size() < 8) { + if (recipes.size() < capacity) { recipes.add(recipe); return; } @@ -413,7 +417,7 @@ public class TileWorktable extends TileBase implements ICrafter { } public void chooseRecipe(int recipeIndex) { - if (recipeIndex == 9) { + if (recipeIndex >= memorized.capacity) { for (int slot = 0; slot < craftingInventory.getSizeInventory(); slot++) { craftingInventory.setInventorySlotContents(slot, null); } diff --git a/src/main/java/forestry/factory/gui/ContainerWorktable.java b/src/main/java/forestry/factory/gui/ContainerWorktable.java index 15d74c5a1..62a190aec 100755 --- a/src/main/java/forestry/factory/gui/ContainerWorktable.java +++ b/src/main/java/forestry/factory/gui/ContainerWorktable.java @@ -115,6 +115,10 @@ public class ContainerWorktable extends ContainerForestry implements IContainerC tile.setRecipe(craftMatrix); } + public void clearRecipe() { + sendRecipeClick(0, tile.getMemory().capacity); + } + public void sendRecipeClick(int mouseButton, int recipeIndex) { PacketPayload payload = new PacketPayload(2, 0, 0); payload.intPayload[0] = mouseButton; diff --git a/src/main/java/forestry/factory/gui/GuiWorktable.java b/src/main/java/forestry/factory/gui/GuiWorktable.java index e14044014..b1b8495d7 100755 --- a/src/main/java/forestry/factory/gui/GuiWorktable.java +++ b/src/main/java/forestry/factory/gui/GuiWorktable.java @@ -82,36 +82,21 @@ public class GuiWorktable extends GuiForestryTitled { } } - private class BookSlot extends Widget { + private class ClearWorktable extends Widget { - private final ItemStack BOOK = new ItemStack(Items.book); - - public BookSlot(WidgetManager manager, int xPos, int yPos) { + public ClearWorktable(WidgetManager manager, int xPos, int yPos) { super(manager, xPos, yPos); + width = 7; + height = 7; } @Override public void draw(int startX, int startY) { - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); - RenderHelper.enableGUIStandardItemLighting(); - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - manager.gui.drawItemStack(BOOK, startX + xPos, startY + yPos); - - GL11.glPopAttrib(); - } - - @Override - protected String getLegacyTooltip(EntityPlayer player) { - return StringUtil.localize("gui.worktable.clear"); } @Override public void handleMouseClick(int mouseX, int mouseY, int mouseButton) { - container.sendRecipeClick(mouseButton, 9); + container.clearRecipe(); } } private final TileWorktable worktable; @@ -125,18 +110,18 @@ public class GuiWorktable extends GuiForestryTitled { this.tile = tile; container = (ContainerWorktable) inventorySlots; - widgetManager.add(new BookSlot(widgetManager, 128, 38)); + final int spacing = 18; + int slot = 0; + for (int y = 0; y < 3; y++) { + int yPos = 20 + (y * spacing); + for (int x = 0; x < 3; x++) { + int xPos = 110 + (x * spacing); + widgetManager.add(new MemorizedSlot(widgetManager, xPos, yPos, slot)); + slot += 1; + } + } - widgetManager.add(new MemorizedSlot(widgetManager, 146, 20, 0)); - widgetManager.add(new MemorizedSlot(widgetManager, 146, 38, 1)); - widgetManager.add(new MemorizedSlot(widgetManager, 146, 56, 2)); - - widgetManager.add(new MemorizedSlot(widgetManager, 128, 56, 3)); - widgetManager.add(new MemorizedSlot(widgetManager, 110, 56, 4)); - - widgetManager.add(new MemorizedSlot(widgetManager, 110, 38, 5)); - widgetManager.add(new MemorizedSlot(widgetManager, 110, 20, 6)); - widgetManager.add(new MemorizedSlot(widgetManager, 128, 20, 7)); + widgetManager.add(new ClearWorktable(widgetManager, 66, 19)); } } diff --git a/src/main/resources/assets/forestry/textures/gui/worktable.png b/src/main/resources/assets/forestry/textures/gui/worktable.png index dd59d8ff065dc9920cc371e2b667aac73ab42af4..48d18d27eff4aff141740d414ac964da60de650f 100755 GIT binary patch literal 1540 zcmaJ>eN0o+a!lY-D!N*79+wq!L6j7Q%Cp5=Y`-o+OD zSS2L7Fk>bW6I~RSU_wT8egu;7ht2)~7c)c1jJmi8Dw#lsB$_NRwt8Qoltt^wOYS-6 z{?6~5d+vGnjIYsMkYAh+04VU(lYRhHNL2xi8ZD8rP!KIe&=rCKp&dpki2*gV(8gdM zj_P3i3`O_6c$KLHK#jA(5Da-6h_JxvC#u{NfIwF!p4|56e%L$8>FjZh%f}?B_ z-A?$)x~*Kua^Rg1iiBPtjYf4*vrdpY^hUegu5g%4T7=NbJv^jhT3#;AFp!KKmRJ$8 z0*@(-RGZKZ9XP6V^9Y={P0Pz$Z9)yx$0$*6)ESf`Wq@Aq|3f)$8!baWldbnZiRECA z$msoyEObj@baCyaN-B|XN(==BDJTeCnJ)S|1t`d!f`~Z-R_v)0EKdtjxh#$MdI=9N zLy8YG9@2p$1|7@NgxzGTAzfydxuzU--BoV4n`>+?gUwuFF_=l4Jrhd`;ckxMVJ4Q& z#@6MGRYrjmQD%~n*q0c(P7*jQePn{oU5hg(-&QQ0yB0EMtR5AkS1xwPMQ2=SdK7hg zY>}}&_zaJxT|#3$eZB82`Xvm$hM;R;U|?!$DwRq>2rDWokh`g=X=7t!X=y2$OfD}k zudS`k&(AL`EUd4uBUp>Q_&x$1fd0k+GIt7?D{U?UU>D{gYl5*G$)9iYeTGN(%v~8< znY?p)VvxJ~YiRGqA>ViMhVz9Bi-U!$BbImHxjQPQjvsydUQqq|^+0O6WI}bQcl0;o z1UQ7!WM#Pd$kH>n)mYOHn%08&TH@raY454$T{l#TWaPcC&a0~S?;8M*zxMqXL)X*| zpUr?<_YbQ+cR!bu6L&^Rbcxd|%3HD}T?esih4eA@oThoe5qOjQcQ5bv@9~}M`Q=EV2i!bBw-c4}EH)E;wQ{aOk_S$>@*8U#*`|bU${e!b3 zbBWqYH2_#*zl-4tfM8Puh$`6Nb4+j;8&nQDFc~nvAO)fl9)_q!?(&QVP`|s-ky{r+ zq!>tuv1jcd^eO8v*3s0~J`;i=UG|KvZYO%BeU%|=p6LkD5&%006pXuOQywKdzAYw{$Y9_zNNH+W+jGlP7; zrN#a>JEllOFvu~a3xMK~2}|68s|Hnrra~Ox!Cw_E?Z&$yU<|zvJbjfx02Kshv9(d! zt6oX?O%rI;K%rvi_jd~{=Y?~L^f*zT)qXIywdnPy>9!>t;AbGpV5+Nbstv451=xlr zNtCO^$kO``!CXtDzP`S!&Q#HVWm$3f5i4>AZzc7amAtFeqgJ7qlTY(>smft$2%P{z zRYVH{8rp=_HZ&S7b#5*}3u;*2hGI4DdrO&%pJ!$nf7Td+CtiCX?VoMA@A9<6a%OSh z!2Q}O(E+@Kk9mH|jXTYdHk{p1qrM(86<-1EjON<;_@f_aol+Xl zi;%|_krU?Kwc$L!n1j13O2q>BRQe`Q8(@NW^Z%w;YyfJ@ph&LcYICQA`a-7#uXaqd(A7P)k6c z=j8h(vht-R`tJfv z(06mHd@s@^aVsBhDAUL)F-}dDrgkp}^LtKWg{*9Eqv7=v2CtlO@TOZy&{m)?`effA z|HW5>147P{MK<%bz+KTlKO}!f9!scPMk0ylj$e8d(h#z_Ds3nYDD$@5Pp!h1>LhlP zFkbe)v@{S+E9-wY$;X4v@F0&cku9D#wv+b-c|5V@M8vPwbj|sd7c{r`fct8Kq zk7pM*%$s>Bz1t=6i%7c68WBJIi3|Rc-FZW$EqiROJhh5~yBrV%ow{+;Ok6xSx_thY zJBh)FAD{A<(ic^{UE_Dy=q>Tm)#CDer?4Euc*R&pseRI{T=I4@u5$XmV~%3RY@#_o zhcOl}LL$B4vHV3ZuHdR8?dsWkD({g{cDb!$X10T7XLo1vcK-cB+L>yjG=t-@v17AV zHLprlJleXrp+zm#!~W*CCgh)P@SgYd+`dK&%DphG%JUQkU3hr2 zb0Yguhh2F8Qo$!Le)u6OthX-o{P<$y%CoP89w~uy%|RFbN>R2`=B_=-1z1G^lvvbC zhO*1SW`1{kT2JOhJG~^3CiJx+G!lJGJg@JGYdmdDqurVsU6&ZF3YOGv(~^=BhdDc^ ze7gkcK+k|UbkJii?#vh-8vedwnTdgcZ^H>vhCbc*^K_P_Y;4@g0lF)$1td4lxB|L` zn#A~Lk}}jpe`H=CS&bqvnm-$28NIBcE%40W62|hykjstGXohf8g{!dDUu@d zwisr?(_l>!iAtq*i4SDDAZ`(;o^`)=$p_lz7h|`U})Q0SFo6OG;cl=R?Bz5HDw|2qL(h$Nx_>x!^AF6yTYW%ZDV zuGnJjzti7vAuF3(htr{+iYl(hRbPQG0g5cK07D(UasP{~FFuHng0a}XZ9!cYwU4|% zx#e7WBUTs}$SpIOKhh*heH&w)TV$UEX8wW_%m%^ aBlZgjyU4cSk+2T{fc*|fM)@}X@BRh54ODpm From fe86b4d08bb8e08c55f8c2ee61e08a6226065771 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 11 Sep 2014 22:50:29 -0700 Subject: [PATCH 48/49] Updated PluginNatura for latest Natura --- src/main/java/forestry/plugins/PluginNatura.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/forestry/plugins/PluginNatura.java b/src/main/java/forestry/plugins/PluginNatura.java index 5ccf0fba9..4e4905968 100755 --- a/src/main/java/forestry/plugins/PluginNatura.java +++ b/src/main/java/forestry/plugins/PluginNatura.java @@ -50,14 +50,14 @@ public class PluginNatura extends NativePlugin { logWillow = GameRegistry.findBlock(NATURA, "willow"); leavesNatura = GameRegistry.findBlock(NATURA, "floraleaves"); saplingNatura = GameRegistry.findBlock(NATURA, "florasapling"); - saplingNaturaRare = GameRegistry.findBlock(NATURA, "Rare Sapling"); + saplingNaturaRare = GameRegistry.findBlock(NATURA, "RareSapling"); ArrayList saplingItemKeys = new ArrayList(); if(saplingNatura != null) saplingItemKeys.add("florasapling"); if(saplingNaturaRare != null) - saplingItemKeys.add("Rare Sapling"); + saplingItemKeys.add("RareSapling"); for (String key : saplingItemKeys) { Item saplingItem = GameRegistry.findItem(NATURA, key); From d6c3c8093c8ba4b452740e99d30a6589b733ea6c Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 12 Sep 2014 02:01:03 -0700 Subject: [PATCH 49/49] Revert "Updated PluginNatura for latest Natura" (it's not released yet) This reverts commit fe86b4d08bb8e08c55f8c2ee61e08a6226065771. --- src/main/java/forestry/plugins/PluginNatura.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/forestry/plugins/PluginNatura.java b/src/main/java/forestry/plugins/PluginNatura.java index 4e4905968..5ccf0fba9 100755 --- a/src/main/java/forestry/plugins/PluginNatura.java +++ b/src/main/java/forestry/plugins/PluginNatura.java @@ -50,14 +50,14 @@ public class PluginNatura extends NativePlugin { logWillow = GameRegistry.findBlock(NATURA, "willow"); leavesNatura = GameRegistry.findBlock(NATURA, "floraleaves"); saplingNatura = GameRegistry.findBlock(NATURA, "florasapling"); - saplingNaturaRare = GameRegistry.findBlock(NATURA, "RareSapling"); + saplingNaturaRare = GameRegistry.findBlock(NATURA, "Rare Sapling"); ArrayList saplingItemKeys = new ArrayList(); if(saplingNatura != null) saplingItemKeys.add("florasapling"); if(saplingNaturaRare != null) - saplingItemKeys.add("RareSapling"); + saplingItemKeys.add("Rare Sapling"); for (String key : saplingItemKeys) { Item saplingItem = GameRegistry.findItem(NATURA, key);