From 48220202bc6532a9c248c1d6aef6a3dbbb5f9b02 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Thu, 19 Dec 2013 10:05:01 -0500 Subject: [PATCH] use mantle's craftingItem --- src/main/java/tconstruct/common/TContent.java | 37 ++++++++++++------ .../java/tconstruct/items/ArmorPattern.java | 6 +-- src/main/java/tconstruct/items/Bowstring.java | 6 +-- .../java/tconstruct/items/CraftingItem.java | 38 ------------------- src/main/java/tconstruct/items/Fletching.java | 4 +- src/main/java/tconstruct/items/Manual.java | 13 ++++--- .../java/tconstruct/items/MaterialItem.java | 12 +++--- .../java/tconstruct/items/OreBerries.java | 4 +- src/main/java/tconstruct/items/Pattern.java | 7 +++- src/main/java/tconstruct/items/ToolPart.java | 4 +- .../tconstruct/items/armor/HeartCanister.java | 6 +-- .../java/tconstruct/items/armor/Knapsack.java | 33 ++++++++-------- 12 files changed, 80 insertions(+), 90 deletions(-) delete mode 100644 src/main/java/tconstruct/items/CraftingItem.java diff --git a/src/main/java/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java index 92a60b8b..46cacf7a 100644 --- a/src/main/java/tconstruct/common/TContent.java +++ b/src/main/java/tconstruct/common/TContent.java @@ -1,15 +1,17 @@ package tconstruct.common; +import mantle.items.abstracts.CraftingItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import tconstruct.library.armor.EnumArmorPart; import tconstruct.library.crafting.ToolBuilder; - 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.*; import net.minecraft.creativetab.CreativeTabs; @@ -370,8 +372,13 @@ public class TContent implements IFuelHandler TRepo.pigIronFluid = FluidRegistry.getFluid("pigiron.molten"); else TRepo.pigIronFluid.setDensity(3000).setViscosity(6000).setTemperature(1300); - TRepo.fluids = new Fluid[]{TRepo.moltenIronFluid, TRepo.moltenGoldFluid, TRepo.moltenCopperFluid, TRepo.moltenTinFluid, TRepo.moltenAluminumFluid, TRepo.moltenCobaltFluid, TRepo.moltenArditeFluid, TRepo.moltenBronzeFluid, TRepo.moltenAlubrassFluid, TRepo.moltenManyullynFluid, TRepo.moltenAlumiteFluid, TRepo.moltenObsidianFluid, TRepo.moltenSteelFluid, TRepo.moltenGlassFluid, TRepo.moltenStoneFluid, TRepo.moltenEmeraldFluid, TRepo.bloodFluid, TRepo.moltenNickelFluid, TRepo.moltenLeadFluid, TRepo.moltenSilverFluid, TRepo.moltenShinyFluid, TRepo.moltenInvarFluid, TRepo.moltenElectrumFluid, TRepo.moltenEnderFluid, TRepo.blueSlimeFluid, TRepo.glueFluid, TRepo.pigIronFluid}; - TRepo.fluidBlocks = new Block[]{TRepo.moltenIron, TRepo.moltenGold, TRepo.moltenCopper, TRepo.moltenTin, TRepo.moltenAluminum, TRepo.moltenCobalt, TRepo.moltenArdite, TRepo.moltenBronze, TRepo.moltenAlubrass, TRepo.moltenManyullyn, TRepo.moltenAlumite, TRepo.moltenObsidian, TRepo.moltenSteel, TRepo.moltenGlass, TRepo.moltenStone, TRepo.moltenEmerald, TRepo.blood, TRepo.moltenNickel, TRepo.moltenLead, TRepo.moltenSilver, TRepo.moltenShiny, TRepo.moltenInvar, TRepo.moltenElectrum, TRepo.moltenEnder, TRepo.slimePool, TRepo.glueFluidBlock}; + TRepo.fluids = new Fluid[] { TRepo.moltenIronFluid, TRepo.moltenGoldFluid, TRepo.moltenCopperFluid, TRepo.moltenTinFluid, TRepo.moltenAluminumFluid, TRepo.moltenCobaltFluid, + TRepo.moltenArditeFluid, TRepo.moltenBronzeFluid, TRepo.moltenAlubrassFluid, TRepo.moltenManyullynFluid, TRepo.moltenAlumiteFluid, TRepo.moltenObsidianFluid, TRepo.moltenSteelFluid, + TRepo.moltenGlassFluid, TRepo.moltenStoneFluid, TRepo.moltenEmeraldFluid, TRepo.bloodFluid, TRepo.moltenNickelFluid, TRepo.moltenLeadFluid, TRepo.moltenSilverFluid, + TRepo.moltenShinyFluid, TRepo.moltenInvarFluid, TRepo.moltenElectrumFluid, TRepo.moltenEnderFluid, TRepo.blueSlimeFluid, TRepo.glueFluid, TRepo.pigIronFluid }; + TRepo.fluidBlocks = new Block[] { TRepo.moltenIron, TRepo.moltenGold, TRepo.moltenCopper, TRepo.moltenTin, TRepo.moltenAluminum, TRepo.moltenCobalt, TRepo.moltenArdite, TRepo.moltenBronze, + TRepo.moltenAlubrass, TRepo.moltenManyullyn, TRepo.moltenAlumite, TRepo.moltenObsidian, TRepo.moltenSteel, TRepo.moltenGlass, TRepo.moltenStone, TRepo.moltenEmerald, TRepo.blood, + TRepo.moltenNickel, TRepo.moltenLead, TRepo.moltenSilver, TRepo.moltenShiny, TRepo.moltenInvar, TRepo.moltenElectrum, TRepo.moltenEnder, TRepo.slimePool, TRepo.glueFluidBlock }; //Slime Islands TRepo.slimeGel = new SlimeGel(PHConstruct.slimeGel).setStepSound(TRepo.slimeStep).setLightOpacity(0).setUnlocalizedName("slime.gel"); TRepo.slimeGrass = new SlimeGrass(PHConstruct.slimeGrass).setStepSound(Block.soundGrassFootstep).setLightOpacity(0).setUnlocalizedName("slime.grass"); @@ -381,7 +388,6 @@ public class TContent implements IFuelHandler TRepo.slimeChannel = new ConveyorBase(PHConstruct.slimeChannel, Material.water, "greencurrent").setHardness(0.3f).setStepSound(TRepo.slimeStep).setUnlocalizedName("slime.channel"); TRepo.bloodChannel = new ConveyorBase(PHConstruct.bloodChannel, Material.water, "liquid_cow").setHardness(0.3f).setStepSound(TRepo.slimeStep).setUnlocalizedName("blood.channel"); TRepo.slimePad = new SlimePad(PHConstruct.slimePad, Material.cloth).setStepSound(TRepo.slimeStep).setHardness(0.3f).setUnlocalizedName("slime.pad"); - //Decoration TRepo.stoneTorch = new StoneTorch(PHConstruct.stoneTorch).setUnlocalizedName("decoration.stonetorch"); @@ -433,7 +439,7 @@ public class TContent implements IFuelHandler TRepo.titleIcon = new TitleIcon(PHConstruct.uselessItem).setUnlocalizedName("tconstruct.titleicon"); GameRegistry.registerItem(TRepo.titleIcon, "titleIcon"); String[] blanks = new String[] { "blank_pattern", "blank_cast", "blank_cast" }; - TRepo.blankPattern = new CraftingItem(PHConstruct.blankPattern, blanks, blanks, "materials/").setUnlocalizedName("tconstruct.Pattern"); + TRepo.blankPattern = new CraftingItem(PHConstruct.blankPattern, blanks, blanks, "materials/", "tinker", TConstructRegistry.materialTab).setUnlocalizedName("tconstruct.Pattern"); GameRegistry.registerItem(TRepo.blankPattern, "blankPattern"); TRepo.materials = new MaterialItem(PHConstruct.materials).setUnlocalizedName("tconstruct.Materials"); @@ -830,13 +836,20 @@ public class TContent implements IFuelHandler achievements.put("tconstruct.beginner", new Achievement(2741, "tconstruct.beginner", 0, 0, TRepo.manualBook, null).setIndependent().registerAchievement()); achievements.put("tconstruct.pattern", new Achievement(2742, "tconstruct.pattern", 2, 1, TRepo.blankPattern, achievements.get("tconstruct.beginner")).registerAchievement()); - achievements.put("tconstruct.tinkerer", new Achievement(2743, "tconstruct.tinkerer", 2, 2, new ItemStack(TRepo.titleIcon, 1, 4096), achievements.get("tconstruct.pattern")).registerAchievement()); - achievements.put("tconstruct.preparedFight", new Achievement(2744, "tconstruct.preparedFight", 1, 3, new ItemStack(TRepo.titleIcon, 1, 4097), achievements.get("tconstruct.tinkerer")).registerAchievement()); - achievements.put("tconstruct.proTinkerer", new Achievement(2745, "tconstruct.proTinkerer", 4, 4, new ItemStack(TRepo.titleIcon, 1, 4098), achievements.get("tconstruct.tinkerer")).setSpecial().registerAchievement()); + achievements.put("tconstruct.tinkerer", + new Achievement(2743, "tconstruct.tinkerer", 2, 2, new ItemStack(TRepo.titleIcon, 1, 4096), achievements.get("tconstruct.pattern")).registerAchievement()); + achievements.put("tconstruct.preparedFight", + new Achievement(2744, "tconstruct.preparedFight", 1, 3, new ItemStack(TRepo.titleIcon, 1, 4097), achievements.get("tconstruct.tinkerer")).registerAchievement()); + achievements.put("tconstruct.proTinkerer", new Achievement(2745, "tconstruct.proTinkerer", 4, 4, new ItemStack(TRepo.titleIcon, 1, 4098), achievements.get("tconstruct.tinkerer")).setSpecial() + .registerAchievement()); achievements.put("tconstruct.smelteryMaker", new Achievement(2746, "tconstruct.smelteryMaker", -2, -1, TRepo.smeltery, achievements.get("tconstruct.beginner")).registerAchievement()); - achievements.put("tconstruct.enemySlayer", new Achievement(2747, "tconstruct.enemySlayer", 0, 5, new ItemStack(TRepo.titleIcon, 1, 4099), achievements.get("tconstruct.preparedFight")).registerAchievement()); - achievements.put("tconstruct.dualConvenience", new Achievement(2748, "tconstruct.dualConvenience", 0, 7, new ItemStack(TRepo.titleIcon, 1, 4100), achievements.get("tconstruct.enemySlayer")).setSpecial().registerAchievement()); - achievements.put("tconstruct.doingItWrong", new Achievement(2749, "tconstruct.doingItWrong", -2, -3, new ItemStack(TRepo.manualBook, 1, 2), achievements.get("tconstruct.smelteryMaker")).registerAchievement()); - achievements.put("tconstruct.betterCrafting", new Achievement(2750, "tconstruct.betterCrafting", -2, 2, TRepo.craftingStationWood, achievements.get("tconstruct.beginner")).registerAchievement()); + achievements.put("tconstruct.enemySlayer", + new Achievement(2747, "tconstruct.enemySlayer", 0, 5, new ItemStack(TRepo.titleIcon, 1, 4099), achievements.get("tconstruct.preparedFight")).registerAchievement()); + achievements.put("tconstruct.dualConvenience", new Achievement(2748, "tconstruct.dualConvenience", 0, 7, new ItemStack(TRepo.titleIcon, 1, 4100), achievements.get("tconstruct.enemySlayer")) + .setSpecial().registerAchievement()); + achievements.put("tconstruct.doingItWrong", + new Achievement(2749, "tconstruct.doingItWrong", -2, -3, new ItemStack(TRepo.manualBook, 1, 2), achievements.get("tconstruct.smelteryMaker")).registerAchievement()); + achievements.put("tconstruct.betterCrafting", + new Achievement(2750, "tconstruct.betterCrafting", -2, 2, TRepo.craftingStationWood, achievements.get("tconstruct.beginner")).registerAchievement()); } } diff --git a/src/main/java/tconstruct/items/ArmorPattern.java b/src/main/java/tconstruct/items/ArmorPattern.java index 2d4120ca..6f9a1ed5 100644 --- a/src/main/java/tconstruct/items/ArmorPattern.java +++ b/src/main/java/tconstruct/items/ArmorPattern.java @@ -3,9 +3,9 @@ package tconstruct.items; import java.util.List; import cpw.mods.fml.relauncher.*; - import tconstruct.library.ItemBlocklike; - +import tconstruct.library.TConstructRegistry; +import mantle.items.abstracts.CraftingItem; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; @@ -18,7 +18,7 @@ public class ArmorPattern extends CraftingItem implements ItemBlocklike public ArmorPattern(int id, String patternType, String folder) { - super(id, patternName, getPatternNames(patternType), folder); + super(id, patternName, getPatternNames(patternType), folder, "tinker", TConstructRegistry.materialTab); this.setHasSubtypes(true); this.setMaxDamage(0); this.setContainerItem(this); diff --git a/src/main/java/tconstruct/items/Bowstring.java b/src/main/java/tconstruct/items/Bowstring.java index 3efd9622..ae294a82 100644 --- a/src/main/java/tconstruct/items/Bowstring.java +++ b/src/main/java/tconstruct/items/Bowstring.java @@ -3,18 +3,18 @@ package tconstruct.items; import java.util.List; import cpw.mods.fml.common.Loader; -import tconstruct.common.TContent; import tconstruct.common.TRepo; +import tconstruct.library.TConstructRegistry; import tconstruct.library.util.IToolPart; +import mantle.items.abstracts.CraftingItem; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; public class Bowstring extends CraftingItem implements IToolPart { public Bowstring(int id) { - super(id, toolMaterialNames, buildTextureNames("_bowstring"), "parts/"); + super(id, toolMaterialNames, buildTextureNames("_bowstring"), "parts/", "tinker", TConstructRegistry.materialTab); this.setHasSubtypes(true); this.setMaxDamage(0); } diff --git a/src/main/java/tconstruct/items/CraftingItem.java b/src/main/java/tconstruct/items/CraftingItem.java deleted file mode 100644 index 73b0b6ee..00000000 --- a/src/main/java/tconstruct/items/CraftingItem.java +++ /dev/null @@ -1,38 +0,0 @@ -package tconstruct.items; - -import tconstruct.common.TRepo; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; -import tconstruct.achievements.TAchievements; - -import java.util.List; - -import tconstruct.library.TConstructRegistry; - -import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; -import net.minecraft.util.MathHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class CraftingItem extends mantle.items.abstracts.CraftingItem -{ - - public CraftingItem(int id, String[] names, String[] tex, String folder) - { - super(id, names, tex, folder, "tinker", TConstructRegistry.materialTab); - } - - @Override - public void onCreated (ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) - { - if (par1ItemStack.itemID == TRepo.blankPattern.itemID) - { - par3EntityPlayer.addStat(TAchievements.achievements.get("tconstruct.pattern"), 1); - } - } -} diff --git a/src/main/java/tconstruct/items/Fletching.java b/src/main/java/tconstruct/items/Fletching.java index 283d9ffb..6d0d7998 100644 --- a/src/main/java/tconstruct/items/Fletching.java +++ b/src/main/java/tconstruct/items/Fletching.java @@ -1,13 +1,15 @@ package tconstruct.items; +import tconstruct.library.TConstructRegistry; import tconstruct.library.util.IToolPart; +import mantle.items.abstracts.CraftingItem; import net.minecraft.item.ItemStack; public class Fletching extends CraftingItem implements IToolPart { public Fletching(int id) { - super(id, toolMaterialNames, buildTextureNames("_fletching"), "parts/"); + super(id, toolMaterialNames, buildTextureNames("_fletching"), "parts/", "tinker", TConstructRegistry.materialTab); this.setHasSubtypes(true); this.setMaxDamage(0); } diff --git a/src/main/java/tconstruct/items/Manual.java b/src/main/java/tconstruct/items/Manual.java index fa19fd2e..129315cd 100644 --- a/src/main/java/tconstruct/items/Manual.java +++ b/src/main/java/tconstruct/items/Manual.java @@ -1,11 +1,12 @@ package tconstruct.items; import tconstruct.achievements.TAchievements; +import tconstruct.library.TConstructRegistry; import java.util.List; import tconstruct.TConstruct; - +import mantle.items.abstracts.CraftingItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -20,14 +21,14 @@ public class Manual extends CraftingItem public Manual(int id) { - super(id, name, textureName, ""); + super(id, name, textureName, "", "tinker", TConstructRegistry.materialTab); setUnlocalizedName("tconstruct.manual"); } @Override public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player) { - player.addStat(TAchievements.achievements.get("tconstruct.beginner"), 1); + player.addStat(TAchievements.achievements.get("tconstruct.beginner"), 1); player.openGui(TConstruct.instance, mantle.client.MProxyClient.manualGuiID, world, 0, 0, 0); /*Side side = FMLCommonHandler.instance().getEffectiveSide(); if (side.isClient()) @@ -41,13 +42,13 @@ public class Manual extends CraftingItem switch (stack.getItemDamage()) { case 0: - list.add("\u00a7o"+StatCollector.translateToLocal("manual1.tooltip")); + list.add("\u00a7o" + StatCollector.translateToLocal("manual1.tooltip")); break; case 1: - list.add("\u00a7o"+StatCollector.translateToLocal("manual2.tooltip")); + list.add("\u00a7o" + StatCollector.translateToLocal("manual2.tooltip")); break; case 2: - list.add("\u00a7o"+StatCollector.translateToLocal("manual3.tooltip")); + list.add("\u00a7o" + StatCollector.translateToLocal("manual3.tooltip")); break; } } diff --git a/src/main/java/tconstruct/items/MaterialItem.java b/src/main/java/tconstruct/items/MaterialItem.java index 055fd664..fc9e83e1 100644 --- a/src/main/java/tconstruct/items/MaterialItem.java +++ b/src/main/java/tconstruct/items/MaterialItem.java @@ -1,11 +1,14 @@ package tconstruct.items; +import tconstruct.library.TConstructRegistry; +import mantle.items.abstracts.CraftingItem; + public class MaterialItem extends CraftingItem { public MaterialItem(int id) { - super(id, materialNames, getTextures(), "materials/"); + super(id, materialNames, getTextures(), "materials/", "tinker", TConstructRegistry.materialTab); } private static String[] getTextures () @@ -21,11 +24,10 @@ public class MaterialItem extends CraftingItem return names; } - static String[] materialNames = new String[] { "PaperStack", "SlimeCrystal", "SearedBrick", "CobaltIngot", "ArditeIngot", "ManyullynIngot", "Mossball", "LavaCrystal", "NecroticBone", - "CopperIngot", "TinIngot", "AluminumIngot", "RawAluminum", "BronzeIngot", "AluBrassIngot", "AlumiteIngot", "SteelIngot", "BlueSlimeCrystal", "ObsidianIngot", "IronNugget", "CopperNugget", "TinNugget", - "AluminumNugget", "EssenceCrystal", "AluBrassNugget", "SilkyCloth", "SilkyJewel", "ObsidianNugget", "CobaltNugget", "ArditeNugget", "ManyullynNugget", "BronzeNugget", "AlumiteNugget", - "SteelNugget", "PigIronIngot", "PigIronNugget", "GlueBall", "SearedBrick" }; + "CopperIngot", "TinIngot", "AluminumIngot", "RawAluminum", "BronzeIngot", "AluBrassIngot", "AlumiteIngot", "SteelIngot", "BlueSlimeCrystal", "ObsidianIngot", "IronNugget", "CopperNugget", + "TinNugget", "AluminumNugget", "EssenceCrystal", "AluBrassNugget", "SilkyCloth", "SilkyJewel", "ObsidianNugget", "CobaltNugget", "ArditeNugget", "ManyullynNugget", "BronzeNugget", + "AlumiteNugget", "SteelNugget", "PigIronIngot", "PigIronNugget", "GlueBall", "SearedBrick" }; static String[] craftingTextures = new String[] { "paperstack", "slimecrystal", "searedbrick", "cobaltingot", "arditeingot", "manyullyningot", "mossball", "lavacrystal", "necroticbone", "copperingot", "tiningot", "aluminumingot", "aluminumraw", "bronzeingot", "alubrassingot", "alumiteingot", "steelingot", "blueslimecrystal", "obsidianingot", "nugget_iron", diff --git a/src/main/java/tconstruct/items/OreBerries.java b/src/main/java/tconstruct/items/OreBerries.java index 4acdd9e6..cc45b5b9 100644 --- a/src/main/java/tconstruct/items/OreBerries.java +++ b/src/main/java/tconstruct/items/OreBerries.java @@ -2,6 +2,8 @@ package tconstruct.items; import java.util.List; +import tconstruct.library.TConstructRegistry; +import mantle.items.abstracts.CraftingItem; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.player.EntityPlayer; @@ -18,7 +20,7 @@ public class OreBerries extends CraftingItem public OreBerries(int id) { - super(id, names, tex, "oreberries/"); + super(id, names, tex, "oreberries/", "tinker", TConstructRegistry.materialTab); } @Override diff --git a/src/main/java/tconstruct/items/Pattern.java b/src/main/java/tconstruct/items/Pattern.java index 4b43ffea..9204c274 100644 --- a/src/main/java/tconstruct/items/Pattern.java +++ b/src/main/java/tconstruct/items/Pattern.java @@ -1,7 +1,10 @@ package tconstruct.items; import cpw.mods.fml.relauncher.*; + import java.util.List; + +import mantle.items.abstracts.CraftingItem; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -16,10 +19,10 @@ public class Pattern extends CraftingItem implements IPattern { this(id, patternName, getPatternNames(patternType), folder); } - + public Pattern(int id, String[] names, String[] patternTypes, String folder) { - super(id, names, patternTypes, folder); + super(id, names, patternTypes, folder, "tinker", TConstructRegistry.materialTab); this.setHasSubtypes(true); this.setMaxDamage(0); this.setContainerItem(this); diff --git a/src/main/java/tconstruct/items/ToolPart.java b/src/main/java/tconstruct/items/ToolPart.java index 06920ad0..dfeb8a43 100644 --- a/src/main/java/tconstruct/items/ToolPart.java +++ b/src/main/java/tconstruct/items/ToolPart.java @@ -2,11 +2,13 @@ package tconstruct.items; import java.util.List; +import mantle.items.abstracts.CraftingItem; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import tconstruct.common.TContent; import tconstruct.common.TRepo; +import tconstruct.library.TConstructRegistry; import tconstruct.library.util.IToolPart; public class ToolPart extends CraftingItem implements IToolPart @@ -15,7 +17,7 @@ public class ToolPart extends CraftingItem implements IToolPart public ToolPart(int id, String textureType, String name) { - super(id, toolMaterialNames, buildTextureNames(textureType), "parts/"); + super(id, toolMaterialNames, buildTextureNames(textureType), "parts/", "tinker", TConstructRegistry.materialTab); this.setHasSubtypes(true); this.setMaxDamage(0); this.partName = name; diff --git a/src/main/java/tconstruct/items/armor/HeartCanister.java b/src/main/java/tconstruct/items/armor/HeartCanister.java index 13606f03..08386746 100644 --- a/src/main/java/tconstruct/items/armor/HeartCanister.java +++ b/src/main/java/tconstruct/items/armor/HeartCanister.java @@ -3,10 +3,10 @@ package tconstruct.items.armor; import java.util.List; import tconstruct.TConstruct; -import tconstruct.items.CraftingItem; +import tconstruct.library.TConstructRegistry; import tconstruct.util.player.ArmorExtended; import tconstruct.util.player.TPlayerStats; - +import mantle.items.abstracts.CraftingItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -19,7 +19,7 @@ public class HeartCanister extends CraftingItem public HeartCanister(int id) { - super(id, new String[] { "empty", "miniheart.red", "heart" }, new String[] { "canister_empty", "miniheart_red", "canister_heart" }, ""); + super(id, new String[] { "empty", "miniheart.red", "heart" }, new String[] { "canister_empty", "miniheart_red", "canister_heart" }, "", "tinker", TConstructRegistry.materialTab ); this.setMaxStackSize(10); } diff --git a/src/main/java/tconstruct/items/armor/Knapsack.java b/src/main/java/tconstruct/items/armor/Knapsack.java index 3bc4b6e3..03852f48 100644 --- a/src/main/java/tconstruct/items/armor/Knapsack.java +++ b/src/main/java/tconstruct/items/armor/Knapsack.java @@ -1,14 +1,14 @@ package tconstruct.items.armor; import tconstruct.TConstruct; +import tconstruct.library.TConstructRegistry; import tconstruct.util.player.*; - +import mantle.items.abstracts.CraftingItem; import net.minecraft.entity.Entity; import net.minecraft.world.World; import java.util.List; -import tconstruct.items.CraftingItem; import net.minecraft.util.StatCollector; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -20,7 +20,7 @@ public class Knapsack extends CraftingItem public Knapsack(int id) { - super(id, new String[] { "knapsack" }, new String[] { "knapsack" }, "armor/"); + super(id, new String[] { "knapsack" }, new String[] { "knapsack" }, "armor/", "tinker", TConstructRegistry.materialTab); this.setMaxStackSize(10); } @@ -35,20 +35,23 @@ public class Knapsack extends CraftingItem break; } } - + @Override - public void onArmorTickUpdate(World world, EntityPlayer player, ItemStack itemStack) + public void onArmorTickUpdate (World world, EntityPlayer player, ItemStack itemStack) { - TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username); - KnapsackInventory inv = stats.knapsack; - - if (stats != null && inv != null) { - for(int i = 0; i < inv.getSizeInventory(); i++){ - if(inv.getStackInSlot(i) != null){ - inv.getStackInSlot(i).getItem().onUpdate(inv.getStackInSlot(i), player.worldObj, player, i, false); - } - } - } + TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username); + KnapsackInventory inv = stats.knapsack; + + if (stats != null && inv != null) + { + for (int i = 0; i < inv.getSizeInventory(); i++) + { + if (inv.getStackInSlot(i) != null) + { + inv.getStackInSlot(i).getItem().onUpdate(inv.getStackInSlot(i), player.worldObj, player, i, false); + } + } + } } }