From cb7ee33feddc5f1fbeb63aafbab9e894691e9a5d Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 27 Jun 2014 02:09:17 +0100 Subject: [PATCH] Implemented the ingame configs. Paging @Minalien again just to be evil too >:D --- .../core/handler/ClientTickHandler.java | 2 +- .../client/core/proxy/ClientProxy.java | 6 +-- .../botania/client/core/proxy/GuiFactory.java | 43 +++++++++++++++++++ .../botania/client/gui/GuiBotaniaConfig.java | 27 ++++++++++++ .../client/gui/{ => lexicon}/GuiLexicon.java | 6 +-- .../gui/{ => lexicon}/GuiLexiconEntry.java | 6 +-- .../gui/{ => lexicon}/GuiLexiconIndex.java | 8 ++-- .../client/gui/{ => lexicon}/IParented.java | 2 +- .../{ => lexicon}/button/GuiButtonBack.java | 4 +- .../button/GuiButtonBackWithShift.java | 2 +- .../button/GuiButtonBookmark.java | 4 +- .../button/GuiButtonInvisible.java | 2 +- .../{ => lexicon}/button/GuiButtonPage.java | 4 +- MODSRC/vazkii/botania/common/Botania.java | 2 +- .../common/core/BotaniaCreativeTab.java | 2 +- .../common/core/handler/ConfigHandler.java | 24 ++++++++++- .../common/lexicon/page/PageRecipe.java | 2 +- MODSRC/vazkii/botania/common/lib/LibMisc.java | 1 + .../botania/common/network/GuiHandler.java | 2 +- resources/assets/botania/lang/en_US.lang | 20 +++++++++ 20 files changed, 140 insertions(+), 29 deletions(-) create mode 100644 MODSRC/vazkii/botania/client/core/proxy/GuiFactory.java create mode 100644 MODSRC/vazkii/botania/client/gui/GuiBotaniaConfig.java rename MODSRC/vazkii/botania/client/gui/{ => lexicon}/GuiLexicon.java (97%) rename MODSRC/vazkii/botania/client/gui/{ => lexicon}/GuiLexiconEntry.java (96%) rename MODSRC/vazkii/botania/client/gui/{ => lexicon}/GuiLexiconIndex.java (95%) rename MODSRC/vazkii/botania/client/gui/{ => lexicon}/IParented.java (63%) rename MODSRC/vazkii/botania/client/gui/{ => lexicon}/button/GuiButtonBack.java (93%) rename MODSRC/vazkii/botania/client/gui/{ => lexicon}/button/GuiButtonBackWithShift.java (94%) rename MODSRC/vazkii/botania/client/gui/{ => lexicon}/button/GuiButtonBookmark.java (93%) rename MODSRC/vazkii/botania/client/gui/{ => lexicon}/button/GuiButtonInvisible.java (96%) rename MODSRC/vazkii/botania/client/gui/{ => lexicon}/button/GuiButtonPage.java (93%) diff --git a/MODSRC/vazkii/botania/client/core/handler/ClientTickHandler.java b/MODSRC/vazkii/botania/client/core/handler/ClientTickHandler.java index 098b9b050..12cf2a006 100644 --- a/MODSRC/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/MODSRC/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -22,7 +22,7 @@ import net.minecraft.tileentity.TileEntity; import vazkii.botania.api.mana.IManaCollector; import vazkii.botania.api.mana.TileSignature; import vazkii.botania.client.core.handler.LightningHandler.LightningBolt; -import vazkii.botania.client.gui.GuiLexicon; +import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.item.ItemTwigWand; import cpw.mods.fml.common.eventhandler.SubscribeEvent; diff --git a/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java b/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java index c3f749330..81ab4e6d4 100644 --- a/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java @@ -25,9 +25,9 @@ import vazkii.botania.client.core.handler.LightningHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.fx.FXSparkle; import vazkii.botania.client.fx.FXWisp; -import vazkii.botania.client.gui.GuiLexicon; -import vazkii.botania.client.gui.GuiLexiconEntry; -import vazkii.botania.client.gui.GuiLexiconIndex; +import vazkii.botania.client.gui.lexicon.GuiLexicon; +import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; +import vazkii.botania.client.gui.lexicon.GuiLexiconIndex; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.client.render.block.RenderAltar; import vazkii.botania.client.render.block.RenderPool; diff --git a/MODSRC/vazkii/botania/client/core/proxy/GuiFactory.java b/MODSRC/vazkii/botania/client/core/proxy/GuiFactory.java new file mode 100644 index 000000000..94e4baa43 --- /dev/null +++ b/MODSRC/vazkii/botania/client/core/proxy/GuiFactory.java @@ -0,0 +1,43 @@ +/** + * 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 a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Jun 27, 2014, 1:50:49 AM (GMT)] + */ +package vazkii.botania.client.core.proxy; + +import java.util.Set; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiScreen; +import vazkii.botania.client.gui.GuiBotaniaConfig; +import cpw.mods.fml.client.IModGuiFactory; + +public class GuiFactory implements IModGuiFactory { + + @Override + public void initialize(Minecraft minecraftInstance) { + // NO-OP + } + + @Override + public Class mainConfigGuiClass() { + return GuiBotaniaConfig.class; + } + + @Override + public Set runtimeGuiCategories() { + return null; + } + + @Override + public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element) { + return null; + } + +} diff --git a/MODSRC/vazkii/botania/client/gui/GuiBotaniaConfig.java b/MODSRC/vazkii/botania/client/gui/GuiBotaniaConfig.java new file mode 100644 index 000000000..898cb6655 --- /dev/null +++ b/MODSRC/vazkii/botania/client/gui/GuiBotaniaConfig.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 a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Jun 27, 2014, 1:52:33 AM (GMT)] + */ +package vazkii.botania.client.gui; + +import net.minecraft.client.gui.GuiScreen; +import net.minecraftforge.common.config.ConfigElement; +import net.minecraftforge.common.config.Configuration; +import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.lib.LibMisc; +import cpw.mods.fml.client.config.GuiConfig; + +public class GuiBotaniaConfig extends GuiConfig { + + public GuiBotaniaConfig(GuiScreen parentScreen) { + super(parentScreen, new ConfigElement(ConfigHandler.config.getCategory(Configuration.CATEGORY_GENERAL)).getChildElements(), LibMisc.MOD_ID, false, false, GuiConfig.getAbridgedConfigPath(ConfigHandler.config.toString())); + } + +} diff --git a/MODSRC/vazkii/botania/client/gui/GuiLexicon.java b/MODSRC/vazkii/botania/client/gui/lexicon/GuiLexicon.java similarity index 97% rename from MODSRC/vazkii/botania/client/gui/GuiLexicon.java rename to MODSRC/vazkii/botania/client/gui/lexicon/GuiLexicon.java index e9915a9e3..8c5d4ff8a 100644 --- a/MODSRC/vazkii/botania/client/gui/GuiLexicon.java +++ b/MODSRC/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -9,7 +9,7 @@ * * File Created @ [Jan 14, 2014, 6:48:05 PM (GMT)] */ -package vazkii.botania.client.gui; +package vazkii.botania.client.gui.lexicon; import java.util.ArrayList; import java.util.List; @@ -27,8 +27,8 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.gui.button.GuiButtonBookmark; -import vazkii.botania.client.gui.button.GuiButtonInvisible; +import vazkii.botania.client.gui.lexicon.button.GuiButtonBookmark; +import vazkii.botania.client.gui.lexicon.button.GuiButtonInvisible; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.item.ItemLexicon; diff --git a/MODSRC/vazkii/botania/client/gui/GuiLexiconEntry.java b/MODSRC/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java similarity index 96% rename from MODSRC/vazkii/botania/client/gui/GuiLexiconEntry.java rename to MODSRC/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java index 2d149a179..52da83b3b 100644 --- a/MODSRC/vazkii/botania/client/gui/GuiLexiconEntry.java +++ b/MODSRC/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java @@ -9,7 +9,7 @@ * * File Created @ [Jan 14, 2014, 6:47:06 PM (GMT)] */ -package vazkii.botania.client.gui; +package vazkii.botania.client.gui.lexicon; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; @@ -23,8 +23,8 @@ import vazkii.botania.api.lexicon.IAddonEntry; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.gui.button.GuiButtonBackWithShift; -import vazkii.botania.client.gui.button.GuiButtonPage; +import vazkii.botania.client.gui.lexicon.button.GuiButtonBackWithShift; +import vazkii.botania.client.gui.lexicon.button.GuiButtonPage; public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IParented { diff --git a/MODSRC/vazkii/botania/client/gui/GuiLexiconIndex.java b/MODSRC/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java similarity index 95% rename from MODSRC/vazkii/botania/client/gui/GuiLexiconIndex.java rename to MODSRC/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java index 48f434e87..2d24dab3c 100644 --- a/MODSRC/vazkii/botania/client/gui/GuiLexiconIndex.java +++ b/MODSRC/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -9,7 +9,7 @@ * * File Created @ [Jan 14, 2014, 6:46:59 PM (GMT)] */ -package vazkii.botania.client.gui; +package vazkii.botania.client.gui.lexicon; import java.util.ArrayList; import java.util.Collections; @@ -25,9 +25,9 @@ import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.gui.button.GuiButtonBack; -import vazkii.botania.client.gui.button.GuiButtonInvisible; -import vazkii.botania.client.gui.button.GuiButtonPage; +import vazkii.botania.client.gui.lexicon.button.GuiButtonBack; +import vazkii.botania.client.gui.lexicon.button.GuiButtonInvisible; +import vazkii.botania.client.gui.lexicon.button.GuiButtonPage; public class GuiLexiconIndex extends GuiLexicon implements IParented { diff --git a/MODSRC/vazkii/botania/client/gui/IParented.java b/MODSRC/vazkii/botania/client/gui/lexicon/IParented.java similarity index 63% rename from MODSRC/vazkii/botania/client/gui/IParented.java rename to MODSRC/vazkii/botania/client/gui/lexicon/IParented.java index fbf2edc28..770593041 100644 --- a/MODSRC/vazkii/botania/client/gui/IParented.java +++ b/MODSRC/vazkii/botania/client/gui/lexicon/IParented.java @@ -1,4 +1,4 @@ -package vazkii.botania.client.gui; +package vazkii.botania.client.gui.lexicon; public interface IParented { diff --git a/MODSRC/vazkii/botania/client/gui/button/GuiButtonBack.java b/MODSRC/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java similarity index 93% rename from MODSRC/vazkii/botania/client/gui/button/GuiButtonBack.java rename to MODSRC/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java index e9b9a35e6..170b28c5c 100644 --- a/MODSRC/vazkii/botania/client/gui/button/GuiButtonBack.java +++ b/MODSRC/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java @@ -9,7 +9,7 @@ * * File Created @ [Jan 14, 2014, 9:54:21 PM (GMT)] */ -package vazkii.botania.client.gui.button; +package vazkii.botania.client.gui.lexicon.button; import java.util.Arrays; import java.util.List; @@ -21,7 +21,7 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.gui.GuiLexicon; +import vazkii.botania.client.gui.lexicon.GuiLexicon; public class GuiButtonBack extends GuiButton { diff --git a/MODSRC/vazkii/botania/client/gui/button/GuiButtonBackWithShift.java b/MODSRC/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java similarity index 94% rename from MODSRC/vazkii/botania/client/gui/button/GuiButtonBackWithShift.java rename to MODSRC/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java index a2014ee0c..633ad081a 100644 --- a/MODSRC/vazkii/botania/client/gui/button/GuiButtonBackWithShift.java +++ b/MODSRC/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java @@ -9,7 +9,7 @@ * * File Created @ [Mar 6, 2014, 6:35:32 PM (GMT)] */ -package vazkii.botania.client.gui.button; +package vazkii.botania.client.gui.lexicon.button; import java.util.Arrays; import java.util.List; diff --git a/MODSRC/vazkii/botania/client/gui/button/GuiButtonBookmark.java b/MODSRC/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java similarity index 93% rename from MODSRC/vazkii/botania/client/gui/button/GuiButtonBookmark.java rename to MODSRC/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java index f2a797c27..afaaea8eb 100644 --- a/MODSRC/vazkii/botania/client/gui/button/GuiButtonBookmark.java +++ b/MODSRC/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java @@ -1,4 +1,4 @@ -package vazkii.botania.client.gui.button; +package vazkii.botania.client.gui.lexicon.button; import java.util.ArrayList; import java.util.List; @@ -8,7 +8,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.gui.GuiLexicon; +import vazkii.botania.client.gui.lexicon.GuiLexicon; public class GuiButtonBookmark extends GuiButton { diff --git a/MODSRC/vazkii/botania/client/gui/button/GuiButtonInvisible.java b/MODSRC/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java similarity index 96% rename from MODSRC/vazkii/botania/client/gui/button/GuiButtonInvisible.java rename to MODSRC/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java index 4b9f96ce8..ddcf69461 100644 --- a/MODSRC/vazkii/botania/client/gui/button/GuiButtonInvisible.java +++ b/MODSRC/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java @@ -9,7 +9,7 @@ * * File Created @ [Jan 14, 2014, 8:34:01 PM (GMT)] */ -package vazkii.botania.client.gui.button; +package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; diff --git a/MODSRC/vazkii/botania/client/gui/button/GuiButtonPage.java b/MODSRC/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java similarity index 93% rename from MODSRC/vazkii/botania/client/gui/button/GuiButtonPage.java rename to MODSRC/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java index 1b0e723e0..3cfd96597 100644 --- a/MODSRC/vazkii/botania/client/gui/button/GuiButtonPage.java +++ b/MODSRC/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java @@ -9,7 +9,7 @@ * * File Created @ [Jan 16, 2014, 4:52:06 PM (GMT)] */ -package vazkii.botania.client.gui.button; +package vazkii.botania.client.gui.lexicon.button; import java.util.Arrays; @@ -20,7 +20,7 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.gui.GuiLexicon; +import vazkii.botania.client.gui.lexicon.GuiLexicon; public class GuiButtonPage extends GuiButton { diff --git a/MODSRC/vazkii/botania/common/Botania.java b/MODSRC/vazkii/botania/common/Botania.java index 3e3230add..4d1f238da 100644 --- a/MODSRC/vazkii/botania/common/Botania.java +++ b/MODSRC/vazkii/botania/common/Botania.java @@ -26,7 +26,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.event.FMLServerStoppingEvent; -@Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES) +@Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES, guiFactory = LibMisc.GUI_FACTORY) public class Botania { @Instance(LibMisc.MOD_ID) diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index 78645fcb7..b90b706bc 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -33,7 +33,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { @Override public ItemStack getIconItemStack() { - return new ItemStack(ModBlocks.flower); + return new ItemStack(ModItems.lexicon); } @Override diff --git a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java index 685c590bf..b06c1c0d0 100644 --- a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java @@ -13,12 +13,16 @@ package vazkii.botania.common.core.handler; import java.io.File; +import vazkii.botania.common.lib.LibMisc; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; +import cpw.mods.fml.client.event.ConfigChangedEvent; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; public final class ConfigHandler { - private static Configuration config; + public static Configuration config; public static boolean useShaders = true; public static boolean lexiconRotatingItems = true; @@ -46,6 +50,12 @@ public final class ConfigHandler { config = new Configuration(configFile); config.load(); + load(); + + FMLCommonHandler.instance().bus().register(new ChangeListener()); + } + + public static void load() { String desc; desc = "Set to false to disable the use of shaders for some of the mod's renders."; @@ -89,7 +99,7 @@ public final class ConfigHandler { desc = "Turn off ONLY IF you're on an extremely large world with an exhagerated count of Mana Spreaders/Mana Pools and are experiencing TPS lag. This toggles whether flowers are strict with their checking for connecting to pools/spreaders or just check whenever possible."; flowerForceCheck = loadPropBool("flower.forceCheck", desc, flowerForceCheck); - + desc = "Set to false to disable the Fallen Kanade flower (gives Regeneration). This config option is here for those using Blood Magic. Note: Turning this off will not remove ones already in the world, it'll simply prevent the crafting."; fallenKanadeEnabled = loadPropBool("fallenKanade.enabled", desc, fallenKanadeEnabled); @@ -123,4 +133,14 @@ public final class ConfigHandler { prop.comment = desc; return prop.getBoolean(default_); } + + public static class ChangeListener { + + @SubscribeEvent + public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent eventArgs) { + if(eventArgs.modID.equals(LibMisc.MOD_ID)) + load(); + } + + } } diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PageRecipe.java b/MODSRC/vazkii/botania/common/lexicon/page/PageRecipe.java index 84ac390c8..4fa7fcadc 100644 --- a/MODSRC/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/MODSRC/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -31,7 +31,7 @@ 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.GuiLexiconEntry; +import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/MODSRC/vazkii/botania/common/lib/LibMisc.java b/MODSRC/vazkii/botania/common/lib/LibMisc.java index ffad50777..df46be714 100644 --- a/MODSRC/vazkii/botania/common/lib/LibMisc.java +++ b/MODSRC/vazkii/botania/common/lib/LibMisc.java @@ -28,6 +28,7 @@ public final class LibMisc { // Proxy Constants public static final String PROXY_COMMON = "vazkii.botania.common.core.proxy.CommonProxy"; public static final String PROXY_CLIENT = "vazkii.botania.client.core.proxy.ClientProxy"; + public static final String GUI_FACTORY = "vazkii.botania.client.core.proxy.GuiFactory"; public static final ForgeDirection[] CARDINAL_DIRECTIONS = new ForgeDirection[] { ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.EAST, ForgeDirection.WEST diff --git a/MODSRC/vazkii/botania/common/network/GuiHandler.java b/MODSRC/vazkii/botania/common/network/GuiHandler.java index c4476c66c..cfeb2dec8 100644 --- a/MODSRC/vazkii/botania/common/network/GuiHandler.java +++ b/MODSRC/vazkii/botania/common/network/GuiHandler.java @@ -14,7 +14,7 @@ package vazkii.botania.common.network; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexicon; -import vazkii.botania.client.gui.GuiLexicon; +import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.common.lib.LibGuiIDs; import cpw.mods.fml.common.network.IGuiHandler; diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index de7459943..305a3d7e9 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -72,6 +72,26 @@ botania.rank5=&6SS botania.knowledge.minecraft=Minecraftian Knowledge botania.knowledge.alfheim=&aElven&7 Knowledge +# CONFIGURATION +blockBreakingParticles.enabled=Block Break Particles +blockBreakingParticlesTool.enabled=Tool Block Break Particles +boundBlock.wireframe.enabled=Bound Block Wireframe +darkQuartz.enabled=Enable Smokey Quatrz +fallenKanade.enabled=Enable Fallen Kanade +flower.forceCheck=Flower Force Checking +flowerParticles.frequency=Flower Particle Frequency +lexicon.enable.rotatingItems=Lexicon Rotating Items +lexicon.render.3D=3D Lexicon Render +powerSystem.subtle=Use Subtle Power System +pylonModel.old=Use Old Pylon Model +references.enabled=Enable Tooltip References +shaders.enabled=Enable Shader Usage +spreader.posShift=Spreader Pos Shift +versionChecking.enabled=Enable Version Checking +wandBeam.static=Enable Static Wand Beam +worldgen.flower.density=Worldgen Flower Density +worldgen.flower.quantity=Worldgen Flower Quantity + # VERSION CHECKING botania.versioning.flavour0=NANI SORE!? BOTANIA IS OUTDATED!? botania.versioning.flavour1=What do you mean Botania is outdated, you ignorant fool?