upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-10-26 14:33:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move golden head to World and fix double-creation that derped the registration. #881

Browse Source
This commit is contained in:
Bernhard Bonigl committed 2014-08-21 20:42:13 +02:00
1 parent 9490b1aff6
commit 5b8484d2dc
4 files changed
+10 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/tconstruct/armor/TinkerArmor.java
-1
View File
@@ -118,7 +118,6 @@ public class TinkerArmor
// glove = new
// Glove(PHConstruct.glove).setUnlocalizedName("tconstruct.Glove");
TinkerArmor.knapsack = new Knapsack().setUnlocalizedName("tconstruct.storage");
TinkerTools.goldHead = new GoldenHead(4, 1.2F, false).setAlwaysEdible().setPotionEffect(Potion.regeneration.id, 10, 0, 1.0F).setUnlocalizedName("goldenhead");
// GameRegistry.registerItem(TRepo.heavyHelmet, "heavyHelmet");
GameRegistry.registerItem(TinkerArmor.heartCanister, "heartCanister");
// GameRegistry.registerItem(TRepo.heavyBoots, "heavyBoots");
src/main/java/tconstruct/smeltery/TinkerSmeltery.java
+2 -1
View File
@@ -1101,7 +1101,8 @@ public class TinkerSmeltery
tableCasting.addCastingRecipe(new ItemStack(Items.golden_apple, 1), goldAmount, new ItemStack(Items.apple), true, 50);
tableCasting.addCastingRecipe(new ItemStack(Items.golden_carrot, 1), goldAmount, new ItemStack(Items.carrot), true, 50);
tableCasting.addCastingRecipe(new ItemStack(Items.speckled_melon, 1), goldAmount, new ItemStack(Items.melon), true, 50);
tableCasting.addCastingRecipe(new ItemStack(TinkerTools.goldHead), goldAmount, new ItemStack(Items.skull, 1, 3), true, 50);
if(TinkerWorld.goldHead != null)
tableCasting.addCastingRecipe(new ItemStack(TinkerWorld.goldHead), goldAmount, new ItemStack(Items.skull, 1, 3), true, 50);
}
protected static void addRecipesForBasinCasting ()
src/main/java/tconstruct/tools/TinkerTools.java
-3
View File
@@ -186,7 +186,6 @@ public class TinkerTools
public static Item manualBook;
public static ToolCore excavator;
public static Item creativeModifier;
public static Item goldHead;
// recipe stuff
public static boolean thaumcraftAvailable;
@@ -337,8 +336,6 @@ public class TinkerTools
// compat
TConstructRegistry.addItemToDirectory(toolPartStrings[i], toolParts[i]);
}
goldHead = new GoldenHead(4, 1.2F, false).setAlwaysEdible().setPotionEffect(Potion.regeneration.id, 10, 0, 1.0F).setUnlocalizedName("goldenhead");
GameRegistry.registerItem(TinkerTools.goldHead, "goldHead");
TinkerTools.creativeModifier = new CreativeModifier().setUnlocalizedName("tconstruct.modifier.creative");
GameRegistry.registerItem(TinkerTools.creativeModifier, "creativeModifier");
src/main/java/tconstruct/world/TinkerWorld.java
+8 -1
View File
@@ -14,6 +14,7 @@ import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraft.potion.Potion;
import net.minecraft.util.WeightedRandomChestContent;
import net.minecraftforge.common.ChestGenHooks;
import net.minecraftforge.common.MinecraftForge;
@@ -78,6 +79,7 @@ import tconstruct.world.itemblocks.SlimeSaplingItemBlock;
import tconstruct.world.itemblocks.SlimeTallGrassItem;
import tconstruct.world.itemblocks.WoolSlab1Item;
import tconstruct.world.itemblocks.WoolSlab2Item;
import tconstruct.world.items.GoldenHead;
import tconstruct.world.items.OreBerries;
import tconstruct.world.items.StrangeFood;
import cpw.mods.fml.common.Mod.Instance;
@@ -134,6 +136,8 @@ public class TinkerWorld
public static ChestGenHooks tinkerHousePatterns;
public static Block punji;
public static Block metalBlock;
// Morbid
public static Item goldHead;
@Handler
public void preInit (FMLPreInitializationEvent event)
@@ -251,6 +255,9 @@ public class TinkerWorld
GameRegistry.registerBlock(TinkerWorld.woodenRail, "rail.wood");
//Items
goldHead = new GoldenHead(4, 1.2F, false).setAlwaysEdible().setPotionEffect(Potion.regeneration.id, 10, 0, 1.0F).setUnlocalizedName("goldenhead");
GameRegistry.registerItem(goldHead, "goldHead");
TinkerWorld.strangeFood = new StrangeFood().setUnlocalizedName("tconstruct.strangefood");
TinkerWorld.oreBerries = new OreBerries().setUnlocalizedName("oreberry");
@@ -407,7 +414,7 @@ public class TinkerWorld
//GameRegistry.addRecipe(new ItemStack(Blocks.light_weighted_pressure_plate, 0, 1), "ii", 'i', aluBrass);
// Ultra hardcore recipes
GameRegistry.addRecipe(new ItemStack(TinkerTools.goldHead), patSurround, '#', new ItemStack(Items.gold_ingot), 'm', new ItemStack(Items.skull, 1, 3));
GameRegistry.addRecipe(new ItemStack(goldHead), patSurround, '#', new ItemStack(Items.gold_ingot), 'm', new ItemStack(Items.skull, 1, 3));
// Wool Slab Recipes