diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-08-22 20:58:30 +1000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-08-22 20:58:30 +1000 |
| commit | 2e1c3edaddd10a958830bb96c9b59c019a63d671 (patch) | |
| tree | a8682df48f66d6e5d98b5c9e3ef5a00ae97a46de | |
| parent | fcb9e4a94b95a3113a05dead4eb99889e6113337 (diff) | |
| download | GT5-Unofficial-2e1c3edaddd10a958830bb96c9b59c019a63d671.tar.gz GT5-Unofficial-2e1c3edaddd10a958830bb96c9b59c019a63d671.tar.bz2 GT5-Unofficial-2e1c3edaddd10a958830bb96c9b59c019a63d671.zip | |
$ Fixed a bug where adding valid biomes for villages in Australia could cause an UnsupportedOperationException.
+ Added new Beta Tester for Capes.
| -rw-r--r-- | src/Java/gtPlusPlus/GTplusplus.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/australia/chunk/ChunkProviderAustralia.java | 40 |
2 files changed, 17 insertions, 25 deletions
diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java index cf6669444e..6883ae0fdc 100644 --- a/src/Java/gtPlusPlus/GTplusplus.java +++ b/src/Java/gtPlusPlus/GTplusplus.java @@ -422,7 +422,7 @@ public class GTplusplus implements ActionListener { mBetaTestCapes.put(new Pair<String, String>("Prewf", "634433ec-6256-44aa-97b3-a615be18ce23")); mBetaTestCapes.put(new Pair<String, String>("FallDark", "86aa136e-9b5e-45e3-8273-6684fd7c537d")); mBetaTestCapes.put(new Pair<String, String>("0lafe", "8b06bcf9-7a94-45f9-a01f-2fff73e7582d")); - //mBetaTestCapes.put(new Pair<String, String>("cantankerousrex", "")); + mBetaTestCapes.put(new Pair<String, String>("Dogehog", "499b751e-f106-41ae-8dfe-3b88a73958e0")); //mBetaTestCapes.put(new Pair<String, String>("cantankerousrex", "")); //Dev Capes diff --git a/src/Java/gtPlusPlus/australia/chunk/ChunkProviderAustralia.java b/src/Java/gtPlusPlus/australia/chunk/ChunkProviderAustralia.java index 623d4b8ee1..82da02db45 100644 --- a/src/Java/gtPlusPlus/australia/chunk/ChunkProviderAustralia.java +++ b/src/Java/gtPlusPlus/australia/chunk/ChunkProviderAustralia.java @@ -1,5 +1,6 @@ package gtPlusPlus.australia.chunk; +import static net.minecraft.world.gen.structure.MapGenVillage.villageSpawnBiomes; import static net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType.ANIMALS; import java.util.ArrayList; @@ -88,37 +89,28 @@ public class ChunkProviderAustralia extends ChunkProviderGenerate implements ICh // Some Init Field? { + try { List<BiomeGenBase> y = new ArrayList<BiomeGenBase>(); + if (!villageSpawnBiomes.isEmpty()) { + y.addAll(villageSpawnBiomes); + } + for (BiomeGenBase h : gtPlusPlus.australia.gen.map.MapGenExtendedVillage.villageSpawnBiomes) { - if (!MapGenVillage.villageSpawnBiomes.contains(h)) { + if (!y.contains(h)) { if (h instanceof BiomeGenBase) { - MapGenVillage.villageSpawnBiomes.add(h); + try { + y.add(h); + } + catch (Throwable t) {} } } } + if (y.size() > villageSpawnBiomes.size()) { + villageSpawnBiomes = y; + } + } + catch (Throwable t) {} - /* - * if (map == null) { map = - * FlatGeneratorInfo.createFlatGeneratorFromString("abcdefg12345678"). - * getWorldFeatures(); } - */ - - /* - * if (map != null && map.containsKey("village")){ Map map1 = - * (Map)map.get("village"); if (!map1.containsKey("size")) { map1.put("size", - * "10"); } villageGenerator = new MapGenExtendedVillage(map1); villageGenerator - * = (MapGenExtendedVillage) TerrainGen.getModdedMapGen(villageGenerator, - * net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.VILLAGE); - * Logger.INFO("Registered Valid Chunk Provider for Custom Villages."); } else { - * Logger.INFO("Failed to register Valid Chunk Provider for Custom Villages."); - * } - */ - - /* - * villageGenerator = (MapGenVillageLogging) - * TerrainGen.getModdedMapGen(villageGenerator, - * net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.VILLAGE); - */ caveGenerator = TerrainGen.getModdedMapGen(caveGenerator, net.minecraftforge.event.terraingen.InitMapGenEvent.EventType.CAVE); mineshaftGenerator = (MapGenMineshaft) TerrainGen.getModdedMapGen(mineshaftGenerator, |