Showing with 323 additions and 135 deletions.
  1. +1 −0 .gitignore
  2. +2 −2 build.gradle
  3. +4 −4 build.properties
  4. BIN gradle/wrapper/gradle-wrapper.jar
  5. +2 −2 gradle/wrapper/gradle-wrapper.properties
  6. +2 −2 src/main/java/iguanaman/hungeroverhaul/config/ConfigOption.java
  7. +100 −51 src/main/java/iguanaman/hungeroverhaul/config/IguanaConfig.java
  8. +1 −1 src/main/java/iguanaman/hungeroverhaul/food/FoodModifier.java
  9. +24 −15 src/main/java/iguanaman/hungeroverhaul/module/ModuleBonemeal.java
  10. +2 −2 src/main/java/iguanaman/hungeroverhaul/module/ModuleNatura.java
  11. +4 −3 src/main/java/iguanaman/hungeroverhaul/module/ModulePlantGrowth.java
  12. +1 −1 src/main/java/iguanaman/hungeroverhaul/module/ModuleVanilla.java
  13. +38 −1 src/main/java/iguanaman/hungeroverhaul/util/BlockHelper.java
  14. +1 −0 src/main/java/iguanaman/hungeroverhaul/util/BonemealModification.java
  15. +1 −1 src/main/java/iguanaman/hungeroverhaul/util/ComponentVillageCustomField.java
  16. +51 −33 src/main/java/iguanaman/hungeroverhaul/util/IguanaEventHook.java
  17. +4 −4 src/main/java/iguanaman/hungeroverhaul/util/ItemTweaks.java
  18. +5 −5 src/main/java/iguanaman/hungeroverhaul/util/PlantGrowthModification.java
  19. +13 −1 src/main/java/iguanaman/hungeroverhaul/util/RandomHelper.java
  20. +9 −1 src/main/resources/assets/HungerOverhaul/lang/de_DE.lang
  21. +38 −0 src/main/resources/assets/HungerOverhaul/lang/pt_BR.lang
  22. +14 −6 src/main/resources/assets/HungerOverhaul/lang/zh_CN.lang
  23. +6 −0 src/main/resources/pack.mcmeta
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
/build
/run
/libs
/eclipse

# Eclipse
.classpath
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ dependencies {
// the jenkins server, so skip this for jenkins builds
if (System.getenv().BUILD_NUMBER == null) {
// note: the 'repository' url changes with each version
repositories { ivy { artifactPattern "http://addons.cursecdn.com/files/2223/550/[module] [revision].[ext]" } }
dependencies { compile "pam:Pam's HarvestCraft:1.7.10f@jar" }
repositories { ivy { artifactPattern "http://addons.cursecdn.com/files/2268/386/[module] [revision].[ext]" } }
dependencies { compile "pam:Pam's HarvestCraft:1.7.10La@jar" }
repositories { ivy { artifactPattern "http://addons.cursecdn.com/files/2206/431/[module] [revision].[ext]"} }
dependencies { compile "pam:Pam's Random Pants:1.7.2a@zip"}
repositories { ivy { artifactPattern "http://addons.cursecdn.com/files/2206/430/[module] [revision].[ext]"} }
Expand Down
8 changes: 4 additions & 4 deletions build.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
minecraft_version=1.7.10
forge_version=10.13.1.1225
mantle_version=0.3.1.jenkins183
forge_version=10.13.2.1291
mantle_version=0.3.2.jenkins187
mod_version=1.0.0
natura_version=90.19cc59f
tcon_version=1.7.0.build677
tcon_version=1.8.3.build926
bop_version=2.1.0.991
applecore_version=1.0.0
applecore_version=1.1.0
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Jul 02 15:54:47 CDT 2014
#Sun May 10 14:26:47 EDT 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public T get(Configuration config)
else if (defaultValue instanceof Integer)
return (T) Integer.valueOf(config.getInt(name, category, (Integer) defaultValue, (Integer) minValue, (Integer) maxValue, getComment()));
else if (defaultValue instanceof Float)
return (T) Float.valueOf((float) config.getFloat(name, category, (Float) defaultValue, (Float) minValue, (Float) maxValue, getComment()));
return (T) Float.valueOf(config.getFloat(name, category, (Float) defaultValue, (Float) minValue, (Float) maxValue, getComment()));
else if (defaultValue instanceof Double)
return (T) Double.valueOf(Math.min((Double) maxValue, Math.max((Double) minValue, getProperty(config).getDouble())));
else if (defaultValue instanceof String)
Expand All @@ -80,7 +80,7 @@ else if (defaultValue instanceof String)

public T getBackwardsCompatible(Configuration config, ConfigOption<T> legacyConfigOption)
{
if (legacyConfigOption.exists(config))
if (!this.exists(config) && legacyConfigOption.exists(config))
{
T oldConfigOptionValue = legacyConfigOption.get(config);
if (oldConfigOptionValue != null)
Expand Down
Loading