From fab5e0350ebe9d59b79215fb1468a1a982adb021 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 16 Dec 2015 21:10:55 +0000 Subject: [PATCH] Added a "Preventing Decay" entry to the Miscellaneous section. Something seems a bit off with it though. --- .../handler/PersistentVariableHelper.java | 5 +++ .../client/gui/lexicon/GuiLexiconIndex.java | 12 +++++-- .../gui/lexicon/button/GuiButtonDoot.java | 2 +- .../lexicon/button/GuiButtonInvisible.java | 30 +++++++++++++++++- .../botania/client/lib/LibResources.java | 1 + .../botania/common/lexicon/DLexiconEntry.java | 27 ++++++++++++++++ .../botania/common/lexicon/LexiconData.java | 4 +++ .../vazkii/botania/common/lib/LibLexicon.java | 1 + .../resources/assets/botania/lang/en_US.lang | 5 +++ .../assets/botania/textures/gui/dog.png | Bin 0 -> 16076 bytes 10 files changed, 83 insertions(+), 4 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/lexicon/DLexiconEntry.java create mode 100644 src/main/resources/assets/botania/textures/gui/dog.png diff --git a/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java b/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java index f69676e76..3cceab243 100644 --- a/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java +++ b/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java @@ -27,6 +27,7 @@ import vazkii.botania.common.lib.LibMisc; public final class PersistentVariableHelper { private static final String TAG_FIRST_LOAD = "firstLoad"; + private static final String TAG_DOG = "dog"; private static final String TAG_BOOKMARK_COUNT = "bookmarkCount"; private static final String TAG_BOOKMARK_PREFIX = "bookmark"; private static final String TAG_BOOKMARKS = "bookmarks"; @@ -37,6 +38,7 @@ public final class PersistentVariableHelper { private static File cacheFile; public static boolean firstLoad = true; + public static boolean dog = true; public static String lastBotaniaVersion = ""; public static void save() throws IOException { @@ -68,6 +70,7 @@ public final class PersistentVariableHelper { cmp.setTag(TAG_LEXICON_NOTES, notesCmp); cmp.setBoolean(TAG_FIRST_LOAD, firstLoad); + cmp.setBoolean(TAG_DOG, dog); cmp.setString(TAG_LAST_BOTANIA_VERSION, lastBotaniaVersion); injectNBTToFile(cmp, getCacheFile()); @@ -109,6 +112,8 @@ public final class PersistentVariableHelper { firstLoad = cmp.hasKey(TAG_FIRST_LOAD) ? cmp.getBoolean(TAG_FIRST_LOAD) : firstLoad; if(firstLoad) lastBotaniaVersion = LibMisc.VERSION; + + dog = cmp.getBoolean(TAG_DOG); } public static void saveSafe() { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java index 691ba443c..6cdb15e7e 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -36,6 +36,7 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.gui.lexicon.button.GuiButtonBack; import vazkii.botania.client.gui.lexicon.button.GuiButtonInvisible; import vazkii.botania.client.gui.lexicon.button.GuiButtonPage; +import vazkii.botania.common.lexicon.DLexiconEntry; public class GuiLexiconIndex extends GuiLexicon implements IParented { @@ -143,6 +144,9 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { button.displayStack = entry.getIcon(); if(entry == tutEntry) tutPage = page; + + if(entry instanceof DLexiconEntry) + button.dog = true; } else button.displayString = ""; } } @@ -287,8 +291,12 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { ClientTickHandler.notifyPageChange(); break; default : - int index = par1GuiButton.id + page * 12; - openEntry(index); + if(par1GuiButton instanceof GuiButtonInvisible && ((GuiButtonInvisible) par1GuiButton).dog) + ((GuiButtonInvisible) par1GuiButton).click(); + else { + int index = par1GuiButton.id + page * 12; + openEntry(index); + } } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java index 1b2646b9e..4995b4502 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java @@ -1,5 +1,5 @@ /** - * This class was created by . It's distributed as +* This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania * diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java index 5029bc516..cbfb7d609 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java @@ -15,28 +15,56 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.core.helper.FontHelper; import vazkii.botania.client.gui.lexicon.GuiLexiconIndex; +import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.lib.LibMisc; public class GuiButtonInvisible extends GuiButtonLexicon { + private static final ResourceLocation dogResource = new ResourceLocation(LibResources.GUI_DOG); + GuiLexiconIndex gui; public ItemStack displayStack = null; + public boolean dog = false; float timeHover = 0; + + boolean enableDog = false; + double dogPos = 0; public GuiButtonInvisible(GuiLexiconIndex gui, int par1, int par2, int par3, int par4, int par5, String par6Str) { super(par1, par2, par3, par4, par5, par6Str); this.gui = gui; } - + + public void click() { + enableDog = true; + PersistentVariableHelper.dog = true; + PersistentVariableHelper.saveSafe(); + } @Override public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + if(enableDog) { + dogPos += ClientTickHandler.delta * 10; + + par1Minecraft.renderEngine.bindTexture(dogResource); + float f = 1F / 64F; + GL11.glTranslated(dogPos, 0, 0); + GL11.glColor4f(1F, 1F, 1F, 1F); + vazkii.botania.client.core.helper.RenderHelper.drawTexturedModalRect(0, yPosition, zLevel + 10, (dogPos % 100 < 50) ? 23 : 0, 0, 23, 19, f, f); + xPosition = (int) Math.max(xPosition, dogPos + 10); + + GL11.glTranslated(-dogPos, 0, 0); + } + field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(field_146123_n); boolean showStack = displayStack != null && !displayString.isEmpty(); diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index b6237a71c..2efb93c42 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -47,6 +47,7 @@ public final class LibResources { public static final String GUI_BAUBLE_BOX = PREFIX_GUI + "baubleBox.png"; public static final String GUI_HUD_ICONS = PREFIX_GUI + "hudIcons.png"; public static final String GUI_STENCIL = PREFIX_GUI + "stencil.png"; + public static final String GUI_DOG = PREFIX_GUI + "dog.png"; public static final String ENTRY_FLOWERS = PREFIX_ENTRIES + "flowers.png"; public static final String ENTRY_APOTHECARY = PREFIX_ENTRIES + "apothecary.png"; diff --git a/src/main/java/vazkii/botania/common/lexicon/DLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/DLexiconEntry.java new file mode 100644 index 000000000..00a0fc499 --- /dev/null +++ b/src/main/java/vazkii/botania/common/lexicon/DLexiconEntry.java @@ -0,0 +1,27 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [16/12/2015, 20:38:33 (GMT)] + */ +package vazkii.botania.common.lexicon; + +import vazkii.botania.api.lexicon.LexiconCategory; +import vazkii.botania.client.core.handler.PersistentVariableHelper; + +public class DLexiconEntry extends BLexiconEntry { + + public DLexiconEntry(String unlocalizedName, LexiconCategory category) { + super(unlocalizedName, category); + } + + @Override + public boolean isVisible() { + return !PersistentVariableHelper.dog; + } + +} diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 6ecb7f040..302e27625 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -287,6 +287,7 @@ public final class LexiconData { public static LexiconEntry challenges; public static LexiconEntry cacophonium; public static LexiconEntry pavement; + public static LexiconEntry preventingDecay; public static LexiconEntry tcIntegration; public static LexiconEntry bcIntegration; @@ -1081,6 +1082,9 @@ public final class LexiconData { pavement = new BLexiconEntry(LibLexicon.MISC_PAVEMENT, categoryMisc); pavement.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipesPavement)); + preventingDecay = new DLexiconEntry(LibLexicon.MISC_PRENTING_DECAY, categoryMisc); + preventingDecay.setLexiconPages(new PageText("0")).setIcon(new ItemStack(Blocks.deadbush)); + if(Botania.bcTriggersLoaded) { bcIntegration = new CLexiconEntry(LibLexicon.MISC_BC_INTEGRATION, categoryMisc, "BuildCraft"); bcIntegration.setLexiconPages(new PageText("0")).setIcon(new ItemStack(Items.redstone)); diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index fc884c301..a02891387 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -258,6 +258,7 @@ public final class LibLexicon { public static final String MISC_CHALLENGES = "challenges"; public static final String MISC_CACOPHONIUM = "cacophonium"; public static final String MISC_PAVEMENT = "pavement"; + public static final String MISC_PRENTING_DECAY = "preventingDecay"; public static final String MISC_TC_INTEGRATION = "tcIntegration"; public static final String MISC_BC_INTEGRATION = "bcIntegration"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 412f39978..5ddcfc233 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -3840,3 +3840,8 @@ botania.entry.banners=Banner Additions botania.tagline.banners=Lots of new banner patterns botania.page.banners0=In the presence of the &1Banners&0 from the future, &1Botania&0 adds &415&0 new icons to them, which can be mixed and matched with the original patterns and icons.
The following items can be used alongside a dye in the crafting grid to add an icon to a &1Banner&0: &1All Iron Tools&0, &1Spark Augments&0, &1Raw Fish&0, &1Livingwood and Dreamwood Twigs&0, &1Lexica Botania&0, &1Terrasteel&0 and the &1Tiny Potato&0. botania.page.banners1=Showcase of the various banners + +# -- PREVNTING DECAY +botania.entry.preventingDecay=Preventing Decay +botania.tagline.preventingDecay=Preventing passive flowers' decay +botania.entry.preventingDecay0=no diff --git a/src/main/resources/assets/botania/textures/gui/dog.png b/src/main/resources/assets/botania/textures/gui/dog.png new file mode 100644 index 0000000000000000000000000000000000000000..3d99571b6c5d150f2b543b4b077ff89991b62b7b GIT binary patch literal 16076 zcmeI3dsGuw9><554@50m1+}Xof?7+MyhG9u#6%@(6nQM5f((-hj3$|w1e0JvAxFDd zJx6U(E2UbM`ar9$$F?qu#VS2+*XOG1tLmb*ZeW*(qBgW#MSmYL3N98Av06AkJ%eUf#$5_~-4r-$pkyq@<*$ z-W`26azyxunugMk%hr^ASVkXFf+Jrx2sjPz(rq*mtqd5(7xLe!`=;S!Lqmfl`||n5 zzf_iq8#d2RN&gyjEH5iNHX-J4JWw|c2ntdcyR=FDgM#p|pdfd0>Jm>ofNn2IUMm9q zV9e0j+J#fVm>{>UG>MpFD4tqT{z*+uO*uZjG2H;pBvnegnc){RF|ualDD{zA-^=#2x4ka0jUo zHCLT*JaFaqFe3{j>k(_AZ@;~)2bqPw%PX+iAPu?N)W zG9Il;*>i4iQ*QXMb@khtwkTqVlml}!G0=I?WU-Y|d5pWk~v zX2rf$E2bAurz$V+d41RBT`$w$-gUDke9!J3Pm`LL{~TSNp7T~hQhnyLX<@@7|30!Y z^7`hJRl=&H;<~(}7xF8<53W@-&##KVKI!eurHlIF(|$KzQV@9}tf3-lhTE}XeptzfGp|QQki&+B=Y)$yOJ;xP4*pzoW5lq+hngzwq490iBNHDy3S0Bxi$h1xYBwz{KKiu0<~_~u zFXEnl9&3AAUl~<9YyaZxI;#Hrm8PnhQtIl$Kbl$x)mFDU>K@ALP-C0hEq}LkG?_TA z^qod+bK1Q#(OX^=mHutYgBjEIN9Vq9l$_C3&2zL|yp?uz*=_75esFy27UJk@F4v=? zm-C)FB2?lM;fv?@o6B385<^O>pIvx%_Ho-XWFRtF{A|PH90XAeC)2a+S-P1DoHE5> zdMclYbDAvl#zK^dP78)FBJ7-eqJT6fa9irW;&MoR0yk5l28$E@eHvqO5i5Z6LPY2DI7IrB{-5e zDG%pMWgMA2P9TxV#Ijh9kS~y+d=V<*^MoRWn6D5EIqe5m6$)BPtKOhU)l6-l4p<4? zLc86fKv9Ro5$6!aQPu)fAeYNgz7Q1(d0+(3<}%wcC(mpf>kZNoM?=_fD`~Nll$k@v z#qy~ldjgkBPtU_%w+0OX|qpR0?wrU%6gp8 zmhQ3;Xewc&imW&>WeH)nkL~Fs^mu0+OOe&+;iJbsH5&(CXUf*eTD%)jb_vL&w1m5_5^4{lg6cXlM^4%N7 zGoW|9jWXCBn3YH>0Lk$xyU-i8s|*gWMCrP0B>x9%V8fRDcPsE}8|wdk1$?=S7h>iD zLa#zQ(zc`H)fUaWlwJ2z#~$sz|CD-MVW6xg%&sC$SOI}r%mqr+*Xf&6>8m_y%1Bvt zl%7z50@G7>k1Fs_A;tSgL8YPWoM{+o26v1Y{|J6V{6f&TF$E|uAm1_1wg$6y>x0K< z(PhF|W&vxS07sUKSSw zgxO?qG4p}EEG`HLv&rIO<^y?ITo4dulf}i%2lBGGARx>pi;I~L}823j)GyvbdP}KwcIX1ccdSaWV6OyeuvV2(!uJ zV&(&RSzHhhW|PIm%m?zaxF8_RCX0)i59DQWK|q*I78f%g$jjn_fH0dZE@nQEm&FAE zVK!M@%zPj(iwgq6Y_hnR`9NM47X*aaWW*Kfd)bpPgEu@K;8o7j#;DccHBb(ooT@{R z;ur*3?naQOZQ%Du1S#Sp$o)L<2I(dQiJ;amXq<{50byEAQo8fnzcw5jbet2WzO$;W zjc7@oustd!=AFAB_zsnuN7vpP zH2)pb$bqdB`>eSbFsZ)&BfE6&kCjW;&iP_Ar+jhVk(Xy~tqfc$3%wzKRCgs;x^*B| zuROVXj4kh{doerXUPdNezVzh$`m_b{{A<(S7{6&=t|)kM%W>lk5^0S~yDTZdzNuaN zAmHNdqC@62Pp(#<+Wqx|Wtui=-(U_B&~FkF_}X%$d$Xmn0BKg(HY#pL%%k6>)lQkE K`D}7t`F{ZTauQzv literal 0 HcmV?d00001