diff --git a/assets/tinker/manuals/smeltery.xml b/assets/tinker/manuals/smeltery.xml index 4ff3b10a..36f59ac5 100644 --- a/assets/tinker/manuals/smeltery.xml +++ b/assets/tinker/manuals/smeltery.xml @@ -52,7 +52,9 @@ The main structure for melting liquids is called the Smeltery. It is larger than * Mixing two metals in the Smeltery may result in an alloy. The process happens automatically. -* If you need more space to process metal, add more layers. +* If you need more space to process metal, add more layers. + +* Casts are made differently from Patterns. Details are found later. @@ -128,9 +130,9 @@ Other liquid removal objects will work, but are frowned upon. An example picture -Blank casts are made by pouring aluminum brass or gold into an empty casting table. These can be turned into ingot casts in the Stencil Table. +Blank casts are made by pouring aluminum brass or gold into an empty casting table. These are used in crafting recipes and can be re-melted. -Other part casts must be created by pouring metal around existing parts, like a pickaxe head. +Part casts must be created by pouring metal around existing parts, like a pickaxe head. diff --git a/mods/WARGH.txt b/mods/WARGH.txt new file mode 100644 index 00000000..e69de29b diff --git a/mods/tinker/textures/blocks/liquid_villager.png b/mods/tinker/textures/blocks/liquid_villager.png new file mode 100644 index 00000000..a9d1b9bf Binary files /dev/null and b/mods/tinker/textures/blocks/liquid_villager.png differ diff --git a/mods/tinker/textures/blocks/liquid_villager_flow.png b/mods/tinker/textures/blocks/liquid_villager_flow.png new file mode 100644 index 00000000..01752191 Binary files /dev/null and b/mods/tinker/textures/blocks/liquid_villager_flow.png differ diff --git a/tconstruct/TConstruct.java b/tconstruct/TConstruct.java index 8640640d..feca2058 100644 --- a/tconstruct/TConstruct.java +++ b/tconstruct/TConstruct.java @@ -137,6 +137,7 @@ public class TConstruct Behavior.registerBuiltInBehaviors(); SpecialStackHandler.registerBuiltInStackHandlers(); content.modIntegration(); + TContent.modRecipes(); content.createEntities(); content.modRecipes(); } diff --git a/tconstruct/blocks/RedstoneMachine.java b/tconstruct/blocks/RedstoneMachine.java index f4f6a950..bd41bfbb 100644 --- a/tconstruct/blocks/RedstoneMachine.java +++ b/tconstruct/blocks/RedstoneMachine.java @@ -49,7 +49,9 @@ public class RedstoneMachine extends InventoryBlock { if (((IInventory) logic).getStackInSlot(1) != null) { - return lightValue[((IInventory) logic).getStackInSlot(1).itemID]; + ItemStack stack = ((IInventory) logic).getStackInSlot(1); + if (stack.itemID < 4096 && Block.blocksList[stack.itemID] != null) + return lightValue[stack.itemID]; } } } diff --git a/tconstruct/common/TContent.java b/tconstruct/common/TContent.java index da0b2c27..3b151099 100644 --- a/tconstruct/common/TContent.java +++ b/tconstruct/common/TContent.java @@ -942,7 +942,7 @@ public class TContent implements IFuelHandler TConstructRegistry.addToolMaterial(5, "Bone", 1, 200, 400, 1, 1.0F, 0, 0f, "\u00A7e", ""); TConstructRegistry.addToolMaterial(6, "Obsidian", 3, 89, 700, 2, 0.8F, 3, 0f, "\u00A7d", ""); TConstructRegistry.addToolMaterial(7, "Netherrack", 2, 131, 400, 1, 1.2F, 0, 1f, "\u00A74", "Stonebound"); - TConstructRegistry.addToolMaterial(8, "Slime", 3, 1500, 150, 0, 2.0F, 0, 0f, "\u00A7a", ""); + TConstructRegistry.addToolMaterial(8, "Slime", PHConstruct.miningLevelIncrease ? 3 : 0, 1500, 150, 0, 2.0F, 0, 0f, "\u00A7a", ""); TConstructRegistry.addToolMaterial(9, "Paper", 0, 30, 200, 0, 0.3F, 0, 0f, "\u00A7f", "Writable"); TConstructRegistry.addToolMaterial(10, "Cobalt", 4, 800, 1100, 3, 1.75F, 2, 0f, "\u00A73", ""); TConstructRegistry.addToolMaterial(11, "Ardite", 4, 600, 800, 3, 2.0F, 0, 2f, "\u00A74", "Stonebound"); @@ -951,7 +951,7 @@ public class TContent implements IFuelHandler TConstructRegistry.addToolMaterial(14, "Bronze", 2, 350, 700, 2, 1.3F, 1, 0f, "\u00A76", ""); TConstructRegistry.addToolMaterial(15, "Alumite", 4, 550, 800, 3, 1.3F, 2, 0f, "\u00A7d", ""); TConstructRegistry.addToolMaterial(16, "Steel", 4, 750, 800, 3, 1.3F, 2, 0f, "", ""); - TConstructRegistry.addToolMaterial(17, "BlueSlime", "Slime ", 1, 500, 150, 0, 1.5F, 0, 0f, "\u00A7b", ""); + TConstructRegistry.addToolMaterial(17, "BlueSlime", "Slime ", PHConstruct.miningLevelIncrease ? 1 : 0, 500, 150, 0, 1.5F, 0, 0f, "\u00A7b", ""); TConstructRegistry.addBowMaterial(0, 384, 20, 1.0f); //Wood TConstructRegistry.addBowMaterial(1, 10, 80, 0.2f); //Stone @@ -1474,12 +1474,16 @@ public class TContent implements IFuelHandler GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 3), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 2)); GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 4), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.wood, 1, 3)); GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 5), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', Block.chest); - GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 10), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 0)); - GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 11), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 1)); - GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 12), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 2)); - GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 13), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 3)); + if (PHConstruct.stencilTableCrafting) + { + GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 10), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 0)); + GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 11), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 1)); + GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 12), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 2)); + GameRegistry.addRecipe(new ItemStack(toolStationWood, 1, 13), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', new ItemStack(Block.planks, 1, 3)); + } GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolStationWood, 1, 1), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "logWood")); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolStationWood, 1, 10), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "plankWood")); + if (PHConstruct.stencilTableCrafting) + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolStationWood, 1, 10), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "plankWood")); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blankPattern, 1, 0), "ps", "sp", 'p', "plankWood", 's', "stickWood")); GameRegistry.addRecipe(new ItemStack(manualBook), "wp", 'w', new ItemStack(blankPattern, 1, 0), 'p', Item.paper); @@ -1629,7 +1633,7 @@ public class TContent implements IFuelHandler GameRegistry.addRecipe(new ItemStack(knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Item.leather), 'r', new ItemStack(toughRod, 1, 2), 'm', new ItemStack(materials, 1, 14)); //Armor - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(dryingRack, 1, 0), "bbb", 'b', "slabWood")); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(dryingRack, 1, 0), "bbb", 'b', "slabWood")); //Landmine GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(landmine, 1, 0), "mcm", "rpr", 'm', "plankWood", 'c', new ItemStack(blankPattern, 1, 1), 'r', Item.redstone, 'p', diff --git a/tconstruct/entity/projectile/ArrowEntity.java b/tconstruct/entity/projectile/ArrowEntity.java index 3a5580a0..4eae1edc 100644 --- a/tconstruct/entity/projectile/ArrowEntity.java +++ b/tconstruct/entity/projectile/ArrowEntity.java @@ -1,6 +1,7 @@ package tconstruct.entity.projectile; import java.util.List; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.crash.CrashReport; @@ -35,6 +36,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa public float mass; public int baseDamage; private float knockbackStrengthMod; + Random random = new Random(); public ArrowEntity(World par1World) { @@ -205,11 +207,6 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa damageInflicted += this.rand.nextInt(damageInflicted / 2 + 2); } - if (!worldObj.isRemote) - { - System.out.println("Speed: " + damageSpeed); - System.out.println("Damage: " + damageInflicted); - } DamageSource damagesource = null; if (this.shootingEntity == null) @@ -243,6 +240,10 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa } entity.setFire(fireAspect); } + + int drain = toolTags.getInteger("Necrotic") * 2; + if (drain > 0 && shootingEntity != null && shootingEntity instanceof EntityLiving) + ((EntityLiving) shootingEntity).heal(random.nextInt(drain + 1)); } if (movingobjectposition.entityHit.attackEntityFrom(damagesource, damageInflicted)) diff --git a/tconstruct/items/tools/Battleaxe.java b/tconstruct/items/tools/Battleaxe.java index 56db1d50..903d16d0 100644 --- a/tconstruct/items/tools/Battleaxe.java +++ b/tconstruct/items/tools/Battleaxe.java @@ -274,16 +274,24 @@ public class Battleaxe extends HarvestTool localMeta = world.getBlockMetadata(x, yPos, z); if (!player.capabilities.isCreativeMode) { + if (block.removeBlockByPlayer(world, player, x, yPos, z)) + { + block.onBlockDestroyedByPlayer(world, x, yPos, z, localMeta); + } block.harvestBlock(world, player, x, yPos, z, localMeta); - block.onBlockHarvested(world, x, y, z, localMeta, player); + block.onBlockHarvested(world, x, yPos, z, localMeta, player); onBlockDestroyed(stack, world, localblockID, x, yPos, z, player); } - world.setBlockToAir(x, yPos, z); + else + { + world.setBlockToAir(x, yPos, z); + } } } } } - + else + break; } if (!world.isRemote) world.playAuxSFX(2001, x, y, z, woodID + (meta << 12)); diff --git a/tconstruct/items/tools/Excavator.java b/tconstruct/items/tools/Excavator.java index 34c09e06..b8a1d555 100644 --- a/tconstruct/items/tools/Excavator.java +++ b/tconstruct/items/tools/Excavator.java @@ -214,12 +214,19 @@ public class Excavator extends HarvestTool { if (!player.capabilities.isCreativeMode) { + if (block.removeBlockByPlayer(world, player, xPos, yPos, zPos)) + { + block.onBlockDestroyedByPlayer(world, xPos, yPos, zPos, localMeta); + } block.harvestBlock(world, player, xPos, yPos, zPos, localMeta); - block.onBlockHarvested(world, x, y, z, localMeta, player); + block.onBlockHarvested(world, xPos, yPos, zPos, localMeta, player); if (blockHardness > 0f) onBlockDestroyed(stack, world, localblockID, xPos, yPos, zPos, player); } - world.setBlockToAir(xPos, yPos, zPos); + else + { + world.setBlockToAir(xPos, yPos, zPos); + } } } } diff --git a/tconstruct/items/tools/Hammer.java b/tconstruct/items/tools/Hammer.java index 6fb034a5..d6b2d4c3 100644 --- a/tconstruct/items/tools/Hammer.java +++ b/tconstruct/items/tools/Hammer.java @@ -294,7 +294,10 @@ public class Hammer extends HarvestTool if (blockHardness > 0f) onBlockDestroyed(stack, world, localblockID, xPos, yPos, zPos, player); } - world.setBlockToAir(xPos, yPos, zPos); + else + { + world.setBlockToAir(xPos, yPos, zPos); + } } } } @@ -324,41 +327,49 @@ public class Hammer extends HarvestTool { if (materials[i] == block.blockMaterial) { - float mineSpeed = tags.getInteger("MiningSpeed"); - int heads = 1; - if (tags.hasKey("MiningSpeed2")) - { - mineSpeed += tags.getInteger("MiningSpeed2"); - heads++; - } - - if (tags.hasKey("MiningSpeedHandle")) - { - mineSpeed += tags.getInteger("MiningSpeedHandle"); - heads++; - } - - if (tags.hasKey("MiningSpeedExtra")) - { - mineSpeed += tags.getInteger("MiningSpeedExtra"); - heads++; - } - float trueSpeed = mineSpeed / (heads * 300f); - int hlvl = MinecraftForge.getBlockHarvestLevel(block, meta, getHarvestType()); - int durability = tags.getInteger("Damage"); - - float stonebound = tags.getFloat("Shoddy"); - float bonusLog = (float) Math.log(durability / 216f + 1) * 2 * stonebound; - trueSpeed += bonusLog; - - if (hlvl <= tags.getInteger("HarvestLevel")) - return trueSpeed; - return 0.1f; + return getblockSpeed(tags, block, meta); } } + + /*if (block == Block.silverfish) + return getblockSpeed(tags, block, meta);*/ + return super.getStrVsBlock(stack, block, meta); } + float getblockSpeed (NBTTagCompound tags, Block block, int meta) + { + float mineSpeed = tags.getInteger("MiningSpeed"); + int heads = 1; + if (tags.hasKey("MiningSpeed2")) + { + mineSpeed += tags.getInteger("MiningSpeed2"); + heads++; + } + if (tags.hasKey("MiningSpeedHandle")) + { + mineSpeed += tags.getInteger("MiningSpeedHandle"); + heads++; + } + + if (tags.hasKey("MiningSpeedExtra")) + { + mineSpeed += tags.getInteger("MiningSpeedExtra"); + heads++; + } + float trueSpeed = mineSpeed / (heads * 300f); + int hlvl = MinecraftForge.getBlockHarvestLevel(block, meta, getHarvestType()); + int durability = tags.getInteger("Damage"); + + float stonebound = tags.getFloat("Shoddy"); + float bonusLog = (float) Math.log(durability / 72f + 1) * 2 * stonebound; + trueSpeed += bonusLog; + + if (hlvl <= tags.getInteger("HarvestLevel")) + return trueSpeed; + return 0.1f; + } + /*@Override public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boolean par5) { diff --git a/tconstruct/items/tools/LumberAxe.java b/tconstruct/items/tools/LumberAxe.java index 4da71c6d..e42439ce 100644 --- a/tconstruct/items/tools/LumberAxe.java +++ b/tconstruct/items/tools/LumberAxe.java @@ -180,6 +180,14 @@ public class LumberAxe extends HarvestTool if (!world.isRemote) world.playAuxSFX(2001, x, y, z, woodID + (meta << 12)); } + else if (wood.blockMaterial == Material.wood) + { + NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); + int meta = world.getBlockMetadata(x, y, z); + destroyWood(world, x, y, z, stack, tags, player); + if (!world.isRemote) + world.playAuxSFX(2001, x, y, z, woodID + (meta << 12)); + } return super.onBlockStartBreak(stack, x, y, z, player); } @@ -226,11 +234,18 @@ public class LumberAxe extends HarvestTool }*/ if (!player.capabilities.isCreativeMode) { + if (block.removeBlockByPlayer(world, player, xPos, yPos, zPos)) + { + block.onBlockDestroyedByPlayer(world, xPos, yPos, zPos, meta); + } block.harvestBlock(world, player, xPos, yPos, zPos, meta); - block.onBlockHarvested(world, x, y, z, meta, player); + block.onBlockHarvested(world, xPos, yPos, zPos, meta, player); onBlockDestroyed(stack, world, localblockID, xPos, yPos, zPos, player); } - world.setBlockToAir(xPos, yPos, zPos); + else + { + world.setBlockToAir(xPos, yPos, zPos); + } breakTree(world, xPos, yPos, zPos, stack, tags, bID, meta, player); } /*else diff --git a/tconstruct/items/tools/Scythe.java b/tconstruct/items/tools/Scythe.java index ca847bb6..9db0a854 100644 --- a/tconstruct/items/tools/Scythe.java +++ b/tconstruct/items/tools/Scythe.java @@ -183,13 +183,14 @@ public class Scythe extends Weapon if (materials[iter] == block.blockMaterial) { int localMeta = world.getBlockMetadata(xPos, yPos, zPos); + world.setBlockToAir(xPos, yPos, zPos); if (!player.capabilities.isCreativeMode) { + block.onBlockDestroyedByPlayer(world, x, y, z, meta); block.harvestBlock(world, player, xPos, yPos, zPos, localMeta); block.onBlockHarvested(world, x, y, z, localMeta, player); onBlockDestroyed(stack, world, localblockID, xPos, yPos, zPos, player); } - world.setBlockToAir(xPos, yPos, zPos); } } } diff --git a/tconstruct/items/tools/Shortbow.java b/tconstruct/items/tools/Shortbow.java index a1f77568..90e1654a 100644 --- a/tconstruct/items/tools/Shortbow.java +++ b/tconstruct/items/tools/Shortbow.java @@ -2,9 +2,6 @@ package tconstruct.items.tools; import java.util.List; -import tconstruct.common.TContent; -import tconstruct.library.tools.BowBase; - import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -12,6 +9,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import tconstruct.common.TContent; +import tconstruct.library.tools.BowBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/tconstruct/modifiers/ModDurability.java b/tconstruct/modifiers/ModDurability.java index 6d178839..cdd5003e 100644 --- a/tconstruct/modifiers/ModDurability.java +++ b/tconstruct/modifiers/ModDurability.java @@ -1,8 +1,9 @@ package tconstruct.modifiers; -import tconstruct.library.tools.ToolMod; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import tconstruct.library.tools.ToolMod; +import tconstruct.util.PHConstruct; /* Adds an integer NBTTag */ @@ -53,9 +54,12 @@ public class ModDurability extends ToolMod tags.setInteger("BonusDurability", bonus); tags.setFloat("ModDurability", modDur); - int mLevel = tags.getInteger("HarvestLevel"); - if (mLevel < miningLevel) - tags.setInteger("HarvestLevel", miningLevel); + if (PHConstruct.miningLevelIncrease) + { + int mLevel = tags.getInteger("HarvestLevel"); + if (mLevel < miningLevel) + tags.setInteger("HarvestLevel", miningLevel); + } int modifiers = tags.getInteger("Modifiers"); modifiers -= 1; diff --git a/tconstruct/util/PHConstruct.java b/tconstruct/util/PHConstruct.java index 9fb7c533..3fb8d4ae 100644 --- a/tconstruct/util/PHConstruct.java +++ b/tconstruct/util/PHConstruct.java @@ -66,6 +66,8 @@ public class PHConstruct miningLevelIncrease = config.get("Difficulty Changes", "Modifiers increase Mining Level", true).getBoolean(true); denyMattock = config.get("Difficulty Changes", "Deny creation of non-metal mattocks", false).getBoolean(false); harderBronze = config.get("Difficulty Changes", "Lower bronze output to 2 ingots", false).getBoolean(false); + stencilTableCrafting = config.get("Difficulty Changes", "Craft Stencil Tables", true).getBoolean(true); + miningLevelIncrease = config.get("Difficulty Changes", "Modifiers increase Mining Level", true).getBoolean(true); blueSlime = config.get("Mob Spawning", "Activate Blue Slime Spawns", true).getBoolean(true); blueSlimeWeight = config.get("Mob Spawning", "Spawn Weight for Blue Slime", 6).getInt(6); @@ -323,10 +325,10 @@ public class PHConstruct seaLevel = config.get("general", "Sea level", 64).getInt(64); - enableHealthRegen = config.get("Ultra Hardcore Changes", "Passive Health Regen", true).getBoolean(true); //Check - goldAppleRecipe = config.get("Ultra Hardcore Changes", "Change Crafting Recipes", false).getBoolean(false); //Check - dropPlayerHeads = config.get("Ultra Hardcore Changes", "Players drop heads on death", false).getBoolean(false); //Check - uhcGhastDrops = config.get("Ultra Hardcore Changes", "Change Ghast drops to Gold Ingots", false).getBoolean(false); //Check + enableHealthRegen = config.get("Ultra Hardcore Changes", "Passive Health Regen", true).getBoolean(true); + goldAppleRecipe = config.get("Ultra Hardcore Changes", "Change Crafting Recipes", false).getBoolean(false); + dropPlayerHeads = config.get("Ultra Hardcore Changes", "Players drop heads on death", false).getBoolean(false); + uhcGhastDrops = config.get("Ultra Hardcore Changes", "Change Ghast drops to Gold Ingots", false).getBoolean(false); worldBorder = config.get("Ultra Hardcore Changes", "Add World Border", false).getBoolean(false); worldBorderSize = config.get("Ultra Hardcore Changes", "World Border Radius", 1000).getInt(1000); freePatterns = config.get("Ultra Hardcore Changes", "Add Patterns to Pattern Chests", false).getBoolean(false); //Check diff --git a/tconstruct/util/player/TPlayerHandler.java b/tconstruct/util/player/TPlayerHandler.java index fd54478e..da53f976 100644 --- a/tconstruct/util/player/TPlayerHandler.java +++ b/tconstruct/util/player/TPlayerHandler.java @@ -35,9 +35,6 @@ public class TPlayerHandler implements IPlayerTracker { //System.out.println("Player: "+entityplayer); //Lookup player - /*TFoodStats food = new TFoodStats(); - food.readStats(entityplayer.foodStats); - entityplayer.foodStats = food*/; NBTTagCompound tags = entityplayer.getEntityData(); if (!tags.hasKey("TConstruct")) { @@ -86,7 +83,6 @@ public class TPlayerHandler implements IPlayerTracker entityplayer.addChatMessage("Warning: Cross-mod Exploit Present!"); } - TContent.modRecipes(); updatePlayerInventory(entityplayer, stats); } diff --git a/tconstruct/worldgen/village/VillageToolStationHandler.java b/tconstruct/worldgen/village/VillageToolStationHandler.java index 882e77be..7c9784b1 100644 --- a/tconstruct/worldgen/village/VillageToolStationHandler.java +++ b/tconstruct/worldgen/village/VillageToolStationHandler.java @@ -9,7 +9,6 @@ import cpw.mods.fml.common.registry.VillagerRegistry.IVillageCreationHandler; public class VillageToolStationHandler implements IVillageCreationHandler { - @Override public StructureVillagePieceWeight getVillagePieceWeight (Random random, int i) { @@ -27,5 +26,4 @@ public class VillageToolStationHandler implements IVillageCreationHandler { return ComponentToolWorkshop.buildComponent(startPiece, pieces, random, p1, p2, p3, p4, p5); } - }