From afb3ee56dd63a84ab106f11e7c7f56cb66e6730d Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Tue, 17 May 2016 16:16:39 +0200 Subject: [PATCH] Fix #1183 Portable alyzer, Fix #1185 Infuser GUI crash and Fix #1187 Crash when trying to break farm block --- .../forestry/core/gui/ContainerItemInventory.java | 2 +- .../forestry/core/inventory/ItemInventoryAlyzer.java | 12 ++++++++++++ .../java/forestry/core/items/ItemRegistryCore.java | 2 -- .../java/forestry/farming/models/ModelFarmBlock.java | 4 +++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/java/forestry/core/gui/ContainerItemInventory.java b/src/main/java/forestry/core/gui/ContainerItemInventory.java index 1003fc6bf..fd3c030c4 100755 --- a/src/main/java/forestry/core/gui/ContainerItemInventory.java +++ b/src/main/java/forestry/core/gui/ContainerItemInventory.java @@ -53,7 +53,7 @@ public abstract class ContainerItemInventory extends Co @Override public ItemStack slotClick(int slotId, int dragType_or_button, ClickType clickTypeIn, EntityPlayer player) { ItemStack result = super.slotClick(slotId, dragType_or_button, clickTypeIn, player); - if(slotId != -999){ + if(slotId > 0){ inventory.onSlotClick(inventorySlots.get(slotId).getSlotIndex(), player); } return result; diff --git a/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java b/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java index 669b69adf..16e886a4d 100644 --- a/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java +++ b/src/main/java/forestry/core/inventory/ItemInventoryAlyzer.java @@ -58,6 +58,18 @@ public class ItemInventoryAlyzer extends ItemInventory implements IErrorSource, return alyzer.canSlotAccept(this, slotIndex, itemStack); } + @Override + public void setInventorySlotContents(int slotIndex, ItemStack itemStack) { + if(!hasSpecimen() && slotIndex == SLOT_SPECIMEN){ + ItemStack ersatz = GeneticsUtil.convertSaplingToGeneticEquivalent(itemStack); + if(ersatz != null){ + super.setInventorySlotContents(slotIndex, ersatz); + return; + } + } + super.setInventorySlotContents(slotIndex, itemStack); + } + @Override public void onSlotClick(int slotIndex, EntityPlayer player) { ISpeciesRoot speciesRoot; diff --git a/src/main/java/forestry/core/items/ItemRegistryCore.java b/src/main/java/forestry/core/items/ItemRegistryCore.java index 666fe4320..ad80094ff 100644 --- a/src/main/java/forestry/core/items/ItemRegistryCore.java +++ b/src/main/java/forestry/core/items/ItemRegistryCore.java @@ -11,8 +11,6 @@ package forestry.core.items; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; import forestry.api.core.Tabs; diff --git a/src/main/java/forestry/farming/models/ModelFarmBlock.java b/src/main/java/forestry/farming/models/ModelFarmBlock.java index 4cdf56629..b75489257 100644 --- a/src/main/java/forestry/farming/models/ModelFarmBlock.java +++ b/src/main/java/forestry/farming/models/ModelFarmBlock.java @@ -43,9 +43,11 @@ public class ModelFarmBlock extends ModelBlockDefault { TileFarm farm = TileUtil.getTile(world, pos, TileFarm.class); EnumFarmBlockTexture texture = EnumFarmBlockTexture.BRICK; + TextureAtlasSprite[] overlayTextures = getOverlaySprites(EnumFarmBlockType.PLAIN); if(farm != null){ texture = farm.getFarmBlockTexture(); + overlayTextures = getOverlaySprites(farm.getFarmBlockType()); } TextureAtlasSprite[] textures = getSprites(texture); @@ -53,7 +55,7 @@ public class ModelFarmBlock extends ModelBlockDefault { // Add the plain block. baker.addBlockModel(blockFarm, Block.FULL_BLOCK_AABB, pos, textures, 0); // Add the overlay block. - baker.addBlockModel(blockFarm, Block.FULL_BLOCK_AABB, pos, getOverlaySprites(farm.getFarmBlockType()), 0); + baker.addBlockModel(blockFarm, Block.FULL_BLOCK_AABB, pos, overlayTextures, 0); // Set the particle sprite baker.setParticleSprite(textures[0]);