Merge branch 'GTNewHorizons:master' into master

2 files changed, 0 insertions, 195 deletions

diff --git a/src/Java/gtPlusPlus/australia/gen/map/structure/StructureManager.java b/src/Java/gtPlusPlus/australia/gen/map/structure/StructureManager.java
deleted file mode 100644
index b3238a5903..0000000000
--- a/src/Java/gtPlusPlus/australia/gen/map/structure/StructureManager.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package gtPlusPlus.australia.gen.map.structure;
-
-import gtPlusPlus.australia.gen.map.MapGenExtendedVillage;
-import gtPlusPlus.australia.gen.map.structure.type.ComponentVillageBank;
-import gtPlusPlus.core.lib.CORE;
-import net.minecraft.world.gen.structure.MapGenStructureIO;
-
-public class StructureManager {
-
-	public static void registerVillageComponents() {
-		try {
-			//Register Village
-			MapGenStructureIO.registerStructure(MapGenExtendedVillage.Start.class, "ExtendedVillage");	
-			
-			//Register Structures within village
-			MapGenStructureIO.func_143031_a(ComponentVillageBank.class, CORE.MODID+":"+"Bank");
-		} catch (Throwable e) {}
-	}
-	
-}
diff --git a/src/Java/gtPlusPlus/australia/gen/map/structure/type/ComponentVillageBank.java b/src/Java/gtPlusPlus/australia/gen/map/structure/type/ComponentVillageBank.java
deleted file mode 100644
index 5b7017aaf0..0000000000
--- a/src/Java/gtPlusPlus/australia/gen/map/structure/type/ComponentVillageBank.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package gtPlusPlus.australia.gen.map.structure.type;
-
-import static net.minecraftforge.common.ChestGenHooks.VILLAGE_BLACKSMITH;
-
-import java.util.List;
-import java.util.Random;
-
-import gtPlusPlus.api.objects.Logger;
-import net.minecraft.block.material.Material;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.WeightedRandomChestContent;
-import net.minecraft.world.World;
-import net.minecraft.world.gen.structure.StructureBoundingBox;
-import net.minecraft.world.gen.structure.StructureComponent;
-import net.minecraft.world.gen.structure.StructureVillagePieces;
-import net.minecraft.world.gen.structure.StructureVillagePieces.House2;
-import net.minecraftforge.common.ChestGenHooks;
-
-public class ComponentVillageBank extends House2 {
-
-	/** List of items that Village's Blacksmith chest can contain. */
-	public static final WeightedRandomChestContent[] villageBlacksmithChestContents = new WeightedRandomChestContent[] {
-			new WeightedRandomChestContent(Items.diamond, 0, 1, 3, 3),
-			new WeightedRandomChestContent(Items.iron_ingot, 0, 1, 5, 10),
-			new WeightedRandomChestContent(Items.gold_ingot, 0, 1, 3, 5),
-			new WeightedRandomChestContent(Items.bread, 0, 1, 3, 15),
-			new WeightedRandomChestContent(Items.apple, 0, 1, 3, 15),
-			new WeightedRandomChestContent(Items.iron_pickaxe, 0, 1, 1, 5),
-			new WeightedRandomChestContent(Items.iron_sword, 0, 1, 1, 5),
-			new WeightedRandomChestContent(Items.iron_chestplate, 0, 1, 1, 5),
-			new WeightedRandomChestContent(Items.iron_helmet, 0, 1, 1, 5),
-			new WeightedRandomChestContent(Items.iron_leggings, 0, 1, 1, 5),
-			new WeightedRandomChestContent(Items.iron_boots, 0, 1, 1, 5),
-			new WeightedRandomChestContent(Item.getItemFromBlock(Blocks.obsidian), 0, 3, 7, 5),
-			new WeightedRandomChestContent(Item.getItemFromBlock(Blocks.sapling), 0, 3, 7, 5),
-			new WeightedRandomChestContent(Items.saddle, 0, 1, 1, 3),
-			new WeightedRandomChestContent(Items.iron_horse_armor, 0, 1, 1, 1),
-			new WeightedRandomChestContent(Items.golden_horse_armor, 0, 1, 1, 1),
-			new WeightedRandomChestContent(Items.diamond_horse_armor, 0, 1, 1, 1) 
-			};
-	
-	private boolean hasMadeChest;
-
-	public ComponentVillageBank() {
-		Logger.INFO("Created a Bank.");
-	}
-
-	public ComponentVillageBank(StructureVillagePieces.Start aStart, int p_i2103_2_, Random aRand,
-			StructureBoundingBox aBox, int aCoordBaseMode) {
-		super(aStart, p_i2103_2_, aRand, aBox, aCoordBaseMode);
-		this.coordBaseMode = aCoordBaseMode;
-		this.boundingBox = aBox;
-	}
-
-	public static StructureVillagePieces.House2 func_74915_a(StructureVillagePieces.Start p_74915_0_, List p_74915_1_,
-			Random p_74915_2_, int p_74915_3_, int p_74915_4_, int p_74915_5_, int p_74915_6_, int p_74915_7_) {
-		StructureBoundingBox structureboundingbox = StructureBoundingBox.getComponentToAddBoundingBox(p_74915_3_,
-				p_74915_4_, p_74915_5_, 0, 0, 0, 10, 6, 7, p_74915_6_);
-		Logger.INFO("12334453");
-		return canVillageGoDeeper(structureboundingbox)
-				&& StructureComponent.findIntersecting(p_74915_1_, structureboundingbox) == null
-						? new StructureVillagePieces.House2(p_74915_0_, p_74915_7_, p_74915_2_, structureboundingbox,
-								p_74915_6_)
-						: null;
-	}
-
-	protected void func_143012_a(NBTTagCompound aNBT) {
-		super.func_143012_a(aNBT);
-		aNBT.setBoolean("Chest", this.hasMadeChest);
-	}
-
-	protected void func_143011_b(NBTTagCompound aNBT) {
-		super.func_143011_b(aNBT);
-		this.hasMadeChest = aNBT.getBoolean("Chest");
-	}
-
-	/**
-	 * second Part of Structure generating, this for example places Spiderwebs, Mob
-	 * Spawners, it closes Mineshafts at the end, it adds Fences...
-	 */
-	public boolean addComponentParts(World aWorld, Random aRand, StructureBoundingBox aBox) {
-		if (this.field_143015_k < 0) {
-			this.field_143015_k = this.getAverageGroundLevel(aWorld, aBox);
-
-			if (this.field_143015_k < 0) {
-				return true;
-			}
-
-			this.boundingBox.offset(0, this.field_143015_k - this.boundingBox.maxY + 6 - 1, 0);
-		}
-
-		this.fillWithBlocks(aWorld, aBox, 0, 1, 0, 9, 4, 6, Blocks.air, Blocks.air, false);
-		this.fillWithBlocks(aWorld, aBox, 0, 0, 0, 9, 0, 6, Blocks.cobblestone, Blocks.cobblestone, false);
-		this.fillWithBlocks(aWorld, aBox, 0, 4, 0, 9, 4, 6, Blocks.cobblestone, Blocks.cobblestone, false);
-		this.fillWithBlocks(aWorld, aBox, 0, 5, 0, 9, 5, 6, Blocks.stone_slab, Blocks.stone_slab, false);
-		this.fillWithBlocks(aWorld, aBox, 1, 5, 1, 8, 5, 5, Blocks.air, Blocks.air, false);
-		this.fillWithBlocks(aWorld, aBox, 1, 1, 0, 2, 3, 0, Blocks.planks, Blocks.planks, false);
-		this.fillWithBlocks(aWorld, aBox, 0, 1, 0, 0, 4, 0, Blocks.log, Blocks.log, false);
-		this.fillWithBlocks(aWorld, aBox, 3, 1, 0, 3, 4, 0, Blocks.log, Blocks.log, false);
-		this.fillWithBlocks(aWorld, aBox, 0, 1, 6, 0, 4, 6, Blocks.log, Blocks.log, false);
-		this.placeBlockAtCurrentPosition(aWorld, Blocks.planks, 0, 3, 3, 1, aBox);
-		this.fillWithBlocks(aWorld, aBox, 3, 1, 2, 3, 3, 2, Blocks.planks, Blocks.planks, false);
-		this.fillWithBlocks(aWorld, aBox, 4, 1, 3, 5, 3, 3, Blocks.planks, Blocks.planks, false);
-		this.fillWithBlocks(aWorld, aBox, 0, 1, 1, 0, 3, 5, Blocks.planks, Blocks.planks, false);
-		this.fillWithBlocks(aWorld, aBox, 1, 1, 6, 5, 3, 6, Blocks.planks, Blocks.planks, false);
-		this.fillWithBlocks(aWorld, aBox, 5, 1, 0, 5, 3, 0, Blocks.fence, Blocks.fence, false);
-		this.fillWithBlocks(aWorld, aBox, 9, 1, 0, 9, 3, 0, Blocks.fence, Blocks.fence, false);
-		this.fillWithBlocks(aWorld, aBox, 6, 1, 4, 9, 4, 6, Blocks.cobblestone, Blocks.cobblestone, false);
-		this.placeBlockAtCurrentPosition(aWorld, Blocks.flowing_lava, 0, 7, 1, 5, aBox);
-		this.placeBlockAtCurrentPosition(aWorld, Blocks.flowing_lava, 0, 8, 1, 5, aBox);
-		this.placeBlockAtCurrentPosition(aWorld, Blocks.iron_bars, 0, 9, 2, 5, aBox);
-		this.placeBlockAtCurrentPosition(aWorld, Blocks.iron_bars, 0, 9, 2, 4, aBox);
-		this.fillWithBlocks(aWorld, aBox, 7, 2, 4, 8, 2, 5, Blocks.air, Blocks.air, false);
-		this.placeBlockAtCurrentPosition(aWorld, Blocks.cobblestone, 0, 6, 1, 3, aBox);
-		this.placeBlockAtCurrentPosition(aWorld, Blocks.furnace, 0, 6, 2, 3, aBox);
-		this.placeBlockAtCurrentPosition(aWorld, Blocks.furnace, 0, 6, 3, 3, aBox);
-		this.placeBlockAtCurrentPosition(aWorld, Blocks.double_stone_slab, 0, 8, 1, 1, aBox);
-		this.placeBlockAtCurrentPosition(aWorld, Blocks.glass_pane, 0, 0, 2, 2, aBox);
-		this.placeBlockAtCurrentPosition(aWorld, Blocks.glass_pane, 0, 0, 2, 4, aBox);
-		this.placeBlockAtCurrentPosition(aWorld, Blocks.glass_pane, 0, 2, 2, 6, aBox);
-		this.placeBlockAtCurrentPosition(aWorld, Blocks.glass_pane, 0, 4, 2, 6, aBox);
-		this.placeBlockAtCurrentPosition(aWorld, Blocks.fence, 0, 2, 1, 4, aBox);
-		this.placeBlockAtCurrentPosition(aWorld, Blocks.wooden_pressure_plate, 0, 2, 2, 4, aBox);
-		this.placeBlockAtCurrentPosition(aWorld, Blocks.planks, 0, 1, 1, 5, aBox);
-		this.placeBlockAtCurrentPosition(aWorld, Blocks.oak_stairs,
-				this.getMetadataWithOffset(Blocks.oak_stairs, 3), 2, 1, 5, aBox);
-		this.placeBlockAtCurrentPosition(aWorld, Blocks.oak_stairs,
-				this.getMetadataWithOffset(Blocks.oak_stairs, 1), 1, 1, 4, aBox);
-		int i;
-		int j;
-
-		if (!this.hasMadeChest) {
-			i = this.getYWithOffset(1);
-			j = this.getXWithOffset(5, 5);
-			int k = this.getZWithOffset(5, 5);
-
-			if (aBox.isVecInside(j, i, k)) {
-				this.hasMadeChest = true;
-				this.generateStructureChestContents(aWorld, aBox, aRand, 5, 1, 5,
-						ChestGenHooks.getItems(VILLAGE_BLACKSMITH, aRand),
-						ChestGenHooks.getCount(VILLAGE_BLACKSMITH, aRand));
-			}
-		}
-
-		for (i = 6; i <= 8; ++i) {
-			if (this.getBlockAtCurrentPosition(aWorld, i, 0, -1, aBox).getMaterial() == Material.air && this
-					.getBlockAtCurrentPosition(aWorld, i, -1, -1, aBox).getMaterial() != Material.air) {
-				this.placeBlockAtCurrentPosition(aWorld, Blocks.stone_stairs,
-						this.getMetadataWithOffset(Blocks.stone_stairs, 3), i, 0, -1, aBox);
-			}
-		}
-
-		for (i = 0; i < 7; ++i) {
-			for (j = 0; j < 10; ++j) {
-				this.clearCurrentPositionBlocksUpwards(aWorld, j, 6, i, aBox);
-				this.func_151554_b(aWorld, Blocks.cobblestone, 0, j, -1, i, aBox);
-			}
-		}
-
-		this.spawnVillagers(aWorld, aBox, 7, 1, 1, 1);
-		return true;
-	}
-
-	/**
-	 * Returns the villager type to spawn in this component, based on the number of
-	 * villagers already spawned.
-	 */
-	protected int getVillagerType(int p_74888_1_) {
-		return 7735;
-	}
-
-}