Merge branch 'master' into 1.7.10

octarine-noise · Jul 6, 2014 · e47391c · e47391c
2 parents 4521454 + 7a133c9
commit e47391c
Show file tree

Hide file tree

Showing 30 changed files with 887 additions and 338 deletions.
diff --git a/README.md b/README.md
@@ -6,4 +6,6 @@ More info: http://www.minecraftforum.net/topic/2776217-better-foliage/
 
 Download
 ========
-[BetterFoliage 0.9.2-beta] (http://goo.gl/G900w3) (MC 1.7.2)
+[BetterFoliage 0.9.3-beta] (http://goo.gl/Rm1QRx) (MC 1.7.2)
+
+[BetterFoliage 0.9.3-beta] (http://goo.gl/BFFr6w) (MC 1.7.10)
diff --git a/build.gradle b/build.gradle
@@ -22,7 +22,7 @@ minecraft {
 
 jar.baseName = 'BetterFoliage-1.7.10'
 group = 'com.github.octarine-noise'
-version='0.9.3b'
+version='0.9.4b'
 
 processResources {
 	inputs.property "version", project.version

diff --git a/src/main/java/mods/betterfoliage/BetterFoliage.java b/src/main/java/mods/betterfoliage/BetterFoliage.java
@@ -4,7 +4,7 @@
 import java.util.Map;
 
 import mods.betterfoliage.client.BetterFoliageClient;
-import mods.betterfoliage.common.config.Config;
+import mods.betterfoliage.common.config.BetterFoliageConfig;
 
 import org.apache.logging.log4j.Logger;
 
@@ -24,6 +24,8 @@ public class BetterFoliage {
 	@Mod.Instance
 	public static BetterFoliage instance;
 
+	public static BetterFoliageConfig config = new BetterFoliageConfig();
+
 	public static Logger log;
 
 	public static File configDir;
@@ -34,7 +36,7 @@ public void preInit(FMLPreInitializationEvent event)  {
 		if (event.getSide() == Side.CLIENT) {
 			configDir = new File(event.getModConfigurationDirectory(), MOD_ID);
 			configDir.mkdir();
-			Config.load();
+			config.load(new File(configDir, "betterfoliage.cfg"));
 			BetterFoliageClient.preInit();
 		}
 	}

diff --git a/src/main/java/mods/betterfoliage/client/BetterFoliageClient.java b/src/main/java/mods/betterfoliage/client/BetterFoliageClient.java
@@ -1,6 +1,7 @@
 package mods.betterfoliage.client;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.Map;
 
 import mods.betterfoliage.BetterFoliage;
@@ -9,6 +10,9 @@
 import mods.betterfoliage.client.render.impl.RenderBlockBetterGrass;
 import mods.betterfoliage.client.render.impl.RenderBlockBetterLeaves;
 import mods.betterfoliage.client.render.impl.RenderBlockBetterLilypad;
+import mods.betterfoliage.client.render.impl.RenderBlockBetterReed;
+import mods.betterfoliage.client.resource.BlockTextureGenerator;
+import mods.betterfoliage.client.resource.HalfTextureResource;
 import mods.betterfoliage.client.resource.ILeafTextureRecognizer;
 import mods.betterfoliage.client.resource.LeafTextureGenerator;
 import net.minecraft.block.Block;
@@ -20,7 +24,9 @@
 import net.minecraft.block.BlockReed;
 import net.minecraft.block.BlockTallGrass;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.resources.IResource;
 import net.minecraft.init.Blocks;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.common.MinecraftForge;
 
@@ -45,6 +51,7 @@ public static void preInit() {
 		registerRenderer(new RenderBlockBetterGrass());
 		registerRenderer(new RenderBlockBetterCactus());
 		registerRenderer(new RenderBlockBetterLilypad());
+		registerRenderer(new RenderBlockBetterReed());
 
 		leaves = new BlockMatcher(BlockLeavesBase.class.getName(),
 								  "forestry.arboriculture.gadgets.BlockLeaves",
@@ -66,6 +73,19 @@ public static void preInit() {
 		leafGenerator = new LeafTextureGenerator();
 		MinecraftForge.EVENT_BUS.register(leafGenerator);
 		leafGenerator.recognizers.add(new BetterFoliageClient());
+
+		MinecraftForge.EVENT_BUS.register(new BlockTextureGenerator("bf_reed_bottom", new ResourceLocation("betterfoliage", "textures/blocks/missing_leaf.png")) {
+			@Override
+			public IResource getResource(ResourceLocation var1) throws IOException {
+				return new HalfTextureResource(unwrapResource(var1), true, getMissingResource());
+			}
+		});
+		MinecraftForge.EVENT_BUS.register(new BlockTextureGenerator("bf_reed_top", new ResourceLocation("betterfoliage", "textures/blocks/missing_leaf.png")) {
+			@Override
+			public IResource getResource(ResourceLocation var1) throws IOException {
+				return new HalfTextureResource(unwrapResource(var1), false, getMissingResource());
+			}
+		});
 
 		MinecraftForge.EVENT_BUS.register(new BetterFoliageClient());
 	}

diff --git a/src/main/java/mods/betterfoliage/client/KeyHandler.java b/src/main/java/mods/betterfoliage/client/KeyHandler.java
@@ -7,7 +7,7 @@
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import mods.betterfoliage.BetterFoliage;
-import mods.betterfoliage.client.gui.ConfigGuiScreen;
+import mods.betterfoliage.client.gui.ConfigGuiMain;
 import net.minecraft.client.settings.KeyBinding;
 
 @SideOnly(Side.CLIENT)
@@ -22,6 +22,6 @@ public KeyHandler() {
 
 	@SubscribeEvent
 	public void handleKeyPress(InputEvent.KeyInputEvent event) {
-		if (guiBinding.isPressed()) FMLClientHandler.instance().showGuiScreen(new ConfigGuiScreen(null));
+		if (guiBinding.isPressed()) FMLClientHandler.instance().showGuiScreen(new ConfigGuiMain(null));
 	}
 }
diff --git a/src/main/java/mods/betterfoliage/client/gui/ConfigGuiFactory.java b/src/main/java/mods/betterfoliage/client/gui/ConfigGuiFactory.java
@@ -18,7 +18,7 @@ public void initialize(Minecraft minecraftInstance) {
 	}
 
 	public Class<? extends GuiScreen> mainConfigGuiClass() {
-		return ConfigGuiScreen.class;
+		return ConfigGuiMain.class;
 	}
 
 	public Set<RuntimeOptionCategoryElement> runtimeGuiCategories() {

diff --git a/src/main/java/mods/betterfoliage/client/gui/ConfigGuiGrass.java b/src/main/java/mods/betterfoliage/client/gui/ConfigGuiGrass.java
@@ -0,0 +1,33 @@
+package mods.betterfoliage.client.gui;
+
+import mods.betterfoliage.BetterFoliage;
+import mods.betterfoliage.client.gui.widget.OptionDoubleWidget;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import cpw.mods.fml.client.FMLClientHandler;
+
+public class ConfigGuiGrass extends ConfigGuiScreenBase {
+
+	public ConfigGuiGrass(GuiScreen parent) {
+		super(parent);
+		int id = 10;
+		widgets.add(new OptionDoubleWidget(BetterFoliage.config.grassSize, -100, -70, 200, 50, id++, id++, "message.betterfoliage.size", "%.2f"));
+		widgets.add(new OptionDoubleWidget(BetterFoliage.config.grassHOffset, -100, -40, 200, 50, id++, id++, "message.betterfoliage.hOffset", "%.3f"));
+		widgets.add(new OptionDoubleWidget(BetterFoliage.config.grassHeightMin, -100, -10, 200, 50, id++, id++, "message.betterfoliage.minHeight", "%.2f"));
+		widgets.add(new OptionDoubleWidget(BetterFoliage.config.grassHeightMax, -100, 20, 200, 50, id++, id++, "message.betterfoliage.maxHeight", "%.2f"));
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public void addButtons(int x, int y) {
+		buttonList.add(new GuiButton(0, x - 50, y + 50, 100, 20, "Close"));
+	}
+
+	@Override
+	protected void onButtonPress(int id) {
+		if (id == 0) FMLClientHandler.instance().showGuiScreen(parent);
+
+		if (BetterFoliage.config.grassHeightMin.value > BetterFoliage.config.grassHeightMax.value) BetterFoliage.config.grassHeightMin.value = BetterFoliage.config.grassHeightMax.value;
+	}
+
+}
diff --git a/src/main/java/mods/betterfoliage/client/gui/ConfigGuiLeaves.java b/src/main/java/mods/betterfoliage/client/gui/ConfigGuiLeaves.java
@@ -0,0 +1,38 @@
+package mods.betterfoliage.client.gui;
+
+import mods.betterfoliage.BetterFoliage;
+import mods.betterfoliage.client.gui.widget.OptionDoubleWidget;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import cpw.mods.fml.client.FMLClientHandler;
+
+public class ConfigGuiLeaves extends ConfigGuiScreenBase {
+
+	public enum Button {CLOSE, LEAVES_OFFSET_MODE}
+
+	public ConfigGuiLeaves(GuiScreen parent) {
+		super(parent);
+		int id = 10;
+		widgets.add(new OptionDoubleWidget(BetterFoliage.config.leavesSize, -100, -70, 200, 50, id++, id++, "message.betterfoliage.size", "%.2f"));
+		widgets.add(new OptionDoubleWidget(BetterFoliage.config.leavesHOffset, -100, -10, 200, 50, id++, id++, "message.betterfoliage.hOffset", "%.3f"));
+		widgets.add(new OptionDoubleWidget(BetterFoliage.config.leavesVOffset, -100, 20, 200, 50, id++, id++, "message.betterfoliage.vOffset", "%.3f"));
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public void addButtons(int x, int y) {
+		buttonList.add(new GuiButton(Button.CLOSE.ordinal(), x - 50, y + 50, 100, 20, "Close"));
+		buttonList.add(new GuiButton(Button.LEAVES_OFFSET_MODE.ordinal(), x - 100, y - 40, 200, 20, ""));
+	}
+
+	protected void updateButtons() {
+		setButtonOptionBoolean(Button.LEAVES_OFFSET_MODE.ordinal(), "message.betterfoliage.leavesMode", BetterFoliage.config.leavesSkew ? "message.betterfoliage.leavesSkew" : "message.betterfoliage.leavesTranslate");
+	}
+
+	@Override
+	protected void onButtonPress(int id) {
+		if (id == Button.CLOSE.ordinal()) FMLClientHandler.instance().showGuiScreen(parent);
+		if (id == Button.LEAVES_OFFSET_MODE.ordinal()) BetterFoliage.config.leavesSkew = !BetterFoliage.config.leavesSkew;
+	}
+
+}
diff --git a/src/main/java/mods/betterfoliage/client/gui/ConfigGuiLilypad.java b/src/main/java/mods/betterfoliage/client/gui/ConfigGuiLilypad.java
@@ -0,0 +1,30 @@
+package mods.betterfoliage.client.gui;
+
+import mods.betterfoliage.BetterFoliage;
+import mods.betterfoliage.client.gui.widget.OptionDoubleWidget;
+import mods.betterfoliage.client.gui.widget.OptionIntegerWidget;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import cpw.mods.fml.client.FMLClientHandler;
+
+public class ConfigGuiLilypad extends ConfigGuiScreenBase {
+
+	public ConfigGuiLilypad(GuiScreen parent) {
+		super(parent);
+		int id = 10;
+		widgets.add(new OptionDoubleWidget(BetterFoliage.config.lilypadHOffset, -100, -40, 200, 50, id++, id++, "message.betterfoliage.hOffset", "%.3f"));
+		widgets.add(new OptionIntegerWidget(BetterFoliage.config.lilypadChance, -100, -10, 200, 50, id++, id++, "message.betterfoliage.flowerChance"));
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public void addButtons(int x, int y) {
+		buttonList.add(new GuiButton(0, x - 50, y + 50, 100, 20, "Close"));
+	}
+
+	@Override
+	protected void onButtonPress(int id) {
+		if (id == 0) FMLClientHandler.instance().showGuiScreen(parent);
+	}
+
+}
diff --git a/src/main/java/mods/betterfoliage/client/gui/ConfigGuiMain.java b/src/main/java/mods/betterfoliage/client/gui/ConfigGuiMain.java
@@ -0,0 +1,75 @@
+package mods.betterfoliage.client.gui;
+
+import mods.betterfoliage.BetterFoliage;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.I18n;
+import cpw.mods.fml.client.FMLClientHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+@SideOnly(Side.CLIENT)
+public class ConfigGuiMain extends ConfigGuiScreenBase {
+
+	public enum Button {CLOSE, 
+						TOGGLE_LEAVES, CONFIG_LEAVES,
+						TOGGLE_GRASS, CONFIG_GRASS,
+						TOGGLE_CACTUS, CONFIG_CACTUS,
+						TOGGLE_LILYPAD, CONFIG_LILYPAD,
+						TOGGLE_REED, CONFIG_REED}
+
+	public ConfigGuiMain(GuiScreen parent) {
+		super(parent);
+
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	protected void addButtons(int x, int y) {
+		buttonList.add(new GuiButton(Button.CLOSE.ordinal(), x - 50, y + 80, 100, 20, "Close"));
+		buttonList.add(new GuiButton(Button.TOGGLE_LEAVES.ordinal(), x - 100, y - 100, 150, 20, ""));
+		buttonList.add(new GuiButton(Button.CONFIG_LEAVES.ordinal(), x + 60, y - 100, 40, 20, I18n.format("message.betterfoliage.config")));
+
+		buttonList.add(new GuiButton(Button.TOGGLE_GRASS.ordinal(), x - 100, y - 70, 150, 20, ""));
+		buttonList.add(new GuiButton(Button.CONFIG_GRASS.ordinal(), x + 60, y - 70, 40, 20, I18n.format("message.betterfoliage.config")));
+
+		buttonList.add(new GuiButton(Button.TOGGLE_CACTUS.ordinal(), x - 100, y - 40, 150, 20, ""));
+		buttonList.add(new GuiButton(Button.CONFIG_CACTUS.ordinal(), x + 60, y - 40, 40, 20, I18n.format("message.betterfoliage.config")));
+
+		buttonList.add(new GuiButton(Button.TOGGLE_LILYPAD.ordinal(), x - 100, y - 10, 150, 20, ""));
+		buttonList.add(new GuiButton(Button.CONFIG_LILYPAD.ordinal(), x + 60, y - 10, 40, 20, I18n.format("message.betterfoliage.config")));
+
+		buttonList.add(new GuiButton(Button.TOGGLE_REED.ordinal(), x - 100, y + 20, 150, 20, ""));
+		buttonList.add(new GuiButton(Button.CONFIG_REED.ordinal(), x + 60, y + 20, 40, 20, I18n.format("message.betterfoliage.config")));
+	}
+
+	protected void updateButtons() {
+		setButtonOptionBoolean(Button.TOGGLE_LEAVES.ordinal(), "message.betterfoliage.betterLeaves", BetterFoliage.config.leavesEnabled);
+		setButtonOptionBoolean(Button.TOGGLE_GRASS.ordinal(), "message.betterfoliage.betterGrass", BetterFoliage.config.grassEnabled);
+		setButtonOptionBoolean(Button.TOGGLE_CACTUS.ordinal(), "message.betterfoliage.betterCactus", BetterFoliage.config.cactusEnabled);
+		setButtonOptionBoolean(Button.TOGGLE_LILYPAD.ordinal(), "message.betterfoliage.betterLilypad", BetterFoliage.config.lilypadEnabled);
+		setButtonOptionBoolean(Button.TOGGLE_REED.ordinal(), "message.betterfoliage.betterReed", BetterFoliage.config.reedEnabled);
+		((GuiButton) buttonList.get(Button.CONFIG_CACTUS.ordinal())).enabled = false;
+	}
+
+	@Override
+	protected void onButtonPress(int id) {
+		if (id == Button.CLOSE.ordinal()) {
+			BetterFoliage.config.save();
+			Minecraft.getMinecraft().renderGlobal.loadRenderers();
+			FMLClientHandler.instance().showGuiScreen(parent);
+		}
+		if (id == Button.TOGGLE_LEAVES.ordinal()) BetterFoliage.config.leavesEnabled = !BetterFoliage.config.leavesEnabled;
+		if (id == Button.TOGGLE_GRASS.ordinal()) BetterFoliage.config.grassEnabled = !BetterFoliage.config.grassEnabled;
+		if (id == Button.TOGGLE_CACTUS.ordinal()) BetterFoliage.config.cactusEnabled = !BetterFoliage.config.cactusEnabled;
+		if (id == Button.TOGGLE_LILYPAD.ordinal()) BetterFoliage.config.lilypadEnabled = !BetterFoliage.config.lilypadEnabled;
+		if (id == Button.TOGGLE_REED.ordinal()) BetterFoliage.config.reedEnabled = !BetterFoliage.config.reedEnabled;
+
+		if (id== Button.CONFIG_LEAVES.ordinal()) FMLClientHandler.instance().showGuiScreen(new ConfigGuiLeaves(this));
+		if (id== Button.CONFIG_GRASS.ordinal()) FMLClientHandler.instance().showGuiScreen(new ConfigGuiGrass(this));
+		if (id== Button.CONFIG_LILYPAD.ordinal()) FMLClientHandler.instance().showGuiScreen(new ConfigGuiLilypad(this));
+		if (id== Button.CONFIG_REED.ordinal()) FMLClientHandler.instance().showGuiScreen(new ConfigGuiReed(this));
+	}
+
+}
diff --git a/src/main/java/mods/betterfoliage/client/gui/ConfigGuiReed.java b/src/main/java/mods/betterfoliage/client/gui/ConfigGuiReed.java
@@ -0,0 +1,34 @@
+package mods.betterfoliage.client.gui;
+
+import mods.betterfoliage.BetterFoliage;
+import mods.betterfoliage.client.gui.widget.OptionDoubleWidget;
+import mods.betterfoliage.client.gui.widget.OptionIntegerWidget;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import cpw.mods.fml.client.FMLClientHandler;
+
+public class ConfigGuiReed extends ConfigGuiScreenBase {
+
+	public ConfigGuiReed(GuiScreen parent) {
+		super(parent);
+		int id = 10;
+		widgets.add(new OptionDoubleWidget(BetterFoliage.config.reedHOffset, -100, -70, 200, 50, id++, id++, "message.betterfoliage.hOffset", "%.3f"));
+		widgets.add(new OptionDoubleWidget(BetterFoliage.config.reedHeightMin, -100, -40, 200, 50, id++, id++, "message.betterfoliage.minHeight", "%.2f"));
+		widgets.add(new OptionDoubleWidget(BetterFoliage.config.reedHeightMax, -100, -10, 200, 50, id++, id++, "message.betterfoliage.maxHeight", "%.2f"));
+		widgets.add(new OptionIntegerWidget(BetterFoliage.config.reedChance, -100, 20, 200, 50, id++, id++, "message.betterfoliage.reedChance"));
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public void addButtons(int x, int y) {
+		buttonList.add(new GuiButton(0, x - 50, y + 50, 100, 20, "Close"));
+	}
+
+	@Override
+	protected void onButtonPress(int id) {
+		if (id == 0) FMLClientHandler.instance().showGuiScreen(parent);
+
+		if (BetterFoliage.config.reedHeightMin.value > BetterFoliage.config.reedHeightMax.value) BetterFoliage.config.reedHeightMin.value = BetterFoliage.config.reedHeightMax.value;
+	}
+
+}