From 536aad631a6492b6b4da9df40c9cdfc5f6ad21ee Mon Sep 17 00:00:00 2001 From: Alkalus Date: Thu, 13 Jul 2017 08:44:59 +1000 Subject: % Cleaned up BurnableFuelHandler.java logging. $ Fixed Rivers not generating in the dark dimension. + Added a new dirt type under the grass in the dark dimension. $ Fixed the textures on the new dirt. % Tweaked mob spawns in the dark dimension. --- .../core/handler/BurnableFuelHandler.java | 4 --- .../core/world/darkworld/Dimension_DarkWorld.java | 2 +- .../world/darkworld/biome/Biome_DarkWorld.java | 29 ++++++++++++++-------- .../block/blockDarkWorldPollutedDirt.java | 3 ++- .../world/darkworld/chunk/ChunkProviderModded.java | 2 +- 5 files changed, 22 insertions(+), 18 deletions(-) (limited to 'src/Java') diff --git a/src/Java/gtPlusPlus/core/handler/BurnableFuelHandler.java b/src/Java/gtPlusPlus/core/handler/BurnableFuelHandler.java index cd70665856..79ca0ad174 100644 --- a/src/Java/gtPlusPlus/core/handler/BurnableFuelHandler.java +++ b/src/Java/gtPlusPlus/core/handler/BurnableFuelHandler.java @@ -13,18 +13,14 @@ public class BurnableFuelHandler implements IFuelHandler{ public int getBurnTime(ItemStack aStack) { //Iterate over my burnables. for (Pair temp : CORE.burnables) { - int aStackID = Item.getIdFromItem(aStack.getItem()); int burnID = Item.getIdFromItem(temp.getValue().getItem()); - //Utils.LOG_INFO("[Fuel Handler] ["+(aStackID == burnID)+"] Trying to look for a burnvalue for "+aStack.getDisplayName()+" | "+Modid+" | aStackID="+aStackID+" | burnID="+burnID); if (aStackID == burnID){ - //Utils.LOG_INFO("[Fuel Handler] match found!"); int burn = temp.getKey(); ItemStack fuel = temp.getValue(); ItemStack testItem = ItemUtils.getSimpleStack(fuel, aStack.stackSize); if (aStack.isItemEqual(testItem)){ - //Utils.LOG_INFO("[Fuel Handler] Found "+fuel.getDisplayName()+" with a burntime of "+burn); return burn; } } diff --git a/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java b/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java index 3a7cf7d683..bcaeccafc1 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java @@ -26,7 +26,7 @@ public class Dimension_DarkWorld { public static blockDarkWorldPortal portalBlock; public static itemDarkWorldPortalTrigger portalItem; public static Block blockTopLayer; - public static Block blockSecondLayer = Blocks.dirt; + public static Block blockSecondLayer; public static Block blockMainFiller = Blocks.stone; public static Block blockSecondaryFiller; public static Block blockFluidLakes = ModBlocks.blockFluidSludge; diff --git a/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java b/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java index aace191cbb..d3629ff139 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java @@ -61,41 +61,48 @@ public class Biome_DarkWorld { this.topBlock = Dimension_DarkWorld.blockTopLayer; this.fillerBlock = Dimension_DarkWorld.blockSecondLayer; this.theBiomeDecorator.generateLakes = true; - this.theBiomeDecorator.treesPerChunk = 50; + this.theBiomeDecorator.treesPerChunk = 35; this.theBiomeDecorator.flowersPerChunk = 4; - this.theBiomeDecorator.grassPerChunk = 10; - this.theBiomeDecorator.deadBushPerChunk = 25; - this.theBiomeDecorator.mushroomsPerChunk = 5; + this.theBiomeDecorator.grassPerChunk = 15; + this.theBiomeDecorator.deadBushPerChunk = 15; + this.theBiomeDecorator.mushroomsPerChunk = 2; this.theBiomeDecorator.reedsPerChunk = 1; this.theBiomeDecorator.cactiPerChunk = 1; this.theBiomeDecorator.sandPerChunk = 8; + this.theBiomeDecorator.clayPerChunk = 12; + this.theBiomeDecorator.waterlilyPerChunk = 10; this.enableRain = true; this.enableSnow = false; this.rainfall = 0.7F; - this.setHeight(new BiomeGenBase.Height(0.25F, 0.65F)); - this.waterColorMultiplier = 0x2d0b2d; + this.setHeight(new BiomeGenBase.Height(0.35F, 0.65F)); + this.waterColorMultiplier = 0x17290A; this.rootHeight = -0.25f; //Ground level this.spawnableMonsterList.clear(); this.spawnableCreatureList.clear(); this.spawnableWaterCreatureList.clear(); this.spawnableCaveCreatureList.clear(); - this.spawnableMonsterList.add(new SpawnListEntry(EntityBat.class, 5, 1, 5)); + + //Enemies this.spawnableMonsterList.add(new SpawnListEntry(EntityBlaze.class, 5, 1, 5)); this.spawnableMonsterList.add(new SpawnListEntry(EntityCaveSpider.class, 5, 1, 5)); - this.spawnableMonsterList.add(new SpawnListEntry(EntityCreeper.class, 5, 1, 5)); + this.spawnableMonsterList.add(new SpawnListEntry(EntityCreeper.class, 4, 1, 2)); this.spawnableMonsterList.add(new SpawnListEntry(EntityEnderman.class, 5, 1, 5)); this.spawnableMonsterList.add(new SpawnListEntry(EntityGhast.class, 5, 1, 5)); - this.spawnableMonsterList.add(new SpawnListEntry(EntityGiantZombie.class, 15, 1, 5)); + this.spawnableMonsterList.add(new SpawnListEntry(EntityGiantZombie.class, 20, 1, 1)); this.spawnableMonsterList.add(new SpawnListEntry(EntityMagmaCube.class, 5, 1, 5)); this.spawnableMonsterList.add(new SpawnListEntry(EntityPigZombie.class, 5, 1, 5)); this.spawnableMonsterList.add(new SpawnListEntry(EntitySkeleton.class, 5, 1, 5)); this.spawnableMonsterList.add(new SpawnListEntry(EntitySpider.class, 5, 1, 5)); - this.spawnableMonsterList.add(new SpawnListEntry(EntitySquid.class, 5, 1, 5)); - this.spawnableMonsterList.add(new SpawnListEntry(EntityWolf.class, 5, 1, 5)); + this.spawnableMonsterList.add(new SpawnListEntry(EntityWolf.class, 5, 4, 10)); this.spawnableMonsterList.add(new SpawnListEntry(EntityZombie.class, 5, 1, 5)); + //Passive this.spawnableCreatureList.add(new SpawnListEntry(EntityCow.class, 5, 5, 10)); + this.spawnableCreatureList.add(new SpawnListEntry(EntityBat.class, 4, 4, 8)); + + //Water + this.spawnableWaterCreatureList.add(new SpawnListEntry(EntitySquid.class, 5, 1, 10)); } diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPollutedDirt.java b/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPollutedDirt.java index 821e59be7d..f95e9a7fb9 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPollutedDirt.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPollutedDirt.java @@ -2,9 +2,10 @@ package gtPlusPlus.core.world.darkworld.block; import cpw.mods.fml.common.registry.LanguageRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; +import net.minecraft.block.BlockDirt; import net.minecraft.block.BlockGrass; -public class blockDarkWorldPollutedDirt extends BlockGrass { +public class blockDarkWorldPollutedDirt extends BlockDirt { public blockDarkWorldPollutedDirt() { this.setCreativeTab(AddToCreativeTab.tabBOP); diff --git a/src/Java/gtPlusPlus/core/world/darkworld/chunk/ChunkProviderModded.java b/src/Java/gtPlusPlus/core/world/darkworld/chunk/ChunkProviderModded.java index 0c46c7824c..2e5ce4510e 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/chunk/ChunkProviderModded.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/chunk/ChunkProviderModded.java @@ -171,7 +171,7 @@ public class ChunkProviderModded implements IChunkProvider { p_147424_3_[j3 += short1] = Dimension_DarkWorld.blockMainFiller; } else if (k2 * 8 + l2 < b0) { - p_147424_3_[j3 += short1] = Dimension_DarkWorld.blockFluidLakes; + p_147424_3_[j3 += short1] = Blocks.water; //River Fluid } else { p_147424_3_[j3 += short1] = null; -- cgit