diff --git a/assets/tinker/lang/en_US.xml b/assets/tinker/lang/en_US.xml
index 8cccdb30..84c75bc2 100644
--- a/assets/tinker/lang/en_US.xml
+++ b/assets/tinker/lang/en_US.xml
@@ -150,11 +150,16 @@
Aluminum Nugget
Fake Essence Crystal
Aluminum Brass Nugget
+<<<<<<< HEAD:assets/tinker/lang/en_US.xml
<<<<<<< HEAD:assets/tinker/lang/en_US.xml
Silky Cloth
Silky Jewel
=======
>>>>>>> Glass connected textures, experimental Thermal Expansion support, extra configs for Jadedcat:mods/tinker/resources/lang/en_US.xml
+=======
+ Silky Cloth
+ Silky Jewel
+>>>>>>> Crafting Station Start:mods/tinker/resources/lang/en_US.xml
Obsidian Nugget
Cobalt Nugget
Ardite Nugget
@@ -188,14 +193,20 @@
Igniter
Landmine
<<<<<<< HEAD:assets/tinker/lang/en_US.xml
+<<<<<<< HEAD:assets/tinker/lang/en_US.xml
+=======
+>>>>>>> Crafting Station Start:mods/tinker/resources/lang/en_US.xml
Punji Stick
Oak Barricade
Spruce Barricade
Birch Barricade
Jungle Barricade
+<<<<<<< HEAD:assets/tinker/lang/en_US.xml
Essence Extractor
=======
>>>>>>> Glass connected textures, experimental Thermal Expansion support, extra configs for Jadedcat:mods/tinker/resources/lang/en_US.xml
+=======
+>>>>>>> Crafting Station Start:mods/tinker/resources/lang/en_US.xml
Block of Cobalt
Block of Ardite
diff --git a/assets/tinker/manuals/firstday.xml b/assets/tinker/manuals/firstday.xml
index 42a7e46f..5f069fa4 100644
--- a/assets/tinker/manuals/firstday.xml
+++ b/assets/tinker/manuals/firstday.xml
@@ -98,26 +98,22 @@ The berries can be melted down into nuggets and ingots, making them an invaluabl
+
+A few traps or blockades may help with your early survival experience
+
+
-Materials and You: v1
+Punji Stick
- patternbook1
- two
+ punji
+ three
-Materials and You: v2
+Barricade
- patternbook2
- two
-
-
-
-
-Mighty Smelting
-
- patternbook3
+ barricade
two
@@ -157,59 +153,31 @@ Note: The Smeltery is required to process all metals, including iron.
+
+If you ever find yourself without this book, a new one is simple to make. Other books can be made from this one as well.
+
+
-Smeltery Drain
+Materials and You: v1
- smelterydrain
- three
+ patternbook1
+ two
-Lava Tank
+Materials and You: v2
- smelterytank1
- three
+ patternbook2
+ two
-Seared Glass
+Mighty Smelting
- smelterytank2
- three
-
-
-
-
-Seared Window
-
- smelterytank3
- three
-
-
-
-
-Seared Faucet
-
- smelteryfaucet
- three
-
-
-
-
-Casting Table
-
- smelterytable
- three
-
-
-
-
-Casting Basin
-
- smelterybasin
- three
+ patternbook3
+ two
diff --git a/assets/tinker/manuals/smeltery.xml b/assets/tinker/manuals/smeltery.xml
index 36f59ac5..6a6f9cc6 100644
--- a/assets/tinker/manuals/smeltery.xml
+++ b/assets/tinker/manuals/smeltery.xml
@@ -240,4 +240,20 @@ Part casts must be created by pouring metal around existing parts, like a pickax
searedstone
+
+Drawbridge
+
+ drawbridge
+ three
+
+
+
+
+Igniter
+
+ igniter
+ three
+
+
+
\ No newline at end of file
diff --git a/mods/tinker/textures/blocks/craftingstation_bottom.png b/mods/tinker/textures/blocks/craftingstation_bottom.png
new file mode 100644
index 00000000..0d2abb0a
Binary files /dev/null and b/mods/tinker/textures/blocks/craftingstation_bottom.png differ
diff --git a/mods/tinker/textures/blocks/craftingstation_side.png b/mods/tinker/textures/blocks/craftingstation_side.png
new file mode 100644
index 00000000..ca9429b8
Binary files /dev/null and b/mods/tinker/textures/blocks/craftingstation_side.png differ
diff --git a/mods/tinker/textures/blocks/craftingstation_top.png b/mods/tinker/textures/blocks/craftingstation_top.png
new file mode 100644
index 00000000..8d6bccfd
Binary files /dev/null and b/mods/tinker/textures/blocks/craftingstation_top.png differ
diff --git a/mods/tinker/textures/blocks/punji.png b/mods/tinker/textures/blocks/punji.png
new file mode 100644
index 00000000..b25debb2
Binary files /dev/null and b/mods/tinker/textures/blocks/punji.png differ
diff --git a/mods/tinker/textures/blocks/smeltery_furnace_off.png b/mods/tinker/textures/blocks/smeltery_furnace_off.png
new file mode 100644
index 00000000..de9b0116
Binary files /dev/null and b/mods/tinker/textures/blocks/smeltery_furnace_off.png differ
diff --git a/mods/tinker/textures/blocks/smeltery_furnace_on.png b/mods/tinker/textures/blocks/smeltery_furnace_on.png
new file mode 100644
index 00000000..aa10a92f
Binary files /dev/null and b/mods/tinker/textures/blocks/smeltery_furnace_on.png differ
diff --git a/mods/tinker/textures/gui/crafting.png b/mods/tinker/textures/gui/crafting.png
new file mode 100644
index 00000000..254daccd
Binary files /dev/null and b/mods/tinker/textures/gui/crafting.png differ
diff --git a/tconstruct/blocks/GolemHeadBlock.java b/tconstruct/blocks/GolemHeadBlock.java
index e18e4bae..c56b1b41 100644
--- a/tconstruct/blocks/GolemHeadBlock.java
+++ b/tconstruct/blocks/GolemHeadBlock.java
@@ -121,7 +121,8 @@ public class GolemHeadBlock extends Block
private boolean idIsInvalid (int i)
{
- return Block.blocksList[i] != null && (!Block.blocksList[i].renderAsNormalBlock() && i != TContent.golemCore.blockID || i == 43 || i == 44 || i == Block.chest.blockID);
+ //return Block.blocksList[i] != null && (!Block.blocksList[i].renderAsNormalBlock() && i != TContent.golemCore.blockID || i == 43 || i == 44 || i == Block.chest.blockID);
+ return false;
}
private boolean buildGolem (World world, int x, int y, int z, int metadata)
diff --git a/tconstruct/blocks/RedstoneMachine.java b/tconstruct/blocks/RedstoneMachine.java
index bd41bfbb..205bc235 100644
--- a/tconstruct/blocks/RedstoneMachine.java
+++ b/tconstruct/blocks/RedstoneMachine.java
@@ -45,11 +45,11 @@ public class RedstoneMachine extends InventoryBlock
{
TileEntity logic = world.getBlockTileEntity(x, y, z);
- if (logic != null && logic instanceof IInventory)
+ if (logic != null && logic instanceof DrawbridgeLogic)
{
- if (((IInventory) logic).getStackInSlot(1) != null)
+ if (((DrawbridgeLogic) logic).getStackInSlot(1) != null)
{
- ItemStack stack = ((IInventory) logic).getStackInSlot(1);
+ ItemStack stack = ((DrawbridgeLogic) logic).getStackInSlot(1);
if (stack.itemID < 4096 && Block.blocksList[stack.itemID] != null)
return lightValue[stack.itemID];
}
diff --git a/tconstruct/client/TProxyClient.java b/tconstruct/client/TProxyClient.java
index 89729dad..39e597ee 100644
--- a/tconstruct/client/TProxyClient.java
+++ b/tconstruct/client/TProxyClient.java
@@ -341,7 +341,6 @@ public class TProxyClient extends TProxyCommon
RenderingRegistry.registerBlockHandler(new PaneConnectedRender());
RenderingRegistry.registerBlockHandler(new RenderLandmine());
RenderingRegistry.registerBlockHandler(new PunjiRender());
- // RenderingRegistry.registerBlockHandler(new BrickRender());
// Special Renderers
ClientRegistry.bindTileEntitySpecialRenderer(CastingTableLogic.class, new CastingTableSpecialRenderer());
@@ -358,8 +357,6 @@ public class TProxyClient extends TProxyCommon
RenderingRegistry.registerEntityRenderingHandler(CartEntity.class, new CartRender());
RenderingRegistry.registerEntityRenderingHandler(DaggerEntity.class, new DaggerRenderCustom());
RenderingRegistry.registerEntityRenderingHandler(Crystal.class, new CrystalRender());
- // RenderingRegistry.registerEntityRenderingHandler(Skyla.class, new
- // SkylaRender());
RenderingRegistry.registerEntityRenderingHandler(MiniGardy.class, new MiniGardyRender());
RenderingRegistry.registerEntityRenderingHandler(Automaton.class, new CrystalGuardianRender());
RenderingRegistry.registerEntityRenderingHandler(LaunchedPotion.class, new LaunchedItemRender(Item.potion, 16384));
@@ -501,8 +498,8 @@ public class TProxyClient extends TProxyCommon
TConstructClientRegistry.registerManualIcon("toughrod", new ItemStack(TContent.toughRod, 1, 0));
TConstructClientRegistry.registerManualIcon("toughbinding", new ItemStack(TContent.toughBinding, 1, 17));
- TConstructClientRegistry.registerManualIcon("largeplate", new ItemStack(TContent.heavyPlate, 1, 17));
-
+ TConstructClientRegistry.registerManualIcon("largeplate", new ItemStack(TContent.largePlate, 1, 17));
+
TConstructClientRegistry.registerManualIcon("bowstring", new ItemStack(TContent.bowstring, 1, 0));
TConstructClientRegistry.registerManualIcon("arrowhead", new ItemStack(TContent.arrowhead, 1, 2));
TConstructClientRegistry.registerManualIcon("fletching", new ItemStack(TContent.fletching, 1, 0));
@@ -525,19 +522,21 @@ public class TProxyClient extends TProxyCommon
TConstructClientRegistry.registerManualIcon("frypanicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.frypanHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, ""));
TConstructClientRegistry.registerManualIcon("battlesignicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.signHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, ""));
TConstructClientRegistry.registerManualIcon("chiselicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.chiselHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, ""));
- TConstructClientRegistry.registerManualIcon("shortbowIcon", ToolBuilder.instance.buildTool(new ItemStack(TContent.toolRod, 1, 10), new ItemStack(TContent.bowstring, 1, 0), new ItemStack(TContent.toolRod, 1, 12), ""));
- TConstructClientRegistry.registerManualIcon("arrowIcon", ToolBuilder.instance.buildTool(new ItemStack(TContent.arrowhead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.fletching, 1, 0), ""));
+ TConstructClientRegistry.registerManualIcon("shortbowIcon",
+ ToolBuilder.instance.buildTool(new ItemStack(TContent.toolRod, 1, 10), new ItemStack(TContent.bowstring, 1, 0), new ItemStack(TContent.toolRod, 1, 12), ""));
+ TConstructClientRegistry.registerManualIcon("arrowIcon",
+ ToolBuilder.instance.buildTool(new ItemStack(TContent.arrowhead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.fletching, 1, 0), ""));
TConstructClientRegistry.registerManualIcon("hammericon", ToolBuilder.instance.buildTool(new ItemStack(TContent.hammerHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11), new ItemStack(
- TContent.heavyPlate, 1, 12), new ItemStack(TContent.heavyPlate, 8), ""));
+ TContent.largePlate, 1, 12), new ItemStack(TContent.largePlate, 8), ""));
TConstructClientRegistry.registerManualIcon("lumbericon", ToolBuilder.instance.buildTool(new ItemStack(TContent.broadAxeHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11), new ItemStack(
- TContent.heavyPlate, 1, 12), new ItemStack(TContent.toughBinding, 8), ""));
+ TContent.largePlate, 1, 12), new ItemStack(TContent.toughBinding, 8), ""));
TConstructClientRegistry.registerManualIcon("excavatoricon", ToolBuilder.instance.buildTool(new ItemStack(TContent.excavatorHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11),
- new ItemStack(TContent.heavyPlate, 1, 12), new ItemStack(TContent.toughBinding, 8), ""));
+ new ItemStack(TContent.largePlate, 1, 12), new ItemStack(TContent.toughBinding, 8), ""));
TConstructClientRegistry.registerManualIcon("scytheicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.scytheBlade, 1, 10), new ItemStack(TContent.toughRod, 1, 11), new ItemStack(
TContent.toughBinding, 1, 12), new ItemStack(TContent.toughRod, 8), ""));
TConstructClientRegistry.registerManualIcon("cleavericon", ToolBuilder.instance.buildTool(new ItemStack(TContent.largeSwordBlade, 1, 10), new ItemStack(TContent.toughRod, 1, 11),
- new ItemStack(TContent.heavyPlate, 1, 12), new ItemStack(TContent.toughRod, 8), ""));
+ new ItemStack(TContent.largePlate, 1, 12), new ItemStack(TContent.toughRod, 8), ""));
TConstructClientRegistry.registerManualIcon("battleaxeicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.broadAxeHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11),
new ItemStack(TContent.broadAxeHead, 1, 12), new ItemStack(TContent.toughBinding, 8), ""));
}
@@ -624,6 +623,22 @@ public class TProxyClient extends TProxyCommon
TConstructClientRegistry.registerManualLargeRecipe("smelteryfaucet", new ItemStack(TContent.searedBlock, 1, 1), searedbrick, null, searedbrick, null, searedbrick, null, null, null, null);
TConstructClientRegistry.registerManualLargeRecipe("smelterybasin", new ItemStack(TContent.searedBlock, 1, 2), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick,
searedbrick, searedbrick);
+
+ //Traps
+ ItemStack reed = new ItemStack(Item.reed);
+ TConstructClientRegistry.registerManualLargeRecipe("punji", new ItemStack(TContent.punji), reed, null, reed, null, reed, null, reed, null, reed);
+ TConstructClientRegistry.registerManualSmallRecipe("barricade", new ItemStack(TContent.barricadeOak), null, log, null, log);
+
+ //Machines
+ ItemStack alubrassIngot = new ItemStack(TContent.materials, 1, 14);
+ ItemStack bronzeIngot = new ItemStack(TContent.materials, 1, 13);
+ ItemStack blankCast = new ItemStack(TContent.blankPattern, 1, 1);
+ ItemStack redstone = new ItemStack(Item.redstone);
+
+ TConstructClientRegistry.registerManualLargeRecipe("drawbridge", new ItemStack(TContent.redstoneMachine, 1, 0), alubrassIngot, blankCast, alubrassIngot, bronzeIngot, new ItemStack(
+ Block.dispenser), bronzeIngot, bronzeIngot, redstone, bronzeIngot);
+ TConstructClientRegistry.registerManualLargeRecipe("igniter", new ItemStack(TContent.redstoneMachine, 1, 1), alubrassIngot, new ItemStack(TContent.largePlate, 1, 7), alubrassIngot,
+ bronzeIngot, new ItemStack(Item.flintAndSteel), bronzeIngot, bronzeIngot, redstone, bronzeIngot);
// Modifier recipes
ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TContent.pickaxeHead, 1, 6), new ItemStack(TContent.toolRod, 1, 2), new ItemStack(TContent.binding, 1, 6), "");
@@ -641,7 +656,7 @@ public class TProxyClient extends TProxyCommon
TConstructClientRegistry.registerManualModifier("blazemod", ironlongsword.copy(), new ItemStack(Item.blazePowder));
TConstructClientRegistry.registerManualModifier("necroticmod", ironlongsword.copy(), new ItemStack(TContent.materials, 1, 8));
TConstructClientRegistry.registerManualModifier("silkymod", ironpick.copy(), new ItemStack(TContent.materials, 1, 26));
- TConstructClientRegistry.registerManualModifier("reinforcedmod", ironpick.copy(), new ItemStack(TContent.heavyPlate, 1, 6));
+ TConstructClientRegistry.registerManualModifier("reinforcedmod", ironpick.copy(), new ItemStack(TContent.largePlate, 1, 6));
TConstructClientRegistry.registerManualModifier("pistonmod", ironlongsword.copy(), new ItemStack(Block.pistonBase));
TConstructClientRegistry.registerManualModifier("beheadingmod", ironlongsword.copy(), new ItemStack(Item.enderPearl), new ItemStack(Block.obsidian));
diff --git a/tconstruct/common/TContent.java b/tconstruct/common/TContent.java
index dee5ac3e..8283e3e0 100644
--- a/tconstruct/common/TContent.java
+++ b/tconstruct/common/TContent.java
@@ -1,48 +1,17 @@
package tconstruct.common;
import java.lang.reflect.Field;
-import java.util.*;
-
-import cpw.mods.fml.common.*;
-import cpw.mods.fml.common.event.FMLInterModComms;
-import cpw.mods.fml.common.registry.*;
-
-import tconstruct.TConstruct;
-import tconstruct.blocks.*;
-import tconstruct.blocks.logic.*;
-import tconstruct.blocks.slime.*;
-import tconstruct.blocks.traps.*;
-import tconstruct.client.StepSoundSlime;
-import tconstruct.entity.*;
-import tconstruct.entity.projectile.*;
-import tconstruct.items.*;
-import tconstruct.items.armor.*;
-import tconstruct.items.blocks.*;
-import tconstruct.items.tools.*;
-import tconstruct.landmine.block.BlockLandmine;
-import tconstruct.landmine.item.ItemBlockLandmine;
-import tconstruct.landmine.tileentity.TileEntityLandmine;
-import tconstruct.library.TConstructRegistry;
-import tconstruct.library.client.TConstructClientRegistry;
-import tconstruct.library.crafting.*;
-import tconstruct.library.tools.ToolCore;
-import tconstruct.library.util.IPattern;
-import tconstruct.modifiers.*;
-import tconstruct.util.*;
-
-import net.minecraft.block.*;
-import net.minecraft.block.material.*;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.*;
-import net.minecraft.item.crafting.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDispenser;
+import net.minecraft.block.StepSound;
import net.minecraft.block.material.MapColor;
import net.minecraft.block.material.Material;
import net.minecraft.block.material.MaterialLiquid;
import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.EnumCreatureType;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
@@ -50,15 +19,202 @@ import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraft.item.crafting.RecipesTools;
import net.minecraft.item.crafting.RecipesWeapons;
import net.minecraft.item.crafting.ShapedRecipes;
-
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.Potion;
import net.minecraft.util.WeightedRandomChestContent;
import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraftforge.common.*;
-import net.minecraftforge.fluids.*;
+import net.minecraftforge.common.BiomeDictionary;
+import net.minecraftforge.common.ChestGenHooks;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;
-import net.minecraftforge.oredict.*;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.oredict.OreDictionary;
+import net.minecraftforge.oredict.ShapedOreRecipe;
+import net.minecraftforge.oredict.ShapelessOreRecipe;
+import tconstruct.TConstruct;
+import tconstruct.blocks.Aggregator;
+import tconstruct.blocks.CraftingSlab;
+import tconstruct.blocks.CraftingStationBlock;
+import tconstruct.blocks.DryingRack;
+import tconstruct.blocks.EquipBlock;
+import tconstruct.blocks.EssenceExtractor;
+import tconstruct.blocks.GlassBlockConnected;
+import tconstruct.blocks.GlassBlockConnectedMeta;
+import tconstruct.blocks.GlassPane;
+import tconstruct.blocks.GlassPaneStained;
+import tconstruct.blocks.GravelOre;
+import tconstruct.blocks.LavaTankBlock;
+import tconstruct.blocks.LightCrystalBase;
+import tconstruct.blocks.LiquidMetalFinite;
+import tconstruct.blocks.MeatBlock;
+import tconstruct.blocks.MetalOre;
+import tconstruct.blocks.MultiBrick;
+import tconstruct.blocks.MultiBrickFancy;
+import tconstruct.blocks.OreberryBush;
+import tconstruct.blocks.OreberryBushEssence;
+import tconstruct.blocks.RedstoneMachine;
+import tconstruct.blocks.SearedBlock;
+import tconstruct.blocks.SearedSlab;
+import tconstruct.blocks.SlabBase;
+import tconstruct.blocks.SmelteryBlock;
+import tconstruct.blocks.SoilBlock;
+import tconstruct.blocks.SpeedBlock;
+import tconstruct.blocks.SpeedSlab;
+import tconstruct.blocks.StoneTorch;
+import tconstruct.blocks.TMetalBlock;
+import tconstruct.blocks.ToolForgeBlock;
+import tconstruct.blocks.ToolStationBlock;
+import tconstruct.blocks.logic.CastingBasinLogic;
+import tconstruct.blocks.logic.CastingTableLogic;
+import tconstruct.blocks.logic.CraftingStationLogic;
+import tconstruct.blocks.logic.DrawbridgeLogic;
+import tconstruct.blocks.logic.DryingRackLogic;
+import tconstruct.blocks.logic.EssenceExtractorLogic;
+import tconstruct.blocks.logic.FaucetLogic;
+import tconstruct.blocks.logic.FirestarterLogic;
+import tconstruct.blocks.logic.FrypanLogic;
+import tconstruct.blocks.logic.GlowstoneAggregator;
+import tconstruct.blocks.logic.LavaTankLogic;
+import tconstruct.blocks.logic.MultiServantLogic;
+import tconstruct.blocks.logic.PartBuilderLogic;
+import tconstruct.blocks.logic.PatternChestLogic;
+import tconstruct.blocks.logic.SmelteryDrainLogic;
+import tconstruct.blocks.logic.SmelteryLogic;
+import tconstruct.blocks.logic.StencilTableLogic;
+import tconstruct.blocks.logic.ToolForgeLogic;
+import tconstruct.blocks.logic.ToolStationLogic;
+import tconstruct.blocks.slime.SlimeFluid;
+import tconstruct.blocks.slime.SlimeGel;
+import tconstruct.blocks.slime.SlimeGrass;
+import tconstruct.blocks.slime.SlimeLeaves;
+import tconstruct.blocks.slime.SlimeSapling;
+import tconstruct.blocks.slime.SlimeTallGrass;
+import tconstruct.blocks.traps.BarricadeBlock;
+import tconstruct.blocks.traps.Punji;
+import tconstruct.client.StepSoundSlime;
+import tconstruct.entity.Automaton;
+import tconstruct.entity.BlueSlime;
+import tconstruct.entity.Crystal;
+import tconstruct.entity.FancyEntityItem;
+import tconstruct.entity.MiniGardy;
+import tconstruct.entity.SlimeClone;
+import tconstruct.entity.projectile.ArrowEntity;
+import tconstruct.entity.projectile.DaggerEntity;
+import tconstruct.entity.projectile.LaunchedPotion;
+import tconstruct.items.Bowstring;
+import tconstruct.items.CraftingItem;
+import tconstruct.items.DiamondApple;
+import tconstruct.items.EssenceCrystal;
+import tconstruct.items.FilledBucket;
+import tconstruct.items.Fletching;
+import tconstruct.items.GoldenHead;
+import tconstruct.items.Manual;
+import tconstruct.items.MaterialItem;
+import tconstruct.items.MetalPattern;
+import tconstruct.items.OreBerries;
+import tconstruct.items.Pattern;
+import tconstruct.items.StrangeFood;
+import tconstruct.items.TitleIcon;
+import tconstruct.items.ToolPart;
+import tconstruct.items.ToolPartHidden;
+import tconstruct.items.ToolShard;
+import tconstruct.items.armor.Glove;
+import tconstruct.items.armor.HeartCanister;
+import tconstruct.items.armor.Knapsack;
+import tconstruct.items.armor.TArmorBase;
+import tconstruct.items.blocks.BarricadeItem;
+import tconstruct.items.blocks.CraftedSoilItemBlock;
+import tconstruct.items.blocks.CraftingSlabItemBlock;
+import tconstruct.items.blocks.GlassBlockItem;
+import tconstruct.items.blocks.GlassPaneItem;
+import tconstruct.items.blocks.GravelOreItem;
+import tconstruct.items.blocks.LavaTankItemBlock;
+import tconstruct.items.blocks.LightCrystalItem;
+import tconstruct.items.blocks.MetalItemBlock;
+import tconstruct.items.blocks.MetalOreItemBlock;
+import tconstruct.items.blocks.MultiBrickFancyItem;
+import tconstruct.items.blocks.MultiBrickItem;
+import tconstruct.items.blocks.OreberryBushItem;
+import tconstruct.items.blocks.OreberryBushSecondItem;
+import tconstruct.items.blocks.RedstoneMachineItem;
+import tconstruct.items.blocks.SearedSlabItem;
+import tconstruct.items.blocks.SearedTableItemBlock;
+import tconstruct.items.blocks.SlimeGelItemBlock;
+import tconstruct.items.blocks.SlimeGrassItemBlock;
+import tconstruct.items.blocks.SlimeLeavesItemBlock;
+import tconstruct.items.blocks.SlimeSaplingItemBlock;
+import tconstruct.items.blocks.SlimeTallGrassItem;
+import tconstruct.items.blocks.SmelteryItemBlock;
+import tconstruct.items.blocks.SpeedBlockItem;
+import tconstruct.items.blocks.SpeedSlabItem;
+import tconstruct.items.blocks.StainedGlassClearItem;
+import tconstruct.items.blocks.StainedGlassClearPaneItem;
+import tconstruct.items.blocks.ToolForgeItemBlock;
+import tconstruct.items.blocks.ToolStationItemBlock;
+import tconstruct.items.blocks.WoolSlab1Item;
+import tconstruct.items.blocks.WoolSlab2Item;
+import tconstruct.items.tools.Arrow;
+import tconstruct.items.tools.BattleSign;
+import tconstruct.items.tools.Battleaxe;
+import tconstruct.items.tools.Broadsword;
+import tconstruct.items.tools.Chisel;
+import tconstruct.items.tools.Cleaver;
+import tconstruct.items.tools.Cutlass;
+import tconstruct.items.tools.Dagger;
+import tconstruct.items.tools.Excavator;
+import tconstruct.items.tools.FryingPan;
+import tconstruct.items.tools.Hammer;
+import tconstruct.items.tools.Hatchet;
+import tconstruct.items.tools.Longsword;
+import tconstruct.items.tools.LumberAxe;
+import tconstruct.items.tools.Mattock;
+import tconstruct.items.tools.Pickaxe;
+import tconstruct.items.tools.PotionLauncher;
+import tconstruct.items.tools.Rapier;
+import tconstruct.items.tools.Scythe;
+import tconstruct.items.tools.Shortbow;
+import tconstruct.items.tools.Shovel;
+import tconstruct.landmine.block.BlockLandmine;
+import tconstruct.landmine.item.ItemBlockLandmine;
+import tconstruct.landmine.tileentity.TileEntityLandmine;
+import tconstruct.library.TConstructRegistry;
+import tconstruct.library.client.TConstructClientRegistry;
+import tconstruct.library.crafting.Detailing;
+import tconstruct.library.crafting.DryingRackRecipes;
+import tconstruct.library.crafting.LiquidCasting;
+import tconstruct.library.crafting.PatternBuilder;
+import tconstruct.library.crafting.Smeltery;
+import tconstruct.library.crafting.ToolBuilder;
+import tconstruct.library.tools.ToolCore;
+import tconstruct.library.util.IPattern;
+import tconstruct.modifiers.ModAntiSpider;
+import tconstruct.modifiers.ModAttack;
+import tconstruct.modifiers.ModAutoSmelt;
+import tconstruct.modifiers.ModBlaze;
+import tconstruct.modifiers.ModButtertouch;
+import tconstruct.modifiers.ModDurability;
+import tconstruct.modifiers.ModElectric;
+import tconstruct.modifiers.ModExtraModifier;
+import tconstruct.modifiers.ModInteger;
+import tconstruct.modifiers.ModLapis;
+import tconstruct.modifiers.ModPiston;
+import tconstruct.modifiers.ModRedstone;
+import tconstruct.modifiers.ModReinforced;
+import tconstruct.modifiers.ModRepair;
+import tconstruct.modifiers.ModSmite;
+import tconstruct.modifiers.TActiveOmniMod;
+import tconstruct.util.PHConstruct;
+import tconstruct.util.RecipeRemover;
+import tconstruct.util.TDispenserBehaviorSpawnEgg;
+import cpw.mods.fml.common.IFuelHandler;
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.event.FMLInterModComms;
+import cpw.mods.fml.common.registry.EntityRegistry;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.LanguageRegistry;
public class TContent implements IFuelHandler
{
@@ -110,7 +266,7 @@ public class TContent implements IFuelHandler
public static Item binding;
public static Item toughBinding;
public static Item toughRod;
- public static Item heavyPlate;
+ public static Item largePlate;
public static Item pickaxeHead;
public static Item shovelHead;
@@ -142,7 +298,6 @@ public class TContent implements IFuelHandler
public static Block toolForge;
public static Block craftingStationWood;
public static Block craftingSlabWood;
-
public static Block heldItemBlock;
public static Block craftedSoil;
@@ -280,7 +435,6 @@ public class TContent implements IFuelHandler
public static Item corestone;
public static Item notebook;
public static Item note;
-
//Wearables
public static Item heavyHelmet;
public static Item heavyChestplate;
@@ -373,6 +527,11 @@ public class TContent implements IFuelHandler
toolForge = new ToolForgeBlock(PHConstruct.toolForge, Material.iron).setUnlocalizedName("ToolForge");
GameRegistry.registerBlock(toolForge, ToolForgeItemBlock.class, "ToolForgeBlock");
GameRegistry.registerTileEntity(ToolForgeLogic.class, "ToolForge");
+
+ craftingStationWood = new CraftingStationBlock(PHConstruct.woodCrafter, Material.wood).setUnlocalizedName("CraftingStation");
+ GameRegistry.registerBlock(craftingStationWood, "CraftingStation");
+ GameRegistry.registerTileEntity(CraftingStationLogic.class, "CraftingStation");
+ //public static Block craftingStationWood;
craftingStationWood = new CraftingStationBlock(PHConstruct.woodCrafter, Material.wood).setUnlocalizedName("CraftingStation");
GameRegistry.registerBlock(craftingStationWood, "CraftingStation");
@@ -438,9 +597,25 @@ public class TContent implements IFuelHandler
GameRegistry.registerTileEntity(DrawbridgeLogic.class, "Drawbridge");
GameRegistry.registerTileEntity(FirestarterLogic.class, "Firestarter");
+ //Traps
landmine = new BlockLandmine(PHConstruct.landmine).setHardness(0.5F).setResistance(0F).setStepSound(Block.soundMetalFootstep).setCreativeTab(TConstructRegistry.blockTab).setUnlocalizedName("landmine");
GameRegistry.registerBlock(landmine, ItemBlockLandmine.class, "Redstone.Landmine");
GameRegistry.registerTileEntity(TileEntityLandmine.class, "Landmine");
+
+ punji = new Punji(PHConstruct.punji).setUnlocalizedName("trap.punji");
+ GameRegistry.registerBlock(punji, "trap.punji");
+
+ barricadeOak = new BarricadeBlock(PHConstruct.barricadeOak, Block.wood, 0).setUnlocalizedName("trap.barricade.oak");
+ GameRegistry.registerBlock(barricadeOak, BarricadeItem.class, "trap.barricade.oak");
+
+ barricadeSpruce = new BarricadeBlock(PHConstruct.barricadeSpruce, Block.wood, 1).setUnlocalizedName("trap.barricade.spruce");
+ GameRegistry.registerBlock(barricadeSpruce, BarricadeItem.class, "trap.barricade.spruce");
+
+ barricadeBirch = new BarricadeBlock(PHConstruct.barricadeBirch, Block.wood, 2).setUnlocalizedName("trap.barricade.birch");
+ GameRegistry.registerBlock(barricadeBirch, BarricadeItem.class, "trap.barricade.birch");
+
+ barricadeJungle = new BarricadeBlock(PHConstruct.barricadeJungle, Block.wood, 3).setUnlocalizedName("trap.barricade.jungle");
+ GameRegistry.registerBlock(barricadeJungle, BarricadeItem.class, "trap.barricade.jungle");
essenceExtractor = new EssenceExtractor(PHConstruct.essenceExtractor).setHardness(12f).setUnlocalizedName("extractor.essence");
GameRegistry.registerBlock(essenceExtractor, "extractor.essence");
@@ -854,7 +1029,7 @@ public class TContent implements IFuelHandler
binding = new ToolPart(PHConstruct.binding, "_binding").setUnlocalizedName("tconstruct.Binding");
toughBinding = new ToolPart(PHConstruct.toughBinding, "_toughbind").setUnlocalizedName("tconstruct.ThickBinding");
toughRod = new ToolPart(PHConstruct.toughRod, "_toughrod").setUnlocalizedName("tconstruct.ThickRod");
- heavyPlate = new ToolPart(PHConstruct.largePlate, "_largeplate").setUnlocalizedName("tconstruct.LargePlate");
+ largePlate = new ToolPart(PHConstruct.largePlate, "_largeplate").setUnlocalizedName("tconstruct.LargePlate");
swordBlade = new ToolPart(PHConstruct.swordBlade, "_sword_blade").setUnlocalizedName("tconstruct.SwordBlade");
wideGuard = new ToolPart(PHConstruct.largeGuard, "_large_guard").setUnlocalizedName("tconstruct.LargeGuard");
@@ -877,7 +1052,7 @@ public class TContent implements IFuelHandler
arrowhead = new ToolPart(PHConstruct.arrowhead, "_arrowhead").setUnlocalizedName("tconstruct.Arrowhead");
fletching = new Fletching(PHConstruct.fletching).setUnlocalizedName("tconstruct.Fletching");
- Item[] toolParts = { toolRod, toolShard, pickaxeHead, shovelHead, hatchetHead, binding, toughBinding, toughRod, heavyPlate, swordBlade, wideGuard, handGuard, crossbar, knifeBlade, fullGuard,
+ Item[] toolParts = { toolRod, toolShard, pickaxeHead, shovelHead, hatchetHead, binding, toughBinding, toughRod, largePlate, swordBlade, wideGuard, handGuard, crossbar, knifeBlade, fullGuard,
frypanHead, signHead, chiselHead, scytheBlade, broadAxeHead, excavatorHead, largeSwordBlade, hammerHead, bowstring, fletching, arrowhead };
String[] toolPartStrings = { "toolRod", "toolShard", "pickaxeHead", "shovelHead", "hatchetHead", "binding", "toughBinding", "toughRod", "heavyPlate", "swordBlade", "wideGuard", "handGuard",
"crossbar", "knifeBlade", "fullGuard", "frypanHead", "signHead", "chiselHead", "scytheBlade", "broadAxeHead", "excavatorHead", "largeSwordBlade", "hammerHead", "bowstring",
@@ -1064,7 +1239,7 @@ public class TContent implements IFuelHandler
{
/* Tools */
patternOutputs = new Item[] { toolRod, pickaxeHead, shovelHead, hatchetHead, swordBlade, wideGuard, handGuard, crossbar, binding, frypanHead, signHead, knifeBlade, chiselHead, toughRod,
- toughBinding, heavyPlate, broadAxeHead, scytheBlade, excavatorHead, largeSwordBlade, hammerHead, fullGuard, null, null, arrowhead };
+ toughBinding, largePlate, broadAxeHead, scytheBlade, excavatorHead, largeSwordBlade, hammerHead, fullGuard, null, null, arrowhead };
int[] nonMetals = { 0, 1, 3, 4, 5, 6, 7, 8, 9, 17 };
@@ -1106,10 +1281,10 @@ public class TContent implements IFuelHandler
tb.addNormalToolRecipe(chisel, chiselHead, toolRod);
tb.addNormalToolRecipe(scythe, scytheBlade, toughRod, toughBinding, toughRod);
- tb.addNormalToolRecipe(lumberaxe, broadAxeHead, toughRod, heavyPlate, toughBinding);
- tb.addNormalToolRecipe(cleaver, largeSwordBlade, toughRod, heavyPlate, toughRod);
- tb.addNormalToolRecipe(excavator, excavatorHead, toughRod, heavyPlate, toughBinding);
- tb.addNormalToolRecipe(hammer, hammerHead, toughRod, heavyPlate, heavyPlate);
+ tb.addNormalToolRecipe(lumberaxe, broadAxeHead, toughRod, largePlate, toughBinding);
+ tb.addNormalToolRecipe(cleaver, largeSwordBlade, toughRod, largePlate, toughRod);
+ tb.addNormalToolRecipe(excavator, excavatorHead, toughRod, largePlate, toughBinding);
+ tb.addNormalToolRecipe(hammer, hammerHead, toughRod, largePlate, largePlate);
tb.addNormalToolRecipe(battleaxe, broadAxeHead, toughRod, broadAxeHead, toughBinding);
//tb.addNormalToolRecipe(shortbow, toolRod, bowstring, toolRod);
@@ -1177,7 +1352,7 @@ public class TContent implements IFuelHandler
tb.registerToolMod(new ModAntiSpider("Anti-Spider", new ItemStack[] { spidereyeball }, 15, 1));
tb.registerToolMod(new ModAntiSpider("Anti-Spider", new ItemStack[] { spidereyeball, spidereyeball }, 15, 2));
- ItemStack obsidianPlate = new ItemStack(heavyPlate, 1, 6);
+ ItemStack obsidianPlate = new ItemStack(largePlate, 1, 6);
tb.registerToolMod(new ModReinforced(new ItemStack[] { obsidianPlate }, 16, 1));
TConstructRegistry.registerActiveToolMod(new TActiveOmniMod());
@@ -1468,7 +1643,7 @@ public class TContent implements IFuelHandler
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(redstoneMachine, 1, 0), "aca", "#d#", "#r#", '#', "ingotBronze", 'a', "ingotAluminumBrass", 'c', new ItemStack(blankPattern, 1, 2),
'r', new ItemStack(Item.redstone), 'd', new ItemStack(Block.dispenser)));
- GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(redstoneMachine, 1, 1), "aca", "#d#", "#r#", '#', "ingotBronze", 'a', "ingotAluminumBrass", 'c', new ItemStack(heavyPlate, 1, 7), 'r',
+ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(redstoneMachine, 1, 1), "aca", "#d#", "#r#", '#', "ingotBronze", 'a', "ingotAluminumBrass", 'c', new ItemStack(largePlate, 1, 7), 'r',
new ItemStack(Item.redstone), 'd', new ItemStack(Item.flintAndSteel))); //Igniter
/* Crafting */
@@ -1687,12 +1862,10 @@ public class TContent implements IFuelHandler
//Traps
GameRegistry.addRecipe(new ItemStack(punji, 5, 0), "b b", " b ", "b b", 'b', new ItemStack(Item.reed));
-
GameRegistry.addRecipe(new ItemStack(barricadeOak, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 1, 0));
GameRegistry.addRecipe(new ItemStack(barricadeSpruce, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 1, 1));
GameRegistry.addRecipe(new ItemStack(barricadeBirch, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 1, 2));
GameRegistry.addRecipe(new ItemStack(barricadeJungle, 1, 0), "b", "b", 'b', new ItemStack(Block.wood, 1, 3));
-
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(barricadeOak, 1, 0), "b", "b", 'b', "logWood"));
GameRegistry.addRecipe(new ItemStack(craftingStationWood, 1, 0), "b", 'b', new ItemStack(Block.workbench));
@@ -2107,7 +2280,6 @@ public class TContent implements IFuelHandler
}
}
-
public static Object getStaticItem (String name, String classPackage)
{
try
diff --git a/tconstruct/common/TProxyCommon.java b/tconstruct/common/TProxyCommon.java
index 26d33222..0b7515ef 100644
--- a/tconstruct/common/TProxyCommon.java
+++ b/tconstruct/common/TProxyCommon.java
@@ -1,5 +1,9 @@
package tconstruct.common;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
import tconstruct.TConstruct;
import tconstruct.entity.MiniGardy;
import tconstruct.inventory.ArmorExtendedContainer;
@@ -9,10 +13,6 @@ import tconstruct.landmine.inventory.ContainerLandmine;
import tconstruct.landmine.tileentity.TileEntityLandmine;
import tconstruct.library.blocks.InventoryLogic;
import tconstruct.util.player.TPlayerStats;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
import cpw.mods.fml.common.network.IGuiHandler;
import cpw.mods.fml.common.registry.LanguageRegistry;
@@ -33,7 +33,6 @@ public class TProxyCommon implements IGuiHandler
public static int drawbridgeGui = 9;
public static int landmineGui = 10;
public static int craftingStationID = 11;
-
public static int inventoryGui = 100;
public static int armorGuiID = 101;
public static int knapsackGuiID = 102;
@@ -101,7 +100,6 @@ public class TProxyCommon implements IGuiHandler
@Override
public Object getClientGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z)
{
- // TODO Auto-generated method stub
return null;
}
diff --git a/tconstruct/entity/Automaton.java b/tconstruct/entity/Automaton.java
index 1aac42c4..0079f340 100644
--- a/tconstruct/entity/Automaton.java
+++ b/tconstruct/entity/Automaton.java
@@ -1,10 +1,10 @@
package tconstruct.entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.world.World;
import tconstruct.entity.ai.GAIAttackTarget;
import tconstruct.entity.ai.GAIFindTarget;
import tconstruct.entity.ai.GAIFollowOwner;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.World;
public class Automaton extends GolemBase
{
diff --git a/tconstruct/inventory/MiniGardyContainer.java b/tconstruct/inventory/MiniGardyContainer.java
index a77e9b6b..7f4cfa0d 100644
--- a/tconstruct/inventory/MiniGardyContainer.java
+++ b/tconstruct/inventory/MiniGardyContainer.java
@@ -1,11 +1,11 @@
package tconstruct.inventory;
-import tconstruct.entity.MiniGardy;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
+import tconstruct.entity.MiniGardy;
public class MiniGardyContainer extends Container
{
diff --git a/tconstruct/items/TitleIcon.java b/tconstruct/items/TitleIcon.java
index 487f7d91..19a944ba 100644
--- a/tconstruct/items/TitleIcon.java
+++ b/tconstruct/items/TitleIcon.java
@@ -2,10 +2,6 @@ package tconstruct.items;
import java.util.List;
-import tconstruct.client.TProxyClient;
-import tconstruct.entity.BlueSlime;
-import tconstruct.library.tools.ToolCore;
-
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
@@ -19,6 +15,9 @@ import net.minecraft.util.Facing;
import net.minecraft.util.Icon;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
+import tconstruct.client.TProxyClient;
+import tconstruct.entity.BlueSlime;
+import tconstruct.library.tools.ToolCore;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
diff --git a/tconstruct/items/tools/Battleaxe.java b/tconstruct/items/tools/Battleaxe.java
index 903d16d0..a49d094b 100644
--- a/tconstruct/items/tools/Battleaxe.java
+++ b/tconstruct/items/tools/Battleaxe.java
@@ -243,6 +243,9 @@ public class Battleaxe extends HarvestTool
@Override
public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player)
{
+ if (!stack.hasTagCompound())
+ return false;
+
World world = player.worldObj;
final int woodID = world.getBlockId(x, y, z);
final Block wood = Block.blocksList[woodID];
diff --git a/tconstruct/items/tools/Cleaver.java b/tconstruct/items/tools/Cleaver.java
index 26cd40b4..59d28e69 100644
--- a/tconstruct/items/tools/Cleaver.java
+++ b/tconstruct/items/tools/Cleaver.java
@@ -36,7 +36,7 @@ public class Cleaver extends Weapon
@Override
public Item getAccessoryItem ()
{
- return TContent.heavyPlate;
+ return TContent.largePlate;
}
@Override
diff --git a/tconstruct/items/tools/Excavator.java b/tconstruct/items/tools/Excavator.java
index b8a1d555..5f08b0a1 100644
--- a/tconstruct/items/tools/Excavator.java
+++ b/tconstruct/items/tools/Excavator.java
@@ -54,7 +54,7 @@ public class Excavator extends HarvestTool
@Override
public Item getAccessoryItem ()
{
- return TContent.heavyPlate;
+ return TContent.largePlate;
}
@Override
@@ -136,6 +136,9 @@ public class Excavator extends HarvestTool
@Override
public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player)
{
+ if (!stack.hasTagCompound())
+ return false;
+
World world = player.worldObj;
final int blockID = world.getBlockId(x, y, z);
final int meta = world.getBlockMetadata(x, y, z);
diff --git a/tconstruct/items/tools/Hammer.java b/tconstruct/items/tools/Hammer.java
index d6b2d4c3..88fe42c6 100644
--- a/tconstruct/items/tools/Hammer.java
+++ b/tconstruct/items/tools/Hammer.java
@@ -81,13 +81,13 @@ public class Hammer extends HarvestTool
@Override
public Item getAccessoryItem ()
{
- return TContent.heavyPlate;
+ return TContent.largePlate;
}
@Override
public Item getExtraItem ()
{
- return TContent.heavyPlate;
+ return TContent.largePlate;
}
public float getDurabilityModifier ()
@@ -208,6 +208,9 @@ public class Hammer extends HarvestTool
@Override
public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player)
{
+ if (!stack.hasTagCompound())
+ return false;
+
World world = player.worldObj;
final int blockID = world.getBlockId(x, y, z);
final int meta = world.getBlockMetadata(x, y, z);
diff --git a/tconstruct/items/tools/LumberAxe.java b/tconstruct/items/tools/LumberAxe.java
index 60c3a58f..f6f37997 100644
--- a/tconstruct/items/tools/LumberAxe.java
+++ b/tconstruct/items/tools/LumberAxe.java
@@ -135,6 +135,9 @@ public class LumberAxe extends HarvestTool
@Override
public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player)
{
+ if (!stack.hasTagCompound())
+ return false;
+
World world = player.worldObj;
final int woodID = world.getBlockId(x, y, z);
final Block wood = Block.blocksList[woodID];
@@ -154,7 +157,7 @@ public class LumberAxe extends HarvestTool
} while (!foundTop);
int numLeaves = 0;
- if (height - y < 30)
+ if (height - y < 50)
{
for (int xPos = x - 1; xPos <= x + 1; xPos++)
{
@@ -328,7 +331,7 @@ public class LumberAxe extends HarvestTool
@Override
public Item getAccessoryItem ()
{
- return TContent.heavyPlate;
+ return TContent.largePlate;
}
@Override
diff --git a/tconstruct/items/tools/Scythe.java b/tconstruct/items/tools/Scythe.java
index 9db0a854..374593bb 100644
--- a/tconstruct/items/tools/Scythe.java
+++ b/tconstruct/items/tools/Scythe.java
@@ -151,6 +151,9 @@ public class Scythe extends Weapon
@Override
public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPlayer player)
{
+ if (!stack.hasTagCompound())
+ return false;
+
World world = player.worldObj;
final int blockID = world.getBlockId(x, y, z);
final int meta = world.getBlockMetadata(x, y, z);
diff --git a/tconstruct/library/tools/AbilityHelper.java b/tconstruct/library/tools/AbilityHelper.java
index 4ae4876e..5c777268 100644
--- a/tconstruct/library/tools/AbilityHelper.java
+++ b/tconstruct/library/tools/AbilityHelper.java
@@ -7,11 +7,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Random;
-import tconstruct.library.ActiveToolMod;
-import tconstruct.library.TConstructRegistry;
-import tconstruct.library.util.PiercingEntityDamage;
-
-
import net.minecraft.block.Block;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.enchantment.EnchantmentThorns;
@@ -20,6 +15,7 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.monster.EntityCreeper;
import net.minecraft.entity.monster.EntityGhast;
+import net.minecraft.entity.monster.IMob;
import net.minecraft.entity.passive.EntityWolf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -39,6 +35,10 @@ import net.minecraftforge.common.FakePlayer;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.Event.Result;
import net.minecraftforge.event.entity.player.UseHoeEvent;
+import tconstruct.library.ActiveToolMod;
+import tconstruct.library.TConstructRegistry;
+import tconstruct.library.util.PiercingEntityDamage;
+import tconstruct.util.PHConstruct;
public class AbilityHelper
{
@@ -206,9 +206,12 @@ public class AbilityHelper
}
//damageTool(stack, 1, player, false);
tool.onEntityDamaged(player.worldObj, player, entity);
- int drain = toolTags.getInteger("Necrotic") * 2;
- if (drain > 0)
- player.heal(random.nextInt(drain + 1));
+ if (!PHConstruct.necroticUHS || (entity instanceof IMob && entity instanceof EntityLivingBase && ((EntityLivingBase) entity).func_110143_aJ() <= 0))
+ {
+ int drain = toolTags.getInteger("Necrotic") * 2;
+ if (drain > 0)
+ player.heal(random.nextInt(drain + 1));
+ }
if (knockback > 0)
{
diff --git a/tconstruct/util/PHConstruct.java b/tconstruct/util/PHConstruct.java
index a8aff134..c22b4035 100644
--- a/tconstruct/util/PHConstruct.java
+++ b/tconstruct/util/PHConstruct.java
@@ -56,7 +56,7 @@ public class PHConstruct
enableTSlime = config.get("Difficulty Changes", "Enable mod slime tools", true).getBoolean(true);
enableTPaper = config.get("Difficulty Changes", "Enable mod paper tools", true).getBoolean(true);
enableTBlueSlime = config.get("Difficulty Changes", "Enable mod blue slime tools", true).getBoolean(true);
-
+
craftMetalTools = config.get("Difficulty Changes", "Craft metals with Wood Patterns", false).getBoolean(false);
vanillaMetalBlocks = config.get("Difficulty Changes", "Craft vanilla metal blocks", true).getBoolean(true);
lavaFortuneInteraction = config.get("Difficulty Changes", "Enable Auto-Smelt and Fortune interaction", true).getBoolean(true);
@@ -73,6 +73,7 @@ public class PHConstruct
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);
+ //1467-1489
woodStation = config.getBlock("Wood Tool Station", 1471).getInt(1471);
heldItemBlock = config.getBlock("Held Item Block", 1472).getInt(1472);
lavaTank = config.getBlock("Lava Tank", 1473).getInt(1473);
@@ -96,13 +97,13 @@ public class PHConstruct
landmine = config.getBlock("Landmine", 1470).getInt(1470);
toolForge = config.getBlock("Tool Forge", 1468).getInt(1468);
multiBrickFancy = config.getBlock("Multi Brick Fancy", 1467).getInt(1467);
-
+
barricadeOak = config.getBlock("Oak Barricade", 1469).getInt(1469);
barricadeSpruce = config.getBlock("Spruce Barricade", 1482).getInt(1482);
barricadeBirch = config.getBlock("Birch Barricade", 1483).getInt(1483);
barricadeJungle = config.getBlock("Jungle Barricade", 1487).getInt(1487);
-
- //Thermal Expansion
+
+ //Thermal Expansion
moltenSilver = config.getBlock("Molten Silver", 3195).getInt(3195);
moltenLead = config.getBlock("Molten Lead", 3196).getInt(3196);
moltenNickel = config.getBlock("Molten Nickel", 3197).getInt(3197);
@@ -128,6 +129,7 @@ public class PHConstruct
blood = config.getBlock("Liquid Cow", 3217).getInt(3217);
moltenEnder = config.getBlock("Molten Ender", 3218).getInt(3218);
+ //3221+
aggregator = config.getBlock("Aggregator", 3221).getInt(3221);
lightCrystalBase = config.getBlock("Light Crystal", 3222).getInt(3222);
glass = config.getBlock("Clear Glass", 3223).getInt(3223);
@@ -137,34 +139,28 @@ public class PHConstruct
dryingRack = config.getBlock("Drying Rack", 3227).getInt(3227);
glassPane = config.getBlock("Glass Pane", 3228).getInt(3228);
stainedGlassClearPane = config.getBlock("Clear Stained Glass Pane", 3229).getInt(3229);
-
+
searedSlab = config.getBlock("Seared Slab", 3230).getInt(3230);
speedSlab = config.getBlock("Speed Slab", 3231).getInt(3231);
//grassSlab = config.getBlock("Grass Slab", 3230).getInt(3230);
-
+
punji = config.getBlock("Punji", 3232).getInt(3232);
woodCrafter = config.getBlock("Crafting Station", 3233).getInt(3233);
essenceExtractor = config.getBlock("Essence Extractor", 3234).getInt(3234);
-
+
slimePoolBlue = config.getBlock("Liquid Blue Slime", 3235).getInt(3235);
slimeGel = config.getBlock("Congealed Slime", 3237).getInt(3237);
slimeGrass = config.getBlock("Slime Grass", 3238).getInt(3238);
slimeTallGrass = config.getBlock("Slime Tall Grass", 3239).getInt(3239);
slimeLeaves = config.getBlock("Slime Grass Leaves", 3240).getInt(3240);
slimeSapling = config.getBlock("Slime Tree Sapling", 3241).getInt(3241);
-
+
meatBlock = config.getBlock("Meat Block", 3242).getInt(3242);
woodCrafterSlab = config.getBlock("Crafting Slab", 3243).getInt(3243);
woolSlab1 = config.getBlock("Wool Slab 1", 3244).getInt(3244);
woolSlab2 = config.getBlock("Wool Slab 2", 3245).getInt(3245);
castingChannel = config.getBlock("Casting Channel", 3249).getInt(3249);
- /*golemCore = config.getBlock("Golem Core", 1481).getInt(1481);
- golemHead = config.getBlock("Golem Head", 1482).getInt(1482);*/
- //golemPedestal = config.getBlock("Golem Pedestal", 1483).getInt(1483);
- //redstoneBallRepeater = config.getBlock("Redstone Ball Repeater", 1483).getInt(1483);
- //netherOreBerry = config.getBlock("Ore Berry Nether", 1487).getInt(1487);
-
manual = config.getItem("Patterns and Misc", "Tinker's Manual", 14018).getInt(14018);
blankPattern = config.getItem("Patterns and Misc", "Blank Patterns", 14019).getInt(14019);
materials = config.getItem("Patterns and Misc", "Materials", 14020).getInt(14020);
@@ -332,8 +328,9 @@ public class PHConstruct
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
-
+ freePatterns = config.get("Ultra Hardcore Changes", "Add Patterns to Pattern Chests", false).getBoolean(false);
+ necroticUHS = config.get("Ultra Hardcore Changes", "Necrotic modifier only heals on hostile mob kills", false).getBoolean(false);
+
//Slime pools
islandRarity = config.get("Worldgen", "Slime Island Rarity", 1450).getInt(1450);
@@ -341,7 +338,7 @@ public class PHConstruct
Property conTexMode = config.get("Looks", "Connected Textures Enabled", true);
conTexMode.comment = "0 = disabled, 1 = enabled, 2 = enabled + ignore stained glass meta";
connectedTexturesMode = conTexMode.getInt(2);
-
+
/* Save the configuration file */
config.save();
@@ -361,7 +358,7 @@ public class PHConstruct
public static int heldItemBlock;
public static int woodCrafter;
public static int woodCrafterSlab;
-
+
public static int ores;
public static int lavaTank;
public static int smeltery;
@@ -375,10 +372,6 @@ public class PHConstruct
public static int redstoneMachine;
public static int dryingRack;
- /*public static int golemCore;
- public static int golemHead;
- public static int golemPedestal;*/
-
//Crops
public static int oreBerry;
public static int oreBerrySecond;
@@ -409,7 +402,7 @@ public class PHConstruct
//Liquids
public static int metalFlowing;
public static int metalStill;
-
+
public static int moltenIron;
public static int moltenGold;
public static int moltenCopper;
@@ -434,7 +427,7 @@ public class PHConstruct
public static int moltenShiny;
public static int moltenInvar;
public static int moltenElectrum;
-
+
//Slime
public static int slimePoolBlue;
public static int slimeGel;
@@ -637,7 +630,7 @@ public class PHConstruct
public static boolean stencilTableCrafting;
public static boolean miningLevelIncrease;
public static boolean denyMattock;
-
+
//Ultra Hardcore modifiers
public static boolean enableHealthRegen;
public static boolean goldAppleRecipe;
@@ -647,6 +640,7 @@ public class PHConstruct
public static int worldBorderSize;
public static boolean freePatterns;
public static int goldHead;
+ public static boolean necroticUHS;
//Superfun
public static boolean superfunWorld;
@@ -654,9 +648,9 @@ public class PHConstruct
public static boolean gregtech;
public static boolean lavaFortuneInteraction;
-
+
public static int islandRarity;
-
+
//Looks
public static int connectedTexturesMode;
}
diff --git a/tconstruct/util/player/TPlayerHandler.java b/tconstruct/util/player/TPlayerHandler.java
index da53f976..66625b43 100644
--- a/tconstruct/util/player/TPlayerHandler.java
+++ b/tconstruct/util/player/TPlayerHandler.java
@@ -71,7 +71,7 @@ public class TPlayerHandler implements IPlayerTracker
playerStats.put(entityplayer.username, stats);
- if (PHConstruct.gregtech)
+ if (PHConstruct.gregtech && Loader.isModLoaded("GregTech-Addon"))
{
PHConstruct.gregtech = false;
if (PHConstruct.lavaFortuneInteraction)
diff --git a/test/EncodingSequence.java b/test/EncodingSequence.java
deleted file mode 100644
index ca6c7544..00000000
--- a/test/EncodingSequence.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package test;
-
-public class EncodingSequence
-{
-
-}
diff --git a/test/Trait.java b/test/Trait.java
deleted file mode 100644
index 23342145..00000000
--- a/test/Trait.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package test;
-
-import java.util.Random;
-
-//Quantitive Trait Locus
-public class Trait
-{
- protected int[] alleles;
- static Random rand = new Random();
-
- public int getAverage ()
- {
- int average = 0;
-
- if (alleles.length > 0)
- {
- for (byte i = 0; i < alleles.length; i++)
- average += alleles[i];
-
- average /= alleles.length;
- }
-
- return average;
- }
-
- public int[] breed (byte[] other, float[] mutation)
- {
- assert alleles.length == other.length : "Complete trait arrays need to have identical length";
-
- int[] result = new int[alleles.length > other.length ? alleles.length : other.length];
-
- for (int i = 0; i < result.length; i++)
- {
- if (rand.nextFloat() < mutation[0])
- {
- result[i] = mutate(alleles[i], other[i], mutation[1]);
- }
- else
- {
- result[i] = rand.nextBoolean() ? alleles[i] : other[i];
- }
- }
-
- return result;
- }
-
- //Assumes linear progression from worst to best. Use other methods for other types
- protected int mutate (int allele, int other, float variance)
- {
- int mutator = rand.nextBoolean() ? allele : other;
- double bellcurve = rand.nextGaussian();
- double offset = variance * bellcurve;
- offset -= offset / 2;
-
- if (mutator + offset < 0)
- mutator = 0;
- else if (mutator + offset > Integer.MAX_VALUE)
- mutator = Integer.MAX_VALUE;
- else
- mutator = (int) (mutator + offset);
-
- return mutator;
- }
-}