etc/BiomesOPlenty
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Tweaked village material replacement

Browse source
This commit is contained in:
Matt Caughey 2014-05-13 12:56:55 -04:00
parent 0382d9fe30
commit 688e46327f
2 changed files with 17 additions and 543 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

550
src/main/java/biomesoplenty/common/eventhandler/world/VillageMaterialEventHandler.java
View file

@ -13,121 +13,6 @@ public class VillageMaterialEventHandler
@SubscribeEvent @SubscribeEvent
public void getVillageBlockID(BiomeEvent.GetVillageBlockID event) public void getVillageBlockID(BiomeEvent.GetVillageBlockID event)
{ {
//Arctic
if (event.biome == BOPCBiomes.arctic)
{
//Cobblestone
if (event.original == Blocks.cobblestone)
{
event.replacement = Blocks.snow;
event.setResult(Result.DENY);
}
//Logs
if (event.original == Blocks.log)
{
event.replacement = Blocks.snow;
event.setResult(Result.DENY);
}
//Wooden Planks
if (event.original == Blocks.planks)
{
event.replacement = Blocks.snow;
event.setResult(Result.DENY);
}
//Wooden Stairs
if (event.original == Blocks.oak_stairs)
{
event.replacement = Blocks.snow;
event.setResult(Result.DENY);
}
//Cobblestone Stairs
if (event.original == Blocks.stone_brick_stairs)
{
event.replacement = Blocks.snow;
event.setResult(Result.DENY);
}
//Single Stone Slabs
if (event.original == Blocks.stone_slab)
{
event.replacement = Blocks.snow;
event.setResult(Result.DENY);
}
//Glass Panes
if (event.original == Blocks.glass_pane)
{
event.replacement = Blocks.ice;
event.setResult(Result.DENY);
}
//Iron Bars
if (event.original == Blocks.iron_bars)
{
event.replacement = Blocks.snow;
event.setResult(Result.DENY);
}
//Double Stone Slabs
if (event.original == Blocks.double_stone_slab)
{
event.replacement = Blocks.snow;
event.setResult(Result.DENY);
}
//Lava
if (event.original == Blocks.lava)
{
event.replacement = Blocks.ice;
event.setResult(Result.DENY);
}
if (event.original == Blocks.flowing_lava)
{
event.replacement = Blocks.ice;
event.setResult(Result.DENY);
}
//Water
if (event.original == Blocks.water)
{
event.replacement = Blocks.ice;
event.setResult(Result.DENY);
}
if (event.original == Blocks.flowing_water)
{
event.replacement = Blocks.ice;
event.setResult(Result.DENY);
}
//Crops
if (event.original == Blocks.wheat)
{
event.replacement = Blocks.air;
event.setResult(Result.DENY);
}
if (event.original == Blocks.potatoes)
{
event.replacement = Blocks.air;
event.setResult(Result.DENY);
}
if (event.original == Blocks.carrots)
{
event.replacement = Blocks.air;
event.setResult(Result.DENY);
}
//Farmland
if (event.original == Blocks.farmland)
{
event.replacement = Blocks.dirt;
event.setResult(Result.DENY);
}
}
//Birch Forest //Birch Forest
/*if (event.biome == Biomes.birchForest.get()) /*if (event.biome == Biomes.birchForest.get())
{ {
@ -153,13 +38,6 @@ public class VillageMaterialEventHandler
//Coniferous Forest //Coniferous Forest
if (event.biome == BOPCBiomes.coniferousForest) if (event.biome == BOPCBiomes.coniferousForest)
{ {
//Cobblestone
if (event.original == Blocks.cobblestone)
{
event.replacement = BOPBlockHelper.get("logs1");
event.setResult(Result.DENY);
}
//Logs //Logs
if (event.original == Blocks.log) if (event.original == Blocks.log)
{ {
@ -180,39 +58,6 @@ public class VillageMaterialEventHandler
event.replacement = BOPBlockHelper.get("firStairs"); event.replacement = BOPBlockHelper.get("firStairs");
event.setResult(Result.DENY); event.setResult(Result.DENY);
} }
//Cobblestone Stairs
if (event.original == Blocks.stone_brick_stairs)
{
event.replacement = BOPBlockHelper.get("firStairs");
event.setResult(Result.DENY);
}
//Stone Slabs
if (event.original == Blocks.stone_slab)
{
event.replacement = BOPBlockHelper.get("woodenSingleSlab1");
event.setResult(Result.DENY);
}
//Lava
if (event.original == Blocks.lava)
{
event.replacement = Blocks.water;
event.setResult(Result.DENY);
}
if (event.original == Blocks.flowing_lava)
{
event.replacement = Blocks.flowing_water;
event.setResult(Result.DENY);
}
//Glass Panes
if (event.original == Blocks.glass_pane)
{
event.replacement = Blocks.iron_bars;
event.setResult(Result.DENY);
}
} }
//Desert //Desert
@ -264,52 +109,12 @@ public class VillageMaterialEventHandler
//Grove //Grove
if (event.biome == BOPCBiomes.grove) if (event.biome == BOPCBiomes.grove)
{ {
//Cobblestone
if (event.original == Blocks.cobblestone)
{
event.replacement = Blocks.log;
event.setResult(Result.DENY);
}
//Wooden Stairs //Wooden Stairs
if (event.original == Blocks.oak_stairs) if (event.original == Blocks.oak_stairs)
{
event.replacement = Blocks.leaves;
event.setResult(Result.DENY);
}
//Cobblestone Stairs
if (event.original == Blocks.stone_brick_stairs)
{ {
event.replacement = Blocks.spruce_stairs; event.replacement = Blocks.spruce_stairs;
event.setResult(Result.DENY); event.setResult(Result.DENY);
} }
//Stone Slabs
if (event.original == Blocks.stone_slab)
{
event.replacement = Blocks.wooden_slab;
event.setResult(Result.DENY);
}
//Lava
if (event.original == Blocks.lava)
{
event.replacement = Blocks.water;
event.setResult(Result.DENY);
}
if (event.original == Blocks.flowing_lava)
{
event.replacement = Blocks.flowing_water;
event.setResult(Result.DENY);
}
//Glass Panes
if (event.original == Blocks.glass_pane)
{
event.replacement = Blocks.iron_bars;
event.setResult(Result.DENY);
}
} }
//Heathland //Heathland
@ -347,13 +152,6 @@ public class VillageMaterialEventHandler
//Lush Desert //Lush Desert
if (event.biome == BOPCBiomes.lushDesert) if (event.biome == BOPCBiomes.lushDesert)
{ {
//Cobblestone
if (event.original == Blocks.cobblestone)
{
event.replacement = BOPBlockHelper.get("redRock");
event.setResult(Result.DENY);
}
//Logs //Logs
if (event.original == Blocks.log) if (event.original == Blocks.log)
{ {
@ -368,44 +166,12 @@ public class VillageMaterialEventHandler
event.setResult(Result.DENY); event.setResult(Result.DENY);
} }
//Cobblestone Stairs
if (event.original == Blocks.stone_brick_stairs)
{
event.replacement = BOPBlockHelper.get("redCobbleStairs");
event.setResult(Result.DENY);
}
//Stone Slabs
if (event.original == Blocks.stone_slab)
{
event.replacement = BOPBlockHelper.get("stoneSingleSlab");
event.setResult(Result.DENY);
}
//Gravel //Gravel
if (event.original == Blocks.gravel) if (event.original == Blocks.gravel)
{ {
event.replacement = Blocks.sand; event.replacement = Blocks.sand;
event.setResult(Result.DENY); event.setResult(Result.DENY);
} }
//Glass Panes
if (event.original == Blocks.glass_pane)
{
event.replacement = Blocks.iron_bars;
event.setResult(Result.DENY);
}
}
//Lush Swamp
if (event.biome == BOPCBiomes.lushSwamp)
{
//Gravel
if (event.original == Blocks.cobblestone)
{
event.replacement = Blocks.mossy_cobblestone;
event.setResult(Result.DENY);
}
} }
//Maple Woods //Maple Woods
@ -422,52 +188,12 @@ public class VillageMaterialEventHandler
//Meadow //Meadow
if (event.biome == BOPCBiomes.meadow) if (event.biome == BOPCBiomes.meadow)
{ {
//Cobblestone
if (event.original == Blocks.cobblestone)
{
event.replacement = Blocks.log;
event.setResult(Result.DENY);
}
//Wooden Stairs //Wooden Stairs
if (event.original == Blocks.oak_stairs) if (event.original == Blocks.oak_stairs)
{ {
event.replacement = Blocks.spruce_stairs; event.replacement = Blocks.spruce_stairs;
event.setResult(Result.DENY); event.setResult(Result.DENY);
} }
//Cobblestone Stairs
if (event.original == Blocks.stone_brick_stairs)
{
event.replacement = Blocks.spruce_stairs;
event.setResult(Result.DENY);
}
//Stone Slabs
if (event.original == Blocks.stone_slab)
{
event.replacement = Blocks.wooden_slab;
event.setResult(Result.DENY);
}
//Lava
if (event.original == Blocks.lava)
{
event.replacement = Blocks.water;
event.setResult(Result.DENY);
}
if (event.original == Blocks.flowing_lava)
{
event.replacement = Blocks.flowing_water;
event.setResult(Result.DENY);
}
//Glass Panes
if (event.original == Blocks.glass_pane)
{
event.replacement = Blocks.iron_bars;
event.setResult(Result.DENY);
}
} }
//Meadow Forest //Meadow Forest
@ -524,13 +250,6 @@ public class VillageMaterialEventHandler
//Outback //Outback
if (event.biome == BOPCBiomes.outback) if (event.biome == BOPCBiomes.outback)
{ {
//Cobblestone
if (event.original == Blocks.cobblestone)
{
event.replacement = Blocks.log2;
event.setResult(Result.DENY);
}
//Logs //Logs
if (event.original == Blocks.log) if (event.original == Blocks.log)
{ {
@ -547,50 +266,17 @@ public class VillageMaterialEventHandler
//Wooden Stairs //Wooden Stairs
if (event.original == Blocks.oak_stairs) if (event.original == Blocks.oak_stairs)
{
event.replacement = Blocks.leaves;
event.setResult(Result.DENY);
}
//Cobblestone Stairs
if (event.original == Blocks.stone_brick_stairs)
{ {
event.replacement = Blocks.acacia_stairs; event.replacement = Blocks.acacia_stairs;
event.setResult(Result.DENY); event.setResult(Result.DENY);
} }
//Stone Slabs
if (event.original == Blocks.stone_slab)
{
event.replacement = BOPBlockHelper.get("woodenSingleSlab1");
event.setResult(Result.DENY);
}
//Lava
if (event.original == Blocks.lava)
{
event.replacement = Blocks.water;
event.setResult(Result.DENY);
}
if (event.original == Blocks.flowing_lava)
{
event.replacement = Blocks.flowing_water;
event.setResult(Result.DENY);
}
//Gravel //Gravel
if (event.original == Blocks.gravel) if (event.original == Blocks.gravel)
{ {
event.replacement = Blocks.sand; event.replacement = Blocks.sand;
event.setResult(Result.DENY); event.setResult(Result.DENY);
} }
//Glass Panes
if (event.original == Blocks.glass_pane)
{
event.replacement = Blocks.iron_bars;
event.setResult(Result.DENY);
}
} }
//Overgrown Greens //Overgrown Greens
@ -715,13 +401,6 @@ public class VillageMaterialEventHandler
//Snowy Coniferous Forest //Snowy Coniferous Forest
if (event.biome == BOPCBiomes.snowyConiferousForest) if (event.biome == BOPCBiomes.snowyConiferousForest)
{ {
//Cobblestone
if (event.original == Blocks.cobblestone)
{
event.replacement = BOPBlockHelper.get("logs1");
event.setResult(Result.DENY);
}
//Logs //Logs
if (event.original == Blocks.log) if (event.original == Blocks.log)
{ {
@ -742,39 +421,6 @@ public class VillageMaterialEventHandler
event.replacement = BOPBlockHelper.get("firStairs"); event.replacement = BOPBlockHelper.get("firStairs");
event.setResult(Result.DENY); event.setResult(Result.DENY);
} }
//Cobblestone Stairs
if (event.original == Blocks.stone_brick_stairs)
{
event.replacement = BOPBlockHelper.get("firStairs");
event.setResult(Result.DENY);
}
//Stone Slabs
if (event.original == Blocks.stone_slab)
{
event.replacement = BOPBlockHelper.get("woodenSingleSlab1");
event.setResult(Result.DENY);
}
//Lava
if (event.original == Blocks.lava)
{
event.replacement = Blocks.water;
event.setResult(Result.DENY);
}
if (event.original == Blocks.flowing_lava)
{
event.replacement = Blocks.flowing_water;
event.setResult(Result.DENY);
}
//Glass Panes
if (event.original == Blocks.glass_pane)
{
event.replacement = Blocks.iron_bars;
event.setResult(Result.DENY);
}
} }
//Spruce Woods //Spruce Woods
@ -863,43 +509,24 @@ public class VillageMaterialEventHandler
//Tropical Rainforest //Tropical Rainforest
if (event.biome == BOPCBiomes.tropicalRainforest) if (event.biome == BOPCBiomes.tropicalRainforest)
{ {
//Cobblestone //Logs
if (event.original == Blocks.cobblestone) if (event.original == Blocks.log)
{ {
event.replacement = Blocks.log; event.replacement = BOPBlockHelper.get("logs4");
event.setResult(Result.DENY);
}
//Wooden Planks
if (event.original == Blocks.planks)
{
event.replacement = BOPBlockHelper.get("planks");
event.setResult(Result.DENY); event.setResult(Result.DENY);
} }
//Wooden Stairs //Wooden Stairs
if (event.original == Blocks.oak_stairs) if (event.original == Blocks.oak_stairs)
{ {
event.replacement = Blocks.jungle_stairs; event.replacement = BOPBlockHelper.get("mahoganyStairs");
event.setResult(Result.DENY);
}
//Cobblestone Stairs
if (event.original == Blocks.stone_brick_stairs)
{
event.replacement = Blocks.jungle_stairs;
event.setResult(Result.DENY);
}
//Stone Slabs
if (event.original == Blocks.stone_slab)
{
event.replacement = Blocks.wooden_slab;
event.setResult(Result.DENY);
}
//Lava
if (event.original == Blocks.lava)
{
event.replacement = Blocks.water;
event.setResult(Result.DENY);
}
if (event.original == Blocks.flowing_lava)
{
event.replacement = Blocks.flowing_water;
event.setResult(Result.DENY); event.setResult(Result.DENY);
} }
@ -909,25 +536,11 @@ public class VillageMaterialEventHandler
event.replacement = Blocks.sand; event.replacement = Blocks.sand;
event.setResult(Result.DENY); event.setResult(Result.DENY);
} }
//Glass Panes
if (event.original == Blocks.glass_pane)
{
event.replacement = Blocks.iron_bars;
event.setResult(Result.DENY);
}
} }
//Wetland //Wetland
if (event.biome == BOPCBiomes.wetland) if (event.biome == BOPCBiomes.wetland)
{ {
//Cobblestone
if (event.original == Blocks.cobblestone)
{
event.replacement = BOPBlockHelper.get("logs3");
event.setResult(Result.DENY);
}
//Logs //Logs
if (event.original == Blocks.log) if (event.original == Blocks.log)
{ {
@ -948,39 +561,6 @@ public class VillageMaterialEventHandler
event.replacement = BOPBlockHelper.get("willowStairs"); event.replacement = BOPBlockHelper.get("willowStairs");
event.setResult(Result.DENY); event.setResult(Result.DENY);
} }
//Cobblestone Stairs
if (event.original == Blocks.stone_brick_stairs)
{
event.replacement = BOPBlockHelper.get("willowStairs");
event.setResult(Result.DENY);
}
//Stone Slabs
if (event.original == Blocks.stone_slab)
{
event.replacement = BOPBlockHelper.get("woodenSingleSlab2");
event.setResult(Result.DENY);
}
//Lava
if (event.original == Blocks.lava)
{
event.replacement = Blocks.water;
event.setResult(Result.DENY);
}
if (event.original == Blocks.flowing_lava)
{
event.replacement = Blocks.flowing_water;
event.setResult(Result.DENY);
}
//Glass Panes
if (event.original == Blocks.glass_pane)
{
event.replacement = Blocks.iron_bars;
event.setResult(Result.DENY);
}
} }
} }
@ -1001,13 +581,6 @@ public class VillageMaterialEventHandler
//Coniferous Forest //Coniferous Forest
if (event.biome == BOPCBiomes.coniferousForest) if (event.biome == BOPCBiomes.coniferousForest)
{ {
//Cobblestone
if (event.original == Blocks.cobblestone)
{
event.replacement = 3;
event.setResult(Result.DENY);
}
//Logs //Logs
if (event.original == Blocks.log) if (event.original == Blocks.log)
{ {
@ -1021,13 +594,6 @@ public class VillageMaterialEventHandler
event.replacement = 3; event.replacement = 3;
event.setResult(Result.DENY); event.setResult(Result.DENY);
} }
//Single Stone Slab
if (event.original == Blocks.stone_slab)
{
event.replacement = 3;
event.setResult(Result.DENY);
}
} }
//Desert //Desert
@ -1051,13 +617,6 @@ public class VillageMaterialEventHandler
//Grove //Grove
if (event.biome == BOPCBiomes.grove) if (event.biome == BOPCBiomes.grove)
{ {
//Cobblestone
if (event.original == Blocks.cobblestone)
{
event.replacement = 1;
event.setResult(Result.DENY);
}
//Logs //Logs
if (event.original == Blocks.log) if (event.original == Blocks.log)
{ {
@ -1078,13 +637,6 @@ public class VillageMaterialEventHandler
event.replacement = 5; event.replacement = 5;
event.setResult(Result.DENY); event.setResult(Result.DENY);
} }
//Single Stone Slab
if (event.original == Blocks.stone_slab)
{
event.replacement = 1;
event.setResult(Result.DENY);
}
} }
//Heathland //Heathland
@ -1108,27 +660,12 @@ public class VillageMaterialEventHandler
//Lush Desert //Lush Desert
if (event.biome == BOPCBiomes.lushDesert) if (event.biome == BOPCBiomes.lushDesert)
{ {
//Cobblestone
if (event.original == Blocks.cobblestone)
{
event.replacement = 1;
event.setResult(Result.DENY);
}
//Wooden Planks //Wooden Planks
if (event.original == Blocks.planks) if (event.original == Blocks.planks)
{ {
event.replacement = 4; event.replacement = 4;
event.setResult(Result.DENY); event.setResult(Result.DENY);
} }
//Single Stone Slab
if (event.original == Blocks.stone_slab)
{
event.replacement = 0;
event.setResult(Result.DENY);
}
} }
//Maple Woods //Maple Woods
@ -1152,13 +689,6 @@ public class VillageMaterialEventHandler
//Meadow //Meadow
if (event.biome == BOPCBiomes.meadow) if (event.biome == BOPCBiomes.meadow)
{ {
//Cobblestone
if (event.original == Blocks.cobblestone)
{
event.replacement = 1;
event.setResult(Result.DENY);
}
//Logs //Logs
if (event.original == Blocks.log) if (event.original == Blocks.log)
{ {
@ -1172,13 +702,6 @@ public class VillageMaterialEventHandler
event.replacement = 1; event.replacement = 1;
event.setResult(Result.DENY); event.setResult(Result.DENY);
} }
//Single Stone Slab
if (event.original == Blocks.stone_slab)
{
event.replacement = 1;
event.setResult(Result.DENY);
}
} }
//Meadow Forest //Meadow Forest
@ -1222,13 +745,6 @@ public class VillageMaterialEventHandler
event.replacement = 4; event.replacement = 4;
event.setResult(Result.DENY); event.setResult(Result.DENY);
} }
//Wooden Stairs
if (event.original == Blocks.oak_stairs)
{
event.replacement = 4;
event.setResult(Result.DENY);
}
} }
//Overgrown Greens //Overgrown Greens
@ -1245,13 +761,6 @@ public class VillageMaterialEventHandler
//Snowy Coniferous Forest //Snowy Coniferous Forest
if (event.biome == BOPCBiomes.snowyConiferousForest) if (event.biome == BOPCBiomes.snowyConiferousForest)
{ {
//Cobblestone
if (event.original == Blocks.cobblestone)
{
event.replacement = 3;
event.setResult(Result.DENY);
}
//Logs //Logs
if (event.original == Blocks.log) if (event.original == Blocks.log)
{ {
@ -1265,13 +774,6 @@ public class VillageMaterialEventHandler
event.replacement = 3; event.replacement = 3;
event.setResult(Result.DENY); event.setResult(Result.DENY);
} }
//Single Stone Slab
if (event.original == Blocks.stone_slab)
{
event.replacement = 3;
event.setResult(Result.DENY);
}
} }
//Spruce Woods //Spruce Woods
@ -1295,13 +797,6 @@ public class VillageMaterialEventHandler
//Tropical Rainforest //Tropical Rainforest
if (event.biome == BOPCBiomes.tropicalRainforest) if (event.biome == BOPCBiomes.tropicalRainforest)
{ {
//Cobblestone
if (event.original == Blocks.cobblestone)
{
event.replacement = 3;
event.setResult(Result.DENY);
}
//Logs //Logs
if (event.original == Blocks.log) if (event.original == Blocks.log)
{ {
@ -1312,14 +807,7 @@ public class VillageMaterialEventHandler
//Wooden Planks //Wooden Planks
if (event.original == Blocks.planks) if (event.original == Blocks.planks)
{ {
event.replacement = 3; event.replacement = 14;
event.setResult(Result.DENY);
}
//Single Stone Slab
if (event.original == Blocks.stone_slab)
{
event.replacement = 3;
event.setResult(Result.DENY); event.setResult(Result.DENY);
} }
} }
@ -1327,13 +815,6 @@ public class VillageMaterialEventHandler
//Wetland //Wetland
if (event.biome == BOPCBiomes.wetland) if (event.biome == BOPCBiomes.wetland)
{ {
//Cobblestone
if (event.original == Blocks.cobblestone)
{
event.replacement = 1;
event.setResult(Result.DENY);
}
//Logs //Logs
if (event.original == Blocks.log) if (event.original == Blocks.log)
{ {
@ -1347,13 +828,6 @@ public class VillageMaterialEventHandler
event.replacement = 9; event.replacement = 9;
event.setResult(Result.DENY); event.setResult(Result.DENY);
} }
//Single Stone Slab
if (event.original == Blocks.stone_slab)
{
event.replacement = 1;
event.setResult(Result.DENY);
}
} }
} }
} }

2
src/main/java/biomesoplenty/common/world/layer/GenLayerRiverMixBOP.java
View file

@ -41,7 +41,7 @@ public class GenLayerRiverMixBOP extends GenLayerRiverMix
{ {
if (riverBiomeIds[i1] == BiomeGenBase.river.biomeID) if (riverBiomeIds[i1] == BiomeGenBase.river.biomeID)
{ {
if (inputBiomeIds[i1] == BiomeGenBase.icePlains.biomeID || inputBiomeIds[i1] == BOPCBiomes.alps.biomeID || inputBiomeIds[i1] == BOPCBiomes.arctic.biomeID || inputBiomeIds[i1] == BOPCBiomes.glacier.biomeID || inputBiomeIds[i1] == BOPCBiomes.snowyConiferousForest.biomeID) if (inputBiomeIds[i1] == BiomeGenBase.icePlains.biomeID || inputBiomeIds[i1] == BOPCBiomes.alps.biomeID || inputBiomeIds[i1] == BOPCBiomes.arctic.biomeID || inputBiomeIds[i1] == BOPCBiomes.glacier.biomeID || inputBiomeIds[i1] == BOPCBiomes.frostForest.biomeID || inputBiomeIds[i1] == BOPCBiomes.snowyConiferousForest.biomeID)
{ {
outputBiomeIds[i1] = BiomeGenBase.frozenRiver.biomeID; outputBiomeIds[i1] = BiomeGenBase.frozenRiver.biomeID;
} }