From 6e8590308f89a929e36d46b08461febcb03a9571 Mon Sep 17 00:00:00 2001 From: Vexatos Date: Sun, 24 Aug 2014 12:30:33 +0200 Subject: [PATCH 001/103] Fixed ItemForestryFood not extending ItemFood. --- .../forestry/core/items/ItemForestryFood.java | 26 +++++++++++++++++-- .../forestry/food/items/ItemBeverage.java | 21 ++++++++++++--- 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/src/main/java/forestry/core/items/ItemForestryFood.java b/src/main/java/forestry/core/items/ItemForestryFood.java index d55d353ab..54d61636e 100755 --- a/src/main/java/forestry/core/items/ItemForestryFood.java +++ b/src/main/java/forestry/core/items/ItemForestryFood.java @@ -10,8 +10,14 @@ ******************************************************************************/ package forestry.core.items; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.core.render.TextureManager; +import forestry.core.utils.StringUtil; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; +import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; @@ -19,7 +25,7 @@ import net.minecraft.world.World; import forestry.core.CreativeTabForestry; -public class ItemForestryFood extends ItemForestry { +public class ItemForestryFood extends ItemFood { private boolean isAlwaysEdible = false; private boolean isDrink = false; @@ -37,12 +43,22 @@ public class ItemForestryFood extends ItemForestry { } public ItemForestryFood(int heal, float saturation) { - super(); + super(0, 0, false); healAmount = heal; saturationModifier = saturation; setCreativeTab(CreativeTabForestry.tabForestry); } + @Override + public int func_150905_g(ItemStack p_150905_1_) { + return healAmount; + } + + @Override + public float func_150906_h(ItemStack p_150906_1_) { + return saturationModifier; + } + @Override public ItemStack onEaten(ItemStack itemstack, World world, EntityPlayer entityplayer) { itemstack.stackSize--; @@ -92,4 +108,10 @@ public class ItemForestryFood extends ItemForestry { return this; } + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister register) { + itemIcon = TextureManager.getInstance().registerTex(register, StringUtil.cleanItemName(this)); + } + } diff --git a/src/main/java/forestry/food/items/ItemBeverage.java b/src/main/java/forestry/food/items/ItemBeverage.java index 5f1476887..89e908f35 100755 --- a/src/main/java/forestry/food/items/ItemBeverage.java +++ b/src/main/java/forestry/food/items/ItemBeverage.java @@ -12,6 +12,7 @@ package forestry.food.items; import java.util.List; +import forestry.core.items.ItemForestryFood; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -28,12 +29,11 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.api.food.BeverageManager; import forestry.api.food.IBeverageEffect; -import forestry.core.CreativeTabForestry; import forestry.core.config.Config; import forestry.core.proxy.Proxies; import forestry.core.render.TextureManager; -public class ItemBeverage extends Item { +public class ItemBeverage extends ItemForestryFood { public static class BeverageInfo { @@ -113,10 +113,9 @@ public class ItemBeverage extends Item { public BeverageInfo[] beverages; public ItemBeverage(BeverageInfo... beverages) { - super(); + super(1, 0.2f); setMaxStackSize(1); this.beverages = beverages; - setCreativeTab(CreativeTabForestry.tabForestry); } /** @@ -147,6 +146,20 @@ public class ItemBeverage extends Item { return itemstack; } + @Override + public int func_150905_g(ItemStack itemstack) { + int meta = itemstack.getItemDamage(); + BeverageInfo beverage = beverages[meta]; + return beverage.heal; + } + + @Override + public float func_150906_h(ItemStack itemstack) { + int meta = itemstack.getItemDamage(); + BeverageInfo beverage = beverages[meta]; + return beverage.saturation; + } + @Override public int getMaxItemUseDuration(ItemStack itemstack) { return 32; From 6bbf07ed2d2aaaa6bc22bb8013ce12629545f239 Mon Sep 17 00:00:00 2001 From: Vexatos Date: Sun, 24 Aug 2014 12:39:25 +0200 Subject: [PATCH 002/103] Fixed ItemForestryFood not extending ItemFood. --- src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java b/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java index 89eed4d6a..b26f67053 100755 --- a/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java +++ b/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java @@ -102,7 +102,7 @@ public class GuiFlutterlyzer extends GuiAlyzer { startPage(); newLine(); - String title = StringUtil.localize("item.flutterlyzer").toUpperCase(); + String title = StringUtil.localize("gui.flutterlyzer").toUpperCase(); drawCenteredLine(title, 8, 158); newLine(); From e48a3cf7b084bcb9e57761a0131549b69e5f5da4 Mon Sep 17 00:00:00 2001 From: Vexatos Date: Sun, 24 Aug 2014 15:08:48 +0200 Subject: [PATCH 003/103] Fixed growth provider names --- lang | 2 +- .../java/forestry/arboriculture/genetics/GrowthProvider.java | 2 +- .../forestry/arboriculture/genetics/GrowthProviderTropical.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lang b/lang index c235ad119..b4014bcf9 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit c235ad119fe0959fb79faa7ec8f17a12a4f38746 +Subproject commit b4014bcf98adf28f69a8933bb9978421b9fbe59b diff --git a/src/main/java/forestry/arboriculture/genetics/GrowthProvider.java b/src/main/java/forestry/arboriculture/genetics/GrowthProvider.java index eb290a320..9f367b6d2 100755 --- a/src/main/java/forestry/arboriculture/genetics/GrowthProvider.java +++ b/src/main/java/forestry/arboriculture/genetics/GrowthProvider.java @@ -39,7 +39,7 @@ public class GrowthProvider implements IGrowthProvider { @Override public String getDescription() { - return StringUtil.localize("gui.growth.normal"); + return StringUtil.localize("growth.normal"); } @Override diff --git a/src/main/java/forestry/arboriculture/genetics/GrowthProviderTropical.java b/src/main/java/forestry/arboriculture/genetics/GrowthProviderTropical.java index f13fbba1d..d9eba5779 100755 --- a/src/main/java/forestry/arboriculture/genetics/GrowthProviderTropical.java +++ b/src/main/java/forestry/arboriculture/genetics/GrowthProviderTropical.java @@ -42,7 +42,7 @@ public class GrowthProviderTropical extends GrowthProvider { @Override public String getDescription() { - return StringUtil.localize("gui.growth.tropical"); + return StringUtil.localize("growth.tropical"); } } From ce9a5405baa7dc929a3d18c60df4f5bee6701185 Mon Sep 17 00:00:00 2001 From: Vexatos Date: Mon, 25 Aug 2014 09:39:47 +0200 Subject: [PATCH 004/103] Removed all the obsolete methods Thanks @squeek502 --- lang | 2 +- .../forestry/core/items/ItemForestryFood.java | 62 +------------------ .../forestry/food/items/ItemBeverage.java | 2 +- 3 files changed, 3 insertions(+), 63 deletions(-) diff --git a/lang b/lang index b4014bcf9..f6643624e 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit b4014bcf98adf28f69a8933bb9978421b9fbe59b +Subproject commit f6643624ef3b3c219e2d6961fdf990e8d13b635c diff --git a/src/main/java/forestry/core/items/ItemForestryFood.java b/src/main/java/forestry/core/items/ItemForestryFood.java index 54d61636e..d490402ac 100755 --- a/src/main/java/forestry/core/items/ItemForestryFood.java +++ b/src/main/java/forestry/core/items/ItemForestryFood.java @@ -15,66 +15,26 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.core.render.TextureManager; import forestry.core.utils.StringUtil; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; -import net.minecraft.world.World; import forestry.core.CreativeTabForestry; public class ItemForestryFood extends ItemFood { - private boolean isAlwaysEdible = false; private boolean isDrink = false; - private int healAmount = 0; - private final float saturationModifier; - - private int potionId; - private int potionDuration; - private int potionAmplifier; - private float potionEffectProbability; - public ItemForestryFood(int heal) { this(heal, 0.6f); } public ItemForestryFood(int heal, float saturation) { - super(0, 0, false); - healAmount = heal; - saturationModifier = saturation; + super(heal, saturation, false); setCreativeTab(CreativeTabForestry.tabForestry); } - @Override - public int func_150905_g(ItemStack p_150905_1_) { - return healAmount; - } - - @Override - public float func_150906_h(ItemStack p_150906_1_) { - return saturationModifier; - } - - @Override - public ItemStack onEaten(ItemStack itemstack, World world, EntityPlayer entityplayer) { - itemstack.stackSize--; - entityplayer.getFoodStats().addStats(healAmount, saturationModifier); - world.playSoundAtEntity(entityplayer, "random.burp", 0.5F, world.rand.nextFloat() * 0.1F + 0.9F); - if (!world.isRemote && potionId > 0 && world.rand.nextFloat() < potionEffectProbability) - entityplayer.addPotionEffect(new PotionEffect(potionId, potionDuration * 20, potionAmplifier)); - - return itemstack; - } - - @Override - public int getMaxItemUseDuration(ItemStack itemstack) { - return 32; - } - @Override public EnumAction getItemUseAction(ItemStack itemstack) { if (isDrink) @@ -83,31 +43,11 @@ public class ItemForestryFood extends ItemFood { return EnumAction.eat; } - @Override - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { - if (entityplayer.canEat(isAlwaysEdible)) - entityplayer.setItemInUse(itemstack, getMaxItemUseDuration(itemstack)); - return itemstack; - } - public ItemForestryFood setIsDrink() { isDrink = true; return this; } - public ItemForestryFood setPotionEffect(int i, int j, int k, float f) { - potionId = i; - potionDuration = j; - potionAmplifier = k; - potionEffectProbability = f; - return this; - } - - public ItemForestryFood setAlwaysEdible() { - isAlwaysEdible = true; - return this; - } - @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister register) { diff --git a/src/main/java/forestry/food/items/ItemBeverage.java b/src/main/java/forestry/food/items/ItemBeverage.java index 89e908f35..1e69a1a9a 100755 --- a/src/main/java/forestry/food/items/ItemBeverage.java +++ b/src/main/java/forestry/food/items/ItemBeverage.java @@ -134,7 +134,7 @@ public class ItemBeverage extends ItemForestryFood { IBeverageEffect[] effects = beverage.loadEffects(itemstack); itemstack.stackSize--; - entityplayer.getFoodStats().addStats(beverage.heal, beverage.saturation); + entityplayer.getFoodStats().func_151686_a(this, itemstack); world.playSoundAtEntity(entityplayer, "random.burp", 0.5F, world.rand.nextFloat() * 0.1F + 0.9F); if (!Proxies.common.isSimulating(world)) From 07c0927083e4498f6e15a0affec238166db188d7 Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Mon, 25 Aug 2014 17:19:29 -0700 Subject: [PATCH 005/103] Add MissingMapping handling (untested) Closes #133 --- api | 2 +- lang | 2 +- src/main/java/forestry/Forestry.java | 47 +++++++++++++++++++++++++--- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/api b/api index 3f6be6bfc..6720bd4ae 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit 3f6be6bfc53538ae723d14f3e9c5556788f31488 +Subproject commit 6720bd4aee8e7951ec3b0a6c4c5aaca4af136d82 diff --git a/lang b/lang index f6643624e..37b482690 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit f6643624ef3b3c219e2d6961fdf990e8d13b635c +Subproject commit 37b482690038b2d1c56a97bf99bc3dfcd50bd0a4 diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index 9d6f077b5..31b23ff2b 100755 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -15,10 +15,13 @@ import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent; +import cpw.mods.fml.common.event.FMLMissingMappingsEvent; +import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; - +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.GameRegistry.Type; import forestry.api.fuels.EngineBronzeFuel; import forestry.api.fuels.EngineCopperFuel; import forestry.api.fuels.FermenterFuel; @@ -27,10 +30,15 @@ import forestry.api.fuels.MoistenerFuel; import forestry.api.fuels.RainSubstrate; import forestry.core.ForestryCore; import forestry.core.config.Defaults; +import forestry.core.config.ForestryItem; import forestry.core.config.Version; import forestry.core.network.PacketHandler; +import forestry.core.proxy.Proxies; import forestry.core.utils.FluidMap; import forestry.core.utils.ItemStackMap; +import forestry.core.utils.StringUtil; +import net.minecraft.block.Block; +import net.minecraft.item.Item; /** * Forestry Minecraft Mod @@ -42,10 +50,10 @@ import forestry.core.utils.ItemStackMap; name = "Forestry", version = Version.VERSION, dependencies = "required-after:Forge@[10.13.0.1180,);" - + "after:Buildcraft|Core;" - + "after:ExtrabiomesXL;" - + "after:BiomesOPlenty;" - + "after:IC2") + + "after:Buildcraft|Core;" + + "after:ExtrabiomesXL;" + + "after:BiomesOPlenty;" + + "after:IC2") //, certificateFingerprint = Version.FINGERPRINT) public class Forestry { @@ -96,4 +104,33 @@ public class Forestry { public void processIMCMessages(IMCEvent event) { core.processIMCMessages(event.getMessages()); } + + @EventHandler + public void missingMapping(FMLMissingMappingsEvent event) { + for (MissingMapping mapping : event.get()) + if (mapping.type == Type.BLOCK) { + Block block = GameRegistry.findBlock(Defaults.MOD, StringUtil.cleanTags(mapping.name)); + if (block != null) { + mapping.remap(block); + Proxies.log.warning("Remapping block " + mapping.name + " to " + StringUtil.cleanBlockName(block)); + } + } else { + Block block = GameRegistry.findBlock(Defaults.MOD, StringUtil.cleanTags(mapping.name)); + if (block != null) { + mapping.remap(Item.getItemFromBlock(block)); + Proxies.log.warning("Remapping item " + mapping.name + " to " + StringUtil.cleanBlockName(block)); + continue; + } + if (mapping.name.equals("builderBackpack")) + mapping.remap(ForestryItem.builderBackpack.item()); + if (mapping.name.equals("builderBackpackT2")) + mapping.remap(ForestryItem.builderBackpackT2.item()); + if (mapping.name.equals("adventurerBackpack")) + mapping.remap(ForestryItem.adventurerBackpack.item()); + if (mapping.name.equals("adventurerBackpackT2")) + mapping.remap(ForestryItem.adventurerBackpackT2.item()); + if (mapping.name.equals("shortMead")) + mapping.remap(ForestryItem.beverage.item()); + } + } } From a1dad33c00cfb0b7425d8fa5e3c2e91478662447 Mon Sep 17 00:00:00 2001 From: James Mitchell Date: Tue, 2 Sep 2014 18:37:32 -0700 Subject: [PATCH 006/103] 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 007/103] 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 008/103] 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 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 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 009/103] 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 010/103] 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 011/103] 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 012/103] 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 013/103] 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 014/103] 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 015/103] 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 016/103] 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 017/103] 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 018/103] 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 019/103] 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 020/103] 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 021/103] 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 022/103] 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 023/103] 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 024/103] 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 025/103] 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 026/103] 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 027/103] 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 028/103] 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 029/103] 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 030/103] 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 031/103] 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 032/103] 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 033/103] 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 034/103] 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 035/103] 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 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 Date: Mon, 8 Sep 2014 02:21:13 -0700 Subject: [PATCH 036/103] 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 037/103] 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 038/103] 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 039/103] 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 040/103] 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 041/103] 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 042/103] 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 043/103] 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 044/103] 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 045/103] 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 046/103] 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 047/103] 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 048/103] 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 049/103] 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 050/103] 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 051/103] 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 052/103] 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 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 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 053/103] 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 054/103] 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); From dff81eb85ca204e721cc006522ddb48da0f83ae8 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 12 Sep 2014 21:25:46 -0700 Subject: [PATCH 055/103] Use EnumAddressee instead of String to identify mail carriers --- api | 2 +- src/main/java/forestry/mail/PostOffice.java | 9 +-------- src/main/java/forestry/mail/PostRegistry.java | 11 ++++++----- src/main/java/forestry/mail/PostalCarrier.java | 10 ++++------ .../java/forestry/mail/gui/ContainerLetter.java | 15 +++++++-------- src/main/java/forestry/mail/gui/GuiLetter.java | 2 +- 6 files changed, 20 insertions(+), 29 deletions(-) diff --git a/api b/api index 210e7d410..7b30b4020 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit 210e7d410222fe74d20e3c3b994fda0419615d3a +Subproject commit 7b30b4020249bd5c8c1137798eb56182b08c3c86 diff --git a/src/main/java/forestry/mail/PostOffice.java b/src/main/java/forestry/mail/PostOffice.java index 422cfaed3..611765e40 100755 --- a/src/main/java/forestry/mail/PostOffice.java +++ b/src/main/java/forestry/mail/PostOffice.java @@ -159,20 +159,13 @@ public class PostOffice extends WorldSavedData implements IPostOffice { IPostalState state = EnumDeliveryState.NOT_MAILABLE; for (IMailAddress address : letter.getRecipients()) { - IPostalCarrier carrier = PostManager.postRegistry.getCarrier(address.getType().toString()); + IPostalCarrier carrier = PostManager.postRegistry.getCarrier(address.getType()); if (carrier == null) continue; state = carrier.deliverLetter(world, this, address, itemstack, doLodge); if (!state.isOk()) break; } - /* - for (MailAddress address : letter.getRecipients()) - if (address.isPlayer()) - state = storeInPOBox(world, address, itemstack, doLodge); - else if (address.getType().equals(EnumAddressee.TRADER.toString())) - state = handleTradeLetter(world, address, itemstack, doLodge); - */ if (!state.isOk()) return state; diff --git a/src/main/java/forestry/mail/PostRegistry.java b/src/main/java/forestry/mail/PostRegistry.java index 6e9a730bf..93b9ece4e 100755 --- a/src/main/java/forestry/mail/PostRegistry.java +++ b/src/main/java/forestry/mail/PostRegistry.java @@ -27,6 +27,7 @@ import forestry.api.mail.IPostalCarrier; import forestry.api.mail.ITradeStation; import forestry.api.mail.PostManager; import forestry.api.mail.IMailAddress; +import forestry.api.mail.EnumAddressee; import forestry.core.config.ForestryItem; import forestry.mail.items.ItemLetter; import forestry.plugins.PluginMail; @@ -168,21 +169,21 @@ public class PostRegistry implements IPostRegistry { } /* CARRIER */ - private final HashMap carriers = new HashMap(); + private final HashMap carriers = new HashMap(); @Override - public Map getRegisteredCarriers() { + public Map getRegisteredCarriers() { return carriers; } @Override public void registerCarrier(IPostalCarrier carrier) { - carriers.put(carrier.getUID(), carrier); + carriers.put(carrier.getType(), carrier); } @Override - public IPostalCarrier getCarrier(String uid) { - return carriers.get(uid); + public IPostalCarrier getCarrier(EnumAddressee type) { + return carriers.get(type); } /* LETTERS */ diff --git a/src/main/java/forestry/mail/PostalCarrier.java b/src/main/java/forestry/mail/PostalCarrier.java index fc68c13b9..ca0301eaf 100755 --- a/src/main/java/forestry/mail/PostalCarrier.java +++ b/src/main/java/forestry/mail/PostalCarrier.java @@ -26,24 +26,22 @@ import forestry.plugins.PluginMail; public class PostalCarrier implements IPostalCarrier { - private final String uid; private final String iconID; private final EnumAddressee type; public PostalCarrier(EnumAddressee type) { - uid = type.toString().toLowerCase(Locale.ENGLISH); - iconID = "mail/carrier." + uid; + iconID = "mail/carrier." + type; this.type = type; } @Override - public String getUID() { - return uid; + public EnumAddressee getType() { + return type; } @Override public String getName() { - return StringUtil.localize("gui.addressee." + uid); + return StringUtil.localize("gui.addressee." + type); } @Override diff --git a/src/main/java/forestry/mail/gui/ContainerLetter.java b/src/main/java/forestry/mail/gui/ContainerLetter.java index 27d4b47b8..d271aa6fc 100755 --- a/src/main/java/forestry/mail/gui/ContainerLetter.java +++ b/src/main/java/forestry/mail/gui/ContainerLetter.java @@ -44,7 +44,7 @@ import forestry.mail.network.PacketLetterInfo; public class ContainerLetter extends ContainerItemInventory { private final LetterInventory letterInventory; - private EnumAddressee carrier = EnumAddressee.PLAYER; + private EnumAddressee carrierType = EnumAddressee.PLAYER; private TradeStationInfo tradeInfo = null; public ContainerLetter(EntityPlayer player, LetterInventory inventory) { @@ -88,7 +88,7 @@ public class ContainerLetter extends ContainerItemInventory { if (letterInventory.getLetter() != null) if (letterInventory.getLetter().getRecipients() != null) if (letterInventory.getLetter().getRecipients().length > 0) - this.carrier = letterInventory.getLetter().getRecipients()[0].getType(); + this.carrierType = letterInventory.getLetter().getRecipients()[0].getType(); } @Override @@ -115,17 +115,17 @@ public class ContainerLetter extends ContainerItemInventory { } public void setCarrierType(EnumAddressee type) { - this.carrier = type; + this.carrierType = type; } public EnumAddressee getCarrierType() { - return this.carrier; + return this.carrierType; } public void advanceCarrierType() { Iterator it = PostManager.postRegistry.getRegisteredCarriers().values().iterator(); while(it.hasNext()) { - if(it.next().getUID().equals(carrier)) + if(it.next().getType().equals(carrierType)) break; } @@ -135,8 +135,7 @@ public class ContainerLetter extends ContainerItemInventory { else postal = PostManager.postRegistry.getRegisteredCarriers().values().iterator().next(); - EnumAddressee type = EnumAddressee.fromString(postal.getUID()); - setCarrierType(type); + setCarrierType(postal.getType()); } public void setRecipient(String recipientName, EnumAddressee type) { @@ -222,7 +221,7 @@ public class ContainerLetter extends ContainerItemInventory { } public void handleLetterInfoUpdate(PacketLetterInfo packet) { - carrier = packet.type; + carrierType = packet.type; if (packet.type == EnumAddressee.PLAYER) { getLetter().setRecipient(packet.address); } else if (packet.type == EnumAddressee.TRADER) { diff --git a/src/main/java/forestry/mail/gui/GuiLetter.java b/src/main/java/forestry/mail/gui/GuiLetter.java index 65fb85f71..4a7c240c5 100755 --- a/src/main/java/forestry/mail/gui/GuiLetter.java +++ b/src/main/java/forestry/mail/gui/GuiLetter.java @@ -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().toString()); + IPostalCarrier carrier = PostManager.postRegistry.getCarrier(container.getCarrierType()); if(carrier != null) drawTexturedModelRectFromIcon(startX + xPos, startY + yPos - 5, carrier.getIcon(), 26, 26); From f13bacfed516eec5ddb0bf080e9fcae54f876054 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 12 Sep 2014 23:39:22 -0700 Subject: [PATCH 056/103] Remove EnumAddressee.INVALID --- api | 2 +- src/main/java/forestry/mail/MailAddress.java | 19 ++++++++++++------- src/main/java/forestry/mail/PostRegistry.java | 2 +- src/main/java/forestry/mail/TradeStation.java | 4 ++-- .../forestry/mail/gui/ContainerLetter.java | 2 +- .../java/forestry/mail/gui/GuiLetter.java | 2 +- .../mail/network/PacketLetterInfo.java | 3 +-- 7 files changed, 19 insertions(+), 15 deletions(-) diff --git a/api b/api index 7b30b4020..d9dd92783 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit 7b30b4020249bd5c8c1137798eb56182b08c3c86 +Subproject commit d9dd927830e9449d441f823bee5ece662b3615c7 diff --git a/src/main/java/forestry/mail/MailAddress.java b/src/main/java/forestry/mail/MailAddress.java index def51aada..5fbc07ab1 100644 --- a/src/main/java/forestry/mail/MailAddress.java +++ b/src/main/java/forestry/mail/MailAddress.java @@ -32,11 +32,11 @@ public class MailAddress implements INBTTagable, IMailAddress { @EntityNetData private GameProfile gameProfile; // gameProfile is a fake GameProfile for traders, and real for players - private static final MailAddress invalidAddress = new MailAddress(); + private static final GameProfile invalidGameProfile = new GameProfile(new UUID(0,0), ""); public MailAddress() { - this.type = EnumAddressee.INVALID; - this.gameProfile = new GameProfile(new UUID(0,0), ""); + this.type = EnumAddressee.PLAYER; + this.gameProfile = invalidGameProfile; } public MailAddress(GameProfile gameProfile) { @@ -101,20 +101,25 @@ public class MailAddress implements INBTTagable, IMailAddress { return type == EnumAddressee.PLAYER; } + public boolean isTrader() { + return type == EnumAddressee.TRADER; + } + public boolean isValid() { - return type != EnumAddressee.INVALID; + return !gameProfile.equals(invalidGameProfile); } @Override public void readFromNBT(NBTTagCompound nbttagcompound) { - type = EnumAddressee.INVALID; + type = null; if(nbttagcompound.hasKey("TP")) { String typeName = nbttagcompound.getString("TP"); type = EnumAddressee.fromString(typeName); } - if (!isValid()) { - gameProfile = invalidAddress.gameProfile; + if (type == null) { + type = EnumAddressee.PLAYER; + gameProfile = invalidGameProfile; } else if(nbttagcompound.hasKey("profile")) { NBTTagCompound profileTag = nbttagcompound.getCompoundTag("profile"); gameProfile = NBTUtil.func_152459_a(profileTag); diff --git a/src/main/java/forestry/mail/PostRegistry.java b/src/main/java/forestry/mail/PostRegistry.java index 93b9ece4e..64f2812a2 100755 --- a/src/main/java/forestry/mail/PostRegistry.java +++ b/src/main/java/forestry/mail/PostRegistry.java @@ -80,7 +80,7 @@ public class PostRegistry implements IPostRegistry { */ @Override public boolean isValidTradeAddress(World world, IMailAddress address) { - return !address.isPlayer() && address.getName().matches("^[a-zA-Z0-9]+$"); + return address.isTrader() && address.getName().matches("^[a-zA-Z0-9]+$"); } /** diff --git a/src/main/java/forestry/mail/TradeStation.java b/src/main/java/forestry/mail/TradeStation.java index 677ada2ec..e0defc5af 100755 --- a/src/main/java/forestry/mail/TradeStation.java +++ b/src/main/java/forestry/mail/TradeStation.java @@ -64,8 +64,8 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve // / CONSTRUCTORS public TradeStation(GameProfile owner, IMailAddress address) { super(SAVE_NAME + address); - if (address.isPlayer()) { - throw new IllegalArgumentException("TradeStation address must not be a player"); + if (!address.isTrader()) { + throw new IllegalArgumentException("TradeStation address must be a trader"); } this.owner = owner; this.address = address; diff --git a/src/main/java/forestry/mail/gui/ContainerLetter.java b/src/main/java/forestry/mail/gui/ContainerLetter.java index d271aa6fc..0d372854c 100755 --- a/src/main/java/forestry/mail/gui/ContainerLetter.java +++ b/src/main/java/forestry/mail/gui/ContainerLetter.java @@ -139,7 +139,7 @@ public class ContainerLetter extends ContainerItemInventory { } public void setRecipient(String recipientName, EnumAddressee type) { - if (StringUtils.isBlank(recipientName) || type == EnumAddressee.INVALID) + if (StringUtils.isBlank(recipientName) || type == null) return; // / Send to server diff --git a/src/main/java/forestry/mail/gui/GuiLetter.java b/src/main/java/forestry/mail/gui/GuiLetter.java index 4a7c240c5..abee1d202 100755 --- a/src/main/java/forestry/mail/gui/GuiLetter.java +++ b/src/main/java/forestry/mail/gui/GuiLetter.java @@ -246,7 +246,7 @@ public class GuiLetter extends GuiForestry { } private void setRecipient(String recipientName, EnumAddressee type) { - if (this.isProcessedLetter || StringUtils.isBlank(recipientName) || type == null || type == EnumAddressee.INVALID) + if (this.isProcessedLetter || StringUtils.isBlank(recipientName) || type == null) return; container.setRecipient(recipientName, type); diff --git a/src/main/java/forestry/mail/network/PacketLetterInfo.java b/src/main/java/forestry/mail/network/PacketLetterInfo.java index cc9ace882..857939524 100644 --- a/src/main/java/forestry/mail/network/PacketLetterInfo.java +++ b/src/main/java/forestry/mail/network/PacketLetterInfo.java @@ -46,11 +46,10 @@ public class PacketLetterInfo extends ForestryPacket { @Override public void writeData(DataOutputStream data) throws IOException { - if (type == null || type == EnumAddressee.INVALID) { + if (type == null) { data.writeShort(-1); return; } - data.writeShort(0); data.writeUTF(type.toString()); From 33ae634f9c4cdd505b7ca31930e211e9d4a33c29 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 13 Sep 2014 19:23:19 -0700 Subject: [PATCH 057/103] Changed nickname for IRC users from ForestryWiki to ForestryGithub --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7acd4e178..d1f4124f8 100755 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Forestry is a modification for the game Minecraft and known primarily for its fa [Wiki](http://forestry.sengir.net/) -[IRC #forestry on esper.net](http://webchat.esper.net/?nick=ForestryWiki...&channels=forestry&prompt=1) +[IRC #forestry on esper.net](http://webchat.esper.net/?nick=ForestryGithub...&channels=forestry&prompt=1) ### Building From 84b40c65b960a0ed38beb37c5c5a2cf1c638ab59 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 13 Sep 2014 19:24:47 -0700 Subject: [PATCH 058/103] Added link to latest 1.7.10 builds on Player's site (with permission) --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index d1f4124f8..0c288fd55 100755 --- a/README.md +++ b/README.md @@ -9,6 +9,8 @@ Forestry is a modification for the game Minecraft and known primarily for its fa [Wiki](http://forestry.sengir.net/) +[Latest Builds for 1.7.10](http://jenkins.ic2.player.to/job/Forestry/) + [IRC #forestry on esper.net](http://webchat.esper.net/?nick=ForestryGithub...&channels=forestry&prompt=1) ### Building From f91b7422b1da5a1c093a25ce9773919dce5cb58e Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 13 Sep 2014 22:20:57 -0700 Subject: [PATCH 059/103] Fixes #184 Items in Trade Letters should have tooltips --- .../java/forestry/core/gui/GuiForestry.java | 28 +++++++++++++++++ .../java/forestry/mail/gui/GuiLetter.java | 31 ++++++++++++------- 2 files changed, 48 insertions(+), 11 deletions(-) diff --git a/src/main/java/forestry/core/gui/GuiForestry.java b/src/main/java/forestry/core/gui/GuiForestry.java index 874b0c391..e0bfda37b 100755 --- a/src/main/java/forestry/core/gui/GuiForestry.java +++ b/src/main/java/forestry/core/gui/GuiForestry.java @@ -35,6 +35,7 @@ import forestry.core.gui.slots.SlotForestry; import forestry.core.gui.tooltips.IToolTipProvider; import forestry.core.gui.tooltips.ToolTip; import forestry.core.gui.tooltips.ToolTipLine; +import forestry.core.gui.widgets.Widget; import forestry.core.interfaces.IClimatised; import forestry.core.interfaces.IErrorSource; import forestry.core.interfaces.IHintSource; @@ -541,4 +542,31 @@ public abstract class GuiForestry extends GuiContainer { this.zLevel = 0.0F; itemRender.zLevel = 0.0F; } + + protected class ItemStackWidget extends Widget { + ItemStack itemStack; + + public ItemStackWidget(int xPos, int yPos, ItemStack itemStack) { + super(widgetManager, xPos, yPos); + + IIcon icon = itemStack.getItem().getIconFromDamage(itemStack.getItemDamage()); + + this.width = icon.getIconWidth(); + this.height = icon.getIconHeight(); + this.itemStack = itemStack; + } + + @Override + public void draw(int startX, int startY) { + itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.renderEngine, itemStack, xPos + startX, yPos + startY); + itemRender.renderItemOverlayIntoGUI(fontRendererObj, mc.renderEngine, itemStack, xPos + startX, yPos + startY); + } + + @Override + public ToolTip getToolTip() { + ToolTip tip = new ToolTip(); + tip.add(itemStack.getDisplayName()); + return tip; + } + } } diff --git a/src/main/java/forestry/mail/gui/GuiLetter.java b/src/main/java/forestry/mail/gui/GuiLetter.java index abee1d202..7bd389742 100755 --- a/src/main/java/forestry/mail/gui/GuiLetter.java +++ b/src/main/java/forestry/mail/gui/GuiLetter.java @@ -10,7 +10,7 @@ ******************************************************************************/ package forestry.mail.gui; -import java.util.Locale; +import java.util.ArrayList; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; @@ -76,6 +76,8 @@ public class GuiLetter extends GuiForestry { boolean addressFocus; boolean textFocus; + protected ArrayList tradeInfoWidgets; + private final ContainerLetter container; public GuiLetter(EntityPlayer player, LetterInventory inventory) { @@ -86,6 +88,7 @@ public class GuiLetter extends GuiForestry { this.container = (ContainerLetter) inventorySlots; this.isProcessedLetter = container.getLetter().isProcessed(); this.widgetManager.add(new AddresseeSlot(16, 12)); + this.tradeInfoWidgets = new ArrayList(); } @Override @@ -172,9 +175,10 @@ public class GuiLetter extends GuiForestry { fontRendererObj.drawString(address.getText(), guiLeft + 49, guiTop + 16, fontColor.get("gui.mail.lettertext")); fontRendererObj.drawSplitString(text.getText(), guiLeft + 20, guiTop + 34, 119, fontColor.get("gui.mail.lettertext")); } else { + clearTradeInfoWidgets(); address.drawTextBox(); if (container.getCarrierType() == EnumAddressee.TRADER) - drawTradePreview(guiLeft + 18, guiTop + 32); + drawTradePreview(18, 32); else text.drawTextBox(); } @@ -191,25 +195,30 @@ public class GuiLetter extends GuiForestry { infoString = "chat.mail." + container.getTradeInfo().state.getIdentifier(); if (infoString != null) { - fontRendererObj.drawSplitString(StringUtil.localize(infoString), x, y, 119, fontColor.get("gui.mail.lettertext")); + fontRendererObj.drawSplitString(StringUtil.localize(infoString), guiLeft + x, guiTop + y, 119, fontColor.get("gui.mail.lettertext")); return; } - fontRendererObj.drawString(StringUtil.localize("gui.mail.pleasesend"), x, y, fontColor.get("gui.mail.lettertext")); + fontRendererObj.drawString(StringUtil.localize("gui.mail.pleasesend"), guiLeft + x, guiTop + y, fontColor.get("gui.mail.lettertext")); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.renderEngine, container.getTradeInfo().tradegood, x, y + 10); - itemRender.renderItemOverlayIntoGUI(fontRendererObj, mc.renderEngine, container.getTradeInfo().tradegood, x, y + 10); + addTradeInfoWidget(new ItemStackWidget(x, y + 10, container.getTradeInfo().tradegood)); GL11.glDisable(GL11.GL_LIGHTING); - fontRendererObj.drawString(StringUtil.localize("gui.mail.foreveryattached"), x, y + 28, fontColor.get("gui.mail.lettertext")); + fontRendererObj.drawString(StringUtil.localize("gui.mail.foreveryattached"), guiLeft + x, guiTop + y + 28, fontColor.get("gui.mail.lettertext")); GL11.glEnable(GL11.GL_LIGHTING); for (int i = 0; i < container.getTradeInfo().required.length; i++) { - GL11.glDisable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.renderEngine, container.getTradeInfo().required[i], x + i * 18, y + 38); - itemRender.renderItemOverlayIntoGUI(fontRendererObj, mc.renderEngine, container.getTradeInfo().required[i], x + i * 18, y + 38); - GL11.glEnable(GL11.GL_LIGHTING); + addTradeInfoWidget(new ItemStackWidget(x + i * 18, y + 38, container.getTradeInfo().required[i])); } + } + private void addTradeInfoWidget(Widget widget) { + tradeInfoWidgets.add(widget); + widgetManager.add(widget); + } + + private void clearTradeInfoWidgets() { + for (Widget widget : tradeInfoWidgets) + widgetManager.remove(widget); } @Override From cea5f224fa01ecac335da669811be1a701c94ace Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 13 Sep 2014 23:30:50 -0700 Subject: [PATCH 060/103] Fix #186. Improve the Beealyzer and Treealyzer Mutations pages --- .../java/forestry/core/gui/GuiAlyzer.java | 88 +++++++------------ .../java/forestry/core/gui/GuiForestry.java | 2 +- 2 files changed, 32 insertions(+), 58 deletions(-) diff --git a/src/main/java/forestry/core/gui/GuiAlyzer.java b/src/main/java/forestry/core/gui/GuiAlyzer.java index 5ec00934f..e082aeb95 100755 --- a/src/main/java/forestry/core/gui/GuiAlyzer.java +++ b/src/main/java/forestry/core/gui/GuiAlyzer.java @@ -130,6 +130,12 @@ public abstract class GuiAlyzer extends GuiForestry { } } + @Override + protected void drawGuiContainerBackgroundLayer(float f, int mouseX, int mouseY) { + super.drawGuiContainerBackgroundLayer(f, mouseX, mouseY); + widgetManager.clear(); + } + protected void drawAnalyticsOverview() { startPage(); @@ -235,10 +241,12 @@ public abstract class GuiAlyzer extends GuiForestry { protected void drawAnalyticsPage4(IIndividual individual) { + float factor = this.factor; + this.setFactor(1.0f); + startPage(COLUMN_0, COLUMN_1, COLUMN_2); drawLine(StringUtil.localize("gui.beealyzer.mutations") + ":", COLUMN_0); newLine(); - newLine(); RenderHelper.enableGUIStandardItemLighting(); @@ -266,7 +274,7 @@ public abstract class GuiAlyzer extends GuiForestry { } x += columnWidth; - if (x > columnWidth * 4) { + if (x >= columnWidth * 4) { x = 0; newLine(); newLine(); @@ -274,73 +282,40 @@ public abstract class GuiAlyzer extends GuiForestry { } endPage(); + + this.setFactor(factor); } protected void drawMutationInfo(IMutation combination, IAllele species, int x) { - drawItemStack(iconStacks.get(combination.getPartner(species).getUID()), - adjustToFactor(guiLeft) + x, adjustToFactor(guiTop) + getLineY()); - /* - itemRenderer.renderItemIntoGUI(fontRendererObj, mc.renderEngine, iconStacks.get(combination.getPartner(species).getUID()), adjustToFactor(guiLeft) + x, - adjustToFactor(guiTop) + getLineY()); - itemRenderer.renderItemOverlayIntoGUI(fontRendererObj, mc.renderEngine, iconStacks.get(combination.getPartner(species).getUID()), adjustToFactor(guiLeft) - + x, adjustToFactor(guiTop) + getLineY()); - */ + ItemStack partnerBee = iconStacks.get(combination.getPartner(species).getUID()); + widgetManager.add(new ItemStackWidget(x, getLineY(), partnerBee)); + + drawProbabilityArrow(combination.getBaseChance(), adjustToFactor(guiLeft) + x + 18, adjustToFactor(guiTop) + getLineY() + 4); IAllele result = combination.getTemplate()[EnumBeeChromosome.SPECIES.ordinal()]; - - drawItemStack(iconStacks.get(result.getUID()), - adjustToFactor(guiLeft) + x + 33, adjustToFactor(guiTop) + getLineY()); - /* - itemRenderer.renderItemIntoGUI(fontRendererObj, mc.renderEngine, iconStacks.get(result.getUID()), adjustToFactor(guiLeft) + x + 33, adjustToFactor(guiTop) - + getLineY()); - itemRenderer.renderItemOverlayIntoGUI(fontRendererObj, mc.renderEngine, iconStacks.get(result.getUID()), adjustToFactor(guiLeft) + x + 33, - adjustToFactor(guiTop) + getLineY()); - */ - - int line = 247; - int column = 100; - - switch (EnumMutateChance.rateChance(combination.getBaseChance())) { - 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); - drawTexturedModalRect(adjustToFactor(guiLeft) + x + 18, adjustToFactor(guiTop) + getLineY() + 4, column, line, 15, 9); - + ItemStack resultBee = iconStacks.get(result.getUID()); + widgetManager.add(new ItemStackWidget(x + 33, getLineY(), resultBee)); } protected void drawUnknownMutation(IMutation combination, IAllele species, int x) { - // Question marks - Proxies.common.bindTexture(textureFile); - drawTexturedModalRect(adjustToFactor(guiLeft) + x, adjustToFactor(guiTop) + getLineY(), 78, 240, 16, 16); + drawQuestionMark(adjustToFactor(guiLeft) + x, adjustToFactor(guiTop) + getLineY()); - Proxies.common.bindTexture(textureFile); - drawTexturedModalRect(adjustToFactor(guiLeft) + x + 32, adjustToFactor(guiTop) + getLineY(), 78, 240, 16, 16); + drawProbabilityArrow(combination.getBaseChance(), adjustToFactor(guiLeft) + x + 18, adjustToFactor(guiTop) + getLineY() + 4); + drawQuestionMark(adjustToFactor(guiLeft) + x + 32, adjustToFactor(guiTop) + getLineY()); + } + + protected void drawQuestionMark(int x, int y) { + Proxies.common.bindTexture(textureFile); + drawTexturedModalRect(x, y, 78, 240, 16, 16); + } + + protected void drawProbabilityArrow(float chance, int x, int y) { int line = 247; int column = 100; - - switch (EnumMutateChance.rateChance(combination.getBaseChance())) { + switch (EnumMutateChance.rateChance(chance)) { case HIGHEST: column = 100; break; @@ -364,8 +339,7 @@ public abstract class GuiAlyzer extends GuiForestry { // Probability arrow Proxies.common.bindTexture(textureFile); - drawTexturedModalRect(adjustToFactor(guiLeft) + x + 18, adjustToFactor(guiTop) + getLineY() + 4, column, line, 15, 9); - + drawTexturedModalRect(x, y, column, line, 15, 9); } protected void drawToleranceInfo(EnumTolerance tolerance, int x, int textColor) { diff --git a/src/main/java/forestry/core/gui/GuiForestry.java b/src/main/java/forestry/core/gui/GuiForestry.java index e0bfda37b..0851bf031 100755 --- a/src/main/java/forestry/core/gui/GuiForestry.java +++ b/src/main/java/forestry/core/gui/GuiForestry.java @@ -549,7 +549,7 @@ public abstract class GuiForestry extends GuiContainer { public ItemStackWidget(int xPos, int yPos, ItemStack itemStack) { super(widgetManager, xPos, yPos); - IIcon icon = itemStack.getItem().getIconFromDamage(itemStack.getItemDamage()); + IIcon icon = itemStack.getItem().getIcon(itemStack, 0); this.width = icon.getIconWidth(); this.height = icon.getIconHeight(); From b7e3145af51cdcfa655a323f55c66fdab8857df2 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 14 Sep 2014 00:20:18 -0700 Subject: [PATCH 061/103] Update localization submodule update Chinese Localization Lengthen English x-alyzer names to take advantage of new wider GUI --- lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang b/lang index 6a0217f4a..a3176f1e3 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 6a0217f4ae1594a1e82ca61303242b1161cdd724 +Subproject commit a3176f1e3920498f7d97f9360b4bc0bf48eb94f6 From 5cf658fbe85782b21e372d8856f39cedfb09be29 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 14 Sep 2014 00:24:02 -0700 Subject: [PATCH 062/103] Give bee products tooltips with their names in the Beealyzer Remove semicolon at end of bee territory area vect (not used) --- .../forestry/apiculture/gui/GuiBeealyzer.java | 15 ++++++++++----- src/main/java/forestry/core/utils/Vect.java | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java index eee45d1fd..7745dca4e 100755 --- a/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java +++ b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java @@ -243,6 +243,9 @@ public class GuiBeealyzer extends GuiAlyzer { private void drawAnalyticsPage3(IBee bee, EnumBeeType type) { + float factor = this.factor; + this.setFactor(1.0f); + tempProductList = bee.getProduceList(); startPage(COLUMN_0, COLUMN_1, COLUMN_2); @@ -253,8 +256,8 @@ public class GuiBeealyzer extends GuiAlyzer { int x = COLUMN_0; for (ItemStack stack : tempProductList) { - itemRender.renderItemIntoGUI(fontRendererObj, mc.renderEngine, stack, (int) ((guiLeft + x) * (1 / factor)), - (int) ((guiTop + getLineY()) * (1 / factor))); + widgetManager.add(new ItemStackWidget(adjustToFactor(x), adjustToFactor(getLineY()), stack)); + x += 18; if (x > adjustToFactor(148)) { x = COLUMN_0; @@ -262,16 +265,16 @@ public class GuiBeealyzer extends GuiAlyzer { } } + newLine(); newLine(); newLine(); drawLine(StringUtil.localize("gui.beealyzer.specialty") + ":", COLUMN_0); - newLine(); x = COLUMN_0; for (ItemStack stack : bee.getSpecialtyList()) { - itemRender.renderItemIntoGUI(fontRendererObj, mc.renderEngine, stack, (int) ((guiLeft + x) * (1 / factor)), - (int) ((guiTop + getLineY()) * (1 / factor))); + widgetManager.add(new ItemStackWidget(adjustToFactor(x), adjustToFactor(getLineY()), stack)); + x += 18; if (x > adjustToFactor(148)) { x = COLUMN_0; @@ -280,6 +283,8 @@ public class GuiBeealyzer extends GuiAlyzer { } endPage(); + + this.setFactor(factor); } } diff --git a/src/main/java/forestry/core/utils/Vect.java b/src/main/java/forestry/core/utils/Vect.java index 3c93fbab0..256b8c2d0 100755 --- a/src/main/java/forestry/core/utils/Vect.java +++ b/src/main/java/forestry/core/utils/Vect.java @@ -51,7 +51,7 @@ public class Vect { @Override public String toString() { - return String.format("%sx%sx%s;", x, y, z); + return String.format("%sx%sx%s", x, y, z); } @Override From 69515d2f6b73c1bbb17aa6891c7a6b0c9795db41 Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 15 Sep 2014 16:44:49 -0700 Subject: [PATCH 063/103] Fixes #183. Give Saplings and Leaves species info for WAILA --- api | 2 +- lang | 2 +- .../arboriculture/gadgets/BlockLeaves.java | 18 ++++++++ .../arboriculture/gadgets/BlockSapling.java | 7 +++ .../arboriculture/gadgets/TileLeaves.java | 7 +-- .../arboriculture/items/ItemLeavesBlock.java | 43 +++++++++++++++++++ .../network/PacketLeafUpdate.java | 12 +++--- .../forestry/plugins/PluginArboriculture.java | 3 +- 8 files changed, 82 insertions(+), 12 deletions(-) create mode 100644 src/main/java/forestry/arboriculture/items/ItemLeavesBlock.java diff --git a/api b/api index d9dd92783..90d78e084 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit d9dd927830e9449d441f823bee5ece662b3615c7 +Subproject commit 90d78e084c2002bd4ebd86ab4e5162c9561450f9 diff --git a/lang b/lang index a3176f1e3..24178af2c 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit a3176f1e3920498f7d97f9360b4bc0bf48eb94f6 +Subproject commit 24178af2cfb1859a0ff9971e688bcc12907ff7a7 diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockLeaves.java b/src/main/java/forestry/arboriculture/gadgets/BlockLeaves.java index 3452d5474..f0052ec42 100755 --- a/src/main/java/forestry/arboriculture/gadgets/BlockLeaves.java +++ b/src/main/java/forestry/arboriculture/gadgets/BlockLeaves.java @@ -18,8 +18,10 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.ColorizerFoliage; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -35,6 +37,8 @@ import forestry.api.arboriculture.ITree; import forestry.api.core.IToolScoop; import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.IButterfly; +import forestry.arboriculture.items.ItemLeavesBlock; +import forestry.core.config.ForestryBlock; import forestry.core.config.Defaults; import forestry.core.proxy.Proxies; import forestry.core.render.TextureManager; @@ -147,6 +151,20 @@ public class BlockLeaves extends BlockTreeContainer { return prod; } + @Override + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { + TileLeaves leaves = getLeafTile(world, x, y, z); + + NBTTagCompound nbttagcompound = new NBTTagCompound(); + leaves.getTree().writeToNBT(nbttagcompound); + + ItemLeavesBlock leavesItem = (ItemLeavesBlock)ForestryBlock.leaves.item(); + ItemStack leavesStack = new ItemStack(leavesItem); + leavesStack.setTagCompound(nbttagcompound); + + return leavesStack; + } + /* RENDERING */ @Override public boolean isOpaqueCube() { diff --git a/src/main/java/forestry/arboriculture/gadgets/BlockSapling.java b/src/main/java/forestry/arboriculture/gadgets/BlockSapling.java index 83443a9a6..31ae5d07b 100755 --- a/src/main/java/forestry/arboriculture/gadgets/BlockSapling.java +++ b/src/main/java/forestry/arboriculture/gadgets/BlockSapling.java @@ -20,6 +20,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -145,6 +146,12 @@ public class BlockSapling extends BlockTreeContainer { return new ArrayList(); } + @Override + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { + TileSapling sapling = getSaplingTile(world, x, y, z); + return PluginArboriculture.treeInterface.getMemberStack(sapling.getTree(), EnumGermlingType.SAPLING.ordinal()); + } + @Override public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { if (Proxies.common.isSimulating(world) && canHarvestBlock(player, world.getBlockMetadata(x, y, z))) diff --git a/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java b/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java index c4cc844f1..83f2d81a3 100755 --- a/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java +++ b/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java @@ -277,16 +277,16 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru /* NETWORK */ @Override public Packet getDescriptionPacket() { - return new PacketLeafUpdate(xCoord, yCoord, zCoord, this).getPacket(); + return new PacketLeafUpdate(this).getPacket(); } @Override public void sendNetworkUpdate() { - Proxies.net.sendNetworkPacket(new PacketLeafUpdate(xCoord, yCoord, zCoord, this), xCoord, yCoord, zCoord); + Proxies.net.sendNetworkPacket(new PacketLeafUpdate(this), xCoord, yCoord, zCoord); } private void sendNetworkUpdateRipening() { - Proxies.net.sendNetworkPacket(new PacketLeafUpdate(xCoord, yCoord, zCoord, determineFruitColour()), xCoord, yCoord, zCoord); + Proxies.net.sendNetworkPacket(new PacketLeafUpdate(this, determineFruitColour()), xCoord, yCoord, zCoord); } @Override @@ -296,6 +296,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru if(packet.isRipeningUpdate()) { colourFruits = packet.colourFruits; } else { + readFromNBT(packet.getTagCompound()); isFruitLeaf = packet.isFruitLeaf(); isPollinatedState = packet.isPollinated(); textureIndexFancy = packet.textureIndexFancy; diff --git a/src/main/java/forestry/arboriculture/items/ItemLeavesBlock.java b/src/main/java/forestry/arboriculture/items/ItemLeavesBlock.java new file mode 100644 index 000000000..da1cda956 --- /dev/null +++ b/src/main/java/forestry/arboriculture/items/ItemLeavesBlock.java @@ -0,0 +1,43 @@ +package forestry.arboriculture.items; + +import forestry.api.arboriculture.ITree; +import forestry.arboriculture.genetics.Tree; +import forestry.core.items.ItemForestryBlock; +import forestry.core.utils.StringUtil; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; + +public class ItemLeavesBlock extends ItemForestryBlock { + + public ItemLeavesBlock(Block block) { + super(block); + } + + @Override + public String getItemStackDisplayName(ItemStack itemstack) { + String type = StringUtil.localize("trees.grammar.leaves.type"); + if (!itemstack.hasTagCompound()) + return type; + ITree tree = getTree(itemstack); + String customTreeKey = "trees.custom.leaves." + tree.getGenome().getPrimary().getUnlocalizedName().replace("trees.species.",""); + if(StatCollector.canTranslate("for." + customTreeKey)){ + return StringUtil.localize(customTreeKey); + } + String grammar = StringUtil.localize("trees.grammar.leaves"); + + return grammar.replaceAll("%SPECIES", tree.getDisplayName()).replaceAll("%TYPE", type); + } + + @Override + public int getColorFromItemStack(ItemStack itemstack, int renderPass) { + ITree tree = getTree(itemstack); + return tree.getGenome().getPrimary().getLeafColour(tree); + } + + private ITree getTree(ItemStack itemStack) { + return new Tree(itemStack.getTagCompound()); + } + +} diff --git a/src/main/java/forestry/arboriculture/network/PacketLeafUpdate.java b/src/main/java/forestry/arboriculture/network/PacketLeafUpdate.java index 8367fa9d1..abcff5967 100755 --- a/src/main/java/forestry/arboriculture/network/PacketLeafUpdate.java +++ b/src/main/java/forestry/arboriculture/network/PacketLeafUpdate.java @@ -15,10 +15,10 @@ import java.io.DataOutputStream; import java.io.IOException; import forestry.arboriculture.gadgets.TileLeaves; -import forestry.core.network.PacketCoordinates; import forestry.core.network.PacketIds; +import forestry.core.network.PacketTileNBT; -public class PacketLeafUpdate extends PacketCoordinates { +public class PacketLeafUpdate extends PacketTileNBT { public byte isRipeningUpdate = 0; @@ -33,8 +33,8 @@ public class PacketLeafUpdate extends PacketCoordinates { public PacketLeafUpdate() { } - public PacketLeafUpdate(int posX, int posY, int posZ, TileLeaves leaves) { - super(PacketIds.LEAF_UPDATE, posX, posY, posZ); + public PacketLeafUpdate(TileLeaves leaves) { + super(PacketIds.LEAF_UPDATE, leaves); leafState = 0; if(leaves.hasFruit()) @@ -48,8 +48,8 @@ public class PacketLeafUpdate extends PacketCoordinates { colourFruits = leaves.determineFruitColour(); } - public PacketLeafUpdate(int posX, int posY, int posZ, int fruitColour) { - super(PacketIds.LEAF_UPDATE, posX, posY, posZ); + public PacketLeafUpdate(TileLeaves leaves, int fruitColour) { + super(PacketIds.LEAF_UPDATE, leaves); isRipeningUpdate = 1; colourFruits = fruitColour; diff --git a/src/main/java/forestry/plugins/PluginArboriculture.java b/src/main/java/forestry/plugins/PluginArboriculture.java index f896efb4f..31f51f179 100755 --- a/src/main/java/forestry/plugins/PluginArboriculture.java +++ b/src/main/java/forestry/plugins/PluginArboriculture.java @@ -89,6 +89,7 @@ import forestry.arboriculture.genetics.TreeTemplates; import forestry.arboriculture.genetics.TreekeepingMode; import forestry.arboriculture.items.ItemGermlingGE; import forestry.arboriculture.items.ItemGrafter; +import forestry.arboriculture.items.ItemLeavesBlock; import forestry.arboriculture.items.ItemStairs; import forestry.arboriculture.items.ItemTreealyzer; import forestry.arboriculture.items.ItemWoodBlock; @@ -233,7 +234,7 @@ public class PluginArboriculture extends NativePlugin implements IFuelHandler { ForestryBlock.saplingGE.registerBlock(new BlockSapling(), ItemForestryBlock.class, "saplingGE"); // Leaves - ForestryBlock.leaves.registerBlock(new BlockLeaves(), ItemForestryBlock.class, "leaves"); + ForestryBlock.leaves.registerBlock(new BlockLeaves(), ItemLeavesBlock.class, "leaves"); // Pods ForestryBlock.pods.registerBlock(new BlockFruitPod(), ItemForestryBlock.class, "pods"); From 5486be107cd4714e570e0e8fdb313fd200b6e70d Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 15 Sep 2014 19:27:37 -0700 Subject: [PATCH 064/103] Fixed fluid localization keys --- lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang b/lang index 24178af2c..7d0f08fdf 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 24178af2cfb1859a0ff9971e688bcc12907ff7a7 +Subproject commit 7d0f08fdfbc46e321441248512fbc531211cfaff From a3c562c1b14eee4ebe2cb20a114900f68a47c3fd Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 15 Sep 2014 23:27:55 -0700 Subject: [PATCH 065/103] Fix #180 dupe bug. Unified checking and removing items from inventories --- .../forestry/core/utils/InventoryAdapter.java | 96 +++++++++---------- .../java/forestry/core/utils/StackUtils.java | 25 ++++- .../factory/gadgets/MachineCarpenter.java | 47 ++++----- .../factory/gadgets/MachineFabricator.java | 50 +++------- .../factory/gadgets/MachineSqueezer.java | 34 ++----- .../factory/gadgets/TileWorktable.java | 43 ++------- .../farming/gadgets/TileFarmPlain.java | 4 +- 7 files changed, 117 insertions(+), 182 deletions(-) diff --git a/src/main/java/forestry/core/utils/InventoryAdapter.java b/src/main/java/forestry/core/utils/InventoryAdapter.java index 70737cc71..0c2fc4d8d 100755 --- a/src/main/java/forestry/core/utils/InventoryAdapter.java +++ b/src/main/java/forestry/core/utils/InventoryAdapter.java @@ -191,68 +191,60 @@ public class InventoryAdapter implements IInventory, INBTTagable { /* CONTAINS */ public boolean contains(ItemStack[] query, int startSlot, int slots) { - for (ItemStack queried : query) { - - int itemCount = 0; - for (int i = startSlot; i < startSlot + slots; i++) { - ItemStack stack = inventory.getStackInSlot(i); - - if (stack == null) - continue; - - if (StackUtils.equals(Blocks.bedrock, queried)) { - itemCount += stack.stackSize; - continue; - } - if (queried.getItemDamage() < 0) { - - if (stack.getItem() == queried.getItem()) - itemCount += stack.stackSize; - continue; - } - - if (stack.isItemEqual(queried) && ItemStack.areItemStackTagsEqual(stack, queried)) - itemCount += stack.stackSize; - } - - if (itemCount < queried.stackSize) - return false; - - } - - return true; + ItemStack[] stock = getStacks(startSlot, slots); + return StackUtils.containsSets(query, stock) > 0; } /* REMOVAL */ - public void removeResources(ItemStack[] query, int startSlot, int slots) { - for (ItemStack queried : query) { + /** + * Removes a set of items from an inventory. + * Removes the exact items first if they exist, and then removes crafting equivalents. + * If the inventory doesn't have all the required items, returns false without removing anything. + * If stowContainer is true, items with containers will have their container stowed. + */ + public boolean removeSets(int count, ItemStack[] set, int firstSlotIndex, int slotCount, EntityPlayer player, boolean stowContainer, boolean oreDictionary, boolean craftingTools) { - ItemStack remain = queried.copy(); + ItemStack[] condensedSet = StackUtils.condenseStacks(set, -1, false); - for (int i = startSlot; i < startSlot + slots; i++) { - ItemStack stack = inventory.getStackInSlot(i); + ItemStack[] stock = getStacks(firstSlotIndex, slotCount); + if (StackUtils.containsSets(condensedSet, stock, null, oreDictionary, craftingTools) < count) + return false; - if (stack == null) - continue; + for (ItemStack stackToRemove : condensedSet) { + stackToRemove.stackSize *= count; - if (queried.getItemDamage() < 0) { - - if (stack.getItem() == queried.getItem()) { - ItemStack removed = decrStackSize(i, remain.stackSize); - remain.stackSize -= removed.stackSize; - } - - } else if (stack.isItemEqual(remain) && ItemStack.areItemStackTagsEqual(stack, remain)) { - ItemStack removed = decrStackSize(i, remain.stackSize); - remain.stackSize -= removed.stackSize; - } - - if (remain.stackSize <= 0) - break; - } + // try to remove the exact stack first + removeStack(stackToRemove, firstSlotIndex, slotCount, player, stowContainer, false, false); + // remove crafting equivalents next + if (stackToRemove.stackSize > 0) + removeStack(stackToRemove, firstSlotIndex, slotCount, player, stowContainer, oreDictionary, craftingTools); } + return true; + } + /** + * Private Helper for removeSetsFromInventory. Assumes removal is possible. + */ + private void removeStack(ItemStack stackToRemove, int firstSlotIndex, int slotCount, EntityPlayer player, boolean stowContainer, boolean oreDictionary, boolean craftingTools) { + for (int j = firstSlotIndex; j < firstSlotIndex + slotCount; j++) { + ItemStack stackInSlot = getStackInSlot(j); + if (stackInSlot == null) + continue; + + if (!StackUtils.isCraftingEquivalent(stackToRemove, stackInSlot, oreDictionary, craftingTools)) + continue; + + + ItemStack removed = decrStackSize(j, stackToRemove.stackSize); + stackToRemove.stackSize -= removed.stackSize; + + if (stowContainer && stackToRemove.getItem().hasContainerItem(stackToRemove)) + StackUtils.stowContainerItem(removed, this, j, player); + + if (stackToRemove.stackSize == 0) + return; + } } /* IINVENTORY */ diff --git a/src/main/java/forestry/core/utils/StackUtils.java b/src/main/java/forestry/core/utils/StackUtils.java index b97d593a8..ee5891f06 100755 --- a/src/main/java/forestry/core/utils/StackUtils.java +++ b/src/main/java/forestry/core/utils/StackUtils.java @@ -267,7 +267,7 @@ public class StackUtils { public static int containsSets(ItemStack[] set, ItemStack[] stock, ItemStack exclude, boolean oreDictionary, boolean craftingTools) { int count = 0; - ItemStack[] condensedRequired = StackUtils.condenseStacks(set); + ItemStack[] condensedRequired = StackUtils.condenseStacks(set, -1, oreDictionary); ItemStack[] condensedOffered = StackUtils.condenseStacks(stock, -1, oreDictionary); for (ItemStack req : condensedRequired) { @@ -297,6 +297,27 @@ public class StackUtils { return count; } + /** + * Compare two item stacks for crafting equivalency without oreDictionary or craftingTools + */ + public static boolean isCraftingEquivalent(ItemStack base, ItemStack comparison) { + if (base == null || comparison == null) + return false; + + if (base.getItem() != comparison.getItem()) + return false; + + if (base.getItemDamage() != Defaults.WILDCARD) + if (base.getItemDamage() != comparison.getItemDamage()) + return false; + + // When the base stackTagCompound is null, treat it as a wildcard for crafting + if (base.stackTagCompound != null && !ItemStack.areItemStackTagsEqual(base, comparison)) + return false; + + return true; + } + /** * Compare two item stacks for crafting equivalency. * @@ -306,7 +327,7 @@ public class StackUtils { * @return */ public static boolean isCraftingEquivalent(ItemStack base, ItemStack comparison, boolean oreDictionary, boolean craftingTools) { - if (isIdenticalItem(base, comparison)) + if (isCraftingEquivalent(base, comparison)) return true; if (base == null || comparison == null) diff --git a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java index dff58d5a9..ac52592d0 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java @@ -384,7 +384,8 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL totalTime = 0; // Remove resources - removeResources(currentRecipe); + if (!removeResources(currentRecipe)) + return false; // Update product display if (activeContainer != null) @@ -432,37 +433,29 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL return StackUtils.containsSets(craftingInventory.getStacks(SLOT_CRAFTING_1, 9), accessibleInventory.getStacks(SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT), null, true, false) > 0; } - private void removeResources(Recipe recipe) { + private boolean removeResources(Recipe recipe) { // Remove resources - if (recipe.liquid != null) - resourceTank.drain(recipe.liquid.amount, true); + if (recipe.liquid != null) { + FluidStack amountDrained = resourceTank.drain(recipe.liquid.amount, false); + if (amountDrained != null && amountDrained.amount == recipe.liquid.amount) + resourceTank.drain(recipe.liquid.amount, true); + else + return false; + } // Remove boxes - if (recipe.box != null) - accessibleInventory.decrStackSize(SLOT_BOX, 1); - - removeSets(1, craftingInventory.getStacks(SLOT_CRAFTING_1, 9)); - - } - - private void removeSets(int count, ItemStack[] set) { - - for (int i = 0; i < count; i++) { - ItemStack[] condensedSet = StackUtils.condenseStacks(set); - for (ItemStack req : condensedSet) { - for (int j = SLOT_INVENTORY_1; j < SLOT_INVENTORY_1 + SLOT_INVENTORY_COUNT; j++) { - ItemStack pol = accessibleInventory.getStackInSlot(j); - if (pol == null) - continue; - if (!StackUtils.isCraftingEquivalent(pol, req, true, false)) - continue; - - ItemStack removed = accessibleInventory.decrStackSize(j, req.stackSize); - req.stackSize -= removed.stackSize; - } - } + if (recipe.box != null) { + ItemStack removed = accessibleInventory.decrStackSize(SLOT_BOX, 1); + if (removed == null || removed.stackSize == 0) + return false; } + return removeSets(1, craftingInventory.getStacks(SLOT_CRAFTING_1, 9)); + } + + private boolean removeSets(int count, ItemStack[] set) { + EntityPlayer player = worldObj.getPlayerEntityByName(owner.getName()); + return accessibleInventory.removeSets(count, set, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT, player, true, true, true); } private boolean tryAddPending() { diff --git a/src/main/java/forestry/factory/gadgets/MachineFabricator.java b/src/main/java/forestry/factory/gadgets/MachineFabricator.java index b48331af8..f4d4004bc 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFabricator.java +++ b/src/main/java/forestry/factory/gadgets/MachineFabricator.java @@ -397,8 +397,8 @@ public class MachineFabricator extends TilePowered implements ICrafter, ISpecial FluidStack liquid = myRecipe.molten; // Remove resources - if (removeFromInventory(1, inventory.getStacks(SLOT_CRAFTING_1, 9), false)) { - removeFromInventory(1, inventory.getStacks(SLOT_CRAFTING_1, 9), true); + if (removeFromInventory(1, inventory.getStacks(SLOT_CRAFTING_1, 9), player, false)) { + removeFromInventory(1, inventory.getStacks(SLOT_CRAFTING_1, 9), player, true); moltenTank.drain(liquid.amount, true); } else if (consumeRecipe) { removeFromCraftMatrix(myRecipe); @@ -428,39 +428,13 @@ public class MachineFabricator extends TilePowered implements ICrafter, ISpecial } - private boolean removeFromInventory(int count, ItemStack[] set, boolean doRemove) { - - boolean hasRemoved = true; - for (int i = 0; i < count; i++) { - ItemStack[] condensedSet = StackUtils.condenseStacks(set, 1, true); - for (ItemStack req : condensedSet) - for (int j = SLOT_INVENTORY_1; j < SLOT_INVENTORY_1 + SLOT_INVENTORY_COUNT; j++) { - ItemStack pol = inventory.getStackInSlot(j); - if (pol == null) - continue; - if (!StackUtils.isCraftingEquivalent(pol, req, true, false)) - continue; - - int available = pol.stackSize; - if (doRemove) { - inventory.decrStackSize(j, req.stackSize); - } - req.stackSize -= available; - - if(req.stackSize <= 0) - break; - } - - boolean hasLeft = false; - for (ItemStack req : condensedSet) - if (req != null && req.stackSize > 0) - hasLeft = true; - if (hasLeft) - hasRemoved = false; - + private boolean removeFromInventory(int count, ItemStack[] set, EntityPlayer player, boolean doRemove) { + if (doRemove) { + return inventory.removeSets(count, set, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT, player, true, true, true); + } else { + ItemStack[] stock = inventory.getStacks(SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT); + return StackUtils.containsSets(set, stock) >= count; } - - return hasRemoved; } @Override @@ -527,10 +501,12 @@ public class MachineFabricator extends TilePowered implements ICrafter, ISpecial @Override public ItemStack[] extractItem(boolean doRemove, ForgeDirection from, int maxItemCount) { ItemStack taken; - if (doRemove) - taken = this.takenFromSlot(SLOT_RESULT, false, null); - else + if (doRemove) { + EntityPlayer player = worldObj.getPlayerEntityByName(owner.getName()); + taken = this.takenFromSlot(SLOT_RESULT, false, player); + } else { taken = this.getResult(); + } if (taken != null) return new ItemStack[] { taken }; diff --git a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java index ea78aff6c..58776c862 100755 --- a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java +++ b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java @@ -76,29 +76,7 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I } public boolean matches(ItemStack[] res) { - // No recipe without resource! - if (res == null || res.length <= 0) - return false; - - boolean matchedAll = true; - - for (ItemStack stack : resources) { - boolean matched = false; - for (ItemStack matchStack : res) { - if (matchStack == null) - continue; - - // If the item matches, we need enough items - if (matchStack.isItemEqual(stack)) - if (matchStack.stackSize >= stack.stackSize) { - matched = true; - break; - } - } - if (!matched) - matchedAll = false; - } - return matchedAll; + return StackUtils.containsSets(resources, res, null, true, true) > 0; } } @@ -290,13 +268,14 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I return true; } + if (!removeResources(currentRecipe.resources)) + return false; + // We are done, add products to queue pendingLiquids.push(currentRecipe.liquid.copy()); if (currentRecipe.remnants != null && worldObj.rand.nextInt(100) < currentRecipe.chance) pendingRemnants.push(currentRecipe.remnants.copy()); - removeResources(currentRecipe.resources); - checkRecipe(); resetRecipe(); @@ -365,8 +344,9 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I return inventory.tryAddStack(stack, SLOT_REMNANT, 1, true); } - private void removeResources(ItemStack[] stacks) { - inventory.removeResources(stacks, SLOT_RESOURCE_1, SLOTS_RESOURCE_COUNT); + private boolean removeResources(ItemStack[] stacks) { + EntityPlayer player = worldObj.getPlayerEntityByName(owner.getName()); + return inventory.removeSets(1, stacks, SLOT_RESOURCE_1, SLOTS_RESOURCE_COUNT, player, false, true, true); } @Override diff --git a/src/main/java/forestry/factory/gadgets/TileWorktable.java b/src/main/java/forestry/factory/gadgets/TileWorktable.java index 6ae55cde3..7b33d2c78 100755 --- a/src/main/java/forestry/factory/gadgets/TileWorktable.java +++ b/src/main/java/forestry/factory/gadgets/TileWorktable.java @@ -462,43 +462,14 @@ public class TileWorktable extends TileBase implements ICrafter { } private boolean validateResources() { - // Need at least one matched set - if (currentRecipe == null) - return false; - - ItemStack[] set = currentRecipe.getMatrix().getStacks(); - ItemStack[] stock = accessibleInventory.getStacks(); + ItemStack[] set = craftingInventory.getStacks(SLOT_CRAFTING_1, 9); + ItemStack[] stock = accessibleInventory.getStacks(SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT); return StackUtils.containsSets(set, stock, currentRecipe.getRecipeOutput(), true, true) > 0; } - private void removeResources(EntityPlayer player) { - removeSets(1, craftingInventory.getStacks(SLOT_CRAFTING_1, 9), player); - } - - private void removeSets(int count, ItemStack[] set, EntityPlayer player) { - - for (int i = 0; i < count; i++) { - ItemStack[] condensedSet = StackUtils.condenseStacks(set); - for (ItemStack req : condensedSet) { - for (int j = SLOT_INVENTORY_1; j < SLOT_INVENTORY_1 + SLOT_INVENTORY_COUNT; j++) { - ItemStack pol = accessibleInventory.getStackInSlot(j); - if (pol == null) - continue; - - if (!StackUtils.isCraftingEquivalent(pol, req, true, true)) - continue; - - ItemStack removed = accessibleInventory.decrStackSize(j, req.stackSize); - req.stackSize -= removed.stackSize; - - if (req.getItem().hasContainerItem(req)) - StackUtils.stowContainerItem(removed, accessibleInventory, j, player); - if (req.stackSize <= 0) - break; - } - } - } - + private boolean removeResources(EntityPlayer player) { + ItemStack[] set = craftingInventory.getStacks(SLOT_CRAFTING_1, 9); + return accessibleInventory.removeSets(1, set, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT, player, true, true, true); } @Override @@ -508,12 +479,12 @@ public class TileWorktable extends TileBase implements ICrafter { @Override public ItemStack takenFromSlot(int slotIndex, boolean consumeRecipe, EntityPlayer player) { - if (!validateResources()) + if (!removeResources(player)) return null; if (Proxies.common.isSimulating(worldObj)) memorized.memorizeRecipe(worldObj, currentRecipe, currentCrafting); - removeResources(player); + updateCraftResult(currentCrafting); return currentRecipe.getRecipeOutput().copy(); } diff --git a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java index ec3123714..30a48125b 100755 --- a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java +++ b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java @@ -19,6 +19,7 @@ import java.util.Set; import java.util.Stack; import java.util.TreeMap; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; import net.minecraft.item.ItemStack; @@ -757,7 +758,8 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable @Override public void removeResources(ItemStack[] resources) { - inventory.removeResources(resources, SLOT_RESOURCES_1, SLOT_COUNT_RESERVOIRS); + EntityPlayer player = worldObj.getPlayerEntityByName(owner.getName()); + inventory.removeSets(1, resources, SLOT_RESOURCES_1, SLOT_RESOURCES_1, player, false, true, true); } @Override From 475a70f144b3851e54ded0ab69a0478342646743 Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 16 Sep 2014 00:03:12 -0700 Subject: [PATCH 066/103] Fixes #145. Worktable can use IC2 RE-Battery and other strange NBT items --- src/main/java/forestry/core/utils/StackUtils.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/forestry/core/utils/StackUtils.java b/src/main/java/forestry/core/utils/StackUtils.java index ee5891f06..0eb820649 100755 --- a/src/main/java/forestry/core/utils/StackUtils.java +++ b/src/main/java/forestry/core/utils/StackUtils.java @@ -311,11 +311,11 @@ public class StackUtils { if (base.getItemDamage() != comparison.getItemDamage()) return false; - // When the base stackTagCompound is null, treat it as a wildcard for crafting - if (base.stackTagCompound != null && !ItemStack.areItemStackTagsEqual(base, comparison)) - return false; - - return true; + // When the base stackTagCompound is null or empty, treat it as a wildcard for crafting + if (base.stackTagCompound == null || base.stackTagCompound.hasNoTags()) + return true; + else + return ItemStack.areItemStackTagsEqual(base, comparison); } /** From b38ca33c7265b67ae342136a06ab29087f6f3500 Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 16 Sep 2014 01:08:29 -0700 Subject: [PATCH 067/103] Allow plugins to specify a mod with a certain version range --- .../java/forestry/core/proxy/ProxyCommon.java | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/src/main/java/forestry/core/proxy/ProxyCommon.java b/src/main/java/forestry/core/proxy/ProxyCommon.java index 6a762abf9..fce377bab 100755 --- a/src/main/java/forestry/core/proxy/ProxyCommon.java +++ b/src/main/java/forestry/core/proxy/ProxyCommon.java @@ -31,6 +31,11 @@ import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.ModContainer; +import cpw.mods.fml.common.versioning.ArtifactVersion; +import cpw.mods.fml.common.versioning.DefaultArtifactVersion; +import cpw.mods.fml.common.versioning.VersionParser; +import cpw.mods.fml.common.versioning.VersionRange; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; @@ -237,9 +242,28 @@ public class ProxyCommon { return Loader.isModLoaded(modname); } - public Object instantiateIfModLoaded(String modname, String className) { + public boolean isModLoaded(String modname, String versionRangeString) { + if (versionRangeString != null) { + ModContainer mod = Loader.instance().getIndexedModList().get(modname); + ArtifactVersion modVersion = mod.getProcessedVersion(); - if (isModLoaded(modname)) + VersionRange versionRange = VersionParser.parseRange(versionRangeString); + DefaultArtifactVersion requiredVersion = new DefaultArtifactVersion(modname, versionRange); + + if (!requiredVersion.containsVersion(modVersion)) + return false; + } + + return isModLoaded(modname); + } + + public Object instantiateIfModLoaded(String modname, String className) { + return instantiateIfModLoaded(modname, null, className); + } + + public Object instantiateIfModLoaded(String modname, String versionRangeString, String className) { + + if (isModLoaded(modname, versionRangeString)) try { Class clas = Class.forName(className, true, Loader.instance().getModClassLoader()); return clas.newInstance(); From 17ec7edcf599e020d4a266dae54ca27766f10382 Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 16 Sep 2014 02:25:02 -0700 Subject: [PATCH 068/103] Fix #128 Make plugins for Buildcraft only available for 6.0.x, not 6.1.x --- src/main/java/forestry/plugins/PluginBuildCraft.java | 3 ++- src/main/java/forestry/plugins/PluginPropolisPipe.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/forestry/plugins/PluginBuildCraft.java b/src/main/java/forestry/plugins/PluginBuildCraft.java index 8b638e8a0..763d679e9 100755 --- a/src/main/java/forestry/plugins/PluginBuildCraft.java +++ b/src/main/java/forestry/plugins/PluginBuildCraft.java @@ -53,6 +53,7 @@ public class PluginBuildCraft implements IPlugin, ITriggerProvider { public static Item wrench; public static Item stoneGear; public static Item pipeWaterproof; + public static final String validVersionRange = "[6.0.0,6.1.0)"; public PluginBuildCraft() { if (PluginBuildCraft.instance == null) @@ -64,7 +65,7 @@ public class PluginBuildCraft implements IPlugin, ITriggerProvider { */ @Override public boolean isAvailable() { - return (Proxies.common.isModLoaded("BuildCraft|Core") && Proxies.common.isModLoaded("BuildCraft|Transport")); + return (Proxies.common.isModLoaded("BuildCraft|Core", validVersionRange) && Proxies.common.isModLoaded("BuildCraft|Transport", validVersionRange)); } @Override diff --git a/src/main/java/forestry/plugins/PluginPropolisPipe.java b/src/main/java/forestry/plugins/PluginPropolisPipe.java index f90d87cba..a068bb5f7 100755 --- a/src/main/java/forestry/plugins/PluginPropolisPipe.java +++ b/src/main/java/forestry/plugins/PluginPropolisPipe.java @@ -38,7 +38,7 @@ public class PluginPropolisPipe extends NativePlugin { @Override public boolean isAvailable() { - return Proxies.common.isModLoaded("BuildCraft|Transport"); + return Proxies.common.isModLoaded("BuildCraft|Transport", PluginBuildCraft.validVersionRange); } @Override @@ -62,7 +62,7 @@ public class PluginPropolisPipe extends NativePlugin { if (FMLCommonHandler.instance().getSide().isClient()) proxyClass = "forestry.pipes.proxy.ClientProxyPipes"; - proxy = (ProxyPipes) Proxies.common.instantiateIfModLoaded("BuildCraft|Transport", proxyClass); + proxy = (ProxyPipes) Proxies.common.instantiateIfModLoaded("BuildCraft|Transport", PluginBuildCraft.validVersionRange, proxyClass); if (proxy == null) return; From cac24a86730d082c8db7463c6bde6dfc99ae53f4 Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 16 Sep 2014 13:53:57 -0700 Subject: [PATCH 069/103] Fixes #190. Stop crash if a mod with a required version isn't loaded --- src/main/java/forestry/core/proxy/ProxyCommon.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/forestry/core/proxy/ProxyCommon.java b/src/main/java/forestry/core/proxy/ProxyCommon.java index fce377bab..009c53b9b 100755 --- a/src/main/java/forestry/core/proxy/ProxyCommon.java +++ b/src/main/java/forestry/core/proxy/ProxyCommon.java @@ -243,6 +243,9 @@ public class ProxyCommon { } public boolean isModLoaded(String modname, String versionRangeString) { + if (!isModLoaded(modname)) + return false; + if (versionRangeString != null) { ModContainer mod = Loader.instance().getIndexedModList().get(modname); ArtifactVersion modVersion = mod.getProcessedVersion(); @@ -254,7 +257,7 @@ public class ProxyCommon { return false; } - return isModLoaded(modname); + return true; } public Object instantiateIfModLoaded(String modname, String className) { From 62af4d6f474666b73da2ee41f29a71473325a9ee Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 16 Sep 2014 14:43:46 -0700 Subject: [PATCH 070/103] Fixes #191. Allow tropical trees to grow in tropical biomes --- .../arboriculture/genetics/GrowthProviderTropical.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/forestry/arboriculture/genetics/GrowthProviderTropical.java b/src/main/java/forestry/arboriculture/genetics/GrowthProviderTropical.java index d9eba5779..2c3125665 100755 --- a/src/main/java/forestry/arboriculture/genetics/GrowthProviderTropical.java +++ b/src/main/java/forestry/arboriculture/genetics/GrowthProviderTropical.java @@ -12,19 +12,20 @@ package forestry.arboriculture.genetics; import java.util.EnumSet; -import forestry.core.utils.StringUtil; +import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.World; import forestry.api.arboriculture.EnumGrowthConditions; import forestry.api.arboriculture.ITreeGenome; +import forestry.core.utils.StringUtil; public class GrowthProviderTropical extends GrowthProvider { @Override public EnumGrowthConditions getGrowthConditions(ITreeGenome genome, World world, int xPos, int yPos, int zPos) { EnumGrowthConditions light = getConditionFromLight(world, xPos, yPos, zPos); - EnumGrowthConditions moisture = getConditionsFromRainfall(world, xPos, yPos, zPos, 0.9f, 2.0f); - EnumGrowthConditions temperature = getConditionsFromTemperature(world, xPos, yPos, zPos, 1.2f, 1.9f); + EnumGrowthConditions moisture = getConditionsFromRainfall(world, xPos, yPos, zPos, BiomeGenBase.jungle.rainfall, 2.0f); + EnumGrowthConditions temperature = getConditionsFromTemperature(world, xPos, yPos, zPos, BiomeGenBase.jungle.temperature, BiomeGenBase.desert.temperature - 0.1f); EnumSet conditions = EnumSet.of(light, moisture, temperature); From ce1d24952f0523aa4e8b767fe90046690a118ca0 Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 16 Sep 2014 16:23:20 -0700 Subject: [PATCH 071/103] Renamed new GUI elements so that texture packs don't use the old version --- src/main/java/forestry/core/gui/GuiAlyzer.java | 2 +- .../java/forestry/factory/gui/GuiWorktable.java | 2 +- src/main/java/forestry/mail/gui/GuiTrader.java | 2 +- .../textures/gui/{beealyzer.png => beealyzer2.png} | Bin .../gui/{mailtrader.png => mailtrader2.png} | Bin .../textures/gui/{worktable.png => worktable2.png} | Bin 6 files changed, 3 insertions(+), 3 deletions(-) rename src/main/resources/assets/forestry/textures/gui/{beealyzer.png => beealyzer2.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/gui/{mailtrader.png => mailtrader2.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/forestry/textures/gui/{worktable.png => worktable2.png} (100%) mode change 100755 => 100644 diff --git a/src/main/java/forestry/core/gui/GuiAlyzer.java b/src/main/java/forestry/core/gui/GuiAlyzer.java index e082aeb95..da6a4261d 100755 --- a/src/main/java/forestry/core/gui/GuiAlyzer.java +++ b/src/main/java/forestry/core/gui/GuiAlyzer.java @@ -56,7 +56,7 @@ public abstract class GuiAlyzer extends GuiForestry { protected HashMap iconStacks = new HashMap(); public GuiAlyzer(ISpeciesRoot speciesRoot, EntityPlayer player, ContainerForestry container, IInventory inventory, int pageMax, int pageSize) { - super(Defaults.TEXTURE_PATH_GUI + "/beealyzer.png", container); + super(Defaults.TEXTURE_PATH_GUI + "/beealyzer2.png", container); xSize = 246; ySize = 238; diff --git a/src/main/java/forestry/factory/gui/GuiWorktable.java b/src/main/java/forestry/factory/gui/GuiWorktable.java index b1b8495d7..dc1458003 100755 --- a/src/main/java/forestry/factory/gui/GuiWorktable.java +++ b/src/main/java/forestry/factory/gui/GuiWorktable.java @@ -103,7 +103,7 @@ public class GuiWorktable extends GuiForestryTitled { protected ContainerWorktable container; public GuiWorktable(EntityPlayer player, TileWorktable tile) { - super(Defaults.TEXTURE_PATH_GUI + "/worktable.png", new ContainerWorktable(player, tile), tile); + super(Defaults.TEXTURE_PATH_GUI + "/worktable2.png", new ContainerWorktable(player, tile), tile); ySize = 218; worktable = tile; diff --git a/src/main/java/forestry/mail/gui/GuiTrader.java b/src/main/java/forestry/mail/gui/GuiTrader.java index 4ce91a6b3..5e9999436 100755 --- a/src/main/java/forestry/mail/gui/GuiTrader.java +++ b/src/main/java/forestry/mail/gui/GuiTrader.java @@ -22,7 +22,7 @@ public class GuiTrader extends GuiForestry { private final ContainerTrader container; public GuiTrader(InventoryPlayer inventoryplayer, MachineTrader tile) { - super(Defaults.TEXTURE_PATH_GUI + "/mailtrader.png", new ContainerTrader(inventoryplayer, tile), tile); + super(Defaults.TEXTURE_PATH_GUI + "/mailtrader2.png", new ContainerTrader(inventoryplayer, tile), tile); this.xSize = 226; this.ySize = 220; diff --git a/src/main/resources/assets/forestry/textures/gui/beealyzer.png b/src/main/resources/assets/forestry/textures/gui/beealyzer2.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/beealyzer.png rename to src/main/resources/assets/forestry/textures/gui/beealyzer2.png diff --git a/src/main/resources/assets/forestry/textures/gui/mailtrader.png b/src/main/resources/assets/forestry/textures/gui/mailtrader2.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/mailtrader.png rename to src/main/resources/assets/forestry/textures/gui/mailtrader2.png diff --git a/src/main/resources/assets/forestry/textures/gui/worktable.png b/src/main/resources/assets/forestry/textures/gui/worktable2.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/forestry/textures/gui/worktable.png rename to src/main/resources/assets/forestry/textures/gui/worktable2.png From 2f7ed2386c0ba6214a9f6590bac610bb463d1086 Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Tue, 16 Sep 2014 17:14:00 -0700 Subject: [PATCH 072/103] Port Railcraft's Fluid utilities to Forestry. --- .../forestry/core/fluids/FluidHelper.java | 286 +++++++++++++++ .../java/forestry/core/fluids/Fluids.java | 79 ++++ .../forestry/core/fluids/TankManager.java | 338 ++++++++++++++++++ .../forestry/core/fluids/tanks/FakeTank.java | 38 ++ .../core/fluids/tanks/FilteredTank.java | 70 ++++ .../core/fluids/tanks/StandardTank.java | 121 +++++++ .../java/forestry/core/utils/NBTUtil.java | 77 ++++ 7 files changed, 1009 insertions(+) create mode 100644 src/main/java/forestry/core/fluids/FluidHelper.java create mode 100644 src/main/java/forestry/core/fluids/Fluids.java create mode 100644 src/main/java/forestry/core/fluids/TankManager.java create mode 100644 src/main/java/forestry/core/fluids/tanks/FakeTank.java create mode 100644 src/main/java/forestry/core/fluids/tanks/FilteredTank.java create mode 100644 src/main/java/forestry/core/fluids/tanks/StandardTank.java create mode 100644 src/main/java/forestry/core/utils/NBTUtil.java diff --git a/src/main/java/forestry/core/fluids/FluidHelper.java b/src/main/java/forestry/core/fluids/FluidHelper.java new file mode 100644 index 000000000..15a01d0ad --- /dev/null +++ b/src/main/java/forestry/core/fluids/FluidHelper.java @@ -0,0 +1,286 @@ +/******************************************************************************* + * 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.fluids; + +import forestry.core.fluids.tanks.StandardTank; +import forestry.core.inventory.InvTools; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.block.Block; +import net.minecraft.block.BlockLiquid; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.world.World; +import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; + +/** + * + * @author CovertJaguar + */ +public final class FluidHelper { + + public static final int BUCKET_FILL_TIME = 8; + public static final int NETWORK_UPDATE_INTERVAL = 128; + public static final int BUCKET_VOLUME = 1000; + + private FluidHelper() { + } + + public static boolean handleRightClick(IFluidHandler tank, ForgeDirection side, EntityPlayer player, boolean fill, boolean drain) { + if (player == null) + return false; + ItemStack current = player.inventory.getCurrentItem(); + if (current != null) { + + FluidStack liquid = getFluidStackInContainer(current); + + if (fill && liquid != null) { + int used = tank.fill(side, liquid, true); + + if (used > 0) { + if (!player.capabilities.isCreativeMode) { + player.inventory.setInventorySlotContents(player.inventory.currentItem, InvTools.depleteItem(current)); + player.inventory.markDirty(); + } + return true; + } + + } else if (drain) { + + FluidStack available = tank.drain(side, Integer.MAX_VALUE, false); + if (available != null) { + ItemStack filled = fillContainer(available, current); + + liquid = getFluidStackInContainer(filled); + if (liquid != null) { + + if (current.stackSize > 1) { + if (!player.inventory.addItemStackToInventory(filled)) + return false; + player.inventory.setInventorySlotContents(player.inventory.currentItem, InvTools.depleteItem(current)); + player.inventory.markDirty(); + } else { + player.inventory.setInventorySlotContents(player.inventory.currentItem, InvTools.depleteItem(current)); + player.inventory.setInventorySlotContents(player.inventory.currentItem, filled); + player.inventory.markDirty(); + } + + tank.drain(side, liquid.amount, true); + return true; + } + } + } + } + return false; + } + + public static void processContainers(StandardTank tank, IInventory inv, int inputSlot, int outputSlot) { + processContainers(tank, inv, inputSlot, outputSlot, tank.getFluidType(), true, true); + } + + public static void processContainers(StandardTank tank, IInventory inv, int inputSlot, int outputSlot, Fluid fluidToFill, boolean processFilled, boolean processEmpty) { + TankManager tankManger = new TankManager(); + tankManger.add(tank); + processContainers(tankManger, inv, inputSlot, outputSlot, fluidToFill, processFilled, processEmpty); + } + + public static void processContainers(TankManager tank, IInventory inv, int inputSlot, int outputSlot, Fluid fluidToFill) { + processContainers(tank, inv, inputSlot, outputSlot, fluidToFill, true, true); + } + + public static void processContainers(IFluidHandler fluidHandler, IInventory inv, int inputSlot, int outputSlot, Fluid fluidToFill, boolean processFilled, boolean processEmpty) { + ItemStack input = inv.getStackInSlot(inputSlot); + + if (input == null) + return; + + if (processFilled && drainContainers(fluidHandler, inv, inputSlot, outputSlot)) + return; + + if (processEmpty && fluidToFill != null) + fillContainers(fluidHandler, inv, inputSlot, outputSlot, fluidToFill); + } + + public static boolean fillContainers(IFluidHandler fluidHandler, IInventory inv, int inputSlot, int outputSlot, Fluid fluidToFill) { + ItemStack input = inv.getStackInSlot(inputSlot); + ItemStack output = inv.getStackInSlot(outputSlot); + ItemStack filled = getFilledContainer(fluidToFill, input); + if (filled != null && (output == null || (output.stackSize < output.getMaxStackSize() && InvTools.isItemEqual(filled, output)))) { + FluidStack fluidInContainer = getFluidStackInContainer(filled); + FluidStack drain = fluidHandler.drain(ForgeDirection.UNKNOWN, fluidInContainer, false); + if (drain != null && drain.amount == fluidInContainer.amount) { + fluidHandler.drain(ForgeDirection.UNKNOWN, fluidInContainer, true); + if (output == null) + inv.setInventorySlotContents(outputSlot, filled); + else + output.stackSize++; + inv.decrStackSize(inputSlot, 1); + return true; + } + } + return false; + } + + public static boolean drainContainers(IFluidHandler fluidHandler, IInventory inv, int inputSlot, int outputSlot) { + ItemStack input = inv.getStackInSlot(inputSlot); + ItemStack output = inv.getStackInSlot(outputSlot); + + if (input != null) { + FluidStack fluidInContainer = getFluidStackInContainer(input); + ItemStack emptyItem = input.getItem().getContainerItem(input); + if (fluidInContainer != null && (emptyItem == null || output == null || (output.stackSize < output.getMaxStackSize() && InvTools.isItemEqual(output, emptyItem)))) { + int used = fluidHandler.fill(ForgeDirection.UNKNOWN, fluidInContainer, false); + if (used >= fluidInContainer.amount) { + fluidHandler.fill(ForgeDirection.UNKNOWN, fluidInContainer, true); + if (emptyItem != null) + if (output == null) + inv.setInventorySlotContents(outputSlot, emptyItem); + else + output.stackSize++; + inv.decrStackSize(inputSlot, 1); + return true; + } + } + } + return false; + } + + public static boolean isBucket(ItemStack stack) { + return FluidContainerRegistry.isBucket(stack); + } + + public static boolean isContainer(ItemStack stack) { + if (stack != null && stack.getItem() instanceof IFluidContainerItem) + return true; + return FluidContainerRegistry.isContainer(stack); + } + + public static boolean isFilledContainer(ItemStack stack) { + return FluidContainerRegistry.isFilledContainer(stack); + } + + public static boolean isEmptyContainer(ItemStack stack) { + return FluidContainerRegistry.isEmptyContainer(stack); + } + + public static ItemStack getFilledContainer(Fluid fluid, ItemStack empty) { + if (fluid == null || empty == null) return null; + return FluidContainerRegistry.fillFluidContainer(new FluidStack(fluid, Integer.MAX_VALUE), empty); + } + + public static ItemStack getFilledContainer(FluidStack fluid, ItemStack empty) { + if (fluid == null || empty == null) return null; + fluid = fluid.copy(); + fluid.amount = Integer.MAX_VALUE; + return FluidContainerRegistry.fillFluidContainer(fluid, empty); + } + + public static ItemStack fillContainer(FluidStack liquid, ItemStack empty) { + if (liquid == null || empty == null) return null; + return FluidContainerRegistry.fillFluidContainer(liquid, empty); + } + + public static FluidStack getFluidStackInContainer(ItemStack stack) { + return FluidContainerRegistry.getFluidForFilledItem(stack); + } + + public static Fluid getFluidInContianer(ItemStack stack) { + FluidStack fluidStack = FluidContainerRegistry.getFluidForFilledItem(stack); + return fluidStack != null ? fluidStack.getFluid() : null; + } + + public static boolean containsFluidStack(ItemStack stack, FluidStack fluidStack) { + return FluidContainerRegistry.containsFluid(stack, fluidStack); + } + + public static boolean containsFluid(ItemStack stack, Fluid fluid) { + return FluidContainerRegistry.containsFluid(stack, new FluidStack(fluid, 1)); + } + + public static boolean isFluidEqual(FluidStack L1, FluidStack L2) { + if (L1 == null || L2 == null) + return false; + return L1.isFluidEqual(L2); + } + + public static Collection getContainersFilledWith(FluidStack fluidStack) { + List containers = new ArrayList(); + for (FluidContainerData data : FluidContainerRegistry.getRegisteredFluidContainerData()) { + FluidStack inContainer = getFluidStackInContainer(data.filledContainer); + if (inContainer != null && inContainer.containsFluid(fluidStack)) + containers.add(data.filledContainer.copy()); + } + return containers; + } + + public static void nerfWaterBottle() { + for (FluidContainerData data : FluidContainerRegistry.getRegisteredFluidContainerData()) { + if (data.filledContainer.getItem() == Items.potionitem && data.emptyContainer.getItem() == Items.glass_bottle && Fluids.WATER.is(data.fluid)) { + data.fluid.amount = 333; + return; + } + } + } + + public static FluidStack drainBlock(World world, int x, int y, int z, boolean doDrain) { + return drainBlock(world.getBlock(x, y, z), world, x, y, z, doDrain); + } + + public static FluidStack drainBlock(Block block, World world, int x, int y, int z, boolean doDrain) { + if (block instanceof IFluidBlock) { + IFluidBlock fluidBlock = (IFluidBlock)block; + if (fluidBlock.canDrain(world, x, y, z)) + return fluidBlock.drain(world, x, y, z, doDrain); + } else if (block == Blocks.water || block == Blocks.flowing_water) { + int meta = world.getBlockMetadata(x, y, z); + if (meta != 0) + return null; + if (doDrain) + world.setBlockToAir(x, y, z); + return new FluidStack(FluidRegistry.WATER, FluidContainerRegistry.BUCKET_VOLUME); + } else if (block == Blocks.lava || block == Blocks.flowing_lava) { + int meta = world.getBlockMetadata(x, y, z); + if (meta != 0) + return null; + if (doDrain) + world.setBlockToAir(x, y, z); + return new FluidStack(FluidRegistry.LAVA, FluidContainerRegistry.BUCKET_VOLUME); + } + return null; + } + + public static boolean isFullFluidBlock(World world, int x, int y, int z) { + return isFullFluidBlock(world.getBlock(x, y, z), world, x, y, z); + } + + public static boolean isFullFluidBlock(Block block, World world, int x, int y, int z) { + if (block instanceof BlockLiquid || block instanceof IFluidBlock) + return world.getBlockMetadata(x, y, z) == 0; + return false; + } + + public static Fluid getFluid(Block block) { + if (block instanceof IFluidBlock) + return ((IFluidBlock) block).getFluid(); + else if (block == Blocks.water || block == Blocks.flowing_water) + return FluidRegistry.WATER; + else if (block == Blocks.lava || block == Blocks.flowing_lava) + return FluidRegistry.LAVA; + return null; + } + +} diff --git a/src/main/java/forestry/core/fluids/Fluids.java b/src/main/java/forestry/core/fluids/Fluids.java new file mode 100644 index 000000000..6599a48ff --- /dev/null +++ b/src/main/java/forestry/core/fluids/Fluids.java @@ -0,0 +1,79 @@ +/******************************************************************************* + * 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.fluids; + +import java.util.Locale; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +/** + * + * @author CovertJaguar + */ +public enum Fluids { + + WATER, LAVA, FUEL, BIOFUEL, CREOSOTE, STEAM, BIOETHANOL, COAL, PYROTHEUM; + private final String tag; + + private Fluids() { + tag = name().toLowerCase(Locale.ENGLISH); + } + + public String getTag() { + return tag; + } + + public Fluid get() { + return FluidRegistry.getFluid(tag); + } + + /** + * Gets a FluidStack filled with qty milliBuckets worth of Fluid. + * + * @param qty + * @return + */ + public FluidStack get(int qty) { + return FluidRegistry.getFluidStack(tag, qty); + } + + /** + * Gets a FluidStack filled with n buckets worth of Fluid. + * + * @param n + * @return + */ + public FluidStack getB(int n) { + return FluidRegistry.getFluidStack(tag, n * FluidContainerRegistry.BUCKET_VOLUME); + } + + public boolean is(Fluid fluid) { + return get() == fluid; + } + + public boolean is(FluidStack fluidStack) { + return fluidStack != null && get() == fluidStack.getFluid(); + } + + public boolean isContained(ItemStack containerStack) { + return containerStack != null && FluidHelper.containsFluid(containerStack, get()); + } + + public static boolean areEqual(Fluid fluid, FluidStack fluidStack) { + if (fluidStack != null && fluid == fluidStack.getFluid()) + return true; + return fluid == null && fluidStack == null; + } + +} diff --git a/src/main/java/forestry/core/fluids/TankManager.java b/src/main/java/forestry/core/fluids/TankManager.java new file mode 100644 index 000000000..b18c079f5 --- /dev/null +++ b/src/main/java/forestry/core/fluids/TankManager.java @@ -0,0 +1,338 @@ +/******************************************************************************* + * 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.fluids; + +import com.google.common.collect.ForwardingList; +import forestry.core.fluids.tanks.StandardTank; +import forestry.core.inventory.ITileFilter; +import forestry.core.utils.NBTUtil; +import forestry.core.utils.NBTUtil.NBTList; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.IFluidTank; + +/** + * + * @author CovertJaguar + */ +public class TankManager extends ForwardingList implements IFluidHandler, List { + + public static final ITileFilter TANK_FILTER = new ITileFilter() { + @Override + public boolean matches(TileEntity tile) { + return tile instanceof IFluidHandler; + } + + }; + private static final byte NETWORK_DATA = 3; + private final List tanks = new ArrayList(); + private final List prevFluidStacks = new ArrayList(); + private final List prevColor = new ArrayList(); + + public TankManager() { + } + + public TankManager(StandardTank... tanks) { + addAll(Arrays.asList(tanks)); + } + + @Override + protected List delegate() { + return tanks; + } + + @Override + public boolean add(StandardTank tank) { + boolean added = tanks.add(tank); + int index = tanks.indexOf(tank); + tank.setTankIndex(index); + prevFluidStacks.add(tank.getFluid() == null ? null : tank.getFluid().copy()); + prevColor.add(tank.getColor()); + return added; + } + + public void writeTanksToNBT(NBTTagCompound data) { + NBTTagList tagList = new NBTTagList(); + for (byte slot = 0; slot < tanks.size(); slot++) { + StandardTank tank = tanks.get(slot); + if (tank.getFluid() != null) { + NBTTagCompound tag = new NBTTagCompound(); + tag.setByte("tank", slot); + tank.writeToNBT(tag); + tagList.appendTag(tag); + } + } + data.setTag("tanks", tagList); + } + + public void readTanksFromNBT(NBTTagCompound data) { + NBTList tagList = NBTUtil.getNBTList(data, "tanks", NBTUtil.EnumNBTType.COMPOUND); + for (NBTTagCompound tag : tagList) { + int slot = tag.getByte("tank"); + if (slot >= 0 && slot < tanks.size()) + tanks.get(slot).readFromNBT(tag); + } + } + + public void writePacketData(DataOutputStream data) throws IOException { + for (int i = 0; i < tanks.size(); i++) + writePacketData(data, i); + } + + public void writePacketData(DataOutputStream data, int tankIndex) throws IOException { + if (tankIndex >= tanks.size()) + return; + StandardTank tank = tanks.get(tankIndex); + FluidStack fluidStack = tank.getFluid(); + if (fluidStack != null) { + data.writeShort(fluidStack.fluidID); + data.writeInt(fluidStack.amount); + data.writeInt(fluidStack.getFluid().getColor(fluidStack)); + } else + data.writeShort(-1); + } + + public void readPacketData(DataInputStream data) throws IOException { + for (int i = 0; i < tanks.size(); i++) + readPacketData(data, i); + } + + public void readPacketData(DataInputStream data, int tankIndex) throws IOException { + if (tankIndex >= tanks.size()) + return; + StandardTank tank = tanks.get(tankIndex); + int fluidId = data.readShort(); + if (fluidId != -1) { + tank.setFluid(new FluidStack(fluidId, data.readInt())); + tank.colorCache = data.readInt(); + } else + tank.setFluid(null); + } + + public void initGuiData(Container container, ICrafting player, int tankIndex) { + if (tankIndex >= tanks.size()) + return; + FluidStack fluidStack = tanks.get(tankIndex).getFluid(); + int fluidId = -1; + int fluidAmount = 0; + if (fluidStack != null && fluidStack.amount > 0) { + fluidId = fluidStack.getFluid().getID(); + fluidAmount = fluidStack.amount; + } + + player.sendProgressBarUpdate(container, tankIndex * NETWORK_DATA + 0, fluidId); + PacketBuilder.instance().sendGuiIntegerPacket((EntityPlayerMP) player, container.windowId, tankIndex * NETWORK_DATA + 1, fluidAmount); + } + + public void updateGuiData(Container container, List crafters, int tankIndex) { + StandardTank tank = tanks.get(tankIndex); + FluidStack fluidStack = tank.getFluid(); + FluidStack prev = prevFluidStacks.get(tankIndex); + int color = tank.getColor(); + int pColor = prevColor.get(tankIndex); + + for (Object crafter1 : crafters) { + ICrafting crafter = (ICrafting) crafter1; + EntityPlayerMP player = (EntityPlayerMP) crafter1; + if (fluidStack == null ^ prev == null) { + int fluidId = -1; + int fluidAmount = 0; + if (fluidStack != null) { + fluidId = fluidStack.fluidID; + fluidAmount = fluidStack.amount; + } + crafter.sendProgressBarUpdate(container, tankIndex * NETWORK_DATA + 0, fluidId); + PacketBuilder.instance().sendGuiIntegerPacket(player, container.windowId, tankIndex * NETWORK_DATA + 1, fluidAmount); + } else if (fluidStack != null && prev != null) { + if (fluidStack.getFluid() != prev.getFluid()) + crafter.sendProgressBarUpdate(container, tankIndex * NETWORK_DATA + 0, fluidStack.fluidID); + if (fluidStack.amount != prev.amount) + PacketBuilder.instance().sendGuiIntegerPacket(player, container.windowId, tankIndex * NETWORK_DATA + 1, fluidStack.amount); + if (color != pColor) + PacketBuilder.instance().sendGuiIntegerPacket(player, container.windowId, tankIndex * NETWORK_DATA + 2, color); + } + } + + prevFluidStacks.set(tankIndex, tank.getFluid() == null ? null : tank.getFluid().copy()); + prevColor.set(tankIndex, color); + } + + public void processGuiUpdate(int messageId, int data) { + int tankIndex = messageId / NETWORK_DATA; + + if (tankIndex >= tanks.size()) + return; + StandardTank tank = tanks.get(tankIndex); + FluidStack fluidStack = tank.getFluid(); + if (fluidStack == null) { + fluidStack = new FluidStack(-1, 0); + tank.setFluid(fluidStack); + } + int fluidId = fluidStack.fluidID; + int amount = fluidStack.amount; + int color = tank.colorCache; + boolean newLiquid = false; + switch (messageId % NETWORK_DATA) { + case 0: + fluidId = data; + newLiquid = true; + break; + case 1: + amount = data; + break; + case 2: + color = data; + break; + } + if (newLiquid) { + fluidStack = new FluidStack(fluidId, 0); + tank.setFluid(fluidStack); + } + fluidStack.amount = amount; + tank.colorCache = color; + } + + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + return fill(0, resource, doFill); + } + + public int fill(int tankIndex, FluidStack resource, boolean doFill) { + if (tankIndex < 0 || tankIndex >= tanks.size() || resource == null) + return 0; + + return tanks.get(tankIndex).fill(resource, doFill); + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + return drain(0, maxDrain, doDrain); + } + + public FluidStack drain(int tankIndex, int maxDrain, boolean doDrain) { + if (tankIndex < 0 || tankIndex >= tanks.size()) + return null; + + return tanks.get(tankIndex).drain(maxDrain, doDrain); + } + + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + for (StandardTank tank : tanks) + if (tankCanDrainFluid(tank, resource)) + return tank.drain(resource.amount, doDrain); + return null; + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + return true; + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return true; + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection direction) { + FluidTankInfo[] info = new FluidTankInfo[size()]; + for (int i = 0; i < size(); i++) + info[i] = get(i).getInfo(); + return info; + } + + public FluidTankInfo[] getTankInfo() { + return getTankInfo(ForgeDirection.UNKNOWN); + } + + @Override + public StandardTank get(int tankIndex) { + if (tankIndex < 0 || tankIndex >= tanks.size()) + return null; + return tanks.get(tankIndex); + } + + public void setCapacity(int tankIndex, int capacity) { + StandardTank tank = get(tankIndex); + tank.setCapacity(capacity); + FluidStack fluidStack = tank.getFluid(); + if (fluidStack != null && fluidStack.amount > capacity) + fluidStack.amount = capacity; + } + +// Used to push fluids to surrounding blocks, missing code from Railcraft, if needed contact CovertJaguar +// public void outputLiquid(AdjacentTileCache cache, ITileFilter filter, ForgeDirection[] sides, int tankIndex, int amount) { +// for (ForgeDirection side : sides) { +// TileEntity tile = cache.getTileOnSide(side); +// if (!filter.matches(tile)) continue; +// IFluidHandler tank = getTankFromTile(tile); +// if (tank == null) continue; +// outputLiquid((IFluidHandler) tile, side, tankIndex, amount); +// } +// } + public void outputLiquid(IFluidHandler[] outputs, int tankIndex, int amount) { + for (int side = 0; side < 6; side++) { + IFluidHandler nearbyTank = outputs[side]; + if (nearbyTank != null) + outputLiquid(nearbyTank, ForgeDirection.getOrientation(side), tankIndex, amount); + } + } + + public static IFluidHandler getTankFromTile(TileEntity tile) { + IFluidHandler tank = null; + if (tile instanceof IFluidHandler) + tank = (IFluidHandler) tile; + return tank; + } + + private void outputLiquid(IFluidHandler tank, ForgeDirection side, int tankIndex, int amount) { + FluidStack available = drain(tankIndex, amount, false); + if (available != null) { + int used = tank.fill(side.getOpposite(), available, true); + if (used > 0) + drain(tankIndex, used, true); + } + } + + private boolean tankAcceptsFluid(IFluidTank tank, FluidStack fluidStack) { + if (fluidStack == null) + return false; + if (tank.fill(fluidStack, false) > 0) + return true; + return false; + } + + private boolean tankCanDrainFluid(IFluidTank tank, FluidStack fluidStack) { + if (fluidStack == null) + return false; + FluidStack drained = tank.drain(1, false); + if (drained != null && drained.amount > 0) + return true; + return false; + } + +} diff --git a/src/main/java/forestry/core/fluids/tanks/FakeTank.java b/src/main/java/forestry/core/fluids/tanks/FakeTank.java new file mode 100644 index 000000000..090b818f3 --- /dev/null +++ b/src/main/java/forestry/core/fluids/tanks/FakeTank.java @@ -0,0 +1,38 @@ +/* + * This code is the property of CovertJaguar + * and may only be used with explicit written + * permission unless otherwise specified on the + * license page at railcraft.wikispaces.com. + */ +package mods.railcraft.common.fluids.tanks; + +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidTank; + +/** + * + * @author CovertJaguar + */ +public final class FakeTank extends FluidTank { + + public static final IFluidTank INSTANCE = new FakeTank(); + public static final IFluidTank[] ARRAY = new IFluidTank[]{INSTANCE}; + public static final FluidTankInfo[] INFO = new FluidTankInfo[]{INSTANCE.getInfo()}; + + private FakeTank() { + super(1); + } + + @Override + public int fill(FluidStack resource, boolean doFill) { + return 0; + } + + @Override + public FluidStack drain(int maxDrain, boolean doDrain) { + return null; + } + +} diff --git a/src/main/java/forestry/core/fluids/tanks/FilteredTank.java b/src/main/java/forestry/core/fluids/tanks/FilteredTank.java new file mode 100644 index 000000000..6c7d5262c --- /dev/null +++ b/src/main/java/forestry/core/fluids/tanks/FilteredTank.java @@ -0,0 +1,70 @@ +/******************************************************************************* + * 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.fluids.tanks; + +import forestry.core.gui.tooltips.ToolTipLine; +import net.minecraft.item.EnumRarity; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + +/** + * + * @author CovertJaguar + */ +public class FilteredTank extends StandardTank { + + private final Fluid filter; + + public FilteredTank(int capacity, Fluid filter) { + this(capacity, filter, null); + } + + public FilteredTank(int capacity, Fluid filter, TileEntity tile) { + super(capacity, tile); + this.filter = filter; + } + + @Override + public int fill(FluidStack resource, boolean doFill) { + if (liquidMatchesFilter(resource)) + return super.fill(resource, doFill); + return 0; + } + + public Fluid getFilter() { + return filter; + } + + public boolean liquidMatchesFilter(FluidStack resource) { + if (resource == null || filter == null) + return false; + return resource.getFluid() == filter; + } + + @Override + protected void refreshTooltip() { + toolTip.clear(); + int amount = 0; + if (filter != null) { + EnumRarity rarity = filter.getRarity(); + if (rarity == null) + rarity = EnumRarity.common; + ToolTipLine name = new ToolTipLine(filter.getLocalizedName(), rarity.rarityColor); + name.setSpacing(2); + toolTip.add(name); + if (getFluid() != null) + amount = getFluid().amount; + } + toolTip.add(new ToolTipLine(String.format("%,d", amount) + " / " + String.format("%,d", getCapacity()))); + } + +} diff --git a/src/main/java/forestry/core/fluids/tanks/StandardTank.java b/src/main/java/forestry/core/fluids/tanks/StandardTank.java new file mode 100644 index 000000000..8f53f0e5f --- /dev/null +++ b/src/main/java/forestry/core/fluids/tanks/StandardTank.java @@ -0,0 +1,121 @@ +/******************************************************************************* + * 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.fluids.tanks; + +import forestry.core.gui.tooltips.ToolTip; +import forestry.core.gui.tooltips.ToolTipLine; +import java.util.Locale; +import net.minecraft.item.EnumRarity; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; + +/** + * + * @author CovertJaguar + */ +public class StandardTank extends FluidTank { + + public static final int DEFAULT_COLOR = 0xFFFFFF; + public int colorCache = DEFAULT_COLOR; + private int tankIndex; + + public StandardTank(int capacity) { + super(capacity); + } + + public StandardTank(int capacity, TileEntity tile) { + this(capacity); + this.tile = tile; + } + + public void setTankIndex(int index) { + this.tankIndex = index; + } + + public int getTankIndex() { + return tankIndex; + } + + @Override + public void setFluid(FluidStack fluid) { + super.setFluid(fluid); + colorCache = StandardTank.DEFAULT_COLOR; + } + + public int getColor() { + Fluid f = getFluidType(); + if (f == null) + return DEFAULT_COLOR; + return f.getColor(getFluid()); + } + + public boolean isEmpty() { + return getFluid() == null || getFluid().amount <= 0; + } + + public boolean isFull() { + return getFluid() != null && getFluid().amount == getCapacity(); + } + + public int getRemainingSpace() { + return capacity - getFluidAmount(); + } + + public Fluid getFluidType() { + return getFluid() != null ? getFluid().getFluid() : null; + } + + @Override + public int fill(final FluidStack resource, final boolean doFill) { + if (resource == null) + return 0; + if (resource.amount <= 0) + return 0; + return super.fill(resource, doFill); + } + + @Override + public FluidStack drain(int maxDrain, boolean doDrain) { + if (maxDrain <= 0) + return null; + return super.drain(maxDrain, doDrain); + } + + public ToolTip getToolTip() { + return toolTip; + } + + protected void refreshTooltip() { + toolTip.clear(); + int amount = 0; + if (getFluid() != null && getFluid().amount > 0 && getFluid().getFluid() != null) { + Fluid fluidType = getFluidType(); + EnumRarity rarity = fluidType.getRarity(); + if (rarity == null) + rarity = EnumRarity.common; + ToolTipLine fluidName = new ToolTipLine(fluidType.getLocalizedName(), rarity.rarityColor); + fluidName.setSpacing(2); + toolTip.add(fluidName); + amount = getFluid().amount; + } + toolTip.add(new ToolTipLine(String.format(Locale.ENGLISH, "%,d / %,d", amount, getCapacity()))); + } + + protected final ToolTip toolTip = new ToolTip() { + @Override + public void refresh() { + refreshTooltip(); + } + + }; +} diff --git a/src/main/java/forestry/core/utils/NBTUtil.java b/src/main/java/forestry/core/utils/NBTUtil.java new file mode 100644 index 000000000..03ee22182 --- /dev/null +++ b/src/main/java/forestry/core/utils/NBTUtil.java @@ -0,0 +1,77 @@ +/******************************************************************************* + * 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.utils; + +import com.google.common.collect.ForwardingList; +import cpw.mods.fml.common.ObfuscationReflectionHelper; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.nbt.*; + +/** + * + * @author CovertJaguar + */ +public class NBTUtil { + + public enum EnumNBTType { + + END(NBTTagEnd.class), + BYTE(NBTTagByte.class), + SHORT(NBTTagShort.class), + INT(NBTTagInt.class), + LONG(NBTTagLong.class), + FLOAT(NBTTagFloat.class), + DOUBLE(NBTTagDouble.class), + BYTE_ARRAY(NBTTagByteArray.class), + STRING(NBTTagString.class), + LIST(NBTTagList.class), + COMPOUND(NBTTagCompound.class), + INT_ARRAY(NBTTagIntArray.class); + public static final EnumNBTType[] VALUES = values(); + public final Class classObject; + + private EnumNBTType(Class c) { + this.classObject = c; + } + + public static EnumNBTType fromClass(Class c) { + for (EnumNBTType type : VALUES) { + if (type.classObject == c) + return type; + } + return null; + } + + } + + public static NBTList getNBTList(NBTTagCompound nbt, String tag, EnumNBTType type) { + NBTTagList nbtList = nbt.getTagList(tag, type.ordinal()); + return new NBTList(nbtList); + } + + public static class NBTList extends ForwardingList { + + private final ArrayList backingList; + private final NBTTagList nbtList; + + public NBTList(NBTTagList nbtList) { + this.nbtList = nbtList; + backingList = ObfuscationReflectionHelper.getPrivateValue(NBTTagList.class, nbtList, 0); + } + + @Override + protected List delegate() { + return backingList; + } + + } +} From 7947a66187be7e58e38f36afea72f1ee7dcbba7a Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Tue, 16 Sep 2014 17:15:29 -0700 Subject: [PATCH 073/103] Missed one. --- .../forestry/core/fluids/tanks/FakeTank.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/java/forestry/core/fluids/tanks/FakeTank.java b/src/main/java/forestry/core/fluids/tanks/FakeTank.java index 090b818f3..afeba0a42 100644 --- a/src/main/java/forestry/core/fluids/tanks/FakeTank.java +++ b/src/main/java/forestry/core/fluids/tanks/FakeTank.java @@ -1,10 +1,14 @@ -/* - * This code is the property of CovertJaguar - * and may only be used with explicit written - * permission unless otherwise specified on the - * license page at railcraft.wikispaces.com. - */ -package mods.railcraft.common.fluids.tanks; +/******************************************************************************* + * 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.fluids.tanks; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; From 5442b9983765de762a037dde641bfe1de69af770 Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Tue, 16 Sep 2014 17:40:39 -0700 Subject: [PATCH 074/103] Replace ForestryTank with StandardTank --- .../gadgets/TileAlvearyHygroregulator.java | 10 +- .../forestry/core/fluids/tanks/FakeTank.java | 8 +- .../core/fluids/tanks/StandardTank.java | 170 ++++++++++-------- .../java/forestry/core/gadgets/Engine.java | 4 +- .../forestry/core/gadgets/TileAnalyzer.java | 8 +- .../forestry/core/gadgets/TileForestry.java | 7 +- .../forestry/core/gadgets/TilePowered.java | 4 +- .../forestry/core/gui/ContainerForestry.java | 8 +- .../core/gui/ContainerLiquidTanks.java | 15 +- .../forestry/core/gui/widgets/TankWidget.java | 6 +- .../core/interfaces/ILiquidTankContainer.java | 7 +- .../core/network/PacketTankUpdate.java | 4 +- .../forestry/core/utils/ForestryTank.java | 86 --------- .../java/forestry/core/utils/StackUtils.java | 5 +- .../forestry/energy/gadgets/EngineBronze.java | 16 +- .../energy/gadgets/MachineGenerator.java | 11 +- .../factory/gadgets/MachineBottler.java | 10 +- .../factory/gadgets/MachineCarpenter.java | 10 +- .../factory/gadgets/MachineFabricator.java | 10 +- .../factory/gadgets/MachineFermenter.java | 14 +- .../factory/gadgets/MachineMoistener.java | 10 +- .../factory/gadgets/MachineRaintank.java | 10 +- .../factory/gadgets/MachineSqueezer.java | 10 +- .../factory/gadgets/MachineStill.java | 14 +- .../farming/gadgets/TileFarmPlain.java | 10 +- .../forestry/farming/gadgets/TileValve.java | 17 +- .../forestry/farming/gui/ContainerFarm.java | 15 +- .../farming/triggers/TriggerLowLiquid.java | 4 +- 28 files changed, 218 insertions(+), 285 deletions(-) delete mode 100755 src/main/java/forestry/core/utils/ForestryTank.java diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java index 49d1764d2..67ebee232 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java @@ -25,10 +25,10 @@ import net.minecraftforge.fluids.FluidStack; import forestry.api.apiculture.IAlvearyComponent; import forestry.api.core.ForestryAPI; import forestry.core.config.Defaults; +import forestry.core.fluids.tanks.StandardTank; import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; -import forestry.core.utils.ForestryTank; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.LiquidHelper; import forestry.core.utils.StackUtils; @@ -57,7 +57,7 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory /* MEMBERS */ InventoryAdapter canInventory = new InventoryAdapter(1, "CanInv"); - private ForestryTank liquidTank = new ForestryTank(Defaults.PROCESSOR_TANK_CAPACITY); + private StandardTank liquidTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); private HygroregulatorRecipe currentRecipe; private int transferTime; @@ -146,7 +146,7 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory canInventory.readFromNBT(nbttagcompound); - liquidTank = new ForestryTank(Defaults.PROCESSOR_TANK_CAPACITY); + liquidTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); if (nbttagcompound.hasKey("LiquidTank")) liquidTank.readFromNBT(nbttagcompound.getCompoundTag("LiquidTank")); @@ -283,8 +283,8 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory } @Override - public ForestryTank[] getTanks() { - return new ForestryTank[] { liquidTank }; + public StandardTank[] getTanks() { + return new StandardTank[] { liquidTank }; } /* SMP GUI */ diff --git a/src/main/java/forestry/core/fluids/tanks/FakeTank.java b/src/main/java/forestry/core/fluids/tanks/FakeTank.java index afeba0a42..34086cc1e 100644 --- a/src/main/java/forestry/core/fluids/tanks/FakeTank.java +++ b/src/main/java/forestry/core/fluids/tanks/FakeTank.java @@ -11,18 +11,16 @@ package forestry.core.fluids.tanks; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidTank; /** * * @author CovertJaguar */ -public final class FakeTank extends FluidTank { +public final class FakeTank extends StandardTank { - public static final IFluidTank INSTANCE = new FakeTank(); - public static final IFluidTank[] ARRAY = new IFluidTank[]{INSTANCE}; + public static final FakeTank INSTANCE = new FakeTank(); + public static final FakeTank[] ARRAY = new FakeTank[]{INSTANCE}; public static final FluidTankInfo[] INFO = new FluidTankInfo[]{INSTANCE.getInfo()}; private FakeTank() { diff --git a/src/main/java/forestry/core/fluids/tanks/StandardTank.java b/src/main/java/forestry/core/fluids/tanks/StandardTank.java index 8f53f0e5f..d4f226904 100644 --- a/src/main/java/forestry/core/fluids/tanks/StandardTank.java +++ b/src/main/java/forestry/core/fluids/tanks/StandardTank.java @@ -25,97 +25,113 @@ import net.minecraftforge.fluids.FluidTank; */ public class StandardTank extends FluidTank { - public static final int DEFAULT_COLOR = 0xFFFFFF; - public int colorCache = DEFAULT_COLOR; - private int tankIndex; + public static final int DEFAULT_COLOR = 0xFFFFFF; + public int colorCache = DEFAULT_COLOR; + private int tankIndex; - public StandardTank(int capacity) { - super(capacity); - } + public StandardTank(int capacity) { + super(capacity); + } - public StandardTank(int capacity, TileEntity tile) { - this(capacity); - this.tile = tile; - } + public StandardTank(FluidStack fluid, int capacity) { + this(capacity); + setFluid(fluid); + } - public void setTankIndex(int index) { - this.tankIndex = index; - } + public StandardTank(int capacity, TileEntity tile) { + this(capacity); + this.tile = tile; + } - public int getTankIndex() { - return tankIndex; - } + public StandardTank(FluidStack fluid, int capacity, TileEntity tile) { + this(capacity); + this.tile = tile; + setFluid(fluid); + } - @Override - public void setFluid(FluidStack fluid) { - super.setFluid(fluid); - colorCache = StandardTank.DEFAULT_COLOR; - } + public void setTankIndex(int index) { + this.tankIndex = index; + } - public int getColor() { - Fluid f = getFluidType(); - if (f == null) - return DEFAULT_COLOR; - return f.getColor(getFluid()); - } + public int getTankIndex() { + return tankIndex; + } - public boolean isEmpty() { - return getFluid() == null || getFluid().amount <= 0; - } + @Override + public void setFluid(FluidStack fluid) { + super.setFluid(fluid); + colorCache = StandardTank.DEFAULT_COLOR; + } - public boolean isFull() { - return getFluid() != null && getFluid().amount == getCapacity(); - } + public int getColor() { + Fluid f = getFluidType(); + if (f == null) + return DEFAULT_COLOR; + return f.getColor(getFluid()); + } - public int getRemainingSpace() { - return capacity - getFluidAmount(); - } + public boolean isEmpty() { + return getFluid() == null || getFluid().amount <= 0; + } - public Fluid getFluidType() { - return getFluid() != null ? getFluid().getFluid() : null; - } + public boolean isFull() { + return getFluid() != null && getFluid().amount == getCapacity(); + } - @Override - public int fill(final FluidStack resource, final boolean doFill) { - if (resource == null) - return 0; - if (resource.amount <= 0) - return 0; - return super.fill(resource, doFill); - } + public int getRemainingSpace() { + return capacity - getFluidAmount(); + } - @Override - public FluidStack drain(int maxDrain, boolean doDrain) { - if (maxDrain <= 0) - return null; - return super.drain(maxDrain, doDrain); - } + public Fluid getFluidType() { + return getFluid() != null ? getFluid().getFluid() : null; + } - public ToolTip getToolTip() { - return toolTip; - } + @Override + public int fill(final FluidStack resource, final boolean doFill) { + if (resource == null) + return 0; + if (resource.amount <= 0) + return 0; + return super.fill(resource, doFill); + } - protected void refreshTooltip() { - toolTip.clear(); - int amount = 0; - if (getFluid() != null && getFluid().amount > 0 && getFluid().getFluid() != null) { - Fluid fluidType = getFluidType(); - EnumRarity rarity = fluidType.getRarity(); - if (rarity == null) - rarity = EnumRarity.common; - ToolTipLine fluidName = new ToolTipLine(fluidType.getLocalizedName(), rarity.rarityColor); - fluidName.setSpacing(2); - toolTip.add(fluidName); - amount = getFluid().amount; - } - toolTip.add(new ToolTipLine(String.format(Locale.ENGLISH, "%,d / %,d", amount, getCapacity()))); - } + @Override + public FluidStack drain(int maxDrain, boolean doDrain) { + if (maxDrain <= 0) + return null; + return super.drain(maxDrain, doDrain); + } - protected final ToolTip toolTip = new ToolTip() { - @Override - public void refresh() { - refreshTooltip(); - } + @Override + public String toString() { + return String.format("Tank: %s, %d/%d", fluid != null && fluid.getFluid() != null ? fluid.getFluid().getName() : "Empty", getFluidAmount(), getCapacity()); + } - }; + public ToolTip getToolTip() { + return toolTip; + } + + protected void refreshTooltip() { + toolTip.clear(); + int amount = 0; + if (getFluid() != null && getFluid().amount > 0 && getFluid().getFluid() != null) { + Fluid fluidType = getFluidType(); + EnumRarity rarity = fluidType.getRarity(); + if (rarity == null) + rarity = EnumRarity.common; + ToolTipLine fluidName = new ToolTipLine(fluidType.getLocalizedName(), rarity.rarityColor); + fluidName.setSpacing(2); + toolTip.add(fluidName); + amount = getFluid().amount; + } + toolTip.add(new ToolTipLine(String.format(Locale.ENGLISH, "%,d / %,d", amount, getCapacity()))); + } + + protected final ToolTip toolTip = new ToolTip() { + @Override + public void refresh() { + refreshTooltip(); + } + + }; } diff --git a/src/main/java/forestry/core/gadgets/Engine.java b/src/main/java/forestry/core/gadgets/Engine.java index 23a013a7c..927462a71 100755 --- a/src/main/java/forestry/core/gadgets/Engine.java +++ b/src/main/java/forestry/core/gadgets/Engine.java @@ -31,11 +31,11 @@ import buildcraft.api.transport.IPipeTile.PipeType; import forestry.core.TemperatureState; import forestry.core.config.Defaults; +import forestry.core.fluids.tanks.StandardTank; import forestry.core.interfaces.IPowerHandler; import forestry.core.network.PacketPayload; import forestry.core.proxy.Proxies; import forestry.core.utils.BlockUtil; -import forestry.core.utils.ForestryTank; import forestry.plugins.PluginBuildCraft; public abstract class Engine extends TileBase implements IPowerHandler, IPipeConnection, IPowerEmitter { @@ -96,7 +96,7 @@ public abstract class Engine extends TileBase implements IPowerHandler, IPipeCon powerProvider.configure(10, 200, 10, 100000); } - protected ItemStack replenishByContainer(ItemStack inventoryStack, FluidContainerData container, ForestryTank tank) { + protected ItemStack replenishByContainer(ItemStack inventoryStack, FluidContainerData container, StandardTank tank) { if (container == null) return inventoryStack; diff --git a/src/main/java/forestry/core/gadgets/TileAnalyzer.java b/src/main/java/forestry/core/gadgets/TileAnalyzer.java index 03052832f..fc780deb3 100755 --- a/src/main/java/forestry/core/gadgets/TileAnalyzer.java +++ b/src/main/java/forestry/core/gadgets/TileAnalyzer.java @@ -38,7 +38,7 @@ import forestry.core.network.GuiId; import forestry.core.network.PacketIds; import forestry.core.network.PacketInventoryStack; import forestry.core.proxy.Proxies; -import forestry.core.utils.ForestryTank; +import forestry.core.fluids.tanks.StandardTank; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.LiquidHelper; import forestry.core.utils.StackUtils; @@ -67,7 +67,7 @@ public class TileAnalyzer extends TileBase implements ISpecialInventory, ISidedI public FluidStack resource = FluidRegistry.getFluidStack(Defaults.LIQUID_HONEY, HONEY_REQUIRED); @EntityNetData - public ForestryTank resourceTank = new ForestryTank(Defaults.PROCESSOR_TANK_CAPACITY); + public StandardTank resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); private final Stack pendingProducts = new Stack(); /* CONSTRUCTOR */ @@ -441,8 +441,8 @@ public class TileAnalyzer extends TileBase implements ISpecialInventory, ISidedI } @Override - public ForestryTank[] getTanks() { - return new ForestryTank[] { resourceTank }; + public StandardTank[] getTanks() { + return new StandardTank[] { resourceTank }; } /* diff --git a/src/main/java/forestry/core/gadgets/TileForestry.java b/src/main/java/forestry/core/gadgets/TileForestry.java index ffd3bc9d9..8b06c4b41 100755 --- a/src/main/java/forestry/core/gadgets/TileForestry.java +++ b/src/main/java/forestry/core/gadgets/TileForestry.java @@ -33,6 +33,7 @@ import com.mojang.authlib.GameProfile; import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; +import forestry.core.fluids.tanks.FakeTank; import forestry.core.interfaces.IErrorSource; import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.interfaces.IOwnable; @@ -43,7 +44,7 @@ import forestry.core.network.PacketPayload; import forestry.core.network.PacketTileUpdate; import forestry.core.proxy.Proxies; import forestry.core.utils.EnumAccess; -import forestry.core.utils.ForestryTank; +import forestry.core.fluids.tanks.StandardTank; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.Vect; @@ -355,14 +356,14 @@ public abstract class TileForestry extends TileEntity implements INetworkedEntit /* IFLUIDHANDLER BASICS */ public FluidTankInfo[] getTankInfo(ForgeDirection from) { if (this instanceof ILiquidTankContainer) { - ForestryTank[] tanks = ((ILiquidTankContainer) this).getTanks(); + StandardTank[] tanks = ((ILiquidTankContainer) this).getTanks(); FluidTankInfo[] info = new FluidTankInfo[tanks.length]; for (int i = 0; i < info.length; i++) { info[i] = tanks[i].getInfo(); } return info; } - return ForestryTank.DUMMY_TANKINFO_ARRAY; + return FakeTank.INFO; } public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { diff --git a/src/main/java/forestry/core/gadgets/TilePowered.java b/src/main/java/forestry/core/gadgets/TilePowered.java index 999e3bfbe..3129fd1bf 100755 --- a/src/main/java/forestry/core/gadgets/TilePowered.java +++ b/src/main/java/forestry/core/gadgets/TilePowered.java @@ -29,7 +29,7 @@ import forestry.core.network.IndexInPayload; import forestry.core.network.PacketPayload; import forestry.core.proxy.Proxies; import forestry.core.utils.EnumTankLevel; -import forestry.core.utils.ForestryTank; +import forestry.core.fluids.tanks.StandardTank; public abstract class TilePowered extends TileBase implements IPowerHandler, IRenderableMachine { @@ -179,7 +179,7 @@ public abstract class TilePowered extends TileBase implements IPowerHandler, IRe } */ /* LIQUID CONTAINER HANDLING */ - protected ItemStack bottleIntoContainer(ItemStack canStack, ItemStack outputStack, FluidContainerData container, ForestryTank tank) { + protected ItemStack bottleIntoContainer(ItemStack canStack, ItemStack outputStack, FluidContainerData container, StandardTank tank) { if (tank.getFluidAmount() < container.fluid.amount) return outputStack; if (canStack.stackSize <= 0) diff --git a/src/main/java/forestry/core/gui/ContainerForestry.java b/src/main/java/forestry/core/gui/ContainerForestry.java index 39c6e65b0..3d5c2e1d2 100755 --- a/src/main/java/forestry/core/gui/ContainerForestry.java +++ b/src/main/java/forestry/core/gui/ContainerForestry.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.core.gui; +import forestry.core.fluids.tanks.FakeTank; +import forestry.core.fluids.tanks.StandardTank; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -19,8 +21,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import forestry.core.gui.slots.SlotForestry; -import forestry.core.utils.ForestryTank; import forestry.core.utils.StackUtils; +import net.minecraftforge.fluids.IFluidTank; public class ContainerForestry extends Container { @@ -208,7 +210,7 @@ public class ContainerForestry extends Container { public void onTankUpdate(NBTTagCompound nbt) { } - public ForestryTank getTank(int slot) { - return ForestryTank.FAKETANK; + public StandardTank getTank(int slot) { + return FakeTank.INSTANCE; } } diff --git a/src/main/java/forestry/core/gui/ContainerLiquidTanks.java b/src/main/java/forestry/core/gui/ContainerLiquidTanks.java index 47a3f7273..4f3aa2a74 100755 --- a/src/main/java/forestry/core/gui/ContainerLiquidTanks.java +++ b/src/main/java/forestry/core/gui/ContainerLiquidTanks.java @@ -24,13 +24,14 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidTank; import forestry.api.core.IToolPipette; +import forestry.core.fluids.tanks.FakeTank; +import forestry.core.fluids.tanks.StandardTank; import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.network.PacketIds; import forestry.core.network.PacketPayload; import forestry.core.network.PacketTankUpdate; import forestry.core.network.PacketUpdate; import forestry.core.proxy.Proxies; -import forestry.core.utils.ForestryTank; public class ContainerLiquidTanks extends ContainerForestry { @@ -79,14 +80,14 @@ public class ContainerLiquidTanks extends ContainerForestry { } } - private Map syncedFluids = new HashMap(); + private Map syncedFluids = new HashMap(); @Override public void detectAndSendChanges() { super.detectAndSendChanges(); for (int i = 0; i < tanks.getTanks().length; i++) { - ForestryTank tank = tanks.getTanks()[i]; + StandardTank tank = tanks.getTanks()[i]; // If null has been synced if (tank.getFluid() == null && getTank(i).getFluidAmount() <= 0) @@ -102,7 +103,7 @@ public class ContainerLiquidTanks extends ContainerForestry { } } - syncedFluids.put(i, new ForestryTank(tank.getFluid() == null ? null : tank.getFluid().copy(), tank.getCapacity())); + syncedFluids.put(i, new StandardTank(tank.getFluid() == null ? null : tank.getFluid().copy(), tank.getCapacity())); } } @@ -113,13 +114,13 @@ public class ContainerLiquidTanks extends ContainerForestry { int capacity = nbt.getShort("capacity"); tanks.getTanks()[tankID].readFromNBT(nbt); - ForestryTank tank = new ForestryTank(capacity); + StandardTank tank = new StandardTank(capacity); tank.readFromNBT(nbt); syncedFluids.put(tankID, tank); } @Override - public ForestryTank getTank(int slot) { - return syncedFluids.get(slot) == null ? ForestryTank.FAKETANK : syncedFluids.get(slot); + public StandardTank getTank(int slot) { + return syncedFluids.get(slot) == null ? FakeTank.INSTANCE : syncedFluids.get(slot); } } diff --git a/src/main/java/forestry/core/gui/widgets/TankWidget.java b/src/main/java/forestry/core/gui/widgets/TankWidget.java index 3d987bf2d..31642eee9 100755 --- a/src/main/java/forestry/core/gui/widgets/TankWidget.java +++ b/src/main/java/forestry/core/gui/widgets/TankWidget.java @@ -19,13 +19,13 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; import forestry.api.core.IToolPipette; +import forestry.core.fluids.tanks.StandardTank; import forestry.core.gui.ContainerForestry; import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.WidgetManager; import forestry.core.gui.tooltips.ToolTip; import forestry.core.proxy.Proxies; import forestry.core.render.SpriteSheet; -import forestry.core.utils.ForestryTank; /** * Slot for liquid tanks @@ -48,7 +48,7 @@ public class TankWidget extends Widget { return this; } - public ForestryTank getTank() { + public StandardTank getTank() { return ((ContainerForestry) manager.gui.inventorySlots).getTank(slot); } @@ -96,7 +96,7 @@ public class TankWidget extends Widget { @Override public ToolTip getToolTip() { - ForestryTank tank = getTank(); + StandardTank tank = getTank(); if (tank == null) return null; return tank.getToolTip(); diff --git a/src/main/java/forestry/core/interfaces/ILiquidTankContainer.java b/src/main/java/forestry/core/interfaces/ILiquidTankContainer.java index dc5c7601e..37fdb8164 100755 --- a/src/main/java/forestry/core/interfaces/ILiquidTankContainer.java +++ b/src/main/java/forestry/core/interfaces/ILiquidTankContainer.java @@ -10,12 +10,11 @@ ******************************************************************************/ package forestry.core.interfaces; +import forestry.core.fluids.tanks.StandardTank; import net.minecraftforge.fluids.IFluidHandler; -import forestry.core.utils.ForestryTank; - public interface ILiquidTankContainer extends IFluidHandler { - ForestryTank[] getTanks(); - + StandardTank[] getTanks(); + } diff --git a/src/main/java/forestry/core/network/PacketTankUpdate.java b/src/main/java/forestry/core/network/PacketTankUpdate.java index bec6e939d..d7cecfbd5 100755 --- a/src/main/java/forestry/core/network/PacketTankUpdate.java +++ b/src/main/java/forestry/core/network/PacketTankUpdate.java @@ -10,13 +10,13 @@ ******************************************************************************/ package forestry.core.network; +import forestry.core.fluids.tanks.StandardTank; import net.minecraft.nbt.NBTTagCompound; -import forestry.core.utils.ForestryTank; public class PacketTankUpdate extends PacketNBT { - public PacketTankUpdate(int tankSlot, ForestryTank tank) { + public PacketTankUpdate(int tankSlot, StandardTank tank) { super(PacketIds.TANK_UPDATE); NBTTagCompound nbt = new NBTTagCompound(); nbt.setByte("tank", (byte) tankSlot); diff --git a/src/main/java/forestry/core/utils/ForestryTank.java b/src/main/java/forestry/core/utils/ForestryTank.java deleted file mode 100755 index a80d3ae57..000000000 --- a/src/main/java/forestry/core/utils/ForestryTank.java +++ /dev/null @@ -1,86 +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.core.utils; - -import java.util.Locale; - -import net.minecraft.item.EnumRarity; - -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fluids.FluidTankInfo; - -import forestry.core.config.Config; -import forestry.core.gui.tooltips.ToolTip; -import forestry.core.gui.tooltips.ToolTipLine; - -public class ForestryTank extends FluidTank { - - public static final ForestryTank FAKETANK = new ForestryTank(0); - public static final ForestryTank[] FAKETANK_ARRAY = new ForestryTank[] { FAKETANK }; - public static final FluidTankInfo DUMMY_TANK_INFO = new FluidTankInfo(FAKETANK); - public static final FluidTankInfo[] DUMMY_TANKINFO_ARRAY = new FluidTankInfo[] { DUMMY_TANK_INFO }; - - public ForestryTank(FluidStack stack, int capacity) { - super(stack, capacity); - } - - public ForestryTank(int capacity) { - super(capacity); - } - - public ForestryTank(Fluid fluid, int amount, int capacity) { - super(fluid, amount, capacity); - } - - public boolean isEmpty() { - return getFluid() == null || getFluid().amount <= 0; - } - - public boolean isFull() { - return getFluid() != null && getFluid().amount == getCapacity(); - } - - public Fluid getFluidType() { - return getFluid() != null ? getFluid().getFluid() : null; - } - - @Override - public String toString() { - return String.format("Tank: %s, %d/%d", fluid != null && fluid.getFluid() != null ? fluid.getFluid().getName() : "Empty", getFluidAmount(), getCapacity()); - } - - public ToolTip getToolTip() { - return toolTip; - } - protected final ToolTip toolTip = new ToolTip() { - @Override - public void refresh() { - toolTip.clear(); - int amount = 0; - if (getFluid() != null && getFluid().amount > 0 && getFluid().getFluid() != null) { - Fluid fluidType = getFluidType(); - EnumRarity rarity = fluidType.getRarity(); - if (rarity == null) - rarity = EnumRarity.common; - ToolTipLine fluidName = new ToolTipLine(fluidType.getLocalizedName(getFluid()), rarity.rarityColor); - fluidName.setSpacing(2); - toolTip.add(fluidName); - amount = getFluid().amount; - } else { - toolTip.add(new ToolTipLine(StringUtil.localize("gui.empty"))); - } - if (Config.tooltipLiquidAmount) - toolTip.add(new ToolTipLine(String.format(Locale.ENGLISH, "%,d / %,d", amount, getCapacity()))); - } - }; -} diff --git a/src/main/java/forestry/core/utils/StackUtils.java b/src/main/java/forestry/core/utils/StackUtils.java index 0eb820649..5fc271975 100755 --- a/src/main/java/forestry/core/utils/StackUtils.java +++ b/src/main/java/forestry/core/utils/StackUtils.java @@ -29,6 +29,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.oredict.OreDictionary; import forestry.core.config.Defaults; +import forestry.core.fluids.tanks.StandardTank; import forestry.core.gadgets.TileForestry; public class StackUtils { @@ -400,12 +401,12 @@ public class StackUtils { } - public static void replenishByContainer(TileForestry tile, ItemStack inventoryStack, ForestryTank tank) { + public static void replenishByContainer(TileForestry tile, ItemStack inventoryStack, StandardTank tank) { FluidContainerData container = LiquidHelper.getLiquidContainer(inventoryStack); replenishByContainer(tile, inventoryStack, container, tank); } - public static ItemStack replenishByContainer(TileForestry tile, ItemStack inventoryStack, FluidContainerData container, ForestryTank tank) { + public static ItemStack replenishByContainer(TileForestry tile, ItemStack inventoryStack, FluidContainerData container, StandardTank tank) { if (container == null) return inventoryStack; diff --git a/src/main/java/forestry/energy/gadgets/EngineBronze.java b/src/main/java/forestry/energy/gadgets/EngineBronze.java index cb0728de6..692391296 100755 --- a/src/main/java/forestry/energy/gadgets/EngineBronze.java +++ b/src/main/java/forestry/energy/gadgets/EngineBronze.java @@ -29,12 +29,12 @@ import forestry.api.fuels.FuelManager; import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; +import forestry.core.fluids.tanks.StandardTank; import forestry.core.gadgets.Engine; import forestry.core.gadgets.TileBase; import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.network.GuiId; import forestry.core.network.PacketPayload; -import forestry.core.utils.ForestryTank; import forestry.core.utils.LiquidHelper; import forestry.core.utils.TileInventoryAdapter; @@ -65,8 +65,8 @@ public class EngineBronze extends Engine implements ISpecialInventory, ILiquidTa else shutdown = false; } - public ForestryTank fuelTank = new ForestryTank(Defaults.ENGINE_TANK_CAPACITY); - public ForestryTank heatingTank = new ForestryTank(Defaults.ENGINE_TANK_CAPACITY); + public StandardTank fuelTank = new StandardTank(Defaults.ENGINE_TANK_CAPACITY); + public StandardTank heatingTank = new StandardTank(Defaults.ENGINE_TANK_CAPACITY); private final TileInventoryAdapter inventory; public int burnTime; public int totalTime; @@ -99,7 +99,7 @@ public class EngineBronze extends Engine implements ISpecialInventory, ILiquidTa FluidContainerData container = LiquidHelper.getLiquidContainer(inventory.getStackInSlot(SLOT_CAN)); if (container != null) { - ForestryTank tank = null; + StandardTank tank = null; if (container.fluid.isFluidEqual(LiquidHelper.getLiquid(Defaults.LIQUID_LAVA, 1))) tank = heatingTank; @@ -284,8 +284,8 @@ public class EngineBronze extends Engine implements ISpecialInventory, ILiquidTa currentFluidId = fluid.getID(); } - fuelTank = new ForestryTank(Defaults.ENGINE_TANK_CAPACITY); - heatingTank = new ForestryTank(Defaults.ENGINE_TANK_CAPACITY); + fuelTank = new StandardTank(Defaults.ENGINE_TANK_CAPACITY); + heatingTank = new StandardTank(Defaults.ENGINE_TANK_CAPACITY); if (nbt.hasKey("FuelSlot")) { fuelTank.readFromNBT(nbt.getCompoundTag("FuelSlot")); heatingTank.readFromNBT(nbt.getCompoundTag("HeatingSlot")); @@ -457,7 +457,7 @@ public class EngineBronze extends Engine implements ISpecialInventory, ILiquidTa } @Override - public ForestryTank[] getTanks() { - return new ForestryTank[] { fuelTank, heatingTank }; + public StandardTank[] getTanks() { + return new StandardTank[] { fuelTank, heatingTank }; } } diff --git a/src/main/java/forestry/energy/gadgets/MachineGenerator.java b/src/main/java/forestry/energy/gadgets/MachineGenerator.java index bab24cd96..76a8cffcf 100755 --- a/src/main/java/forestry/energy/gadgets/MachineGenerator.java +++ b/src/main/java/forestry/energy/gadgets/MachineGenerator.java @@ -28,17 +28,16 @@ import forestry.api.fuels.GeneratorFuel; import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; +import forestry.core.fluids.tanks.StandardTank; import forestry.core.gadgets.TileBase; import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.interfaces.IRenderableMachine; import forestry.core.network.EntityNetData; import forestry.core.network.GuiId; import forestry.core.utils.EnumTankLevel; -import forestry.core.utils.ForestryTank; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.LiquidHelper; import forestry.core.utils.StackUtils; -import forestry.core.utils.StringUtil; import forestry.core.utils.Utils; import forestry.plugins.PluginIC2; @@ -49,7 +48,7 @@ public class MachineGenerator extends TileBase implements ISpecialInventory, ILi public static final int maxEnergy = 30000; @EntityNetData - public ForestryTank resourceTank = new ForestryTank(Defaults.PROCESSOR_TANK_CAPACITY); + public StandardTank resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); private int tickCount = 0; InventoryAdapter inventory = new InventoryAdapter(1, "Items"); @@ -92,7 +91,7 @@ public class MachineGenerator extends TileBase implements ISpecialInventory, ILi if (ic2EnergySource != null) ic2EnergySource.readFromNBT(nbttagcompound); - resourceTank = new ForestryTank(Defaults.PROCESSOR_TANK_CAPACITY); + resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); if (nbttagcompound.hasKey("ResourceTank")) resourceTank.readFromNBT(nbttagcompound.getCompoundTag("ResourceTank")); @@ -286,7 +285,7 @@ public class MachineGenerator extends TileBase implements ISpecialInventory, ILi } @Override - public ForestryTank[] getTanks() { - return new ForestryTank[] { resourceTank }; + public StandardTank[] getTanks() { + return new StandardTank[] { resourceTank }; } } diff --git a/src/main/java/forestry/factory/gadgets/MachineBottler.java b/src/main/java/forestry/factory/gadgets/MachineBottler.java index d0e21c0f6..c59d455b9 100755 --- a/src/main/java/forestry/factory/gadgets/MachineBottler.java +++ b/src/main/java/forestry/factory/gadgets/MachineBottler.java @@ -39,6 +39,7 @@ import forestry.api.recipes.RecipeManagers; import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; +import forestry.core.fluids.tanks.StandardTank; import forestry.core.gadgets.TileBase; import forestry.core.gadgets.TilePowered; import forestry.core.interfaces.ILiquidTankContainer; @@ -46,7 +47,6 @@ import forestry.core.network.EntityNetData; import forestry.core.network.GuiId; import forestry.core.triggers.ForestryTrigger; import forestry.core.utils.EnumTankLevel; -import forestry.core.utils.ForestryTank; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.LiquidHelper; import forestry.core.utils.StackUtils; @@ -149,7 +149,7 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq } @EntityNetData - public ForestryTank resourceTank = new ForestryTank(Defaults.PROCESSOR_TANK_CAPACITY); + public StandardTank resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); private final InventoryAdapter inventory = new InventoryAdapter(3, "Items"); @@ -215,7 +215,7 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq fillingTotalTime = nbttagcompound.getInteger("FillingTotalTime"); productPending = nbttagcompound.getBoolean("ProductPending"); - resourceTank = new ForestryTank(Defaults.PROCESSOR_TANK_CAPACITY); + resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); if (nbttagcompound.hasKey("ResourceTank")) resourceTank.readFromNBT(nbttagcompound.getCompoundTag("ResourceTank")); @@ -494,8 +494,8 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq } @Override - public ForestryTank[] getTanks() { - return new ForestryTank[] { resourceTank }; + public StandardTank[] getTanks() { + return new StandardTank[] { resourceTank }; } // ITRIGGERPROVIDER diff --git a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java index ac52592d0..3cd1a454a 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java @@ -40,6 +40,7 @@ import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.config.ForestryItem; +import forestry.core.fluids.tanks.StandardTank; import forestry.core.gadgets.TileBase; import forestry.core.gadgets.TilePowered; import forestry.core.interfaces.ILiquidTankContainer; @@ -47,7 +48,6 @@ import forestry.core.network.EntityNetData; import forestry.core.network.GuiId; import forestry.core.triggers.ForestryTrigger; import forestry.core.utils.EnumTankLevel; -import forestry.core.utils.ForestryTank; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.LiquidHelper; import forestry.core.utils.ShapedRecipeCustom; @@ -214,7 +214,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL /* MEMBER */ @EntityNetData - public ForestryTank resourceTank = new ForestryTank(Defaults.PROCESSOR_TANK_CAPACITY); + public StandardTank resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); private final TileInventoryAdapter craftingInventory; private final TileInventoryAdapter accessibleInventory; public MachineCarpenter.Recipe currentRecipe; @@ -287,7 +287,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL packageTime = nbttagcompound.getInteger("PackageTime"); totalTime = nbttagcompound.getInteger("PackageTotalTime"); - resourceTank = new ForestryTank(Defaults.PROCESSOR_TANK_CAPACITY); + resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); if (nbttagcompound.hasKey("ResourceTank")) resourceTank.readFromNBT(nbttagcompound.getCompoundTag("ResourceTank")); @@ -680,8 +680,8 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL } @Override - public ForestryTank[] getTanks() { - return new ForestryTank[] { resourceTank }; + public StandardTank[] getTanks() { + return new StandardTank[] { resourceTank }; } // ITRIGGERPROVIDER diff --git a/src/main/java/forestry/factory/gadgets/MachineFabricator.java b/src/main/java/forestry/factory/gadgets/MachineFabricator.java index f4d4004bc..df22a17f7 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFabricator.java +++ b/src/main/java/forestry/factory/gadgets/MachineFabricator.java @@ -37,7 +37,7 @@ import forestry.core.interfaces.ICrafter; import forestry.core.interfaces.ICraftingPlan; import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.network.GuiId; -import forestry.core.utils.ForestryTank; +import forestry.core.fluids.tanks.StandardTank; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.ShapedRecipeCustom; import forestry.core.utils.StackUtils; @@ -230,7 +230,7 @@ public class MachineFabricator extends TilePowered implements ICrafter, ISpecial /* MEMBER */ private final InventoryAdapter inventory = new InventoryAdapter(30, "Items"); - private ForestryTank moltenTank = new ForestryTank(2 * Defaults.BUCKET_VOLUME); + private StandardTank moltenTank = new StandardTank(2 * Defaults.BUCKET_VOLUME); private int heat = 0; private int guiMeltingPoint = 0; @@ -284,7 +284,7 @@ public class MachineFabricator extends TilePowered implements ICrafter, ISpecial heat = nbttagcompound.getInteger("Heat"); // Tank - moltenTank = new ForestryTank(Defaults.BUCKET_VOLUME * 2); + moltenTank = new StandardTank(Defaults.BUCKET_VOLUME * 2); if (nbttagcompound.hasKey("MoltenTank")) moltenTank.readFromNBT(nbttagcompound.getCompoundTag("MoltenTank")); @@ -579,7 +579,7 @@ public class MachineFabricator extends TilePowered implements ICrafter, ISpecial /* ILIQUIDCONTAINER */ @Override - public ForestryTank[] getTanks() { - return new ForestryTank[] { moltenTank }; + public StandardTank[] getTanks() { + return new StandardTank[] { moltenTank }; } } diff --git a/src/main/java/forestry/factory/gadgets/MachineFermenter.java b/src/main/java/forestry/factory/gadgets/MachineFermenter.java index de78cb441..12b5d5e24 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFermenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineFermenter.java @@ -43,7 +43,7 @@ import forestry.core.network.EntityNetData; import forestry.core.network.GuiId; import forestry.core.triggers.ForestryTrigger; import forestry.core.utils.EnumTankLevel; -import forestry.core.utils.ForestryTank; +import forestry.core.fluids.tanks.StandardTank; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.LiquidHelper; import forestry.core.utils.StackUtils; @@ -180,9 +180,9 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL } } @EntityNetData - public ForestryTank resourceTank = new ForestryTank(Defaults.PROCESSOR_TANK_CAPACITY); + public StandardTank resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); @EntityNetData - public ForestryTank productTank = new ForestryTank(Defaults.PROCESSOR_TANK_CAPACITY); + public StandardTank productTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); private final InventoryAdapter inventory = new InventoryAdapter(5, "Items"); private Recipe currentRecipe; private float currentResourceModifier; @@ -244,8 +244,8 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL fuelTotalTime = nbttagcompound.getInteger("FuelTotalTime"); fuelCurrentFerment = nbttagcompound.getInteger("FuelCurrentFerment"); - resourceTank = new ForestryTank(Defaults.PROCESSOR_TANK_CAPACITY); - productTank = new ForestryTank(Defaults.PROCESSOR_TANK_CAPACITY); + resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); + productTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); if (nbttagcompound.hasKey("ResourceTank")) { resourceTank.readFromNBT(nbttagcompound.getCompoundTag("ResourceTank")); productTank.readFromNBT(nbttagcompound.getCompoundTag("ProductTank")); @@ -685,8 +685,8 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL } @Override - public ForestryTank[] getTanks() { - return new ForestryTank[] { resourceTank, productTank }; + public StandardTank[] getTanks() { + return new StandardTank[] { resourceTank, productTank }; } // ITRIGGERPROVIDER diff --git a/src/main/java/forestry/factory/gadgets/MachineMoistener.java b/src/main/java/forestry/factory/gadgets/MachineMoistener.java index 95fb05177..2d557ceed 100755 --- a/src/main/java/forestry/factory/gadgets/MachineMoistener.java +++ b/src/main/java/forestry/factory/gadgets/MachineMoistener.java @@ -43,7 +43,7 @@ import forestry.core.network.EntityNetData; import forestry.core.network.GuiId; import forestry.core.triggers.ForestryTrigger; import forestry.core.utils.EnumTankLevel; -import forestry.core.utils.ForestryTank; +import forestry.core.fluids.tanks.StandardTank; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.LiquidHelper; import forestry.core.utils.StackUtils; @@ -127,7 +127,7 @@ public class MachineMoistener extends TilePowered implements ISpecialInventory, } @EntityNetData - public ForestryTank resourceTank = new ForestryTank(Defaults.PROCESSOR_TANK_CAPACITY); + public StandardTank resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); private final InventoryAdapter inventory = new InventoryAdapter(12, "Items"); //private ItemStack[] inventoryStacks = new ItemStack[12]; public MachineMoistener.Recipe currentRecipe; @@ -190,7 +190,7 @@ public class MachineMoistener extends TilePowered implements ISpecialInventory, totalTime = nbttagcompound.getInteger("TotalTime"); productionTime = nbttagcompound.getInteger("ProductionTime"); - resourceTank = new ForestryTank(Defaults.PROCESSOR_TANK_CAPACITY); + resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); if (nbttagcompound.hasKey("ResourceTank")) resourceTank.readFromNBT(nbttagcompound.getCompoundTag("ResourceTank")); @@ -687,8 +687,8 @@ public class MachineMoistener extends TilePowered implements ISpecialInventory, } @Override - public ForestryTank[] getTanks() { - return new ForestryTank[] { resourceTank }; + public StandardTank[] getTanks() { + return new StandardTank[] { resourceTank }; } /* SMP GUI */ diff --git a/src/main/java/forestry/factory/gadgets/MachineRaintank.java b/src/main/java/forestry/factory/gadgets/MachineRaintank.java index bd0612c9a..34680308f 100755 --- a/src/main/java/forestry/factory/gadgets/MachineRaintank.java +++ b/src/main/java/forestry/factory/gadgets/MachineRaintank.java @@ -35,7 +35,7 @@ import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.network.GuiId; import forestry.core.triggers.ForestryTrigger; import forestry.core.utils.Fluids; -import forestry.core.utils.ForestryTank; +import forestry.core.fluids.tanks.StandardTank; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.LiquidHelper; import forestry.core.utils.StackUtils; @@ -49,7 +49,7 @@ public class MachineRaintank extends TileBase implements ISidedInventory, ILiqui private static final FluidStack STACK_WATER = LiquidHelper.getLiquid(Defaults.LIQUID_WATER, Defaults.RAINTANK_AMOUNT_PER_UPDATE); /* MEMBER */ - public ForestryTank resourceTank = new ForestryTank(Defaults.RAINTANK_TANK_CAPACITY); + public StandardTank resourceTank = new StandardTank(Defaults.RAINTANK_TANK_CAPACITY); private final InventoryAdapter inventory = new InventoryAdapter(3, "Items"); private boolean isValidBiome = true; private int fillingTime; @@ -97,7 +97,7 @@ public class MachineRaintank extends TileBase implements ISidedInventory, ILiqui isValidBiome = nbttagcompound.getBoolean("IsValidBiome"); - resourceTank = new ForestryTank(Defaults.RAINTANK_TANK_CAPACITY); + resourceTank = new StandardTank(Defaults.RAINTANK_TANK_CAPACITY); if (nbttagcompound.hasKey("ResourceTank")) resourceTank.readFromNBT(nbttagcompound.getCompoundTag("ResourceTank")); @@ -300,8 +300,8 @@ public class MachineRaintank extends TileBase implements ISidedInventory, ILiqui } @Override - public ForestryTank[] getTanks() { - return new ForestryTank[] { resourceTank }; + public StandardTank[] getTanks() { + return new StandardTank[] { resourceTank }; } /* ITRIGGERPROVIDER */ diff --git a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java index 58776c862..40290943f 100755 --- a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java +++ b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java @@ -44,7 +44,7 @@ import forestry.core.network.EntityNetData; import forestry.core.network.GuiId; import forestry.core.triggers.ForestryTrigger; import forestry.core.utils.EnumTankLevel; -import forestry.core.utils.ForestryTank; +import forestry.core.fluids.tanks.StandardTank; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.LiquidHelper; import forestry.core.utils.StackUtils; @@ -116,7 +116,7 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I /* MEMBER */ @EntityNetData - public ForestryTank productTank = new ForestryTank(Defaults.PROCESSOR_TANK_CAPACITY); + public StandardTank productTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); private final InventoryAdapter inventory = new InventoryAdapter(12, "Items"); private Recipe currentRecipe; @@ -211,7 +211,7 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I } // Product tank - productTank = new ForestryTank(Defaults.PROCESSOR_TANK_CAPACITY); + productTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); if (nbttagcompound.hasKey("ProductTank")) productTank.readFromNBT(nbttagcompound.getCompoundTag("ProductTank")); @@ -526,8 +526,8 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I } @Override - public ForestryTank[] getTanks() { - return new ForestryTank[] { productTank }; + public StandardTank[] getTanks() { + return new StandardTank[] { productTank }; } /* ITRIGGERPROVIDER */ diff --git a/src/main/java/forestry/factory/gadgets/MachineStill.java b/src/main/java/forestry/factory/gadgets/MachineStill.java index e8ba3949b..031ed64ba 100755 --- a/src/main/java/forestry/factory/gadgets/MachineStill.java +++ b/src/main/java/forestry/factory/gadgets/MachineStill.java @@ -42,7 +42,7 @@ import forestry.core.network.EntityNetData; import forestry.core.network.GuiId; import forestry.core.triggers.ForestryTrigger; import forestry.core.utils.EnumTankLevel; -import forestry.core.utils.ForestryTank; +import forestry.core.fluids.tanks.StandardTank; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.LiquidHelper; import forestry.core.utils.StackUtils; @@ -116,9 +116,9 @@ public class MachineStill extends TilePowered implements ISpecialInventory, ISid /* MEMBER */ @EntityNetData - public ForestryTank resourceTank = new ForestryTank(Defaults.PROCESSOR_TANK_CAPACITY); + public StandardTank resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); @EntityNetData - public ForestryTank productTank = new ForestryTank(Defaults.PROCESSOR_TANK_CAPACITY); + public StandardTank productTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); private final InventoryAdapter inventory = new InventoryAdapter(3, "Items"); @@ -172,8 +172,8 @@ public class MachineStill extends TilePowered implements ISpecialInventory, ISid distillationTime = nbttagcompound.getInteger("DistillationTime"); distillationTotalTime = nbttagcompound.getInteger("DistillationTotalTime"); - resourceTank = new ForestryTank(Defaults.PROCESSOR_TANK_CAPACITY); - productTank = new ForestryTank(Defaults.PROCESSOR_TANK_CAPACITY); + resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); + productTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); if (nbttagcompound.hasKey("ResourceTank")) { resourceTank.readFromNBT(nbttagcompound.getCompoundTag("ResourceTank")); productTank.readFromNBT(nbttagcompound.getCompoundTag("ProductTank")); @@ -483,8 +483,8 @@ public class MachineStill extends TilePowered implements ISpecialInventory, ISid } @Override - public ForestryTank[] getTanks() { - return new ForestryTank[] { resourceTank, productTank }; + public StandardTank[] getTanks() { + return new StandardTank[] { resourceTank, productTank }; } /* ITRIGGERPROVIDER */ diff --git a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java index 30a48125b..b488b0173 100755 --- a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java +++ b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java @@ -51,7 +51,7 @@ import forestry.core.interfaces.IHintSource; import forestry.core.interfaces.ISocketable; import forestry.core.proxy.Proxies; import forestry.core.utils.DelayTimer; -import forestry.core.utils.ForestryTank; +import forestry.core.fluids.tanks.StandardTank; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.LiquidHelper; import forestry.core.utils.StackUtils; @@ -88,7 +88,7 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable private final InventoryAdapter sockets = new InventoryAdapter(1, "sockets"); - private ForestryTank liquidTank = new ForestryTank(Defaults.PROCESSOR_TANK_CAPACITY); + private StandardTank liquidTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); private IFarmLogic harvestProvider; // The farm logic which supplied the pending crops. private final Stack pendingCrops = new Stack(); @@ -121,7 +121,7 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable refreshFarmLogics(); - liquidTank = new ForestryTank(Defaults.PROCESSOR_TANK_CAPACITY); + liquidTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); if (nbttagcompound.hasKey("LiquidTank")) liquidTank.readFromNBT(nbttagcompound.getCompoundTag("LiquidTank")); } @@ -667,7 +667,7 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable public void makeMaster() { super.makeMaster(); if (liquidTank == null) - liquidTank = new ForestryTank(Defaults.PROCESSOR_TANK_CAPACITY); + liquidTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); refreshFarmLogics(); } @@ -676,7 +676,7 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable super.onStructureReset(); } - public ForestryTank getTank() { + public StandardTank getTank() { return liquidTank; } diff --git a/src/main/java/forestry/farming/gadgets/TileValve.java b/src/main/java/forestry/farming/gadgets/TileValve.java index 98977348f..fbd0cd174 100755 --- a/src/main/java/forestry/farming/gadgets/TileValve.java +++ b/src/main/java/forestry/farming/gadgets/TileValve.java @@ -10,11 +10,12 @@ ******************************************************************************/ package forestry.farming.gadgets; +import forestry.core.fluids.tanks.FakeTank; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import forestry.core.interfaces.ILiquidTankContainer; -import forestry.core.utils.ForestryTank; +import forestry.core.fluids.tanks.StandardTank; public class TileValve extends TileFarm implements ILiquidTankContainer { @@ -33,7 +34,7 @@ public class TileValve extends TileFarm implements ILiquidTankContainer { } /* ILIQUIDTANKCONTAINER */ - private ForestryTank getMasterTank() { + private StandardTank getMasterTank() { if (!isIntegratedIntoStructure() || !hasMaster()) return null; @@ -46,7 +47,7 @@ public class TileValve extends TileFarm implements ILiquidTankContainer { @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - ForestryTank tank = getMasterTank(); + StandardTank tank = getMasterTank(); if (tank == null) return 0; @@ -55,7 +56,7 @@ public class TileValve extends TileFarm implements ILiquidTankContainer { @Override public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - ForestryTank tank = getMasterTank(); + StandardTank tank = getMasterTank(); if (tank == null) return null; @@ -63,12 +64,12 @@ public class TileValve extends TileFarm implements ILiquidTankContainer { } @Override - public ForestryTank[] getTanks() { - ForestryTank tank = getMasterTank(); + public StandardTank[] getTanks() { + StandardTank tank = getMasterTank(); if (tank == null) - return ForestryTank.FAKETANK_ARRAY; + return FakeTank.ARRAY; - return new ForestryTank[] { tank }; + return new StandardTank[] { tank }; } } diff --git a/src/main/java/forestry/farming/gui/ContainerFarm.java b/src/main/java/forestry/farming/gui/ContainerFarm.java index d045798f1..907612e50 100755 --- a/src/main/java/forestry/farming/gui/ContainerFarm.java +++ b/src/main/java/forestry/farming/gui/ContainerFarm.java @@ -23,6 +23,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import forestry.api.farming.IFarmLogic; +import forestry.core.fluids.tanks.FakeTank; import forestry.core.gui.ContainerSocketed; import forestry.core.gui.slots.SlotCustom; import forestry.core.gui.slots.SlotForestry; @@ -30,7 +31,7 @@ import forestry.core.gui.slots.SlotLiquidContainer; import forestry.core.gui.slots.SlotOutput; import forestry.core.network.PacketTankUpdate; import forestry.core.proxy.Proxies; -import forestry.core.utils.ForestryTank; +import forestry.core.fluids.tanks.StandardTank; import forestry.core.utils.TileInventoryAdapter; import forestry.farming.gadgets.TileFarmPlain; import forestry.plugins.PluginFarming; @@ -135,7 +136,7 @@ public class ContainerFarm extends ContainerSocketed { public void updateProgressBar(int i, int j) { tile.getGUINetworkData(i, j); } - private Map syncedFluids = new HashMap(); + private Map syncedFluids = new HashMap(); @Override public void detectAndSendChanges() { @@ -145,7 +146,7 @@ public class ContainerFarm extends ContainerSocketed { tile.sendGUINetworkData(this, (ICrafting) crafters.get(i)); } - ForestryTank tank = tile.getTank(); + StandardTank tank = tile.getTank(); // If null has been synced if (tank.getFluid() == null && getTank(0).getFluidAmount() <= 0) @@ -160,7 +161,7 @@ public class ContainerFarm extends ContainerSocketed { Proxies.net.sendToPlayer(new PacketTankUpdate(0, tank), player); } } - syncedFluids.put(0, new ForestryTank(tank.getFluid() == null ? null : tank.getFluid().copy(), tank.getCapacity())); + syncedFluids.put(0, new StandardTank(tank.getFluid() == null ? null : tank.getFluid().copy(), tank.getCapacity())); } @@ -168,13 +169,13 @@ public class ContainerFarm extends ContainerSocketed { public void onTankUpdate(NBTTagCompound nbt) { int tankID = nbt.getByte("tank"); int capacity = nbt.getShort("capacity"); - ForestryTank tank = new ForestryTank(capacity); + StandardTank tank = new StandardTank(capacity); tank.readFromNBT(nbt); syncedFluids.put(tankID, tank); } @Override - public ForestryTank getTank(int slot) { - return syncedFluids.get(slot) == null ? ForestryTank.FAKETANK : syncedFluids.get(slot); + public StandardTank getTank(int slot) { + return syncedFluids.get(slot) == null ? FakeTank.INSTANCE : syncedFluids.get(slot); } } diff --git a/src/main/java/forestry/farming/triggers/TriggerLowLiquid.java b/src/main/java/forestry/farming/triggers/TriggerLowLiquid.java index 52c46865c..eec0b98e5 100755 --- a/src/main/java/forestry/farming/triggers/TriggerLowLiquid.java +++ b/src/main/java/forestry/farming/triggers/TriggerLowLiquid.java @@ -18,7 +18,7 @@ import buildcraft.api.gates.ITriggerParameter; import forestry.api.core.ITileStructure; import forestry.core.triggers.Trigger; -import forestry.core.utils.ForestryTank; +import forestry.core.fluids.tanks.StandardTank; import forestry.farming.gadgets.TileFarmPlain; import forestry.farming.gadgets.TileHatch; @@ -49,7 +49,7 @@ public class TriggerLowLiquid extends Trigger { if (central == null || !(central instanceof TileFarmPlain)) return false; - ForestryTank tank = ((TileFarmPlain) central).getTank(); + StandardTank tank = ((TileFarmPlain) central).getTank(); return ((float) tank.getFluidAmount() / tank.getCapacity()) <= threshold; } } From 05c58ff7a9c7d8b12d11696434271246b08a8145 Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 16 Sep 2014 21:52:52 -0700 Subject: [PATCH 075/103] Allow TankManager to network --- .../forestry/core/fluids/TankManager.java | 26 +++++--- .../core/network/PacketGuiInteger.java | 63 +++++++++++++++++++ .../java/forestry/core/network/PacketIds.java | 1 + 3 files changed, 82 insertions(+), 8 deletions(-) create mode 100644 src/main/java/forestry/core/network/PacketGuiInteger.java diff --git a/src/main/java/forestry/core/fluids/TankManager.java b/src/main/java/forestry/core/fluids/TankManager.java index b18c079f5..56ae92e47 100644 --- a/src/main/java/forestry/core/fluids/TankManager.java +++ b/src/main/java/forestry/core/fluids/TankManager.java @@ -13,6 +13,8 @@ package forestry.core.fluids; import com.google.common.collect.ForwardingList; import forestry.core.fluids.tanks.StandardTank; import forestry.core.inventory.ITileFilter; +import forestry.core.network.PacketGuiInteger; +import forestry.core.proxy.Proxies; import forestry.core.utils.NBTUtil; import forestry.core.utils.NBTUtil.NBTList; import java.io.DataInputStream; @@ -144,7 +146,8 @@ public class TankManager extends ForwardingList implements IFluidH } player.sendProgressBarUpdate(container, tankIndex * NETWORK_DATA + 0, fluidId); - PacketBuilder.instance().sendGuiIntegerPacket((EntityPlayerMP) player, container.windowId, tankIndex * NETWORK_DATA + 1, fluidAmount); + PacketGuiInteger packet = new PacketGuiInteger(container.windowId, tankIndex * NETWORK_DATA + 1, fluidAmount); + Proxies.net.sendToPlayer(packet, (EntityPlayerMP)player); } public void updateGuiData(Container container, List crafters, int tankIndex) { @@ -165,14 +168,19 @@ public class TankManager extends ForwardingList implements IFluidH fluidAmount = fluidStack.amount; } crafter.sendProgressBarUpdate(container, tankIndex * NETWORK_DATA + 0, fluidId); - PacketBuilder.instance().sendGuiIntegerPacket(player, container.windowId, tankIndex * NETWORK_DATA + 1, fluidAmount); + PacketGuiInteger packet = new PacketGuiInteger(container.windowId, tankIndex * NETWORK_DATA + 1, fluidAmount); + Proxies.net.sendToPlayer(packet, player); } else if (fluidStack != null && prev != null) { if (fluidStack.getFluid() != prev.getFluid()) crafter.sendProgressBarUpdate(container, tankIndex * NETWORK_DATA + 0, fluidStack.fluidID); - if (fluidStack.amount != prev.amount) - PacketBuilder.instance().sendGuiIntegerPacket(player, container.windowId, tankIndex * NETWORK_DATA + 1, fluidStack.amount); - if (color != pColor) - PacketBuilder.instance().sendGuiIntegerPacket(player, container.windowId, tankIndex * NETWORK_DATA + 2, color); + if (fluidStack.amount != prev.amount) { + PacketGuiInteger packet = new PacketGuiInteger(container.windowId, tankIndex * NETWORK_DATA + 1, fluidStack.amount); + Proxies.net.sendToPlayer(packet, player); + } + if (color != pColor) { + PacketGuiInteger packet = new PacketGuiInteger(container.windowId, tankIndex * NETWORK_DATA + 2, color); + Proxies.net.sendToPlayer(packet, player); + } } } @@ -269,10 +277,12 @@ public class TankManager extends ForwardingList implements IFluidH return getTankInfo(ForgeDirection.UNKNOWN); } + public FluidTankInfo getTankInfo(int tankIndex) { + return get(tankIndex).getInfo(); + } + @Override public StandardTank get(int tankIndex) { - if (tankIndex < 0 || tankIndex >= tanks.size()) - return null; return tanks.get(tankIndex); } diff --git a/src/main/java/forestry/core/network/PacketGuiInteger.java b/src/main/java/forestry/core/network/PacketGuiInteger.java new file mode 100644 index 000000000..7b7ff9eb7 --- /dev/null +++ b/src/main/java/forestry/core/network/PacketGuiInteger.java @@ -0,0 +1,63 @@ +/******************************************************************************* + * 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.network; + +import cpw.mods.fml.client.FMLClientHandler; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import net.minecraft.client.entity.EntityClientPlayerMP; + +/** + * + * @author CovertJaguar + */ + +public class PacketGuiInteger extends ForestryPacket { + + private int windowId, dataId, value; + + public PacketGuiInteger() { + super(); + } + + public PacketGuiInteger(int windowId, int dataId, int value) { + this.windowId = windowId; + this.dataId = dataId; + this.value = value; + } + + @Override + public void writeData(DataOutputStream data) throws IOException { + data.writeByte(windowId); + data.writeByte(dataId); + data.writeInt(value); + } + + @Override + public void readData(DataInputStream data) throws IOException { + windowId = data.readByte(); + dataId = data.readByte(); + value = data.readInt(); + + EntityClientPlayerMP player = FMLClientHandler.instance().getClient().thePlayer; + + if (player.openContainer != null && player.openContainer.windowId == windowId) + player.openContainer.updateProgressBar(dataId, value); + } + + @Override + public int getID() { + return PacketIds.GUI_INTEGER; + } + +} diff --git a/src/main/java/forestry/core/network/PacketIds.java b/src/main/java/forestry/core/network/PacketIds.java index acc395720..622903c95 100755 --- a/src/main/java/forestry/core/network/PacketIds.java +++ b/src/main/java/forestry/core/network/PacketIds.java @@ -49,6 +49,7 @@ public class PacketIds { public static final int LEAF_UPDATE = 90; public static final int TANK_UPDATE = 91; + public static final int GUI_INTEGER = 92; // Propolis pipe public static final int PROP_SEND_FILTER_SET = 100; From 2c1224eec008e6841d62d5976566f54c8a6c8fcf Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 18 Sep 2014 01:51:23 -0700 Subject: [PATCH 076/103] Fixed tooltip background being too short for long tooltips --- .../java/forestry/core/gui/GuiForestry.java | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/src/main/java/forestry/core/gui/GuiForestry.java b/src/main/java/forestry/core/gui/GuiForestry.java index 0851bf031..b8eec636f 100755 --- a/src/main/java/forestry/core/gui/GuiForestry.java +++ b/src/main/java/forestry/core/gui/GuiForestry.java @@ -320,38 +320,40 @@ public abstract class GuiForestry extends GuiContainer { int left = this.guiLeft; int top = this.guiTop; - int lenght = 0; + int length = 0; + int height = 0; int x; int y; for (ToolTipLine tip : toolTips) { y = this.fontRendererObj.getStringWidth(tip.text); - if (y > lenght) - lenght = y; + height += 10 + tip.getSpacing(); + if (y > length) + length = y; } x = mouseX - left + 12; y = mouseY - top - 12; - int var14 = 8; - - if (toolTips.size() > 1) - var14 += 2 + (toolTips.size() - 1) * 10; this.zLevel = 300.0F; itemRender.zLevel = 300.0F; - int var15 = -267386864; - this.drawGradientRect(x - 3, y - 4, x + lenght + 3, y - 3, var15, var15); - this.drawGradientRect(x - 3, y + var14 + 3, x + lenght + 3, y + var14 + 4, var15, var15); - this.drawGradientRect(x - 3, y - 3, x + lenght + 3, y + var14 + 3, var15, var15); - this.drawGradientRect(x - 4, y - 3, x - 3, y + var14 + 3, var15, var15); - this.drawGradientRect(x + lenght + 3, y - 3, x + lenght + 4, y + var14 + 3, var15, var15); - int var16 = 1347420415; - int var17 = (var16 & 16711422) >> 1 | var16 & -16777216; - this.drawGradientRect(x - 3, y - 3 + 1, x - 3 + 1, y + var14 + 3 - 1, var16, var17); - this.drawGradientRect(x + lenght + 2, y - 3 + 1, x + lenght + 3, y + var14 + 3 - 1, var16, var17); - this.drawGradientRect(x - 3, y - 3, x + lenght + 3, y - 3 + 1, var16, var16); - this.drawGradientRect(x - 3, y + var14 + 2, x + lenght + 3, y + var14 + 3, var17, var17); + Color backgroundColor = new Color(16, 0, 16, 240); + int backgroundColorInt = backgroundColor.getRGB(); + this.drawGradientRect(x - 3, y - 4, x + length + 2, y - 3, backgroundColorInt, backgroundColorInt); + this.drawGradientRect(x - 3, y + height + 1, x + length + 2, y + height + 2, backgroundColorInt, backgroundColorInt); + this.drawGradientRect(x - 3, y - 3, x + length + 2, y + height + 1, backgroundColorInt, backgroundColorInt); + this.drawGradientRect(x - 4, y - 3, x - 3, y + height + 1, backgroundColorInt, backgroundColorInt); + this.drawGradientRect(x + length + 2, y - 3, x + length + 3, y + height + 1, backgroundColorInt, backgroundColorInt); + + Color borderColorTop = new Color(80, 0, 255, 80); + int borderColorTopInt = borderColorTop.getRGB(); + Color borderColorBottom = new Color((borderColorTopInt & 0xfefefe) >> 1 | borderColorTopInt & -0x1000000, true); + int borderColorBottomInt = borderColorBottom.getRGB(); + this.drawGradientRect(x - 3, y - 3 + 1, x - 3 + 1, y + height, borderColorTopInt, borderColorBottomInt); + this.drawGradientRect(x + length + 1, y - 3 + 1, x + length + 2, y + height, borderColorTopInt, borderColorBottomInt); + this.drawGradientRect(x - 3, y - 3, x + length + 2, y - 3 + 1, borderColorTopInt, borderColorTopInt); + this.drawGradientRect(x - 3, y + height, x + length + 2, y + height + 1, borderColorBottomInt, borderColorBottomInt); for (ToolTipLine tip : toolTips) { String line = tip.text; From 1a434af5f69eff17b3462822361f3784e5e8d0a0 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 18 Sep 2014 01:52:05 -0700 Subject: [PATCH 077/103] Make GUI Titles show up behind tooltips instead of in front. --- src/main/java/forestry/core/gui/GuiForestryTitled.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/forestry/core/gui/GuiForestryTitled.java b/src/main/java/forestry/core/gui/GuiForestryTitled.java index 41d9e9df8..d09b4ec30 100644 --- a/src/main/java/forestry/core/gui/GuiForestryTitled.java +++ b/src/main/java/forestry/core/gui/GuiForestryTitled.java @@ -27,8 +27,8 @@ public abstract class GuiForestryTitled extends GuiFores @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")); + super.drawGuiContainerForegroundLayer(mouseX, mouseY); } } From 07b5e04513d485e5d26ae826fb9b33054ce047b5 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 18 Sep 2014 02:02:27 -0700 Subject: [PATCH 078/103] Fixed missing import --- src/main/java/forestry/core/gui/GuiForestry.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/forestry/core/gui/GuiForestry.java b/src/main/java/forestry/core/gui/GuiForestry.java index b8eec636f..1f22de848 100755 --- a/src/main/java/forestry/core/gui/GuiForestry.java +++ b/src/main/java/forestry/core/gui/GuiForestry.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.core.gui; +import java.awt.Color; import java.util.Collection; import java.util.List; From 240fdedaebd76f28d8485f6e48f54ecdb86ef5bd Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 18 Sep 2014 01:55:05 -0700 Subject: [PATCH 079/103] Filtered tanks accept multiple fluids. Tooltip lists all accepted fluids --- .../core/fluids/tanks/FilteredTank.java | 54 ++++++++++++------- .../core/fluids/tanks/StandardTank.java | 9 +++- 2 files changed, 41 insertions(+), 22 deletions(-) diff --git a/src/main/java/forestry/core/fluids/tanks/FilteredTank.java b/src/main/java/forestry/core/fluids/tanks/FilteredTank.java index 6c7d5262c..b5416916e 100644 --- a/src/main/java/forestry/core/fluids/tanks/FilteredTank.java +++ b/src/main/java/forestry/core/fluids/tanks/FilteredTank.java @@ -14,7 +14,10 @@ import forestry.core.gui.tooltips.ToolTipLine; import net.minecraft.item.EnumRarity; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import java.util.Arrays; +import java.util.Collection; /** * @@ -22,15 +25,19 @@ import net.minecraftforge.fluids.FluidStack; */ public class FilteredTank extends StandardTank { - private final Fluid filter; + private Collection filters; - public FilteredTank(int capacity, Fluid filter) { - this(capacity, filter, null); + public FilteredTank(int capacity, Fluid... filters) { + this(capacity, Arrays.asList(filters), null); } - public FilteredTank(int capacity, Fluid filter, TileEntity tile) { + public FilteredTank(int capacity, Collection filters) { + this(capacity, filters, null); + } + + public FilteredTank(int capacity, Collection filters, TileEntity tile) { super(capacity, tile); - this.filter = filter; + this.filters = filters; } @Override @@ -40,30 +47,37 @@ public class FilteredTank extends StandardTank { return 0; } - public Fluid getFilter() { - return filter; - } + public boolean accepts(Fluid fluid) { + return filters.contains(fluid); + } public boolean liquidMatchesFilter(FluidStack resource) { - if (resource == null || filter == null) + if (resource == null || filters == null) return false; - return resource.getFluid() == filter; + return filters.contains(resource.getFluid()); } @Override protected void refreshTooltip() { + if (hasFluid()) { + super.refreshTooltip(); + return; + } + toolTip.clear(); int amount = 0; - if (filter != null) { - EnumRarity rarity = filter.getRarity(); - if (rarity == null) - rarity = EnumRarity.common; - ToolTipLine name = new ToolTipLine(filter.getLocalizedName(), rarity.rarityColor); - name.setSpacing(2); - toolTip.add(name); - if (getFluid() != null) - amount = getFluid().amount; - } + for (Fluid filter : filters) { + EnumRarity rarity = filter.getRarity(); + if (rarity == null) + rarity = EnumRarity.common; + FluidStack filterFluidStack = FluidRegistry.getFluidStack(filter.getName(), 0); + ToolTipLine name = new ToolTipLine(filter.getLocalizedName(filterFluidStack), rarity.rarityColor); + name.setSpacing(2); + toolTip.add(name); + if (getFluid() != null) + amount = getFluid().amount; + } + toolTip.add(new ToolTipLine(String.format("%,d", amount) + " / " + String.format("%,d", getCapacity()))); } diff --git a/src/main/java/forestry/core/fluids/tanks/StandardTank.java b/src/main/java/forestry/core/fluids/tanks/StandardTank.java index d4f226904..c3c27fbf6 100644 --- a/src/main/java/forestry/core/fluids/tanks/StandardTank.java +++ b/src/main/java/forestry/core/fluids/tanks/StandardTank.java @@ -111,15 +111,20 @@ public class StandardTank extends FluidTank { return toolTip; } + protected boolean hasFluid() { + FluidStack fluid = getFluid(); + return fluid != null && fluid.amount > 0 && fluid.getFluid() != null; + } + protected void refreshTooltip() { toolTip.clear(); int amount = 0; - if (getFluid() != null && getFluid().amount > 0 && getFluid().getFluid() != null) { + if (hasFluid()) { Fluid fluidType = getFluidType(); EnumRarity rarity = fluidType.getRarity(); if (rarity == null) rarity = EnumRarity.common; - ToolTipLine fluidName = new ToolTipLine(fluidType.getLocalizedName(), rarity.rarityColor); + ToolTipLine fluidName = new ToolTipLine(fluidType.getLocalizedName(getFluid()), rarity.rarityColor); fluidName.setSpacing(2); toolTip.add(fluidName); amount = getFluid().amount; From 0c6ed6286db0396c465d9200c15096fa94b3683f Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 18 Sep 2014 01:59:58 -0700 Subject: [PATCH 080/103] Fix types in StackMap to allow explicit types for FuelManager keys --- api | 2 +- src/main/java/forestry/core/utils/StackMap.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api b/api index 90d78e084..7d07b4198 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit 90d78e084c2002bd4ebd86ab4e5162c9561450f9 +Subproject commit 7d07b419809a36c63a1e747085a2e8d1f26c67cd diff --git a/src/main/java/forestry/core/utils/StackMap.java b/src/main/java/forestry/core/utils/StackMap.java index 184fee1f0..3e4bbbc66 100755 --- a/src/main/java/forestry/core/utils/StackMap.java +++ b/src/main/java/forestry/core/utils/StackMap.java @@ -21,10 +21,10 @@ import java.util.Map; * @param The thing this map maps onto * @param

The stack class (i.e. ItemStack, FluidStack) used for lookups */ -public abstract class StackMap extends HashMap{ +public abstract class StackMap extends HashMap{ @Override - public final T put(Object key, T value) { + public final T put(P key, T value) { if(isValidKey(key) && key != null && value != null) return super.put(key, value); return null; @@ -36,7 +36,7 @@ public abstract class StackMap extends HashMap{ public final boolean containsKey(Object key) { P stack = getStack(key); if(stack == null) return false; - for (Map.Entry entry : this.entrySet()) + for (Map.Entry entry : this.entrySet()) if (areEqual(stack, entry.getKey())) return true; return super.containsKey(key); @@ -46,7 +46,7 @@ public abstract class StackMap extends HashMap{ public final T get(Object key) { P stack = getStack(key); if(stack == null) return null; - for (Map.Entry entry : this.entrySet()) + for (Map.Entry entry : this.entrySet()) if (areEqual(stack, entry.getKey())) return entry.getValue(); return super.get(key); From b5878c3002a1a0b0f0917cb69685b3192c71cac8 Mon Sep 17 00:00:00 2001 From: G H Date: Thu, 18 Sep 2014 11:53:33 -0400 Subject: [PATCH 081/103] Support Mekanism products in miner backpack - Support Mekanism 5x ore product steps in Miner's backpack --- src/main/java/forestry/plugins/PluginStorage.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/forestry/plugins/PluginStorage.java b/src/main/java/forestry/plugins/PluginStorage.java index ba7aa18d2..853bc9900 100755 --- a/src/main/java/forestry/plugins/PluginStorage.java +++ b/src/main/java/forestry/plugins/PluginStorage.java @@ -589,6 +589,12 @@ public class PluginStorage extends NativePlugin implements IOreDictionaryHandler minerItems.add(ore); else if (name.startsWith("crystal")) minerItems.add(ore); + else if (name.startsWith("cluster")) + minerItems.add(ore); + else if (name.startsWith("shard")) + minerItems.add(ore); + else if (name.startsWith("clump")) + minerItems.add(ore); else if (name.matches("dropUranium")) minerItems.add(ore); else if (name.equals("treeLeaves") || name.equals("treeSapling") || name.equals("logWood")) From 4b7619355d14f7063762b6d4129c04af8f4ea24a Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 18 Sep 2014 02:23:08 -0700 Subject: [PATCH 082/103] Moved GeneratorFuel list to FuelManager --- api | 2 +- src/main/java/forestry/Forestry.java | 2 ++ .../forestry/energy/gadgets/MachineGenerator.java | 12 ++++++------ src/main/java/forestry/plugins/PluginEnergy.java | 15 ++++++++++----- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/api b/api index 7d07b4198..3d25676cc 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit 7d07b419809a36c63a1e747085a2e8d1f26c67cd +Subproject commit 3d25676cc26f216836baec287624aa12eff92fc9 diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index a48076d0b..5a75c7a50 100755 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -26,6 +26,7 @@ import forestry.api.fuels.EngineBronzeFuel; import forestry.api.fuels.EngineCopperFuel; import forestry.api.fuels.FermenterFuel; import forestry.api.fuels.FuelManager; +import forestry.api.fuels.GeneratorFuel; import forestry.api.fuels.MoistenerFuel; import forestry.api.fuels.RainSubstrate; import forestry.core.ForestryCore; @@ -66,6 +67,7 @@ public class Forestry { FuelManager.rainSubstrate = new ItemStackMap(); FuelManager.bronzeEngineFuel = new FluidMap(); FuelManager.copperEngineFuel = new ItemStackMap(); + FuelManager.generatorFuel = new FluidMap(); } @SidedProxy(clientSide = "forestry.core.ForestryClient", serverSide = "forestry.core.ForestryCore") public static ForestryCore core = new ForestryCore(); diff --git a/src/main/java/forestry/energy/gadgets/MachineGenerator.java b/src/main/java/forestry/energy/gadgets/MachineGenerator.java index 76a8cffcf..607bbc3bc 100755 --- a/src/main/java/forestry/energy/gadgets/MachineGenerator.java +++ b/src/main/java/forestry/energy/gadgets/MachineGenerator.java @@ -24,6 +24,7 @@ import ic2.api.energy.prefab.BasicSource; import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; +import forestry.api.fuels.FuelManager; import forestry.api.fuels.GeneratorFuel; import forestry.core.EnumErrorCode; import forestry.core.config.Config; @@ -119,7 +120,7 @@ public class MachineGenerator extends TileBase implements ISpecialInventory, ILi if (inventory.getStackInSlot(SLOT_CAN) != null) { FluidContainerData container = LiquidHelper.getLiquidContainer(inventory.getStackInSlot(SLOT_CAN)); if (container != null) - if (GeneratorFuel.fuels.containsKey(container.fluid.fluidID)) { + if (FuelManager.generatorFuel.containsKey(container.fluid)) { inventory.setInventorySlotContents(SLOT_CAN, StackUtils.replenishByContainer(this, inventory.getStackInSlot(SLOT_CAN), container, resourceTank)); if (inventory.getStackInSlot(SLOT_CAN).stackSize <= 0) inventory.setInventorySlotContents(SLOT_CAN, null); @@ -134,9 +135,8 @@ public class MachineGenerator extends TileBase implements ISpecialInventory, ILi ic2EnergySource.updateEntity(); - if (resourceTank.getFluidAmount() > 0 && - GeneratorFuel.fuels.containsKey(resourceTank.getFluid().fluidID)) { - GeneratorFuel fuel = GeneratorFuel.fuels.get(resourceTank.getFluid().fluidID); + if (resourceTank.getFluidAmount() > 0 && FuelManager.generatorFuel.containsKey(resourceTank.getFluid())) { + GeneratorFuel fuel = FuelManager.generatorFuel.get(resourceTank.getFluid()); if (resourceTank.getFluidAmount() >= fuel.fuelConsumed.amount && ic2EnergySource.getFreeCapacity() >= fuel.eu) { @@ -239,7 +239,7 @@ public class MachineGenerator extends TileBase implements ISpecialInventory, ILi if (container == null) return 0; - if (!GeneratorFuel.fuels.containsKey(container.fluid.fluidID)) + if (!FuelManager.generatorFuel.containsKey(container.fluid)) return 0; if (inventory.getStackInSlot(SLOT_CAN) == null) { @@ -272,7 +272,7 @@ public class MachineGenerator extends TileBase implements ISpecialInventory, ILi @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { // We only accept water - if (!GeneratorFuel.fuels.containsKey(resource.fluidID)) + if (!FuelManager.generatorFuel.containsKey(resource)) return 0; int used = resourceTank.fill(resource, doFill); diff --git a/src/main/java/forestry/plugins/PluginEnergy.java b/src/main/java/forestry/plugins/PluginEnergy.java index f578cac3c..5befe52ff 100755 --- a/src/main/java/forestry/plugins/PluginEnergy.java +++ b/src/main/java/forestry/plugins/PluginEnergy.java @@ -13,7 +13,8 @@ package forestry.plugins; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.FluidStack; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.network.IGuiHandler; @@ -21,6 +22,7 @@ import cpw.mods.fml.common.network.IGuiHandler; import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuitLayout; import forestry.api.core.PluginInfo; +import forestry.api.fuels.FuelManager; import forestry.api.fuels.GeneratorFuel; import forestry.core.GameMode; import forestry.core.circuits.Circuit; @@ -146,10 +148,13 @@ public class PluginEnergy extends NativePlugin { definitionGenerator.register(); definitionEngineClockwork.register(); - GeneratorFuel.fuels.put(LiquidHelper.getLiquid(Defaults.LIQUID_ETHANOL, 1).getFluid().getID(), new GeneratorFuel(LiquidHelper.getLiquid(Defaults.LIQUID_ETHANOL, 1), - (int) (32 * GameMode.getGameMode().getFloatSetting("fuel.ethanol.generator")), 4)); - GeneratorFuel.fuels.put(LiquidHelper.getLiquid(Defaults.LIQUID_BIOMASS, 1).getFluid().getID(), new GeneratorFuel(LiquidHelper.getLiquid(Defaults.LIQUID_BIOMASS, 1), - (int) (8 * GameMode.getGameMode().getFloatSetting("fuel.biomass.generator")), 1)); + FluidStack ethanol = LiquidHelper.getLiquid(Defaults.LIQUID_ETHANOL, 1); + GeneratorFuel ethanolFuel = new GeneratorFuel(ethanol, (int) (32 * GameMode.getGameMode().getFloatSetting("fuel.ethanol.generator")), 4); + FuelManager.generatorFuel.put(ethanol.getFluid(), ethanolFuel); + + FluidStack biomass = LiquidHelper.getLiquid(Defaults.LIQUID_BIOMASS, 1); + GeneratorFuel biomassFuel = new GeneratorFuel(biomass, (int) (8 * GameMode.getGameMode().getFloatSetting("fuel.biomass.generator")), 1); + FuelManager.generatorFuel.put(biomass.getFluid(), biomassFuel); Circuit.energyElectricChoke1 = new CircuitElectricChoke("energyChoke1"); Circuit.energyFireDampener1 = new CircuitFireDampener("energyDampener1"); From 6a41a055d13ef11a91fa0976c30a199920822650 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 18 Sep 2014 19:07:44 -0700 Subject: [PATCH 083/103] Updated all tanks to use TankManager. --- .../gadgets/TileAlvearyHygroregulator.java | 67 +++++++--- .../gui/ContainerAlvearyHygroregulator.java | 13 -- .../forestry/core/fluids/TankManager.java | 91 ++++++++----- .../core/fluids/tanks/FilteredTank.java | 11 +- .../core/fluids/tanks/StandardTank.java | 30 +++++ .../java/forestry/core/gadgets/Engine.java | 16 --- .../forestry/core/gadgets/TileAnalyzer.java | 76 ++++++----- .../forestry/core/gadgets/TileForestry.java | 33 ----- .../forestry/core/gui/ContainerAnalyzer.java | 13 -- .../forestry/core/gui/ContainerForestry.java | 7 - .../core/gui/ContainerLiquidTanks.java | 79 ++++------- .../forestry/core/gui/widgets/TankWidget.java | 9 +- .../core/interfaces/ILiquidTankContainer.java | 7 +- .../forestry/core/network/PacketHandler.java | 18 +-- .../java/forestry/core/network/PacketIds.java | 1 - .../core/network/PacketTankUpdate.java | 31 ----- .../forestry/energy/gadgets/EngineBronze.java | 125 ++++++++++++------ .../forestry/energy/gadgets/EngineCopper.java | 4 +- .../energy/gadgets/MachineGenerator.java | 78 ++++++----- .../energy/gui/ContainerEngineBronze.java | 13 -- .../energy/gui/ContainerGenerator.java | 13 -- .../factory/gadgets/MachineBottler.java | 86 ++++++------ .../factory/gadgets/MachineCarpenter.java | 77 +++++++---- .../factory/gadgets/MachineFabricator.java | 98 +++++++++----- .../factory/gadgets/MachineFermenter.java | 115 ++++++++-------- .../factory/gadgets/MachineMoistener.java | 73 ++++++---- .../factory/gadgets/MachineRaintank.java | 65 +++++---- .../factory/gadgets/MachineSqueezer.java | 67 +++++++--- .../factory/gadgets/MachineStill.java | 90 +++++++------ .../factory/gui/ContainerBottler.java | 13 -- .../factory/gui/ContainerCarpenter.java | 14 +- .../factory/gui/ContainerFabricator.java | 13 -- .../factory/gui/ContainerFermenter.java | 13 -- .../factory/gui/ContainerMoistener.java | 13 -- .../factory/gui/ContainerRaintank.java | 13 -- .../factory/gui/ContainerSqueezer.java | 13 -- .../forestry/factory/gui/ContainerStill.java | 13 -- .../forestry/farming/gadgets/TileFarm.java | 2 +- .../farming/gadgets/TileFarmPlain.java | 80 ++++++++--- .../forestry/farming/gadgets/TileValve.java | 84 ++++++++---- .../forestry/farming/gui/ContainerFarm.java | 51 ++----- .../farming/triggers/TriggerLowLiquid.java | 8 +- 42 files changed, 914 insertions(+), 822 deletions(-) delete mode 100755 src/main/java/forestry/core/network/PacketTankUpdate.java diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java index 67ebee232..a12b5af36 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java @@ -18,14 +18,17 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; import forestry.api.apiculture.IAlvearyComponent; import forestry.api.core.ForestryAPI; import forestry.core.config.Defaults; -import forestry.core.fluids.tanks.StandardTank; +import forestry.core.fluids.TankManager; +import forestry.core.fluids.tanks.FilteredTank; import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; @@ -57,7 +60,8 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory /* MEMBERS */ InventoryAdapter canInventory = new InventoryAdapter(1, "CanInv"); - private StandardTank liquidTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); + private final TankManager tankManager; + private FilteredTank liquidTank; private HygroregulatorRecipe currentRecipe; private int transferTime; @@ -65,9 +69,16 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory public TileAlvearyHygroregulator() { super(BLOCK_META); - recipes = new HygroregulatorRecipe[] { new HygroregulatorRecipe(new FluidStack(LiquidHelper.getFluid(Defaults.LIQUID_WATER), 1), 1, 0.01f, -0.005f), - new HygroregulatorRecipe(new FluidStack(LiquidHelper.getFluid(Defaults.LIQUID_LAVA), 1), 10, -0.01f, +0.005f), - new HygroregulatorRecipe(new FluidStack(LiquidHelper.getFluid(Defaults.LIQUID_ICE), 1), 10, 0.02f, -0.01f) }; + Fluid water = LiquidHelper.getFluid(Defaults.LIQUID_WATER); + Fluid lava = LiquidHelper.getFluid(Defaults.LIQUID_LAVA); + Fluid liquidIce = LiquidHelper.getFluid(Defaults.LIQUID_ICE); + + liquidTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, water, lava, liquidIce); + tankManager = new TankManager(liquidTank); + + recipes = new HygroregulatorRecipe[] { new HygroregulatorRecipe(new FluidStack(water, 1), 1, 0.01f, -0.005f), + new HygroregulatorRecipe(new FluidStack(lava, 1), 10, -0.01f, +0.005f), + new HygroregulatorRecipe(new FluidStack(liquidIce, 1), 10, 0.02f, -0.01f) }; } @Override @@ -146,9 +157,7 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory canInventory.readFromNBT(nbttagcompound); - liquidTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); - if (nbttagcompound.hasKey("LiquidTank")) - liquidTank.readFromNBT(nbttagcompound.getCompoundTag("LiquidTank")); + tankManager.readTanksFromNBT(nbttagcompound); transferTime = nbttagcompound.getInteger("TransferTime"); @@ -164,9 +173,7 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory canInventory.writeToNBT(nbttagcompound); - NBTTagCompound NBTresourceSlot = new NBTTagCompound(); - liquidTank.writeToNBT(NBTresourceSlot); - nbttagcompound.setTag("LiquidTank", NBTresourceSlot); + tankManager.writeTanksToNBT(nbttagcompound); nbttagcompound.setInteger("TransferTime", transferTime); if (currentRecipe != null) { @@ -268,30 +275,54 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory */ @Override public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) { + if (slotIndex == 0) { + FluidStack fluid = LiquidHelper.getFluidStackInContainer(itemstack); + if (fluid == null || fluid.amount <= 0) + return false; + return liquidTank.accepts(fluid.getFluid()); + } + return super.isItemValidForSlot(slotIndex, itemstack); } /* ILIQUIDTANKCONTAINER */ + @Override + public TankManager getTankManager() { + return tankManager; + } + @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - return liquidTank.fill(resource, doFill); + return tankManager.fill(from, resource, doFill); + } + + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + return tankManager.drain(from, resource, doDrain); } @Override public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - return liquidTank.drain(maxDrain, doDrain); + return tankManager.drain(from, maxDrain, doDrain); } @Override - public StandardTank[] getTanks() { - return new StandardTank[] { liquidTank }; + public boolean canFill(ForgeDirection from, Fluid fluid) { + return tankManager.canFill(from, fluid); } - /* SMP GUI */ - public void getGUINetworkData(int i, int j) { + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return tankManager.canDrain(from, fluid); } - public void sendGUINetworkData(Container container, ICrafting iCrafting) { + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + return tankManager.getTankInfo(from); } + @Override + public void getGUINetworkData(int messageId, int data) {} + + @Override + public void sendGUINetworkData(Container container, ICrafting iCrafting) {} } diff --git a/src/main/java/forestry/apiculture/gui/ContainerAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/gui/ContainerAlvearyHygroregulator.java index 2692e7552..3f02bc80f 100755 --- a/src/main/java/forestry/apiculture/gui/ContainerAlvearyHygroregulator.java +++ b/src/main/java/forestry/apiculture/gui/ContainerAlvearyHygroregulator.java @@ -37,17 +37,4 @@ public class ContainerAlvearyHygroregulator extends ContainerLiquidTanks { } - @Override - public void updateProgressBar(int i, int j) { - tile.getGUINetworkData(i, j); - } - - @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); - - for (int i = 0; i < crafters.size(); i++) - tile.sendGUINetworkData(this, (ICrafting) crafters.get(i)); - } - } diff --git a/src/main/java/forestry/core/fluids/TankManager.java b/src/main/java/forestry/core/fluids/TankManager.java index 56ae92e47..11fea5a57 100644 --- a/src/main/java/forestry/core/fluids/TankManager.java +++ b/src/main/java/forestry/core/fluids/TankManager.java @@ -11,6 +11,7 @@ package forestry.core.fluids; import com.google.common.collect.ForwardingList; +import forestry.core.fluids.tanks.FakeTank; import forestry.core.fluids.tanks.StandardTank; import forestry.core.inventory.ITileFilter; import forestry.core.network.PacketGuiInteger; @@ -22,6 +23,7 @@ import java.io.DataOutputStream; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.List; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; @@ -66,6 +68,15 @@ public class TankManager extends ForwardingList implements IFluidH return tanks; } + @Override + public boolean addAll(Collection collection) { + boolean changed = false; + for (StandardTank tank : collection) + changed |= add(tank); + + return changed; + } + @Override public boolean add(StandardTank tank) { boolean added = tanks.add(tank); @@ -76,6 +87,10 @@ public class TankManager extends ForwardingList implements IFluidH return added; } + public int maxMessageId() { + return NETWORK_DATA * tanks.size(); + } + public void writeTanksToNBT(NBTTagCompound data) { NBTTagList tagList = new NBTTagList(); for (byte slot = 0; slot < tanks.size(); slot++) { @@ -134,6 +149,11 @@ public class TankManager extends ForwardingList implements IFluidH tank.setFluid(null); } + public void initGuiData(Container container, ICrafting player) { + for (StandardTank tank : tanks) + initGuiData(container, player, tank.getTankIndex()); + } + public void initGuiData(Container container, ICrafting player, int tankIndex) { if (tankIndex >= tanks.size()) return; @@ -150,6 +170,11 @@ public class TankManager extends ForwardingList implements IFluidH Proxies.net.sendToPlayer(packet, (EntityPlayerMP)player); } + public void updateGuiData(Container container, List crafters) { + for (StandardTank tank : tanks) + updateGuiData(container, crafters, tank.getTankIndex()); + } + public void updateGuiData(Container container, List crafters, int tankIndex) { StandardTank tank = tanks.get(tankIndex); FluidStack fluidStack = tank.getFluid(); @@ -225,26 +250,41 @@ public class TankManager extends ForwardingList implements IFluidH @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - return fill(0, resource, doFill); + for (StandardTank tank : tanks) + if (tankAcceptsFluid(tank, resource)) + return fill(tank.getTankIndex(), resource, doFill); + + return FakeTank.INSTANCE.fill(resource, doFill); } public int fill(int tankIndex, FluidStack resource, boolean doFill) { if (tankIndex < 0 || tankIndex >= tanks.size() || resource == null) return 0; - return tanks.get(tankIndex).fill(resource, doFill); + StandardTank tank = tanks.get(tankIndex); + if (!tank.canBeFilledExternally()) + return 0; + + return tank.fill(resource, doFill); } @Override public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - return drain(0, maxDrain, doDrain); + for (StandardTank tank : tanks) + if (tankCanDrain(tank)) + return drain(tank.getTankIndex(), maxDrain, doDrain); + return FakeTank.INSTANCE.drain(maxDrain, doDrain); } public FluidStack drain(int tankIndex, int maxDrain, boolean doDrain) { if (tankIndex < 0 || tankIndex >= tanks.size()) return null; - return tanks.get(tankIndex).drain(maxDrain, doDrain); + StandardTank tank = tanks.get(tankIndex); + if (!tank.canBeDrainedExternally()) + return null; + + return tank.drain(maxDrain, doDrain); } @Override @@ -281,6 +321,10 @@ public class TankManager extends ForwardingList implements IFluidH return get(tankIndex).getInfo(); } + public FluidStack getFluid(int tankIndex) { + return get(tankIndex).getFluid(); + } + @Override public StandardTank get(int tankIndex) { return tanks.get(tankIndex); @@ -294,24 +338,6 @@ public class TankManager extends ForwardingList implements IFluidH fluidStack.amount = capacity; } -// Used to push fluids to surrounding blocks, missing code from Railcraft, if needed contact CovertJaguar -// public void outputLiquid(AdjacentTileCache cache, ITileFilter filter, ForgeDirection[] sides, int tankIndex, int amount) { -// for (ForgeDirection side : sides) { -// TileEntity tile = cache.getTileOnSide(side); -// if (!filter.matches(tile)) continue; -// IFluidHandler tank = getTankFromTile(tile); -// if (tank == null) continue; -// outputLiquid((IFluidHandler) tile, side, tankIndex, amount); -// } -// } - public void outputLiquid(IFluidHandler[] outputs, int tankIndex, int amount) { - for (int side = 0; side < 6; side++) { - IFluidHandler nearbyTank = outputs[side]; - if (nearbyTank != null) - outputLiquid(nearbyTank, ForgeDirection.getOrientation(side), tankIndex, amount); - } - } - public static IFluidHandler getTankFromTile(TileEntity tile) { IFluidHandler tank = null; if (tile instanceof IFluidHandler) @@ -319,25 +345,18 @@ public class TankManager extends ForwardingList implements IFluidH return tank; } - private void outputLiquid(IFluidHandler tank, ForgeDirection side, int tankIndex, int amount) { - FluidStack available = drain(tankIndex, amount, false); - if (available != null) { - int used = tank.fill(side.getOpposite(), available, true); - if (used > 0) - drain(tankIndex, used, true); - } - } - - private boolean tankAcceptsFluid(IFluidTank tank, FluidStack fluidStack) { + private boolean tankAcceptsFluid(StandardTank tank, FluidStack fluidStack) { if (fluidStack == null) return false; + if (!tank.canBeFilledExternally()) + return false; if (tank.fill(fluidStack, false) > 0) return true; return false; } - private boolean tankCanDrainFluid(IFluidTank tank, FluidStack fluidStack) { - if (fluidStack == null) + private boolean tankCanDrain(StandardTank tank) { + if (!tank.canBeDrainedExternally()) return false; FluidStack drained = tank.drain(1, false); if (drained != null && drained.amount > 0) @@ -345,4 +364,8 @@ public class TankManager extends ForwardingList implements IFluidH return false; } + private boolean tankCanDrainFluid(StandardTank tank, FluidStack fluidStack) { + return fluidStack != null && tankCanDrain(tank); + } + } diff --git a/src/main/java/forestry/core/fluids/tanks/FilteredTank.java b/src/main/java/forestry/core/fluids/tanks/FilteredTank.java index b5416916e..37d30948d 100644 --- a/src/main/java/forestry/core/fluids/tanks/FilteredTank.java +++ b/src/main/java/forestry/core/fluids/tanks/FilteredTank.java @@ -18,6 +18,7 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import java.util.Arrays; import java.util.Collection; +import java.util.HashSet; /** * @@ -25,7 +26,7 @@ import java.util.Collection; */ public class FilteredTank extends StandardTank { - private Collection filters; + private HashSet filters; public FilteredTank(int capacity, Fluid... filters) { this(capacity, Arrays.asList(filters), null); @@ -37,9 +38,14 @@ public class FilteredTank extends StandardTank { public FilteredTank(int capacity, Collection filters, TileEntity tile) { super(capacity, tile); - this.filters = filters; + this.filters = new HashSet(filters); } + public void addFilter(Fluid filter) { + if (!accepts(filter)) + filters.add(filter); + } + @Override public int fill(FluidStack resource, boolean doFill) { if (liquidMatchesFilter(resource)) @@ -47,6 +53,7 @@ public class FilteredTank extends StandardTank { return 0; } + @Override public boolean accepts(Fluid fluid) { return filters.contains(fluid); } diff --git a/src/main/java/forestry/core/fluids/tanks/StandardTank.java b/src/main/java/forestry/core/fluids/tanks/StandardTank.java index c3c27fbf6..c8f250199 100644 --- a/src/main/java/forestry/core/fluids/tanks/StandardTank.java +++ b/src/main/java/forestry/core/fluids/tanks/StandardTank.java @@ -25,6 +25,12 @@ import net.minecraftforge.fluids.FluidTank; */ public class StandardTank extends FluidTank { + // defines how the tank responds to IFluidHandler requests + public enum TankMode { + DEFAULT, OUTPUT, INPUT, INTERNAL + } + + public TankMode tankMode = TankMode.DEFAULT; public static final int DEFAULT_COLOR = 0xFFFFFF; public int colorCache = DEFAULT_COLOR; private int tankIndex; @@ -92,9 +98,33 @@ public class StandardTank extends FluidTank { return 0; if (resource.amount <= 0) return 0; + if (!accepts(resource.getFluid())) + return 0; return super.fill(resource, doFill); } + public boolean accepts(Fluid fluid) { + return true; + } + + public boolean canBeFilledExternally() { + switch (tankMode) { + case DEFAULT: + case INPUT: + return true; + } + return false; + } + + public boolean canBeDrainedExternally() { + switch (tankMode) { + case DEFAULT: + case OUTPUT: + return true; + } + return false; + } + @Override public FluidStack drain(int maxDrain, boolean doDrain) { if (maxDrain <= 0) diff --git a/src/main/java/forestry/core/gadgets/Engine.java b/src/main/java/forestry/core/gadgets/Engine.java index 927462a71..d754cded7 100755 --- a/src/main/java/forestry/core/gadgets/Engine.java +++ b/src/main/java/forestry/core/gadgets/Engine.java @@ -19,7 +19,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import buildcraft.api.core.Position; import buildcraft.api.power.IPowerEmitter; @@ -31,7 +30,6 @@ import buildcraft.api.transport.IPipeTile.PipeType; import forestry.core.TemperatureState; import forestry.core.config.Defaults; -import forestry.core.fluids.tanks.StandardTank; import forestry.core.interfaces.IPowerHandler; import forestry.core.network.PacketPayload; import forestry.core.proxy.Proxies; @@ -52,7 +50,6 @@ public abstract class Engine extends TileBase implements IPowerHandler, IPipeCon payload.intPayload[2] = heat; payload.floatPayload[0] = pistonSpeedServer; - return payload; } @@ -96,20 +93,7 @@ public abstract class Engine extends TileBase implements IPowerHandler, IPipeCon powerProvider.configure(10, 200, 10, 100000); } - protected ItemStack replenishByContainer(ItemStack inventoryStack, FluidContainerData container, StandardTank tank) { - if (container == null) - return inventoryStack; - if (tank.fill(container.fluid, false) >= container.fluid.amount) { - tank.fill(container.fluid, true); - if (container.filledContainer != null && container.filledContainer.getItem().hasContainerItem(container.filledContainer)) - inventoryStack = container.emptyContainer.copy(); - else - inventoryStack.stackSize--; - } - - return inventoryStack; - } @Override public void rotateAfterPlacement(World world, int x, int y, int z, EntityLivingBase entityliving, ItemStack itemstack) { diff --git a/src/main/java/forestry/core/gadgets/TileAnalyzer.java b/src/main/java/forestry/core/gadgets/TileAnalyzer.java index fc780deb3..ad9a7066b 100755 --- a/src/main/java/forestry/core/gadgets/TileAnalyzer.java +++ b/src/main/java/forestry/core/gadgets/TileAnalyzer.java @@ -22,15 +22,18 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.network.Packet; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; import forestry.core.EnumErrorCode; +import forestry.core.fluids.TankManager; import forestry.core.config.Defaults; import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.network.EntityNetData; @@ -38,11 +41,10 @@ import forestry.core.network.GuiId; import forestry.core.network.PacketIds; import forestry.core.network.PacketInventoryStack; import forestry.core.proxy.Proxies; -import forestry.core.fluids.tanks.StandardTank; +import forestry.core.fluids.tanks.FilteredTank; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.LiquidHelper; import forestry.core.utils.StackUtils; -import forestry.core.utils.StringUtil; public class TileAnalyzer extends TileBase implements ISpecialInventory, ISidedInventory, ILiquidTankContainer { @@ -65,13 +67,17 @@ public class TileAnalyzer extends TileBase implements ISpecialInventory, ISidedI private final short inputSlot1 = 2; private final short outputSlot1 = 8; - public FluidStack resource = FluidRegistry.getFluidStack(Defaults.LIQUID_HONEY, HONEY_REQUIRED); @EntityNetData - public StandardTank resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); + public FilteredTank resourceTank; + + private final TankManager tankManager; + private final Stack pendingProducts = new Stack(); /* CONSTRUCTOR */ public TileAnalyzer() { + resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, FluidRegistry.getFluid(Defaults.LIQUID_HONEY)); + tankManager = new TankManager(resourceTank); } @Override @@ -92,8 +98,7 @@ public class TileAnalyzer extends TileBase implements ISpecialInventory, ISidedI nbttagcompound.setInteger("AnalyzeTime", analyzeTime); - // / Resource tank - resourceTank.writeToNBT(nbttagcompound); + tankManager.writeTanksToNBT(nbttagcompound); // / Pending Products NBTTagList nbttaglist = new NBTTagList(); @@ -117,8 +122,7 @@ public class TileAnalyzer extends TileBase implements ISpecialInventory, ISidedI analyzeTime = nbttagcompound.getInteger("AnalyzeTime"); - // / Resource tank - resourceTank.readFromNBT(nbttagcompound); + tankManager.readTanksFromNBT(nbttagcompound); // / Pending Products NBTTagList nbttaglist = nbttagcompound.getTagList("PendingProducts", 10); @@ -146,7 +150,7 @@ public class TileAnalyzer extends TileBase implements ISpecialInventory, ISidedI // Check if we have suitable items waiting in the can slot if (getStackInSlot(canSlot) != null) { FluidContainerData container = LiquidHelper.getLiquidContainer(getStackInSlot(canSlot)); - if (container != null && resource.isFluidEqual(container.fluid)) { + if (container != null && resourceTank.accepts(container.fluid.getFluid())) { setInventorySlotContents(canSlot, StackUtils.replenishByContainer(this, getStackInSlot(canSlot), container, resourceTank)); if (getStackInSlot(canSlot).stackSize <= 0) @@ -187,7 +191,7 @@ public class TileAnalyzer extends TileBase implements ISpecialInventory, ISidedI return; // We need our liquid honey - if (resourceTank.getFluidAmount() < resource.amount) { + if (resourceTank.getFluidAmount() < HONEY_REQUIRED) { setErrorState(EnumErrorCode.NORESOURCE); return; } @@ -208,7 +212,7 @@ public class TileAnalyzer extends TileBase implements ISpecialInventory, ISidedI setInventorySlotContents(analyzeSlot, getStackInSlot(i)); setInventorySlotContents(i, null); - resourceTank.drain(resource.amount, true); + resourceTank.drain(HONEY_REQUIRED, true); analyzeTime = TIME_TO_ANALYZE; sendNetworkUpdate(); return; @@ -251,6 +255,7 @@ public class TileAnalyzer extends TileBase implements ISpecialInventory, ISidedI /* SMP */ public void getGUINetworkData(int i, int j) { + i -= tankManager.maxMessageId() + 1; switch (i) { case 0: analyzeTime = j; @@ -259,7 +264,8 @@ public class TileAnalyzer extends TileBase implements ISpecialInventory, ISidedI } public void sendGUINetworkData(Container container, ICrafting iCrafting) { - iCrafting.sendProgressBarUpdate(container, 0, analyzeTime); + int i = tankManager.maxMessageId() + 1; + iCrafting.sendProgressBarUpdate(container, i, analyzeTime); } @@ -388,7 +394,7 @@ public class TileAnalyzer extends TileBase implements ISpecialInventory, ISidedI if (!AlleleManager.alleleRegistry.isIndividual(stack)) { FluidContainerData container = LiquidHelper.getLiquidContainer(stack); - if (container == null || !container.fluid.isFluidEqual(resource)) + if (container == null || !resourceTank.accepts(container.fluid.getFluid())) return 0; if (getStackInSlot(canSlot) == null) { @@ -423,33 +429,39 @@ public class TileAnalyzer extends TileBase implements ISpecialInventory, ISidedI } /* ILIQUIDCONTAINER */ + @Override + public TankManager getTankManager() { + return tankManager; + } + @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - - // We only accept what is already in the tank or valid ingredients - if (resourceTank.getFluidAmount() > 0 && !resourceTank.getFluid().isFluidEqual(resource)) - return 0; - else if (!LiquidHelper.isLiquid(Defaults.LIQUID_HONEY, resource)) - return 0; - - int used = resourceTank.fill(resource, doFill); - - if (doFill && used > 0) - sendNetworkUpdate(); - - return used; + return tankManager.fill(from, resource, doFill); } @Override - public StandardTank[] getTanks() { - return new StandardTank[] { resourceTank }; + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + return tankManager.drain(from, resource, doDrain); } - /* @Override - public ILiquidTank getTank(ForgeDirection direction, LiquidStack type) { - return resourceTank; + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + return tankManager.drain(from, maxDrain, doDrain); + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + return tankManager.canFill(from, fluid); + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return tankManager.canDrain(from, fluid); + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + return tankManager.getTankInfo(from); } - */ } diff --git a/src/main/java/forestry/core/gadgets/TileForestry.java b/src/main/java/forestry/core/gadgets/TileForestry.java index 8b06c4b41..9d9795ba4 100755 --- a/src/main/java/forestry/core/gadgets/TileForestry.java +++ b/src/main/java/forestry/core/gadgets/TileForestry.java @@ -352,37 +352,4 @@ public abstract class TileForestry extends TileEntity implements INetworkedEntit return getInternalInventory().getSizeInventorySide(side); } - - /* IFLUIDHANDLER BASICS */ - public FluidTankInfo[] getTankInfo(ForgeDirection from) { - if (this instanceof ILiquidTankContainer) { - StandardTank[] tanks = ((ILiquidTankContainer) this).getTanks(); - FluidTankInfo[] info = new FluidTankInfo[tanks.length]; - for (int i = 0; i < info.length; i++) { - info[i] = tanks[i].getInfo(); - } - return info; - } - return FakeTank.INFO; - } - - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - return 0; - } - - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - return null; - } - - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - return resource != null ? drain(from, resource.amount, doDrain) : null; - } - - public boolean canFill(ForgeDirection from, Fluid fluid) { - return true; - } - - public boolean canDrain(ForgeDirection from, Fluid fluid) { - return true; - } } diff --git a/src/main/java/forestry/core/gui/ContainerAnalyzer.java b/src/main/java/forestry/core/gui/ContainerAnalyzer.java index ce98716cb..231aa18a0 100755 --- a/src/main/java/forestry/core/gui/ContainerAnalyzer.java +++ b/src/main/java/forestry/core/gui/ContainerAnalyzer.java @@ -54,17 +54,4 @@ public class ContainerAnalyzer extends ContainerLiquidTanks { } - @Override - public void updateProgressBar(int i, int j) { - tile.getGUINetworkData(i, j); - } - - @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); - - for (int i = 0; i < crafters.size(); i++) - tile.sendGUINetworkData(this, (ICrafting) crafters.get(i)); - } - } diff --git a/src/main/java/forestry/core/gui/ContainerForestry.java b/src/main/java/forestry/core/gui/ContainerForestry.java index 3d5c2e1d2..31fd7293d 100755 --- a/src/main/java/forestry/core/gui/ContainerForestry.java +++ b/src/main/java/forestry/core/gui/ContainerForestry.java @@ -206,11 +206,4 @@ public class ContainerForestry extends Container { public boolean canInteractWith(EntityPlayer entityplayer) { return inventory.isUseableByPlayer(entityplayer); } - - public void onTankUpdate(NBTTagCompound nbt) { - } - - public StandardTank getTank(int slot) { - return FakeTank.INSTANCE; - } } diff --git a/src/main/java/forestry/core/gui/ContainerLiquidTanks.java b/src/main/java/forestry/core/gui/ContainerLiquidTanks.java index 4f3aa2a74..688d1dcfa 100755 --- a/src/main/java/forestry/core/gui/ContainerLiquidTanks.java +++ b/src/main/java/forestry/core/gui/ContainerLiquidTanks.java @@ -10,36 +10,29 @@ ******************************************************************************/ package forestry.core.gui; -import java.util.HashMap; -import java.util.Map; - import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidTank; import forestry.api.core.IToolPipette; -import forestry.core.fluids.tanks.FakeTank; import forestry.core.fluids.tanks.StandardTank; import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.network.PacketIds; import forestry.core.network.PacketPayload; -import forestry.core.network.PacketTankUpdate; import forestry.core.network.PacketUpdate; import forestry.core.proxy.Proxies; public class ContainerLiquidTanks extends ContainerForestry { - private ILiquidTankContainer tanks; + private ILiquidTankContainer tile; - public ContainerLiquidTanks(IInventory inventory, ILiquidTankContainer tanks) { + public ContainerLiquidTanks(IInventory inventory, ILiquidTankContainer tile) { super(inventory); - this.tanks = tanks; + this.tile = tile; } public void handlePipetteClick(int slot, EntityPlayer player) { @@ -53,74 +46,52 @@ public class ContainerLiquidTanks extends ContainerForestry { return; if (!Proxies.common.isSimulating(player.worldObj)) { - PacketPayload payload = new PacketPayload(1, 0, 0); payload.intPayload[0] = slot; Proxies.net.sendToServer(new PacketUpdate(PacketIds.PIPETTE_CLICK, payload)); return; - } IToolPipette pipette = (IToolPipette) held; - int liquidAmount = tanks.getTanks()[slot].getFluid().amount; + StandardTank tank = tile.getTankManager().get(slot); + int liquidAmount = tank.getFluid().amount; + if (pipette.canPipette(itemstack) && liquidAmount > 0) { - if (liquidAmount > 0) { - int filled = pipette.fill(itemstack, tanks.getTanks()[slot].drain(1000, false), - true); - tanks.getTanks()[slot].drain(filled, true); + FluidStack fillAmount = tank.drain(1000, false); + int filled = pipette.fill(itemstack, fillAmount, true); + tank.drain(filled, true); } - } else { - - IFluidTank tank = tanks.getTanks()[slot]; FluidStack potential = pipette.drain(itemstack, pipette.getCapacity(itemstack), false); if (potential != null) pipette.drain(itemstack, tank.fill(potential, true), true); - } } - private Map syncedFluids = new HashMap(); + + @Override + public void updateProgressBar(int messageId, int data) { + super.updateProgressBar(messageId, data); + + tile.getTankManager().processGuiUpdate(messageId, data); + tile.getGUINetworkData(messageId, data); + } @Override public void detectAndSendChanges() { super.detectAndSendChanges(); - - for (int i = 0; i < tanks.getTanks().length; i++) { - StandardTank tank = tanks.getTanks()[i]; - - // If null has been synced - if (tank.getFluid() == null && getTank(i).getFluidAmount() <= 0) - continue; - // If fluid has been synced - if (tank.getFluid() != null && tank.getFluid().isFluidStackIdentical(getTank(i).getFluid())) - continue; - - for (int j = 0; j < this.crafters.size(); ++j) { - if (this.crafters.get(j) instanceof EntityPlayerMP) { - EntityPlayerMP player = (EntityPlayerMP) this.crafters.get(j); - Proxies.net.sendToPlayer(new PacketTankUpdate(i, tank), player); - } - } - - syncedFluids.put(i, new StandardTank(tank.getFluid() == null ? null : tank.getFluid().copy(), tank.getCapacity())); - - } + tile.getTankManager().updateGuiData(this, crafters); + for (int i = 0; i < crafters.size(); i++) + tile.sendGUINetworkData(this, (ICrafting) crafters.get(i)); } @Override - public void onTankUpdate(NBTTagCompound nbt) { - int tankID = nbt.getByte("tank"); - int capacity = nbt.getShort("capacity"); - tanks.getTanks()[tankID].readFromNBT(nbt); - - StandardTank tank = new StandardTank(capacity); - tank.readFromNBT(nbt); - syncedFluids.put(tankID, tank); + public void addCraftingToCrafters(ICrafting icrafting) { + super.addCraftingToCrafters(icrafting); + tile.getTankManager().initGuiData(this, icrafting); } - @Override public StandardTank getTank(int slot) { - return syncedFluids.get(slot) == null ? FakeTank.INSTANCE : syncedFluids.get(slot); + return tile.getTankManager().get(slot); } } diff --git a/src/main/java/forestry/core/gui/widgets/TankWidget.java b/src/main/java/forestry/core/gui/widgets/TankWidget.java index 31642eee9..99eecc761 100755 --- a/src/main/java/forestry/core/gui/widgets/TankWidget.java +++ b/src/main/java/forestry/core/gui/widgets/TankWidget.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.core.gui.widgets; +import forestry.farming.gui.ContainerFarm; +import net.minecraft.inventory.Container; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; @@ -49,7 +51,12 @@ public class TankWidget extends Widget { } public StandardTank getTank() { - return ((ContainerForestry) manager.gui.inventorySlots).getTank(slot); + Container container = manager.gui.inventorySlots; + if (container instanceof ContainerLiquidTanks) + return ((ContainerLiquidTanks) container).getTank(slot); + else if (container instanceof ContainerFarm) + return ((ContainerFarm) container).getTank(slot); + return null; } @Override diff --git a/src/main/java/forestry/core/interfaces/ILiquidTankContainer.java b/src/main/java/forestry/core/interfaces/ILiquidTankContainer.java index 37fdb8164..f3b410ba7 100755 --- a/src/main/java/forestry/core/interfaces/ILiquidTankContainer.java +++ b/src/main/java/forestry/core/interfaces/ILiquidTankContainer.java @@ -10,11 +10,16 @@ ******************************************************************************/ package forestry.core.interfaces; +import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.StandardTank; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; import net.minecraftforge.fluids.IFluidHandler; public interface ILiquidTankContainer extends IFluidHandler { - StandardTank[] getTanks(); + TankManager getTankManager(); + void getGUINetworkData(int messageId, int data); + void sendGUINetworkData(Container container, ICrafting iCrafting); } diff --git a/src/main/java/forestry/core/network/PacketHandler.java b/src/main/java/forestry/core/network/PacketHandler.java index 18decd213..0a796444e 100755 --- a/src/main/java/forestry/core/network/PacketHandler.java +++ b/src/main/java/forestry/core/network/PacketHandler.java @@ -141,10 +141,9 @@ public class PacketHandler { packetTR.readData(data); onGenomeTrackerUpdate(packetTR); break; - case PacketIds.TANK_UPDATE: - PacketTankUpdate packetAB = new PacketTankUpdate(); - packetAB.readData(data); - onTankUpdate(packetAB); + case PacketIds.GUI_INTEGER: + PacketGuiInteger packet = new PacketGuiInteger(); + packet.readData(data); break; default: for (forestry.core.interfaces.IPacketHandler handler : PluginManager.packetHandlers) @@ -168,17 +167,6 @@ public class PacketHandler { channel.sendTo(packet, player); } - - private void onTankUpdate(PacketTankUpdate packetAB) { - assert FMLCommonHandler.instance().getEffectiveSide().isClient(); - - EntityPlayer player = Proxies.common.getPlayer(); - - if (player.openContainer instanceof ContainerForestry) { - ((ContainerForestry)player.openContainer).onTankUpdate(packetAB.nbttagcompound); - } - } - private void onGenomeTrackerUpdate(PacketNBT packet) { assert FMLCommonHandler.instance().getEffectiveSide().isClient(); diff --git a/src/main/java/forestry/core/network/PacketIds.java b/src/main/java/forestry/core/network/PacketIds.java index 622903c95..b35aa1d58 100755 --- a/src/main/java/forestry/core/network/PacketIds.java +++ b/src/main/java/forestry/core/network/PacketIds.java @@ -48,7 +48,6 @@ public class PacketIds { public static final int LEAF_UPDATE = 90; - public static final int TANK_UPDATE = 91; public static final int GUI_INTEGER = 92; // Propolis pipe diff --git a/src/main/java/forestry/core/network/PacketTankUpdate.java b/src/main/java/forestry/core/network/PacketTankUpdate.java deleted file mode 100755 index d7cecfbd5..000000000 --- a/src/main/java/forestry/core/network/PacketTankUpdate.java +++ /dev/null @@ -1,31 +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.core.network; - -import forestry.core.fluids.tanks.StandardTank; -import net.minecraft.nbt.NBTTagCompound; - - -public class PacketTankUpdate extends PacketNBT { - - public PacketTankUpdate(int tankSlot, StandardTank tank) { - super(PacketIds.TANK_UPDATE); - NBTTagCompound nbt = new NBTTagCompound(); - nbt.setByte("tank", (byte) tankSlot); - nbt.setShort("capacity", (short) tank.getCapacity()); - tank.writeToNBT(nbt); - this.nbttagcompound = nbt; - } - - public PacketTankUpdate() { - } - -} diff --git a/src/main/java/forestry/energy/gadgets/EngineBronze.java b/src/main/java/forestry/energy/gadgets/EngineBronze.java index 692391296..ebc286a13 100755 --- a/src/main/java/forestry/energy/gadgets/EngineBronze.java +++ b/src/main/java/forestry/energy/gadgets/EngineBronze.java @@ -21,6 +21,7 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; import forestry.api.core.ForestryAPI; import forestry.api.core.ISpecialInventory; @@ -29,7 +30,9 @@ import forestry.api.fuels.FuelManager; import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; +import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.StandardTank; +import forestry.core.fluids.tanks.FilteredTank; import forestry.core.gadgets.Engine; import forestry.core.gadgets.TileBase; import forestry.core.interfaces.ILiquidTankContainer; @@ -65,8 +68,9 @@ public class EngineBronze extends Engine implements ISpecialInventory, ILiquidTa else shutdown = false; } - public StandardTank fuelTank = new StandardTank(Defaults.ENGINE_TANK_CAPACITY); - public StandardTank heatingTank = new StandardTank(Defaults.ENGINE_TANK_CAPACITY); + public FilteredTank fuelTank; + public FilteredTank heatingTank; + private final TankManager tankManager; private final TileInventoryAdapter inventory; public int burnTime; public int totalTime; @@ -81,6 +85,16 @@ public class EngineBronze extends Engine implements ISpecialInventory, ILiquidTa setHints(Config.hints.get("engine.bronze")); inventory = new TileInventoryAdapter(this, 1, "Items"); + + fuelTank = new FilteredTank(Defaults.ENGINE_TANK_CAPACITY, FuelManager.bronzeEngineFuel.keySet()); + fuelTank.tankMode = StandardTank.TankMode.INPUT; + heatingTank = new FilteredTank(Defaults.ENGINE_TANK_CAPACITY, FluidRegistry.LAVA); + heatingTank.tankMode = StandardTank.TankMode.INPUT; + this.tankManager = new TankManager(fuelTank, heatingTank); + } + + public TankManager getTankManager() { + return tankManager; } @Override @@ -101,9 +115,9 @@ public class EngineBronze extends Engine implements ISpecialInventory, ILiquidTa StandardTank tank = null; - if (container.fluid.isFluidEqual(LiquidHelper.getLiquid(Defaults.LIQUID_LAVA, 1))) + if (heatingTank.accepts(container.fluid.getFluid())) tank = heatingTank; - else if (FuelManager.bronzeEngineFuel.containsKey(container.fluid)) + else if (fuelTank.accepts(container.fluid.getFluid())) tank = fuelTank; if (tank != null) { @@ -219,7 +233,7 @@ public class EngineBronze extends Engine implements ISpecialInventory, ILiquidTa * Returns the fuel value (power per cycle) an item of the passed ItemStack * provides * - * @param item + * @param fluid * @return */ private int determineFuelValue(Fluid fluid) { @@ -231,16 +245,31 @@ public class EngineBronze extends Engine implements ISpecialInventory, ILiquidTa /** * - * @param fuelid + * @param fluid * @return Duration of burn cycle of one bucket */ - private int determineBurnTime(Fluid item) { - if (FuelManager.bronzeEngineFuel.containsKey(item)) - return FuelManager.bronzeEngineFuel.get(item).burnDuration; + private int determineBurnTime(Fluid fluid) { + if (FuelManager.bronzeEngineFuel.containsKey(fluid)) + return FuelManager.bronzeEngineFuel.get(fluid).burnDuration; else return 0; } + protected ItemStack replenishByContainer(ItemStack inventoryStack, FluidContainerData container, StandardTank tank) { + if (container == null) + return inventoryStack; + + if (tank.fill(container.fluid, false) >= container.fluid.amount) { + tank.fill(container.fluid, true); + if (container.filledContainer != null && container.filledContainer.getItem().hasContainerItem(container.filledContainer)) + inventoryStack = container.emptyContainer.copy(); + else + inventoryStack.stackSize--; + } + + return inventoryStack; + } + // / STATE INFORMATION @Override public boolean isBurning() { @@ -284,13 +313,7 @@ public class EngineBronze extends Engine implements ISpecialInventory, ILiquidTa currentFluidId = fluid.getID(); } - fuelTank = new StandardTank(Defaults.ENGINE_TANK_CAPACITY); - heatingTank = new StandardTank(Defaults.ENGINE_TANK_CAPACITY); - if (nbt.hasKey("FuelSlot")) { - fuelTank.readFromNBT(nbt.getCompoundTag("FuelSlot")); - heatingTank.readFromNBT(nbt.getCompoundTag("HeatingSlot")); - } - + tankManager.readTanksFromNBT(nbt); inventory.readFromNBT(nbt); } @@ -310,21 +333,14 @@ public class EngineBronze extends Engine implements ISpecialInventory, ILiquidTa if (fluid != null) nbt.setString("currentFluid", fluid.getName()); - NBTTagCompound nbtFuelSlot = new NBTTagCompound(); - NBTTagCompound nbtHeatingSlot = new NBTTagCompound(); - - fuelTank.writeToNBT(nbtFuelSlot); - heatingTank.writeToNBT(nbtHeatingSlot); - - nbt.setTag("FuelSlot", nbtFuelSlot); - nbt.setTag("HeatingSlot", nbtHeatingSlot); - + tankManager.writeTanksToNBT(nbt); inventory.writeToNBT(nbt); } /* GUI */ @Override public void getGUINetworkData(int id, int data) { + id -= tankManager.maxMessageId() + 1; switch (id) { case 0: @@ -350,12 +366,13 @@ public class EngineBronze extends Engine implements ISpecialInventory, ILiquidTa @Override public void sendGUINetworkData(Container containerEngine, ICrafting iCrafting) { - iCrafting.sendProgressBarUpdate(containerEngine, 0, burnTime); - iCrafting.sendProgressBarUpdate(containerEngine, 1, totalTime); - iCrafting.sendProgressBarUpdate(containerEngine, 2, currentOutput); - iCrafting.sendProgressBarUpdate(containerEngine, 3, (int) storedEnergy); - iCrafting.sendProgressBarUpdate(containerEngine, 4, heat); - iCrafting.sendProgressBarUpdate(containerEngine, 5, currentFluidId); + int i = tankManager.maxMessageId() + 1; + iCrafting.sendProgressBarUpdate(containerEngine, i, burnTime); + iCrafting.sendProgressBarUpdate(containerEngine, i + 1, totalTime); + iCrafting.sendProgressBarUpdate(containerEngine, i + 2, currentOutput); + iCrafting.sendProgressBarUpdate(containerEngine, i + 3, (int) storedEnergy); + iCrafting.sendProgressBarUpdate(containerEngine, i + 4, heat); + iCrafting.sendProgressBarUpdate(containerEngine, i + 5, currentFluidId); } /* IINVENTORY */ @@ -423,6 +440,13 @@ public class EngineBronze extends Engine implements ISpecialInventory, ILiquidTa */ @Override public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) { + if (slotIndex == SLOT_CAN) { + FluidStack fluid = LiquidHelper.getFluidStackInContainer(itemstack); + if (fluid == null || fluid.amount <= 0) + return false; + return fuelTank.accepts(fluid.getFluid()) || heatingTank.accepts(fluid.getFluid()); + } + return super.isItemValidForSlot(slotIndex, itemstack); } @@ -441,23 +465,36 @@ public class EngineBronze extends Engine implements ISpecialInventory, ILiquidTa return null; } - // / ITANKCONTAINER + // IFluidHandler + @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - // We only accept biomass and water as fuel - int used = 0; - - if (FuelManager.bronzeEngineFuel.containsKey(resource)) - used = fuelTank.fill(resource, doFill); - - if (LiquidHelper.isLiquid(Defaults.LIQUID_LAVA, resource)) - used = heatingTank.fill(resource, doFill); - - return used; + return tankManager.fill(from, resource, doFill); } @Override - public StandardTank[] getTanks() { - return new StandardTank[] { fuelTank, heatingTank }; + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + return tankManager.drain(from, resource, doDrain); } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + return tankManager.drain(from, maxDrain, doDrain); + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + return tankManager.canFill(from, fluid); + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return tankManager.canDrain(from, fluid); + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + return tankManager.getTankInfo(from); + } + } diff --git a/src/main/java/forestry/energy/gadgets/EngineCopper.java b/src/main/java/forestry/energy/gadgets/EngineCopper.java index eb371b303..3a3203e1e 100755 --- a/src/main/java/forestry/energy/gadgets/EngineCopper.java +++ b/src/main/java/forestry/energy/gadgets/EngineCopper.java @@ -204,7 +204,7 @@ public class EngineCopper extends Engine implements ISpecialInventory, ISidedInv /** * Returns the fuel value (power per cycle) an item of the passed ItemStack provides * - * @param item + * @param fuel * @return */ private int determineFuelValue(ItemStack fuel) { @@ -217,7 +217,7 @@ public class EngineCopper extends Engine implements ISpecialInventory, ISidedInv /** * Returns the fuel value (power per cycle) an item of the passed ItemStack provides * - * @param item + * @param fuel * @return */ private int determineBurnDuration(ItemStack fuel) { diff --git a/src/main/java/forestry/energy/gadgets/MachineGenerator.java b/src/main/java/forestry/energy/gadgets/MachineGenerator.java index 607bbc3bc..8527de339 100755 --- a/src/main/java/forestry/energy/gadgets/MachineGenerator.java +++ b/src/main/java/forestry/energy/gadgets/MachineGenerator.java @@ -17,6 +17,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidStack; @@ -30,6 +31,8 @@ import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.fluids.tanks.StandardTank; +import forestry.core.fluids.tanks.FilteredTank; +import forestry.core.fluids.TankManager; import forestry.core.gadgets.TileBase; import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.interfaces.IRenderableMachine; @@ -41,6 +44,8 @@ import forestry.core.utils.LiquidHelper; import forestry.core.utils.StackUtils; import forestry.core.utils.Utils; import forestry.plugins.PluginIC2; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; public class MachineGenerator extends TileBase implements ISpecialInventory, ILiquidTankContainer, IRenderableMachine { @@ -49,7 +54,8 @@ public class MachineGenerator extends TileBase implements ISpecialInventory, ILi public static final int maxEnergy = 30000; @EntityNetData - public StandardTank resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); + public FilteredTank resourceTank; + private final TankManager tankManager; private int tickCount = 0; InventoryAdapter inventory = new InventoryAdapter(1, "Items"); @@ -58,6 +64,9 @@ public class MachineGenerator extends TileBase implements ISpecialInventory, ILi public MachineGenerator() { setHints(Config.hints.get("generator")); + resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, FuelManager.generatorFuel.keySet()); + tankManager = new TankManager(resourceTank); + if (PluginIC2.instance.isAvailable()) { ic2EnergySource = new BasicSource(this, maxEnergy, 1); } @@ -79,10 +88,7 @@ public class MachineGenerator extends TileBase implements ISpecialInventory, ILi if (ic2EnergySource != null) ic2EnergySource.writeToNBT(nbttagcompound); - NBTTagCompound NBTresourceSlot = new NBTTagCompound(); - resourceTank.writeToNBT(NBTresourceSlot); - nbttagcompound.setTag("ResourceTank", NBTresourceSlot); - + tankManager.writeTanksToNBT(nbttagcompound); inventory.writeToNBT(nbttagcompound); } @@ -92,10 +98,7 @@ public class MachineGenerator extends TileBase implements ISpecialInventory, ILi if (ic2EnergySource != null) ic2EnergySource.readFromNBT(nbttagcompound); - resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); - if (nbttagcompound.hasKey("ResourceTank")) - resourceTank.readFromNBT(nbttagcompound.getCompoundTag("ResourceTank")); - + tankManager.readTanksFromNBT(nbttagcompound); inventory.readFromNBT(nbttagcompound); } @@ -120,7 +123,8 @@ public class MachineGenerator extends TileBase implements ISpecialInventory, ILi if (inventory.getStackInSlot(SLOT_CAN) != null) { FluidContainerData container = LiquidHelper.getLiquidContainer(inventory.getStackInSlot(SLOT_CAN)); if (container != null) - if (FuelManager.generatorFuel.containsKey(container.fluid)) { + + if (resourceTank.accepts(container.fluid.getFluid())) { inventory.setInventorySlotContents(SLOT_CAN, StackUtils.replenishByContainer(this, inventory.getStackInSlot(SLOT_CAN), container, resourceTank)); if (inventory.getStackInSlot(SLOT_CAN).stackSize <= 0) inventory.setInventorySlotContents(SLOT_CAN, null); @@ -135,7 +139,7 @@ public class MachineGenerator extends TileBase implements ISpecialInventory, ILi ic2EnergySource.updateEntity(); - if (resourceTank.getFluidAmount() > 0 && FuelManager.generatorFuel.containsKey(resourceTank.getFluid())) { + if (resourceTank.getFluidAmount() > 0) { GeneratorFuel fuel = FuelManager.generatorFuel.get(resourceTank.getFluid()); if (resourceTank.getFluidAmount() >= fuel.fuelConsumed.amount && @@ -183,17 +187,16 @@ public class MachineGenerator extends TileBase implements ISpecialInventory, ILi /* SMP GUI */ public void getGUINetworkData(int i, int j) { - - switch (i) { - case 0: + int firstMessageId = tankManager.maxMessageId() + 1; + if (i == firstMessageId) { if (ic2EnergySource != null) ic2EnergySource.setEnergyStored(j); - break; } } public void sendGUINetworkData(Container container, ICrafting iCrafting) { + int firstMessageId = tankManager.maxMessageId() + 1; if (ic2EnergySource != null) { - iCrafting.sendProgressBarUpdate(container, 0, (short) ic2EnergySource.getEnergyStored()); + iCrafting.sendProgressBarUpdate(container, firstMessageId, (short) ic2EnergySource.getEnergyStored()); } } @@ -268,24 +271,39 @@ public class MachineGenerator extends TileBase implements ISpecialInventory, ILi return null; } - /* ILIQUIDCONTAINER IMPLEMENTATION */ + /* ILiquidTankContainer */ @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - // We only accept water - if (!FuelManager.generatorFuel.containsKey(resource)) - return 0; - - int used = resourceTank.fill(resource, doFill); - - if (doFill && used > 0) - // TODO: Slow down updates - sendNetworkUpdate(); - - return used; + return tankManager.fill(from, resource, doFill); } @Override - public StandardTank[] getTanks() { - return new StandardTank[] { resourceTank }; + public TankManager getTankManager() { + return tankManager; } + + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + return tankManager.drain(from, resource, doDrain); + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + return tankManager.drain(from, maxDrain, doDrain); + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + return tankManager.canFill(from, fluid); + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return tankManager.canDrain(from, fluid); + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + return tankManager.getTankInfo(from); + } + } diff --git a/src/main/java/forestry/energy/gui/ContainerEngineBronze.java b/src/main/java/forestry/energy/gui/ContainerEngineBronze.java index 1f8433f3d..a7fdf5c87 100755 --- a/src/main/java/forestry/energy/gui/ContainerEngineBronze.java +++ b/src/main/java/forestry/energy/gui/ContainerEngineBronze.java @@ -43,17 +43,4 @@ public class ContainerEngineBronze extends ContainerLiquidTanks { return engine.isUseableByPlayer(entityplayer); } - @Override - public void updateProgressBar(int i, int j) { - engine.getGUINetworkData(i, j); - } - - @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); - - for (int i = 0; i < crafters.size(); i++) - engine.sendGUINetworkData(this, (ICrafting) crafters.get(i)); - } - } diff --git a/src/main/java/forestry/energy/gui/ContainerGenerator.java b/src/main/java/forestry/energy/gui/ContainerGenerator.java index 45581741c..8f4f75d35 100755 --- a/src/main/java/forestry/energy/gui/ContainerGenerator.java +++ b/src/main/java/forestry/energy/gui/ContainerGenerator.java @@ -37,19 +37,6 @@ public class ContainerGenerator extends ContainerLiquidTanks { this.addSlot(new Slot(player, i, 8 + i * 18, 142)); } - @Override - public void updateProgressBar(int i, int j) { - tile.getGUINetworkData(i, j); - } - - @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); - - for (int i = 0; i < crafters.size(); i++) - tile.sendGUINetworkData(this, (ICrafting) crafters.get(i)); - } - @Override public boolean canInteractWith(EntityPlayer entityplayer) { return tile.isUseableByPlayer(entityplayer); diff --git a/src/main/java/forestry/factory/gadgets/MachineBottler.java b/src/main/java/forestry/factory/gadgets/MachineBottler.java index c59d455b9..3fd4ebb7e 100755 --- a/src/main/java/forestry/factory/gadgets/MachineBottler.java +++ b/src/main/java/forestry/factory/gadgets/MachineBottler.java @@ -12,10 +12,12 @@ package forestry.factory.gadgets; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedList; import java.util.Map; import java.util.Stack; +import forestry.core.fluids.tanks.FilteredTank; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; @@ -25,21 +27,22 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; import buildcraft.api.gates.ITrigger; import buildcraft.api.power.PowerHandler; import forestry.api.core.ForestryAPI; import forestry.api.recipes.IBottlerManager; -import forestry.api.recipes.RecipeManagers; import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.fluids.tanks.StandardTank; +import forestry.core.fluids.TankManager; import forestry.core.gadgets.TileBase; import forestry.core.gadgets.TilePowered; import forestry.core.interfaces.ILiquidTankContainer; @@ -86,10 +89,13 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq public static class RecipeManager implements IBottlerManager { public static ArrayList recipes = new ArrayList(); + public static HashSet recipeFluids = new HashSet(); @Override public void addRecipe(int cyclesPerUnit, FluidStack input, ItemStack can, ItemStack bottled) { recipes.add(new MachineBottler.Recipe(cyclesPerUnit, input, can, bottled)); + if (input != null) + recipeFluids.add(input.getFluid()); } /** @@ -113,8 +119,8 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq if(FluidContainerRegistry.isEmptyContainer(empty)) { ItemStack filled = FluidContainerRegistry.fillFluidContainer(res, empty); if(filled != null) { - RecipeManagers.bottlerManager.addRecipe(CYCLES_FILLING_DEFAULT, FluidContainerRegistry.getFluidForFilledItem(filled), empty, filled); - return findMatchingRecipe(res, empty); + FluidStack fluidStack = FluidContainerRegistry.getFluidForFilledItem(filled); + return findMatchingRecipe(fluidStack, empty); } } @@ -127,14 +133,7 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq * @return true if any recipe has a matching input */ public static boolean isInput(FluidStack res) { - for (int i = 0; i < recipes.size(); i++) { - Recipe recipe = recipes.get(i); - if (recipe.hasInput(res)) - return true; - } - - return FluidRegistry.isFluidRegistered(res.getFluid()); - + return recipeFluids.contains(res.getFluid()); } @Override @@ -149,7 +148,8 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq } @EntityNetData - public StandardTank resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); + public FilteredTank resourceTank; + private final TankManager tankManager; private final InventoryAdapter inventory = new InventoryAdapter(3, "Items"); @@ -162,6 +162,8 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq public MachineBottler() { setHints(Config.hints.get("bottler")); + resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluids); + tankManager = new TankManager(resourceTank); } @Override @@ -189,10 +191,7 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq nbttagcompound.setInteger("FillingTotalTime", fillingTotalTime); nbttagcompound.setBoolean("ProductPending", productPending); - NBTTagCompound NBTresourceSlot = new NBTTagCompound(); - resourceTank.writeToNBT(NBTresourceSlot); - nbttagcompound.setTag("ResourceTank", NBTresourceSlot); - + tankManager.writeTanksToNBT(nbttagcompound); inventory.writeToNBT(nbttagcompound); NBTTagList nbttaglist = new NBTTagList(); @@ -215,9 +214,7 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq fillingTotalTime = nbttagcompound.getInteger("FillingTotalTime"); productPending = nbttagcompound.getBoolean("ProductPending"); - resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); - if (nbttagcompound.hasKey("ResourceTank")) - resourceTank.readFromNBT(nbttagcompound.getCompoundTag("ResourceTank")); + tankManager.readTanksFromNBT(nbttagcompound); inventory.readFromNBT(nbttagcompound); @@ -371,7 +368,7 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq /* SMP GUI */ public void getGUINetworkData(int i, int j) { - + i -= tankManager.maxMessageId() + 1; switch (i) { case 0: fillingTime = j; @@ -383,8 +380,9 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq } public void sendGUINetworkData(Container container, ICrafting iCrafting) { - iCrafting.sendProgressBarUpdate(container, 0, fillingTime); - iCrafting.sendProgressBarUpdate(container, 1, fillingTotalTime); + int i = tankManager.maxMessageId() + 1; + iCrafting.sendProgressBarUpdate(container, i, fillingTime); + iCrafting.sendProgressBarUpdate(container, i + 1, fillingTotalTime); } /* IINVENTORY */ @@ -479,23 +477,37 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq /* ILIQUIDCONTAINER */ @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - - if (!RecipeManager.isInput(resource)) - return 0; - - int used = resourceTank.fill(resource, doFill); - - if (doFill && used > 0) - // TODO: Slow down updates - sendNetworkUpdate(); - - return used; + public TankManager getTankManager() { + return tankManager; } @Override - public StandardTank[] getTanks() { - return new StandardTank[] { resourceTank }; + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + return tankManager.fill(from, resource, doFill); + } + + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + return tankManager.drain(from, resource, doDrain); + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + return tankManager.drain(from, maxDrain, doDrain); + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + return tankManager.canFill(from, fluid); + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return tankManager.canDrain(from, fluid); + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + return tankManager.getTankInfo(from); } // ITRIGGERPROVIDER diff --git a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java index 3cd1a454a..c9d67863e 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java @@ -12,6 +12,7 @@ package forestry.factory.gadgets; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedList; import java.util.Map; @@ -27,9 +28,11 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; import buildcraft.api.gates.ITrigger; import buildcraft.api.power.PowerHandler; @@ -41,6 +44,8 @@ import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.config.ForestryItem; import forestry.core.fluids.tanks.StandardTank; +import forestry.core.fluids.tanks.FilteredTank; +import forestry.core.fluids.TankManager; import forestry.core.gadgets.TileBase; import forestry.core.gadgets.TilePowered; import forestry.core.interfaces.ILiquidTankContainer; @@ -141,6 +146,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL public static class RecipeManager implements ICarpenterManager { public static ArrayList recipes = new ArrayList(); + public static HashSet recipeFluids = new HashSet(); @Override public void addCrating(ItemStack itemStack) { @@ -170,6 +176,8 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL @Override public void addRecipe(int packagingTime, FluidStack liquid, ItemStack box, ItemStack product, Object materials[]) { recipes.add(new Recipe(packagingTime, liquid, box, ShapedRecipeCustom.createShapedRecipe(product, materials))); + if (liquid != null) + recipeFluids.add(liquid.getFluid()); } public static Recipe findMatchingRecipe(FluidStack liquid, ItemStack item, InventoryCrafting inventorycrafting, World world) { @@ -182,12 +190,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL } public static boolean isResourceLiquid(FluidStack liquid) { - for (Recipe recipe : recipes) { - if (recipe.hasLiquid(liquid)) - return true; - } - - return false; + return recipeFluids.contains(liquid.getFluid()); } public static boolean isBox(ItemStack resource) { @@ -214,7 +217,8 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL /* MEMBER */ @EntityNetData - public StandardTank resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); + public FilteredTank resourceTank; + private final TankManager tankManager; private final TileInventoryAdapter craftingInventory; private final TileInventoryAdapter accessibleInventory; public MachineCarpenter.Recipe currentRecipe; @@ -231,8 +235,11 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL public MachineCarpenter() { setHints(Config.hints.get("carpenter")); + resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluids); craftingInventory = new TileInventoryAdapter(this, 10, "CraftItems"); accessibleInventory = (TileInventoryAdapter) new TileInventoryAdapter(this, 30, "Items").configureSided(Defaults.FACINGS, SLOT_BOX, 20); + + tankManager = new TankManager(resourceTank); } @Override @@ -258,10 +265,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL nbttagcompound.setInteger("PackageTime", packageTime); nbttagcompound.setInteger("PackageTotalTime", totalTime); - NBTTagCompound NBTresourceSlot = new NBTTagCompound(); - - resourceTank.writeToNBT(NBTresourceSlot); - nbttagcompound.setTag("ResourceTank", NBTresourceSlot); + tankManager.writeTanksToNBT(nbttagcompound); craftingInventory.writeToNBT(nbttagcompound); accessibleInventory.writeToNBT(nbttagcompound); @@ -287,9 +291,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL packageTime = nbttagcompound.getInteger("PackageTime"); totalTime = nbttagcompound.getInteger("PackageTotalTime"); - resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); - if (nbttagcompound.hasKey("ResourceTank")) - resourceTank.readFromNBT(nbttagcompound.getCompoundTag("ResourceTank")); + tankManager.readTanksFromNBT(nbttagcompound); if (nbttagcompound.hasKey("CraftItems")) craftingInventory.readFromNBT(nbttagcompound); @@ -602,7 +604,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL /* SMP GUI */ public void getGUINetworkData(int i, int j) { - + i -= tankManager.maxMessageId() + 1; switch (i) { case 0: packageTime = j; @@ -614,8 +616,9 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL } public void sendGUINetworkData(Container container, ICrafting iCrafting) { - iCrafting.sendProgressBarUpdate(container, 0, packageTime); - iCrafting.sendProgressBarUpdate(container, 1, totalTime); + int i = tankManager.maxMessageId() + 1; + iCrafting.sendProgressBarUpdate(container, i, packageTime); + iCrafting.sendProgressBarUpdate(container, i + 1, totalTime); } /* ISIDEDINVENTORY */ @@ -670,18 +673,40 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL // ILIQUIDCONTAINER IMPLEMENTATION @Override public int fill(ForgeDirection direction, FluidStack resource, boolean doFill) { - int used = resourceTank.fill(resource, doFill); - - if (doFill && used > 0) - // TODO: Slow down updates - sendNetworkUpdate(); - - return used; + return tankManager.fill(direction, resource, doFill); } @Override - public StandardTank[] getTanks() { - return new StandardTank[] { resourceTank }; + public TankManager getTankManager() { + return tankManager; + } + + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + return tankManager.drain(from, resource, doDrain); + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + return tankManager.drain(from, maxDrain, doDrain); + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + return tankManager.canFill(from, fluid); + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return tankManager.canDrain(from, fluid); + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + return tankManager.getTankInfo(from); + } + + public void resetProductDisplay(InventoryCrafting craftMatrix) { + setCurrentRecipe(RecipeManager.findMatchingRecipe(resourceTank.getFluid(), getBoxStack(), craftMatrix, getWorldObj())); } // ITRIGGERPROVIDER diff --git a/src/main/java/forestry/factory/gadgets/MachineFabricator.java b/src/main/java/forestry/factory/gadgets/MachineFabricator.java index df22a17f7..aeea17996 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFabricator.java +++ b/src/main/java/forestry/factory/gadgets/MachineFabricator.java @@ -23,6 +23,8 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import buildcraft.api.power.PowerHandler; @@ -38,9 +40,12 @@ import forestry.core.interfaces.ICraftingPlan; import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.network.GuiId; import forestry.core.fluids.tanks.StandardTank; +import forestry.core.fluids.TankManager; +import forestry.core.fluids.tanks.FilteredTank; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.ShapedRecipeCustom; import forestry.core.utils.StackUtils; +import net.minecraftforge.fluids.FluidTankInfo; public class MachineFabricator extends TilePowered implements ICrafter, ISpecialInventory, ILiquidTankContainer { @@ -229,14 +234,21 @@ public class MachineFabricator extends TilePowered implements ICrafter, ISpecial public static final short SLOT_INVENTORY_COUNT = 18; /* MEMBER */ + private final TankManager tankManager; + private FilteredTank moltenTank; private final InventoryAdapter inventory = new InventoryAdapter(30, "Items"); - private StandardTank moltenTank = new StandardTank(2 * Defaults.BUCKET_VOLUME); + private final int moltenTankIndex; private int heat = 0; private int guiMeltingPoint = 0; private FluidStack pendingSmelt; public MachineFabricator() { + Fluid liquidGlass = FluidRegistry.getFluid(Defaults.LIQUID_GLASS); + moltenTank = new FilteredTank(2 * Defaults.BUCKET_VOLUME, liquidGlass); + moltenTank.tankMode = StandardTank.TankMode.INTERNAL; + tankManager = new TankManager(moltenTank); + moltenTankIndex = moltenTank.getTankIndex(); } @Override @@ -262,9 +274,7 @@ public class MachineFabricator extends TilePowered implements ICrafter, ISpecial nbttagcompound.setInteger("Heat", heat); // Tank - NBTTagCompound nbtMoltenTank = new NBTTagCompound(); - moltenTank.writeToNBT(nbtMoltenTank); - nbttagcompound.setTag("MoltenTank", nbtMoltenTank); + tankManager.writeTanksToNBT(nbttagcompound); // Pending Smelt if (pendingSmelt != null) { @@ -284,9 +294,7 @@ public class MachineFabricator extends TilePowered implements ICrafter, ISpecial heat = nbttagcompound.getInteger("Heat"); // Tank - moltenTank = new StandardTank(Defaults.BUCKET_VOLUME * 2); - if (nbttagcompound.hasKey("MoltenTank")) - moltenTank.readFromNBT(nbttagcompound.getCompoundTag("MoltenTank")); + tankManager.readTanksFromNBT(nbttagcompound); // Pending Smelt if (nbttagcompound.hasKey("PendingSmelt")) { @@ -303,13 +311,6 @@ public class MachineFabricator extends TilePowered implements ICrafter, ISpecial @Override public void updateServerSide() { - // Remove smelt if we have gone below metling point - if (moltenTank.getFluidAmount() > 0) { - Smelting smelt = RecipeManager.findMatchingSmelting(moltenTank.getFluid()); - if (smelt != null && heat < smelt.meltingPoint) - moltenTank.drain(5, true); - } - // Add pending smelt if (pendingSmelt != null) { @@ -319,16 +320,19 @@ public class MachineFabricator extends TilePowered implements ICrafter, ISpecial if (pendingSmelt.amount <= 0) pendingSmelt = null; // Smelt if necessary and possible - } else if (moltenTank.getFluidAmount() < moltenTank.getCapacity()) - if (inventory.getStackInSlot(SLOT_METAL) != null) { + } else if (moltenTank.getFluidAmount() < moltenTank.getCapacity() && inventory.getStackInSlot(SLOT_METAL) != null) { + Smelting smelt = RecipeManager.findMatchingSmelting(inventory.getStackInSlot(SLOT_METAL)); + if (smelt != null && smelt.meltingPoint <= heat) { - Smelting smelt = RecipeManager.findMatchingSmelting(inventory.getStackInSlot(SLOT_METAL)); - if (smelt != null && smelt.meltingPoint <= heat) { - - this.decrStackSize(SLOT_METAL, 1); - pendingSmelt = smelt.product.copy(); - } + this.decrStackSize(SLOT_METAL, 1); + pendingSmelt = smelt.product.copy(); } + } else if (moltenTank.getFluidAmount() > 0) { + // Remove smelt if we have gone below melting point + Smelting smelt = RecipeManager.findMatchingSmelting(moltenTank.getFluid()); + if (smelt != null && heat < smelt.meltingPoint) + moltenTank.drain(5, true); + } this.dissipateHeat(); } @@ -475,19 +479,18 @@ public class MachineFabricator extends TilePowered implements ICrafter, ISpecial /* SMP */ public void getGUINetworkData(int i, int j) { - switch (i) { - case 0: + int messageId = tankManager.maxMessageId() + 1; + + if (i == messageId) heat = j; - break; - case 1: + else if (i == messageId + 1) guiMeltingPoint = j; - break; - } } public void sendGUINetworkData(Container container, ICrafting iCrafting) { - iCrafting.sendProgressBarUpdate(container, 0, heat); - iCrafting.sendProgressBarUpdate(container, 1, getMeltingPoint()); + int messageId = tankManager.maxMessageId() + 1; + iCrafting.sendProgressBarUpdate(container, messageId, heat); + iCrafting.sendProgressBarUpdate(container, messageId + 1, getMeltingPoint()); } // / ISPECIALINVENTORY @@ -579,7 +582,38 @@ public class MachineFabricator extends TilePowered implements ICrafter, ISpecial /* ILIQUIDCONTAINER */ @Override - public StandardTank[] getTanks() { - return new StandardTank[] { moltenTank }; + public TankManager getTankManager() { + return tankManager; } + + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + return tankManager.fill(from, resource, doFill); + } + + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + return tankManager.drain(from, resource, doDrain); + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + return tankManager.drain(from, maxDrain, doDrain); + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + return tankManager.canFill(from, fluid); + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return tankManager.canDrain(from, fluid); + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + return tankManager.getTankInfo(from); + } + } diff --git a/src/main/java/forestry/factory/gadgets/MachineFermenter.java b/src/main/java/forestry/factory/gadgets/MachineFermenter.java index 12b5d5e24..47bf39e6c 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFermenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineFermenter.java @@ -12,9 +12,11 @@ package forestry.factory.gadgets; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedList; import java.util.Map; +import forestry.core.fluids.tanks.FilteredTank; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; @@ -23,6 +25,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidStack; @@ -44,10 +47,12 @@ import forestry.core.network.GuiId; import forestry.core.triggers.ForestryTrigger; import forestry.core.utils.EnumTankLevel; import forestry.core.fluids.tanks.StandardTank; +import forestry.core.fluids.TankManager; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.LiquidHelper; import forestry.core.utils.StackUtils; import forestry.core.utils.Utils; +import net.minecraftforge.fluids.FluidTankInfo; public class MachineFermenter extends TilePowered implements ISidedInventory, ILiquidTankContainer { @@ -117,10 +122,16 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL public static class RecipeManager implements IFermenterManager { public static ArrayList recipes = new ArrayList(); + public static HashSet recipeFluidInputs = new HashSet(); + public static HashSet recipeFluidOutputs = new HashSet(); @Override public void addRecipe(ItemStack resource, int fermentationValue, float modifier, FluidStack output, FluidStack liquid) { recipes.add(new Recipe(resource, fermentationValue, modifier, output, liquid)); + if (liquid != null) + recipeFluidInputs.add(liquid.getFluid()); + if (output != null) + recipeFluidOutputs.add(output.getFluid()); } @Override @@ -151,21 +162,11 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL } public static boolean isLiquidResource(FluidStack liquid) { - for (int i = 0; i < recipes.size(); i++) { - Recipe recipe = recipes.get(i); - if (recipe.liquid.isFluidEqual(liquid)) - return true; - } - return false; + return recipeFluidInputs.contains(liquid.getFluid()); } public static boolean isLiquidProduct(FluidStack liquid) { - for (int i = 0; i < recipes.size(); i++) { - Recipe recipe = recipes.get(i); - if (recipe.output.isFluidEqual(liquid)) - return true; - } - return false; + return recipeFluidOutputs.contains(liquid.getFluid()); } @Override @@ -180,9 +181,12 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL } } @EntityNetData - public StandardTank resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); + public FilteredTank resourceTank; @EntityNetData - public StandardTank productTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); + public FilteredTank productTank; + + private final TankManager tankManager; + private final InventoryAdapter inventory = new InventoryAdapter(5, "Items"); private Recipe currentRecipe; private float currentResourceModifier; @@ -194,6 +198,11 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL public MachineFermenter() { setHints(Config.hints.get("fermenter")); + resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluidInputs); + resourceTank.tankMode = StandardTank.TankMode.INPUT; + productTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluidOutputs); + productTank.tankMode = StandardTank.TankMode.OUTPUT; + tankManager = new TankManager(resourceTank, productTank); } @Override @@ -221,15 +230,7 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL nbttagcompound.setInteger("FuelTotalTime", fuelTotalTime); nbttagcompound.setInteger("FuelCurrentFerment", fuelCurrentFerment); - NBTTagCompound NBTresourceSlot = new NBTTagCompound(); - NBTTagCompound NBTproductSlot = new NBTTagCompound(); - - resourceTank.writeToNBT(NBTresourceSlot); - productTank.writeToNBT(NBTproductSlot); - - nbttagcompound.setTag("ResourceTank", NBTresourceSlot); - nbttagcompound.setTag("ProductTank", NBTproductSlot); - + tankManager.writeTanksToNBT(nbttagcompound); inventory.writeToNBT(nbttagcompound); } @@ -244,13 +245,7 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL fuelTotalTime = nbttagcompound.getInteger("FuelTotalTime"); fuelCurrentFerment = nbttagcompound.getInteger("FuelCurrentFerment"); - resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); - productTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); - if (nbttagcompound.hasKey("ResourceTank")) { - resourceTank.readFromNBT(nbttagcompound.getCompoundTag("ResourceTank")); - productTank.readFromNBT(nbttagcompound.getCompoundTag("ProductTank")); - } - + tankManager.readTanksFromNBT(nbttagcompound); inventory.readFromNBT(nbttagcompound); } @@ -511,28 +506,25 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL /* SMP GUI */ public void getGUINetworkData(int i, int j) { + int firstMessageId = tankManager.maxMessageId() + 1; - switch (i) { - case 0: + if (i == firstMessageId) fuelBurnTime = j; - break; - case 1: + else if (i == firstMessageId + 1) fuelTotalTime = j; - break; - case 2: + else if (i == firstMessageId + 2) fermentationTime = j; - break; - case 3: + else if (i == firstMessageId + 3) fermentationTotalTime = j; - break; - } } public void sendGUINetworkData(Container container, ICrafting iCrafting) { - iCrafting.sendProgressBarUpdate(container, 0, fuelBurnTime); - iCrafting.sendProgressBarUpdate(container, 1, fuelTotalTime); - iCrafting.sendProgressBarUpdate(container, 2, fermentationTime); - iCrafting.sendProgressBarUpdate(container, 3, fermentationTotalTime); + int firstMessageId = tankManager.maxMessageId() + 1; + + iCrafting.sendProgressBarUpdate(container, firstMessageId, fuelBurnTime); + iCrafting.sendProgressBarUpdate(container, firstMessageId + 1, fuelTotalTime); + iCrafting.sendProgressBarUpdate(container, firstMessageId + 2, fermentationTime); + iCrafting.sendProgressBarUpdate(container, firstMessageId + 3, fermentationTotalTime); } /* INVENTORY */ @@ -663,20 +655,15 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL return super.getAccessibleSlotsFromSide(side); } - // ILIQUIDCONTAINER IMPLEMENTATION + /* ILiquidTankContainer */ @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + return resourceTank.fill(resource, doFill); + } - if (!RecipeManager.isLiquidResource(resource)) - return 0; - - int used = resourceTank.fill(resource, doFill); - - if (doFill && used > 0) - // updateNetworkTime.markTime(worldObj); - sendNetworkUpdate(); - - return used; + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + return tankManager.drain(from, resource, doDrain); } @Override @@ -685,8 +672,22 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL } @Override - public StandardTank[] getTanks() { - return new StandardTank[] { resourceTank, productTank }; + public boolean canFill(ForgeDirection from, Fluid fluid) { + return tankManager.canFill(from, fluid); + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return tankManager.canDrain(from, fluid); + } + + @Override + public TankManager getTankManager() { + return tankManager; + } + + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + return tankManager.getTankInfo(from); } // ITRIGGERPROVIDER diff --git a/src/main/java/forestry/factory/gadgets/MachineMoistener.java b/src/main/java/forestry/factory/gadgets/MachineMoistener.java index 2d557ceed..dcb0bff73 100755 --- a/src/main/java/forestry/factory/gadgets/MachineMoistener.java +++ b/src/main/java/forestry/factory/gadgets/MachineMoistener.java @@ -23,7 +23,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; +import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import buildcraft.api.gates.ITrigger; @@ -43,11 +45,13 @@ import forestry.core.network.EntityNetData; import forestry.core.network.GuiId; import forestry.core.triggers.ForestryTrigger; import forestry.core.utils.EnumTankLevel; -import forestry.core.fluids.tanks.StandardTank; +import forestry.core.fluids.tanks.FilteredTank; +import forestry.core.fluids.TankManager; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.LiquidHelper; import forestry.core.utils.StackUtils; import forestry.core.utils.Utils; +import net.minecraftforge.fluids.FluidTankInfo; public class MachineMoistener extends TilePowered implements ISpecialInventory, ISidedInventory, ILiquidTankContainer { @@ -127,7 +131,8 @@ public class MachineMoistener extends TilePowered implements ISpecialInventory, } @EntityNetData - public StandardTank resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); + public FilteredTank resourceTank; + private final TankManager tankManager; private final InventoryAdapter inventory = new InventoryAdapter(12, "Items"); //private ItemStack[] inventoryStacks = new ItemStack[12]; public MachineMoistener.Recipe currentRecipe; @@ -141,6 +146,8 @@ public class MachineMoistener extends TilePowered implements ISpecialInventory, public MachineMoistener() { setHints(Config.hints.get("moistener")); + resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, FluidRegistry.WATER); + tankManager = new TankManager(resourceTank); } @Override @@ -162,11 +169,7 @@ public class MachineMoistener extends TilePowered implements ISpecialInventory, nbttagcompound.setInteger("TotalTime", totalTime); nbttagcompound.setInteger("ProductionTime", productionTime); - NBTTagCompound NBTresourceSlot = new NBTTagCompound(); - - resourceTank.writeToNBT(NBTresourceSlot); - nbttagcompound.setTag("ResourceTank", NBTresourceSlot); - + tankManager.writeTanksToNBT(nbttagcompound); inventory.writeToNBT(nbttagcompound); // Write pending product @@ -190,10 +193,7 @@ public class MachineMoistener extends TilePowered implements ISpecialInventory, totalTime = nbttagcompound.getInteger("TotalTime"); productionTime = nbttagcompound.getInteger("ProductionTime"); - resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); - if (nbttagcompound.hasKey("ResourceTank")) - resourceTank.readFromNBT(nbttagcompound.getCompoundTag("ResourceTank")); - + tankManager.readTanksFromNBT(nbttagcompound); inventory.readFromNBT(nbttagcompound); // Load pending product @@ -215,7 +215,7 @@ public class MachineMoistener extends TilePowered implements ISpecialInventory, // Check if we have suitable water container waiting in the item slot if (inventory.getStackInSlot(SLOT_PRODUCT) != null) { FluidContainerData container = LiquidHelper.getLiquidContainer(inventory.getStackInSlot(SLOT_PRODUCT)); - if (container != null && container.fluid.isFluidEqual(STACK_WATER)) { + if (container != null && resourceTank.accepts(container.fluid.getFluid())) { inventory.setInventorySlotContents(SLOT_PRODUCT, StackUtils.replenishByContainer(this, inventory.getStackInSlot(SLOT_PRODUCT), container, resourceTank)); if (inventory.getStackInSlot(SLOT_PRODUCT).stackSize <= 0) @@ -633,7 +633,7 @@ public class MachineMoistener extends TilePowered implements ISpecialInventory, public int addItem(ItemStack stack, boolean doAdd, ForgeDirection from) { FluidContainerData container = LiquidHelper.getLiquidContainer(stack); - if (container != null && container.fluid.isFluidEqual(STACK_WATER)) { + if (container != null && resourceTank.accepts(container.fluid.getFluid())) { return inventory.addStack(stack, SLOT_PRODUCT, 1, false, doAdd); } @@ -675,24 +675,44 @@ public class MachineMoistener extends TilePowered implements ISpecialInventory, return StackUtils.EMPTY_STACK_ARRAY; } - /* ILIQUIDCONTAINER */ + /* ILiquidTankContainer */ @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - int used = resourceTank.fill(resource, doFill); - - if (doFill && used > 0) - sendNetworkUpdate(); - - return used; + return tankManager.fill(from, resource, doFill); } @Override - public StandardTank[] getTanks() { - return new StandardTank[] { resourceTank }; + public TankManager getTankManager() { + return tankManager; + } + + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + return tankManager.drain(from, resource, doDrain); + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + return tankManager.drain(from, maxDrain, doDrain); + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + return tankManager.canFill(from, fluid); + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return tankManager.canDrain(from, fluid); + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + return tankManager.getTankInfo(from); } /* SMP GUI */ public void getGUINetworkData(int i, int j) { + i -= tankManager.maxMessageId() + 1; switch (i) { case 0: @@ -711,10 +731,11 @@ public class MachineMoistener extends TilePowered implements ISpecialInventory, } public void sendGUINetworkData(Container container, ICrafting iCrafting) { - iCrafting.sendProgressBarUpdate(container, 0, burnTime); - iCrafting.sendProgressBarUpdate(container, 1, totalTime); - iCrafting.sendProgressBarUpdate(container, 2, productionTime); - iCrafting.sendProgressBarUpdate(container, 3, timePerItem); + int i = tankManager.maxMessageId() + 1; + iCrafting.sendProgressBarUpdate(container, i, burnTime); + iCrafting.sendProgressBarUpdate(container, i + 1, totalTime); + iCrafting.sendProgressBarUpdate(container, i + 2, productionTime); + iCrafting.sendProgressBarUpdate(container, i + 3, timePerItem); } // ITRIGGERPROVIDER diff --git a/src/main/java/forestry/factory/gadgets/MachineRaintank.java b/src/main/java/forestry/factory/gadgets/MachineRaintank.java index 34680308f..c5a2b621d 100755 --- a/src/main/java/forestry/factory/gadgets/MachineRaintank.java +++ b/src/main/java/forestry/factory/gadgets/MachineRaintank.java @@ -21,6 +21,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import buildcraft.api.gates.ITrigger; @@ -35,11 +37,13 @@ import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.network.GuiId; import forestry.core.triggers.ForestryTrigger; import forestry.core.utils.Fluids; -import forestry.core.fluids.tanks.StandardTank; +import forestry.core.fluids.TankManager; +import forestry.core.fluids.tanks.FilteredTank; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.LiquidHelper; import forestry.core.utils.StackUtils; import forestry.core.utils.Utils; +import net.minecraftforge.fluids.FluidTankInfo; public class MachineRaintank extends TileBase implements ISidedInventory, ILiquidTankContainer { @@ -49,7 +53,8 @@ public class MachineRaintank extends TileBase implements ISidedInventory, ILiqui private static final FluidStack STACK_WATER = LiquidHelper.getLiquid(Defaults.LIQUID_WATER, Defaults.RAINTANK_AMOUNT_PER_UPDATE); /* MEMBER */ - public StandardTank resourceTank = new StandardTank(Defaults.RAINTANK_TANK_CAPACITY); + public FilteredTank resourceTank; + private final TankManager tankManager; private final InventoryAdapter inventory = new InventoryAdapter(3, "Items"); private boolean isValidBiome = true; private int fillingTime; @@ -58,6 +63,9 @@ public class MachineRaintank extends TileBase implements ISidedInventory, ILiqui public MachineRaintank() { setHints(Config.hints.get("raintank")); + resourceTank = new FilteredTank(Defaults.RAINTANK_TANK_CAPACITY, FluidRegistry.WATER); + tankManager = new TankManager(resourceTank); + // Raintanks in desert and snow biomes are useless if (worldObj != null) { BiomeGenBase biome = Utils.getBiomeAt(worldObj, xCoord, zCoord); @@ -84,10 +92,7 @@ public class MachineRaintank extends TileBase implements ISidedInventory, ILiqui nbttagcompound.setBoolean("IsValidBiome", isValidBiome); - NBTTagCompound NBTresourceSlot = new NBTTagCompound(); - resourceTank.writeToNBT(NBTresourceSlot); - nbttagcompound.setTag("ResourceTank", NBTresourceSlot); - + tankManager.writeTanksToNBT(nbttagcompound); inventory.writeToNBT(nbttagcompound); } @@ -97,10 +102,7 @@ public class MachineRaintank extends TileBase implements ISidedInventory, ILiqui isValidBiome = nbttagcompound.getBoolean("IsValidBiome"); - resourceTank = new StandardTank(Defaults.RAINTANK_TANK_CAPACITY); - if (nbttagcompound.hasKey("ResourceTank")) - resourceTank.readFromNBT(nbttagcompound.getCompoundTag("ResourceTank")); - + tankManager.readTanksFromNBT(nbttagcompound); inventory.readFromNBT(nbttagcompound); } @@ -267,6 +269,7 @@ public class MachineRaintank extends TileBase implements ISidedInventory, ILiqui /* SMP GUI */ public void getGUINetworkData(int i, int j) { + i -= tankManager.maxMessageId() + 1; switch (i) { case 0: fillingTime = j; @@ -275,33 +278,43 @@ public class MachineRaintank extends TileBase implements ISidedInventory, ILiqui } public void sendGUINetworkData(Container container, ICrafting iCrafting) { - iCrafting.sendProgressBarUpdate(container, 0, fillingTime); + int i = tankManager.maxMessageId() + 1; + iCrafting.sendProgressBarUpdate(container, i, fillingTime); } // / ILIQUIDCONTAINER IMPLEMENTATION @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - // We only accept water - if (!resource.isFluidEqual(STACK_WATER)) - return 0; - - int used = resourceTank.fill(resource, doFill); - - if (doFill && used > 0) - // updateNetworkTime.markTime(worldObj); - sendNetworkUpdate(); - - return used; + return tankManager.fill(from, resource, doFill); } @Override - public FluidStack drain(ForgeDirection from, int quantityMax, boolean doEmpty) { - return resourceTank.drain(quantityMax, doEmpty); + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + return tankManager.drain(from, resource, doDrain); } @Override - public StandardTank[] getTanks() { - return new StandardTank[] { resourceTank }; + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + return tankManager.drain(from, maxDrain, doDrain); + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + return tankManager.canFill(from, fluid); + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return tankManager.canDrain(from, fluid); + } + + @Override + public TankManager getTankManager() { + return tankManager; + } + + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + return tankManager.getTankInfo(from); } /* ITRIGGERPROVIDER */ diff --git a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java index 40290943f..89c3f3214 100755 --- a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java +++ b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java @@ -12,6 +12,7 @@ package forestry.factory.gadgets; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedList; import java.util.Map; import java.util.Stack; @@ -25,6 +26,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidStack; @@ -45,10 +47,13 @@ import forestry.core.network.GuiId; import forestry.core.triggers.ForestryTrigger; import forestry.core.utils.EnumTankLevel; import forestry.core.fluids.tanks.StandardTank; +import forestry.core.fluids.tanks.FilteredTank; +import forestry.core.fluids.TankManager; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.LiquidHelper; import forestry.core.utils.StackUtils; import forestry.core.utils.Utils; +import net.minecraftforge.fluids.FluidTankInfo; public class MachineSqueezer extends TilePowered implements ISpecialInventory, ISidedInventory, ILiquidTankContainer { @@ -82,10 +87,13 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I public static class RecipeManager implements ISqueezerManager { public static ArrayList recipes = new ArrayList(); + public static HashSet recipeFluids = new HashSet(); @Override public void addRecipe(int timePerItem, ItemStack[] resources, FluidStack liquid, ItemStack remnants, int chance) { recipes.add(new MachineSqueezer.Recipe(timePerItem, resources, liquid, remnants, chance)); + if (liquid != null) + recipeFluids.add(liquid.getFluid()); } @Override @@ -115,8 +123,9 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I } /* MEMBER */ + private final TankManager tankManager; @EntityNetData - public StandardTank productTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); + public FilteredTank productTank; private final InventoryAdapter inventory = new InventoryAdapter(12, "Items"); private Recipe currentRecipe; @@ -128,6 +137,9 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I public MachineSqueezer() { setHints(Config.hints.get("squeezer")); + productTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluids); + productTank.tankMode = StandardTank.TankMode.OUTPUT; + tankManager = new TankManager(productTank); } @Override @@ -180,10 +192,7 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I } nbttagcompound.setTag("PendingLiquids", nbttaglist); - // ProductTank - NBTTagCompound NBTproductSlot = new NBTTagCompound(); - productTank.writeToNBT(NBTproductSlot); - nbttagcompound.setTag("ProductTank", NBTproductSlot); + tankManager.writeTanksToNBT(nbttagcompound); } @Override @@ -210,10 +219,7 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I pendingLiquids.add(FluidStack.loadFluidStackFromNBT(nbttagcompound1)); } - // Product tank - productTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); - if (nbttagcompound.hasKey("ProductTank")) - productTank.readFromNBT(nbttagcompound.getCompoundTag("ProductTank")); + tankManager.readTanksFromNBT(nbttagcompound); checkRecipe(); } @@ -377,6 +383,7 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I /* SMP GUI */ public void getGUINetworkData(int i, int j) { + i -= tankManager.maxMessageId() + 1; switch (i) { case 0: productionTime = j; @@ -388,8 +395,9 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I } public void sendGUINetworkData(Container container, ICrafting iCrafting) { - iCrafting.sendProgressBarUpdate(container, 0, productionTime); - iCrafting.sendProgressBarUpdate(container, 1, timePerItem); + int i = tankManager.maxMessageId() + 1; + iCrafting.sendProgressBarUpdate(container, i, productionTime); + iCrafting.sendProgressBarUpdate(container, i + 1, timePerItem); } /* IINVENTORY */ @@ -477,7 +485,10 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I } if(slotIndex >= SLOT_RESOURCE_1 && slotIndex < SLOT_RESOURCE_1 + SLOTS_RESOURCE_COUNT) { - return !LiquidHelper.isEmptyContainer(itemstack); + if (LiquidHelper.isEmptyContainer(itemstack)) + return false; + FluidStack fluid = LiquidHelper.getFluidStackInContainer(itemstack); + return productTank.accepts(fluid.getFluid()); } return false; @@ -521,13 +532,37 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I /* ILIQUIDCONTAINER IMPLEMENTATION */ @Override - public FluidStack drain(ForgeDirection from, int quantityMax, boolean doEmpty) { - return productTank.drain(quantityMax, doEmpty); + public TankManager getTankManager() { + return tankManager; } @Override - public StandardTank[] getTanks() { - return new StandardTank[] { productTank }; + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + return tankManager.fill(from, resource, doFill); + } + + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + return tankManager.drain(from, resource, doDrain); + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + return tankManager.drain(from, maxDrain, doDrain); + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + return tankManager.canFill(from, fluid); + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return tankManager.canDrain(from, fluid); + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + return tankManager.getTankInfo(from); } /* ITRIGGERPROVIDER */ diff --git a/src/main/java/forestry/factory/gadgets/MachineStill.java b/src/main/java/forestry/factory/gadgets/MachineStill.java index 031ed64ba..b4fc6214d 100755 --- a/src/main/java/forestry/factory/gadgets/MachineStill.java +++ b/src/main/java/forestry/factory/gadgets/MachineStill.java @@ -12,6 +12,7 @@ package forestry.factory.gadgets; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedList; import java.util.Map; @@ -23,6 +24,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidStack; @@ -43,10 +45,13 @@ import forestry.core.network.GuiId; import forestry.core.triggers.ForestryTrigger; import forestry.core.utils.EnumTankLevel; import forestry.core.fluids.tanks.StandardTank; +import forestry.core.fluids.tanks.FilteredTank; +import forestry.core.fluids.TankManager; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.LiquidHelper; import forestry.core.utils.StackUtils; import forestry.core.utils.Utils; +import net.minecraftforge.fluids.FluidTankInfo; public class MachineStill extends TilePowered implements ISpecialInventory, ISidedInventory, ILiquidTankContainer { @@ -84,10 +89,16 @@ public class MachineStill extends TilePowered implements ISpecialInventory, ISid public static class RecipeManager implements IStillManager { public static ArrayList recipes = new ArrayList(); + public static HashSet recipeFluidInputs = new HashSet(); + public static HashSet recipeFluidOutputs = new HashSet(); @Override public void addRecipe(int timePerUnit, FluidStack input, FluidStack output) { recipes.add(new MachineStill.Recipe(timePerUnit, input, output)); + if (input != null) + recipeFluidInputs.add(input.getFluid()); + if (output != null) + recipeFluidOutputs.add(output.getFluid()); } public static Recipe findMatchingRecipe(FluidStack item) { @@ -100,7 +111,7 @@ public class MachineStill extends TilePowered implements ISpecialInventory, ISid } public static boolean isInput(FluidStack res) { - return findMatchingRecipe(res) != null; + return recipeFluidInputs.contains(res.getFluid()); } @Override @@ -116,9 +127,10 @@ public class MachineStill extends TilePowered implements ISpecialInventory, ISid /* MEMBER */ @EntityNetData - public StandardTank resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); + public FilteredTank resourceTank; @EntityNetData - public StandardTank productTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); + public FilteredTank productTank; + private final TankManager tankManager; private final InventoryAdapter inventory = new InventoryAdapter(3, "Items"); @@ -129,6 +141,11 @@ public class MachineStill extends TilePowered implements ISpecialInventory, ISid public MachineStill() { setHints(Config.hints.get("still")); + resourceTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluidInputs); + resourceTank.tankMode = StandardTank.TankMode.INPUT; + productTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, RecipeManager.recipeFluidOutputs); + productTank.tankMode = StandardTank.TankMode.OUTPUT; + tankManager = new TankManager(resourceTank, productTank); } @Override @@ -153,15 +170,7 @@ public class MachineStill extends TilePowered implements ISpecialInventory, ISid nbttagcompound.setInteger("DistillationTime", distillationTime); nbttagcompound.setInteger("DistillationTotalTime", distillationTotalTime); - NBTTagCompound NBTresourceSlot = new NBTTagCompound(); - NBTTagCompound NBTproductSlot = new NBTTagCompound(); - - resourceTank.writeToNBT(NBTresourceSlot); - productTank.writeToNBT(NBTproductSlot); - - nbttagcompound.setTag("ResourceTank", NBTresourceSlot); - nbttagcompound.setTag("ProductTank", NBTproductSlot); - + tankManager.writeTanksToNBT(nbttagcompound); inventory.writeToNBT(nbttagcompound); } @@ -172,13 +181,7 @@ public class MachineStill extends TilePowered implements ISpecialInventory, ISid distillationTime = nbttagcompound.getInteger("DistillationTime"); distillationTotalTime = nbttagcompound.getInteger("DistillationTotalTime"); - resourceTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); - productTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); - if (nbttagcompound.hasKey("ResourceTank")) { - resourceTank.readFromNBT(nbttagcompound.getCompoundTag("ResourceTank")); - productTank.readFromNBT(nbttagcompound.getCompoundTag("ProductTank")); - } - + tankManager.readTanksFromNBT(nbttagcompound); inventory.readFromNBT(nbttagcompound); checkRecipe(); @@ -191,7 +194,7 @@ public class MachineStill extends TilePowered implements ISpecialInventory, ISid if (inventory.getStackInSlot(SLOT_CAN) != null) { FluidContainerData container = LiquidHelper.getLiquidContainer(inventory.getStackInSlot(SLOT_CAN)); - if (container != null && RecipeManager.isInput(container.fluid)) { + if (container != null && resourceTank.accepts(container.fluid.getFluid())) { inventory.setInventorySlotContents(SLOT_CAN, StackUtils.replenishByContainer(this, inventory.getStackInSlot(SLOT_CAN), container, resourceTank)); if (inventory.getStackInSlot(SLOT_CAN).stackSize <= 0) @@ -319,7 +322,7 @@ public class MachineStill extends TilePowered implements ISpecialInventory, ISid /* SMP GUI */ public void getGUINetworkData(int i, int j) { - + i -= tankManager.maxMessageId() + 1; switch (i) { case 0: distillationTime = j; @@ -331,8 +334,9 @@ public class MachineStill extends TilePowered implements ISpecialInventory, ISid } public void sendGUINetworkData(Container container, ICrafting iCrafting) { - iCrafting.sendProgressBarUpdate(container, 0, distillationTime); - iCrafting.sendProgressBarUpdate(container, 1, distillationTotalTime); + int i = tankManager.maxMessageId() + 1; + iCrafting.sendProgressBarUpdate(container, i, distillationTime); + iCrafting.sendProgressBarUpdate(container, i + 1, distillationTotalTime); } /* ISPECIALINVENTORY */ @@ -341,7 +345,7 @@ public class MachineStill extends TilePowered implements ISpecialInventory, ISid int inventorySlot; FluidContainerData container = LiquidHelper.getLiquidContainer(stack); - if (container != null && RecipeManager.isInput(container.fluid)) + if (container != null && resourceTank.accepts(container.fluid.getFluid())) inventorySlot = SLOT_CAN; else if (LiquidHelper.isEmptyContainer(stack)) inventorySlot = SLOT_RESOURCE; @@ -456,35 +460,45 @@ public class MachineStill extends TilePowered implements ISpecialInventory, ISid if(slotIndex == SLOT_CAN) { FluidContainerData container = LiquidHelper.getLiquidContainer(itemstack); - return container != null && RecipeManager.isInput(container.fluid); + return container != null && resourceTank.accepts(container.fluid.getFluid()); } return false; } - /* ILIQUIDCONTAINER */ + /* ILiquidTankContainer */ @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + return tankManager.fill(from, resource, doFill); + } - if (!MachineStill.RecipeManager.isInput(resource)) - return 0; - - int used = resourceTank.fill(resource, doFill); - - if (doFill && used > 0) - sendNetworkUpdate(); - - return used; + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + return tankManager.drain(from, resource, doDrain); } @Override public FluidStack drain(ForgeDirection from, int quantityMax, boolean doEmpty) { - return productTank.drain(quantityMax, doEmpty); + return tankManager.drain(from, quantityMax, doEmpty); } @Override - public StandardTank[] getTanks() { - return new StandardTank[] { resourceTank, productTank }; + public boolean canFill(ForgeDirection from, Fluid fluid) { + return tankManager.canFill(from, fluid); + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return tankManager.canDrain(from, fluid); + } + + @Override + public TankManager getTankManager() { + return tankManager; + } + + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + return tankManager.getTankInfo(from); } /* ITRIGGERPROVIDER */ diff --git a/src/main/java/forestry/factory/gui/ContainerBottler.java b/src/main/java/forestry/factory/gui/ContainerBottler.java index 228968e54..3a891e8a7 100755 --- a/src/main/java/forestry/factory/gui/ContainerBottler.java +++ b/src/main/java/forestry/factory/gui/ContainerBottler.java @@ -42,19 +42,6 @@ public class ContainerBottler extends ContainerLiquidTanks { } - // @Override client side only - public void updateProgressBar(int i, int j) { - tile.getGUINetworkData(i, j); - } - - @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); - - for (int i = 0; i < crafters.size(); i++) - tile.sendGUINetworkData(this, (ICrafting) crafters.get(i)); - } - @Override public boolean canInteractWith(EntityPlayer entityplayer) { return tile.isUseableByPlayer(entityplayer); diff --git a/src/main/java/forestry/factory/gui/ContainerCarpenter.java b/src/main/java/forestry/factory/gui/ContainerCarpenter.java index ccbf2d96d..acd15dd2a 100755 --- a/src/main/java/forestry/factory/gui/ContainerCarpenter.java +++ b/src/main/java/forestry/factory/gui/ContainerCarpenter.java @@ -12,7 +12,6 @@ package forestry.factory.gui; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCraftResult; import net.minecraft.inventory.Slot; @@ -110,19 +109,9 @@ public class ContainerCarpenter extends ContainerLiquidTanks implements IContain } } - @Override - public void updateProgressBar(int i, int j) { - machine.getGUINetworkData(i, j); - } - @Override public void detectAndSendChanges() { super.detectAndSendChanges(); - - for (int i = 0; i < crafters.size(); i++) { - machine.sendGUINetworkData(this, (ICrafting) crafters.get(i)); - } - updateProductSlot(); } @@ -150,8 +139,7 @@ public class ContainerCarpenter extends ContainerLiquidTanks implements IContain private void resetProductDisplay() { if (machine != null) { - machine.setCurrentRecipe(MachineCarpenter.RecipeManager.findMatchingRecipe(machine.resourceTank.getFluid(), machine.getBoxStack(), craftMatrix, - machine.getWorldObj())); + machine.resetProductDisplay(craftMatrix); updateProductSlot(); } } diff --git a/src/main/java/forestry/factory/gui/ContainerFabricator.java b/src/main/java/forestry/factory/gui/ContainerFabricator.java index 1ff1e592d..1ed6cef6e 100755 --- a/src/main/java/forestry/factory/gui/ContainerFabricator.java +++ b/src/main/java/forestry/factory/gui/ContainerFabricator.java @@ -55,17 +55,4 @@ public class ContainerFabricator extends ContainerLiquidTanks { } - // @Override client side only - public void updateProgressBar(int i, int j) { - tile.getGUINetworkData(i, j); - } - - @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); - - for (int i = 0; i < crafters.size(); i++) - tile.sendGUINetworkData(this, (ICrafting) crafters.get(i)); - } - } diff --git a/src/main/java/forestry/factory/gui/ContainerFermenter.java b/src/main/java/forestry/factory/gui/ContainerFermenter.java index d28bd1774..e7aa3acb3 100755 --- a/src/main/java/forestry/factory/gui/ContainerFermenter.java +++ b/src/main/java/forestry/factory/gui/ContainerFermenter.java @@ -43,19 +43,6 @@ public class ContainerFermenter extends ContainerLiquidTanks { } - @Override - public void updateProgressBar(int i, int j) { - fermenter.getGUINetworkData(i, j); - } - - @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); - - for (int i = 0; i < crafters.size(); i++) - fermenter.sendGUINetworkData(this, (ICrafting) crafters.get(i)); - } - @Override public boolean canInteractWith(EntityPlayer entityplayer) { return fermenter.isUseableByPlayer(entityplayer); diff --git a/src/main/java/forestry/factory/gui/ContainerMoistener.java b/src/main/java/forestry/factory/gui/ContainerMoistener.java index 9e4363671..d51d771e8 100755 --- a/src/main/java/forestry/factory/gui/ContainerMoistener.java +++ b/src/main/java/forestry/factory/gui/ContainerMoistener.java @@ -57,19 +57,6 @@ public class ContainerMoistener extends ContainerLiquidTanks implements IContain } - // @Override client side only - public void updateProgressBar(int i, int j) { - tile.getGUINetworkData(i, j); - } - - @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); - - for (int i = 0; i < crafters.size(); i++) - tile.sendGUINetworkData(this, (ICrafting) crafters.get(i)); - } - @Override public void onCraftMatrixChanged(IInventory iinventory, int slot) { inventory.setInventorySlotContents(slot, iinventory.getStackInSlot(slot)); diff --git a/src/main/java/forestry/factory/gui/ContainerRaintank.java b/src/main/java/forestry/factory/gui/ContainerRaintank.java index 253014dda..ad0b0afa6 100755 --- a/src/main/java/forestry/factory/gui/ContainerRaintank.java +++ b/src/main/java/forestry/factory/gui/ContainerRaintank.java @@ -40,19 +40,6 @@ public class ContainerRaintank extends ContainerLiquidTanks { } - // @Override client side only - public void updateProgressBar(int i, int j) { - tile.getGUINetworkData(i, j); - } - - @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); - - for (int i = 0; i < crafters.size(); i++) - tile.sendGUINetworkData(this, (ICrafting) crafters.get(i)); - } - @Override public boolean canInteractWith(EntityPlayer entityplayer) { return tile.isUseableByPlayer(entityplayer); diff --git a/src/main/java/forestry/factory/gui/ContainerSqueezer.java b/src/main/java/forestry/factory/gui/ContainerSqueezer.java index 246ae162f..7c236ca59 100755 --- a/src/main/java/forestry/factory/gui/ContainerSqueezer.java +++ b/src/main/java/forestry/factory/gui/ContainerSqueezer.java @@ -50,17 +50,4 @@ public class ContainerSqueezer extends ContainerLiquidTanks { addSlot(new Slot(player, j1, 8 + j1 * 18, 142)); } - @Override - public void updateProgressBar(int i, int j) { - tile.getGUINetworkData(i, j); - } - - @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); - - for (int i = 0; i < crafters.size(); i++) - tile.sendGUINetworkData(this, (ICrafting) crafters.get(i)); - } - } diff --git a/src/main/java/forestry/factory/gui/ContainerStill.java b/src/main/java/forestry/factory/gui/ContainerStill.java index fe7ce5a7d..fa384ee0f 100755 --- a/src/main/java/forestry/factory/gui/ContainerStill.java +++ b/src/main/java/forestry/factory/gui/ContainerStill.java @@ -39,19 +39,6 @@ public class ContainerStill extends ContainerLiquidTanks { } - // @Override client side only - public void updateProgressBar(int i, int j) { - processor.getGUINetworkData(i, j); - } - - @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); - - for (int i = 0; i < crafters.size(); i++) - processor.sendGUINetworkData(this, (ICrafting) crafters.get(i)); - } - @Override public boolean canInteractWith(EntityPlayer entityplayer) { return processor.isUseableByPlayer(entityplayer); diff --git a/src/main/java/forestry/farming/gadgets/TileFarm.java b/src/main/java/forestry/farming/gadgets/TileFarm.java index 63f87ea2d..c25424b1b 100755 --- a/src/main/java/forestry/farming/gadgets/TileFarm.java +++ b/src/main/java/forestry/farming/gadgets/TileFarm.java @@ -284,7 +284,7 @@ public abstract class TileFarm extends TileForestry implements IFarmComponent { @Override public ITileStructure getCentralTE() { - if (!isIntegratedIntoStructure()) + if (!isIntegratedIntoStructure() || !hasMaster()) return null; if (!isMaster) { diff --git a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java index b488b0173..b5fe62890 100755 --- a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java +++ b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java @@ -29,8 +29,11 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; +import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuitBoard; @@ -49,9 +52,12 @@ import forestry.core.config.Defaults; import forestry.core.interfaces.IClimatised; import forestry.core.interfaces.IHintSource; import forestry.core.interfaces.ISocketable; +import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.proxy.Proxies; import forestry.core.utils.DelayTimer; import forestry.core.fluids.tanks.StandardTank; +import forestry.core.fluids.tanks.FilteredTank; +import forestry.core.fluids.TankManager; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.LiquidHelper; import forestry.core.utils.StackUtils; @@ -61,7 +67,7 @@ import forestry.farming.FarmTarget; import forestry.farming.logic.FarmLogicArboreal; import forestry.plugins.PluginFarming; -public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable, IClimatised, IHintSource { +public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable, IClimatised, IHintSource, ILiquidTankContainer { public static final int SLOT_RESOURCES_1 = 0; public static final int SLOT_GERMLINGS_1 = 6; @@ -74,8 +80,6 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable public static final int SLOT_COUNT = 22; - public static final FluidStack STACK_WATER = LiquidHelper.getLiquid(Defaults.LIQUID_WATER, 1); - public static final int DELAY_HYDRATION = 100; public static final float RAINFALL_MODIFIER_CAP = 15f; public static final int BUFFER_FERTILIZER = 200; @@ -88,7 +92,8 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable private final InventoryAdapter sockets = new InventoryAdapter(1, "sockets"); - private StandardTank liquidTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); + private FilteredTank liquidTank; + private final TankManager tankManager; private IFarmLogic harvestProvider; // The farm logic which supplied the pending crops. private final Stack pendingCrops = new Stack(); @@ -107,6 +112,8 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable public TileFarmPlain() { fertilizerValue = GameMode.getGameMode().getIntegerSetting("farms.fertilizer.value"); + liquidTank = new FilteredTank(Defaults.PROCESSOR_TANK_CAPACITY, FluidRegistry.WATER); + tankManager = new TankManager(liquidTank); } /* SAVING & LOADING */ @@ -121,9 +128,7 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable refreshFarmLogics(); - liquidTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); - if (nbttagcompound.hasKey("LiquidTank")) - liquidTank.readFromNBT(nbttagcompound.getCompoundTag("LiquidTank")); + tankManager.readTanksFromNBT(nbttagcompound); } @Override @@ -135,10 +140,7 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable nbttagcompound.setInteger("HydrationDelay", hydrationDelay); nbttagcompound.setInteger("TicksSinceRainfall", ticksSinceRainfall); - NBTTagCompound NBTresourceSlot = new NBTTagCompound(); - liquidTank.writeToNBT(NBTresourceSlot); - nbttagcompound.setTag("LiquidTank", NBTresourceSlot); - + tankManager.writeTanksToNBT(nbttagcompound); } /* UPDATING */ @@ -171,7 +173,7 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable // Check if we have suitable items waiting in the item slot if (inventory.getStackInSlot(SLOT_CAN) != null) { FluidContainerData container = LiquidHelper.getLiquidContainer(inventory.getStackInSlot(SLOT_CAN)); - if (container != null && LiquidHelper.isLiquid(Defaults.LIQUID_WATER, container.fluid)) { + if (container != null && liquidTank.accepts(container.fluid.getFluid())) { inventory.setInventorySlotContents(SLOT_CAN, StackUtils.replenishByContainer(this, inventory.getStackInSlot(SLOT_CAN), container, liquidTank)); if (inventory.getStackInSlot(SLOT_CAN).stackSize <= 0) @@ -666,8 +668,6 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable @Override public void makeMaster() { super.makeMaster(); - if (liquidTank == null) - liquidTank = new StandardTank(Defaults.PROCESSOR_TANK_CAPACITY); refreshFarmLogics(); } @@ -676,8 +676,13 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable super.onStructureReset(); } - public StandardTank getTank() { - return liquidTank; + public StandardTank[] getTanks() { + return new StandardTank[] {liquidTank}; + } + + @Override + public TankManager getTankManager() { + return tankManager; } @Override @@ -764,7 +769,7 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable @Override public boolean hasLiquid(FluidStack liquid) { - return liquidTank.getFluidAmount() >= liquid.amount && liquidTank.getFluid().isFluidEqual(liquid); + return liquidTank.getFluidAmount() >= liquid.amount; } @Override @@ -875,7 +880,7 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable /* NETWORK GUI */ public void getGUINetworkData(int i, int j) { - + i -= tankManager.maxMessageId() + 1; switch (i) { case 0: storedFertilizer = j; @@ -893,10 +898,11 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable } public void sendGUINetworkData(Container container, ICrafting iCrafting) { - iCrafting.sendProgressBarUpdate(container, 0, storedFertilizer); - iCrafting.sendProgressBarUpdate(container, 3, Math.round(temperature * 100)); - iCrafting.sendProgressBarUpdate(container, 4, Math.round(humidity * 100)); - iCrafting.sendProgressBarUpdate(container, 5, ticksSinceRainfall); + int i = tankManager.maxMessageId() + 1; + iCrafting.sendProgressBarUpdate(container, i, storedFertilizer); + iCrafting.sendProgressBarUpdate(container, i + 3, Math.round(temperature * 100)); + iCrafting.sendProgressBarUpdate(container, i + 4, Math.round(humidity * 100)); + iCrafting.sendProgressBarUpdate(container, i + 5, ticksSinceRainfall); } /* ICLIMATISED */ @@ -967,4 +973,34 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable return true; } + /* ILiquidTankContainer */ + @Override + public int fill(ForgeDirection direction, FluidStack resource, boolean doFill) { + return tankManager.fill(direction, resource, doFill); + } + + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + return tankManager.drain(from, resource, doDrain); + } + + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + return tankManager.drain(from, maxDrain, doDrain); + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) { + return tankManager.canFill(from, fluid); + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return tankManager.canDrain(from, fluid); + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + return tankManager.getTankInfo(from); + } } diff --git a/src/main/java/forestry/farming/gadgets/TileValve.java b/src/main/java/forestry/farming/gadgets/TileValve.java index fbd0cd174..d39fb84b1 100755 --- a/src/main/java/forestry/farming/gadgets/TileValve.java +++ b/src/main/java/forestry/farming/gadgets/TileValve.java @@ -10,12 +10,16 @@ ******************************************************************************/ package forestry.farming.gadgets; -import forestry.core.fluids.tanks.FakeTank; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import forestry.core.interfaces.ILiquidTankContainer; -import forestry.core.fluids.tanks.StandardTank; +import forestry.core.fluids.TankManager; +import forestry.core.fluids.tanks.FakeTank; +import net.minecraftforge.fluids.FluidTankInfo; public class TileValve extends TileFarm implements ILiquidTankContainer { @@ -34,42 +38,74 @@ public class TileValve extends TileFarm implements ILiquidTankContainer { } /* ILIQUIDTANKCONTAINER */ - private StandardTank getMasterTank() { - if (!isIntegratedIntoStructure() || !hasMaster()) - return null; + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + TankManager tankManager = getTankManager(); + if (tankManager == null) + return FakeTank.INSTANCE.fill(resource, doFill); - TileFarmPlain central = (TileFarmPlain) getCentralTE(); - if (central == null) - return null; - - return central.getTank(); + return tankManager.fill(from, resource, doFill); } @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - StandardTank tank = getMasterTank(); - if (tank == null) - return 0; + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + TankManager tankManager = getTankManager(); + if (tankManager == null) + return null; - return tank.fill(resource, doFill); + return tankManager.drain(from, resource, doDrain); } @Override public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - StandardTank tank = getMasterTank(); - if (tank == null) - return null; + TankManager tankManager = getTankManager(); + if (tankManager == null) + return FakeTank.INSTANCE.drain(maxDrain, doDrain); - return tank.drain(maxDrain, doDrain); + return tankManager.drain(from, maxDrain, doDrain); } @Override - public StandardTank[] getTanks() { - StandardTank tank = getMasterTank(); - if (tank == null) - return FakeTank.ARRAY; + public boolean canFill(ForgeDirection from, Fluid fluid) { + TankManager tankManager = getTankManager(); + if (tankManager == null) + return true; - return new StandardTank[] { tank }; + return tankManager.canFill(from, fluid); } + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) { + TankManager tankManager = getTankManager(); + if (tankManager == null) + return false; + + return tankManager.canDrain(from, fluid); + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) { + TankManager tankManager = getTankManager(); + if (tankManager == null) + return FakeTank.INFO; + + return tankManager.getTankInfo(from); + } + + @Override + public TankManager getTankManager() { + TileFarmPlain central = (TileFarmPlain) getCentralTE(); + if (central == null) + return null; + + return central.getTankManager(); + } + + @Override + public void getGUINetworkData(int messageId, int data) { + } + + @Override + public void sendGUINetworkData(Container container, ICrafting iCrafting) { + } } diff --git a/src/main/java/forestry/farming/gui/ContainerFarm.java b/src/main/java/forestry/farming/gui/ContainerFarm.java index 907612e50..4aac1ecc5 100755 --- a/src/main/java/forestry/farming/gui/ContainerFarm.java +++ b/src/main/java/forestry/farming/gui/ContainerFarm.java @@ -10,28 +10,20 @@ ******************************************************************************/ package forestry.farming.gui; - -import java.util.HashMap; -import java.util.Map; - -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import forestry.api.farming.IFarmLogic; -import forestry.core.fluids.tanks.FakeTank; +import forestry.core.fluids.TankManager; +import forestry.core.fluids.tanks.StandardTank; import forestry.core.gui.ContainerSocketed; import forestry.core.gui.slots.SlotCustom; import forestry.core.gui.slots.SlotForestry; import forestry.core.gui.slots.SlotLiquidContainer; import forestry.core.gui.slots.SlotOutput; -import forestry.core.network.PacketTankUpdate; -import forestry.core.proxy.Proxies; -import forestry.core.fluids.tanks.StandardTank; import forestry.core.utils.TileInventoryAdapter; import forestry.farming.gadgets.TileFarmPlain; import forestry.plugins.PluginFarming; @@ -135,47 +127,32 @@ public class ContainerFarm extends ContainerSocketed { @Override public void updateProgressBar(int i, int j) { tile.getGUINetworkData(i, j); + TankManager tankManager = tile.getTankManager(); + if (tankManager != null) + tankManager.processGuiUpdate(i, j); } - private Map syncedFluids = new HashMap(); @Override public void detectAndSendChanges() { super.detectAndSendChanges(); + TankManager tankManager = tile.getTankManager(); + if (tankManager != null) + tankManager.updateGuiData(this, crafters); for (int i = 0; i < crafters.size(); i++) { tile.sendGUINetworkData(this, (ICrafting) crafters.get(i)); } - - StandardTank tank = tile.getTank(); - - // If null has been synced - if (tank.getFluid() == null && getTank(0).getFluidAmount() <= 0) - return; - // If fluid has been synced - if (tank.getFluid() != null && tank.getFluid().isFluidStackIdentical(getTank(0).getFluid())) - return; - - for (int j = 0; j < this.crafters.size(); ++j) { - if (this.crafters.get(j) instanceof EntityPlayerMP) { - EntityPlayerMP player = (EntityPlayerMP) this.crafters.get(j); - Proxies.net.sendToPlayer(new PacketTankUpdate(0, tank), player); - } - } - syncedFluids.put(0, new StandardTank(tank.getFluid() == null ? null : tank.getFluid().copy(), tank.getCapacity())); - } @Override - public void onTankUpdate(NBTTagCompound nbt) { - int tankID = nbt.getByte("tank"); - int capacity = nbt.getShort("capacity"); - StandardTank tank = new StandardTank(capacity); - tank.readFromNBT(nbt); - syncedFluids.put(tankID, tank); + public void addCraftingToCrafters(ICrafting iCrafting) { + super.addCraftingToCrafters(iCrafting); + TankManager tankManager = tile.getTankManager(); + if (tankManager != null) + tankManager.initGuiData(this, iCrafting); } - @Override public StandardTank getTank(int slot) { - return syncedFluids.get(slot) == null ? FakeTank.INSTANCE : syncedFluids.get(slot); + return tile.getTankManager().get(slot); } } diff --git a/src/main/java/forestry/farming/triggers/TriggerLowLiquid.java b/src/main/java/forestry/farming/triggers/TriggerLowLiquid.java index eec0b98e5..a68f933ab 100755 --- a/src/main/java/forestry/farming/triggers/TriggerLowLiquid.java +++ b/src/main/java/forestry/farming/triggers/TriggerLowLiquid.java @@ -18,9 +18,10 @@ import buildcraft.api.gates.ITriggerParameter; import forestry.api.core.ITileStructure; import forestry.core.triggers.Trigger; -import forestry.core.fluids.tanks.StandardTank; +import forestry.core.fluids.TankManager; import forestry.farming.gadgets.TileFarmPlain; import forestry.farming.gadgets.TileHatch; +import net.minecraftforge.fluids.FluidTankInfo; public class TriggerLowLiquid extends Trigger { @@ -49,7 +50,8 @@ public class TriggerLowLiquid extends Trigger { if (central == null || !(central instanceof TileFarmPlain)) return false; - StandardTank tank = ((TileFarmPlain) central).getTank(); - return ((float) tank.getFluidAmount() / tank.getCapacity()) <= threshold; + TankManager tankManager = ((TileFarmPlain) central).getTankManager(); + FluidTankInfo info = tankManager.getTankInfo(0); + return ((float) info.fluid.amount / info.capacity) <= threshold; } } From 1d48d4d85519e942f43819e638bff795206e39f7 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 18 Sep 2014 19:09:33 -0700 Subject: [PATCH 084/103] Fixed localization for Short Mead --- lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang b/lang index 7d0f08fdf..97a62b9cc 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 7d0f08fdfbc46e321441248512fbc531211cfaff +Subproject commit 97a62b9cc7a67f9a77529e4bd40e5b13acf501c5 From c51e01987c2afd93527f44e6b9fabdef4d72b03d Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 18 Sep 2014 19:24:55 -0700 Subject: [PATCH 085/103] convert spaces to tabs --- .../core/fluids/tanks/FilteredTank.java | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/main/java/forestry/core/fluids/tanks/FilteredTank.java b/src/main/java/forestry/core/fluids/tanks/FilteredTank.java index 37d30948d..59e973a4d 100644 --- a/src/main/java/forestry/core/fluids/tanks/FilteredTank.java +++ b/src/main/java/forestry/core/fluids/tanks/FilteredTank.java @@ -26,53 +26,53 @@ import java.util.HashSet; */ public class FilteredTank extends StandardTank { - private HashSet filters; + private HashSet filters; - public FilteredTank(int capacity, Fluid... filters) { - this(capacity, Arrays.asList(filters), null); - } + public FilteredTank(int capacity, Fluid... filters) { + this(capacity, Arrays.asList(filters), null); + } public FilteredTank(int capacity, Collection filters) { this(capacity, filters, null); } - public FilteredTank(int capacity, Collection filters, TileEntity tile) { - super(capacity, tile); - this.filters = new HashSet(filters); - } + public FilteredTank(int capacity, Collection filters, TileEntity tile) { + super(capacity, tile); + this.filters = new HashSet(filters); + } public void addFilter(Fluid filter) { if (!accepts(filter)) filters.add(filter); } - @Override - public int fill(FluidStack resource, boolean doFill) { - if (liquidMatchesFilter(resource)) - return super.fill(resource, doFill); - return 0; - } + @Override + public int fill(FluidStack resource, boolean doFill) { + if (liquidMatchesFilter(resource)) + return super.fill(resource, doFill); + return 0; + } @Override public boolean accepts(Fluid fluid) { return filters.contains(fluid); } - public boolean liquidMatchesFilter(FluidStack resource) { - if (resource == null || filters == null) - return false; + public boolean liquidMatchesFilter(FluidStack resource) { + if (resource == null || filters == null) + return false; return filters.contains(resource.getFluid()); - } + } - @Override - protected void refreshTooltip() { + @Override + protected void refreshTooltip() { if (hasFluid()) { super.refreshTooltip(); return; } - toolTip.clear(); - int amount = 0; + toolTip.clear(); + int amount = 0; for (Fluid filter : filters) { EnumRarity rarity = filter.getRarity(); if (rarity == null) @@ -85,7 +85,7 @@ public class FilteredTank extends StandardTank { amount = getFluid().amount; } - toolTip.add(new ToolTipLine(String.format("%,d", amount) + " / " + String.format("%,d", getCapacity()))); - } + toolTip.add(new ToolTipLine(String.format("%,d", amount) + " / " + String.format("%,d", getCapacity()))); + } } From fe8d55f38f6cd10f4baa67eb665076ca88a25639 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 18 Sep 2014 22:41:48 -0700 Subject: [PATCH 086/103] Created Server-safe method to get EntityPlayer from GameProfile --- api | 2 +- .../forestry/core/proxy/ClientProxyCommon.java | 7 +++++++ .../java/forestry/core/proxy/ProxyCommon.java | 17 +++++++++++++++++ .../factory/gadgets/MachineCarpenter.java | 4 ++-- .../factory/gadgets/MachineFabricator.java | 3 ++- .../factory/gadgets/MachineSqueezer.java | 3 ++- .../forestry/farming/gadgets/TileFarmPlain.java | 2 +- src/main/java/forestry/mail/MailAddress.java | 9 +-------- .../java/forestry/mail/proxy/ProxyMail.java | 2 +- 9 files changed, 34 insertions(+), 15 deletions(-) diff --git a/api b/api index 3d25676cc..c3641536b 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit 3d25676cc26f216836baec287624aa12eff92fc9 +Subproject commit c3641536b984fada6fd7b5d7b9b757a7f40dd3d7 diff --git a/src/main/java/forestry/core/proxy/ClientProxyCommon.java b/src/main/java/forestry/core/proxy/ClientProxyCommon.java index 7dbe1a2f6..f91e2179e 100755 --- a/src/main/java/forestry/core/proxy/ClientProxyCommon.java +++ b/src/main/java/forestry/core/proxy/ClientProxyCommon.java @@ -12,6 +12,8 @@ package forestry.core.proxy; import java.io.File; +import com.mojang.authlib.GameProfile; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; @@ -90,6 +92,11 @@ public class ClientProxyCommon extends ProxyCommon { return true; } + @Override + public EntityPlayer getPlayer(World world, GameProfile profile) { + return world.getPlayerEntityByName(profile.getName()); + } + @Override public double getBlockReachDistance(EntityPlayer entityplayer) { if (entityplayer instanceof EntityPlayerSP) diff --git a/src/main/java/forestry/core/proxy/ProxyCommon.java b/src/main/java/forestry/core/proxy/ProxyCommon.java index 009c53b9b..61ee87411 100755 --- a/src/main/java/forestry/core/proxy/ProxyCommon.java +++ b/src/main/java/forestry/core/proxy/ProxyCommon.java @@ -12,6 +12,8 @@ package forestry.core.proxy; import java.io.File; +import com.mojang.authlib.GameProfile; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.IResourceManager; @@ -37,6 +39,8 @@ import cpw.mods.fml.common.versioning.DefaultArtifactVersion; import cpw.mods.fml.common.versioning.VersionParser; import cpw.mods.fml.common.versioning.VersionRange; +import net.minecraft.world.WorldServer; +import net.minecraftforge.common.util.FakePlayerFactory; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; @@ -153,6 +157,19 @@ public class ProxyCommon { return server.getConfigurationManager().func_152596_g(player.getGameProfile()); } + /** + * Get a player for a given World and GameProfile. + * If they are not in the World, returns a FakePlayer. + * Do not store references to the return value, to prevent worlds staying in memory. + */ + public EntityPlayer getPlayer(World world, GameProfile profile) { + EntityPlayer player = world.getPlayerEntityByName(profile.getName()); + if (player != null) + return player; + else + return FakePlayerFactory.get((WorldServer)world, profile); + } + public double getBlockReachDistance(EntityPlayer entityplayer) { return 4f; } diff --git a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java index c9d67863e..3175f0021 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java @@ -43,7 +43,7 @@ import forestry.core.EnumErrorCode; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.config.ForestryItem; -import forestry.core.fluids.tanks.StandardTank; +import forestry.core.proxy.Proxies; import forestry.core.fluids.tanks.FilteredTank; import forestry.core.fluids.TankManager; import forestry.core.gadgets.TileBase; @@ -456,7 +456,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL } private boolean removeSets(int count, ItemStack[] set) { - EntityPlayer player = worldObj.getPlayerEntityByName(owner.getName()); + EntityPlayer player = Proxies.common.getPlayer(worldObj, owner); return accessibleInventory.removeSets(count, set, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT, player, true, true, true); } diff --git a/src/main/java/forestry/factory/gadgets/MachineFabricator.java b/src/main/java/forestry/factory/gadgets/MachineFabricator.java index aeea17996..042f87da1 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFabricator.java +++ b/src/main/java/forestry/factory/gadgets/MachineFabricator.java @@ -39,6 +39,7 @@ import forestry.core.interfaces.ICrafter; import forestry.core.interfaces.ICraftingPlan; import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.network.GuiId; +import forestry.core.proxy.Proxies; import forestry.core.fluids.tanks.StandardTank; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; @@ -505,7 +506,7 @@ public class MachineFabricator extends TilePowered implements ICrafter, ISpecial public ItemStack[] extractItem(boolean doRemove, ForgeDirection from, int maxItemCount) { ItemStack taken; if (doRemove) { - EntityPlayer player = worldObj.getPlayerEntityByName(owner.getName()); + EntityPlayer player = Proxies.common.getPlayer(worldObj, owner); taken = this.takenFromSlot(SLOT_RESULT, false, player); } else { taken = this.getResult(); diff --git a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java index 89c3f3214..2712f9b2b 100755 --- a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java +++ b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java @@ -49,6 +49,7 @@ import forestry.core.utils.EnumTankLevel; import forestry.core.fluids.tanks.StandardTank; import forestry.core.fluids.tanks.FilteredTank; import forestry.core.fluids.TankManager; +import forestry.core.proxy.Proxies; import forestry.core.utils.InventoryAdapter; import forestry.core.utils.LiquidHelper; import forestry.core.utils.StackUtils; @@ -351,7 +352,7 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I } private boolean removeResources(ItemStack[] stacks) { - EntityPlayer player = worldObj.getPlayerEntityByName(owner.getName()); + EntityPlayer player = Proxies.common.getPlayer(worldObj, owner); return inventory.removeSets(1, stacks, SLOT_RESOURCE_1, SLOTS_RESOURCE_COUNT, player, false, true, true); } diff --git a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java index b5fe62890..14cfe796b 100755 --- a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java +++ b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java @@ -763,7 +763,7 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable @Override public void removeResources(ItemStack[] resources) { - EntityPlayer player = worldObj.getPlayerEntityByName(owner.getName()); + EntityPlayer player = Proxies.common.getPlayer(worldObj, owner); inventory.removeSets(1, resources, SLOT_RESOURCES_1, SLOT_RESOURCES_1, player, false, true, true); } diff --git a/src/main/java/forestry/mail/MailAddress.java b/src/main/java/forestry/mail/MailAddress.java index 5fbc07ab1..2e9563d6e 100644 --- a/src/main/java/forestry/mail/MailAddress.java +++ b/src/main/java/forestry/mail/MailAddress.java @@ -143,18 +143,11 @@ public class MailAddress implements INBTTagable, IMailAddress { 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 addressPlayer = Proxies.common.getPlayer(world, gameProfile); EntityPlayer clientPlayer = Proxies.common.getPlayer(); return addressPlayer != null && clientPlayer != null && clientPlayer.equals(addressPlayer); diff --git a/src/main/java/forestry/mail/proxy/ProxyMail.java b/src/main/java/forestry/mail/proxy/ProxyMail.java index 36fb92b10..acb3221c5 100755 --- a/src/main/java/forestry/mail/proxy/ProxyMail.java +++ b/src/main/java/forestry/mail/proxy/ProxyMail.java @@ -28,7 +28,7 @@ public class ProxyMail { } public void setPOBoxInfo(World world, IMailAddress address, POBoxInfo info) { - EntityPlayer player = address.getPlayer(world); + EntityPlayer player = Proxies.common.getPlayer(world, address.getPlayerProfile()); if (player != null) Proxies.net.sendToPlayer(new PacketPOBoxInfo(PacketIds.POBOX_INFO, info), player); } From 95d6f30f22f016425e518201a7306805e2180903 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 18 Sep 2014 22:54:45 -0700 Subject: [PATCH 087/103] Fix #185. Remove [Forestry] user, use owner's permissions --- .../arboriculture/worldgen/BlockTypeLeaf.java | 1 + .../worldgen/WorldGenArboriculture.java | 8 ++--- .../java/forestry/core/config/Config.java | 11 ------ src/main/java/forestry/core/utils/Utils.java | 36 ------------------- .../farming/gadgets/TileFarmPlain.java | 3 +- .../forestry/farming/logic/FarmableCocoa.java | 3 +- .../farming/logic/FarmableFarmCraftory.java | 6 ++-- .../forestry/farming/logic/FarmableGE.java | 6 ++-- .../farming/logic/FarmableGenericCrop.java | 6 ++-- .../farming/logic/FarmableGenericSapling.java | 6 ++-- .../forestry/farming/logic/FarmableGourd.java | 3 +- .../farming/logic/FarmableStacked.java | 3 +- .../farming/logic/FarmableVanillaSapling.java | 6 ++-- .../farming/logic/FarmableVanillaShroom.java | 3 +- 14 files changed, 30 insertions(+), 71 deletions(-) diff --git a/src/main/java/forestry/arboriculture/worldgen/BlockTypeLeaf.java b/src/main/java/forestry/arboriculture/worldgen/BlockTypeLeaf.java index 14561fca7..ccf0eb716 100755 --- a/src/main/java/forestry/arboriculture/worldgen/BlockTypeLeaf.java +++ b/src/main/java/forestry/arboriculture/worldgen/BlockTypeLeaf.java @@ -24,6 +24,7 @@ public class BlockTypeLeaf extends BlockType { public BlockTypeLeaf(GameProfile owner) { super(ForestryBlock.leaves, 0); + this.owner = owner; } @Override diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java index 3d44fd5e5..cb868ed4b 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java @@ -58,10 +58,10 @@ public abstract class WorldGenArboriculture extends WorldGenBase { private GameProfile getOwner() { TileEntity tile = world.getTileEntity(startX, startY, startZ); - if (!(tile instanceof TileSapling)) - return Utils.getForestryPlayerProfile(); - - return ((TileSapling) tile).getOwnerProfile(); + if (tile instanceof TileSapling) + return ((TileSapling) tile).getOwnerProfile(); + else + return null; } public abstract void preGenerate(); diff --git a/src/main/java/forestry/core/config/Config.java b/src/main/java/forestry/core/config/Config.java index a063fe370..fa37af2aa 100755 --- a/src/main/java/forestry/core/config/Config.java +++ b/src/main/java/forestry/core/config/Config.java @@ -104,9 +104,6 @@ public class Config { // Mail public static boolean mailAlertEnabled = true; - public static String fakeUserLogin = "[Forestry]"; - public static boolean fakeUserAutoop = true; - // Hints public static boolean disableHints = false; public static HashMap hints = new HashMap(); @@ -254,14 +251,6 @@ public class Config { for (String str : disabledStructures) Proxies.log.finer("Disabled structure '%s'.", str); - property = config.get("permissions.login", CATEGORY_COMMON, "[Forestry]"); - property.Comment = "set the default login used by Forestry."; - Config.fakeUserLogin = property.Value; - - property = config.get("permissions.autoop", CATEGORY_COMMON, true); - property.Comment = "set to false to prevent Forestry's user from autooping."; - Config.fakeUserAutoop = Boolean.parseBoolean(property.Value); - registerClimates(); ForestryTrigger.initialize(); diff --git a/src/main/java/forestry/core/utils/Utils.java b/src/main/java/forestry/core/utils/Utils.java index 2a123d77d..69344aaa5 100755 --- a/src/main/java/forestry/core/utils/Utils.java +++ b/src/main/java/forestry/core/utils/Utils.java @@ -60,42 +60,6 @@ import forestry.plugins.PluginArboriculture; public class Utils { - private static EntityPlayer modPlayer; - - public static GameProfile getForestryPlayerProfile() { - return new GameProfile(UUID.nameUUIDFromBytes(Config.fakeUserLogin.getBytes(Charsets.UTF_8)), - Config.fakeUserLogin); - } - - public static EntityPlayer getForestryPlayer(World world, int x, int y, int z) { - if (modPlayer == null) { - modPlayer = new EntityPlayer(world, getForestryPlayerProfile()) { - @Override - public boolean canCommandSenderUseCommand(int var1, String var2) { - return false; - } - - @Override - public ChunkCoordinates getPlayerCoordinates() { - return null; - } - - @Override - public void addChatMessage(IChatComponent var1) { - } - }; - modPlayer.posX = x; - modPlayer.posY = y; - modPlayer.posZ = z; - Proxies.log.info("Created player '%s' for Forestry.", modPlayer.getGameProfile().getId()); - if (Config.fakeUserAutoop) { - MinecraftServer.getServer().getConfigurationManager().func_152605_a(modPlayer.getGameProfile()); - Proxies.log.info("Opped player '%s'.", modPlayer.getGameProfile().getId()); - } - } - - return modPlayer; - } private static Random rand; public static int getUID() { diff --git a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java index 14cfe796b..e38ece0da 100755 --- a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java +++ b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java @@ -790,7 +790,8 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable if (!germling.isGermling(inventory.getStackInSlot(i))) continue; - if (!germling.plantSaplingAt(inventory.getStackInSlot(i), world, x, y, z)) + EntityPlayer player = Proxies.common.getPlayer(world, owner); + if (!germling.plantSaplingAt(player, inventory.getStackInSlot(i), world, x, y, z)) continue; inventory.decrStackSize(i, 1); diff --git a/src/main/java/forestry/farming/logic/FarmableCocoa.java b/src/main/java/forestry/farming/logic/FarmableCocoa.java index 81922fb82..47d0a380b 100755 --- a/src/main/java/forestry/farming/logic/FarmableCocoa.java +++ b/src/main/java/forestry/farming/logic/FarmableCocoa.java @@ -11,6 +11,7 @@ package forestry.farming.logic; import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -56,7 +57,7 @@ public class FarmableCocoa implements IFarmable { } @Override - public boolean plantSaplingAt(ItemStack germling, World world, int x, int y, int z) { + public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { return BlockUtil.tryPlantPot(world, x, y, z, COCOA_PLANT); } diff --git a/src/main/java/forestry/farming/logic/FarmableFarmCraftory.java b/src/main/java/forestry/farming/logic/FarmableFarmCraftory.java index 2d4b4ec73..bf8fa7cf2 100755 --- a/src/main/java/forestry/farming/logic/FarmableFarmCraftory.java +++ b/src/main/java/forestry/farming/logic/FarmableFarmCraftory.java @@ -13,6 +13,7 @@ package forestry.farming.logic; import java.util.Collection; import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -20,7 +21,6 @@ import net.minecraft.world.World; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; import forestry.core.utils.StackUtils; -import forestry.core.utils.Utils; import forestry.core.utils.Vect; import forestry.plugins.PluginFarmCraftory; @@ -71,8 +71,8 @@ public class FarmableFarmCraftory implements IFarmable { } @Override - public boolean plantSaplingAt(ItemStack germling, World world, int x, int y, int z) { - return germling.copy().tryPlaceItemIntoWorld(Utils.getForestryPlayer(world, x, y, z), world, x, y - 1, z, 1, 0, 0, 0); + public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { + return germling.copy().tryPlaceItemIntoWorld(player, world, x, y - 1, z, 1, 0, 0, 0); } @Override diff --git a/src/main/java/forestry/farming/logic/FarmableGE.java b/src/main/java/forestry/farming/logic/FarmableGE.java index f7c1f5ea9..7281d3023 100755 --- a/src/main/java/forestry/farming/logic/FarmableGE.java +++ b/src/main/java/forestry/farming/logic/FarmableGE.java @@ -11,6 +11,7 @@ package forestry.farming.logic; import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -18,7 +19,6 @@ import forestry.api.arboriculture.ITree; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; import forestry.core.config.ForestryBlock; -import forestry.core.utils.Utils; import forestry.core.utils.Vect; import forestry.plugins.PluginArboriculture; @@ -44,8 +44,8 @@ public class FarmableGE implements IFarmable { } @Override - public boolean plantSaplingAt(ItemStack germling, World world, int x, int y, int z) { - return germling.copy().tryPlaceItemIntoWorld(Utils.getForestryPlayer(world, x, y, z), world, x, y - 1, z, 1, 0, 0, 0); + public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { + return germling.copy().tryPlaceItemIntoWorld(player, world, x, y - 1, z, 1, 0, 0, 0); } @Override diff --git a/src/main/java/forestry/farming/logic/FarmableGenericCrop.java b/src/main/java/forestry/farming/logic/FarmableGenericCrop.java index 6346480cf..60c7c7d55 100755 --- a/src/main/java/forestry/farming/logic/FarmableGenericCrop.java +++ b/src/main/java/forestry/farming/logic/FarmableGenericCrop.java @@ -11,12 +11,12 @@ package forestry.farming.logic; import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; -import forestry.core.utils.Utils; import forestry.core.utils.Vect; public class FarmableGenericCrop implements IFarmable { @@ -65,8 +65,8 @@ public class FarmableGenericCrop implements IFarmable { } @Override - public boolean plantSaplingAt(ItemStack germling, World world, int x, int y, int z) { - return germling.copy().tryPlaceItemIntoWorld(Utils.getForestryPlayer(world, x, y, z), world, x, y - 1, z, 1, 0, 0, 0); + public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { + return germling.copy().tryPlaceItemIntoWorld(player, world, x, y - 1, z, 1, 0, 0, 0); } @Override diff --git a/src/main/java/forestry/farming/logic/FarmableGenericSapling.java b/src/main/java/forestry/farming/logic/FarmableGenericSapling.java index 4aefa7f20..d75de37c5 100755 --- a/src/main/java/forestry/farming/logic/FarmableGenericSapling.java +++ b/src/main/java/forestry/farming/logic/FarmableGenericSapling.java @@ -11,13 +11,13 @@ package forestry.farming.logic; import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import forestry.api.farming.ICrop; import forestry.api.farming.IFarmable; import forestry.core.utils.StackUtils; -import forestry.core.utils.Utils; import forestry.core.utils.Vect; public class FarmableGenericSapling implements IFarmable { @@ -79,8 +79,8 @@ public class FarmableGenericSapling implements IFarmable { } @Override - public boolean plantSaplingAt(ItemStack germling, World world, int x, int y, int z) { - return germling.copy().tryPlaceItemIntoWorld(Utils.getForestryPlayer(world, x, y, z), world, x, y - 1, z, 1, 0, 0, 0); + public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { + return germling.copy().tryPlaceItemIntoWorld(player, world, x, y - 1, z, 1, 0, 0, 0); } } diff --git a/src/main/java/forestry/farming/logic/FarmableGourd.java b/src/main/java/forestry/farming/logic/FarmableGourd.java index 79c56c852..989fedc80 100755 --- a/src/main/java/forestry/farming/logic/FarmableGourd.java +++ b/src/main/java/forestry/farming/logic/FarmableGourd.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.farming.logic; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -67,7 +68,7 @@ public class FarmableGourd implements IFarmable { } @Override - public boolean plantSaplingAt(ItemStack germling, World world, int x, int y, int z) { + public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { return world.setBlock(x, y, z, StackUtils.getBlock(stem), 0, Defaults.FLAG_BLOCK_SYNCH); } diff --git a/src/main/java/forestry/farming/logic/FarmableStacked.java b/src/main/java/forestry/farming/logic/FarmableStacked.java index dcb05bd2c..6b22e542f 100755 --- a/src/main/java/forestry/farming/logic/FarmableStacked.java +++ b/src/main/java/forestry/farming/logic/FarmableStacked.java @@ -11,6 +11,7 @@ package forestry.farming.logic; import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -49,7 +50,7 @@ public class FarmableStacked implements IFarmable { } @Override - public boolean plantSaplingAt(ItemStack germling, World world, int x, int y, int z) { + public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { return world.setBlock(x, y, z, block, 0, Defaults.FLAG_BLOCK_SYNCH); } diff --git a/src/main/java/forestry/farming/logic/FarmableVanillaSapling.java b/src/main/java/forestry/farming/logic/FarmableVanillaSapling.java index e9d0d6dc9..f40168c88 100755 --- a/src/main/java/forestry/farming/logic/FarmableVanillaSapling.java +++ b/src/main/java/forestry/farming/logic/FarmableVanillaSapling.java @@ -12,6 +12,7 @@ package forestry.farming.logic; import java.util.Map; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -20,7 +21,6 @@ import net.minecraft.world.World; import forestry.api.arboriculture.ITree; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; -import forestry.core.utils.Utils; import forestry.plugins.PluginArboriculture; public class FarmableVanillaSapling extends FarmableGenericSapling { @@ -33,7 +33,7 @@ public class FarmableVanillaSapling extends FarmableGenericSapling { } @Override - public boolean plantSaplingAt(ItemStack germling, World world, int x, int y, int z) { + public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { ITree tree = null; for (Map.Entry entry : AlleleManager.ersatzSaplings.entrySet()) if (entry.getKey().isItemEqual(germling) && entry.getValue() instanceof ITree) { @@ -44,7 +44,7 @@ public class FarmableVanillaSapling extends FarmableGenericSapling { if (tree == null) return false; - return PluginArboriculture.treeInterface.plantSapling(world, tree, Utils.getForestryPlayerProfile(), x, y, z); + return PluginArboriculture.treeInterface.plantSapling(world, tree, player.getGameProfile(), x, y, z); } } diff --git a/src/main/java/forestry/farming/logic/FarmableVanillaShroom.java b/src/main/java/forestry/farming/logic/FarmableVanillaShroom.java index c92603f47..4754ebf3a 100755 --- a/src/main/java/forestry/farming/logic/FarmableVanillaShroom.java +++ b/src/main/java/forestry/farming/logic/FarmableVanillaShroom.java @@ -11,6 +11,7 @@ package forestry.farming.logic; import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -39,7 +40,7 @@ public class FarmableVanillaShroom extends FarmableGenericSapling { } @Override - public boolean plantSaplingAt(ItemStack germling, World world, int x, int y, int z) { + public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { int meta = 0; if (StackUtils.equals(Blocks.red_mushroom, germling)) meta = 1; From 5616081f176c82fd7eccc33b5993d0bf09185831 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 19 Sep 2014 00:34:30 -0700 Subject: [PATCH 088/103] Fix #53: Backpacks in Resupply mode crash when opening slotless GUIs --- src/main/java/forestry/core/utils/ItemInventory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/forestry/core/utils/ItemInventory.java b/src/main/java/forestry/core/utils/ItemInventory.java index da4da269e..e7fcb75ff 100755 --- a/src/main/java/forestry/core/utils/ItemInventory.java +++ b/src/main/java/forestry/core/utils/ItemInventory.java @@ -42,7 +42,7 @@ public class ItemInventory implements IInventory, INBTTagable { isItemInventory = true; // Set an uid to identify the itemstack on SMP - setUID(true); + setUID(false); readFromNBT(itemstack.getTagCompound()); } From 12fd949fa5a3dd168d00a5c067bde225b2db0cc8 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 19 Sep 2014 00:34:50 -0700 Subject: [PATCH 089/103] Minor ItemBackpack code cleanup --- src/main/java/forestry/storage/items/ItemBackpack.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/forestry/storage/items/ItemBackpack.java b/src/main/java/forestry/storage/items/ItemBackpack.java index 3dbe05c69..b7e0d2c27 100755 --- a/src/main/java/forestry/storage/items/ItemBackpack.java +++ b/src/main/java/forestry/storage/items/ItemBackpack.java @@ -157,7 +157,8 @@ public class ItemBackpack extends ItemInventoried { // Create our own backpack inventory ItemInventory backpackInventory = new ItemInventory(ItemBackpack.class, getBackpackSize(), stack); - if (stack.getItemDamage() == 2) + BackpackMode mode = getMode(stack); + if (mode == BackpackMode.RECEIVE) tryChestReceive(player, backpackInventory, inventory); else tryChestTransfer(backpackInventory, inventory); From d9ab86f9f24b29667b749e767b6990efcde60679 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 19 Sep 2014 00:44:30 -0700 Subject: [PATCH 090/103] Fix #196 Crash on trying to insert invalid item into Squeezer --- src/main/java/forestry/factory/gadgets/MachineSqueezer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java index 2712f9b2b..f1bc9e5d2 100755 --- a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java +++ b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java @@ -489,7 +489,7 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I if (LiquidHelper.isEmptyContainer(itemstack)) return false; FluidStack fluid = LiquidHelper.getFluidStackInContainer(itemstack); - return productTank.accepts(fluid.getFluid()); + return fluid != null && productTank.accepts(fluid.getFluid()); } return false; From 063efce85f24b48efb040ac94cde1ec80df97e02 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 19 Sep 2014 01:29:28 -0700 Subject: [PATCH 091/103] Fixed crash when loading another player's ssp world with a multifarm --- .../java/forestry/core/proxy/ClientProxyCommon.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/forestry/core/proxy/ClientProxyCommon.java b/src/main/java/forestry/core/proxy/ClientProxyCommon.java index f91e2179e..bab31f684 100755 --- a/src/main/java/forestry/core/proxy/ClientProxyCommon.java +++ b/src/main/java/forestry/core/proxy/ClientProxyCommon.java @@ -25,6 +25,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraft.world.WorldServer; + +import net.minecraftforge.common.util.FakePlayerFactory; import org.lwjgl.input.Keyboard; @@ -94,7 +97,13 @@ public class ClientProxyCommon extends ProxyCommon { @Override public EntityPlayer getPlayer(World world, GameProfile profile) { - return world.getPlayerEntityByName(profile.getName()); + EntityPlayer player = world.getPlayerEntityByName(profile.getName()); + if (player != null) + return player; + else if (world instanceof WorldServer) + return FakePlayerFactory.get((WorldServer) world, profile); + else + return null; } @Override From 8fd2c811e3f27f47d1ec8cb4c1a21f72b5c013d6 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 19 Sep 2014 03:30:44 -0700 Subject: [PATCH 092/103] Info tabs push NEI out of the way --- src/main/java/codechicken/nei/LICENSE.txt | 21 ++++++++ .../java/codechicken/nei/VisiblityData.java | 38 ++++++++++++++ .../codechicken/nei/api/INEIGuiHandler.java | 49 +++++++++++++++++++ .../nei/api/TaggedInventoryArea.java | 48 ++++++++++++++++++ .../java/forestry/core/gui/GuiForestry.java | 24 ++++++++- .../java/forestry/core/gui/LedgerManager.java | 4 ++ 6 files changed, 183 insertions(+), 1 deletion(-) create mode 100644 src/main/java/codechicken/nei/LICENSE.txt create mode 100644 src/main/java/codechicken/nei/VisiblityData.java create mode 100644 src/main/java/codechicken/nei/api/INEIGuiHandler.java create mode 100644 src/main/java/codechicken/nei/api/TaggedInventoryArea.java diff --git a/src/main/java/codechicken/nei/LICENSE.txt b/src/main/java/codechicken/nei/LICENSE.txt new file mode 100644 index 000000000..186cfbbc0 --- /dev/null +++ b/src/main/java/codechicken/nei/LICENSE.txt @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2014 ChickenBones + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/src/main/java/codechicken/nei/VisiblityData.java b/src/main/java/codechicken/nei/VisiblityData.java new file mode 100644 index 000000000..f5753aa8e --- /dev/null +++ b/src/main/java/codechicken/nei/VisiblityData.java @@ -0,0 +1,38 @@ +package codechicken.nei; + +public class VisiblityData +{ + public boolean showUtilityButtons = true; + public boolean showStateButtons = true; + /** + * Item panel and associated buttons + */ + public boolean showItemPanel = true; + /** + * Item and search section + */ + public boolean showItemSection = true; + /** + * Dropdown and Item search field + */ + public boolean showSearchSection = true; + /** + * All widgets except options button + */ + public boolean showWidgets = true; + /** + * The entire NEI interface, aka hidden + */ + public boolean showNEI = true; + public boolean enableDeleteMode = true; + + public void translateDependancies() + { + if(!showNEI) + showWidgets = false; + if(!showWidgets) + showItemSection = showUtilityButtons = showStateButtons = false; + if(!showItemSection) + showSearchSection = showItemPanel = false; + } +} diff --git a/src/main/java/codechicken/nei/api/INEIGuiHandler.java b/src/main/java/codechicken/nei/api/INEIGuiHandler.java new file mode 100644 index 000000000..9ca8fb6cb --- /dev/null +++ b/src/main/java/codechicken/nei/api/INEIGuiHandler.java @@ -0,0 +1,49 @@ +package codechicken.nei.api; + +import codechicken.nei.VisiblityData; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.item.ItemStack; + +import java.util.List; + +/** + * If this is implemented on a gui, it will be automatically registered + */ +public interface INEIGuiHandler +{ + public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility); + + /** + * NEI will give the specified item to the InventoryRange returned if the player's inventory is full. + * return null for no range + */ + public Iterable getItemSpawnSlots(GuiContainer gui, ItemStack item); + + /** + * @return A list of TaggedInventoryAreas that will be used with the savestates. + */ + public List getInventoryAreas(GuiContainer gui); + + /** + * Handles clicks while an itemstack has been dragged from the item panel. Use this to set configurable slots and the like. + * Changes made to the stackSize of the dragged stack will be kept + * @param gui The current gui instance + * @param mousex The x position of the mouse + * @param mousey The y position of the mouse + * @param draggedStack The stack being dragged from the item panel + * @param button The button presed + * @return True if the drag n drop was handled. False to resume processing through other routes. The held stack will be deleted if draggedStack.stackSize == 0 + */ + public boolean handleDragNDrop(GuiContainer gui, int mousex, int mousey, ItemStack draggedStack, int button); + + /** + * Used to prevent the item panel from drawing on top of other gui elements. + * This function will also be called with a 1x1 size rectangle on the mouse position for determining if the given coordinate should override item panel functions such as scrolling + * @param x The x coordinate of the rectangle bounding the slot + * @param y The y coordinate of the rectangle bounding the slot + * @param w The w coordinate of the rectangle bounding the slot + * @param h The h coordinate of the rectangle bounding the slot + * @return true if the item panel slot within the specified rectangle should not be rendered. + */ + public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h); +} diff --git a/src/main/java/codechicken/nei/api/TaggedInventoryArea.java b/src/main/java/codechicken/nei/api/TaggedInventoryArea.java new file mode 100644 index 000000000..b50d2e239 --- /dev/null +++ b/src/main/java/codechicken/nei/api/TaggedInventoryArea.java @@ -0,0 +1,48 @@ +package codechicken.nei.api; + +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; + +import java.util.HashSet; + +public class TaggedInventoryArea +{ + public HashSet slots = new HashSet(); + public String tagName; + /** + * Only for player inventories. + */ + private IInventory inventory; + /** + * Other inventories + */ + private Container container; + + public TaggedInventoryArea(InventoryPlayer invPlayer) + { + this("InventoryPlayer", 0, 39, null); + inventory = invPlayer; + } + + public TaggedInventoryArea(String name, int first, int last, Container container) + { + this.container = container; + tagName = name; + for(int i = first; i <= last; i++) + slots.add(i); + } + + public ItemStack getStackInSlot(int i) + { + if(inventory != null) + return inventory.getStackInSlot(i); + return container.getSlot(i).getStack(); + } + + public boolean isContainer() + { + return inventory == null; + } +} diff --git a/src/main/java/forestry/core/gui/GuiForestry.java b/src/main/java/forestry/core/gui/GuiForestry.java index 1f22de848..c1af240dd 100755 --- a/src/main/java/forestry/core/gui/GuiForestry.java +++ b/src/main/java/forestry/core/gui/GuiForestry.java @@ -14,6 +14,10 @@ import java.awt.Color; import java.util.Collection; import java.util.List; +import codechicken.nei.VisiblityData; +import codechicken.nei.api.INEIGuiHandler; +import codechicken.nei.api.TaggedInventoryArea; + import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.OpenGlHelper; @@ -45,7 +49,7 @@ import forestry.core.interfaces.IPowerHandler; import forestry.core.proxy.Proxies; import forestry.core.utils.FontColour; -public abstract class GuiForestry extends GuiContainer { +public abstract class GuiForestry extends GuiContainer implements INEIGuiHandler { /* WIDGETS */ protected WidgetManager widgetManager; @@ -572,4 +576,22 @@ public abstract class GuiForestry extends GuiContainer { return tip; } } + + /* NEI */ + @Override + public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility) { return null; } + @Override + public Iterable getItemSpawnSlots(GuiContainer gui, ItemStack item) { return null; } + @Override + public List getInventoryAreas(GuiContainer gui) { return null; } + @Override + public boolean handleDragNDrop(GuiContainer gui, int mousex, int mousey, ItemStack draggedStack, int button) { return false; } + + @Override + public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h) { + if (gui instanceof GuiForestry) + return ((GuiForestry)gui).ledgerManager.ledgerOverlaps(x, y, w, h); + else + return false; + } } diff --git a/src/main/java/forestry/core/gui/LedgerManager.java b/src/main/java/forestry/core/gui/LedgerManager.java index 1e9353e8a..57f1934df 100755 --- a/src/main/java/forestry/core/gui/LedgerManager.java +++ b/src/main/java/forestry/core/gui/LedgerManager.java @@ -117,4 +117,8 @@ public class LedgerManager { } + public boolean ledgerOverlaps(int x, int y, int width, int height) { + return getAtPosition(x + width, y + height) != null || getAtPosition(x + width, y) != null || getAtPosition(x, y + height) != null || getAtPosition(x, y) != null; + } + } From 40a58add8967781ee1df58cf9ab8818aec7105e2 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 19 Sep 2014 15:44:01 -0700 Subject: [PATCH 093/103] Fix #200, Squeezer not working with automation --- .../factory/gadgets/MachineSqueezer.java | 45 ++++++++++++------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java index f1bc9e5d2..15e24e659 100755 --- a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java +++ b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java @@ -11,6 +11,7 @@ package forestry.factory.gadgets; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; @@ -89,12 +90,15 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I public static class RecipeManager implements ISqueezerManager { public static ArrayList recipes = new ArrayList(); public static HashSet recipeFluids = new HashSet(); + public static HashSet recipeInputs = new HashSet(); @Override public void addRecipe(int timePerItem, ItemStack[] resources, FluidStack liquid, ItemStack remnants, int chance) { recipes.add(new MachineSqueezer.Recipe(timePerItem, resources, liquid, remnants, chance)); if (liquid != null) recipeFluids.add(liquid.getFluid()); + if (resources != null) + recipeInputs.addAll(Arrays.asList(resources)); } @Override @@ -112,6 +116,15 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I return null; } + public static boolean canUse(ItemStack itemStack) { + if (recipeInputs.contains(itemStack)) + return true; + for (ItemStack recipeInput : recipeInputs) + if (StackUtils.isCraftingEquivalent(recipeInput, itemStack)) + return true; + return false; + } + @Override public Map getRecipes() { HashMap recipeList = new HashMap(); @@ -427,12 +440,22 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I return super.hasCustomInventoryName(); } - /** - * TODO: just a specialsource workaround - */ @Override public boolean isItemValidForSlot(int slotIndex, ItemStack itemstack) { - return super.isItemValidForSlot(slotIndex, itemstack); + + if(slotIndex == SLOT_CAN_INPUT) { + return LiquidHelper.isEmptyContainer(itemstack); + } + + if(slotIndex >= SLOT_RESOURCE_1 && slotIndex < SLOT_RESOURCE_1 + SLOTS_RESOURCE_COUNT) { + if (LiquidHelper.isEmptyContainer(itemstack)) + return false; + + if (RecipeManager.canUse(itemstack)) + return true; + } + + return false; } /** @@ -481,19 +504,9 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I if(!super.canPutStackFromSide(slotIndex, itemstack, side)) return false; - if(slotIndex == SLOT_CAN_INPUT) { - return LiquidHelper.isEmptyContainer(itemstack); - } - - if(slotIndex >= SLOT_RESOURCE_1 && slotIndex < SLOT_RESOURCE_1 + SLOTS_RESOURCE_COUNT) { - if (LiquidHelper.isEmptyContainer(itemstack)) - return false; - FluidStack fluid = LiquidHelper.getFluidStackInContainer(itemstack); - return fluid != null && productTank.accepts(fluid.getFluid()); - } - - return false; + return slotIndex == SLOT_CAN_INPUT || (slotIndex >= SLOT_RESOURCE_1 && slotIndex < SLOT_RESOURCE_1 + SLOTS_RESOURCE_COUNT); } + /* ISPECIALINVENTORY */ @Override public int addItem(ItemStack stack, boolean doAdd, ForgeDirection from) { From 1bc5833e326ea807aca154d032aec5ea1d886294 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 19 Sep 2014 16:01:23 -0700 Subject: [PATCH 094/103] Fix #199 Vanilla saplings can't be analized in Treealyzer --- .../forestry/arboriculture/gui/ContainerTreealyzer.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/forestry/arboriculture/gui/ContainerTreealyzer.java b/src/main/java/forestry/arboriculture/gui/ContainerTreealyzer.java index b0e1ec589..6d92cae38 100755 --- a/src/main/java/forestry/arboriculture/gui/ContainerTreealyzer.java +++ b/src/main/java/forestry/arboriculture/gui/ContainerTreealyzer.java @@ -10,19 +10,23 @@ ******************************************************************************/ package forestry.arboriculture.gui; +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 net.minecraft.entity.player.InventoryPlayer; +import org.apache.commons.lang3.ArrayUtils; public class ContainerTreealyzer extends ContainerAlyzer { TreealyzerInventory inventory; + private static Object[] acceptedEnergy = new Object[] {ForestryItem.honeydew, ForestryItem.honeyDrop}; + private static Object[] acceptedSpecimens = ArrayUtils.addAll(AlleleManager.ersatzSaplings.keySet().toArray(), ItemGermlingGE.class); public ContainerTreealyzer(InventoryPlayer inventoryplayer, TreealyzerInventory inventory) { - super(inventoryplayer, inventory, new Object[] { ForestryItem.honeydew, ForestryItem.honeyDrop }, new Object[] { ItemGermlingGE.class }); + super(inventoryplayer, inventory, acceptedEnergy, acceptedSpecimens); } } From 48f8244dd10ed419ea087ca215cefe454c5b8ab0 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 19 Sep 2014 21:00:21 -0700 Subject: [PATCH 095/103] Fixed localization of circuit names and descriptions --- lang | 2 +- .../java/forestry/core/circuits/Circuit.java | 21 +++++++----- .../energy/circuits/CircuitElectricBoost.java | 4 +-- .../circuits/CircuitElectricChange.java | 4 +-- .../energy/circuits/CircuitElectricChoke.java | 2 +- .../circuits/CircuitElectricEfficiency.java | 2 +- .../energy/circuits/CircuitFireDampener.java | 2 +- .../farming/circuits/CircuitFarmLogic.java | 4 +-- .../java/forestry/plugins/PluginEnergy.java | 12 +++---- .../java/forestry/plugins/PluginFarming.java | 32 +++++++++---------- 10 files changed, 44 insertions(+), 41 deletions(-) diff --git a/lang b/lang index 97a62b9cc..899e594a8 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 97a62b9cc7a67f9a77529e4bd40e5b13acf501c5 +Subproject commit 899e594a823957ce20cb37eaf86abddfe3b2add0 diff --git a/src/main/java/forestry/core/circuits/Circuit.java b/src/main/java/forestry/core/circuits/Circuit.java index dadff587a..313b37b21 100755 --- a/src/main/java/forestry/core/circuits/Circuit.java +++ b/src/main/java/forestry/core/circuits/Circuit.java @@ -21,14 +21,10 @@ public abstract class Circuit implements ICircuit { String uid; int limit = 1; boolean requiresDiscovery; - String name; - String[] descriptions; - public Circuit(String uid, boolean requiresDiscovery, String name, String[] descriptions) { + public Circuit(String uid, boolean requiresDiscovery) { this.uid = uid; this.requiresDiscovery = requiresDiscovery; - this.name = name; - this.descriptions = descriptions; ChipsetManager.circuitRegistry.registerCircuit(this); } @@ -54,14 +50,23 @@ public abstract class Circuit implements ICircuit { @Override public String getName() { - return "circuit." + this.name; + return "circuit." + this.uid; } @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void addTooltip(List list) { - for (String description : descriptions) - list.add(" - " + StringUtil.localize(description)); + list.add(StringUtil.localize(getName())); + + int i = 1; + while (true) { + String unlocalizedDescription = getName() + ".description." + i; + String description = StringUtil.localize(unlocalizedDescription); + if (description.endsWith(unlocalizedDescription)) + break; + list.add(" - " + description); + i++; + } } public static ICircuit energyElectricChoke1; diff --git a/src/main/java/forestry/energy/circuits/CircuitElectricBoost.java b/src/main/java/forestry/energy/circuits/CircuitElectricBoost.java index 649b6c698..acdad1149 100755 --- a/src/main/java/forestry/energy/circuits/CircuitElectricBoost.java +++ b/src/main/java/forestry/energy/circuits/CircuitElectricBoost.java @@ -12,8 +12,8 @@ package forestry.energy.circuits; public class CircuitElectricBoost extends CircuitElectricChange { - public CircuitElectricBoost(String uid, int limit, int eu, int mj, String name, String[] description) { - super(uid, false, name, description); + public CircuitElectricBoost(String uid, int limit, int eu, int mj) { + super(uid, false); this.setLimit(limit); this.configureChange(eu, mj); } diff --git a/src/main/java/forestry/energy/circuits/CircuitElectricChange.java b/src/main/java/forestry/energy/circuits/CircuitElectricChange.java index 4440fc70e..a438271e0 100755 --- a/src/main/java/forestry/energy/circuits/CircuitElectricChange.java +++ b/src/main/java/forestry/energy/circuits/CircuitElectricChange.java @@ -20,8 +20,8 @@ public abstract class CircuitElectricChange extends Circuit { int euChange = 7; int mjChange = 2; - public CircuitElectricChange(String uid, boolean requiresDiscovery, String name, String[] descriptions) { - super(uid, requiresDiscovery, name, descriptions); + public CircuitElectricChange(String uid, boolean requiresDiscovery) { + super(uid, requiresDiscovery); } protected void configureChange(int euChange, int mjChange) { diff --git a/src/main/java/forestry/energy/circuits/CircuitElectricChoke.java b/src/main/java/forestry/energy/circuits/CircuitElectricChoke.java index b68eca792..e385e9032 100755 --- a/src/main/java/forestry/energy/circuits/CircuitElectricChoke.java +++ b/src/main/java/forestry/energy/circuits/CircuitElectricChoke.java @@ -13,7 +13,7 @@ package forestry.energy.circuits; public class CircuitElectricChoke extends CircuitElectricChange { public CircuitElectricChoke(String uid) { - super(uid, false, "electric.choke.1", new String[] { "Reduces ouput by 1 MJ/t", "Reduces intake by 2 EU/t" }); + super(uid, false); this.configureChange(-2, -1); this.setLimit(1); } diff --git a/src/main/java/forestry/energy/circuits/CircuitElectricEfficiency.java b/src/main/java/forestry/energy/circuits/CircuitElectricEfficiency.java index 3ebc2ce94..29b10cb49 100755 --- a/src/main/java/forestry/energy/circuits/CircuitElectricEfficiency.java +++ b/src/main/java/forestry/energy/circuits/CircuitElectricEfficiency.java @@ -13,7 +13,7 @@ package forestry.energy.circuits; public class CircuitElectricEfficiency extends CircuitElectricChange { public CircuitElectricEfficiency(String uid) { - super(uid, false, "electric.efficiency.1", new String[] { "Reduces intake by 1 EU/t" }); + super(uid, false); this.setLimit(1); this.configureChange(-1, 0); } diff --git a/src/main/java/forestry/energy/circuits/CircuitFireDampener.java b/src/main/java/forestry/energy/circuits/CircuitFireDampener.java index ee78160d6..f8fe35a4e 100755 --- a/src/main/java/forestry/energy/circuits/CircuitFireDampener.java +++ b/src/main/java/forestry/energy/circuits/CircuitFireDampener.java @@ -18,7 +18,7 @@ import forestry.energy.gadgets.EngineCopper; public class CircuitFireDampener extends Circuit { public CircuitFireDampener(String uid) { - super(uid, false, "dampener.1", new String[] { "Reduces maximum output to 1 MJ/t", "Preserves fuel output" }); + super(uid, false); } @Override diff --git a/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java b/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java index 3a95355e6..d8beda9e9 100755 --- a/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java +++ b/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java @@ -23,8 +23,8 @@ public class CircuitFarmLogic extends Circuit { private Class logicClass; private boolean isManual = false; - public CircuitFarmLogic(String uid, Class logicClass, String[] descriptions) { - super(uid, false, uid, descriptions); + public CircuitFarmLogic(String uid, Class logicClass) { + super(uid, false); this.logicClass = logicClass; setLimit(4); } diff --git a/src/main/java/forestry/plugins/PluginEnergy.java b/src/main/java/forestry/plugins/PluginEnergy.java index 5befe52ff..c25538fbd 100755 --- a/src/main/java/forestry/plugins/PluginEnergy.java +++ b/src/main/java/forestry/plugins/PluginEnergy.java @@ -156,13 +156,11 @@ public class PluginEnergy extends NativePlugin { GeneratorFuel biomassFuel = new GeneratorFuel(biomass, (int) (8 * GameMode.getGameMode().getFloatSetting("fuel.biomass.generator")), 1); FuelManager.generatorFuel.put(biomass.getFluid(), biomassFuel); - Circuit.energyElectricChoke1 = new CircuitElectricChoke("energyChoke1"); - Circuit.energyFireDampener1 = new CircuitFireDampener("energyDampener1"); - Circuit.energyElectricEfficiency1 = new CircuitElectricEfficiency("energyEfficiency1"); - Circuit.energyElectricBoost1 = new CircuitElectricBoost("energyBoost1", 2, 7, 2, "electric.boost.1", new String[]{"Increases output by 2 MJ/t", - "Increases intake by 7 EU/t"}); - Circuit.energyElectricBoost2 = new CircuitElectricBoost("energyBoost2", 2, 15, 4, "electric.boost.2", new String[]{"Increases output by 4 MJ/t", - "Increases intake by 15 EU/t"}); + Circuit.energyElectricChoke1 = new CircuitElectricChoke("electric.choke.1"); + Circuit.energyFireDampener1 = new CircuitFireDampener("dampener.1"); + Circuit.energyElectricEfficiency1 = new CircuitElectricEfficiency("electric.efficiency.1"); + Circuit.energyElectricBoost1 = new CircuitElectricBoost("electric.boost.1", 2, 7, 2); + Circuit.energyElectricBoost2 = new CircuitElectricBoost("electric.boost.2", 2, 15, 4); } @Override diff --git a/src/main/java/forestry/plugins/PluginFarming.java b/src/main/java/forestry/plugins/PluginFarming.java index 801cb5224..018f20a78 100755 --- a/src/main/java/forestry/plugins/PluginFarming.java +++ b/src/main/java/forestry/plugins/PluginFarming.java @@ -171,24 +171,24 @@ public class PluginFarming extends NativePlugin { GameRegistry.registerTileEntity(TileValve.class, "forestry.FarmValve"); GameRegistry.registerTileEntity(TileControl.class, "forestry.FarmControl"); - Circuit.farmArborealManaged = new CircuitFarmLogic("managedArboreal", FarmLogicArboreal.class, new String[]{"Arboreal Plants"}); - Circuit.farmShroomManaged = new CircuitFarmLogic("managedShroom", FarmLogicShroom.class, new String[]{"Mushrooms"}); - Circuit.farmPeatManaged = new CircuitFarmLogic("managedPeat", FarmLogicPeat.class, new String[]{"Peat Bog"}); - Circuit.farmCerealManaged = new CircuitFarmLogic("managedCereal", FarmLogicCereal.class, new String[]{"Crops"}); - Circuit.farmVegetableManaged = new CircuitFarmLogic("managedVegetable", FarmLogicVegetable.class, new String[]{"Vegetables"}); - Circuit.farmInfernalManaged = new CircuitFarmLogic("managedInfernal", FarmLogicInfernal.class, new String[]{"Infernal Crops"}); + Circuit.farmArborealManaged = new CircuitFarmLogic("managedArboreal", FarmLogicArboreal.class); + Circuit.farmShroomManaged = new CircuitFarmLogic("managedShroom", FarmLogicShroom.class); + Circuit.farmPeatManaged = new CircuitFarmLogic("managedPeat", FarmLogicPeat.class); + Circuit.farmCerealManaged = new CircuitFarmLogic("managedCereal", FarmLogicCereal.class); + Circuit.farmVegetableManaged = new CircuitFarmLogic("managedVegetable", FarmLogicVegetable.class); + Circuit.farmInfernalManaged = new CircuitFarmLogic("managedInfernal", FarmLogicInfernal.class); - Circuit.farmPeatManual = new CircuitFarmLogic("manualPeat", FarmLogicPeat.class, new String[]{"Peat Bog"}).setManual(); - Circuit.farmShroomManual = new CircuitFarmLogic("manualShroom", FarmLogicShroom.class, new String[]{"Mushrooms"}).setManual(); - Circuit.farmCerealManual = new CircuitFarmLogic("manualCereal", FarmLogicCereal.class, new String[]{"Crops"}).setManual(); - Circuit.farmVegetableManual = new CircuitFarmLogic("manualVegetable", FarmLogicVegetable.class, new String[]{"Vegetables"}).setManual(); - Circuit.farmSucculentManual = new CircuitFarmLogic("manualSucculent", FarmLogicSucculent.class, new String[]{"Succulents"}).setManual(); - Circuit.farmPoalesManual = new CircuitFarmLogic("manualPoales", FarmLogicPoale.class, new String[]{"Reeds"}).setManual(); - Circuit.farmGourdManual = new CircuitFarmLogic("manualGourd", FarmLogicGourd.class, new String[]{"Gourds"}).setManual(); - Circuit.farmCocoaManual = new CircuitFarmLogic("manualCocoa", FarmLogicCocoa.class, new String[]{"Cocoa Plantation"}).setManual(); + Circuit.farmPeatManual = new CircuitFarmLogic("manualPeat", FarmLogicPeat.class).setManual(); + Circuit.farmShroomManual = new CircuitFarmLogic("manualShroom", FarmLogicShroom.class).setManual(); + Circuit.farmCerealManual = new CircuitFarmLogic("manualCereal", FarmLogicCereal.class).setManual(); + Circuit.farmVegetableManual = new CircuitFarmLogic("manualVegetable", FarmLogicVegetable.class).setManual(); + Circuit.farmSucculentManual = new CircuitFarmLogic("manualSucculent", FarmLogicSucculent.class).setManual(); + Circuit.farmPoalesManual = new CircuitFarmLogic("manualPoales", FarmLogicPoale.class).setManual(); + Circuit.farmGourdManual = new CircuitFarmLogic("manualGourd", FarmLogicGourd.class).setManual(); + Circuit.farmCocoaManual = new CircuitFarmLogic("manualCocoa", FarmLogicCocoa.class).setManual(); - Circuit.farmOrchardManual = new CircuitFarmLogic("manualOrchard", FarmLogicOrchard.class, new String[]{"Orchard"}); - Circuit.farmRubberManual = new CircuitFarmLogic("manualRubber", FarmLogicRubber.class, new String[]{"Rubber Plantation"}); + Circuit.farmOrchardManual = new CircuitFarmLogic("manualOrchard", FarmLogicOrchard.class); + Circuit.farmRubberManual = new CircuitFarmLogic("manualRubber", FarmLogicRubber.class); MinecraftForge.EVENT_BUS.register(new EventHandlerFarming()); } From 646e0fdb5ac17de026a3784b96fa93ff1b841ce0 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 19 Sep 2014 21:24:51 -0700 Subject: [PATCH 096/103] Fix #201: Worktable crash on shift-clicking items in. --- src/main/java/forestry/factory/gadgets/TileWorktable.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/forestry/factory/gadgets/TileWorktable.java b/src/main/java/forestry/factory/gadgets/TileWorktable.java index 7b33d2c78..f8c1306f8 100755 --- a/src/main/java/forestry/factory/gadgets/TileWorktable.java +++ b/src/main/java/forestry/factory/gadgets/TileWorktable.java @@ -461,7 +461,9 @@ public class TileWorktable extends TileBase implements ICrafter { craftingInventory.setInventorySlotContents(SLOT_CRAFTING_RESULT, null); } - private boolean validateResources() { + private boolean canCraftCurrentRecipe() { + if (currentRecipe == null) + return false; ItemStack[] set = craftingInventory.getStacks(SLOT_CRAFTING_1, 9); ItemStack[] stock = accessibleInventory.getStacks(SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT); return StackUtils.containsSets(set, stock, currentRecipe.getRecipeOutput(), true, true) > 0; @@ -474,7 +476,9 @@ public class TileWorktable extends TileBase implements ICrafter { @Override public boolean canTakeStack(int slotIndex) { - return validateResources(); + if (slotIndex == SLOT_CRAFTING_RESULT) + return canCraftCurrentRecipe(); + return true; } @Override From 12a8c0bc5e5008fffb9714e3be6bac7ae9bc640b Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 19 Sep 2014 21:34:03 -0700 Subject: [PATCH 097/103] Removed unused "exclude" param from StackUtils.containsSets --- src/main/java/forestry/core/utils/InventoryAdapter.java | 2 +- src/main/java/forestry/core/utils/StackUtils.java | 7 ++----- .../java/forestry/factory/gadgets/MachineCarpenter.java | 2 +- .../java/forestry/factory/gadgets/MachineSqueezer.java | 2 +- src/main/java/forestry/factory/gadgets/TileWorktable.java | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/java/forestry/core/utils/InventoryAdapter.java b/src/main/java/forestry/core/utils/InventoryAdapter.java index 0c2fc4d8d..084586f21 100755 --- a/src/main/java/forestry/core/utils/InventoryAdapter.java +++ b/src/main/java/forestry/core/utils/InventoryAdapter.java @@ -207,7 +207,7 @@ public class InventoryAdapter implements IInventory, INBTTagable { ItemStack[] condensedSet = StackUtils.condenseStacks(set, -1, false); ItemStack[] stock = getStacks(firstSlotIndex, slotCount); - if (StackUtils.containsSets(condensedSet, stock, null, oreDictionary, craftingTools) < count) + if (StackUtils.containsSets(condensedSet, stock, oreDictionary, craftingTools) < count) return false; for (ItemStack stackToRemove : condensedSet) { diff --git a/src/main/java/forestry/core/utils/StackUtils.java b/src/main/java/forestry/core/utils/StackUtils.java index 5fc271975..fda13c15c 100755 --- a/src/main/java/forestry/core/utils/StackUtils.java +++ b/src/main/java/forestry/core/utils/StackUtils.java @@ -255,7 +255,7 @@ public class StackUtils { * @return */ public static int containsSets(ItemStack[] set, ItemStack[] stock) { - return containsSets(set, stock, null, false, false); + return containsSets(set, stock, false, false); } /** @@ -265,7 +265,7 @@ public class StackUtils { * @param stock * @return */ - public static int containsSets(ItemStack[] set, ItemStack[] stock, ItemStack exclude, boolean oreDictionary, boolean craftingTools) { + public static int containsSets(ItemStack[] set, ItemStack[] stock, boolean oreDictionary, boolean craftingTools) { int count = 0; ItemStack[] condensedRequired = StackUtils.condenseStacks(set, -1, oreDictionary); @@ -276,9 +276,6 @@ public class StackUtils { boolean matched = false; for (ItemStack offer : condensedOffered) { - if (exclude != null && isIdenticalItem(offer, exclude)) - continue; - if (isCraftingEquivalent(req, offer, oreDictionary, craftingTools)) { matched = true; diff --git a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java index 3175f0021..7222ef072 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java @@ -432,7 +432,7 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL return false; // Need at least one matched set - return StackUtils.containsSets(craftingInventory.getStacks(SLOT_CRAFTING_1, 9), accessibleInventory.getStacks(SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT), null, true, false) > 0; + return StackUtils.containsSets(craftingInventory.getStacks(SLOT_CRAFTING_1, 9), accessibleInventory.getStacks(SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT), true, false) > 0; } private boolean removeResources(Recipe recipe) { diff --git a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java index 15e24e659..4f4e414e8 100755 --- a/src/main/java/forestry/factory/gadgets/MachineSqueezer.java +++ b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java @@ -83,7 +83,7 @@ public class MachineSqueezer extends TilePowered implements ISpecialInventory, I } public boolean matches(ItemStack[] res) { - return StackUtils.containsSets(resources, res, null, true, true) > 0; + return StackUtils.containsSets(resources, res, true, true) > 0; } } diff --git a/src/main/java/forestry/factory/gadgets/TileWorktable.java b/src/main/java/forestry/factory/gadgets/TileWorktable.java index f8c1306f8..c2dbfc7a0 100755 --- a/src/main/java/forestry/factory/gadgets/TileWorktable.java +++ b/src/main/java/forestry/factory/gadgets/TileWorktable.java @@ -466,7 +466,7 @@ public class TileWorktable extends TileBase implements ICrafter { return false; ItemStack[] set = craftingInventory.getStacks(SLOT_CRAFTING_1, 9); ItemStack[] stock = accessibleInventory.getStacks(SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT); - return StackUtils.containsSets(set, stock, currentRecipe.getRecipeOutput(), true, true) > 0; + return StackUtils.containsSets(set, stock, true, true) > 0; } private boolean removeResources(EntityPlayer player) { From acccfac0c32f4e13dd062c93198df5b0e74fe460 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 19 Sep 2014 23:15:38 -0700 Subject: [PATCH 098/103] minor reformatting for readability --- src/main/java/forestry/factory/gadgets/MachineCarpenter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java index 7222ef072..d9bafbc3a 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCarpenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java @@ -432,7 +432,9 @@ public class MachineCarpenter extends TilePowered implements ISidedInventory, IL return false; // Need at least one matched set - return StackUtils.containsSets(craftingInventory.getStacks(SLOT_CRAFTING_1, 9), accessibleInventory.getStacks(SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT), true, false) > 0; + ItemStack[] set = craftingInventory.getStacks(SLOT_CRAFTING_1, 9); + ItemStack[] stock = accessibleInventory.getStacks(SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT); + return StackUtils.containsSets(set, stock, true, false) > 0; } private boolean removeResources(Recipe recipe) { From d459856852f46364b556a2760a6454c0119f2d47 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 19 Sep 2014 23:18:14 -0700 Subject: [PATCH 099/103] Make sure worktables don't craft ore-dictionary items into wrong recipe For example: Wood Logs are all ore dictionary equivalent with each other, but an Oak Log shouldn't be able to make Ebony Wood Planks because it makes Oak Wood Planks using the same recipe. --- .../factory/gadgets/TileWorktable.java | 51 ++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/src/main/java/forestry/factory/gadgets/TileWorktable.java b/src/main/java/forestry/factory/gadgets/TileWorktable.java index c2dbfc7a0..14ece46b3 100755 --- a/src/main/java/forestry/factory/gadgets/TileWorktable.java +++ b/src/main/java/forestry/factory/gadgets/TileWorktable.java @@ -464,9 +464,58 @@ public class TileWorktable extends TileBase implements ICrafter { private boolean canCraftCurrentRecipe() { if (currentRecipe == null) return false; + + // Need at least one matched set ItemStack[] set = craftingInventory.getStacks(SLOT_CRAFTING_1, 9); ItemStack[] stock = accessibleInventory.getStacks(SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT); - return StackUtils.containsSets(set, stock, true, true) > 0; + if (StackUtils.containsSets(set, stock, true, true) == 0) + return false; + + // Check that it doesn't make a different recipe. + // For example: + // Wood Logs are all ore dictionary equivalent with each other, + // but an Oak Log shouldn't be able to make Ebony Wood Planks + // because it makes Oak Wood Planks using the same recipe. + // Strategy: + // Create a fake crafting inventory using items we have in stock + // in place of the ones in the saved crafting inventory. + // Check that the recipe it makes is the same as the currentRecipe. + InventoryCrafting crafting = new InventoryCrafting(DUMMY_CONTAINER, 3, 3); + InventoryAdapter recipeMatrix = currentRecipe.getMatrix(); + ItemStack[] stockCopy = StackUtils.condenseStacks(stock); + + for (int slot = 0; slot < recipeMatrix.getSizeInventory(); slot++) { + ItemStack recipeStack = recipeMatrix.getStackInSlot(slot); + if (recipeStack == null) + continue; + + // Use crafting equivalent (not oredict) items first + for (ItemStack stockStack : stockCopy) { + if (stockStack.stackSize > 0 && StackUtils.isCraftingEquivalent(recipeStack, stockStack, false, false)) { + ItemStack stack = new ItemStack(stockStack.getItem(), 1, stockStack.getItemDamage()); + stockStack.stackSize--; + crafting.setInventorySlotContents(slot, stack); + break; + } + } + + // Use oredict items if crafting equivalent items aren't available + if (crafting.getStackInSlot(slot) == null) { + for (ItemStack stockStack : stockCopy) { + if (stockStack.stackSize > 0 && StackUtils.isCraftingEquivalent(recipeStack, stockStack, true, true)) { + ItemStack stack = new ItemStack(stockStack.getItem(), 1, stockStack.getItemDamage()); + stockStack.stackSize--; + crafting.setInventorySlotContents(slot, stack); + break; + } + } + } + } + IRecipe recipe = RECIPE_BRIDGE.getRecipe(crafting, worldObj); + if (recipe == null) + return false; + + return recipe.getRecipeOutput().isItemEqual(currentRecipe.getRecipeOutput()); } private boolean removeResources(EntityPlayer player) { From 7f50c7e929bc952abb8466f88aa16fc1e7ec54cb Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 20 Sep 2014 01:53:15 -0700 Subject: [PATCH 100/103] Fix #181: Letters sent to yourself disappear in Single Player --- .../forestry/core/gadgets/TileForestry.java | 7 ---- .../forestry/core/proxy/ProxyNetwork.java | 3 +- .../forestry/mail/gadgets/MachineMailbox.java | 34 ++++--------------- .../forestry/mail/gui/ContainerMailbox.java | 13 ++++--- 4 files changed, 17 insertions(+), 40 deletions(-) diff --git a/src/main/java/forestry/core/gadgets/TileForestry.java b/src/main/java/forestry/core/gadgets/TileForestry.java index 9d9795ba4..38e2fcdc3 100755 --- a/src/main/java/forestry/core/gadgets/TileForestry.java +++ b/src/main/java/forestry/core/gadgets/TileForestry.java @@ -264,13 +264,6 @@ public abstract class TileForestry extends TileEntity implements INetworkedEntit return owner; } - public EntityPlayer getOwnerEntity() { - if (owner != null) - return worldObj.func_152378_a(owner.getId()); - else - return null; - } - @Override public void setOwner(EntityPlayer player) { this.owner = player.getGameProfile(); diff --git a/src/main/java/forestry/core/proxy/ProxyNetwork.java b/src/main/java/forestry/core/proxy/ProxyNetwork.java index f13fd1e63..516c76eaa 100755 --- a/src/main/java/forestry/core/proxy/ProxyNetwork.java +++ b/src/main/java/forestry/core/proxy/ProxyNetwork.java @@ -15,6 +15,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; +import net.minecraftforge.common.util.FakePlayer; import forestry.Forestry; import forestry.core.config.Defaults; @@ -38,7 +39,7 @@ public class ProxyNetwork { } public void sendToPlayer(ForestryPacket packet, EntityPlayer entityplayer) { - if (!(entityplayer instanceof EntityPlayerMP)) + if (!(entityplayer instanceof EntityPlayerMP) || (entityplayer instanceof FakePlayer)) return; EntityPlayerMP player = (EntityPlayerMP) entityplayer; diff --git a/src/main/java/forestry/mail/gadgets/MachineMailbox.java b/src/main/java/forestry/mail/gadgets/MachineMailbox.java index 6e6645d13..f26e1dfea 100755 --- a/src/main/java/forestry/mail/gadgets/MachineMailbox.java +++ b/src/main/java/forestry/mail/gadgets/MachineMailbox.java @@ -18,6 +18,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -80,25 +81,15 @@ public class MachineMailbox extends TileBase implements IMailContainer, ISpecial @Override public void updateServerSide() { if (!isLinked) { - getOrCreateMailInventory(); + getOrCreateMailInventory(worldObj, getOwnerProfile()); isLinked = true; } } /* MAIL HANDLING */ - public IInventory getOrCreateMailInventory() { - return getOrCreateMailInventory(null); - } - public IInventory getOrCreateMailInventory(EntityPlayer player) { - GameProfile playerProfile; - if (player != null) { - playerProfile = player.getGameProfile(); - } else { - playerProfile = getOwnerProfile(); - } - - if (playerProfile == null) + public IInventory getOrCreateMailInventory(World world, GameProfile playerProfile) { + if (!Proxies.common.isSimulating(world)) return new InventoryAdapter(POBox.SLOT_SIZE, "Letters"); IMailAddress address = PostManager.postRegistry.getMailAddress(playerProfile); @@ -121,7 +112,7 @@ public class MachineMailbox extends TileBase implements IMailContainer, ISpecial @Override public boolean hasMail() { - IInventory mailInventory = getOrCreateMailInventory(); + IInventory mailInventory = getOrCreateMailInventory(worldObj, getOwnerProfile()); for (int i = 0; i < mailInventory.getSizeInventory(); i++) if (mailInventory.getStackInSlot(i) != null) return true; @@ -137,19 +128,6 @@ public class MachineMailbox extends TileBase implements IMailContainer, ISpecial return res; } - /* ISIDEDINVENTORY */ - private static int[] slotIndices; - - public int[] getSizeInventorySide(int side) { - IInventory inventory = getOrCreateMailInventory(); - if(slotIndices == null) { - slotIndices = new int[inventory.getSizeInventory()]; - for(int i = 0; i < inventory.getSizeInventory(); i++) - slotIndices[i] = i; - } - return slotIndices; - } - /* ISPECIALINVENTORY */ @Override public int addItem(ItemStack stack, boolean doAdd, ForgeDirection from) { @@ -168,7 +146,7 @@ public class MachineMailbox extends TileBase implements IMailContainer, ISpecial public ItemStack[] extractItem(boolean doRemove, ForgeDirection from, int maxItemCount) { ItemStack product = null; - IInventory mailInventory = getOrCreateMailInventory(); + IInventory mailInventory = getOrCreateMailInventory(worldObj, getOwnerProfile()); for (int i = 0; i < mailInventory.getSizeInventory(); i++) { ItemStack slotStack = mailInventory.getStackInSlot(i); diff --git a/src/main/java/forestry/mail/gui/ContainerMailbox.java b/src/main/java/forestry/mail/gui/ContainerMailbox.java index 68620e852..4569fccb8 100755 --- a/src/main/java/forestry/mail/gui/ContainerMailbox.java +++ b/src/main/java/forestry/mail/gui/ContainerMailbox.java @@ -27,6 +27,9 @@ import forestry.plugins.PluginMail; public class ContainerMailbox extends ContainerForestry { + public static final short SLOT_LETTERS = 0; + public static final short SLOT_LETTERS_COUNT = 7 * 12; + MachineMailbox mailbox; POBox mailinventory; @@ -36,7 +39,7 @@ public class ContainerMailbox extends ContainerForestry { // Mailbox contents this.mailbox = tile; - IInventory inv = mailbox.getOrCreateMailInventory(player.player); + IInventory inv = mailbox.getOrCreateMailInventory(player.player.worldObj, player.player.getGameProfile()); if (inv instanceof POBox) mailinventory = (POBox) inv; @@ -58,9 +61,11 @@ public class ContainerMailbox extends ContainerForestry { public ItemStack slotClick(int slotIndex, int button, int par3, EntityPlayer player) { ItemStack stack = super.slotClick(slotIndex, button, par3, player); - if (Proxies.common.isSimulating(player.worldObj) && mailinventory != null) { - IMailAddress address = PostManager.postRegistry.getMailAddress(mailbox.getOwnerProfile()); - PluginMail.proxy.setPOBoxInfo(mailbox.getWorldObj(), address, mailinventory.getPOBoxInfo()); + if (slotIndex >= SLOT_LETTERS && slotIndex < SLOT_LETTERS + SLOT_LETTERS_COUNT) { + if (Proxies.common.isSimulating(player.worldObj) && mailinventory != null) { + IMailAddress address = PostManager.postRegistry.getMailAddress(player.getGameProfile()); + PluginMail.proxy.setPOBoxInfo(mailbox.getWorldObj(), address, mailinventory.getPOBoxInfo()); + } } return stack; From af7b9e13ec791ede90382916b3efd7f46e6b591c Mon Sep 17 00:00:00 2001 From: Parker Young Date: Sat, 20 Sep 2014 16:24:11 -0400 Subject: [PATCH 101/103] Updated lang submodule --- lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang b/lang index 899e594a8..c3743cfd7 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 899e594a823957ce20cb37eaf86abddfe3b2add0 +Subproject commit c3743cfd74a24aa096240e637868da95eaad7d03 From b42a5803a8bfa693a0c84ebe1bca03fe87c433cd Mon Sep 17 00:00:00 2001 From: Parker Young Date: Sat, 20 Sep 2014 16:26:33 -0400 Subject: [PATCH 102/103] Updated Gradle wrapper to 2.0 --- gradle/wrapper/gradle-wrapper.jar | Bin 51106 -> 51017 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 3c7abdf12790879c06b07176de29647f77aa4129..b7612167031001b7b84baf2a959e8ea8ad03c011 100644 GIT binary patch delta 22539 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 delta 22638 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ѯ?jC=Pd%zYo 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 T@ Date: Sat, 20 Sep 2014 16:01:09 -0700 Subject: [PATCH 103/103] Fix #205: Worktable cannot craft certain items (AE2 Facades) --- .../factory/gadgets/TileWorktable.java | 70 +++++++------------ 1 file changed, 25 insertions(+), 45 deletions(-) diff --git a/src/main/java/forestry/factory/gadgets/TileWorktable.java b/src/main/java/forestry/factory/gadgets/TileWorktable.java index 14ece46b3..83f393db4 100755 --- a/src/main/java/forestry/factory/gadgets/TileWorktable.java +++ b/src/main/java/forestry/factory/gadgets/TileWorktable.java @@ -50,33 +50,19 @@ public class TileWorktable extends TileBase implements ICrafter { private final static RecipeBridge RECIPE_BRIDGE = new RecipeBridge(); private static class RecipeBridge { - - private final LinkedList overrides = new LinkedList(); - - public IRecipe getRecipe(InventoryCrafting crafting, World world) { - for (IRecipe recipe : overrides) { - if (recipe.matches(crafting, world)) - return recipe; - } - - for (Object obj : CraftingManager.getInstance().getRecipeList()) { - IRecipe recipe = (IRecipe) obj; - if (recipe.matches(crafting, world)) - return recipe; - } - - return null; + public ItemStack findMatchingRecipe(InventoryCrafting crafting, World world) { + return CraftingManager.getInstance().findMatchingRecipe(crafting, world); } } /* RECIPE MEMORY */ - public static final class Recipe implements IRecipe, INBTTagable { + public static final class Recipe implements INBTTagable { private InventoryAdapter matrix; private long lastUsed; private boolean locked; private World cachedWorld; - private IRecipe cachedRecipe; + private ItemStack cachedRecipeOutput; public Recipe(InventoryCrafting crafting) { this.matrix = new InventoryAdapter(new PlainInventory(crafting)); @@ -90,9 +76,9 @@ public class TileWorktable extends TileBase implements ICrafter { this.cachedWorld = world; } - private boolean updateCachedIRecipe() { + private boolean updateCachedRecipeOutput() { - if (cachedRecipe != null) + if (cachedRecipeOutput != null) return true; InventoryCrafting crafting = new InventoryCrafting(DUMMY_CONTAINER, 3, 3); @@ -100,8 +86,8 @@ public class TileWorktable extends TileBase implements ICrafter { crafting.setInventorySlotContents(i, matrix.getStackInSlot(i)); } - cachedRecipe = RECIPE_BRIDGE.getRecipe(crafting, cachedWorld); - return cachedRecipe != null; + cachedRecipeOutput = RECIPE_BRIDGE.findMatchingRecipe(crafting, cachedWorld); + return cachedRecipeOutput != null; } public void updateLastUse(World world) { @@ -117,18 +103,16 @@ public class TileWorktable extends TileBase implements ICrafter { return matrix; } - @Override public ItemStack getCraftingResult(InventoryCrafting inventorycrafting) { - if (updateCachedIRecipe()) - return cachedRecipe.getCraftingResult(inventorycrafting); + if (updateCachedRecipeOutput()) + return cachedRecipeOutput; return null; } - @Override public ItemStack getRecipeOutput() { - if (updateCachedIRecipe()) - return cachedRecipe.getRecipeOutput(); + if (updateCachedRecipeOutput()) + return cachedRecipeOutput; return null; } @@ -141,20 +125,17 @@ public class TileWorktable extends TileBase implements ICrafter { return this.locked; } - @Override public int getRecipeSize() { return matrix.getSizeInventory(); } - @Override - public boolean matches(InventoryCrafting crafting, World world) { - if (crafting.getSizeInventory() != matrix.getSizeInventory()) + public boolean hasSameOutput(InventoryCrafting crafting, World world) { + + if (!updateCachedRecipeOutput()) return false; - if (!updateCachedIRecipe()) - return false; - - return cachedRecipe.matches(crafting, world); + ItemStack recipeOutput = RECIPE_BRIDGE.findMatchingRecipe(crafting, world); + return recipeOutput != null && cachedRecipeOutput.isItemEqual(recipeOutput); } @Override @@ -261,7 +242,7 @@ public class TileWorktable extends TileBase implements ICrafter { private Recipe getMemorized(InventoryCrafting crafting, World world) { for (Recipe recipe : recipes) { - if (recipe.matches(crafting, world)) + if (recipe.hasSameOutput(crafting, world)) return recipe; } @@ -438,8 +419,8 @@ public class TileWorktable extends TileBase implements ICrafter { /* CRAFTING */ public void setRecipe(InventoryCrafting crafting) { - IRecipe recipe = RECIPE_BRIDGE.getRecipe(crafting, worldObj); - if (recipe == null) { + ItemStack recipeOutput = RECIPE_BRIDGE.findMatchingRecipe(crafting, worldObj); + if (recipeOutput == null) { currentRecipe = null; currentCrafting = null; } else { @@ -481,11 +462,10 @@ public class TileWorktable extends TileBase implements ICrafter { // in place of the ones in the saved crafting inventory. // Check that the recipe it makes is the same as the currentRecipe. InventoryCrafting crafting = new InventoryCrafting(DUMMY_CONTAINER, 3, 3); - InventoryAdapter recipeMatrix = currentRecipe.getMatrix(); ItemStack[] stockCopy = StackUtils.condenseStacks(stock); - for (int slot = 0; slot < recipeMatrix.getSizeInventory(); slot++) { - ItemStack recipeStack = recipeMatrix.getStackInSlot(slot); + for (int slot = 0; slot < currentCrafting.getSizeInventory(); slot++) { + ItemStack recipeStack = currentCrafting.getStackInSlot(slot); if (recipeStack == null) continue; @@ -511,11 +491,11 @@ public class TileWorktable extends TileBase implements ICrafter { } } } - IRecipe recipe = RECIPE_BRIDGE.getRecipe(crafting, worldObj); - if (recipe == null) + ItemStack recipeOutput = RECIPE_BRIDGE.findMatchingRecipe(crafting, worldObj); + if (recipeOutput == null) return false; - return recipe.getRecipeOutput().isItemEqual(currentRecipe.getRecipeOutput()); + return recipeOutput.isItemEqual(currentRecipe.getRecipeOutput()); } private boolean removeResources(EntityPlayer player) {