diff --git a/src/minecraft/biomesoplenty/BiomesOPlenty.java b/src/minecraft/biomesoplenty/BiomesOPlenty.java index 2d40e448d..5fbc4e0e9 100644 --- a/src/minecraft/biomesoplenty/BiomesOPlenty.java +++ b/src/minecraft/biomesoplenty/BiomesOPlenty.java @@ -121,7 +121,7 @@ public class BiomesOPlenty Localizations.loadLanguages(); // Achievement declaration - if (BOPConfiguration.achievements == true) + if (BOPConfiguration.achievements) { AchievementHelper.init(); } @@ -144,8 +144,11 @@ public class BiomesOPlenty proxy.registerRenderers(); - DimensionManager.unregisterProviderType(-1); - DimensionManager.registerProviderType(-1, WorldProviderBOPhell.class, true); + if (BOPConfiguration.netherOverride) + { + DimensionManager.unregisterProviderType(-1); + DimensionManager.registerProviderType(-1, WorldProviderBOPhell.class, true); + } DimensionManager.registerProviderType(BOPConfiguration.promisedLandDimID, WorldProviderPromised.class, false); DimensionManager.registerDimension(BOPConfiguration.promisedLandDimID, BOPConfiguration.promisedLandDimID); diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPAppleLeaves.java b/src/minecraft/biomesoplenty/blocks/BlockBOPAppleLeaves.java index 3121755bf..60ce40109 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPAppleLeaves.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPAppleLeaves.java @@ -16,6 +16,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.common.FakePlayer; import net.minecraftforge.common.IShearable; import biomesoplenty.BiomesOPlenty; import biomesoplenty.api.Blocks; @@ -236,9 +237,11 @@ public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable { world.setBlock(x, y, z, blockID, meta - 3, 3); EntityItem entityitem = new EntityItem(world, x, y, z, new ItemStack(Item.appleRed, 1, 0)); + if (!world.isRemote) { world.spawnEntityInWorld(entityitem); - //entityitem.onCollideWithPlayer(player); + if (!(player instanceof FakePlayer)) + entityitem.onCollideWithPlayer(player); } return true; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPColorizedSapling.java b/src/minecraft/biomesoplenty/blocks/BlockBOPColorizedSapling.java index 76aa57900..ced319618 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPColorizedSapling.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPColorizedSapling.java @@ -81,7 +81,7 @@ public class BlockBOPColorizedSapling extends BlockSapling return id == Block.sand.blockID; default: - return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID; + return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID || blocksList[id].canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, this); } } else return this.canPlaceBlockOnSide(world, x, y, z, side); diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPSapling.java b/src/minecraft/biomesoplenty/blocks/BlockBOPSapling.java index c1b242edf..ab151bb3d 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPSapling.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPSapling.java @@ -88,7 +88,7 @@ public class BlockBOPSapling extends BlockSapling return id == Blocks.holyGrass.get().blockID || id == Block.grass.blockID; default: - return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID; + return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID || blocksList[id].canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, this); } } else return this.canPlaceBlockOnSide(world, x, y, z, side); diff --git a/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java b/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java index df93de5c2..238bf5330 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java +++ b/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java @@ -17,6 +17,7 @@ public class BOPConfiguration { public static boolean achievements; public static boolean dungeonLoot; public static boolean vanillaEnhanced; + public static boolean netherOverride; public static int villageDistance; @@ -465,6 +466,7 @@ public class BOPConfiguration { dungeonLoot = config.get("Miscellanious Settings", "Add Custom Dungeon Loot", true).getBoolean(false); vanillaEnhanced = config.get("Biome Settings", "Enhanced Vanilla Biomes", true).getBoolean(false); promisedLandDimID = config.get("Dimension Settings", "Promised Land Dimension ID", 20, null).getInt(); + netherOverride = config.get("Dimension Settings", "Enable Nether Override", true).getBoolean(true); addToDefault = config.get("Biome Settings", "Add Biomes To Default World", false).getBoolean(true); @@ -658,19 +660,19 @@ public class BOPConfiguration { taigaVillage = config.get("Allow Villages", "Taiga", true).getBoolean(false); // Get Terrain Block ID's - mudID = config.getTerrainBlock("Terrain Block IDs", "Mud ID", 160, null).getInt(); - driedDirtID = config.getTerrainBlock("Terrain Block IDs", "Dried Dirt ID", 161, null).getInt(); - redRockID = config.getTerrainBlock("Terrain Block IDs", "Red Rock ID", 162, null).getInt(); - ashID = config.getTerrainBlock("Terrain Block IDs", "Ash Block ID", 163, null).getInt(); - ashStoneID = config.getTerrainBlock("Terrain Block IDs", "Ash Stone ID", 164, null).getInt(); - hardIceID = config.getTerrainBlock("Terrain Block IDs", "Hard Ice ID", 165, null).getInt(); - originGrassID = config.getTerrainBlock("Terrain Block IDs", "Origin Grass ID", 166, null).getInt(); - hardSandID = config.getTerrainBlock("Terrain Block IDs", "Hard Sand ID", 167, null).getInt(); - hardDirtID = config.getTerrainBlock("Terrain Block IDs", "Hard Dirt ID", 168, null).getInt(); - holyGrassID = config.getTerrainBlock("Terrain Block IDs", "Holy Grass ID", 169, null).getInt(); - holyDirtID = config.getTerrainBlock("Terrain Block IDs", "Holy Dirt ID", 170, null).getInt(); - holyStoneID = config.getTerrainBlock("Terrain Block IDs", "Skystone ID", 171, null).getInt(); - cragRockID = config.getTerrainBlock("Terrain Block IDs", "Crag Rock ID", 172, null).getInt(); + mudID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Mud ID", 160, null).getInt(); + driedDirtID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Dried Dirt ID", 161, null).getInt(); + redRockID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Red Rock ID", 162, null).getInt(); + ashID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Ash Block ID", 163, null).getInt(); + ashStoneID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Ash Stone ID", 164, null).getInt(); + hardIceID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Hard Ice ID", 165, null).getInt(); + originGrassID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Origin Grass ID", 166, null).getInt(); + hardSandID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Hard Sand ID", 167, null).getInt(); + hardDirtID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Hard Dirt ID", 168, null).getInt(); + holyGrassID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Holy Grass ID", 169, null).getInt(); + holyDirtID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Holy Dirt ID", 170, null).getInt(); + holyStoneID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Skystone ID", 171, null).getInt(); + cragRockID = config.getTerrainBlock("Terrain Block IDs - MUST BE BELOW 255", "Crag Rock ID", 172, null).getInt(); // Get Crafted Block ID's plantsID = config.getBlock("Plant ID", 1920, null).getInt(); diff --git a/src/minecraft/biomesoplenty/configuration/BOPCrafting.java b/src/minecraft/biomesoplenty/configuration/BOPCrafting.java index 5f5eb700e..4077c6e80 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPCrafting.java +++ b/src/minecraft/biomesoplenty/configuration/BOPCrafting.java @@ -236,6 +236,7 @@ public class BOPCrafting FurnaceRecipes.smelting().addSmelting(Blocks.logs1.get().blockID, new ItemStack(Item.coal, 1, 1), 15F); FurnaceRecipes.smelting().addSmelting(Blocks.logs2.get().blockID, new ItemStack(Item.coal, 1, 1), 15F); + FurnaceRecipes.smelting().addSmelting(Blocks.logs4.get().blockID, new ItemStack(Item.coal, 1, 1), 15F); for (int i = 0; i < 3; ++i) { FurnaceRecipes.smelting().addSmelting(Blocks.logs3.get().blockID, i, new ItemStack(Item.coal, 1, 1), 15F); } diff --git a/src/minecraft/biomesoplenty/helpers/FurnaceFuel.java b/src/minecraft/biomesoplenty/helpers/FurnaceFuel.java index 2e1ca021f..d8006acc9 100644 --- a/src/minecraft/biomesoplenty/helpers/FurnaceFuel.java +++ b/src/minecraft/biomesoplenty/helpers/FurnaceFuel.java @@ -43,6 +43,12 @@ public class FurnaceFuel implements IFuelHandler { return 300; if(par1 == Blocks.holyStairs.get().blockID) return 300; + if(par1 == Blocks.pineStairs.get().blockID) + return 300; + if(par1 == Blocks.jacarandaStairs.get().blockID) + return 300; + if(par1 == Blocks.hellBarkStairs.get().blockID) + return 300; if(par1 == Items.miscItems.get().itemID && par2 == 1) return 400;