From c24571006a56b95aaa7737ef69b2918bcbbce443 Mon Sep 17 00:00:00 2001 From: SoundLogic Date: Sat, 23 Aug 2014 14:35:39 -0500 Subject: [PATCH 1/5] Created the needed pages in the botania guide --- .../botania/client/lib/LibResources.java | 1 + .../botania/common/lexicon/LexiconData.java | 9 +- .../common/lexicon/page/PageEntity.java | 136 ++++++++++++++++ .../common/lexicon/page/PageShedding.java | 147 ++++++++++++++++++ resources/assets/botania/lang/en_US.lang | 2 +- .../botania/textures/gui/sheddingOverlay.png | Bin 0 -> 4449 bytes 6 files changed, 293 insertions(+), 2 deletions(-) create mode 100644 MODSRC/vazkii/botania/common/lexicon/page/PageEntity.java create mode 100644 MODSRC/vazkii/botania/common/lexicon/page/PageShedding.java create mode 100644 resources/assets/botania/textures/gui/sheddingOverlay.png diff --git a/MODSRC/vazkii/botania/client/lib/LibResources.java b/MODSRC/vazkii/botania/client/lib/LibResources.java index 1cdb8e0b6..24a3e0db1 100644 --- a/MODSRC/vazkii/botania/client/lib/LibResources.java +++ b/MODSRC/vazkii/botania/client/lib/LibResources.java @@ -33,6 +33,7 @@ public final class LibResources { public static final String GUI_PETAL_OVERLAY = PREFIX_GUI + "petalOverlay.png"; public static final String GUI_TERRASTEEL_OVERLAY = PREFIX_GUI + "terrasteelOverlay.png"; public static final String GUI_ELVEN_TRADE_OVERLAY = PREFIX_GUI + "elvenTradeOverlay.png"; + public static final String GUI_SHEDDING_OVERLAY = PREFIX_GUI + "sheddingOverlay.png"; public static final String ENTRY_FLOWERS = PREFIX_ENTRIES + "flowers.png"; public static final String ENTRY_APOTHECARY = PREFIX_ENTRIES + "apothecary.png"; diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 318a68b2e..84a40b784 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -11,6 +11,7 @@ */ package vazkii.botania.common.lexicon; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconCategory; @@ -29,10 +30,12 @@ import vazkii.botania.common.crafting.ModRuneRecipes; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.page.PageCraftingRecipe; import vazkii.botania.common.lexicon.page.PageElvenRecipe; +import vazkii.botania.common.lexicon.page.PageEntity; import vazkii.botania.common.lexicon.page.PageImage; import vazkii.botania.common.lexicon.page.PageManaInfusionRecipe; import vazkii.botania.common.lexicon.page.PagePetalRecipe; import vazkii.botania.common.lexicon.page.PageRuneRecipe; +import vazkii.botania.common.lexicon.page.PageShedding; import vazkii.botania.common.lexicon.page.PageTerrasteel; import vazkii.botania.common.lexicon.page.PageText; import vazkii.botania.common.lib.LibLexicon; @@ -604,7 +607,11 @@ public final class LexiconData { prismarine.setLexiconPages(new PageText("0"), new PageText("1"), new PageManaInfusionRecipe("2", ModManaAlchemyRecipes.prismarineRecipe), new PageCraftingRecipe("3", ModCrafingRecipes.recipePrismarine), new PageCraftingRecipe("4", ModCrafingRecipes.recipePrismarineBrick), new PageCraftingRecipe("5", ModCrafingRecipes.recipeDarkPrismarine), new PageCraftingRecipe("6", ModCrafingRecipes.recipeSeaLamp)); shedding = new BLexiconEntry(LibLexicon.MISC_SHEDDING, categoryMisc); - shedding.setLexiconPages(new PageText("0")); + shedding.setLexiconPages(new PageText("0"), + new PageShedding("1", "Chicken", 20, new ItemStack(Items.feather)), + new PageShedding("2", "Skeleton", 40, new ItemStack(Items.bone)), + new PageShedding("3", "Ghast", 30, new ItemStack(Items.ghast_tear)), + new PageShedding("4", "Villager", 40, new ItemStack(Items.emerald))); tinyPotato = new BLexiconEntry(LibLexicon.MISC_TINY_POTATO, categoryMisc); tinyPotato.setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", ModManaInfusionRecipes.tinyPotatoRecipe)); diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PageEntity.java b/MODSRC/vazkii/botania/common/lexicon/page/PageEntity.java new file mode 100644 index 000000000..3f2e6e9f9 --- /dev/null +++ b/MODSRC/vazkii/botania/common/lexicon/page/PageEntity.java @@ -0,0 +1,136 @@ +package vazkii.botania.common.lexicon.page; + +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Random; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.MathHelper; +import net.minecraft.util.StatCollector; + +import org.lwjgl.input.Mouse; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import cpw.mods.fml.common.registry.EntityRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.api.internal.IGuiLexiconEntry; +import vazkii.botania.api.lexicon.LexiconPage; +import vazkii.botania.api.lexicon.LexiconRecipeMappings; +import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData; +import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; +import net.minecraft.world.World; + +public class PageEntity extends LexiconPage{ + + Entity dummyEntity; + + int relativeMouseX, relativeMouseY; + + boolean tooltipEntity; + + int size; + + public PageEntity(String unlocalizedName, String entity, int size) { + super(unlocalizedName); + Class EntityClass=(Class) EntityList.stringToClassMapping.get(entity); + this.size=size; + try { + dummyEntity = (Entity)EntityClass.getConstructor(new Class[] {World.class}).newInstance(new Object[] {null}); + } catch (InstantiationException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IllegalAccessException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IllegalArgumentException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (InvocationTargetException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (NoSuchMethodException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (SecurityException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + @Override + @SideOnly(Side.CLIENT) + public void renderScreen(IGuiLexiconEntry gui, int mx, int my) { + + int text_x = gui.getLeft() + 16; + int text_y = gui.getTop() + gui.getHeight() - 40; + + int entity_scale = getEntityScale(size); + + int entity_x = gui.getLeft() + gui.getWidth() / 2; + int entity_y = gui.getTop() + gui.getHeight() / 2 + MathHelper.floor_float(dummyEntity.height * entity_scale / 2); + + tickEntity(dummyEntity); + + renderEntity(gui, dummyEntity, entity_x, entity_y, entity_scale, dummyEntity.ticksExisted * 2); + + PageText.renderText(text_x, text_y, gui.getWidth() - 30, gui.getHeight(), getUnlocalizedName()); + + } + + public int getEntityScale(int targetSize) + { + float entity_size = dummyEntity.width; + + if(dummyEntity.width < dummyEntity.height) + { + entity_size = dummyEntity.height; + } + + return MathHelper.floor_float(size / entity_size); + + } + + public void tickEntity(Entity entity) + { + dummyEntity.ticksExisted++; + } + + public void renderEntity(IGuiLexiconEntry gui, Entity entity, int x, int y, int scale, float rotation) + { + dummyEntity.worldObj = (Minecraft.getMinecraft() != null) ? Minecraft.getMinecraft().theWorld : null; + + GL11.glEnable(GL11.GL_COLOR_MATERIAL); + GL11.glPushMatrix(); + GL11.glTranslatef((float)x, (float)y, 50.0F); + GL11.glScalef((float)(-scale), (float)scale, (float)scale); + GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(rotation, 0.0F, 1.0F, 0.0F); + RenderHelper.enableStandardItemLighting(); + GL11.glTranslatef(0.0F, entity.yOffset, 0.0F); + RenderManager.instance.playerViewY = 180.0F; + RenderManager.instance.renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F); + GL11.glPopMatrix(); + RenderHelper.disableStandardItemLighting(); + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit); + GL11.glDisable(GL11.GL_TEXTURE_2D); + OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit); + + if(relativeMouseX >= x - (dummyEntity.width * scale / 2) - 10 && relativeMouseY >= y - (dummyEntity.height * scale) - 20 && relativeMouseX <= x + (dummyEntity.width * scale / 2) + 10 && relativeMouseY <= y + 20) { + tooltipEntity = true; + } + + } +} diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PageShedding.java b/MODSRC/vazkii/botania/common/lexicon/page/PageShedding.java new file mode 100644 index 000000000..872fdb782 --- /dev/null +++ b/MODSRC/vazkii/botania/common/lexicon/page/PageShedding.java @@ -0,0 +1,147 @@ +package vazkii.botania.common.lexicon.page; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.lwjgl.input.Mouse; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import vazkii.botania.api.internal.IGuiLexiconEntry; +import vazkii.botania.api.lexicon.LexiconRecipeMappings; +import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData; +import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; +import vazkii.botania.client.lib.LibResources; +import cpw.mods.fml.common.registry.EntityRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.entity.EntityList; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.MathHelper; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; + +public class PageShedding extends PageEntity{ + + private static final ResourceLocation sheddingOverlay = new ResourceLocation(LibResources.GUI_SHEDDING_OVERLAY); + + ItemStack shedStack; + + ItemStack tooltipStack; + boolean tooltipEntry; + + static boolean mouseDownLastTick = false; + + + public PageShedding(String unlocalizedName, String entity, int size, ItemStack shedStack) { + super(unlocalizedName, entity, size); + this.shedStack = shedStack; + } + + @Override + @SideOnly(Side.CLIENT) + public void renderScreen(IGuiLexiconEntry gui, int mx, int my) { + + relativeMouseX = mx; + relativeMouseY = my; + + int stack_x = gui.getLeft() + gui.getWidth() / 2 - 8; + int stack_y = gui.getTop() + gui.getHeight() - 40 - 24 - 5; + + + int entity_scale = getEntityScale(size); + + int entity_x = gui.getLeft() + gui.getWidth() / 2; + int entity_y = gui.getTop() + gui.getHeight() / 2 + MathHelper.floor_float(dummyEntity.height * entity_scale / 2) - 35; + + tickEntity(dummyEntity); + + renderEntity(gui, dummyEntity, entity_x, entity_y, entity_scale, dummyEntity.ticksExisted * 2); + + renderItem(gui, stack_x, stack_y, shedStack); + + TextureManager render = Minecraft.getMinecraft().renderEngine; + render.bindTexture(sheddingOverlay); + + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glColor4f(1F, 1F, 1F, 1F); + ((GuiScreen) gui).drawTexturedModalRect(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight()); + + + if(tooltipStack != null) { + List tooltipData = tooltipStack.getTooltip(Minecraft.getMinecraft().thePlayer, false); + List parsedTooltip = new ArrayList(); + boolean first = true; + + for(String s : tooltipData) { + String s_ = s; + if(!first) + s_ = EnumChatFormatting.GRAY + s; + parsedTooltip.add(s_); + first = false; + } + + vazkii.botania.client.core.helper.RenderHelper.renderTooltip(mx, my, parsedTooltip); + + int tooltipY = 8 + tooltipData.size() * 11; + + if(tooltipEntry) { + vazkii.botania.client.core.helper.RenderHelper.renderTooltipOrange(mx, my + tooltipY, Arrays.asList(EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.clickToRecipe"))); + tooltipY += 18; + } + } + else if(tooltipEntity) { + List parsedTooltip = new ArrayList(); + parsedTooltip.add(EntityList.getEntityString(dummyEntity)); + vazkii.botania.client.core.helper.RenderHelper.renderTooltip(mx, my, parsedTooltip); + } + + tooltipStack = null; + tooltipEntry = tooltipEntity = false; + GL11.glDisable(GL11.GL_BLEND); + mouseDownLastTick = Mouse.isButtonDown(0); + } + + @SideOnly(Side.CLIENT) + public void renderItem(IGuiLexiconEntry gui, int xPos, int yPos, ItemStack stack) { + RenderItem render = new RenderItem(); + boolean mouseDown = Mouse.isButtonDown(0); + + GL11.glPushMatrix(); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + RenderHelper.enableGUIStandardItemLighting(); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GL11.glEnable(GL11.GL_DEPTH_TEST); + render.renderItemAndEffectIntoGUI(Minecraft.getMinecraft().fontRenderer, Minecraft.getMinecraft().getTextureManager(), stack, xPos, yPos); + render.renderItemOverlayIntoGUI(Minecraft.getMinecraft().fontRenderer, Minecraft.getMinecraft().getTextureManager(), stack, xPos, yPos); + RenderHelper.disableStandardItemLighting(); + GL11.glPopMatrix(); + + if(relativeMouseX >= xPos && relativeMouseY >= yPos && relativeMouseX <= xPos + 16 && relativeMouseY <= yPos + 16) { + tooltipStack = stack; + + EntryData data = LexiconRecipeMappings.getDataForStack(tooltipStack); + if(data != null && (data.entry != gui.getEntry() || data.page != gui.getPageOn())) { + tooltipEntry = true; + + if(!mouseDownLastTick && mouseDown && GuiScreen.isShiftKeyDown()) { + GuiLexiconEntry newGui = new GuiLexiconEntry(data.entry, (GuiScreen) gui); + newGui.page = data.page; + Minecraft.getMinecraft().displayGuiScreen(newGui); + } + } + } + + GL11.glDisable(GL11.GL_LIGHTING); + } + +} diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index bfabf2538..7c6990676 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -1570,7 +1570,7 @@ botania.page.prismarine6=Crafting the &1Sea Lantern&0 # -- NATURAL SHEDDING botania.entry.shedding=Natural Shedding -botania.page.shedding0=The living beings that inhabit our lands don't live in a static state. It's common for pieces of their body to fall out, &1Feathers&0 on &4Chickens&0, &1Bones&0 on &4Skeletons&0, so on.
Even the tough &4Ghasts&0 sometimes shed a tear or the &4Villagers&0 accidentally drop an &1Emerald&0 and can't pick it back up because their arms are stuck together for some reason. +botania.page.shedding0=The living and unliving beings that inhabit our lands don't live in a static state. It's common for pieces of their body to fall out, or for them to drop things, or for them to extrude substances. The following pages list some such items that can come from such entities. # -- TINY POTATO botania.entry.tinyPotato=Tiny Potato diff --git a/resources/assets/botania/textures/gui/sheddingOverlay.png b/resources/assets/botania/textures/gui/sheddingOverlay.png new file mode 100644 index 0000000000000000000000000000000000000000..b142dfdcf0c1c0edc1d05434d3e1623dfc720d08 GIT binary patch literal 4449 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 Date: Sat, 23 Aug 2014 16:01:06 -0500 Subject: [PATCH 2/5] Advanced Configurable Shedding Options --- .../common/core/handler/ConfigHandler.java | 43 ++---- .../common/core/handler/SheddingHandler.java | 31 +--- .../common/core/proxy/CommonProxy.java | 2 + .../botania/common/lexicon/LexiconData.java | 15 +- .../common/shedding/SheddingTracker.java | 135 ++++++++++++++++++ 5 files changed, 161 insertions(+), 65 deletions(-) create mode 100644 MODSRC/vazkii/botania/common/shedding/SheddingTracker.java diff --git a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java index 8b7d87a40..e87b9f901 100644 --- a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java @@ -16,6 +16,7 @@ import java.io.File; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; import vazkii.botania.common.lib.LibMisc; +import vazkii.botania.common.shedding.SheddingTracker; import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -52,15 +53,6 @@ public final class ConfigHandler { public static boolean darkQuartzEnabled = true; public static boolean enchanterEnabled = true; - public static int shedRateChicken = 26000; - public static int shedRateSquid = 18000; - public static int shedRateVillager = 226000; - public static int shedRateSpider = 12000; - public static int shedRateBlaze = 8000; - public static int shedRateGhast = 9001; - public static int shedRateSkeleton = 36000; - public static int shedRateSlime = 21000; - public static int flowerQuantity = 2; public static int flowerDensity = 16; @@ -148,30 +140,6 @@ public final class ConfigHandler { desc = "Set to false to disable the Mana Enchanter. Since some people find it OP or something. This only disables the entry and creation. Old ones that are already in the world will stay."; enchanterEnabled = loadPropBool("manaEnchanter.enabled", desc, enchanterEnabled); - desc = "The average amount of ticks between a chicken randomly dropping a feather. Set to -1 to disable this feature"; - shedRateChicken = loadPropInt("shedRate.chicken", desc, shedRateChicken); - - desc = "The average amount of ticks between a squid randomly dropping an ink sac. Set to -1 to disable this feature"; - shedRateSquid = loadPropInt("shedRate.squid", desc, shedRateSquid); - - desc = "The average amount of ticks between a villager randomly dropping an emerald. Set to -1 to disable this feature"; - shedRateVillager = loadPropInt("shedRate.villager", desc, shedRateVillager); - - desc = "The average amount of ticks between a spider randomly dropping a piece of string. Set to -1 to disable this feature"; - shedRateSpider = loadPropInt("shedRate.spider", desc, shedRateSpider); - - desc = "The average amount of ticks between a blaze randomly dropping a piece of blaze powder. Set to -1 to disable this feature"; - shedRateBlaze = loadPropInt("shedRate.blaze", desc, shedRateBlaze); - - desc = "The average amount of ticks between a ghast randomly dropping a ghast tear. Set to -1 to disable this feature"; - shedRateGhast = loadPropInt("shedRate.ghast", desc, shedRateGhast); - - desc = "The average amount of ticks between a skeleton randomly dropping a bone. Set to -1 to disable this feature"; - shedRateSkeleton = loadPropInt("shedRate.skeleton", desc, shedRateSkeleton); - - desc = "The average amount of ticks between a slime randomly dropping a slimeball. Set to -1 to disable this feature"; - shedRateSlime = loadPropInt("shedRate.slime", desc, shedRateSlime); - desc = "The quanity of flower patches to generate in the world, defaults to 3, the lower the number the less patches geenrate."; flowerQuantity = loadPropInt("worldgen.flower.quantity", desc, 3); @@ -182,6 +150,15 @@ public final class ConfigHandler { config.save(); } + public static void loadPostInit() + { + SheddingTracker.loadFromConfig(config); + + if(config.hasChanged()) + config.save(); + + } + public static int loadPropInt(String propName, String desc, int default_) { Property prop = config.get(Configuration.CATEGORY_GENERAL, propName, default_); prop.comment = desc; diff --git a/MODSRC/vazkii/botania/common/core/handler/SheddingHandler.java b/MODSRC/vazkii/botania/common/core/handler/SheddingHandler.java index 049e2dca9..2ba5cb2b7 100644 --- a/MODSRC/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/SheddingHandler.java @@ -11,6 +11,7 @@ */ package vazkii.botania.common.core.handler; +import vazkii.botania.common.shedding.SheddingTracker; import net.minecraft.entity.monster.EntityBlaze; import net.minecraft.entity.monster.EntityGhast; import net.minecraft.entity.monster.EntitySkeleton; @@ -30,31 +31,11 @@ public final class SheddingHandler { if(event.entity.worldObj.isRemote) return; - if(event.entity instanceof EntityChicken) { - if(ConfigHandler.shedRateChicken != -1 && event.entity.worldObj.rand.nextInt(ConfigHandler.shedRateChicken) == 0) - event.entity.dropItem(Items.feather, 1); - } else if(event.entity instanceof EntitySquid) { - if(ConfigHandler.shedRateSquid != -1 && event.entity.worldObj.rand.nextInt(ConfigHandler.shedRateSquid) == 0) - event.entity.dropItem(Items.dye, 1); - } else if(event.entity instanceof EntityVillager) { - if(ConfigHandler.shedRateVillager != -1 && event.entity.worldObj.rand.nextInt(ConfigHandler.shedRateVillager) == 0) - event.entity.dropItem(Items.emerald, 1); - } else if(event.entity instanceof EntitySpider) { - if(ConfigHandler.shedRateSpider != -1 && event.entity.worldObj.rand.nextInt(ConfigHandler.shedRateSpider) == 0) - event.entity.dropItem(Items.string, 1); - } else if(event.entity instanceof EntityBlaze) { - if(ConfigHandler.shedRateBlaze != -1 && event.entity.worldObj.rand.nextInt(ConfigHandler.shedRateBlaze) == 0) - event.entity.dropItem(Items.blaze_rod, 1); - } else if(event.entity instanceof EntityGhast) { - if(ConfigHandler.shedRateGhast != -1 && event.entity.worldObj.rand.nextInt(ConfigHandler.shedRateGhast) == 0) - event.entity.dropItem(Items.ghast_tear, 1); - } else if(event.entity instanceof EntitySkeleton) { - if(ConfigHandler.shedRateSkeleton != -1 && event.entity.worldObj.rand.nextInt(ConfigHandler.shedRateSkeleton) == 0) - event.entity.dropItem(Items.bone, 1); - } else if(event.entity instanceof EntitySlime) { - if(ConfigHandler.shedRateSlime != -1 && event.entity.worldObj.rand.nextInt(ConfigHandler.shedRateSlime) == 0) - event.entity.dropItem(Items.slime_ball, 1); + SheddingTracker.ShedPattern pattern = SheddingTracker.getShedPattern(event.entity); + + if(pattern != null){ + if(event.entity.worldObj.rand.nextInt(pattern.getRate()) == 0) + event.entity.entityDropItem(pattern.getItemStack(), 0.0F); } } - } diff --git a/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java b/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java index 28fb020c7..326b9ee32 100644 --- a/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java @@ -86,6 +86,8 @@ public class CommonProxy { public void postInit(FMLPostInitializationEvent event) { ModBlocks.addDispenserBehaviours(); + ConfigHandler.loadPostInit(); + LexiconData.postInit(); } public void serverStarting(FMLServerStartingEvent event) { diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 84a40b784..404a5e46d 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -39,6 +39,7 @@ import vazkii.botania.common.lexicon.page.PageShedding; import vazkii.botania.common.lexicon.page.PageTerrasteel; import vazkii.botania.common.lexicon.page.PageText; import vazkii.botania.common.lib.LibLexicon; +import vazkii.botania.common.shedding.SheddingTracker; public final class LexiconData { @@ -606,13 +607,6 @@ public final class LexiconData { prismarine = new BLexiconEntry(LibLexicon.MISC_PRISMARINE, categoryMisc); prismarine.setLexiconPages(new PageText("0"), new PageText("1"), new PageManaInfusionRecipe("2", ModManaAlchemyRecipes.prismarineRecipe), new PageCraftingRecipe("3", ModCrafingRecipes.recipePrismarine), new PageCraftingRecipe("4", ModCrafingRecipes.recipePrismarineBrick), new PageCraftingRecipe("5", ModCrafingRecipes.recipeDarkPrismarine), new PageCraftingRecipe("6", ModCrafingRecipes.recipeSeaLamp)); - shedding = new BLexiconEntry(LibLexicon.MISC_SHEDDING, categoryMisc); - shedding.setLexiconPages(new PageText("0"), - new PageShedding("1", "Chicken", 20, new ItemStack(Items.feather)), - new PageShedding("2", "Skeleton", 40, new ItemStack(Items.bone)), - new PageShedding("3", "Ghast", 30, new ItemStack(Items.ghast_tear)), - new PageShedding("4", "Villager", 40, new ItemStack(Items.emerald))); - tinyPotato = new BLexiconEntry(LibLexicon.MISC_TINY_POTATO, categoryMisc); tinyPotato.setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", ModManaInfusionRecipes.tinyPotatoRecipe)); @@ -625,4 +619,11 @@ public final class LexiconData { starfield = new ALexiconEntry(LibLexicon.MISC_STARFIELD, categoryMisc); starfield.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeStarfield)); } + public static void postInit() { + if(SheddingTracker.hasShedding()) { + shedding = new BLexiconEntry(LibLexicon.MISC_SHEDDING, categoryMisc); + shedding.setLexiconPages(new PageText("0")); + SheddingTracker.addToLexicon(); + } + } } diff --git a/MODSRC/vazkii/botania/common/shedding/SheddingTracker.java b/MODSRC/vazkii/botania/common/shedding/SheddingTracker.java new file mode 100644 index 000000000..94efef807 --- /dev/null +++ b/MODSRC/vazkii/botania/common/shedding/SheddingTracker.java @@ -0,0 +1,135 @@ +package vazkii.botania.common.shedding; + +import java.util.ArrayList; +import java.util.Map.Entry; + +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lexicon.page.PageShedding; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.monster.EntityBlaze; +import net.minecraft.entity.monster.EntityGhast; +import net.minecraft.entity.monster.EntitySkeleton; +import net.minecraft.entity.monster.EntitySlime; +import net.minecraft.entity.monster.EntitySpider; +import net.minecraft.entity.passive.EntityChicken; +import net.minecraft.entity.passive.EntitySquid; +import net.minecraft.entity.passive.EntityVillager; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.common.config.Property; + +public class SheddingTracker { + + public static ArrayList patterns = new ArrayList(); + public static ArrayList defaultPatterns = new ArrayList(); + + public static class ShedPattern { + Class EntityClass; + ItemStack itemStack; + int rate; + int lexiconSize; + public ShedPattern(Class EntityClass, ItemStack itemStack, int rate, int lexiconSize) { + this.EntityClass = EntityClass; + this.itemStack = itemStack; + this.rate = rate; + this.lexiconSize=lexiconSize; + } + public ItemStack getItemStack() + { + return itemStack.copy(); + } + public int getRate() + { + return rate; + } + public String getEntityString() + { + return (String)EntityList.classToStringMapping.get(EntityClass); + } + } + + public static ShedPattern getShedPattern(Entity entity) + { + for(ShedPattern pattern : patterns) + { + if(pattern.EntityClass.isInstance(entity)) + return pattern; + } + return null; + } + + public static boolean hasShedding() + { + return patterns.size() > 0; + } + + public static void addToLexicon() + { + if(!hasShedding()) + return; + int i = 1; + for(ShedPattern pattern : patterns) + { + PageShedding page = new PageShedding(String.valueOf(i), (String)EntityList.classToStringMapping.get(pattern.EntityClass), pattern.lexiconSize, pattern.getItemStack()); + LexiconData.shedding.addPage(page); + } + } + + public static void loadFromConfig(Configuration config) { + + defaultPatterns.add(new ShedPattern(EntityChicken.class, new ItemStack(Items.feather), 26000, 20)); + defaultPatterns.add(new ShedPattern(EntitySquid.class, new ItemStack(Items.dye), 18000, 20)); + defaultPatterns.add(new ShedPattern(EntityVillager.class, new ItemStack(Items.emerald), 226000, 40)); + defaultPatterns.add(new ShedPattern(EntitySpider.class, new ItemStack(Items.string), 12000, 40)); + defaultPatterns.add(new ShedPattern(EntityBlaze.class, new ItemStack(Items.blaze_powder), 8000, 40)); + defaultPatterns.add(new ShedPattern(EntityGhast.class, new ItemStack(Items.ghast_tear), 9001, 30)); + defaultPatterns.add(new ShedPattern(EntitySkeleton.class, new ItemStack(Items.bone), 36000, 40)); + defaultPatterns.add(new ShedPattern(EntitySlime.class, new ItemStack(Items.slime_ball), 21000, 40)); + + ArrayList defaultNames = new ArrayList(); + + for(ShedPattern pattern : defaultPatterns) + { + loadFromConfig(config, pattern.getEntityString(), pattern); + defaultNames.add(pattern.getEntityString()); + } + for(Object o : EntityList.stringToClassMapping.entrySet()) + { + Entry entry = (Entry)o; + if(EntityLiving.class.isAssignableFrom(entry.getValue())) { + String name = entry.getKey(); + if(!defaultNames.contains(name)) + loadFromConfig(config, name, null); + } + } + } + public static void loadFromConfig(Configuration config, String key, ShedPattern defaultPattern) + { + String itemName = ""; + int metadata = 0; + int rate = -1; + int lexiconSize = 40; + if(defaultPattern != null) + { + itemName = Item.itemRegistry.getNameForObject(defaultPattern.getItemStack().getItem()); + metadata = defaultPattern.getItemStack().getItemDamage(); + rate = defaultPattern.rate; + lexiconSize = defaultPattern.lexiconSize; + } + Property prop=config.get("Shedding", key+".item", itemName); + prop.comment = "Configuration of Shedding for "+key; + itemName = prop.getString(); + rate = config.get("Shedding", key+".rate", rate).getInt(); + metadata = config.get("Shedding", key+".metadata", metadata).getInt(); + lexiconSize = config.get("Shedding", key+".size", lexiconSize).getInt(); + + if(itemName != "" && rate != -1) + patterns.add(new ShedPattern((Class)EntityList.stringToClassMapping.get(key), new ItemStack((Item)Item.itemRegistry.getObject(itemName),1 ,metadata), rate, lexiconSize)); + } +} From 2044198d2db42f623b72c5cf1db3f67c64741029 Mon Sep 17 00:00:00 2001 From: SoundLogic Date: Sat, 23 Aug 2014 16:54:45 -0500 Subject: [PATCH 3/5] So much formatting cleaning. Still, no one suggested decapitation, so an improvement! --- .../common/core/handler/ConfigHandler.java | 4 +- .../common/core/handler/SheddingHandler.java | 13 +- .../botania/common/lexicon/LexiconData.java | 1 + .../common/lexicon/page/PageEntity.java | 112 ++++++------------ .../common/shedding/SheddingTracker.java | 34 ++---- 5 files changed, 50 insertions(+), 114 deletions(-) diff --git a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java index e87b9f901..0e4d4542b 100644 --- a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java @@ -150,13 +150,11 @@ public final class ConfigHandler { config.save(); } - public static void loadPostInit() - { + public static void loadPostInit() { SheddingTracker.loadFromConfig(config); if(config.hasChanged()) config.save(); - } public static int loadPropInt(String propName, String desc, int default_) { diff --git a/MODSRC/vazkii/botania/common/core/handler/SheddingHandler.java b/MODSRC/vazkii/botania/common/core/handler/SheddingHandler.java index 2ba5cb2b7..49af8799c 100644 --- a/MODSRC/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/SheddingHandler.java @@ -11,17 +11,8 @@ */ package vazkii.botania.common.core.handler; -import vazkii.botania.common.shedding.SheddingTracker; -import net.minecraft.entity.monster.EntityBlaze; -import net.minecraft.entity.monster.EntityGhast; -import net.minecraft.entity.monster.EntitySkeleton; -import net.minecraft.entity.monster.EntitySlime; -import net.minecraft.entity.monster.EntitySpider; -import net.minecraft.entity.passive.EntityChicken; -import net.minecraft.entity.passive.EntitySquid; -import net.minecraft.entity.passive.EntityVillager; -import net.minecraft.init.Items; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; +import vazkii.botania.common.shedding.SheddingTracker; import cpw.mods.fml.common.eventhandler.SubscribeEvent; public final class SheddingHandler { @@ -33,7 +24,7 @@ public final class SheddingHandler { SheddingTracker.ShedPattern pattern = SheddingTracker.getShedPattern(event.entity); - if(pattern != null){ + if(pattern != null) { if(event.entity.worldObj.rand.nextInt(pattern.getRate()) == 0) event.entity.entityDropItem(pattern.getItemStack(), 0.0F); } diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 404a5e46d..4c102a05e 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -619,6 +619,7 @@ public final class LexiconData { starfield = new ALexiconEntry(LibLexicon.MISC_STARFIELD, categoryMisc); starfield.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipeStarfield)); } + public static void postInit() { if(SheddingTracker.hasShedding()) { shedding = new BLexiconEntry(LibLexicon.MISC_SHEDDING, categoryMisc); diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PageEntity.java b/MODSRC/vazkii/botania/common/lexicon/page/PageEntity.java index 3f2e6e9f9..156ed0204 100644 --- a/MODSRC/vazkii/botania/common/lexicon/page/PageEntity.java +++ b/MODSRC/vazkii/botania/common/lexicon/page/PageEntity.java @@ -1,70 +1,36 @@ package vazkii.botania.common.lexicon.page; -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Random; - import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; -import net.minecraft.entity.EntityLiving; -import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MathHelper; -import net.minecraft.util.StatCollector; +import net.minecraft.world.World; -import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.common.registry.EntityRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; -import vazkii.botania.api.lexicon.LexiconRecipeMappings; -import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData; -import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; -import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PageEntity extends LexiconPage{ Entity dummyEntity; - int relativeMouseX, relativeMouseY; - boolean tooltipEntity; - int size; - + public PageEntity(String unlocalizedName, String entity, int size) { super(unlocalizedName); Class EntityClass=(Class) EntityList.stringToClassMapping.get(entity); this.size=size; try { dummyEntity = (Entity)EntityClass.getConstructor(new Class[] {World.class}).newInstance(new Object[] {null}); - } catch (InstantiationException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IllegalAccessException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IllegalArgumentException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (InvocationTargetException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (NoSuchMethodException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (SecurityException e) { - // TODO Auto-generated catch block + } catch (Exception e) { e.printStackTrace(); } } @@ -72,65 +38,55 @@ public class PageEntity extends LexiconPage{ @Override @SideOnly(Side.CLIENT) public void renderScreen(IGuiLexiconEntry gui, int mx, int my) { - int text_x = gui.getLeft() + 16; int text_y = gui.getTop() + gui.getHeight() - 40; - int entity_scale = getEntityScale(size); - int entity_x = gui.getLeft() + gui.getWidth() / 2; int entity_y = gui.getTop() + gui.getHeight() / 2 + MathHelper.floor_float(dummyEntity.height * entity_scale / 2); - + tickEntity(dummyEntity); - - renderEntity(gui, dummyEntity, entity_x, entity_y, entity_scale, dummyEntity.ticksExisted * 2); - + + renderEntity(gui, dummyEntity, entity_x, entity_y, entity_scale, dummyEntity.ticksExisted * 2); + PageText.renderText(text_x, text_y, gui.getWidth() - 30, gui.getHeight(), getUnlocalizedName()); } - public int getEntityScale(int targetSize) - { + public int getEntityScale(int targetSize) { float entity_size = dummyEntity.width; if(dummyEntity.width < dummyEntity.height) - { entity_size = dummyEntity.height; - } - + return MathHelper.floor_float(size / entity_size); - + } - - public void tickEntity(Entity entity) - { + + public void tickEntity(Entity entity) { dummyEntity.ticksExisted++; } - - public void renderEntity(IGuiLexiconEntry gui, Entity entity, int x, int y, int scale, float rotation) - { - dummyEntity.worldObj = (Minecraft.getMinecraft() != null) ? Minecraft.getMinecraft().theWorld : null; - GL11.glEnable(GL11.GL_COLOR_MATERIAL); - GL11.glPushMatrix(); - GL11.glTranslatef((float)x, (float)y, 50.0F); - GL11.glScalef((float)(-scale), (float)scale, (float)scale); - GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(rotation, 0.0F, 1.0F, 0.0F); - RenderHelper.enableStandardItemLighting(); - GL11.glTranslatef(0.0F, entity.yOffset, 0.0F); - RenderManager.instance.playerViewY = 180.0F; - RenderManager.instance.renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F); - GL11.glPopMatrix(); - RenderHelper.disableStandardItemLighting(); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit); - GL11.glDisable(GL11.GL_TEXTURE_2D); - OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit); + public void renderEntity(IGuiLexiconEntry gui, Entity entity, int x, int y, int scale, float rotation) { + dummyEntity.worldObj = (Minecraft.getMinecraft() != null) ? Minecraft.getMinecraft().theWorld : null; - if(relativeMouseX >= x - (dummyEntity.width * scale / 2) - 10 && relativeMouseY >= y - (dummyEntity.height * scale) - 20 && relativeMouseX <= x + (dummyEntity.width * scale / 2) + 10 && relativeMouseY <= y + 20) { + GL11.glEnable(GL11.GL_COLOR_MATERIAL); + GL11.glPushMatrix(); + GL11.glTranslatef((float)x, (float)y, 50.0F); + GL11.glScalef((float)(-scale), (float)scale, (float)scale); + GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(rotation, 0.0F, 1.0F, 0.0F); + RenderHelper.enableStandardItemLighting(); + GL11.glTranslatef(0.0F, entity.yOffset, 0.0F); + RenderManager.instance.playerViewY = 180.0F; + RenderManager.instance.renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, 1.0F); + GL11.glPopMatrix(); + RenderHelper.disableStandardItemLighting(); + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit); + GL11.glDisable(GL11.GL_TEXTURE_2D); + OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit); + + if(relativeMouseX >= x - (dummyEntity.width * scale / 2) - 10 && relativeMouseY >= y - (dummyEntity.height * scale) - 20 && relativeMouseX <= x + (dummyEntity.width * scale / 2) + 10 && relativeMouseY <= y + 20) tooltipEntity = true; - } - } } diff --git a/MODSRC/vazkii/botania/common/shedding/SheddingTracker.java b/MODSRC/vazkii/botania/common/shedding/SheddingTracker.java index 94efef807..d8bcae78c 100644 --- a/MODSRC/vazkii/botania/common/shedding/SheddingTracker.java +++ b/MODSRC/vazkii/botania/common/shedding/SheddingTracker.java @@ -3,10 +3,6 @@ package vazkii.botania.common.shedding; import java.util.ArrayList; import java.util.Map.Entry; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lexicon.page.PageShedding; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; @@ -23,6 +19,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; +import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lexicon.page.PageShedding; public class SheddingTracker { @@ -40,22 +38,18 @@ public class SheddingTracker { this.rate = rate; this.lexiconSize=lexiconSize; } - public ItemStack getItemStack() - { + public ItemStack getItemStack() { return itemStack.copy(); } - public int getRate() - { + public int getRate() { return rate; } - public String getEntityString() - { + public String getEntityString() { return (String)EntityList.classToStringMapping.get(EntityClass); } } - public static ShedPattern getShedPattern(Entity entity) - { + public static ShedPattern getShedPattern(Entity entity) { for(ShedPattern pattern : patterns) { if(pattern.EntityClass.isInstance(entity)) @@ -64,13 +58,11 @@ public class SheddingTracker { return null; } - public static boolean hasShedding() - { + public static boolean hasShedding() { return patterns.size() > 0; } - public static void addToLexicon() - { + public static void addToLexicon() { if(!hasShedding()) return; int i = 1; @@ -94,13 +86,11 @@ public class SheddingTracker { ArrayList defaultNames = new ArrayList(); - for(ShedPattern pattern : defaultPatterns) - { + for(ShedPattern pattern : defaultPatterns) { loadFromConfig(config, pattern.getEntityString(), pattern); defaultNames.add(pattern.getEntityString()); } - for(Object o : EntityList.stringToClassMapping.entrySet()) - { + for(Object o : EntityList.stringToClassMapping.entrySet()) { Entry entry = (Entry)o; if(EntityLiving.class.isAssignableFrom(entry.getValue())) { String name = entry.getKey(); @@ -109,8 +99,8 @@ public class SheddingTracker { } } } - public static void loadFromConfig(Configuration config, String key, ShedPattern defaultPattern) - { + + public static void loadFromConfig(Configuration config, String key, ShedPattern defaultPattern) { String itemName = ""; int metadata = 0; int rate = -1; From 6c622324423f037a1ae4f07b61a47463cf3bd92b Mon Sep 17 00:00:00 2001 From: SoundLogic Date: Sat, 23 Aug 2014 17:00:06 -0500 Subject: [PATCH 4/5] Couple more empty lines removed --- MODSRC/vazkii/botania/common/lexicon/page/PageShedding.java | 2 -- MODSRC/vazkii/botania/common/shedding/SheddingTracker.java | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PageShedding.java b/MODSRC/vazkii/botania/common/lexicon/page/PageShedding.java index 872fdb782..32bbdf276 100644 --- a/MODSRC/vazkii/botania/common/lexicon/page/PageShedding.java +++ b/MODSRC/vazkii/botania/common/lexicon/page/PageShedding.java @@ -33,13 +33,11 @@ public class PageShedding extends PageEntity{ private static final ResourceLocation sheddingOverlay = new ResourceLocation(LibResources.GUI_SHEDDING_OVERLAY); ItemStack shedStack; - ItemStack tooltipStack; boolean tooltipEntry; static boolean mouseDownLastTick = false; - public PageShedding(String unlocalizedName, String entity, int size, ItemStack shedStack) { super(unlocalizedName, entity, size); this.shedStack = shedStack; diff --git a/MODSRC/vazkii/botania/common/shedding/SheddingTracker.java b/MODSRC/vazkii/botania/common/shedding/SheddingTracker.java index d8bcae78c..2206e335c 100644 --- a/MODSRC/vazkii/botania/common/shedding/SheddingTracker.java +++ b/MODSRC/vazkii/botania/common/shedding/SheddingTracker.java @@ -66,8 +66,7 @@ public class SheddingTracker { if(!hasShedding()) return; int i = 1; - for(ShedPattern pattern : patterns) - { + for(ShedPattern pattern : patterns) { PageShedding page = new PageShedding(String.valueOf(i), (String)EntityList.classToStringMapping.get(pattern.EntityClass), pattern.lexiconSize, pattern.getItemStack()); LexiconData.shedding.addPage(page); } @@ -105,8 +104,7 @@ public class SheddingTracker { int metadata = 0; int rate = -1; int lexiconSize = 40; - if(defaultPattern != null) - { + if(defaultPattern != null) { itemName = Item.itemRegistry.getNameForObject(defaultPattern.getItemStack().getItem()); metadata = defaultPattern.getItemStack().getItemDamage(); rate = defaultPattern.rate; From 72a24a389979727e00307514cc44ed05cfd4267e Mon Sep 17 00:00:00 2001 From: SoundLogic Date: Sat, 23 Aug 2014 17:00:56 -0500 Subject: [PATCH 5/5] Forgot to save this --- MODSRC/vazkii/botania/common/lexicon/page/PageShedding.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PageShedding.java b/MODSRC/vazkii/botania/common/lexicon/page/PageShedding.java index 32bbdf276..8f6e91216 100644 --- a/MODSRC/vazkii/botania/common/lexicon/page/PageShedding.java +++ b/MODSRC/vazkii/botania/common/lexicon/page/PageShedding.java @@ -49,13 +49,9 @@ public class PageShedding extends PageEntity{ relativeMouseX = mx; relativeMouseY = my; - int stack_x = gui.getLeft() + gui.getWidth() / 2 - 8; int stack_y = gui.getTop() + gui.getHeight() - 40 - 24 - 5; - - int entity_scale = getEntityScale(size); - int entity_x = gui.getLeft() + gui.getWidth() / 2; int entity_y = gui.getTop() + gui.getHeight() / 2 + MathHelper.floor_float(dummyEntity.height * entity_scale / 2) - 35;