From 7617d347356a7380a427cabd0a91dffcd76d2e1e Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Sun, 20 Oct 2013 14:05:23 -0400 Subject: [PATCH] Added Koru world gen --- .../biomesoplenty/biomes/BiomeDecoratorBOP.java | 12 ++++++++++++ common/biomesoplenty/biomes/BiomeGenBayou.java | 1 + common/biomesoplenty/biomes/BiomeGenBog.java | 1 + .../biomesoplenty/biomes/BiomeGenDeadSwamp.java | 1 + common/biomesoplenty/biomes/BiomeGenFen.java | 1 + .../biomes/BiomeGenFungiForest.java | 7 ++++--- .../biomesoplenty/biomes/BiomeGenLushSwamp.java | 1 + common/biomesoplenty/biomes/BiomeGenMarsh.java | 1 + common/biomesoplenty/biomes/BiomeGenMoor.java | 1 + .../biomesoplenty/biomes/BiomeGenQuagmire.java | 1 + .../biomes/BiomeGenSilkglades.java | 1 + .../biomesoplenty/biomes/BiomeGenSludgepit.java | 1 + .../biomesoplenty/biomes/BiomeGenWetland.java | 1 + .../biomes/vanilla/BiomeGenSwampNew.java | 1 + .../biomesoplenty/textures/blocks/koru.png | Bin 308 -> 291 bytes 15 files changed, 28 insertions(+), 3 deletions(-) diff --git a/common/biomesoplenty/biomes/BiomeDecoratorBOP.java b/common/biomesoplenty/biomes/BiomeDecoratorBOP.java index 2e783e17e..6ea6b7634 100644 --- a/common/biomesoplenty/biomes/BiomeDecoratorBOP.java +++ b/common/biomesoplenty/biomes/BiomeDecoratorBOP.java @@ -236,6 +236,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator public WorldGenerator minersDelightGen; public WorldGenerator icyIrisGen; public WorldGenerator redwoodShrubGen; + public WorldGenerator koruGen; public WorldGenerator boneSpineGen; public WorldGenerator boneSpine2Gen; @@ -334,6 +335,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator public int icyIrisPerChunk; public int waterReedsPerChunk; public int redwoodShrubsPerChunk; + public int koruPerChunk; public int boneSpinesPerChunk; public int boneSpines2PerChunk; @@ -540,6 +542,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator algaeGen = new WorldGenAlgae(); waterReedGen = new WorldGenWaterReeds(); redwoodShrubGen = new WorldGenRedwoodShrub(0,0); + koruGen = new WorldGenTallGrass(Blocks.foliage.get().blockID, 12); pitGen = new WorldGenPit(Blocks.ash.get().blockID); waterlilyPerChunk = 0; lilyflowersPerChunk = 0; @@ -633,6 +636,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator icyIrisPerChunk = 0; waterReedsPerChunk = 0; redwoodShrubsPerChunk = 0; + koruPerChunk = 0; generateLakes = true; generateAsh = false; generateMycelium = false; @@ -1301,6 +1305,14 @@ public class BiomeDecoratorBOP extends BiomeDecorator shrubGen.generate(currentWorld, randomGenerator, var3, var4, var5); } + for (var2 = 0; var2 < koruPerChunk; ++var2) + { + var3 = chunk_X + randomGenerator.nextInt(16) + 8; + var4 = randomGenerator.nextInt(256); + var5 = chunk_Z + randomGenerator.nextInt(16) + 8; + koruGen.generate(currentWorld, randomGenerator, var3, var4, var5); + } + for (var2 = 0; var2 < wheatGrassPerChunk; ++var2) { var3 = chunk_X + randomGenerator.nextInt(16) + 8; diff --git a/common/biomesoplenty/biomes/BiomeGenBayou.java b/common/biomesoplenty/biomes/BiomeGenBayou.java index fc76813f9..b2e3d3789 100644 --- a/common/biomesoplenty/biomes/BiomeGenBayou.java +++ b/common/biomesoplenty/biomes/BiomeGenBayou.java @@ -43,6 +43,7 @@ public class BiomeGenBayou extends BiomeGenBase customBiomeDecorator.shrubsPerChunk = 2; customBiomeDecorator.wheatGrassPerChunk = 7; customBiomeDecorator.waterReedsPerChunk = 4; + customBiomeDecorator.koruPerChunk = 1; customBiomeDecorator.generatePumpkins = false; waterColorMultiplier = 16767282; spawnableWaterCreatureList.clear(); diff --git a/common/biomesoplenty/biomes/BiomeGenBog.java b/common/biomesoplenty/biomes/BiomeGenBog.java index 38d4fb792..68e2f375e 100644 --- a/common/biomesoplenty/biomes/BiomeGenBog.java +++ b/common/biomesoplenty/biomes/BiomeGenBog.java @@ -41,6 +41,7 @@ public class BiomeGenBog extends BiomeGenBase customBiomeDecorator.wheatGrassPerChunk = 3; customBiomeDecorator.poisonWaterPerChunk = 2; customBiomeDecorator.waterReedsPerChunk = 8; + customBiomeDecorator.koruPerChunk = 1; customBiomeDecorator.shrubsPerChunk = 10; customBiomeDecorator.generatePumpkins = false; } diff --git a/common/biomesoplenty/biomes/BiomeGenDeadSwamp.java b/common/biomesoplenty/biomes/BiomeGenDeadSwamp.java index bd5ee8518..9ded44907 100644 --- a/common/biomesoplenty/biomes/BiomeGenDeadSwamp.java +++ b/common/biomesoplenty/biomes/BiomeGenDeadSwamp.java @@ -33,6 +33,7 @@ public class BiomeGenDeadSwamp extends BiomeGenBase customBiomeDecorator.reedsBOPPerChunk = 2; customBiomeDecorator.wheatGrassPerChunk = 10; customBiomeDecorator.waterReedsPerChunk = 4; + customBiomeDecorator.koruPerChunk = 1; spawnableCreatureList.clear(); spawnableWaterCreatureList.clear(); waterColorMultiplier = 10661201; diff --git a/common/biomesoplenty/biomes/BiomeGenFen.java b/common/biomesoplenty/biomes/BiomeGenFen.java index d1261a3bb..3643562d3 100644 --- a/common/biomesoplenty/biomes/BiomeGenFen.java +++ b/common/biomesoplenty/biomes/BiomeGenFen.java @@ -42,6 +42,7 @@ public class BiomeGenFen extends BiomeGenBase customBiomeDecorator.portobellosPerChunk = 1; customBiomeDecorator.wheatGrassPerChunk = 8; customBiomeDecorator.waterReedsPerChunk = 10; + customBiomeDecorator.koruPerChunk = 1; customBiomeDecorator.shrubsPerChunk = 7; spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3)); } diff --git a/common/biomesoplenty/biomes/BiomeGenFungiForest.java b/common/biomesoplenty/biomes/BiomeGenFungiForest.java index 640b00591..af924d98d 100644 --- a/common/biomesoplenty/biomes/BiomeGenFungiForest.java +++ b/common/biomesoplenty/biomes/BiomeGenFungiForest.java @@ -28,9 +28,9 @@ public class BiomeGenFungiForest extends BiomeGenBase theBiomeDecorator = new BiomeDecoratorBOP(this); customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator; customBiomeDecorator.treesPerChunk = 8; - customBiomeDecorator.grassPerChunk = 6; + customBiomeDecorator.grassPerChunk = 4; customBiomeDecorator.sproutsPerChunk = 2; - customBiomeDecorator.bushesPerChunk = 2; + customBiomeDecorator.bushesPerChunk = 1; customBiomeDecorator.highGrassPerChunk = 1; customBiomeDecorator.mushroomsPerChunk = 8; customBiomeDecorator.bigMushroomsPerChunk = 8; @@ -45,7 +45,8 @@ public class BiomeGenFungiForest extends BiomeGenBase customBiomeDecorator.lilyflowersPerChunk = 2; customBiomeDecorator.carrotsPerChunk = 1; customBiomeDecorator.wheatGrassPerChunk = 3; - customBiomeDecorator.shrubsPerChunk = 5; + customBiomeDecorator.shrubsPerChunk = 2; + customBiomeDecorator.koruPerChunk = 1; customBiomeDecorator.generateMycelium = true; customBiomeDecorator.generatePumpkins = true; waterColorMultiplier = 65326; diff --git a/common/biomesoplenty/biomes/BiomeGenLushSwamp.java b/common/biomesoplenty/biomes/BiomeGenLushSwamp.java index 0ab049e50..9d238ba13 100644 --- a/common/biomesoplenty/biomes/BiomeGenLushSwamp.java +++ b/common/biomesoplenty/biomes/BiomeGenLushSwamp.java @@ -34,6 +34,7 @@ public class BiomeGenLushSwamp extends BiomeGenBase customBiomeDecorator.poisonWaterPerChunk = 2; customBiomeDecorator.carrotsPerChunk = 1; customBiomeDecorator.shrubsPerChunk = 5; + customBiomeDecorator.koruPerChunk = 1; customBiomeDecorator.waterReedsPerChunk = 6; spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 1, 1, 1)); } diff --git a/common/biomesoplenty/biomes/BiomeGenMarsh.java b/common/biomesoplenty/biomes/BiomeGenMarsh.java index e97d8e8aa..d28c27b17 100644 --- a/common/biomesoplenty/biomes/BiomeGenMarsh.java +++ b/common/biomesoplenty/biomes/BiomeGenMarsh.java @@ -34,6 +34,7 @@ public class BiomeGenMarsh extends BiomeGenBase customBiomeDecorator.sandPerChunk2 = -999; customBiomeDecorator.mudPerChunk = 1; customBiomeDecorator.mudPerChunk2 = 1; + customBiomeDecorator.koruPerChunk = 1; customBiomeDecorator.waterReedsPerChunk = 10; customBiomeDecorator.generatePumpkins = false; spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3)); diff --git a/common/biomesoplenty/biomes/BiomeGenMoor.java b/common/biomesoplenty/biomes/BiomeGenMoor.java index b9741c3a2..8abf5367c 100644 --- a/common/biomesoplenty/biomes/BiomeGenMoor.java +++ b/common/biomesoplenty/biomes/BiomeGenMoor.java @@ -33,6 +33,7 @@ public class BiomeGenMoor extends BiomeGenBase customBiomeDecorator.waterLakesPerChunk = 10; customBiomeDecorator.blueFlowersPerChunk = 6; customBiomeDecorator.wheatGrassPerChunk = 7; + customBiomeDecorator.koruPerChunk = 1; waterColorMultiplier = 5800566; customBiomeDecorator.generatePumpkins = false; } diff --git a/common/biomesoplenty/biomes/BiomeGenQuagmire.java b/common/biomesoplenty/biomes/BiomeGenQuagmire.java index 328d39c8e..29983d6e4 100644 --- a/common/biomesoplenty/biomes/BiomeGenQuagmire.java +++ b/common/biomesoplenty/biomes/BiomeGenQuagmire.java @@ -32,6 +32,7 @@ public class BiomeGenQuagmire extends BiomeGenBase customBiomeDecorator.sandPerChunk2 = -999; customBiomeDecorator.wheatGrassPerChunk = 3; customBiomeDecorator.waterReedsPerChunk = 2; + customBiomeDecorator.koruPerChunk = 1; waterColorMultiplier = 13390080; customBiomeDecorator.generateQuagmire = true; } diff --git a/common/biomesoplenty/biomes/BiomeGenSilkglades.java b/common/biomesoplenty/biomes/BiomeGenSilkglades.java index 551a417dd..a88cddef1 100644 --- a/common/biomesoplenty/biomes/BiomeGenSilkglades.java +++ b/common/biomesoplenty/biomes/BiomeGenSilkglades.java @@ -40,6 +40,7 @@ public class BiomeGenSilkglades extends BiomeGenBase customBiomeDecorator.poisonIvyPerChunk = 2; customBiomeDecorator.cobwebsPerChunk = 9; customBiomeDecorator.waterReedsPerChunk = 4; + customBiomeDecorator.koruPerChunk = 1; customBiomeDecorator.generatePumpkins = true; waterColorMultiplier = 16777079; spawnableWaterCreatureList.clear(); diff --git a/common/biomesoplenty/biomes/BiomeGenSludgepit.java b/common/biomesoplenty/biomes/BiomeGenSludgepit.java index 29112003c..c05eca45a 100644 --- a/common/biomesoplenty/biomes/BiomeGenSludgepit.java +++ b/common/biomesoplenty/biomes/BiomeGenSludgepit.java @@ -40,6 +40,7 @@ public class BiomeGenSludgepit extends BiomeGenBase customBiomeDecorator.algaePerChunk = 2; customBiomeDecorator.poisonWaterPerChunk = 5; customBiomeDecorator.waterReedsPerChunk = 6; + customBiomeDecorator.koruPerChunk = 1; spawnableCreatureList.add(new SpawnListEntry(EntitySlime.class, 1, 1, 1)); waterColorMultiplier = 11506176; } diff --git a/common/biomesoplenty/biomes/BiomeGenWetland.java b/common/biomesoplenty/biomes/BiomeGenWetland.java index 2954f9d28..af9729bc0 100644 --- a/common/biomesoplenty/biomes/BiomeGenWetland.java +++ b/common/biomesoplenty/biomes/BiomeGenWetland.java @@ -46,6 +46,7 @@ public class BiomeGenWetland extends BiomeGenBase customBiomeDecorator.berryBushesPerChunk = 1; customBiomeDecorator.shrubsPerChunk = 10; customBiomeDecorator.waterReedsPerChunk = 8; + customBiomeDecorator.koruPerChunk = 1; spawnableCreatureList.clear(); spawnableWaterCreatureList.clear(); spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3)); diff --git a/common/biomesoplenty/biomes/vanilla/BiomeGenSwampNew.java b/common/biomesoplenty/biomes/vanilla/BiomeGenSwampNew.java index 5f5d74c5e..9e17627dc 100644 --- a/common/biomesoplenty/biomes/vanilla/BiomeGenSwampNew.java +++ b/common/biomesoplenty/biomes/vanilla/BiomeGenSwampNew.java @@ -40,6 +40,7 @@ public class BiomeGenSwampNew extends BiomeGenBase customBiomeDecorator.mudPerChunk2 = 9; customBiomeDecorator.portobellosPerChunk = 1; customBiomeDecorator.waterReedsPerChunk = 4; + customBiomeDecorator.koruPerChunk = 1; waterColorMultiplier = 14745456; spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 1, 1, 1)); } diff --git a/resources/assets/biomesoplenty/textures/blocks/koru.png b/resources/assets/biomesoplenty/textures/blocks/koru.png index 53e6560e3bbc22ef674ac6cd335ef57c125205bd..9b4fc1c4f8bbdb8fec08879184116dd4419aacbd 100644 GIT binary patch delta 202 zcmV;*05$)#0;2+uJPN=701m(bYSxJfkwz(hpGibPR5(wqk1-CzFbG9Cai?y%LDr5v zPWBuimr3<1zJ(odGxSN8F?>G8{?5J~=WBhR+#FBegU07$`5s~!d3g>(8vWV0Wr6^q zKQB$OmV!W{D3-}j1MN(liL=!@q5)KKi45Z2k07*qoM6N<$ Ef?AAPssI20 delta 219 zcmV<103`pT0<;2V=zw>utaE#$lE2w%pSzu&PckveD2L_B1`%vw5 z{JsjTXA!dtYQB0|OO$=(|TCi@t`4(A4op z)sQsay`bT$S6>>Tr%O|AE=1u_gcj002ovPDHLkV1jI0VH^Me