StateMc/BetterFoliage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Major refactoring

Browse Source 
Added cactus and lilypads
This commit is contained in:
octarine-noise
2014-06-29 21:53:35 +02:00
parent ec184f9916
commit 220f2356d8
26 changed files with 773 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/mods/betterfoliage/common/config/Config.java
View File

@@ -8,7 +8,10 @@ import net.minecraftforge.common.config.Configuration;
public class Config {
public static boolean leavesEnabled = true;
public static boolean leavesSkew = false;
public static boolean grassEnabled = true;
public static boolean cactusEnabled = true;
public static boolean lilypadEnabled = true;
public static OptionDouble leavesHOffset = new OptionDouble(0.0, 0.4, 0.025, 0.2);
public static OptionDouble leavesVOffset = new OptionDouble(0.0, 0.4, 0.025, 0.1);
@@ -19,6 +22,9 @@ public class Config {
public static OptionDouble grassHeightMax = new OptionDouble(0.1, 1.5, 0.05, 1.0);
public static OptionDouble grassSize = new OptionDouble(0.5, 1.5, 0.05, 1.0);
public static OptionDouble lilypadHOffset = new OptionDouble(0.0, 0.25, 0.025, 0.1);
public static OptionInteger lilypadChance = new OptionInteger(0, 64, 1, 16);
private Config() {}
public static void load() {
@@ -26,6 +32,7 @@ public class Config {
config.load();
leavesEnabled = config.get("render", "leavesEnabled", true).getBoolean(true);
leavesSkew = config.get("render", "leavesOffsetSkew", false).getBoolean(false);
loadValue(config, "render", "leavesHorizontalOffset", leavesHOffset);
loadValue(config, "render", "leavesVerticalOffset", leavesVOffset);
loadValue(config, "render", "leavesSize", leavesSize);
@@ -36,6 +43,11 @@ public class Config {
loadValue(config, "render", "grassHeightMax", grassHeightMax);
if (grassHeightMin.value > grassHeightMax.value) grassHeightMin.value = grassHeightMax.value;
grassEnabled = config.get("render", "cactusEnabled", true).getBoolean(true);
grassEnabled = config.get("render", "lilypadEnabled", true).getBoolean(true);
loadValue(config, "render", "lilypadHorizontalOffset", lilypadHOffset);
loadValue(config, "render", "lilypadChance", lilypadChance);
if (config.hasChanged()) config.save();
}
@@ -44,6 +56,7 @@ public class Config {
config.load();
config.get("render", "leavesEnabled", true).set(leavesEnabled);
config.get("render", "leavesOffsetSkew", false).set(leavesSkew);
saveValue(config, "render", "leavesHorizontalOffset", leavesHOffset);
saveValue(config, "render", "leavesVerticalOffset", leavesVOffset);
saveValue(config, "render", "leavesSize", leavesSize);
@@ -53,6 +66,11 @@ public class Config {
saveValue(config, "render", "grassHeightMin", grassHeightMin);
saveValue(config, "render", "grassHeightMax", grassHeightMax);
config.get("render", "cactusEnabled", true).set(cactusEnabled);
config.get("render", "lilypadEnabled", true).set(lilypadEnabled);
saveValue(config, "render", "lilypadHorizontalOffset", lilypadHOffset);
saveValue(config, "render", "lilypadChance", lilypadChance);
if (config.hasChanged()) config.save();
}
@@ -71,4 +89,20 @@ public class Config {
saveValue(config, category, key, option);
}
}
protected static void saveValue(Configuration config, String category, String key, OptionInteger option) {
config.get(category, key, option.value).set(option.value);
}
protected static void loadValue(Configuration config, String category, String key, OptionInteger option) {
option.value = config.get(category, key, option.value).getInt(option.value);
if (option.value > option.max) {
option.value = option.max;
saveValue(config, category, key, option);
}
if (option.value < option.min) {
option.value = option.min;
saveValue(config, category, key, option);
}
}
}

26
src/main/java/mods/betterfoliage/common/config/OptionInteger.java Normal file
View File

@@ -0,0 +1,26 @@
package mods.betterfoliage.common.config;
public class OptionInteger {
public int min;
public int max;
public int step;
public int value;
public OptionInteger(int min, int max, int step, int value) {
this.min = min;
this.max = max;
this.step = step;
this.value = value;
}
public void increment() {
value += step;
if (value > max) value = max;
}
public void decrement() {
value -= step;
if (value < min) value = min;
}
}

32
src/main/java/mods/betterfoliage/common/util/DeobfNames.java
View File

@@ -4,6 +4,24 @@ public class DeobfNames {
private DeobfNames() {}
/** MCP name of RenderBlocks */
public static final String RB_NAME_MCP = "net/minecraft/client/renderer/RenderBlocks";
/** Obfuscated name of RenderBlocks */
public static final String RB_NAME_OBF = "ble";
/** MCP name of RenderBlocks.blockAccess */
public static final String RB_BA_NAME_MCP = "blockAccess";
/** Obfuscated name of RenderBlocks.blockAccess */
public static final String RB_BA_NAME_OBF = "a";
/** MCP signature of RenderBlocks.blockAccess */
public static final String RB_BA_SIG_MCP = "Lnet/minecraft/world/IBlockAccess;";
/** Obfuscated signature of RenderBlocks.blockAccess */
public static final String RB_BA_SIG_OBF = "Lafx;";
/** MCP name of RenderBlocks.renderBlockByRenderType() */
public static final String RB_RBBRT_NAME_MCP = "renderBlockByRenderType";
@@ -16,17 +34,11 @@ public class DeobfNames {
/** Obfuscated signature of RenderBlocks.renderBlockByRenderType() */
public static final String RB_RBBRT_SIG_OBF = "(Lahu;III)Z";
/** MCP signature of BlockRenderTypeOverride.getRenderType(Block) */
public static final String BRTO_GRT_SIG_MCP = "(Lnet/minecraft/block/Block;)I";
/** MCP signature of BetterFoliageClient.getRenderTypeOverride() */
public static final String BFC_GRTO_SIG_MCP = "(Lnet/minecraft/world/IBlockAccess;IIILnet/minecraft/block/Block;I)I";
/** Obfuscated signature of BlockRenderTypeOverride.getRenderType(Block) */
public static final String BRTO_GRT_SIG_OBF = "(Lahu;)I";
/** MCP signature of BlockRenderTypeOverride.getRenderType(Block) */
public static final String BRTO_GRTO_SIG_MCP = "(ILnet/minecraft/block/Block;)I";
/** Obfuscated signature of BlockRenderTypeOverride.getRenderType(Block) */
public static final String BRTO_GRTO_SIG_OBF = "(ILahu;)I";
/** Obfuscated signature of BetterFoliageClient.getRenderTypeOverride() */
public static final String BFC_GRTO_SIG_OBF = "(Lafx;IIILahu;I)I";
/** MCP name of SimpleReloadableResourceManager.domainResourceManagers */
public static final String SRRM_DRM_MCP = "domainResourceManagers";

12
src/main/java/mods/betterfoliage/common/util/Double3.java
View File

@@ -1,5 +1,7 @@
package mods.betterfoliage.common.util;
import net.minecraftforge.common.util.ForgeDirection;
public class Double3 {
public final double x;
@@ -12,10 +14,20 @@ public class Double3 {
this.z = z;
}
public Double3(ForgeDirection dir) {
this.x = dir.offsetX;
this.y = dir.offsetY;
this.z = dir.offsetZ;
}
public Double3 add(Double3 other) {
return new Double3(x + other.x, y + other.y, z + other.z);
}
public Double3 add(double x, double y, double z) {
return new Double3(this.x + x, this.y + y, this.z + z);
}
public Double3 scaleAxes(double sx, double sy, double sz) {
return new Double3(x * sx, y * sy, z * sz);
}