mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-20 12:19:48 +00:00
Merge branch 'armor' of https://github.com/mDiyo/TinkersConstruct
This commit is contained in:
1 parent
6a7b576deb
commit
7076c78782
24 files changed
+887
-91
No files matched your search
@@ -4,7 +4,6 @@ import cpw.mods.fml.common.*;
|
||||
import cpw.mods.fml.common.event.FMLInterModComms;
|
||||
import cpw.mods.fml.common.registry.*;
|
||||
import java.lang.reflect.Field;
|
||||
|
||||
import java.util.*;
|
||||
import net.minecraft.block.*;
|
||||
import net.minecraft.block.material.*;
|
||||
@@ -48,6 +47,7 @@ public class TContent implements IFuelHandler
|
||||
public static Item toolShard;
|
||||
public static Item woodPattern;
|
||||
public static Item metalPattern;
|
||||
public static Item armorPattern;
|
||||
|
||||
public static Item manualBook;
|
||||
public static Item buckets;
|
||||
@@ -264,6 +264,9 @@ public class TContent implements IFuelHandler
|
||||
public static ChestGenHooks tinkerHouseChest;
|
||||
public static ChestGenHooks tinkerHousePatterns;
|
||||
|
||||
//Temporary items
|
||||
//public static Item armorTest = new ArmorStandard(2445, 4, EnumArmorPart.HELMET).setCreativeTab(CreativeTabs.tabAllSearch);
|
||||
|
||||
public TContent()
|
||||
{
|
||||
registerItems();
|
||||
@@ -765,10 +768,12 @@ public class TContent implements IFuelHandler
|
||||
toolShard = new ToolShard(PHConstruct.toolShard, "_chunk").setUnlocalizedName("tconstruct.ToolShard");
|
||||
woodPattern = new Pattern(PHConstruct.woodPattern, "WoodPattern", "pattern_", "materials/").setUnlocalizedName("tconstruct.Pattern");
|
||||
metalPattern = new MetalPattern(PHConstruct.metalPattern, "MetalPattern", "cast_", "materials/").setUnlocalizedName("tconstruct.MetalPattern");
|
||||
|
||||
armorPattern = new ArmorPattern(PHConstruct.armorPattern, "ArmorPattern", "armorcast_", "materials/").setUnlocalizedName("tconstruct.ArmorPattern");
|
||||
|
||||
TConstructRegistry.addItemToDirectory("blankPattern", blankPattern);
|
||||
TConstructRegistry.addItemToDirectory("woodPattern", woodPattern);
|
||||
TConstructRegistry.addItemToDirectory("metalPattern", metalPattern);
|
||||
TConstructRegistry.addItemToDirectory("armorPattern", armorPattern);
|
||||
|
||||
String[] patternTypes = { "ingot", "toolRod", "pickaxeHead", "shovelHead", "hatchetHead", "swordBlade", "wideGuard", "handGuard", "crossbar", "binding", "frypanHead", "signHead",
|
||||
"knifeBlade", "chiselHead", "toughRod", "toughBinding", "largePlate", "broadAxeHead", "scytheHead", "excavatorHead", "largeBlade", "hammerHead", "fullGuard" };
|
||||
@@ -781,6 +786,10 @@ public class TContent implements IFuelHandler
|
||||
{
|
||||
TConstructRegistry.addItemStackToDirectory(patternTypes[i] + "Cast", new ItemStack(metalPattern, 1, i));
|
||||
}
|
||||
String[] armorPartTypes = { "helmet", "chestplate", "leggings", "boots" };
|
||||
for (int i = 1; i < armorPartTypes.length; i++) {
|
||||
TConstructRegistry.addItemStackToDirectory(armorPartTypes[i] + "Cast", new ItemStack(armorPattern, 1, i));
|
||||
}
|
||||
|
||||
manualBook = new Manual(PHConstruct.manual);
|
||||
buckets = new FilledBucket(PHConstruct.buckets);
|
||||
@@ -1261,6 +1270,9 @@ public class TContent implements IFuelHandler
|
||||
basinCasting.addCastingRecipe(new ItemStack(Block.whiteStone), new FluidStack(moltenEnderFluid, 25), new ItemStack(Block.obsidian), true, 100); //endstone
|
||||
basinCasting.addCastingRecipe(new ItemStack(metalBlock.blockID, 1, 10), new FluidStack(moltenEnderFluid, 1000), null, true, 100); //ender
|
||||
|
||||
//TODO TEST
|
||||
// basinCasting.addCastingRecipe(new ItemStack(armorTest), new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue * 24), new ItemStack(armorPattern, 1, 0), false, 100, new FluidRenderProperties(0.5F, 0.575F, 0.15F, 0.85F, 0.15F, 0.85F));
|
||||
|
||||
//Ore
|
||||
Smeltery.addMelting(Block.oreIron, 0, 600, new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue * 2));
|
||||
Smeltery.addMelting(Block.oreGold, 0, 400, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2));
|
||||
|
||||
Reference in new issue
Block a user