mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-20 20:22:36 +00:00
use mantle's craftingItem
This commit is contained in:
1 parent
51e0833ae8
commit
48220202bc
12 files changed
+80
-90
No files matched your search
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user