diff --git a/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java b/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java index 62643ce77..4f4bfdb0d 100644 --- a/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java +++ b/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java @@ -174,8 +174,8 @@ public class BOPConfigurationTerrainGen hotSpringsVillage = config.get("Allow Villages", "HotSprings", false).getBoolean(false); icyHillsVillage = config.get("Allow Villages", "IcyHills", false).getBoolean(false); jadeCliffsVillage = config.get("Allow Villages", "JadeCliffs", false).getBoolean(false); - lushDesertVillage = config.get("Allow Villages", "LushDesert", false).getBoolean(false); - lushSwampVillage = config.get("Allow Villages", "LushSwamp", false).getBoolean(false); + lushDesertVillage = config.get("Allow Villages", "LushDesert", true).getBoolean(false); + lushSwampVillage = config.get("Allow Villages", "LushSwamp", true).getBoolean(false); mangroveVillage = config.get("Allow Villages", "Mangrove", false).getBoolean(false); mapleWoodsVillage = config.get("Allow Villages", "MapleWoods", false).getBoolean(false); marshVillage = config.get("Allow Villages", "Marsh", false).getBoolean(false); @@ -205,11 +205,11 @@ public class BOPConfigurationTerrainGen shrublandVillage = config.get("Allow Villages", "Shrubland", true).getBoolean(false); silkgladesVillage = config.get("Allow Villages", "Silkgladess", false).getBoolean(false); sludgepitVillage = config.get("Allow Villages", "Sludgepit", false).getBoolean(false); - spruceWoodsVillage = config.get("Allow Villages", "SpruceWoods", false).getBoolean(false); + spruceWoodsVillage = config.get("Allow Villages", "SpruceWoods", true).getBoolean(false); steppeVillage = config.get("Allow Villages", "Steppe", true).getBoolean(false); temperateRainforestVillage = config.get("Allow Villages", "TemperateRainforest", false).getBoolean(false); thicketVillage = config.get("Allow Villages", "Thicket", false).getBoolean(false); - timberVillage = config.get("Allow Villages", "Timber", false).getBoolean(false); + timberVillage = config.get("Allow Villages", "Timber", true).getBoolean(false); tropicalRainforestVillage = config.get("Allow Villages", "TropicalRainforest", true).getBoolean(false); tropicsVillage = config.get("Allow Villages", "Tropics", false).getBoolean(false); tundraVillage = config.get("Allow Villages", "Tundra", true).getBoolean(false); diff --git a/common/biomesoplenty/handlers/VillageMaterialEventHandler.java b/common/biomesoplenty/handlers/VillageMaterialEventHandler.java index fa0892cc1..676062ecc 100644 --- a/common/biomesoplenty/handlers/VillageMaterialEventHandler.java +++ b/common/biomesoplenty/handlers/VillageMaterialEventHandler.java @@ -5,17 +5,203 @@ import net.minecraftforge.event.Event.Result; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.terraingen.BiomeEvent; import biomesoplenty.api.Biomes; +import biomesoplenty.api.Blocks; public class VillageMaterialEventHandler { @ForgeSubscribe public void getVillageBlockID(BiomeEvent.GetVillageBlockID event) { - if (event.biome == Biomes.savanna.get()) + //Arctic + if (event.biome == Biomes.arctic.get()) { + //Cobblestone if (event.original == Block.cobblestone.blockID) { - event.replacement = Block.brick.blockID; + event.replacement = Block.blockSnow.blockID; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = Block.blockSnow.blockID; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = Block.blockSnow.blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Block.blockSnow.blockID; + event.setResult(Result.DENY); + } + + //Cobblestone Stairs + if (event.original == Block.stairsCobblestone.blockID) + { + event.replacement = Block.blockSnow.blockID; + event.setResult(Result.DENY); + } + + //Single Stone Slabs + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = Block.blockSnow.blockID; + event.setResult(Result.DENY); + } + + //Glass Panes + if (event.original == Block.thinGlass.blockID) + { + event.replacement = Block.blockSnow.blockID; + event.setResult(Result.DENY); + } + + //Iron Bars + if (event.original == Block.fenceIron.blockID) + { + event.replacement = Block.blockSnow.blockID; + event.setResult(Result.DENY); + } + + //Fences + if (event.original == Block.fence.blockID) + { + event.replacement = Block.cobblestoneWall.blockID; + event.setResult(Result.DENY); + } + + //Double Stone Slabs + if (event.original == Block.stoneDoubleSlab.blockID) + { + event.replacement = Block.blockSnow.blockID; + event.setResult(Result.DENY); + } + + //Lava + if (event.original == Block.lavaStill.blockID) + { + event.replacement = Block.ice.blockID; + event.setResult(Result.DENY); + } + if (event.original == Block.lavaMoving.blockID) + { + event.replacement = Block.ice.blockID; + event.setResult(Result.DENY); + } + + //Water + if (event.original == Block.waterStill.blockID) + { + event.replacement = Block.ice.blockID; + event.setResult(Result.DENY); + } + if (event.original == Block.waterMoving.blockID) + { + event.replacement = Block.ice.blockID; + event.setResult(Result.DENY); + } + + //Crops + if (event.original == Block.crops.blockID) + { + event.replacement = 0; + event.setResult(Result.DENY); + } + if (event.original == Block.potato.blockID) + { + event.replacement = 0; + event.setResult(Result.DENY); + } + if (event.original == Block.carrot.blockID) + { + event.replacement = 0; + event.setResult(Result.DENY); + } + + //Farmland + if (event.original == Block.tilledField.blockID) + { + event.replacement = Block.dirt.blockID; + event.setResult(Result.DENY); + } + + //Pressure Plate + if (event.original == Block.pressurePlatePlanks.blockID) + { + event.replacement = 0; + event.setResult(Result.DENY); + } + } + + //Savanna + if (event.biome == Biomes.savanna.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Blocks.logs1.get().blockID; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = Blocks.logs1.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = Blocks.planks.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Blocks.acaciaStairs.get().blockID; + event.setResult(Result.DENY); + } + + //Cobblestone Stairs + if (event.original == Block.stairsCobblestone.blockID) + { + event.replacement = Blocks.acaciaStairs.get().blockID; + event.setResult(Result.DENY); + } + + //Stone Slabs + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = Blocks.woodenSingleSlab1.get().blockID; + event.setResult(Result.DENY); + } + + //Lava + if (event.original == Block.lavaStill.blockID) + { + event.replacement = Block.waterStill.blockID; + event.setResult(Result.DENY); + } + if (event.original == Block.lavaMoving.blockID) + { + event.replacement = Block.waterMoving.blockID; + event.setResult(Result.DENY); + } + + //Gravel + if (event.original == Block.gravel.blockID) + { + event.replacement = Block.sand.blockID; event.setResult(Result.DENY); } }