mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 03:49:29 +00:00
more 1.7 work
This commit is contained in:
1 parent
3bf37fa6a7
commit
3c23d27cf7
48 files changed
+330
-332
No files matched your search
@@ -9,9 +9,9 @@ public class ArmorBasic extends ItemArmor
|
||||
|
||||
public String textureName;
|
||||
|
||||
public ArmorBasic(int par1, EnumArmorMaterial par2EnumArmorMaterial, int par3, String textureName)
|
||||
public ArmorBasic(ArmorMaterial par2EnumArmorMaterial, int par3, String textureName)
|
||||
{
|
||||
super(par1, par2EnumArmorMaterial, 0, par3);
|
||||
super(par2EnumArmorMaterial, 0, par3);
|
||||
this.textureName = textureName;
|
||||
}
|
||||
|
||||
|
||||
@@ -19,9 +19,9 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
public class Arrow extends ToolCore
|
||||
{
|
||||
|
||||
public Arrow(int id)
|
||||
public Arrow()
|
||||
{
|
||||
super(id, 3);
|
||||
super(3);
|
||||
this.setUnlocalizedName("InfiTool.Arrow");
|
||||
this.setMaxStackSize(64);
|
||||
this.setMaxDamage(0);
|
||||
|
||||
@@ -8,9 +8,9 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class BattleSign extends Weapon
|
||||
{
|
||||
public BattleSign(int itemID)
|
||||
public BattleSign()
|
||||
{
|
||||
super(itemID, 1);
|
||||
super(1);
|
||||
this.setUnlocalizedName("InfiTool.Battlesign");
|
||||
}
|
||||
|
||||
|
||||
@@ -11,13 +11,13 @@ import tconstruct.entity.projectile.ArrowEntity;
|
||||
import tconstruct.library.crafting.ToolBuilder;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.library.tools.ToolCore;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
import net.minecraft.enchantment.EnchantmentHelper;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
import net.minecraft.entity.projectile.EntityArrow;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.EnumAction;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -32,9 +32,9 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public abstract class BowBase extends ToolCore
|
||||
{
|
||||
public BowBase(int itemID)
|
||||
public BowBase()
|
||||
{
|
||||
super(itemID, 0);
|
||||
super(0);
|
||||
}
|
||||
|
||||
public int durabilityTypeAccessory ()
|
||||
@@ -64,7 +64,7 @@ public abstract class BowBase extends ToolCore
|
||||
|
||||
boolean creative = player.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0;
|
||||
int slotID = getInventorySlotContainItem(TRepo.arrow, player.inventory);
|
||||
int arrowID = getInventorySlotContainItem(Item.arrow, player.inventory);
|
||||
int arrowID = getInventorySlotContainItem(Items.arrow, player.inventory);
|
||||
int arrowState = 0;
|
||||
ItemStack tinkerArrow = null;
|
||||
if (slotID != -1)
|
||||
@@ -153,7 +153,7 @@ public abstract class BowBase extends ToolCore
|
||||
}
|
||||
else
|
||||
{
|
||||
player.inventory.consumeInventoryItem(Item.arrow);
|
||||
player.inventory.consumeInventoryItem(Items.arrow);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6,9 +6,9 @@ import net.minecraft.item.Item;
|
||||
|
||||
public class Broadsword extends Weapon
|
||||
{
|
||||
public Broadsword(int itemID)
|
||||
public Broadsword()
|
||||
{
|
||||
super(itemID, 4);
|
||||
super(4);
|
||||
this.setUnlocalizedName("InfiTool.Broadsword");
|
||||
}
|
||||
|
||||
|
||||
@@ -12,17 +12,17 @@ import net.minecraft.item.EnumAction;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.EnumMovingObjectType;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.util.MovingObjectPosition.MovingObjectType;
|
||||
import net.minecraft.world.World;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class Chisel extends ToolCore
|
||||
{
|
||||
public Chisel(int id)
|
||||
public Chisel()
|
||||
{
|
||||
super(id, 0);
|
||||
super(0);
|
||||
this.setUnlocalizedName("InfiTool.Chisel");
|
||||
this.setContainerItem(this);
|
||||
}
|
||||
@@ -89,7 +89,7 @@ public class Chisel extends ToolCore
|
||||
{
|
||||
return itemstack;
|
||||
}
|
||||
if (movingobjectposition.typeOfHit == EnumMovingObjectType.TILE)
|
||||
if (movingobjectposition.typeOfHit == MovingObjectType.TILE)
|
||||
{
|
||||
int x = movingobjectposition.blockX;
|
||||
int y = movingobjectposition.blockY;
|
||||
|
||||
@@ -16,9 +16,9 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class Cleaver extends Weapon
|
||||
{
|
||||
public Cleaver(int itemID)
|
||||
public Cleaver()
|
||||
{
|
||||
super(itemID, 6);
|
||||
super(6);
|
||||
this.setUnlocalizedName("InfiTool.Cleaver");
|
||||
}
|
||||
|
||||
|
||||
@@ -1,18 +1,15 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.Weapon;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
public class Cutlass extends Weapon
|
||||
{
|
||||
public Cutlass(int itemID)
|
||||
{
|
||||
super(itemID, 4);
|
||||
super(4);
|
||||
this.setUnlocalizedName("InfiTool.Cutlass");
|
||||
}
|
||||
|
||||
|
||||
@@ -11,9 +11,9 @@ import net.minecraft.world.World;
|
||||
|
||||
public class Dagger extends Weapon
|
||||
{
|
||||
public Dagger(int id)
|
||||
public Dagger()
|
||||
{
|
||||
super(id, 1);
|
||||
super(1);
|
||||
this.setUnlocalizedName("InfiTool.Dagger");
|
||||
}
|
||||
|
||||
|
||||
@@ -19,9 +19,9 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class Excavator extends HarvestTool
|
||||
{
|
||||
public Excavator(int itemID)
|
||||
public Excavator()
|
||||
{
|
||||
super(itemID, 2);
|
||||
super(2);
|
||||
this.setUnlocalizedName("InfiTool.Excavator");
|
||||
}
|
||||
|
||||
|
||||
@@ -24,9 +24,9 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class FryingPan extends Weapon
|
||||
{
|
||||
public FryingPan(int itemID)
|
||||
public FryingPan()
|
||||
{
|
||||
super(itemID, 2);
|
||||
super(2);
|
||||
this.setUnlocalizedName("InfiTool.FryPan");
|
||||
}
|
||||
|
||||
|
||||
@@ -15,9 +15,9 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class Hatchet extends HarvestTool
|
||||
{
|
||||
public Hatchet(int itemID)
|
||||
public Hatchet()
|
||||
{
|
||||
super(itemID, 3);
|
||||
super(3);
|
||||
this.setUnlocalizedName("InfiTool.Axe");
|
||||
}
|
||||
|
||||
|
||||
@@ -15,9 +15,9 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class Longsword extends Weapon
|
||||
{
|
||||
public Longsword(int itemID)
|
||||
public Longsword()
|
||||
{
|
||||
super(itemID, 4);
|
||||
super(4);
|
||||
this.setUnlocalizedName("InfiTool.Longsword");
|
||||
}
|
||||
|
||||
|
||||
@@ -19,9 +19,9 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class LumberAxe extends HarvestTool
|
||||
{
|
||||
public LumberAxe(int itemID)
|
||||
public LumberAxe()
|
||||
{
|
||||
super(itemID, 0);
|
||||
super(0);
|
||||
this.setUnlocalizedName("InfiTool.LumberAxe");
|
||||
}
|
||||
|
||||
|
||||
@@ -17,9 +17,9 @@ import tconstruct.util.config.PHConstruct;
|
||||
|
||||
public class Mattock extends DualHarvestTool
|
||||
{
|
||||
public Mattock(int itemID)
|
||||
public Mattock()
|
||||
{
|
||||
super(itemID, 3);
|
||||
super(3);
|
||||
this.setUnlocalizedName("InfiTool.Mattock");
|
||||
}
|
||||
|
||||
|
||||
@@ -7,9 +7,9 @@ import net.minecraft.item.Item;
|
||||
|
||||
public class Pickaxe extends HarvestTool
|
||||
{
|
||||
public Pickaxe(int itemID)
|
||||
public Pickaxe()
|
||||
{
|
||||
super(itemID, 1);
|
||||
super(1);
|
||||
this.setUnlocalizedName("InfiTool.Pickaxe");
|
||||
}
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ public class PotionLauncher extends Item
|
||||
|
||||
NBTTagCompound potionTag = new NBTTagCompound();
|
||||
potion.writeToNBT(potionTag);
|
||||
tags.setCompoundTag("LoadedPotion", potionTag);
|
||||
tags.setTag("LoadedPotion", potionTag);
|
||||
tags.setBoolean("Loaded", true);
|
||||
|
||||
if (!player.capabilities.isCreativeMode)
|
||||
@@ -115,7 +115,7 @@ public class PotionLauncher extends Item
|
||||
ItemStack stack = new ItemStack(b, 1, 0);
|
||||
NBTTagCompound compound = new NBTTagCompound();
|
||||
NBTTagCompound tags = new NBTTagCompound();
|
||||
compound.setCompoundTag("InfiTool", tags);
|
||||
compound.setTag("InfiTool", tags);
|
||||
|
||||
tags.setBoolean("Loaded", false);
|
||||
|
||||
|
||||
@@ -13,9 +13,9 @@ import net.minecraft.world.World;
|
||||
|
||||
public class Rapier extends Weapon
|
||||
{
|
||||
public Rapier(int itemID)
|
||||
public Rapier()
|
||||
{
|
||||
super(itemID, 2);
|
||||
super(2);
|
||||
this.setUnlocalizedName("InfiTool.Rapier");
|
||||
}
|
||||
|
||||
|
||||
@@ -22,9 +22,9 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class Scythe extends Weapon
|
||||
{
|
||||
public Scythe(int itemID)
|
||||
public Scythe()
|
||||
{
|
||||
super(itemID, 4);
|
||||
super(4);
|
||||
this.setUnlocalizedName("InfiTool.Scythe");
|
||||
}
|
||||
|
||||
|
||||
@@ -15,9 +15,9 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class Shortbow extends BowBase
|
||||
{
|
||||
public Shortbow(int itemID)
|
||||
public Shortbow()
|
||||
{
|
||||
super(itemID);
|
||||
super();
|
||||
this.setUnlocalizedName("InfiTool.Shortbow");
|
||||
}
|
||||
|
||||
|
||||
@@ -9,9 +9,9 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class Shovel extends HarvestTool
|
||||
{
|
||||
public Shovel(int itemID)
|
||||
public Shovel()
|
||||
{
|
||||
super(itemID, 2);
|
||||
super(2);
|
||||
this.setUnlocalizedName("InfiTool.Shovel");
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user