diff --git a/common/biomesoplenty/api/Biomes.java b/common/biomesoplenty/api/Biomes.java index aa6f4bdfb..90dcf5a29 100644 --- a/common/biomesoplenty/api/Biomes.java +++ b/common/biomesoplenty/api/Biomes.java @@ -70,7 +70,6 @@ public class Biomes public static Optional netherLava = Optional.absent(); public static Optional netherBone = Optional.absent(); public static Optional netherBlood = Optional.absent(); - public static Optional netherHive = Optional.absent(); public static Optional oasis = Optional.absent(); diff --git a/common/biomesoplenty/biomes/BiomeDecoratorBOP.java b/common/biomesoplenty/biomes/BiomeDecoratorBOP.java index 82700beca..73f91501b 100644 --- a/common/biomesoplenty/biomes/BiomeDecoratorBOP.java +++ b/common/biomesoplenty/biomes/BiomeDecoratorBOP.java @@ -73,6 +73,7 @@ import biomesoplenty.worldgen.WorldGenGrave; import biomesoplenty.worldgen.WorldGenGravel; import biomesoplenty.worldgen.WorldGenHighCattail; import biomesoplenty.worldgen.WorldGenHighGrass; +import biomesoplenty.worldgen.WorldGenHive; import biomesoplenty.worldgen.WorldGenKelp; import biomesoplenty.worldgen.WorldGenLilyflower; import biomesoplenty.worldgen.WorldGenMelon; @@ -239,6 +240,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator public WorldGenerator icyIrisGen; public WorldGenerator redwoodShrubGen; public WorldGenerator koruGen; + public WorldGenerator waspHiveGen; public WorldGenerator boneSpineGen; public WorldGenerator boneSpine2Gen; @@ -338,6 +340,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator public int waterReedsPerChunk; public int redwoodShrubsPerChunk; public int koruPerChunk; + public int waspHivesPerChunk; public int boneSpinesPerChunk; public int boneSpines2PerChunk; @@ -519,6 +522,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator kelpGen = new WorldGenKelp(false); shortKelpGen = new WorldGenShortKelp(false); graveGen = new WorldGenGrave(); + waspHiveGen = new WorldGenHive(); mushroomBrownGen = new WorldGenBOPFlowers(Block.mushroomBrown.blockID, 0); mushroomRedGen = new WorldGenBOPFlowers(Block.mushroomRed.blockID, 0); flatMushroomGen = new WorldGenBOPFlowers(Blocks.mushrooms.get().blockID, 4); @@ -641,6 +645,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator waterReedsPerChunk = 0; redwoodShrubsPerChunk = 0; koruPerChunk = 0; + waspHivesPerChunk = 0; generateLakes = true; generateAsh = false; generateMycelium = false; @@ -1323,6 +1328,14 @@ public class BiomeDecoratorBOP extends BiomeDecorator koruGen.generate(currentWorld, randomGenerator, var3, var4, var5); } + for (var2 = 0; var2 < waspHivesPerChunk; ++var2) + { + var3 = chunk_X + randomGenerator.nextInt(16) + 8; + var4 = randomGenerator.nextInt(64)+50; + var5 = chunk_Z + randomGenerator.nextInt(16) + 8; + waspHiveGen.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/nether/BiomeGenNetherBase.java b/common/biomesoplenty/biomes/nether/BiomeGenNetherBase.java index 421995690..d00e03482 100644 --- a/common/biomesoplenty/biomes/nether/BiomeGenNetherBase.java +++ b/common/biomesoplenty/biomes/nether/BiomeGenNetherBase.java @@ -21,6 +21,7 @@ public class BiomeGenNetherBase extends BiomeGenBase fillerBlock = (byte)Block.netherrack.blockID; customBiomeDecorator.gravesPerChunk = 1; customBiomeDecorator.burningBlossomsPerChunk = 1; + customBiomeDecorator.waspHivesPerChunk = 1; spawnableMonsterList.clear(); spawnableCreatureList.clear(); spawnableWaterCreatureList.clear(); diff --git a/common/biomesoplenty/biomes/nether/BiomeGenNetherBlood.java b/common/biomesoplenty/biomes/nether/BiomeGenNetherBlood.java index 609c4a62f..5a280e2ff 100644 --- a/common/biomesoplenty/biomes/nether/BiomeGenNetherBlood.java +++ b/common/biomesoplenty/biomes/nether/BiomeGenNetherBlood.java @@ -21,6 +21,7 @@ public class BiomeGenNetherBlood extends BiomeGenBase topBlock = (byte)Blocks.flesh.get().blockID; fillerBlock = (byte)Blocks.flesh.get().blockID; customBiomeDecorator.gravesPerChunk = 1; + customBiomeDecorator.waspHivesPerChunk = 1; spawnableMonsterList.clear(); spawnableCreatureList.clear(); spawnableWaterCreatureList.clear(); diff --git a/common/biomesoplenty/biomes/nether/BiomeGenNetherBone.java b/common/biomesoplenty/biomes/nether/BiomeGenNetherBone.java index 554a7c201..2753cba5b 100644 --- a/common/biomesoplenty/biomes/nether/BiomeGenNetherBone.java +++ b/common/biomesoplenty/biomes/nether/BiomeGenNetherBone.java @@ -22,6 +22,7 @@ public class BiomeGenNetherBone extends BiomeGenBase customBiomeDecorator.boneSpinesPerChunk = 6; customBiomeDecorator.boneSpines2PerChunk = 9; customBiomeDecorator.gravesPerChunk = 1; + customBiomeDecorator.waspHivesPerChunk = 1; spawnableMonsterList.clear(); spawnableCreatureList.clear(); spawnableWaterCreatureList.clear(); diff --git a/common/biomesoplenty/biomes/nether/BiomeGenNetherDesert.java b/common/biomesoplenty/biomes/nether/BiomeGenNetherDesert.java index c1717f36e..b41fbb64b 100644 --- a/common/biomesoplenty/biomes/nether/BiomeGenNetherDesert.java +++ b/common/biomesoplenty/biomes/nether/BiomeGenNetherDesert.java @@ -21,6 +21,7 @@ public class BiomeGenNetherDesert extends BiomeGenBase fillerBlock = (byte)Block.slowSand.blockID; customBiomeDecorator.thornsPerChunk = 10; customBiomeDecorator.gravesPerChunk = 1; + customBiomeDecorator.waspHivesPerChunk = 1; spawnableMonsterList.clear(); spawnableCreatureList.clear(); spawnableWaterCreatureList.clear(); diff --git a/common/biomesoplenty/biomes/nether/BiomeGenNetherGarden.java b/common/biomesoplenty/biomes/nether/BiomeGenNetherGarden.java index ff7e0b1e6..eb088fbc8 100644 --- a/common/biomesoplenty/biomes/nether/BiomeGenNetherGarden.java +++ b/common/biomesoplenty/biomes/nether/BiomeGenNetherGarden.java @@ -33,6 +33,7 @@ public class BiomeGenNetherGarden extends BiomeGenBase customBiomeDecorator.toadstoolsPerChunk = 5; customBiomeDecorator.gravesPerChunk = 1; customBiomeDecorator.burningBlossomsPerChunk = 8; + customBiomeDecorator.waspHivesPerChunk = 1; spawnableMonsterList.clear(); spawnableCreatureList.clear(); spawnableWaterCreatureList.clear(); diff --git a/common/biomesoplenty/biomes/nether/BiomeGenNetherHive.java b/common/biomesoplenty/biomes/nether/BiomeGenNetherHive.java deleted file mode 100644 index df3235929..000000000 --- a/common/biomesoplenty/biomes/nether/BiomeGenNetherHive.java +++ /dev/null @@ -1,51 +0,0 @@ -package biomesoplenty.biomes.nether; - -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.entity.monster.EntityGhast; -import net.minecraft.entity.monster.EntityMagmaCube; -import net.minecraft.entity.monster.EntityPigZombie; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.biome.SpawnListEntry; -import biomesoplenty.api.Blocks; -import biomesoplenty.biomes.BiomeDecoratorBOP; -import biomesoplenty.worldgen.WorldGenHive; - -public class BiomeGenNetherHive extends BiomeGenBase -{ - private BiomeDecoratorBOP customBiomeDecorator; - - public BiomeGenNetherHive(int par1) - { - super(par1); - theBiomeDecorator = new BiomeDecoratorBOP(this); - customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator; - topBlock = (byte)Block.netherrack.blockID; - fillerBlock = (byte)Block.netherrack.blockID; - spawnableMonsterList.clear(); - spawnableCreatureList.clear(); - spawnableWaterCreatureList.clear(); - spawnableCaveCreatureList.clear(); - customBiomeDecorator.generateHive = true; - spawnableMonsterList.add(new SpawnListEntry(EntityGhast.class, 50, 4, 4)); - spawnableMonsterList.add(new SpawnListEntry(EntityPigZombie.class, 100, 4, 4)); - spawnableMonsterList.add(new SpawnListEntry(EntityMagmaCube.class, 1, 4, 4)); - } - - @Override - public void decorate(World par1World, Random par2Random, int par3, int par4) - { - super.decorate(par1World, par2Random, par3, par4); - - if (par2Random.nextInt(2) == 0) - { - int var5 = par3 + par2Random.nextInt(16) + 8; - int var99 = par2Random.nextInt(128); - int var6 = par4 + par2Random.nextInt(16) + 8; - WorldGenHive var7 = new WorldGenHive(); - var7.generate(par1World, par2Random, var5, var99, var6); - } - } -} diff --git a/common/biomesoplenty/biomes/nether/BiomeGenNetherLava.java b/common/biomesoplenty/biomes/nether/BiomeGenNetherLava.java index 72cb9b212..1f9f9aa89 100644 --- a/common/biomesoplenty/biomes/nether/BiomeGenNetherLava.java +++ b/common/biomesoplenty/biomes/nether/BiomeGenNetherLava.java @@ -31,6 +31,7 @@ public class BiomeGenNetherLava extends BiomeGenBase customBiomeDecorator.smolderingGrassPerChunk = 2; customBiomeDecorator.gravesPerChunk = 1; customBiomeDecorator.burningBlossomsPerChunk = 4; + customBiomeDecorator.waspHivesPerChunk = 1; customBiomeDecorator.generateAsh = true; spawnableMonsterList.clear(); spawnableCreatureList.clear(); diff --git a/common/biomesoplenty/configuration/BOPBiomes.java b/common/biomesoplenty/configuration/BOPBiomes.java index c19044421..ce131cc99 100644 --- a/common/biomesoplenty/configuration/BOPBiomes.java +++ b/common/biomesoplenty/configuration/BOPBiomes.java @@ -108,7 +108,6 @@ import biomesoplenty.biomes.nether.BiomeGenNetherBlood; import biomesoplenty.biomes.nether.BiomeGenNetherBone; import biomesoplenty.biomes.nether.BiomeGenNetherDesert; import biomesoplenty.biomes.nether.BiomeGenNetherGarden; -import biomesoplenty.biomes.nether.BiomeGenNetherHive; import biomesoplenty.biomes.nether.BiomeGenNetherLava; import biomesoplenty.biomes.ocean.BiomeGenOceanAbyss; import biomesoplenty.biomes.ocean.BiomeGenOceanCoral; @@ -242,7 +241,6 @@ public class BOPBiomes { Biomes.netherLava = Optional.of((new BiomeGenNetherLava(BOPConfigurationIDs.netherLavaID)).setColor(16711680).setBiomeName("Phantasmagoric Inferno").setDisableRain().setTemperatureRainfall(2.0F, 0.0F)); Biomes.netherBone = Optional.of((new BiomeGenNetherBone(BOPConfigurationIDs.netherBoneID)).setColor(16711680).setBiomeName("Boneyard").setDisableRain().setTemperatureRainfall(2.0F, 0.0F)); Biomes.netherBlood = Optional.of((new BiomeGenNetherBlood(BOPConfigurationIDs.netherBloodID)).setColor(16711680).setBiomeName("Bloody Heap").setDisableRain().setTemperatureRainfall(2.0F, 0.0F)); - Biomes.netherHive = Optional.of((new BiomeGenNetherHive(BOPConfigurationIDs.netherHiveID)).setColor(16711680).setBiomeName("Hellish Hive").setDisableRain().setTemperatureRainfall(2.0F, 0.0F)); Biomes.oasis = Optional.of((new BiomeGenOasis(BOPConfigurationIDs.oasisID)).setColor(16421912).setBiomeName("Oasis").setTemperatureRainfall(0.9F, 0.7F).setMinMaxHeight(0.3F, 0.4F)); @@ -385,7 +383,6 @@ public class BOPBiomes { BiomeDictionary.registerBiomeType(Biomes.netherLava.get(), Type.NETHER); BiomeDictionary.registerBiomeType(Biomes.netherBone.get(), Type.NETHER, Type.WASTELAND); BiomeDictionary.registerBiomeType(Biomes.netherBlood.get(), Type.NETHER); - BiomeDictionary.registerBiomeType(Biomes.netherHive.get(), Type.NETHER); BiomeDictionary.registerBiomeType(Biomes.oasis.get(), Type.DESERT, Type.JUNGLE); diff --git a/common/biomesoplenty/configuration/configfile/BOPConfigurationBiomeGen.java b/common/biomesoplenty/configuration/configfile/BOPConfigurationBiomeGen.java index 7e327bc34..dc51b41df 100644 --- a/common/biomesoplenty/configuration/configfile/BOPConfigurationBiomeGen.java +++ b/common/biomesoplenty/configuration/configfile/BOPConfigurationBiomeGen.java @@ -107,7 +107,6 @@ public class BOPConfigurationBiomeGen public static boolean phantasmagoricInfernoGen; public static boolean boneyardGen; public static boolean bloodyHeapGen; - public static boolean hellishHiveGen; // Beach variations public static boolean gravelBeachGen; @@ -223,7 +222,6 @@ public class BOPConfigurationBiomeGen phantasmagoricInfernoGen = config.get("Nether Biomes To Generate", "PhantasmagoricInferno", true).getBoolean(true); boneyardGen = config.get("Nether Biomes To Generate", "Boneyard", true).getBoolean(true); bloodyHeapGen = config.get("Nether Biomes To Generate", "BloodyHeap", true).getBoolean(true); - hellishHiveGen = config.get("Nether Biomes To Generate", "HellishHive", true).getBoolean(true); // Beach variations gravelBeachGen = config.get("Beach Variations To Generate", "Gravel Beach", true).getBoolean(true); diff --git a/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java b/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java index 3c785e019..2410f8b64 100644 --- a/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java +++ b/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java @@ -219,7 +219,6 @@ public class BOPConfigurationIDs public static int netherLavaID; public static int netherBoneID; public static int netherBloodID; - public static int netherHiveID; public static int oasisID; @@ -481,7 +480,6 @@ public class BOPConfigurationIDs //23-79 ExtraBiomesXL - netherHiveID = config.get("Biome IDs", "Hellish Hive (Nether) ID", 29).getInt(); netherBloodID = config.get("Biome IDs", "Bloody Heap (Nether) ID", 30).getInt(); lavenderFieldsID = config.get("Biome IDs", "Lavender Fields ID", 31).getInt(); diff --git a/common/biomesoplenty/world/WorldProviderBOPhell.java b/common/biomesoplenty/world/WorldProviderBOPhell.java index 49716ac7a..fbea88e6f 100644 --- a/common/biomesoplenty/world/WorldProviderBOPhell.java +++ b/common/biomesoplenty/world/WorldProviderBOPhell.java @@ -10,7 +10,7 @@ public class WorldProviderBOPhell extends WorldProviderHell @Override public void registerWorldChunkManager() { - if (Biomes.netherGarden.isPresent() || Biomes.netherDesert.isPresent() || Biomes.netherLava.isPresent() || Biomes.netherBone.isPresent() || Biomes.netherBlood.isPresent() || Biomes.netherHive.isPresent()) + if (Biomes.netherGarden.isPresent() || Biomes.netherDesert.isPresent() || Biomes.netherLava.isPresent() || Biomes.netherBone.isPresent() || Biomes.netherBlood.isPresent()) { this.worldChunkMgr = new WorldChunkManagerBOPhell(worldObj); } diff --git a/common/biomesoplenty/world/layer/BiomeLayerBiomes.java b/common/biomesoplenty/world/layer/BiomeLayerBiomes.java index f4a66efbf..efac359fd 100644 --- a/common/biomesoplenty/world/layer/BiomeLayerBiomes.java +++ b/common/biomesoplenty/world/layer/BiomeLayerBiomes.java @@ -90,13 +90,6 @@ public class BiomeLayerBiomes extends BiomeLayer netherBiomes.add(Biomes.netherBlood.get()); } } - if (Biomes.netherHive.isPresent()) - { - if (BOPConfigurationBiomeGen.hellishHiveGen) - { - netherBiomes.add(Biomes.netherHive.get()); - } - } if (Biomes.netherBiomes.size() > 0) { netherBiomes.addAll(Biomes.netherBiomes); diff --git a/common/biomesoplenty/worldgen/WorldGenHive.java b/common/biomesoplenty/worldgen/WorldGenHive.java index 76e2338e9..55130b59b 100644 --- a/common/biomesoplenty/worldgen/WorldGenHive.java +++ b/common/biomesoplenty/worldgen/WorldGenHive.java @@ -19,12 +19,9 @@ public class WorldGenHive extends WorldGenerator int baseWidth = 4 + rand.nextInt(2); int baseHeight = 8 + rand.nextInt(2); - if (world.getBlockId(x, y + 3, z) != Block.netherrack.blockID) + if (world.getBlockId(x, y + 3, z) != Block.netherrack.blockID || !world.isAirBlock(x, y + 2, z)) { - if (!world.isAirBlock(x, y + 2, z)) - { - return false; - } + return false; } for (int cubeno = 0; cubeno < 3; cubeno++) @@ -42,7 +39,7 @@ public class WorldGenHive extends WorldGenerator break; case 2: - chance = 0.75F; + chance = 0.5F; break; } diff --git a/resources/assets/biomesoplenty/textures/blocks/hive.png b/resources/assets/biomesoplenty/textures/blocks/hive.png index 07ddc537e..37f1e1be3 100644 Binary files a/resources/assets/biomesoplenty/textures/blocks/hive.png and b/resources/assets/biomesoplenty/textures/blocks/hive.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/hivealt.png b/resources/assets/biomesoplenty/textures/blocks/hivealt.png new file mode 100644 index 000000000..07ddc537e Binary files /dev/null and b/resources/assets/biomesoplenty/textures/blocks/hivealt.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/honey_flowing.png b/resources/assets/biomesoplenty/textures/blocks/honey_flowing.png new file mode 100644 index 000000000..87ca3ba69 Binary files /dev/null and b/resources/assets/biomesoplenty/textures/blocks/honey_flowing.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/honey_flowing.png.mcmeta b/resources/assets/biomesoplenty/textures/blocks/honey_flowing.png.mcmeta new file mode 100644 index 000000000..8e55e43ba --- /dev/null +++ b/resources/assets/biomesoplenty/textures/blocks/honey_flowing.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} diff --git a/resources/assets/biomesoplenty/textures/blocks/honey_still.png b/resources/assets/biomesoplenty/textures/blocks/honey_still.png new file mode 100644 index 000000000..3cabedb6a Binary files /dev/null and b/resources/assets/biomesoplenty/textures/blocks/honey_still.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/honey_still.png.mcmeta b/resources/assets/biomesoplenty/textures/blocks/honey_still.png.mcmeta new file mode 100644 index 000000000..7ceb36394 --- /dev/null +++ b/resources/assets/biomesoplenty/textures/blocks/honey_still.png.mcmeta @@ -0,0 +1,45 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/resources/assets/biomesoplenty/textures/mobs/wasp.png b/resources/assets/biomesoplenty/textures/mobs/wasp.png index e4f6cb83b..795b4b66b 100644 Binary files a/resources/assets/biomesoplenty/textures/mobs/wasp.png and b/resources/assets/biomesoplenty/textures/mobs/wasp.png differ