From 8a103a72cc387410b58141e8ecbe74948ef9879c Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Wed, 26 Oct 2016 23:59:04 +0200 Subject: [PATCH] Remove Unused Encylopedia --- src/main/java/binnie/botany/Botany.java | 2 - .../botany/genetics/ModuleGenetics.java | 9 ---- .../java/binnie/core/item/ModuleItems.java | 45 +++++++++++------- .../genetics/gui/AnalystPageAppearance.java | 1 + .../botany/textures/items/encylopedia.png | Bin 322 -> 0 bytes .../textures/items/encylopediaReinforced.png | Bin 322 -> 0 bytes 6 files changed, 29 insertions(+), 28 deletions(-) delete mode 100644 src/main/resources/assets/botany/textures/items/encylopedia.png delete mode 100644 src/main/resources/assets/botany/textures/items/encylopediaReinforced.png diff --git a/src/main/java/binnie/botany/Botany.java b/src/main/java/binnie/botany/Botany.java index 780db42e..dbc21c9a 100644 --- a/src/main/java/binnie/botany/Botany.java +++ b/src/main/java/binnie/botany/Botany.java @@ -65,8 +65,6 @@ public class Botany extends AbstractMod { public static ItemBotany seed; public static ItemBotany pollen; public static ItemDictionary database; - public static ItemEncyclopedia encyclopedia; - public static ItemEncyclopedia encyclopediaIron; /* MODULE GARDENING */ public static BlockPlant plant; diff --git a/src/main/java/binnie/botany/genetics/ModuleGenetics.java b/src/main/java/binnie/botany/genetics/ModuleGenetics.java index 88cdcd05..379a7ec1 100644 --- a/src/main/java/binnie/botany/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/botany/genetics/ModuleGenetics.java @@ -38,8 +38,6 @@ public class ModuleGenetics implements IInitializable { Botany.pollen = new ItemBotany("pollen", EnumFlowerStage.POLLEN, "pollen"); Botany.seed = new ItemBotany("seed", EnumFlowerStage.SEED, "germling"); Botany.database = new ItemDictionary(); - Botany.encyclopedia = new ItemEncyclopedia(false); - Botany.encyclopediaIron = new ItemEncyclopedia(true); } @Override @@ -57,13 +55,6 @@ public class ModuleGenetics implements IInitializable { OreDictionary.registerOre("flower", new ItemStack(Blocks.DOUBLE_PLANT, 1, 4)); OreDictionary.registerOre("flower", new ItemStack(Blocks.DOUBLE_PLANT, 1, 5)); OreDictionary.registerOre("flower", new ItemStack(Botany.flower, 1, OreDictionary.WILDCARD_VALUE)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Botany.encyclopedia), - "fff", - "fbf", - "fff", - 'f', "flower", - 'b', Items.BOOK)); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Botany.encyclopediaIron), new ItemStack(Botany.encyclopedia), "ingotIron")); FlowerManager.flowerRegistry.registerAcceptableFlower(Botany.flower, "flowersVanilla"); RecipeManagers.carpenterManager.addRecipe(100, Binnie.Liquid.getFluidStack("water", 2000), null, new ItemStack(Botany.database), "X#X", diff --git a/src/main/java/binnie/core/item/ModuleItems.java b/src/main/java/binnie/core/item/ModuleItems.java index 5acc4d6c..bcbc4020 100644 --- a/src/main/java/binnie/core/item/ModuleItems.java +++ b/src/main/java/binnie/core/item/ModuleItems.java @@ -2,16 +2,20 @@ package binnie.core.item; import binnie.botany.Botany; import binnie.botany.api.IFlower; +import binnie.botany.api.IFlowerGenome; import binnie.botany.flower.TileEntityFlower; import binnie.botany.network.PacketID; import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.core.network.packet.MessageNBT; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -37,24 +41,31 @@ public class ModuleItems implements IInitializable { if (!BinnieCore.isBotanyActive()) { return; } + BlockPos pos = event.getPos(); + World world = event.getWorld(); + EntityPlayer player = event.getEntityPlayer(); - if (event.getEntityPlayer() != null && event.getEntityPlayer().getHeldItemMainhand() != null && event.getEntityPlayer().getHeldItemMainhand().getItem() == BinnieCore.fieldKit && event.getEntityPlayer().isSneaking()) { - final TileEntity tile = event.getWorld().getTileEntity(event.getPos()); - if (tile instanceof TileEntityFlower) { - final TileEntityFlower tileFlower = (TileEntityFlower) tile; - final IFlower flower = tileFlower.getFlower(); - if (flower != null) { - final NBTTagCompound info = new NBTTagCompound(); - info.setString("Species", flower.getGenome().getPrimary().getUID()); - info.setString("Species2", flower.getGenome().getSecondary().getUID()); - info.setFloat("Age", flower.getAge() / flower.getGenome().getLifespan()); - info.setShort("Colour", (short) flower.getGenome().getPrimaryColor().getID()); - info.setShort("Colour2", (short) flower.getGenome().getSecondaryColor().getID()); - info.setBoolean("Wilting", flower.isWilted()); - info.setBoolean("Flowered", flower.hasFlowered()); - Botany.proxy.sendToPlayer(new MessageNBT(PacketID.Encylopedia.ordinal(), info), event.getEntityPlayer()); - event.getEntityPlayer().getHeldItemMainhand().damageItem(1, event.getEntityPlayer()); - } + if (player != null) { + ItemStack heldItem = player.getHeldItemMainhand(); + if(heldItem != null && heldItem.getItem() == BinnieCore.fieldKit && player.isSneaking()){ + TileEntity tile = world.getTileEntity(pos); + if (tile instanceof TileEntityFlower) { + TileEntityFlower tileFlower = (TileEntityFlower) tile; + IFlower flower = tileFlower.getFlower(); + if (flower != null && flower.getGenome() != null) { + IFlowerGenome flowerGenome = flower.getGenome(); + NBTTagCompound info = new NBTTagCompound(); + info.setString("Species", flowerGenome.getPrimary().getUID()); + info.setString("Species2", flowerGenome.getSecondary().getUID()); + info.setFloat("Age", flower.getAge() / flowerGenome.getLifespan()); + info.setShort("Colour", (short) flowerGenome.getPrimaryColor().getID()); + info.setShort("Colour2", (short) flowerGenome.getSecondaryColor().getID()); + info.setBoolean("Wilting", flower.isWilted()); + info.setBoolean("Flowered", flower.hasFlowered()); + Botany.proxy.sendToPlayer(new MessageNBT(PacketID.Encylopedia.ordinal(), info), player); + heldItem.damageItem(1, event.getEntityPlayer()); + } + } } } } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java b/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java index b7d9d7c7..e5889ca4 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java @@ -3,6 +3,7 @@ package binnie.genetics.gui; import binnie.botany.api.IFlower; import binnie.craftgui.botany.ControlColourDisplay; import binnie.craftgui.controls.ControlTextCentered; +import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.geometry.IArea; import binnie.craftgui.minecraft.control.ControlIconDisplay; diff --git a/src/main/resources/assets/botany/textures/items/encylopedia.png b/src/main/resources/assets/botany/textures/items/encylopedia.png deleted file mode 100644 index d0403aff2c148855c64fcf9f4c264f3bb729f07b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL9r6oh?3y^w370~qEv>0#LT=By}Z;C1rt33 z>la@$fhx9ox;Tbd_;2ku_!19-e%RzI307ul4DS%izA@jiuMNN$^kK5xX{7Y>H6Br0#LT=By}Z;C1rt33 z>la@$fhx9ox;Tbd_;2kuMWLN+i&*ZjYu3B? z;B0E3R(#{#!mX!2pETM0z(Q`v1coV2oI%MwH!Z&lU2yO+F=#okyJS