Reorganize folders for modules

This commit is contained in:
mDiyo committed 2014-06-04 21:44:48 -08:00
1 parent 2c14f315de
commit e2f0558b6f
370 files changed
+4274 -4788

No files matched your search

@@ -10,9 +10,9 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import tconstruct.TConstruct;
import tconstruct.common.TRepo;
import tconstruct.library.crafting.ToolBuilder;
import tconstruct.library.tools.ToolCore;
import tconstruct.tools.TinkerTools;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -73,13 +73,13 @@ public class Arrow extends ToolCore
@Override
public Item getHeadItem ()
{
return TRepo.arrowhead;
return TinkerTools.arrowhead;
}
@Override
public Item getAccessoryItem ()
{
return TRepo.fletching;
return TinkerTools.fletching;
}
@Override
@@ -105,7 +105,7 @@ public class Arrow extends ToolCore
ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, 3), new ItemStack(getHandleItem(), 1, 0), accessoryStack, extraStack, "");
if (tool == null)
{
if (!TRepo.supressMissingToolLogs)
if (!TinkerTools.supressMissingToolLogs)
{
TConstruct.logger.warn("Creative builder failed tool for Vanilla style" + this.getToolName());
TConstruct.logger.warn("Make sure you do not have item ID conflicts");
@@ -128,9 +128,9 @@ public class Arrow extends ToolCore
if (tool == null)
{
if (!TRepo.supressMissingToolLogs)
if (!TinkerTools.supressMissingToolLogs)
{
if (!TRepo.supressMissingToolLogs)
if (!TinkerTools.supressMissingToolLogs)
{
TConstruct.logger.warn("Creative builder failed tool for Vanilla style" + this.getToolName());
TConstruct.logger.warn("Make sure you do not have item ID conflicts");
@@ -1,8 +1,8 @@
package tconstruct.items.tools;
import net.minecraft.item.Item;
import tconstruct.common.TRepo;
import tconstruct.library.tools.Weapon;
import tconstruct.tools.TinkerTools;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -61,7 +61,7 @@ public class BattleSign extends Weapon
@Override
public Item getHeadItem ()
{
return TRepo.signHead;
return TinkerTools.signHead;
}
@Override
@@ -15,11 +15,11 @@ import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import tconstruct.common.TRepo;
import tconstruct.library.ActiveToolMod;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.tools.AbilityHelper;
import tconstruct.library.tools.HarvestTool;
import tconstruct.tools.TinkerTools;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -57,25 +57,25 @@ public class Battleaxe extends HarvestTool
@Override
public Item getHeadItem ()
{
return TRepo.broadAxeHead;
return TinkerTools.broadAxeHead;
}
@Override
public Item getHandleItem ()
{
return TRepo.toughRod;
return TinkerTools.toughRod;
}
@Override
public Item getAccessoryItem ()
{
return TRepo.broadAxeHead;
return TinkerTools.broadAxeHead;
}
@Override
public Item getExtraItem ()
{
return TRepo.toughBinding;
return TinkerTools.toughBinding;
}
@Override
@@ -22,11 +22,11 @@ import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.ArrowLooseEvent;
import net.minecraftforge.event.entity.player.ArrowNockEvent;
import tconstruct.TConstruct;
import tconstruct.common.TRepo;
import tconstruct.entity.projectile.ArrowEntity;
import tconstruct.library.crafting.ToolBuilder;
import tconstruct.library.tools.AbilityHelper;
import tconstruct.library.tools.ToolCore;
import tconstruct.tools.TinkerTools;
import tconstruct.tools.entity.ArrowEntity;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -65,7 +65,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(TRepo.arrow, player.inventory);
int slotID = getInventorySlotContainItem(TinkerTools.arrow, player.inventory);
int arrowID = getInventorySlotContainItem(Items.arrow, player.inventory);
int arrowState = 0;
ItemStack tinkerArrow = null;
@@ -151,7 +151,7 @@ public abstract class BowBase extends ToolCore
// if (tinkerArrow != null)
if (slotID != -1 && (arrowID == -1 || slotID < arrowID))
{
player.inventory.consumeInventoryItem(TRepo.arrow);
player.inventory.consumeInventoryItem(TinkerTools.arrow);
}
else
{
@@ -222,7 +222,7 @@ public abstract class BowBase extends ToolCore
return event.result;
}
if (player.capabilities.isCreativeMode || player.inventory.hasItemStack(new ItemStack(Items.arrow)) || player.inventory.hasItemStack(new ItemStack(TRepo.arrow)))
if (player.capabilities.isCreativeMode || player.inventory.hasItemStack(new ItemStack(Items.arrow)) || player.inventory.hasItemStack(new ItemStack(TinkerTools.arrow)))
{
player.setItemInUse(stack, this.getMaxItemUseDuration(stack));
}
@@ -773,7 +773,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 (!TRepo.supressMissingToolLogs)
if (!TinkerTools.supressMissingToolLogs)
{
TConstruct.logger.warn("Creative builder failed tool for " + name + this.getToolName());
TConstruct.logger.warn("Make sure you do not have item ID conflicts");
@@ -1,8 +1,8 @@
package tconstruct.items.tools;
import net.minecraft.item.Item;
import tconstruct.common.TRepo;
import tconstruct.library.tools.Weapon;
import tconstruct.tools.TinkerTools;
public class Broadsword extends Weapon
{
@@ -15,13 +15,13 @@ public class Broadsword extends Weapon
@Override
public Item getHeadItem ()
{
return TRepo.swordBlade;
return TinkerTools.swordBlade;
}
@Override
public Item getAccessoryItem ()
{
return TRepo.wideGuard;
return TinkerTools.wideGuard;
}
@Override
@@ -12,10 +12,10 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.MovingObjectPosition.MovingObjectType;
import net.minecraft.world.World;
import tconstruct.TConstruct;
import tconstruct.common.TRepo;
import tconstruct.library.crafting.Detailing.DetailInput;
import tconstruct.library.tools.AbilityHelper;
import tconstruct.library.tools.ToolCore;
import tconstruct.tools.TinkerTools;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -213,7 +213,7 @@ public class Chisel extends ToolCore
@Override
public Item getHeadItem ()
{
return TRepo.chiselHead;
return TinkerTools.chiselHead;
}
@Override
@@ -7,9 +7,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.world.World;
import tconstruct.common.TRepo;
import tconstruct.library.tools.AbilityHelper;
import tconstruct.library.tools.Weapon;
import tconstruct.tools.TinkerTools;
import tconstruct.util.config.PHConstruct;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -25,25 +25,25 @@ public class Cleaver extends Weapon
@Override
public Item getHeadItem ()
{
return TRepo.largeSwordBlade;
return TinkerTools.largeSwordBlade;
}
@Override
public Item getHandleItem ()
{
return TRepo.toughRod;
return TinkerTools.toughRod;
}
@Override
public Item getAccessoryItem ()
{
return TRepo.largePlate;
return TinkerTools.largePlate;
}
@Override
public Item getExtraItem ()
{
return TRepo.toughRod;
return TinkerTools.toughRod;
}
@Override
@@ -1,8 +1,8 @@
package tconstruct.items.tools;
import net.minecraft.item.Item;
import tconstruct.common.TRepo;
import tconstruct.library.tools.Weapon;
import tconstruct.tools.TinkerTools;
public class Cutlass extends Weapon
{
@@ -15,13 +15,13 @@ public class Cutlass extends Weapon
@Override
public Item getHeadItem ()
{
return TRepo.swordBlade;
return TinkerTools.swordBlade;
}
@Override
public Item getAccessoryItem ()
{
return TRepo.fullGuard;
return TinkerTools.fullGuard;
}
@Override
@@ -5,9 +5,9 @@ import net.minecraft.item.EnumAction;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import tconstruct.common.TRepo;
import tconstruct.entity.projectile.DaggerEntity;
import tconstruct.library.tools.Weapon;
import tconstruct.tools.TinkerTools;
import tconstruct.tools.entity.DaggerEntity;
public class Dagger extends Weapon
{
@@ -101,12 +101,12 @@ public class Dagger extends Weapon
@Override
public Item getHeadItem ()
{
return TRepo.knifeBlade;
return TinkerTools.knifeBlade;
}
@Override
public Item getAccessoryItem ()
{
return TRepo.crossbar;
return TinkerTools.crossbar;
}
}
@@ -9,11 +9,11 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import tconstruct.common.TRepo;
import tconstruct.library.ActiveToolMod;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.tools.AbilityHelper;
import tconstruct.library.tools.HarvestTool;
import tconstruct.tools.TinkerTools;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -42,25 +42,25 @@ public class Excavator extends HarvestTool
@Override
public Item getHeadItem ()
{
return TRepo.excavatorHead;
return TinkerTools.excavatorHead;
}
@Override
public Item getHandleItem ()
{
return TRepo.toughRod;
return TinkerTools.toughRod;
}
@Override
public Item getAccessoryItem ()
{
return TRepo.largePlate;
return TinkerTools.largePlate;
}
@Override
public Item getExtraItem ()
{
return TRepo.toughBinding;
return TinkerTools.toughBinding;
}
@Override
@@ -12,11 +12,11 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.world.World;
import tconstruct.blocks.logic.EquipLogic;
import tconstruct.common.TRepo;
import tconstruct.library.crafting.ToolBuilder;
import tconstruct.library.tools.AbilityHelper;
import tconstruct.library.tools.Weapon;
import tconstruct.tools.TinkerTools;
import tconstruct.tools.logic.EquipLogic;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -125,14 +125,14 @@ public class FryingPan extends Weapon
{
return false;
}
else if (!TRepo.heldItemBlock.canPlaceBlockAt(world, x, y, z))
else if (!TinkerTools.heldItemBlock.canPlaceBlockAt(world, x, y, z))
{
return false;
}
else
{
world.setBlock(x, y, z, TRepo.heldItemBlock, 0, 3);
TRepo.heldItemBlock.onBlockPlacedBy(world, x, y, z, player, stack);
world.setBlock(x, y, z, TinkerTools.heldItemBlock, 0, 3);
TinkerTools.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.getTileEntity(x, y, z);
@@ -147,7 +147,7 @@ public class FryingPan extends Weapon
@Override
public Item getHeadItem ()
{
return TRepo.frypanHead;
return TinkerTools.frypanHead;
}
@Override
@@ -14,12 +14,12 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import tconstruct.common.TRepo;
import tconstruct.library.ActiveToolMod;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.crafting.ToolBuilder;
import tconstruct.library.tools.AbilityHelper;
import tconstruct.library.tools.HarvestTool;
import tconstruct.tools.TinkerTools;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -73,25 +73,25 @@ public class Hammer extends HarvestTool
@Override
public Item getHeadItem ()
{
return TRepo.hammerHead;
return TinkerTools.hammerHead;
}
@Override
public Item getHandleItem ()
{
return TRepo.toughRod;
return TinkerTools.toughRod;
}
@Override
public Item getAccessoryItem ()
{
return TRepo.largePlate;
return TinkerTools.largePlate;
}
@Override
public Item getExtraItem ()
{
return TRepo.largePlate;
return TinkerTools.largePlate;
}
@Override
@@ -6,9 +6,9 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import tconstruct.common.TRepo;
import tconstruct.library.tools.AbilityHelper;
import tconstruct.library.tools.HarvestTool;
import tconstruct.tools.TinkerTools;
import tconstruct.util.config.PHConstruct;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -50,7 +50,7 @@ public class Hatchet extends HarvestTool
@Override
public Item getHeadItem ()
{
return TRepo.hatchetHead;
return TinkerTools.hatchetHead;
}
@Override
@@ -8,8 +8,8 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import tconstruct.common.TRepo;
import tconstruct.library.tools.Weapon;
import tconstruct.tools.TinkerTools;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -102,13 +102,13 @@ public class Longsword extends Weapon
@Override
public Item getHeadItem ()
{
return TRepo.swordBlade;
return TinkerTools.swordBlade;
}
@Override
public Item getAccessoryItem ()
{
return TRepo.handGuard;
return TinkerTools.handGuard;
}
@Override
@@ -9,11 +9,11 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import tconstruct.common.TRepo;
import tconstruct.library.ActiveToolMod;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.tools.AbilityHelper;
import tconstruct.library.tools.HarvestTool;
import tconstruct.tools.TinkerTools;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -324,25 +324,25 @@ public class LumberAxe extends HarvestTool
@Override
public Item getHeadItem ()
{
return TRepo.broadAxeHead;
return TinkerTools.broadAxeHead;
}
@Override
public Item getHandleItem ()
{
return TRepo.toughRod;
return TinkerTools.toughRod;
}
@Override
public Item getAccessoryItem ()
{
return TRepo.largePlate;
return TinkerTools.largePlate;
}
@Override
public Item getExtraItem ()
{
return TRepo.toughBinding;
return TinkerTools.toughBinding;
}
@SideOnly(Side.CLIENT)
@@ -9,10 +9,10 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import tconstruct.TConstruct;
import tconstruct.common.TRepo;
import tconstruct.library.crafting.ToolBuilder;
import tconstruct.library.tools.AbilityHelper;
import tconstruct.library.tools.DualHarvestTool;
import tconstruct.tools.TinkerTools;
import tconstruct.util.config.PHConstruct;
public class Mattock extends DualHarvestTool
@@ -59,13 +59,13 @@ public class Mattock extends DualHarvestTool
@Override
public Item getHeadItem ()
{
return TRepo.hatchetHead;
return TinkerTools.hatchetHead;
}
@Override
public Item getAccessoryItem ()
{
return TRepo.shovelHead;
return TinkerTools.shovelHead;
}
@Override
@@ -128,7 +128,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 (!TRepo.supressMissingToolLogs)
if (!TinkerTools.supressMissingToolLogs)
{
TConstruct.logger.warn("Creative builder failed tool for " + name + this.getToolName());
TConstruct.logger.warn("Make sure you do not have item ID conflicts");
@@ -2,8 +2,8 @@ package tconstruct.items.tools;
import net.minecraft.block.material.Material;
import net.minecraft.item.Item;
import tconstruct.common.TRepo;
import tconstruct.library.tools.HarvestTool;
import tconstruct.tools.TinkerTools;
public class Pickaxe extends HarvestTool
{
@@ -30,13 +30,13 @@ public class Pickaxe extends HarvestTool
@Override
public Item getHeadItem ()
{
return TRepo.pickaxeHead;
return TinkerTools.pickaxeHead;
}
@Override
public Item getAccessoryItem ()
{
return TRepo.binding;
return TinkerTools.binding;
}
@Override
@@ -15,7 +15,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import tconstruct.entity.projectile.LaunchedPotion;
import tconstruct.tools.entity.LaunchedPotion;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -8,8 +8,8 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import tconstruct.common.TRepo;
import tconstruct.library.tools.Weapon;
import tconstruct.tools.TinkerTools;
public class Rapier extends Weapon
{
@@ -75,13 +75,13 @@ public class Rapier extends Weapon
@Override
public Item getHeadItem ()
{
return TRepo.swordBlade;
return TinkerTools.swordBlade;
}
@Override
public Item getAccessoryItem ()
{
return TRepo.crossbar;
return TinkerTools.crossbar;
}
@Override
@@ -19,11 +19,11 @@ import net.minecraft.stats.StatList;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World;
import net.minecraftforge.common.IShearable;
import tconstruct.common.TRepo;
import tconstruct.library.ActiveToolMod;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.tools.AbilityHelper;
import tconstruct.library.tools.Weapon;
import tconstruct.tools.TinkerTools;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -52,25 +52,25 @@ public class Scythe extends Weapon
@Override
public Item getHeadItem ()
{
return TRepo.scytheBlade;
return TinkerTools.scytheBlade;
}
@Override
public Item getHandleItem ()
{
return TRepo.toughRod;
return TinkerTools.toughRod;
}
@Override
public Item getAccessoryItem ()
{
return TRepo.toughBinding;
return TinkerTools.toughBinding;
}
@Override
public Item getExtraItem ()
{
return TRepo.toughRod;
return TinkerTools.toughRod;
}
@SideOnly(Side.CLIENT)
@@ -10,7 +10,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import tconstruct.common.TRepo;
import tconstruct.tools.TinkerTools;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -55,19 +55,19 @@ public class Shortbow extends BowBase
@Override
public Item getHeadItem ()
{
return TRepo.toolRod;
return TinkerTools.toolRod;
}
@Override
public Item getHandleItem ()
{
return TRepo.bowstring;
return TinkerTools.bowstring;
}
@Override
public Item getAccessoryItem ()
{
return TRepo.toolRod;
return TinkerTools.toolRod;
}
@Override
@@ -2,8 +2,8 @@ package tconstruct.items.tools;
import net.minecraft.block.material.Material;
import net.minecraft.item.Item;
import tconstruct.common.TRepo;
import tconstruct.library.tools.HarvestTool;
import tconstruct.tools.TinkerTools;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -32,7 +32,7 @@ public class Shovel extends HarvestTool
@Override
public Item getHeadItem ()
{
return TRepo.shovelHead;
return TinkerTools.shovelHead;
}
@Override