From 7c380f634433a4a6bd2f7a49e64499ebbfa3df1b Mon Sep 17 00:00:00 2001 From: Zeno410 Date: Wed, 6 Jan 2016 01:50:41 -0800 Subject: [PATCH 1/3] Checking River Stripping (not for release) Debug for river stripping --- src/main/java/rtg/event/EventManagerRTG.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/rtg/event/EventManagerRTG.java b/src/main/java/rtg/event/EventManagerRTG.java index 403cda89f..fc32e2155 100644 --- a/src/main/java/rtg/event/EventManagerRTG.java +++ b/src/main/java/rtg/event/EventManagerRTG.java @@ -152,6 +152,7 @@ public void onBiomeGenInit(WorldTypeEvent.InitBiomeGens event) { try { event.newBiomeGens = new RiverRemover().riverLess(event.originalBiomeGens); } catch (ClassCastException ex) { + throw ex; // failed attempt because the GenLayers don't end with GenLayerRiverMix } } From bda2a752ced214df30f238ab7b658f8d6a4f8835 Mon Sep 17 00:00:00 2001 From: Zeno410 Date: Wed, 6 Jan 2016 01:51:26 -0800 Subject: [PATCH 2/3] Further dimensional fixes Something else needed to be fixed for alternate dimensions --- src/main/java/rtg/world/WorldTypeRTG.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/rtg/world/WorldTypeRTG.java b/src/main/java/rtg/world/WorldTypeRTG.java index 4dcb2c7d2..c5aea3984 100644 --- a/src/main/java/rtg/world/WorldTypeRTG.java +++ b/src/main/java/rtg/world/WorldTypeRTG.java @@ -8,6 +8,7 @@ import net.minecraft.world.biome.WorldChunkManager; import net.minecraft.world.chunk.IChunkProvider; +import net.minecraft.world.gen.ChunkProviderGenerate; import net.minecraftforge.common.DimensionManager; public class WorldTypeRTG extends WorldType @@ -34,7 +35,11 @@ public WorldChunkManager getChunkManager(World world) @Override public IChunkProvider getChunkGenerator(World world, String generatorOptions) { - return new ChunkProviderRTG(world, world.getSeed()); + if (world.provider.dimensionId == 0) { + return new ChunkProviderRTG(world, world.getSeed()); + } else { + return new ChunkProviderGenerate(world, world.getSeed(), world.getWorldInfo().isMapFeaturesEnabled()); + } } @Override From ab8b8092a49acac076889a8fb185507e92d54f03 Mon Sep 17 00:00:00 2001 From: Zeno410 Date: Wed, 6 Jan 2016 01:55:24 -0800 Subject: [PATCH 3/3] Disabling river strip check This is getting to be a real pain --- src/main/java/rtg/event/EventManagerRTG.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/rtg/event/EventManagerRTG.java b/src/main/java/rtg/event/EventManagerRTG.java index fc32e2155..ad79aba09 100644 --- a/src/main/java/rtg/event/EventManagerRTG.java +++ b/src/main/java/rtg/event/EventManagerRTG.java @@ -152,7 +152,7 @@ public void onBiomeGenInit(WorldTypeEvent.InitBiomeGens event) { try { event.newBiomeGens = new RiverRemover().riverLess(event.originalBiomeGens); } catch (ClassCastException ex) { - throw ex; + //throw ex; // failed attempt because the GenLayers don't end with GenLayerRiverMix } }