Skip to content

Commit

Permalink
Merge pull request #40 from Team-RTG/1.10.2-dev
Browse files Browse the repository at this point in the history 
Merged dev into master (1.10.2-0.1.0-UNSTABLE-ALPHA-2)
  • Loading branch information
@whichonespink44
whichonespink44 authored Nov 22, 2016
2 parents 5b925be + 21975fc commit db49e1b
Show file tree
Hide file tree
Showing 2,922 changed files with 50,318 additions and 28,406 deletions.
10 changes: 5 additions & 5 deletions build.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
mod_id=appalachia
mod_name=Appalachia
mod_desc=Minecraft mod that adds biomes inspired by the Appalachian region of North America.
mod_version=0.1.0-UNSTABLE-ALPHA-1
mod_version=0.1.0-UNSTABLE-ALPHA-2
mc_version=1.10.2
mod_url=https://github.com/Team-RTG/Appalachia
mod_author="Team RTG"
mod_creds=
mod_logo=assets/appalachia/logo.png
rtg_minver=4.1.1.3
rtg_minver=4.1.1.8
rtg_maxver=
mcf_version=12.18.1.2094
mcf_version=12.18.2.2099
mcf_minver=12.18.1.2011
mcf_maxver=
# mcf_suffix is the branch suffix (without '-') on the Forge version when it's not the default branch in the Forge repo
# This may be the same as mc_version, eg Non-default: 1.9.4-12.17.0.1974-1.9.4, Default: 1.9.4-12.17.0.1976
# This may be the same as mc_version, eg Non-default: 1.9.4-12.18.2.2099-1.9.4, Default: 1.9.4-12.18.2.2099
mcf_suffix=
mcp_mappings=snapshot_nodoc_20160830
mcp_mappings=snapshot_nodoc_20161027
run_dir=run
package_base=org.teamrtg
100 changes: 77 additions & 23 deletions etc/config/Appalachia/appalachia.cfg
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,71 @@
# Configuration file

"biome ids" {
# [range: 0 ~ 255, default: 40]
I:"Appalachian Mountains Biome ID"=40
# [range: 0 ~ 255, default: 47]
I:"Autumn Blue Ridge Bog Biome ID"=47

# [range: 0 ~ 255, default: 41]
I:"Autumn Blue Ridge Forest Biome ID"=41

# [range: 0 ~ 255, default: 43]
I:"Autumn Blue Ridge Hills Biome ID"=43

# [range: 0 ~ 255, default: 45]
I:"Autumn Blue Ridge Mountains Biome ID"=45

# [range: 0 ~ 255, default: 57]
I:"Autumn Smoky Bog Biome ID"=57

# [range: 0 ~ 255, default: 51]
I:"Autumn Smoky Forest Biome ID"=51

# [range: 0 ~ 255, default: 53]
I:"Autumn Smoky Hills Biome ID"=53

# [range: 0 ~ 255, default: 55]
I:"Autumn Smoky Mountains Biome ID"=55

# [range: 0 ~ 255, default: 48]
I:"Autumn Blue Ridge Forest Biome ID"=48
I:"Blue Ridge Beach Biome ID"=48

# [range: 0 ~ 255, default: 49]
I:"Autumn Blue Ridge Hills Biome ID"=49
# [range: 0 ~ 255, default: 46]
I:"Blue Ridge Bog Biome ID"=46

# [range: 0 ~ 255, default: 50]
I:"Autumn Blue Ridge Mountains Biome ID"=50
# [range: 0 ~ 255, default: 40]
I:"Blue Ridge Forest Biome ID"=40

# [range: 0 ~ 255, default: 42]
I:"Blue Ridge Hills Biome ID"=42

# [range: 0 ~ 255, default: 44]
I:"Blue Ridge Beach Biome ID"=44
I:"Blue Ridge Mountains Biome ID"=44

# [range: 0 ~ 255, default: 42]
I:"Blue Ridge Forest Biome ID"=42
# [range: 0 ~ 255, default: 49]
I:"Blue Ridge River Biome ID"=49

# [range: 0 ~ 255, default: 43]
I:"Blue Ridge Hills Biome ID"=43
# [range: 0 ~ 255, default: 58]
I:"Smoky Beach Biome ID"=58

# [range: 0 ~ 255, default: 41]
I:"Blue Ridge Mountains Biome ID"=41
# [range: 0 ~ 255, default: 56]
I:"Smoky Bog Biome ID"=56

# [range: 0 ~ 255, default: 45]
I:"Blue Ridge River Biome ID"=45
# [range: 0 ~ 255, default: 50]
I:"Smoky Forest Biome ID"=50

# [range: 0 ~ 255, default: 46]
I:"Prairie Biome ID"=46
# [range: 0 ~ 255, default: 52]
I:"Smoky Hills Biome ID"=52

# [range: 0 ~ 255, default: 47]
I:"Smoky Mountains Biome ID"=47
# [range: 0 ~ 255, default: 54]
I:"Smoky Mountains Biome ID"=54

# [range: 0 ~ 255, default: 59]
I:"Smoky River Biome ID"=59
}


"biome weights" {
# [range: 0 ~ 2147483647, default: 20]
I:"Appalachian Mountains Biome Weight"=20
# [range: 0 ~ 2147483647, default: 10]
I:"Autumn Blue Ridge Bog Biome Weight"=10

# [range: 0 ~ 2147483647, default: 20]
I:"Autumn Blue Ridge Forest Biome Weight"=20
Expand All @@ -49,9 +76,24 @@
# [range: 0 ~ 2147483647, default: 20]
I:"Autumn Blue Ridge Mountains Biome Weight"=20

# [range: 0 ~ 2147483647, default: 10]
I:"Autumn Smoky Bog Biome Weight"=10

# [range: 0 ~ 2147483647, default: 20]
I:"Autumn Smoky Forest Biome Weight"=20

# [range: 0 ~ 2147483647, default: 20]
I:"Autumn Smoky Hills Biome Weight"=20

# [range: 0 ~ 2147483647, default: 20]
I:"Autumn Smoky Mountains Biome Weight"=20

# [range: 0 ~ 2147483647, default: 0]
I:"Blue Ridge Beach Biome Weight"=0

# [range: 0 ~ 2147483647, default: 10]
I:"Blue Ridge Bog Biome Weight"=10

# [range: 0 ~ 2147483647, default: 20]
I:"Blue Ridge Forest Biome Weight"=20

Expand All @@ -64,11 +106,23 @@
# [range: 0 ~ 2147483647, default: 0]
I:"Blue Ridge River Biome Weight"=0

# [range: 0 ~ 2147483647, default: 0]
I:"Smoky Beach Biome Weight"=0

# [range: 0 ~ 2147483647, default: 10]
I:"Smoky Bog Biome Weight"=10

# [range: 0 ~ 2147483647, default: 20]
I:"Smoky Forest Biome Weight"=20

# [range: 0 ~ 2147483647, default: 20]
I:"Prairie Biome Weight"=20
I:"Smoky Hills Biome Weight"=20

# [range: 0 ~ 2147483647, default: 20]
I:"Smoky Mountains Biome Weight"=20

# [range: 0 ~ 2147483647, default: 0]
I:"Smoky River Biome Weight"=0
}


Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Sep 14 12:28:28 PDT 2015
#Mon Nov 14 20:36:39 EST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
52 changes: 26 additions & 26 deletions gradlew
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,30 @@
##
##############################################################################

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null

APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

Expand All @@ -30,6 +48,7 @@ die ( ) {
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
Expand All @@ -40,31 +59,11 @@ case "`uname`" in
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac

# For Cygwin, ensure paths are in UNIX format before anything is touched.
if $cygwin ; then
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
fi

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >&-
APP_HOME="`pwd -P`"
cd "$SAVED" >&-

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

# Determine the Java command to use to start the JVM.
Expand All @@ -90,7 +89,7 @@ location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
Expand All @@ -114,6 +113,7 @@ fi
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`

# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
Expand Down
8 changes: 4 additions & 4 deletions gradlew.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

Expand Down Expand Up @@ -46,7 +46,7 @@ echo location of your Java installation.
goto fail

:init
@rem Get command-line arguments, handling Windowz variants
@rem Get command-line arguments, handling Windows variants

if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args
Expand Down
22 changes: 14 additions & 8 deletions src/api/java/rtg/RTG.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import net.minecraft.world.gen.structure.MapGenStructureIO;

import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.Mod.Instance;
import net.minecraftforge.fml.common.SidedProxy;
Expand All @@ -14,10 +15,8 @@
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.event.FMLServerStoppedEvent;

import rtg.api.event.BiomeConfigEvent;
import rtg.config.BiomeConfigManager;
import rtg.config.ConfigManager;
import rtg.config.rtg.ConfigRTG;
import rtg.config.ConfigRTG;
import rtg.event.EventManagerRTG;
import rtg.event.WorldTypeMessageEventHandler;
import rtg.proxy.ClientProxy;
Expand All @@ -31,7 +30,9 @@
import rtg.world.biome.realistic.biomesoplenty.RealisticBiomeBOPBase;
import rtg.world.biome.realistic.biomesyougo.RealisticBiomeBYGBase;
import rtg.world.biome.realistic.flowercraft.RealisticBiomeFCBase;
import rtg.world.biome.realistic.mineworld.RealisticBiomeMWBase;
import rtg.world.biome.realistic.mithwoodforest.RealisticBiomeMFBase;
import rtg.world.biome.realistic.morechinesemc.RealisticBiomeMCMBase;
import rtg.world.biome.realistic.sugiforest.RealisticBiomeSFBase;
import rtg.world.biome.realistic.vanilla.RealisticBiomeVanillaBase;
import rtg.world.gen.structure.MapGenScatteredFeatureRTG;
Expand All @@ -40,6 +41,14 @@
import rtg.world.gen.structure.StructureOceanMonumentRTG;


@SuppressWarnings({"WeakerAccess", "unused"})
@Mod(
modid = ModInfo.MOD_ID,
name = ModInfo.MOD_NAME,
version = "5.0.0.0",
dependencies = "required-after:Forge@[12.18.1.2011,)" + ModInfo.MOD_DEPS,
acceptableRemoteVersions = "*"
)
public class RTG {

public static String configPath;
Expand All @@ -62,11 +71,6 @@ public void initPre(FMLPreInitializationEvent event) {

worldtype = new WorldTypeRTG(ModInfo.WORLD_TYPE);

// Biome configs MUST get initialised before the main config.
MinecraftForge.EVENT_BUS.post(new BiomeConfigEvent.Pre());
BiomeConfigManager.initBiomeConfigs();
MinecraftForge.EVENT_BUS.post(new BiomeConfigEvent.Post());

configPath = event.getModConfigurationDirectory() + File.separator + ModInfo.CONFIG_DIRECTORY + File.separator;
ConfigManager.init(configPath);

Expand Down Expand Up @@ -96,7 +100,9 @@ public void initPost(FMLPostInitializationEvent event) {
RealisticBiomeBOPBase.addBiomes();
RealisticBiomeBYGBase.addBiomes();
RealisticBiomeFCBase.addBiomes();
RealisticBiomeMCMBase.addBiomes();
RealisticBiomeMFBase.addBiomes();
RealisticBiomeMWBase.addBiomes();
RealisticBiomeSFBase.addBiomes();

RealisticBiomePresenceTester.doBiomeCheck();
Expand Down
Loading

0 comments on commit db49e1b

Please sign in to comment.