|
@@ -1,6 +1,7 @@
|
|
|
package me.km.items;
|
|
|
|
|
|
import me.km.KajetansMod;
|
|
|
+import me.km.blocks.EnumMetals;
|
|
|
import net.minecraft.creativetab.CreativeTabs;
|
|
|
import net.minecraft.init.Items;
|
|
|
import net.minecraft.init.SoundEvents;
|
|
@@ -10,7 +11,7 @@ import net.minecraft.item.Item;
|
|
|
import net.minecraft.item.ItemArmor.ArmorMaterial;
|
|
|
import net.minecraft.item.ItemStack;
|
|
|
import net.minecraftforge.common.util.EnumHelper;
|
|
|
-import net.minecraftforge.fml.common.registry.GameRegistry;
|
|
|
+import net.minecraftforge.registries.IForgeRegistry;
|
|
|
|
|
|
public class ModItems
|
|
|
{
|
|
@@ -160,20 +161,20 @@ public class ModItems
|
|
|
public static ItemBase batWing;
|
|
|
public static ItemBase wolfFur;
|
|
|
|
|
|
- public static void init()
|
|
|
+ public static void init(IForgeRegistry<Item> r)
|
|
|
{
|
|
|
// nuggets and ingots
|
|
|
- copperIngot = register(new ItemBase("copper_ingot", "ingotCopper").setCreativeTab(CreativeTabs.MATERIALS));
|
|
|
- copperNugget = register(new ItemBase("copper_nugget", "copperNugget").setCreativeTab(CreativeTabs.MATERIALS));
|
|
|
+ copperIngot = register(r, new ItemBase("copper_ingot", "ingotCopper").setCreativeTab(CreativeTabs.MATERIALS));
|
|
|
+ copperNugget = register(r, new ItemBase("copper_nugget", "copperNugget").setCreativeTab(CreativeTabs.MATERIALS));
|
|
|
|
|
|
- tinIngot = register(new ItemBase("tin_ingot", "ingotTin").setCreativeTab(CreativeTabs.MATERIALS));
|
|
|
- tinNugget = register(new ItemBase("tin_nugget", "tinNugget").setCreativeTab(CreativeTabs.MATERIALS));
|
|
|
+ tinIngot = register(r, new ItemBase("tin_ingot", "ingotTin").setCreativeTab(CreativeTabs.MATERIALS));
|
|
|
+ tinNugget = register(r, new ItemBase("tin_nugget", "tinNugget").setCreativeTab(CreativeTabs.MATERIALS));
|
|
|
|
|
|
- bronzeIngot = register(new ItemBase("bronze_ingot", "ingotBronze").setCreativeTab(CreativeTabs.MATERIALS));
|
|
|
- bronzeNugget = register(new ItemBase("bronze_nugget", "bronzeNugget").setCreativeTab(CreativeTabs.MATERIALS));
|
|
|
+ bronzeIngot = register(r, new ItemBase("bronze_ingot", "ingotBronze").setCreativeTab(CreativeTabs.MATERIALS));
|
|
|
+ bronzeNugget = register(r, new ItemBase("bronze_nugget", "bronzeNugget").setCreativeTab(CreativeTabs.MATERIALS));
|
|
|
|
|
|
- silverIngot = register(new ItemBase("silver_ingot", "ingotSilver").setCreativeTab(CreativeTabs.MATERIALS));
|
|
|
- silverNugget = register(new ItemBase("silver_nugget", "silverNugget").setCreativeTab(CreativeTabs.MATERIALS));
|
|
|
+ silverIngot = register(r, new ItemBase("silver_ingot", "ingotSilver").setCreativeTab(CreativeTabs.MATERIALS));
|
|
|
+ silverNugget = register(r, new ItemBase("silver_nugget", "silverNugget").setCreativeTab(CreativeTabs.MATERIALS));
|
|
|
|
|
|
// repair items
|
|
|
TOOL_COPPER.setRepairItem(new ItemStack(copperIngot));
|
|
@@ -186,92 +187,96 @@ public class ModItems
|
|
|
TOOL_SILVER.setRepairItem(new ItemStack(silverIngot));
|
|
|
|
|
|
// tools and swords
|
|
|
- copperSword = register(new ItemSword(TOOL_COPPER, "copper_sword", "swordCopper"));
|
|
|
- copperShovel = register(new ItemSpade(TOOL_COPPER, "copper_shovel", "shovelCopper"));
|
|
|
- copperPickaxe = register(new ItemPickaxe(TOOL_COPPER, "copper_pickaxe", "pickaxeCopper"));
|
|
|
- copperAxe = register(new ItemAxe(TOOL_COPPER, 7, -3.1f, "copper_axe", "hatchetCopper"));
|
|
|
- copperHoe = register(new ItemHoe(TOOL_COPPER, "copper_hoe", "hoeCopper"));
|
|
|
+ copperSword = register(r, new ItemSword(TOOL_COPPER, "copper_sword", "swordCopper"));
|
|
|
+ copperShovel = register(r, new ItemSpade(TOOL_COPPER, "copper_shovel", "shovelCopper"));
|
|
|
+ copperPickaxe = register(r, new ItemPickaxe(TOOL_COPPER, "copper_pickaxe", "pickaxeCopper"));
|
|
|
+ copperAxe = register(r, new ItemAxe(TOOL_COPPER, 7, -3.1f, "copper_axe", "hatchetCopper"));
|
|
|
+ copperHoe = register(r, new ItemHoe(TOOL_COPPER, "copper_hoe", "hoeCopper"));
|
|
|
|
|
|
- bronzeSword = register(new ItemSword(TOOL_BRONZE, "bronze_sword", "swordBronze"));
|
|
|
- bronzeShovel = register(new ItemSpade(TOOL_BRONZE, "bronze_shovel", "shovelBronze"));
|
|
|
- bronzePickaxe = register(new ItemPickaxe(TOOL_BRONZE, "bronze_pickaxe", "pickaxeBronze"));
|
|
|
- bronzeAxe = register(new ItemAxe(TOOL_BRONZE, 8, -3.0f, "bronze_axe", "hatchetBronze"));
|
|
|
- bronzeHoe = register(new ItemHoe(TOOL_BRONZE, "bronze_hoe", "hoeBronze"));
|
|
|
+ bronzeSword = register(r, new ItemSword(TOOL_BRONZE, "bronze_sword", "swordBronze"));
|
|
|
+ bronzeShovel = register(r, new ItemSpade(TOOL_BRONZE, "bronze_shovel", "shovelBronze"));
|
|
|
+ bronzePickaxe = register(r, new ItemPickaxe(TOOL_BRONZE, "bronze_pickaxe", "pickaxeBronze"));
|
|
|
+ bronzeAxe = register(r, new ItemAxe(TOOL_BRONZE, 8, -3.0f, "bronze_axe", "hatchetBronze"));
|
|
|
+ bronzeHoe = register(r, new ItemHoe(TOOL_BRONZE, "bronze_hoe", "hoeBronze"));
|
|
|
|
|
|
// armor
|
|
|
- copperHelmet = register(new ItemArmor(ARMOR_COPPER, EntityEquipmentSlot.HEAD, "copper_helmet", "helmetCopper"));
|
|
|
- copperChestplate = register(new ItemArmor(ARMOR_COPPER, EntityEquipmentSlot.CHEST, "copper_chestplate", "chestplateCopper"));
|
|
|
- copperLeggings = register(new ItemArmor(ARMOR_COPPER, EntityEquipmentSlot.LEGS, "copper_leggings", "leggingsCopper"));
|
|
|
- copperBoots = register(new ItemArmor(ARMOR_COPPER, EntityEquipmentSlot.FEET, "copper_boots", "bootsCopper"));
|
|
|
+ copperHelmet = register(r, new ItemArmor(ARMOR_COPPER, EntityEquipmentSlot.HEAD, "copper_helmet", "helmetCopper"));
|
|
|
+ copperChestplate = register(r, new ItemArmor(ARMOR_COPPER, EntityEquipmentSlot.CHEST, "copper_chestplate", "chestplateCopper"));
|
|
|
+ copperLeggings = register(r, new ItemArmor(ARMOR_COPPER, EntityEquipmentSlot.LEGS, "copper_leggings", "leggingsCopper"));
|
|
|
+ copperBoots = register(r, new ItemArmor(ARMOR_COPPER, EntityEquipmentSlot.FEET, "copper_boots", "bootsCopper"));
|
|
|
|
|
|
- bronzeHelmet = register(new ItemArmor(ARMOR_BRONZE, EntityEquipmentSlot.HEAD, "bronze_helmet", "helmetBronze"));
|
|
|
- bronzeChestplate = register(new ItemArmor(ARMOR_BRONZE, EntityEquipmentSlot.CHEST, "bronze_chestplate", "chestplateBronze"));
|
|
|
- bronzeLeggings = register(new ItemArmor(ARMOR_BRONZE, EntityEquipmentSlot.LEGS, "bronze_leggings", "leggingsBronze"));
|
|
|
- bronzeBoots = register(new ItemArmor(ARMOR_BRONZE, EntityEquipmentSlot.FEET, "bronze_boots", "bootsBronze"));
|
|
|
+ bronzeHelmet = register(r, new ItemArmor(ARMOR_BRONZE, EntityEquipmentSlot.HEAD, "bronze_helmet", "helmetBronze"));
|
|
|
+ bronzeChestplate = register(r, new ItemArmor(ARMOR_BRONZE, EntityEquipmentSlot.CHEST, "bronze_chestplate", "chestplateBronze"));
|
|
|
+ bronzeLeggings = register(r, new ItemArmor(ARMOR_BRONZE, EntityEquipmentSlot.LEGS, "bronze_leggings", "leggingsBronze"));
|
|
|
+ bronzeBoots = register(r, new ItemArmor(ARMOR_BRONZE, EntityEquipmentSlot.FEET, "bronze_boots", "bootsBronze"));
|
|
|
|
|
|
- cylinder = register(new ItemCylinder(ARMOR_CYLINDER, "cylinder", "cylinder"));
|
|
|
- suitChestplate = register(new ItemArmor(ARMOR_SUIT, EntityEquipmentSlot.CHEST, "suit_chestplate", "chestplateSuit"));
|
|
|
- suitLeggings = register(new ItemArmor(ARMOR_SUIT, EntityEquipmentSlot.LEGS, "suit_leggings", "leggingsSuit"));
|
|
|
- suitBoots = register(new ItemArmor(ARMOR_SUIT, EntityEquipmentSlot.FEET, "suit_boots", "bootsSuit"));
|
|
|
+ cylinder = register(r, new ItemCylinder(ARMOR_CYLINDER, "cylinder", "cylinder"));
|
|
|
+ suitChestplate = register(r, new ItemArmor(ARMOR_SUIT, EntityEquipmentSlot.CHEST, "suit_chestplate", "chestplateSuit"));
|
|
|
+ suitLeggings = register(r, new ItemArmor(ARMOR_SUIT, EntityEquipmentSlot.LEGS, "suit_leggings", "leggingsSuit"));
|
|
|
+ suitBoots = register(r, new ItemArmor(ARMOR_SUIT, EntityEquipmentSlot.FEET, "suit_boots", "bootsSuit"));
|
|
|
|
|
|
- strawHat = register(new ItemHat(ARMOR_STRAW, "straw_hat", "hatStraw"));
|
|
|
+ strawHat = register(r, new ItemHat(ARMOR_STRAW, "straw_hat", "hatStraw"));
|
|
|
|
|
|
// wands
|
|
|
- woodenWand = register(new ItemWand("wood_wand", "wandWood", Item.ToolMaterial.WOOD, 1));
|
|
|
- stoneWand = register(new ItemWand("stone_wand", "wandStone", Item.ToolMaterial.STONE, 1));
|
|
|
- copperWand = register(new ItemWand("copper_wand", "wandCopper", TOOL_COPPER, 2));
|
|
|
- bronzeWand = register(new ItemWand("bronze_wand", "wandBronze", TOOL_BRONZE, 2));
|
|
|
- ironWand = register(new ItemWand("iron_wand", "wandIron", Item.ToolMaterial.IRON, 2));
|
|
|
- goldWand = register(new ItemWand("gold_wand", "wandGold", Item.ToolMaterial.GOLD, 6));
|
|
|
- emeraldWand = register(new ItemWand("emerald_wand", "wandEmerald", TOOL_EMERALD, 4));
|
|
|
- redstoneWand = register(new ItemWand("redstone_wand", "wandRedstone", TOOL_REDSTONE, 5));
|
|
|
- lapisWand = register(new ItemWand("lapis_wand", "wandLapis", TOOL_LAPIS, 6));
|
|
|
- diamondWand = register(new ItemWand("diamond_wand", "wandDiamond", Item.ToolMaterial.DIAMOND, 4));
|
|
|
- silverWand = register(new ItemWand("silver_wand", "wandSilver", TOOL_SILVER, 6));
|
|
|
+ woodenWand = register(r, new ItemWand("wood_wand", "wandWood", Item.ToolMaterial.WOOD, 1));
|
|
|
+ stoneWand = register(r, new ItemWand("stone_wand", "wandStone", Item.ToolMaterial.STONE, 1));
|
|
|
+ copperWand = register(r, new ItemWand("copper_wand", "wandCopper", TOOL_COPPER, 2));
|
|
|
+ bronzeWand = register(r, new ItemWand("bronze_wand", "wandBronze", TOOL_BRONZE, 2));
|
|
|
+ ironWand = register(r, new ItemWand("iron_wand", "wandIron", Item.ToolMaterial.IRON, 2));
|
|
|
+ goldWand = register(r, new ItemWand("gold_wand", "wandGold", Item.ToolMaterial.GOLD, 6));
|
|
|
+ emeraldWand = register(r, new ItemWand("emerald_wand", "wandEmerald", TOOL_EMERALD, 4));
|
|
|
+ redstoneWand = register(r, new ItemWand("redstone_wand", "wandRedstone", TOOL_REDSTONE, 5));
|
|
|
+ lapisWand = register(r, new ItemWand("lapis_wand", "wandLapis", TOOL_LAPIS, 6));
|
|
|
+ diamondWand = register(r, new ItemWand("diamond_wand", "wandDiamond", Item.ToolMaterial.DIAMOND, 4));
|
|
|
+ silverWand = register(r, new ItemWand("silver_wand", "wandSilver", TOOL_SILVER, 6));
|
|
|
|
|
|
// sticks
|
|
|
- woodenStick = register(new ItemStick("wood_stick", "stickWood", Item.ToolMaterial.WOOD));
|
|
|
- stoneStick = register(new ItemStick("stone_stick", "stickStone", Item.ToolMaterial.STONE));
|
|
|
- copperStick = register(new ItemStick("copper_stick", "stickCopper", TOOL_COPPER));
|
|
|
- bronzeStick = register(new ItemStick("bronze_stick", "stickBronze", TOOL_BRONZE));
|
|
|
- ironStick = register(new ItemStick("iron_stick", "stickIron", Item.ToolMaterial.IRON));
|
|
|
- goldStick = register(new ItemStick("gold_stick", "stickGold", Item.ToolMaterial.GOLD));
|
|
|
- diamondStick = register(new ItemStick("diamond_stick", "stickDiamond", Item.ToolMaterial.DIAMOND));
|
|
|
+ woodenStick = register(r, new ItemStick("wood_stick", "stickWood", Item.ToolMaterial.WOOD));
|
|
|
+ stoneStick = register(r, new ItemStick("stone_stick", "stickStone", Item.ToolMaterial.STONE));
|
|
|
+ copperStick = register(r, new ItemStick("copper_stick", "stickCopper", TOOL_COPPER));
|
|
|
+ bronzeStick = register(r, new ItemStick("bronze_stick", "stickBronze", TOOL_BRONZE));
|
|
|
+ ironStick = register(r, new ItemStick("iron_stick", "stickIron", Item.ToolMaterial.IRON));
|
|
|
+ goldStick = register(r, new ItemStick("gold_stick", "stickGold", Item.ToolMaterial.GOLD));
|
|
|
+ diamondStick = register(r, new ItemStick("diamond_stick", "stickDiamond", Item.ToolMaterial.DIAMOND));
|
|
|
|
|
|
// dagger
|
|
|
- woodenDagger = register(new ItemDagger("wood_dagger", "daggerWood", Item.ToolMaterial.WOOD));
|
|
|
- stoneDagger = register(new ItemDagger("stone_dagger", "daggerStone", Item.ToolMaterial.STONE));
|
|
|
- copperDagger = register(new ItemDagger("copper_dagger", "daggerCopper", TOOL_COPPER));
|
|
|
- bronzeDagger = register(new ItemDagger("bronze_dagger", "daggerBronze", TOOL_BRONZE));
|
|
|
- ironDagger = register(new ItemDagger("iron_dagger", "daggerIron", Item.ToolMaterial.IRON));
|
|
|
- goldDagger = register(new ItemDagger("gold_dagger", "daggerGold", Item.ToolMaterial.GOLD));
|
|
|
- diamondDagger = register(new ItemDagger("diamond_dagger", "daggerDiamond", Item.ToolMaterial.DIAMOND));
|
|
|
+ woodenDagger = register(r, new ItemDagger("wood_dagger", "daggerWood", Item.ToolMaterial.WOOD));
|
|
|
+ stoneDagger = register(r, new ItemDagger("stone_dagger", "daggerStone", Item.ToolMaterial.STONE));
|
|
|
+ copperDagger = register(r, new ItemDagger("copper_dagger", "daggerCopper", TOOL_COPPER));
|
|
|
+ bronzeDagger = register(r, new ItemDagger("bronze_dagger", "daggerBronze", TOOL_BRONZE));
|
|
|
+ ironDagger = register(r, new ItemDagger("iron_dagger", "daggerIron", Item.ToolMaterial.IRON));
|
|
|
+ goldDagger = register(r, new ItemDagger("gold_dagger", "daggerGold", Item.ToolMaterial.GOLD));
|
|
|
+ diamondDagger = register(r, new ItemDagger("diamond_dagger", "daggerDiamond", Item.ToolMaterial.DIAMOND));
|
|
|
|
|
|
// hammer
|
|
|
- woodenHammer = register(new ItemHammer("wood_hammer", "hammerWood", Item.ToolMaterial.WOOD));
|
|
|
- stoneHammer = register(new ItemHammer("stone_hammer", "hammerStone", Item.ToolMaterial.STONE));
|
|
|
- copperHammer = register(new ItemHammer("copper_hammer", "hammerCopper", TOOL_COPPER));
|
|
|
- bronzeHammer = register(new ItemHammer("bronze_hammer", "hammerBronze", TOOL_BRONZE));
|
|
|
- ironHammer = register(new ItemHammer("iron_hammer", "hammerIron", Item.ToolMaterial.IRON));
|
|
|
- goldHammer = register(new ItemHammer("gold_hammer", "hammerGold", Item.ToolMaterial.GOLD));
|
|
|
- diamondHammer = register(new ItemHammer("diamond_hammer", "hammerDiamond", Item.ToolMaterial.DIAMOND));
|
|
|
+ woodenHammer = register(r, new ItemHammer("wood_hammer", "hammerWood", Item.ToolMaterial.WOOD));
|
|
|
+ stoneHammer = register(r, new ItemHammer("stone_hammer", "hammerStone", Item.ToolMaterial.STONE));
|
|
|
+ copperHammer = register(r, new ItemHammer("copper_hammer", "hammerCopper", TOOL_COPPER));
|
|
|
+ bronzeHammer = register(r, new ItemHammer("bronze_hammer", "hammerBronze", TOOL_BRONZE));
|
|
|
+ ironHammer = register(r, new ItemHammer("iron_hammer", "hammerIron", Item.ToolMaterial.IRON));
|
|
|
+ goldHammer = register(r, new ItemHammer("gold_hammer", "hammerGold", Item.ToolMaterial.GOLD));
|
|
|
+ diamondHammer = register(r, new ItemHammer("diamond_hammer", "hammerDiamond", Item.ToolMaterial.DIAMOND));
|
|
|
|
|
|
// coins
|
|
|
- copperCoin = register(new ItemBase("coin_copper", "coinCopper").setCreativeTab(CreativeTabs.MISC));
|
|
|
- silverCoin = register(new ItemBase("coin_silver", "coinSilver").setCreativeTab(CreativeTabs.MISC));
|
|
|
- goldCoin = register(new ItemBase("coin_gold", "coinGold").setCreativeTab(CreativeTabs.MISC));
|
|
|
+ copperCoin = register(r, new ItemBase("coin_copper", "coinCopper").setCreativeTab(CreativeTabs.MISC));
|
|
|
+ silverCoin = register(r, new ItemBase("coin_silver", "coinSilver").setCreativeTab(CreativeTabs.MISC));
|
|
|
+ goldCoin = register(r, new ItemBase("coin_gold", "coinGold").setCreativeTab(CreativeTabs.MISC));
|
|
|
|
|
|
// misc
|
|
|
- scroll = register((ItemScroll) new ItemScroll("scroll", "scroll").setCreativeTab(CreativeTabs.MISC));
|
|
|
- realHayBed = register(new ItemBed("real_hay_bed", "realHayBed"));
|
|
|
- hayBundle = register(new ItemBase("hay_bundle", "bundleHay").setCreativeTab(CreativeTabs.MATERIALS));
|
|
|
- batWing = register(new ItemBase("bat_wing", "batWing").setCreativeTab(CreativeTabs.MATERIALS));
|
|
|
- wolfFur = register(new ItemBase("wolf_fur", "wolfFur").setCreativeTab(CreativeTabs.MATERIALS));
|
|
|
+ scroll = register(r, (ItemScroll) new ItemScroll("scroll", "scroll").setCreativeTab(CreativeTabs.MISC));
|
|
|
+ realHayBed = register(r, new ItemBed("real_hay_bed", "realHayBed"));
|
|
|
+ hayBundle = register(r, new ItemBase("hay_bundle", "bundleHay").setCreativeTab(CreativeTabs.MATERIALS));
|
|
|
+ batWing = register(r, new ItemBase("bat_wing", "batWing").setCreativeTab(CreativeTabs.MATERIALS));
|
|
|
+ wolfFur = register(r, new ItemBase("wolf_fur", "wolfFur").setCreativeTab(CreativeTabs.MATERIALS));
|
|
|
+
|
|
|
+
|
|
|
+ // workaround
|
|
|
+ EnumMetals.fixMetalIngots();
|
|
|
}
|
|
|
|
|
|
- private static <T extends Item> T register(T item)
|
|
|
+ private static <T extends Item> T register(IForgeRegistry<Item> r, T item)
|
|
|
{
|
|
|
- GameRegistry.register(item);
|
|
|
+ r.register(item);
|
|
|
if(item instanceof ItemModelProvider)
|
|
|
{
|
|
|
((ItemModelProvider) item).registerItemModel(item);
|