From 9afbf80a696a7cb0534c5a39314930843f5a19c2 Mon Sep 17 00:00:00 2001 From: Alexander Date: Sun, 16 Feb 2014 16:05:39 -0500 Subject: [PATCH] Fix Smeltery --- .../worldgen/village/ComponentSmeltery.java | 33 +++++-------------- .../village/VillageSmelteryHandler.java | 2 +- 2 files changed, 9 insertions(+), 26 deletions(-) diff --git a/src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java b/src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java index 1ecbc4fc..0d7dd8ae 100644 --- a/src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java +++ b/src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java @@ -9,10 +9,10 @@ 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 tconstruct.TConstruct; +import net.minecraft.world.gen.structure.StructureVillagePieces.Start; import tconstruct.common.TRepo; -public class ComponentSmeltery extends StructureVillagePieces.Village +public class ComponentSmeltery extends StructureVillagePieces.House1 { private int averageGroundLevel = -1; @@ -20,16 +20,16 @@ public class ComponentSmeltery extends StructureVillagePieces.Village { } - public ComponentSmeltery(StructureVillagePieces.Start par1ComponentVillageStartPiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) + public ComponentSmeltery(Start villagePiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) { - super(par1ComponentVillageStartPiece, par2); + super(); this.coordBaseMode = par5; this.boundingBox = par4StructureBoundingBox; } - public static ComponentSmeltery func_74898_a (StructureVillagePieces.Start villagePiece, List pieces, Random random, int p1, int p2, int p3, int p4, int p5) + public static ComponentSmeltery buildComponent (Start villagePiece, List pieces, Random random, int p1, int p2, int p3, int p4, int p5) { - StructureBoundingBox structureboundingbox = StructureBoundingBox.getComponentToAddBoundingBox(p1, p2, p3, 0, 0, 0, 9, 3, 7, p4); + StructureBoundingBox structureboundingbox = StructureBoundingBox.getComponentToAddBoundingBox(p1, p2, p3, 0, 0, 0, 7, 6, 7, p4); return canVillageGoDeeper(structureboundingbox) && StructureComponent.findIntersecting(pieces, structureboundingbox) == null ? new ComponentSmeltery(villagePiece, p5, random, structureboundingbox, p4) : null; } @@ -88,27 +88,10 @@ public class ComponentSmeltery extends StructureVillagePieces.Village this.func_151554_b(world, Blocks.stonebrick, 0, i1, -1, l, sbb); } } + return true; } - - int remapDirection (int direction) - { - TConstruct.logger.info("Direction: " + direction); - switch (direction) - { - case 0: - return 2; - case 1: - return 3; - case 2: - return 1; - case 3: - return 0; - } - TConstruct.logger.error("This shouldn't happen (remapDirection in tconstruct.worldgen.village.ComponentSmeltery)"); - return -1; - } - + protected void fillWithMetaBlocks (World par1World, StructureBoundingBox par2StructureBoundingBox, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, Block placeBlockID, int placeBlockMeta, Block replaceBlockID, int replaceBlockMeta, boolean alwaysReplace) { diff --git a/src/main/java/tconstruct/worldgen/village/VillageSmelteryHandler.java b/src/main/java/tconstruct/worldgen/village/VillageSmelteryHandler.java index 688604a0..d22f74ca 100644 --- a/src/main/java/tconstruct/worldgen/village/VillageSmelteryHandler.java +++ b/src/main/java/tconstruct/worldgen/village/VillageSmelteryHandler.java @@ -24,7 +24,7 @@ public class VillageSmelteryHandler implements IVillageCreationHandler @Override public Object buildComponent (PieceWeight villagePiece, Start startPiece, List pieces, Random random, int p1, int p2, int p3, int p4, int p5) { - return ComponentSmeltery.func_74898_a(startPiece, pieces, random, p1, p2, p3, p4, p5); + return ComponentSmeltery.buildComponent(startPiece, pieces, random, p1, p2, p3, p4, p5); } }