mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 03:49:29 +00:00
TContent refactor Part 1
This commit is contained in:
1 parent
241bfcf0d5
commit
1a74c0768f
77 files changed
+1884
-5647
No files matched your search
@@ -1,6 +1,6 @@
|
||||
package tconstruct.items;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.world.World;
|
||||
@@ -74,7 +74,7 @@ public class CraftingItem extends Item
|
||||
@Override
|
||||
public void onCreated(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
|
||||
{
|
||||
if(par1ItemStack.itemID == TContent.blankPattern.itemID){
|
||||
if(par1ItemStack.itemID == TRepo.blankPattern.itemID){
|
||||
par3EntityPlayer.addStat(TAchievements.achievements.get("tconstruct.pattern"), 1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ import java.util.List;
|
||||
import net.minecraftforge.fluids.BlockFluidFinite;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.blocks.logic.LiquidTextureLogic;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
@@ -27,7 +27,7 @@ public class FilledBucket extends ItemBucket
|
||||
public FilledBucket(int id)
|
||||
{
|
||||
super(id, 0);
|
||||
//setTextureFile(TContent.craftingTexture);
|
||||
//setTextureFile(TRepo.craftingTexture);
|
||||
//setIconIndex(224);
|
||||
setUnlocalizedName("tconstruct.bucket");
|
||||
setContainerItem(Item.bucketEmpty);
|
||||
@@ -141,10 +141,10 @@ public class FilledBucket extends ItemBucket
|
||||
{
|
||||
try {
|
||||
int metadata = 0;
|
||||
if (TContent.fluidBlocks[type] instanceof BlockFluidFinite)
|
||||
if (TRepo.fluidBlocks[type] instanceof BlockFluidFinite)
|
||||
metadata = 7;
|
||||
|
||||
world.setBlock(clickX, clickY, clickZ, TContent.fluidBlocks[type].blockID, metadata, 3); //TODO: Merge liquids
|
||||
world.setBlock(clickX, clickY, clickZ, TRepo.fluidBlocks[type].blockID, metadata, 3); //TODO: Merge liquids
|
||||
} catch (ArrayIndexOutOfBoundsException ex) {
|
||||
TConstruct.logger.warning("AIOBE occured when placing bucket into world; " + ex);
|
||||
return false;
|
||||
|
||||
@@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import tconstruct.blocks.logic.TileEntityLandmine;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -58,25 +58,25 @@ public class ItemBlockLandmine extends ItemBlock
|
||||
@Override
|
||||
public boolean placeBlockAt (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata)
|
||||
{
|
||||
if (!world.setBlock(x, y, z, TContent.landmine.blockID, metadata, 3))
|
||||
if (!world.setBlock(x, y, z, TRepo.landmine.blockID, metadata, 3))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (world.getBlockId(x, y, z) == TContent.landmine.blockID)
|
||||
if (world.getBlockId(x, y, z) == TRepo.landmine.blockID)
|
||||
{
|
||||
TContent.landmine.onBlockPlacedBy(world, x, y, z, player, stack);
|
||||
TRepo.landmine.onBlockPlacedBy(world, x, y, z, player, stack);
|
||||
|
||||
TileEntityLandmine te = (TileEntityLandmine) world.getBlockTileEntity(x, y, z);
|
||||
if (te == null)
|
||||
{
|
||||
te = (TileEntityLandmine) TContent.landmine.createTileEntity(world, metadata);
|
||||
te = (TileEntityLandmine) TRepo.landmine.createTileEntity(world, metadata);
|
||||
}
|
||||
|
||||
te.triggerType = stack.getItemDamage();
|
||||
world.setBlockTileEntity(x, y, z, te);
|
||||
|
||||
TContent.landmine.onPostBlockPlaced(world, x, y, z, metadata);
|
||||
TRepo.landmine.onPostBlockPlaced(world, x, y, z, metadata);
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
@@ -2,7 +2,7 @@ package tconstruct.items.blocks;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -44,7 +44,7 @@ public class OreberryBushItem extends ItemBlock
|
||||
{
|
||||
Block block = Block.blocksList[world.getBlockId(x, y, z)];
|
||||
|
||||
if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TContent.oreBerry) && world.isAirBlock(x, y + 1, z))
|
||||
if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TRepo.oreBerry) && world.isAirBlock(x, y + 1, z))
|
||||
{
|
||||
world.setBlock(x, y + 1, z, blockID, stack.getItemDamage() % 4, 3);
|
||||
if (!player.capabilities.isCreativeMode)
|
||||
|
||||
@@ -2,7 +2,7 @@ package tconstruct.items.blocks;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -48,7 +48,7 @@ public class OreberryBushSecondItem extends ItemBlock
|
||||
{
|
||||
Block block = Block.blocksList[world.getBlockId(x, y, z)];
|
||||
|
||||
if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TContent.oreBerrySecond) && world.isAirBlock(x, y + 1, z))
|
||||
if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TRepo.oreBerrySecond) && world.isAirBlock(x, y + 1, z))
|
||||
{
|
||||
world.setBlock(x, y + 1, z, blockID, stack.getItemDamage() % 4, 3);
|
||||
if (!player.capabilities.isCreativeMode)
|
||||
|
||||
@@ -4,7 +4,7 @@ import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.Icon;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -28,7 +28,7 @@ public class SlimeTallGrassItem extends ItemBlock
|
||||
public Icon getIconFromDamage (int meta)
|
||||
{
|
||||
int arr = MathHelper.clamp_int(meta, 0, blockType.length);
|
||||
return TContent.slimeTallGrass.getIcon(0, arr);
|
||||
return TRepo.slimeTallGrass.getIcon(0, arr);
|
||||
}
|
||||
|
||||
public String getUnlocalizedName (ItemStack itemstack)
|
||||
|
||||
@@ -3,7 +3,7 @@ package tconstruct.items.tools;
|
||||
import java.util.List;
|
||||
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.crafting.ToolBuilder;
|
||||
import tconstruct.library.tools.ToolCore;
|
||||
|
||||
@@ -73,13 +73,13 @@ public class Arrow extends ToolCore
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.arrowhead;
|
||||
return TRepo.arrowhead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.fletching;
|
||||
return TRepo.fletching;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -125,7 +125,7 @@ public class Arrow extends ToolCore
|
||||
|
||||
if (tool == null)
|
||||
{
|
||||
if (!TContent.supressMissingToolLogs)
|
||||
if (!TRepo.supressMissingToolLogs)
|
||||
{
|
||||
TConstruct.logger.warning("Creative builder failed tool for Vanilla style" + this.getToolName());
|
||||
TConstruct.logger.warning("Make sure you do not have item ID conflicts");
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.Weapon;
|
||||
import net.minecraft.item.Item;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
@@ -99,7 +99,7 @@ public class BattleSign extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.signHead;
|
||||
return TRepo.signHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.ActiveToolMod;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
@@ -58,25 +58,25 @@ public class Battleaxe extends HarvestTool
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.broadAxeHead;
|
||||
return TRepo.broadAxeHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getHandleItem ()
|
||||
{
|
||||
return TContent.toughRod;
|
||||
return TRepo.toughRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.broadAxeHead;
|
||||
return TRepo.broadAxeHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getExtraItem ()
|
||||
{
|
||||
return TContent.toughBinding;
|
||||
return TRepo.toughBinding;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -6,7 +6,7 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.entity.projectile.ArrowEntity;
|
||||
import tconstruct.library.crafting.ToolBuilder;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
@@ -63,7 +63,7 @@ public abstract class BowBase extends ToolCore
|
||||
time = event.charge;
|
||||
|
||||
boolean creative = player.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0;
|
||||
int slotID = getInventorySlotContainItem(TContent.arrow.itemID, player.inventory);
|
||||
int slotID = getInventorySlotContainItem(TRepo.arrow.itemID, player.inventory);
|
||||
int arrowID = getInventorySlotContainItem(Item.arrow.itemID, player.inventory);
|
||||
int arrowState = 0;
|
||||
ItemStack tinkerArrow = null;
|
||||
@@ -149,7 +149,7 @@ public abstract class BowBase extends ToolCore
|
||||
//if (tinkerArrow != null)
|
||||
if (slotID != -1 && (arrowID == -1 || slotID < arrowID))
|
||||
{
|
||||
player.inventory.consumeInventoryItem(TContent.arrow.itemID);
|
||||
player.inventory.consumeInventoryItem(TRepo.arrow.itemID);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -215,7 +215,7 @@ public abstract class BowBase extends ToolCore
|
||||
return event.result;
|
||||
}
|
||||
|
||||
if (player.capabilities.isCreativeMode || player.inventory.hasItem(Item.arrow.itemID) || player.inventory.hasItem(TContent.arrow.itemID))
|
||||
if (player.capabilities.isCreativeMode || player.inventory.hasItem(Item.arrow.itemID) || player.inventory.hasItem(TRepo.arrow.itemID))
|
||||
{
|
||||
player.setItemInUse(stack, this.getMaxItemUseDuration(stack));
|
||||
}
|
||||
@@ -771,7 +771,7 @@ public abstract class BowBase extends ToolCore
|
||||
ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, 0), accessoryStack, extraStack, name + getToolName());
|
||||
if (tool == null)
|
||||
{
|
||||
if (!TContent.supressMissingToolLogs)
|
||||
if (!TRepo.supressMissingToolLogs)
|
||||
{
|
||||
TConstruct.logger.warning("Creative builder failed tool for " + name + this.getToolName());
|
||||
TConstruct.logger.warning("Make sure you do not have item ID conflicts");
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.Weapon;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
@@ -15,13 +15,13 @@ public class Broadsword extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.swordBlade;
|
||||
return TRepo.swordBlade;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.wideGuard;
|
||||
return TRepo.wideGuard;
|
||||
}
|
||||
|
||||
public float getDurabilityModifier ()
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.crafting.Detailing.DetailInput;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.library.tools.ToolCore;
|
||||
@@ -211,7 +211,7 @@ public class Chisel extends ToolCore
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.chiselHead;
|
||||
return TRepo.chiselHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.library.tools.Weapon;
|
||||
import tconstruct.util.config.PHConstruct;
|
||||
@@ -25,25 +25,25 @@ public class Cleaver extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.largeSwordBlade;
|
||||
return TRepo.largeSwordBlade;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getHandleItem ()
|
||||
{
|
||||
return TContent.toughRod;
|
||||
return TRepo.toughRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.largePlate;
|
||||
return TRepo.largePlate;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getExtraItem ()
|
||||
{
|
||||
return TContent.toughRod;
|
||||
return TRepo.toughRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -2,7 +2,7 @@ package tconstruct.items.tools;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.Weapon;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
@@ -19,13 +19,13 @@ public class Cutlass extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.swordBlade;
|
||||
return TRepo.swordBlade;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.fullGuard;
|
||||
return TRepo.fullGuard;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.entity.projectile.DaggerEntity;
|
||||
import tconstruct.library.tools.Weapon;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -97,12 +97,12 @@ public class Dagger extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.knifeBlade;
|
||||
return TRepo.knifeBlade;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.crossbar;
|
||||
return TRepo.crossbar;
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.ActiveToolMod;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
@@ -42,25 +42,25 @@ public class Excavator extends HarvestTool
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.excavatorHead;
|
||||
return TRepo.excavatorHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getHandleItem ()
|
||||
{
|
||||
return TContent.toughRod;
|
||||
return TRepo.toughRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.largePlate;
|
||||
return TRepo.largePlate;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getExtraItem ()
|
||||
{
|
||||
return TContent.toughBinding;
|
||||
return TRepo.toughBinding;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -3,7 +3,7 @@ package tconstruct.items.tools;
|
||||
import java.util.List;
|
||||
|
||||
import tconstruct.blocks.logic.EquipLogic;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.crafting.ToolBuilder;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.library.tools.Weapon;
|
||||
@@ -121,14 +121,14 @@ public class FryingPan extends Weapon
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else if (!TContent.heldItemBlock.canPlaceBlockAt(world, x, y, z))
|
||||
else if (!TRepo.heldItemBlock.canPlaceBlockAt(world, x, y, z))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
world.setBlock(x, y, z, TContent.heldItemBlock.blockID, 0, 3);
|
||||
TContent.heldItemBlock.onBlockPlacedBy(world, x, y, z, player, stack);
|
||||
world.setBlock(x, y, z, TRepo.heldItemBlock.blockID, 0, 3);
|
||||
TRepo.heldItemBlock.onBlockPlacedBy(world, x, y, z, player, stack);
|
||||
world.playSoundEffect(x, y, z, "tinker:frypan_hit", 1.0F, (random.nextFloat() - random.nextFloat()) * 0.2F + 0.65F);
|
||||
|
||||
EquipLogic logic = (EquipLogic) world.getBlockTileEntity(x, y, z);
|
||||
@@ -143,7 +143,7 @@ public class FryingPan extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.frypanHead;
|
||||
return TRepo.frypanHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -3,7 +3,7 @@ package tconstruct.items.tools;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.ActiveToolMod;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.crafting.ToolBuilder;
|
||||
@@ -72,25 +72,25 @@ public class Hammer extends HarvestTool
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.hammerHead;
|
||||
return TRepo.hammerHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getHandleItem ()
|
||||
{
|
||||
return TContent.toughRod;
|
||||
return TRepo.toughRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.largePlate;
|
||||
return TRepo.largePlate;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getExtraItem ()
|
||||
{
|
||||
return TContent.largePlate;
|
||||
return TRepo.largePlate;
|
||||
}
|
||||
|
||||
public float getDurabilityModifier ()
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.library.tools.HarvestTool;
|
||||
import tconstruct.util.config.PHConstruct;
|
||||
@@ -48,7 +48,7 @@ public class Hatchet extends HarvestTool
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.hatchetHead;
|
||||
return TRepo.hatchetHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.Weapon;
|
||||
import net.minecraft.client.entity.EntityPlayerSP;
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -102,13 +102,13 @@ public class Longsword extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.swordBlade;
|
||||
return TRepo.swordBlade;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.handGuard;
|
||||
return TRepo.handGuard;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.ActiveToolMod;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
@@ -323,25 +323,25 @@ public class LumberAxe extends HarvestTool
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.broadAxeHead;
|
||||
return TRepo.broadAxeHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getHandleItem ()
|
||||
{
|
||||
return TContent.toughRod;
|
||||
return TRepo.toughRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.largePlate;
|
||||
return TRepo.largePlate;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getExtraItem ()
|
||||
{
|
||||
return TContent.toughBinding;
|
||||
return TRepo.toughBinding;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
||||
@@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.crafting.ToolBuilder;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.library.tools.DualHarvestTool;
|
||||
@@ -53,13 +53,13 @@ public class Mattock extends DualHarvestTool
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.hatchetHead;
|
||||
return TRepo.hatchetHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.shovelHead;
|
||||
return TRepo.shovelHead;
|
||||
}
|
||||
|
||||
public int durabilityTypeAccessory ()
|
||||
@@ -120,7 +120,7 @@ public class Mattock extends DualHarvestTool
|
||||
ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, id), accessoryStack, extraStack, name + getToolName());
|
||||
if (tool == null)
|
||||
{
|
||||
if (!TContent.supressMissingToolLogs)
|
||||
if (!TRepo.supressMissingToolLogs)
|
||||
{
|
||||
TConstruct.logger.warning("Creative builder failed tool for " + name + this.getToolName());
|
||||
TConstruct.logger.warning("Make sure you do not have item ID conflicts");
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.HarvestTool;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -30,13 +30,13 @@ public class Pickaxe extends HarvestTool
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.pickaxeHead;
|
||||
return TRepo.pickaxeHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.binding;
|
||||
return TRepo.binding;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.Weapon;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
@@ -73,13 +73,13 @@ public class Rapier extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.swordBlade;
|
||||
return TRepo.swordBlade;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.crossbar;
|
||||
return TRepo.crossbar;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -2,7 +2,7 @@ package tconstruct.items.tools;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.ActiveToolMod;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
@@ -45,25 +45,25 @@ public class Scythe extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.scytheBlade;
|
||||
return TRepo.scytheBlade;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getHandleItem ()
|
||||
{
|
||||
return TContent.toughRod;
|
||||
return TRepo.toughRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.toughBinding;
|
||||
return TRepo.toughBinding;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getExtraItem ()
|
||||
{
|
||||
return TContent.toughRod;
|
||||
return TRepo.toughRod;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
||||
@@ -9,7 +9,7 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -54,19 +54,19 @@ public class Shortbow extends BowBase
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.toolRod;
|
||||
return TRepo.toolRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getHandleItem ()
|
||||
{
|
||||
return TContent.bowstring;
|
||||
return TRepo.bowstring;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.toolRod;
|
||||
return TRepo.toolRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.HarvestTool;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -32,7 +32,7 @@ public class Shovel extends HarvestTool
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.shovelHead;
|
||||
return TRepo.shovelHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user