From ce1b9002baefcdf451759d6b4102371fc80d31ce Mon Sep 17 00:00:00 2001 From: mDiyo Date: Sun, 28 Apr 2013 02:37:19 -0700 Subject: [PATCH] Refactor Library --- mods/tinker/tconstruct/TConstruct.java | 2 +- mods/tinker/tconstruct/blocks/EquipBlock.java | 2 +- mods/tinker/tconstruct/blocks/GolemCoreBlock.java | 2 +- mods/tinker/tconstruct/blocks/GolemPedestalBlock.java | 2 +- mods/tinker/tconstruct/blocks/LavaTankBlock.java | 2 +- mods/tinker/tconstruct/blocks/SearedBlock.java | 2 +- mods/tinker/tconstruct/blocks/SmelteryBlock.java | 8 ++++---- mods/tinker/tconstruct/blocks/ToolStationBlock.java | 2 +- .../tconstruct/blocks/logic/CastingBasinLogic.java | 4 ++-- .../tconstruct/blocks/logic/CastingTableLogic.java | 4 ++-- mods/tinker/tconstruct/blocks/logic/EquipLogic.java | 2 +- mods/tinker/tconstruct/blocks/logic/FaucetLogic.java | 4 ++-- mods/tinker/tconstruct/blocks/logic/FrypanLogic.java | 2 +- .../tinker/tconstruct/blocks/logic/GolemCoreLogic.java | 2 +- .../tconstruct/blocks/logic/MultiServantLogic.java | 6 +++--- .../tconstruct/blocks/logic/PartCrafterLogic.java | 4 ++-- .../tconstruct/blocks/logic/PatternChestLogic.java | 2 +- .../tconstruct/blocks/logic/PatternShaperLogic.java | 2 +- .../tconstruct/blocks/logic/SmelteryDrainLogic.java | 2 +- mods/tinker/tconstruct/blocks/logic/SmelteryLogic.java | 10 +++++----- .../tconstruct/blocks/logic/ToolStationLogic.java | 2 +- .../tconstruct/client/SuperCustomToolRenderer.java | 2 +- mods/tinker/tconstruct/client/TProxyClient.java | 2 +- mods/tinker/tconstruct/client/gui/GuiManual.java | 2 +- mods/tinker/tconstruct/client/gui/PartCrafterGui.java | 2 +- mods/tinker/tconstruct/client/gui/ToolStationGui.java | 4 ++-- mods/tinker/tconstruct/common/TContent.java | 4 ++-- .../tconstruct/entity/projectile/DaggerEntity.java | 4 ++-- .../tconstruct/entity/projectile/RotatingBase.java | 2 +- .../inventory/PartCrafterChestContainer.java | 2 +- .../tconstruct/inventory/PartCrafterContainer.java | 2 +- .../tconstruct/inventory/PatternChestContainer.java | 2 +- mods/tinker/tconstruct/inventory/SlotPattern.java | 2 +- mods/tinker/tconstruct/inventory/SlotTool.java | 2 +- mods/tinker/tconstruct/items/Pattern.java | 2 +- mods/tinker/tconstruct/items/TitleIcon.java | 2 +- mods/tinker/tconstruct/items/ToolPart.java | 2 +- mods/tinker/tconstruct/items/tools/Axe.java | 4 ++-- mods/tinker/tconstruct/items/tools/BattleSign.java | 2 +- mods/tinker/tconstruct/items/tools/Broadsword.java | 2 +- mods/tinker/tconstruct/items/tools/Chisel.java | 2 +- mods/tinker/tconstruct/items/tools/Dagger.java | 2 +- mods/tinker/tconstruct/items/tools/FryingPan.java | 4 ++-- mods/tinker/tconstruct/items/tools/Hammer.java | 2 +- mods/tinker/tconstruct/items/tools/Longsword.java | 4 ++-- mods/tinker/tconstruct/items/tools/LumberAxe.java | 4 ++-- mods/tinker/tconstruct/items/tools/Mattock.java | 4 ++-- mods/tinker/tconstruct/items/tools/Pickaxe.java | 2 +- mods/tinker/tconstruct/items/tools/RangedWeapon.java | 2 +- mods/tinker/tconstruct/items/tools/Rapier.java | 4 ++-- mods/tinker/tconstruct/items/tools/Shovel.java | 2 +- mods/tinker/tconstruct/library/TConstructRegistry.java | 3 +++ .../library/{ => blocks}/InventoryBlock.java | 4 +++- .../library/{ => blocks}/InventoryLogic.java | 2 +- .../library/client/TConstructClientRegistry.java | 2 +- .../tconstruct/library/crafting/PatternBuilder.java | 2 +- .../tconstruct/library/crafting/ToolBuilder.java | 8 ++++---- .../tinker/tconstruct/library/crafting/ToolRecipe.java | 2 +- .../tconstruct/library/{ => tools}/AbilityHelper.java | 3 ++- .../library/{ => tools}/DualHarvestTool.java | 2 +- .../tconstruct/library/{ => tools}/HarvestTool.java | 2 +- .../tconstruct/library/{ => tools}/ToolCore.java | 3 ++- .../tconstruct/library/{ => tools}/ToolMaterial.java | 2 +- .../tinker/tconstruct/library/{ => tools}/ToolMod.java | 2 +- mods/tinker/tconstruct/library/{ => tools}/Weapon.java | 2 +- .../tconstruct/library/{ => util}/CoordTuple.java | 2 +- .../tconstruct/library/{ => util}/IActiveLogic.java | 2 +- .../tconstruct/library/{ => util}/IFacingLogic.java | 2 +- .../tconstruct/library/{ => util}/IMasterLogic.java | 2 +- .../tinker/tconstruct/library/{ => util}/IPattern.java | 2 +- .../tconstruct/library/{ => util}/IServantLogic.java | 2 +- .../tconstruct/library/{ => util}/IToolPart.java | 2 +- .../library/{ => util}/PiercingEntityDamage.java | 2 +- .../tinker/tconstruct/library/{ => util}/TabTools.java | 2 +- mods/tinker/tconstruct/modifiers/ModAttack.java | 4 ++-- mods/tinker/tconstruct/modifiers/ModBlaze.java | 4 ++-- mods/tinker/tconstruct/modifiers/ModBoolean.java | 2 +- mods/tinker/tconstruct/modifiers/ModDurability.java | 2 +- mods/tinker/tconstruct/modifiers/ModElectric.java | 2 +- mods/tinker/tconstruct/modifiers/ModExtraModifier.java | 2 +- mods/tinker/tconstruct/modifiers/ModInteger.java | 2 +- mods/tinker/tconstruct/modifiers/ModLapis.java | 6 +++--- mods/tinker/tconstruct/modifiers/ModPotion.java | 2 +- mods/tinker/tconstruct/modifiers/ModRedstone.java | 4 ++-- mods/tinker/tconstruct/modifiers/ModRepair.java | 2 +- mods/tinker/tconstruct/util/TCraftingHandler.java | 2 +- mods/tinker/tconstruct/util/network/TGuiHandler.java | 2 +- .../tinker/tconstruct/util/network/TPacketHandler.java | 2 +- mods/tinker/tconstruct/util/player/TPlayerHandler.java | 2 +- .../tconstruct/worldgen/TBaseWorldGenerator.java | 2 +- .../tconstruct/worldgen/village/ComponentSmeltery.java | 2 +- 91 files changed, 127 insertions(+), 120 deletions(-) rename mods/tinker/tconstruct/library/{ => blocks}/InventoryBlock.java (96%) rename mods/tinker/tconstruct/library/{ => blocks}/InventoryLogic.java (98%) rename mods/tinker/tconstruct/library/{ => tools}/AbilityHelper.java (99%) rename mods/tinker/tconstruct/library/{ => tools}/DualHarvestTool.java (99%) rename mods/tinker/tconstruct/library/{ => tools}/HarvestTool.java (99%) rename mods/tinker/tconstruct/library/{ => tools}/ToolCore.java (99%) rename mods/tinker/tconstruct/library/{ => tools}/ToolMaterial.java (97%) rename mods/tinker/tconstruct/library/{ => tools}/ToolMod.java (98%) rename mods/tinker/tconstruct/library/{ => tools}/Weapon.java (98%) rename mods/tinker/tconstruct/library/{ => util}/CoordTuple.java (96%) rename mods/tinker/tconstruct/library/{ => util}/IActiveLogic.java (69%) rename mods/tinker/tconstruct/library/{ => util}/IFacingLogic.java (86%) rename mods/tinker/tconstruct/library/{ => util}/IMasterLogic.java (64%) rename mods/tinker/tconstruct/library/{ => util}/IPattern.java (85%) rename mods/tinker/tconstruct/library/{ => util}/IServantLogic.java (82%) rename mods/tinker/tconstruct/library/{ => util}/IToolPart.java (71%) rename mods/tinker/tconstruct/library/{ => util}/PiercingEntityDamage.java (86%) rename mods/tinker/tconstruct/library/{ => util}/TabTools.java (88%) diff --git a/mods/tinker/tconstruct/TConstruct.java b/mods/tinker/tconstruct/TConstruct.java index 1e0410f1..3b76083e 100644 --- a/mods/tinker/tconstruct/TConstruct.java +++ b/mods/tinker/tconstruct/TConstruct.java @@ -3,7 +3,7 @@ package mods.tinker.tconstruct; import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.common.TProxyCommon; import mods.tinker.tconstruct.library.TConstructRegistry; -import mods.tinker.tconstruct.library.TabTools; +import mods.tinker.tconstruct.library.util.TabTools; import mods.tinker.tconstruct.util.PHConstruct; import mods.tinker.tconstruct.util.TCraftingHandler; import mods.tinker.tconstruct.util.TEventHandler; diff --git a/mods/tinker/tconstruct/blocks/EquipBlock.java b/mods/tinker/tconstruct/blocks/EquipBlock.java index 2d06e916..83083cb9 100644 --- a/mods/tinker/tconstruct/blocks/EquipBlock.java +++ b/mods/tinker/tconstruct/blocks/EquipBlock.java @@ -5,7 +5,7 @@ import java.util.Random; import mods.tinker.tconstruct.TConstruct; import mods.tinker.tconstruct.blocks.logic.FrypanLogic; import mods.tinker.tconstruct.client.block.FrypanRender; -import mods.tinker.tconstruct.library.InventoryBlock; +import mods.tinker.tconstruct.library.blocks.InventoryBlock; import mods.tinker.tconstruct.util.network.TGuiHandler; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/mods/tinker/tconstruct/blocks/GolemCoreBlock.java b/mods/tinker/tconstruct/blocks/GolemCoreBlock.java index 17833341..972c08cd 100644 --- a/mods/tinker/tconstruct/blocks/GolemCoreBlock.java +++ b/mods/tinker/tconstruct/blocks/GolemCoreBlock.java @@ -3,8 +3,8 @@ package mods.tinker.tconstruct.blocks; import mods.tinker.tconstruct.TConstruct; import mods.tinker.tconstruct.blocks.logic.GolemCoreLogic; import mods.tinker.tconstruct.client.block.GolemCoreRender; -import mods.tinker.tconstruct.library.InventoryBlock; import mods.tinker.tconstruct.library.TConstructRegistry; +import mods.tinker.tconstruct.library.blocks.InventoryBlock; import net.minecraft.block.material.Material; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; diff --git a/mods/tinker/tconstruct/blocks/GolemPedestalBlock.java b/mods/tinker/tconstruct/blocks/GolemPedestalBlock.java index eb9c6b95..4d8af1f5 100644 --- a/mods/tinker/tconstruct/blocks/GolemPedestalBlock.java +++ b/mods/tinker/tconstruct/blocks/GolemPedestalBlock.java @@ -3,7 +3,7 @@ package mods.tinker.tconstruct.blocks; import java.util.Random; import mods.tinker.tconstruct.blocks.logic.GolemPedestalLogic; -import mods.tinker.tconstruct.library.InventoryBlock; +import mods.tinker.tconstruct.library.blocks.InventoryBlock; import net.minecraft.block.material.Material; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; diff --git a/mods/tinker/tconstruct/blocks/LavaTankBlock.java b/mods/tinker/tconstruct/blocks/LavaTankBlock.java index 6ee11c5b..80ff164d 100644 --- a/mods/tinker/tconstruct/blocks/LavaTankBlock.java +++ b/mods/tinker/tconstruct/blocks/LavaTankBlock.java @@ -4,8 +4,8 @@ import java.util.List; import mods.tinker.tconstruct.blocks.logic.LavaTankLogic; import mods.tinker.tconstruct.client.block.TankRender; -import mods.tinker.tconstruct.library.IServantLogic; import mods.tinker.tconstruct.library.TConstructRegistry; +import mods.tinker.tconstruct.library.util.IServantLogic; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/mods/tinker/tconstruct/blocks/SearedBlock.java b/mods/tinker/tconstruct/blocks/SearedBlock.java index da4f78d7..489f2435 100644 --- a/mods/tinker/tconstruct/blocks/SearedBlock.java +++ b/mods/tinker/tconstruct/blocks/SearedBlock.java @@ -7,8 +7,8 @@ import mods.tinker.tconstruct.blocks.logic.CastingBasinLogic; import mods.tinker.tconstruct.blocks.logic.CastingTableLogic; import mods.tinker.tconstruct.blocks.logic.FaucetLogic; import mods.tinker.tconstruct.client.block.SearedRender; -import mods.tinker.tconstruct.library.InventoryBlock; import mods.tinker.tconstruct.library.TConstructRegistry; +import mods.tinker.tconstruct.library.blocks.InventoryBlock; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; diff --git a/mods/tinker/tconstruct/blocks/SmelteryBlock.java b/mods/tinker/tconstruct/blocks/SmelteryBlock.java index c5e595b5..e5e38a98 100644 --- a/mods/tinker/tconstruct/blocks/SmelteryBlock.java +++ b/mods/tinker/tconstruct/blocks/SmelteryBlock.java @@ -8,11 +8,11 @@ import mods.tinker.tconstruct.blocks.logic.MultiServantLogic; import mods.tinker.tconstruct.blocks.logic.SmelteryDrainLogic; import mods.tinker.tconstruct.blocks.logic.SmelteryLogic; import mods.tinker.tconstruct.client.block.SmelteryRender; -import mods.tinker.tconstruct.library.IFacingLogic; -import mods.tinker.tconstruct.library.IMasterLogic; -import mods.tinker.tconstruct.library.IServantLogic; -import mods.tinker.tconstruct.library.InventoryBlock; import mods.tinker.tconstruct.library.TConstructRegistry; +import mods.tinker.tconstruct.library.blocks.InventoryBlock; +import mods.tinker.tconstruct.library.util.IFacingLogic; +import mods.tinker.tconstruct.library.util.IMasterLogic; +import mods.tinker.tconstruct.library.util.IServantLogic; import mods.tinker.tconstruct.util.network.TGuiHandler; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; diff --git a/mods/tinker/tconstruct/blocks/ToolStationBlock.java b/mods/tinker/tconstruct/blocks/ToolStationBlock.java index 503ad3bc..1da1ce2c 100644 --- a/mods/tinker/tconstruct/blocks/ToolStationBlock.java +++ b/mods/tinker/tconstruct/blocks/ToolStationBlock.java @@ -8,8 +8,8 @@ import mods.tinker.tconstruct.blocks.logic.PatternChestLogic; import mods.tinker.tconstruct.blocks.logic.PatternShaperLogic; import mods.tinker.tconstruct.blocks.logic.ToolStationLogic; import mods.tinker.tconstruct.client.block.TableRender; -import mods.tinker.tconstruct.library.InventoryBlock; import mods.tinker.tconstruct.library.TConstructRegistry; +import mods.tinker.tconstruct.library.blocks.InventoryBlock; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; diff --git a/mods/tinker/tconstruct/blocks/logic/CastingBasinLogic.java b/mods/tinker/tconstruct/blocks/logic/CastingBasinLogic.java index 2a613b82..2c5c9783 100644 --- a/mods/tinker/tconstruct/blocks/logic/CastingBasinLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/CastingBasinLogic.java @@ -1,10 +1,10 @@ package mods.tinker.tconstruct.blocks.logic; import mods.tinker.tconstruct.TConstruct; -import mods.tinker.tconstruct.library.IPattern; -import mods.tinker.tconstruct.library.InventoryLogic; +import mods.tinker.tconstruct.library.blocks.InventoryLogic; import mods.tinker.tconstruct.library.crafting.CastingRecipe; import mods.tinker.tconstruct.library.crafting.LiquidBlockCasting; +import mods.tinker.tconstruct.library.util.IPattern; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; diff --git a/mods/tinker/tconstruct/blocks/logic/CastingTableLogic.java b/mods/tinker/tconstruct/blocks/logic/CastingTableLogic.java index 1f7e375a..41451377 100644 --- a/mods/tinker/tconstruct/blocks/logic/CastingTableLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/CastingTableLogic.java @@ -1,10 +1,10 @@ package mods.tinker.tconstruct.blocks.logic; import mods.tinker.tconstruct.TConstruct; -import mods.tinker.tconstruct.library.IPattern; -import mods.tinker.tconstruct.library.InventoryLogic; +import mods.tinker.tconstruct.library.blocks.InventoryLogic; import mods.tinker.tconstruct.library.crafting.CastingRecipe; import mods.tinker.tconstruct.library.crafting.LiquidCasting; +import mods.tinker.tconstruct.library.util.IPattern; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; diff --git a/mods/tinker/tconstruct/blocks/logic/EquipLogic.java b/mods/tinker/tconstruct/blocks/logic/EquipLogic.java index dff875b6..b65ea0d1 100644 --- a/mods/tinker/tconstruct/blocks/logic/EquipLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/EquipLogic.java @@ -1,6 +1,6 @@ package mods.tinker.tconstruct.blocks.logic; -import mods.tinker.tconstruct.library.InventoryLogic; +import mods.tinker.tconstruct.library.blocks.InventoryLogic; import net.minecraft.item.ItemStack; /* Slots diff --git a/mods/tinker/tconstruct/blocks/logic/FaucetLogic.java b/mods/tinker/tconstruct/blocks/logic/FaucetLogic.java index cac833b5..989c3be1 100644 --- a/mods/tinker/tconstruct/blocks/logic/FaucetLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/FaucetLogic.java @@ -1,8 +1,8 @@ package mods.tinker.tconstruct.blocks.logic; import mods.tinker.tconstruct.TConstruct; -import mods.tinker.tconstruct.library.IActiveLogic; -import mods.tinker.tconstruct.library.IFacingLogic; +import mods.tinker.tconstruct.library.util.IActiveLogic; +import mods.tinker.tconstruct.library.util.IFacingLogic; import net.minecraft.entity.EntityLiving; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.INetworkManager; diff --git a/mods/tinker/tconstruct/blocks/logic/FrypanLogic.java b/mods/tinker/tconstruct/blocks/logic/FrypanLogic.java index 84a7ccb1..5c849393 100644 --- a/mods/tinker/tconstruct/blocks/logic/FrypanLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/FrypanLogic.java @@ -1,7 +1,7 @@ package mods.tinker.tconstruct.blocks.logic; import mods.tinker.tconstruct.inventory.FrypanContainer; -import mods.tinker.tconstruct.library.IActiveLogic; +import mods.tinker.tconstruct.library.util.IActiveLogic; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.InventoryPlayer; diff --git a/mods/tinker/tconstruct/blocks/logic/GolemCoreLogic.java b/mods/tinker/tconstruct/blocks/logic/GolemCoreLogic.java index 14fed5ff..821f1d22 100644 --- a/mods/tinker/tconstruct/blocks/logic/GolemCoreLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/GolemCoreLogic.java @@ -1,6 +1,6 @@ package mods.tinker.tconstruct.blocks.logic; -import mods.tinker.tconstruct.library.InventoryLogic; +import mods.tinker.tconstruct.library.blocks.InventoryLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/mods/tinker/tconstruct/blocks/logic/MultiServantLogic.java b/mods/tinker/tconstruct/blocks/logic/MultiServantLogic.java index fe1cd1f6..7174b087 100644 --- a/mods/tinker/tconstruct/blocks/logic/MultiServantLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/MultiServantLogic.java @@ -1,8 +1,8 @@ package mods.tinker.tconstruct.blocks.logic; -import mods.tinker.tconstruct.library.CoordTuple; -import mods.tinker.tconstruct.library.IMasterLogic; -import mods.tinker.tconstruct.library.IServantLogic; +import mods.tinker.tconstruct.library.util.CoordTuple; +import mods.tinker.tconstruct.library.util.IMasterLogic; +import mods.tinker.tconstruct.library.util.IServantLogic; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.network.INetworkManager; diff --git a/mods/tinker/tconstruct/blocks/logic/PartCrafterLogic.java b/mods/tinker/tconstruct/blocks/logic/PartCrafterLogic.java index e3ee95af..c4d7dc98 100644 --- a/mods/tinker/tconstruct/blocks/logic/PartCrafterLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/PartCrafterLogic.java @@ -2,9 +2,9 @@ package mods.tinker.tconstruct.blocks.logic; import mods.tinker.tconstruct.inventory.PartCrafterChestContainer; import mods.tinker.tconstruct.inventory.PartCrafterContainer; -import mods.tinker.tconstruct.library.IPattern; -import mods.tinker.tconstruct.library.InventoryLogic; +import mods.tinker.tconstruct.library.blocks.InventoryLogic; import mods.tinker.tconstruct.library.crafting.PatternBuilder; +import mods.tinker.tconstruct.library.util.IPattern; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; diff --git a/mods/tinker/tconstruct/blocks/logic/PatternChestLogic.java b/mods/tinker/tconstruct/blocks/logic/PatternChestLogic.java index d29a0713..26c0a3ca 100644 --- a/mods/tinker/tconstruct/blocks/logic/PatternChestLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/PatternChestLogic.java @@ -1,7 +1,7 @@ package mods.tinker.tconstruct.blocks.logic; import mods.tinker.tconstruct.inventory.PatternChestContainer; -import mods.tinker.tconstruct.library.InventoryLogic; +import mods.tinker.tconstruct.library.blocks.InventoryLogic; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.world.World; diff --git a/mods/tinker/tconstruct/blocks/logic/PatternShaperLogic.java b/mods/tinker/tconstruct/blocks/logic/PatternShaperLogic.java index e6a1a7fb..535b875b 100644 --- a/mods/tinker/tconstruct/blocks/logic/PatternShaperLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/PatternShaperLogic.java @@ -2,7 +2,7 @@ package mods.tinker.tconstruct.blocks.logic; import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.inventory.PatternShaperContainer; -import mods.tinker.tconstruct.library.InventoryLogic; +import mods.tinker.tconstruct.library.blocks.InventoryLogic; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; diff --git a/mods/tinker/tconstruct/blocks/logic/SmelteryDrainLogic.java b/mods/tinker/tconstruct/blocks/logic/SmelteryDrainLogic.java index ee1c02dd..8c47f1bf 100644 --- a/mods/tinker/tconstruct/blocks/logic/SmelteryDrainLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/SmelteryDrainLogic.java @@ -1,6 +1,6 @@ package mods.tinker.tconstruct.blocks.logic; -import mods.tinker.tconstruct.library.IFacingLogic; +import mods.tinker.tconstruct.library.util.IFacingLogic; import net.minecraft.entity.EntityLiving; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.INetworkManager; diff --git a/mods/tinker/tconstruct/blocks/logic/SmelteryLogic.java b/mods/tinker/tconstruct/blocks/logic/SmelteryLogic.java index e02fdf2c..8975b77f 100644 --- a/mods/tinker/tconstruct/blocks/logic/SmelteryLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/SmelteryLogic.java @@ -5,12 +5,12 @@ import java.util.Random; import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.inventory.SmelteryContainer; -import mods.tinker.tconstruct.library.CoordTuple; -import mods.tinker.tconstruct.library.IActiveLogic; -import mods.tinker.tconstruct.library.IFacingLogic; -import mods.tinker.tconstruct.library.IMasterLogic; -import mods.tinker.tconstruct.library.InventoryLogic; +import mods.tinker.tconstruct.library.blocks.InventoryLogic; import mods.tinker.tconstruct.library.crafting.Smeltery; +import mods.tinker.tconstruct.library.util.CoordTuple; +import mods.tinker.tconstruct.library.util.IActiveLogic; +import mods.tinker.tconstruct.library.util.IFacingLogic; +import mods.tinker.tconstruct.library.util.IMasterLogic; import net.minecraft.block.Block; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.item.EntityItem; diff --git a/mods/tinker/tconstruct/blocks/logic/ToolStationLogic.java b/mods/tinker/tconstruct/blocks/logic/ToolStationLogic.java index e4991e58..f80b881c 100644 --- a/mods/tinker/tconstruct/blocks/logic/ToolStationLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/ToolStationLogic.java @@ -1,7 +1,7 @@ package mods.tinker.tconstruct.blocks.logic; import mods.tinker.tconstruct.inventory.ToolStationContainer; -import mods.tinker.tconstruct.library.InventoryLogic; +import mods.tinker.tconstruct.library.blocks.InventoryLogic; import mods.tinker.tconstruct.library.crafting.ToolBuilder; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/mods/tinker/tconstruct/client/SuperCustomToolRenderer.java b/mods/tinker/tconstruct/client/SuperCustomToolRenderer.java index e1133c57..20b2e813 100644 --- a/mods/tinker/tconstruct/client/SuperCustomToolRenderer.java +++ b/mods/tinker/tconstruct/client/SuperCustomToolRenderer.java @@ -2,7 +2,7 @@ package mods.tinker.tconstruct.client; import java.util.Random; -import mods.tinker.tconstruct.library.ToolCore; +import mods.tinker.tconstruct.library.tools.ToolCore; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.RenderBlocks; diff --git a/mods/tinker/tconstruct/client/TProxyClient.java b/mods/tinker/tconstruct/client/TProxyClient.java index 66444b81..9f328fa0 100644 --- a/mods/tinker/tconstruct/client/TProxyClient.java +++ b/mods/tinker/tconstruct/client/TProxyClient.java @@ -46,10 +46,10 @@ import mods.tinker.tconstruct.entity.projectile.DaggerEntity; import mods.tinker.tconstruct.entity.projectile.LaunchedPotion; import mods.tinker.tconstruct.items.tools.Dagger; import mods.tinker.tconstruct.library.TConstructRegistry; -import mods.tinker.tconstruct.library.ToolCore; import mods.tinker.tconstruct.library.client.TConstructClientRegistry; import mods.tinker.tconstruct.library.client.ToolGuiElement; import mods.tinker.tconstruct.library.crafting.ToolBuilder; +import mods.tinker.tconstruct.library.tools.ToolCore; import mods.tinker.tconstruct.util.player.ArmorExtended; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/mods/tinker/tconstruct/client/gui/GuiManual.java b/mods/tinker/tconstruct/client/gui/GuiManual.java index b1316a8b..7e992b33 100644 --- a/mods/tinker/tconstruct/client/gui/GuiManual.java +++ b/mods/tinker/tconstruct/client/gui/GuiManual.java @@ -2,9 +2,9 @@ package mods.tinker.tconstruct.client.gui; import mods.tinker.tconstruct.client.TProxyClient; import mods.tinker.tconstruct.library.TConstructRegistry; -import mods.tinker.tconstruct.library.ToolMaterial; import mods.tinker.tconstruct.library.client.TConstructClientRegistry; import mods.tinker.tconstruct.library.crafting.PatternBuilder; +import mods.tinker.tconstruct.library.tools.ToolMaterial; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiParticle; diff --git a/mods/tinker/tconstruct/client/gui/PartCrafterGui.java b/mods/tinker/tconstruct/client/gui/PartCrafterGui.java index 3c6c0b3d..f34ae796 100644 --- a/mods/tinker/tconstruct/client/gui/PartCrafterGui.java +++ b/mods/tinker/tconstruct/client/gui/PartCrafterGui.java @@ -4,8 +4,8 @@ import mods.tinker.tconstruct.blocks.logic.PartCrafterLogic; import mods.tinker.tconstruct.inventory.ActiveContainer; import mods.tinker.tconstruct.inventory.PartCrafterChestContainer; import mods.tinker.tconstruct.library.TConstructRegistry; -import mods.tinker.tconstruct.library.ToolMaterial; import mods.tinker.tconstruct.library.crafting.PatternBuilder; +import mods.tinker.tconstruct.library.tools.ToolMaterial; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; diff --git a/mods/tinker/tconstruct/client/gui/ToolStationGui.java b/mods/tinker/tconstruct/client/gui/ToolStationGui.java index 4d809356..c8d99465 100644 --- a/mods/tinker/tconstruct/client/gui/ToolStationGui.java +++ b/mods/tinker/tconstruct/client/gui/ToolStationGui.java @@ -6,10 +6,10 @@ import java.io.DataOutputStream; import mods.tinker.tconstruct.blocks.logic.ToolStationLogic; import mods.tinker.tconstruct.inventory.ActiveContainer; import mods.tinker.tconstruct.inventory.ToolStationContainer; -import mods.tinker.tconstruct.library.ToolCore; -import mods.tinker.tconstruct.library.Weapon; import mods.tinker.tconstruct.library.client.TConstructClientRegistry; import mods.tinker.tconstruct.library.client.ToolGuiElement; +import mods.tinker.tconstruct.library.tools.ToolCore; +import mods.tinker.tconstruct.library.tools.Weapon; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; diff --git a/mods/tinker/tconstruct/common/TContent.java b/mods/tinker/tconstruct/common/TContent.java index 6d1eef52..f0ce1976 100644 --- a/mods/tinker/tconstruct/common/TContent.java +++ b/mods/tinker/tconstruct/common/TContent.java @@ -67,15 +67,15 @@ import mods.tinker.tconstruct.items.tools.Pickaxe; import mods.tinker.tconstruct.items.tools.PotionLauncher; import mods.tinker.tconstruct.items.tools.Rapier; import mods.tinker.tconstruct.items.tools.Shovel; -import mods.tinker.tconstruct.library.IPattern; import mods.tinker.tconstruct.library.TConstructRegistry; -import mods.tinker.tconstruct.library.ToolCore; import mods.tinker.tconstruct.library.client.TConstructClientRegistry; import mods.tinker.tconstruct.library.crafting.LiquidBlockCasting; import mods.tinker.tconstruct.library.crafting.LiquidCasting; import mods.tinker.tconstruct.library.crafting.PatternBuilder; import mods.tinker.tconstruct.library.crafting.Smeltery; import mods.tinker.tconstruct.library.crafting.ToolBuilder; +import mods.tinker.tconstruct.library.tools.ToolCore; +import mods.tinker.tconstruct.library.util.IPattern; import mods.tinker.tconstruct.modifiers.ModAttack; import mods.tinker.tconstruct.modifiers.ModBlaze; import mods.tinker.tconstruct.modifiers.ModBoolean; diff --git a/mods/tinker/tconstruct/entity/projectile/DaggerEntity.java b/mods/tinker/tconstruct/entity/projectile/DaggerEntity.java index acbeaff1..053bbce9 100644 --- a/mods/tinker/tconstruct/entity/projectile/DaggerEntity.java +++ b/mods/tinker/tconstruct/entity/projectile/DaggerEntity.java @@ -1,8 +1,8 @@ package mods.tinker.tconstruct.entity.projectile; import mods.tinker.tconstruct.items.tools.Dagger; -import mods.tinker.tconstruct.library.AbilityHelper; -import mods.tinker.tconstruct.library.ToolCore; +import mods.tinker.tconstruct.library.tools.AbilityHelper; +import mods.tinker.tconstruct.library.tools.ToolCore; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/mods/tinker/tconstruct/entity/projectile/RotatingBase.java b/mods/tinker/tconstruct/entity/projectile/RotatingBase.java index 3dc03286..2f40d1f3 100644 --- a/mods/tinker/tconstruct/entity/projectile/RotatingBase.java +++ b/mods/tinker/tconstruct/entity/projectile/RotatingBase.java @@ -5,7 +5,7 @@ import java.util.List; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; -import mods.tinker.tconstruct.library.AbilityHelper; +import mods.tinker.tconstruct.library.tools.AbilityHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; diff --git a/mods/tinker/tconstruct/inventory/PartCrafterChestContainer.java b/mods/tinker/tconstruct/inventory/PartCrafterChestContainer.java index b104c0a6..e2e902fb 100644 --- a/mods/tinker/tconstruct/inventory/PartCrafterChestContainer.java +++ b/mods/tinker/tconstruct/inventory/PartCrafterChestContainer.java @@ -2,7 +2,7 @@ package mods.tinker.tconstruct.inventory; import mods.tinker.tconstruct.blocks.logic.PartCrafterLogic; import mods.tinker.tconstruct.blocks.logic.PatternChestLogic; -import mods.tinker.tconstruct.library.IPattern; +import mods.tinker.tconstruct.library.util.IPattern; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; diff --git a/mods/tinker/tconstruct/inventory/PartCrafterContainer.java b/mods/tinker/tconstruct/inventory/PartCrafterContainer.java index 47b3c900..d827275f 100644 --- a/mods/tinker/tconstruct/inventory/PartCrafterContainer.java +++ b/mods/tinker/tconstruct/inventory/PartCrafterContainer.java @@ -1,7 +1,7 @@ package mods.tinker.tconstruct.inventory; import mods.tinker.tconstruct.blocks.logic.PartCrafterLogic; -import mods.tinker.tconstruct.library.IPattern; +import mods.tinker.tconstruct.library.util.IPattern; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/mods/tinker/tconstruct/inventory/PatternChestContainer.java b/mods/tinker/tconstruct/inventory/PatternChestContainer.java index 44161ee9..33888162 100644 --- a/mods/tinker/tconstruct/inventory/PatternChestContainer.java +++ b/mods/tinker/tconstruct/inventory/PatternChestContainer.java @@ -1,7 +1,7 @@ package mods.tinker.tconstruct.inventory; import mods.tinker.tconstruct.blocks.logic.PatternChestLogic; -import mods.tinker.tconstruct.library.IPattern; +import mods.tinker.tconstruct.library.util.IPattern; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/mods/tinker/tconstruct/inventory/SlotPattern.java b/mods/tinker/tconstruct/inventory/SlotPattern.java index 56cf7ad4..b3fb5061 100644 --- a/mods/tinker/tconstruct/inventory/SlotPattern.java +++ b/mods/tinker/tconstruct/inventory/SlotPattern.java @@ -1,6 +1,6 @@ package mods.tinker.tconstruct.inventory; -import mods.tinker.tconstruct.library.IPattern; +import mods.tinker.tconstruct.library.util.IPattern; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/mods/tinker/tconstruct/inventory/SlotTool.java b/mods/tinker/tconstruct/inventory/SlotTool.java index 9f68d88d..116a570a 100644 --- a/mods/tinker/tconstruct/inventory/SlotTool.java +++ b/mods/tinker/tconstruct/inventory/SlotTool.java @@ -2,7 +2,7 @@ package mods.tinker.tconstruct.inventory; import java.util.Random; -import mods.tinker.tconstruct.library.ToolCore; +import mods.tinker.tconstruct.library.tools.ToolCore; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/mods/tinker/tconstruct/items/Pattern.java b/mods/tinker/tconstruct/items/Pattern.java index fe9294b1..c99e9854 100644 --- a/mods/tinker/tconstruct/items/Pattern.java +++ b/mods/tinker/tconstruct/items/Pattern.java @@ -3,8 +3,8 @@ package mods.tinker.tconstruct.items; import java.util.List; import mods.tinker.tconstruct.common.TContent; -import mods.tinker.tconstruct.library.IPattern; import mods.tinker.tconstruct.library.crafting.PatternBuilder.MaterialSet; +import mods.tinker.tconstruct.library.util.IPattern; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; diff --git a/mods/tinker/tconstruct/items/TitleIcon.java b/mods/tinker/tconstruct/items/TitleIcon.java index 1a83e528..b43018e0 100644 --- a/mods/tinker/tconstruct/items/TitleIcon.java +++ b/mods/tinker/tconstruct/items/TitleIcon.java @@ -1,7 +1,7 @@ package mods.tinker.tconstruct.items; import mods.tinker.tconstruct.client.TProxyClient; -import mods.tinker.tconstruct.library.ToolCore; +import mods.tinker.tconstruct.library.tools.ToolCore; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.item.Item; diff --git a/mods/tinker/tconstruct/items/ToolPart.java b/mods/tinker/tconstruct/items/ToolPart.java index a6e0cd3a..945634fa 100644 --- a/mods/tinker/tconstruct/items/ToolPart.java +++ b/mods/tinker/tconstruct/items/ToolPart.java @@ -6,7 +6,7 @@ import java.util.List; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import mods.tinker.tconstruct.library.IToolPart; +import mods.tinker.tconstruct.library.util.IToolPart; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; diff --git a/mods/tinker/tconstruct/items/tools/Axe.java b/mods/tinker/tconstruct/items/tools/Axe.java index 824b39f0..22e45dec 100644 --- a/mods/tinker/tconstruct/items/tools/Axe.java +++ b/mods/tinker/tconstruct/items/tools/Axe.java @@ -1,8 +1,8 @@ package mods.tinker.tconstruct.items.tools; import mods.tinker.tconstruct.common.TContent; -import mods.tinker.tconstruct.library.AbilityHelper; -import mods.tinker.tconstruct.library.HarvestTool; +import mods.tinker.tconstruct.library.tools.AbilityHelper; +import mods.tinker.tconstruct.library.tools.HarvestTool; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLiving; diff --git a/mods/tinker/tconstruct/items/tools/BattleSign.java b/mods/tinker/tconstruct/items/tools/BattleSign.java index 1b0550fa..91a517b9 100644 --- a/mods/tinker/tconstruct/items/tools/BattleSign.java +++ b/mods/tinker/tconstruct/items/tools/BattleSign.java @@ -1,7 +1,7 @@ package mods.tinker.tconstruct.items.tools; import mods.tinker.tconstruct.common.TContent; -import mods.tinker.tconstruct.library.Weapon; +import mods.tinker.tconstruct.library.tools.Weapon; import net.minecraft.item.Item; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/mods/tinker/tconstruct/items/tools/Broadsword.java b/mods/tinker/tconstruct/items/tools/Broadsword.java index 368fd956..982ac9c7 100644 --- a/mods/tinker/tconstruct/items/tools/Broadsword.java +++ b/mods/tinker/tconstruct/items/tools/Broadsword.java @@ -1,7 +1,7 @@ package mods.tinker.tconstruct.items.tools; import mods.tinker.tconstruct.common.TContent; -import mods.tinker.tconstruct.library.Weapon; +import mods.tinker.tconstruct.library.tools.Weapon; import net.minecraft.item.Item; public class Broadsword extends Weapon diff --git a/mods/tinker/tconstruct/items/tools/Chisel.java b/mods/tinker/tconstruct/items/tools/Chisel.java index 45752e70..d0e453a6 100644 --- a/mods/tinker/tconstruct/items/tools/Chisel.java +++ b/mods/tinker/tconstruct/items/tools/Chisel.java @@ -3,7 +3,7 @@ package mods.tinker.tconstruct.items.tools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import mods.tinker.tconstruct.common.TContent; -import mods.tinker.tconstruct.library.ToolCore; +import mods.tinker.tconstruct.library.tools.ToolCore; import net.minecraft.item.Item; public class Chisel extends ToolCore diff --git a/mods/tinker/tconstruct/items/tools/Dagger.java b/mods/tinker/tconstruct/items/tools/Dagger.java index 0b7d7745..a8140b7d 100644 --- a/mods/tinker/tconstruct/items/tools/Dagger.java +++ b/mods/tinker/tconstruct/items/tools/Dagger.java @@ -4,7 +4,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.entity.projectile.DaggerEntity; -import mods.tinker.tconstruct.library.Weapon; +import mods.tinker.tconstruct.library.tools.Weapon; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; diff --git a/mods/tinker/tconstruct/items/tools/FryingPan.java b/mods/tinker/tconstruct/items/tools/FryingPan.java index 04765742..8e5e2b82 100644 --- a/mods/tinker/tconstruct/items/tools/FryingPan.java +++ b/mods/tinker/tconstruct/items/tools/FryingPan.java @@ -2,8 +2,8 @@ package mods.tinker.tconstruct.items.tools; import mods.tinker.tconstruct.blocks.logic.EquipLogic; import mods.tinker.tconstruct.common.TContent; -import mods.tinker.tconstruct.library.AbilityHelper; -import mods.tinker.tconstruct.library.Weapon; +import mods.tinker.tconstruct.library.tools.AbilityHelper; +import mods.tinker.tconstruct.library.tools.Weapon; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/mods/tinker/tconstruct/items/tools/Hammer.java b/mods/tinker/tconstruct/items/tools/Hammer.java index ba6abe9f..e9ff96b0 100644 --- a/mods/tinker/tconstruct/items/tools/Hammer.java +++ b/mods/tinker/tconstruct/items/tools/Hammer.java @@ -2,7 +2,7 @@ package mods.tinker.tconstruct.items.tools; import java.util.ArrayList; -import mods.tinker.tconstruct.library.HarvestTool; +import mods.tinker.tconstruct.library.tools.HarvestTool; import net.minecraft.block.material.Material; import net.minecraft.item.Item; diff --git a/mods/tinker/tconstruct/items/tools/Longsword.java b/mods/tinker/tconstruct/items/tools/Longsword.java index 2d25353f..fa2e83cf 100644 --- a/mods/tinker/tconstruct/items/tools/Longsword.java +++ b/mods/tinker/tconstruct/items/tools/Longsword.java @@ -1,8 +1,8 @@ package mods.tinker.tconstruct.items.tools; import mods.tinker.tconstruct.common.TContent; -import mods.tinker.tconstruct.library.AbilityHelper; -import mods.tinker.tconstruct.library.Weapon; +import mods.tinker.tconstruct.library.tools.AbilityHelper; +import mods.tinker.tconstruct.library.tools.Weapon; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; diff --git a/mods/tinker/tconstruct/items/tools/LumberAxe.java b/mods/tinker/tconstruct/items/tools/LumberAxe.java index 48fdd39f..635ee89e 100644 --- a/mods/tinker/tconstruct/items/tools/LumberAxe.java +++ b/mods/tinker/tconstruct/items/tools/LumberAxe.java @@ -3,8 +3,8 @@ package mods.tinker.tconstruct.items.tools; import java.util.List; import mods.tinker.tconstruct.common.TContent; -import mods.tinker.tconstruct.library.AbilityHelper; -import mods.tinker.tconstruct.library.HarvestTool; +import mods.tinker.tconstruct.library.tools.AbilityHelper; +import mods.tinker.tconstruct.library.tools.HarvestTool; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; diff --git a/mods/tinker/tconstruct/items/tools/Mattock.java b/mods/tinker/tconstruct/items/tools/Mattock.java index 6f08a6f6..eadaad8e 100644 --- a/mods/tinker/tconstruct/items/tools/Mattock.java +++ b/mods/tinker/tconstruct/items/tools/Mattock.java @@ -1,8 +1,8 @@ package mods.tinker.tconstruct.items.tools; import mods.tinker.tconstruct.common.TContent; -import mods.tinker.tconstruct.library.AbilityHelper; -import mods.tinker.tconstruct.library.DualHarvestTool; +import mods.tinker.tconstruct.library.tools.AbilityHelper; +import mods.tinker.tconstruct.library.tools.DualHarvestTool; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/mods/tinker/tconstruct/items/tools/Pickaxe.java b/mods/tinker/tconstruct/items/tools/Pickaxe.java index 2621a765..f7da4456 100644 --- a/mods/tinker/tconstruct/items/tools/Pickaxe.java +++ b/mods/tinker/tconstruct/items/tools/Pickaxe.java @@ -1,7 +1,7 @@ package mods.tinker.tconstruct.items.tools; import mods.tinker.tconstruct.common.TContent; -import mods.tinker.tconstruct.library.HarvestTool; +import mods.tinker.tconstruct.library.tools.HarvestTool; import net.minecraft.block.material.Material; import net.minecraft.item.Item; diff --git a/mods/tinker/tconstruct/items/tools/RangedWeapon.java b/mods/tinker/tconstruct/items/tools/RangedWeapon.java index 4988563b..7529a246 100644 --- a/mods/tinker/tconstruct/items/tools/RangedWeapon.java +++ b/mods/tinker/tconstruct/items/tools/RangedWeapon.java @@ -1,7 +1,7 @@ package mods.tinker.tconstruct.items.tools; import mods.tinker.tconstruct.common.TContent; -import mods.tinker.tconstruct.library.ToolCore; +import mods.tinker.tconstruct.library.tools.ToolCore; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; diff --git a/mods/tinker/tconstruct/items/tools/Rapier.java b/mods/tinker/tconstruct/items/tools/Rapier.java index 2cdfe68a..e792de55 100644 --- a/mods/tinker/tconstruct/items/tools/Rapier.java +++ b/mods/tinker/tconstruct/items/tools/Rapier.java @@ -1,8 +1,8 @@ package mods.tinker.tconstruct.items.tools; import mods.tinker.tconstruct.common.TContent; -import mods.tinker.tconstruct.library.AbilityHelper; -import mods.tinker.tconstruct.library.Weapon; +import mods.tinker.tconstruct.library.tools.AbilityHelper; +import mods.tinker.tconstruct.library.tools.Weapon; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; diff --git a/mods/tinker/tconstruct/items/tools/Shovel.java b/mods/tinker/tconstruct/items/tools/Shovel.java index 17a53883..4b5c30da 100644 --- a/mods/tinker/tconstruct/items/tools/Shovel.java +++ b/mods/tinker/tconstruct/items/tools/Shovel.java @@ -1,7 +1,7 @@ package mods.tinker.tconstruct.items.tools; import mods.tinker.tconstruct.common.TContent; -import mods.tinker.tconstruct.library.HarvestTool; +import mods.tinker.tconstruct.library.tools.HarvestTool; import net.minecraft.block.material.Material; import net.minecraft.item.Item; import cpw.mods.fml.relauncher.Side; diff --git a/mods/tinker/tconstruct/library/TConstructRegistry.java b/mods/tinker/tconstruct/library/TConstructRegistry.java index cbfe6f68..10947c3e 100644 --- a/mods/tinker/tconstruct/library/TConstructRegistry.java +++ b/mods/tinker/tconstruct/library/TConstructRegistry.java @@ -3,6 +3,9 @@ package mods.tinker.tconstruct.library; import java.util.ArrayList; import java.util.HashMap; +import mods.tinker.tconstruct.library.tools.ToolCore; +import mods.tinker.tconstruct.library.tools.ToolMaterial; +import mods.tinker.tconstruct.library.util.TabTools; import net.minecraft.item.Item; /** A registry to store any relevant API work diff --git a/mods/tinker/tconstruct/library/InventoryBlock.java b/mods/tinker/tconstruct/library/blocks/InventoryBlock.java similarity index 96% rename from mods/tinker/tconstruct/library/InventoryBlock.java rename to mods/tinker/tconstruct/library/blocks/InventoryBlock.java index acfec2e0..bc67cb68 100644 --- a/mods/tinker/tconstruct/library/InventoryBlock.java +++ b/mods/tinker/tconstruct/library/blocks/InventoryBlock.java @@ -1,7 +1,9 @@ -package mods.tinker.tconstruct.library; +package mods.tinker.tconstruct.library.blocks; import java.util.Random; +import mods.tinker.tconstruct.library.util.IActiveLogic; +import mods.tinker.tconstruct.library.util.IFacingLogic; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/mods/tinker/tconstruct/library/InventoryLogic.java b/mods/tinker/tconstruct/library/blocks/InventoryLogic.java similarity index 98% rename from mods/tinker/tconstruct/library/InventoryLogic.java rename to mods/tinker/tconstruct/library/blocks/InventoryLogic.java index 12768a1c..3f345680 100644 --- a/mods/tinker/tconstruct/library/InventoryLogic.java +++ b/mods/tinker/tconstruct/library/blocks/InventoryLogic.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.library; +package mods.tinker.tconstruct.library.blocks; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/mods/tinker/tconstruct/library/client/TConstructClientRegistry.java b/mods/tinker/tconstruct/library/client/TConstructClientRegistry.java index ad4e8846..cedacc74 100644 --- a/mods/tinker/tconstruct/library/client/TConstructClientRegistry.java +++ b/mods/tinker/tconstruct/library/client/TConstructClientRegistry.java @@ -5,8 +5,8 @@ import java.util.HashMap; import java.util.Map; import mods.tinker.tconstruct.library.TConstructRegistry; -import mods.tinker.tconstruct.library.ToolCore; import mods.tinker.tconstruct.library.crafting.ToolBuilder; +import mods.tinker.tconstruct.library.tools.ToolCore; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/mods/tinker/tconstruct/library/crafting/PatternBuilder.java b/mods/tinker/tconstruct/library/crafting/PatternBuilder.java index f509feff..6710c90a 100644 --- a/mods/tinker/tconstruct/library/crafting/PatternBuilder.java +++ b/mods/tinker/tconstruct/library/crafting/PatternBuilder.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import mods.tinker.tconstruct.library.IPattern; +import mods.tinker.tconstruct.library.util.IPattern; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/mods/tinker/tconstruct/library/crafting/ToolBuilder.java b/mods/tinker/tconstruct/library/crafting/ToolBuilder.java index a61a0f9b..bebde420 100644 --- a/mods/tinker/tconstruct/library/crafting/ToolBuilder.java +++ b/mods/tinker/tconstruct/library/crafting/ToolBuilder.java @@ -5,11 +5,11 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import mods.tinker.tconstruct.library.IToolPart; import mods.tinker.tconstruct.library.TConstructRegistry; -import mods.tinker.tconstruct.library.ToolCore; -import mods.tinker.tconstruct.library.ToolMaterial; -import mods.tinker.tconstruct.library.ToolMod; +import mods.tinker.tconstruct.library.tools.ToolCore; +import mods.tinker.tconstruct.library.tools.ToolMaterial; +import mods.tinker.tconstruct.library.tools.ToolMod; +import mods.tinker.tconstruct.library.util.IToolPart; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/mods/tinker/tconstruct/library/crafting/ToolRecipe.java b/mods/tinker/tconstruct/library/crafting/ToolRecipe.java index d30d4773..584b26c9 100644 --- a/mods/tinker/tconstruct/library/crafting/ToolRecipe.java +++ b/mods/tinker/tconstruct/library/crafting/ToolRecipe.java @@ -1,7 +1,7 @@ package mods.tinker.tconstruct.library.crafting; import mods.tinker.tconstruct.library.TConstructRegistry; -import mods.tinker.tconstruct.library.ToolCore; +import mods.tinker.tconstruct.library.tools.ToolCore; import net.minecraft.item.Item; /* diff --git a/mods/tinker/tconstruct/library/AbilityHelper.java b/mods/tinker/tconstruct/library/tools/AbilityHelper.java similarity index 99% rename from mods/tinker/tconstruct/library/AbilityHelper.java rename to mods/tinker/tconstruct/library/tools/AbilityHelper.java index 350bfcea..0531bd74 100644 --- a/mods/tinker/tconstruct/library/AbilityHelper.java +++ b/mods/tinker/tconstruct/library/tools/AbilityHelper.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.library; +package mods.tinker.tconstruct.library.tools; import ic2.api.item.ICustomElectricItem; import ic2.api.item.IElectricItem; @@ -7,6 +7,7 @@ import java.util.Iterator; import java.util.List; import java.util.Random; +import mods.tinker.tconstruct.library.util.PiercingEntityDamage; import net.minecraft.block.Block; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.EnchantmentThorns; diff --git a/mods/tinker/tconstruct/library/DualHarvestTool.java b/mods/tinker/tconstruct/library/tools/DualHarvestTool.java similarity index 99% rename from mods/tinker/tconstruct/library/DualHarvestTool.java rename to mods/tinker/tconstruct/library/tools/DualHarvestTool.java index 5c2788eb..9ce513ce 100644 --- a/mods/tinker/tconstruct/library/DualHarvestTool.java +++ b/mods/tinker/tconstruct/library/tools/DualHarvestTool.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.library; +package mods.tinker.tconstruct.library.tools; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/mods/tinker/tconstruct/library/HarvestTool.java b/mods/tinker/tconstruct/library/tools/HarvestTool.java similarity index 99% rename from mods/tinker/tconstruct/library/HarvestTool.java rename to mods/tinker/tconstruct/library/tools/HarvestTool.java index 029b1679..762dd128 100644 --- a/mods/tinker/tconstruct/library/HarvestTool.java +++ b/mods/tinker/tconstruct/library/tools/HarvestTool.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.library; +package mods.tinker.tconstruct.library.tools; import mods.tinker.tconstruct.common.TContent; import net.minecraft.block.Block; diff --git a/mods/tinker/tconstruct/library/ToolCore.java b/mods/tinker/tconstruct/library/tools/ToolCore.java similarity index 99% rename from mods/tinker/tconstruct/library/ToolCore.java rename to mods/tinker/tconstruct/library/tools/ToolCore.java index 8f898de3..7f08ae22 100644 --- a/mods/tinker/tconstruct/library/ToolCore.java +++ b/mods/tinker/tconstruct/library/tools/ToolCore.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.library; +package mods.tinker.tconstruct.library.tools; import ic2.api.item.IBoxable; import ic2.api.item.ICustomElectricItem; @@ -9,6 +9,7 @@ import java.util.List; import java.util.Map; import java.util.Random; +import mods.tinker.tconstruct.library.TConstructRegistry; import mods.tinker.tconstruct.library.crafting.ToolBuilder; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/mods/tinker/tconstruct/library/ToolMaterial.java b/mods/tinker/tconstruct/library/tools/ToolMaterial.java similarity index 97% rename from mods/tinker/tconstruct/library/ToolMaterial.java rename to mods/tinker/tconstruct/library/tools/ToolMaterial.java index c2ff1ef0..28ab7c76 100644 --- a/mods/tinker/tconstruct/library/ToolMaterial.java +++ b/mods/tinker/tconstruct/library/tools/ToolMaterial.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.library; +package mods.tinker.tconstruct.library.tools; /** * This class is temporary. A full material registry is planned */ diff --git a/mods/tinker/tconstruct/library/ToolMod.java b/mods/tinker/tconstruct/library/tools/ToolMod.java similarity index 98% rename from mods/tinker/tconstruct/library/ToolMod.java rename to mods/tinker/tconstruct/library/tools/ToolMod.java index 9f36cf55..93b7a9fe 100644 --- a/mods/tinker/tconstruct/library/ToolMod.java +++ b/mods/tinker/tconstruct/library/tools/ToolMod.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.library; +package mods.tinker.tconstruct.library.tools; import java.util.ArrayList; import java.util.Arrays; diff --git a/mods/tinker/tconstruct/library/Weapon.java b/mods/tinker/tconstruct/library/tools/Weapon.java similarity index 98% rename from mods/tinker/tconstruct/library/Weapon.java rename to mods/tinker/tconstruct/library/tools/Weapon.java index 2cb0f21c..7a184050 100644 --- a/mods/tinker/tconstruct/library/Weapon.java +++ b/mods/tinker/tconstruct/library/tools/Weapon.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.library; +package mods.tinker.tconstruct.library.tools; import mods.tinker.tconstruct.common.TContent; import net.minecraft.block.Block; diff --git a/mods/tinker/tconstruct/library/CoordTuple.java b/mods/tinker/tconstruct/library/util/CoordTuple.java similarity index 96% rename from mods/tinker/tconstruct/library/CoordTuple.java rename to mods/tinker/tconstruct/library/util/CoordTuple.java index 9b4a539c..5996e6b0 100644 --- a/mods/tinker/tconstruct/library/CoordTuple.java +++ b/mods/tinker/tconstruct/library/util/CoordTuple.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.library; +package mods.tinker.tconstruct.library.util; public class CoordTuple { diff --git a/mods/tinker/tconstruct/library/IActiveLogic.java b/mods/tinker/tconstruct/library/util/IActiveLogic.java similarity index 69% rename from mods/tinker/tconstruct/library/IActiveLogic.java rename to mods/tinker/tconstruct/library/util/IActiveLogic.java index e2f01948..29b19052 100644 --- a/mods/tinker/tconstruct/library/IActiveLogic.java +++ b/mods/tinker/tconstruct/library/util/IActiveLogic.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.library; +package mods.tinker.tconstruct.library.util; public interface IActiveLogic { diff --git a/mods/tinker/tconstruct/library/IFacingLogic.java b/mods/tinker/tconstruct/library/util/IFacingLogic.java similarity index 86% rename from mods/tinker/tconstruct/library/IFacingLogic.java rename to mods/tinker/tconstruct/library/util/IFacingLogic.java index 2c09be24..62d921fc 100644 --- a/mods/tinker/tconstruct/library/IFacingLogic.java +++ b/mods/tinker/tconstruct/library/util/IFacingLogic.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.library; +package mods.tinker.tconstruct.library.util; import net.minecraft.entity.EntityLiving; import net.minecraftforge.common.ForgeDirection; diff --git a/mods/tinker/tconstruct/library/IMasterLogic.java b/mods/tinker/tconstruct/library/util/IMasterLogic.java similarity index 64% rename from mods/tinker/tconstruct/library/IMasterLogic.java rename to mods/tinker/tconstruct/library/util/IMasterLogic.java index 7af49720..e6a553c8 100644 --- a/mods/tinker/tconstruct/library/IMasterLogic.java +++ b/mods/tinker/tconstruct/library/util/IMasterLogic.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.library; +package mods.tinker.tconstruct.library.util; public interface IMasterLogic { diff --git a/mods/tinker/tconstruct/library/IPattern.java b/mods/tinker/tconstruct/library/util/IPattern.java similarity index 85% rename from mods/tinker/tconstruct/library/IPattern.java rename to mods/tinker/tconstruct/library/util/IPattern.java index 4b65d630..666e692f 100644 --- a/mods/tinker/tconstruct/library/IPattern.java +++ b/mods/tinker/tconstruct/library/util/IPattern.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.library; +package mods.tinker.tconstruct.library.util; import mods.tinker.tconstruct.library.crafting.PatternBuilder.MaterialSet; import net.minecraft.item.ItemStack; diff --git a/mods/tinker/tconstruct/library/IServantLogic.java b/mods/tinker/tconstruct/library/util/IServantLogic.java similarity index 82% rename from mods/tinker/tconstruct/library/IServantLogic.java rename to mods/tinker/tconstruct/library/util/IServantLogic.java index b63ac42d..2d353c1e 100644 --- a/mods/tinker/tconstruct/library/IServantLogic.java +++ b/mods/tinker/tconstruct/library/util/IServantLogic.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.library; +package mods.tinker.tconstruct.library.util; public interface IServantLogic { diff --git a/mods/tinker/tconstruct/library/IToolPart.java b/mods/tinker/tconstruct/library/util/IToolPart.java similarity index 71% rename from mods/tinker/tconstruct/library/IToolPart.java rename to mods/tinker/tconstruct/library/util/IToolPart.java index 7da8fe15..0ff2f1ea 100644 --- a/mods/tinker/tconstruct/library/IToolPart.java +++ b/mods/tinker/tconstruct/library/util/IToolPart.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.library; +package mods.tinker.tconstruct.library.util; import net.minecraft.item.ItemStack; diff --git a/mods/tinker/tconstruct/library/PiercingEntityDamage.java b/mods/tinker/tconstruct/library/util/PiercingEntityDamage.java similarity index 86% rename from mods/tinker/tconstruct/library/PiercingEntityDamage.java rename to mods/tinker/tconstruct/library/util/PiercingEntityDamage.java index f91d5624..5c03e769 100644 --- a/mods/tinker/tconstruct/library/PiercingEntityDamage.java +++ b/mods/tinker/tconstruct/library/util/PiercingEntityDamage.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.library; +package mods.tinker.tconstruct.library.util; import net.minecraft.entity.Entity; import net.minecraft.util.EntityDamageSource; diff --git a/mods/tinker/tconstruct/library/TabTools.java b/mods/tinker/tconstruct/library/util/TabTools.java similarity index 88% rename from mods/tinker/tconstruct/library/TabTools.java rename to mods/tinker/tconstruct/library/util/TabTools.java index ee08a100..e78f2b81 100644 --- a/mods/tinker/tconstruct/library/TabTools.java +++ b/mods/tinker/tconstruct/library/util/TabTools.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.library; +package mods.tinker.tconstruct.library.util; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; diff --git a/mods/tinker/tconstruct/modifiers/ModAttack.java b/mods/tinker/tconstruct/modifiers/ModAttack.java index dc3d9fc0..77f37c03 100644 --- a/mods/tinker/tconstruct/modifiers/ModAttack.java +++ b/mods/tinker/tconstruct/modifiers/ModAttack.java @@ -3,8 +3,8 @@ package mods.tinker.tconstruct.modifiers; import java.util.Arrays; import java.util.List; -import mods.tinker.tconstruct.library.ToolCore; -import mods.tinker.tconstruct.library.ToolMod; +import mods.tinker.tconstruct.library.tools.ToolCore; +import mods.tinker.tconstruct.library.tools.ToolMod; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/mods/tinker/tconstruct/modifiers/ModBlaze.java b/mods/tinker/tconstruct/modifiers/ModBlaze.java index 37507232..372efee7 100644 --- a/mods/tinker/tconstruct/modifiers/ModBlaze.java +++ b/mods/tinker/tconstruct/modifiers/ModBlaze.java @@ -3,8 +3,8 @@ package mods.tinker.tconstruct.modifiers; import java.util.Arrays; import java.util.List; -import mods.tinker.tconstruct.library.ToolCore; -import mods.tinker.tconstruct.library.ToolMod; +import mods.tinker.tconstruct.library.tools.ToolCore; +import mods.tinker.tconstruct.library.tools.ToolMod; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/mods/tinker/tconstruct/modifiers/ModBoolean.java b/mods/tinker/tconstruct/modifiers/ModBoolean.java index 467cb0cb..57e89e74 100644 --- a/mods/tinker/tconstruct/modifiers/ModBoolean.java +++ b/mods/tinker/tconstruct/modifiers/ModBoolean.java @@ -1,6 +1,6 @@ package mods.tinker.tconstruct.modifiers; -import mods.tinker.tconstruct.library.ToolMod; +import mods.tinker.tconstruct.library.tools.ToolMod; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/mods/tinker/tconstruct/modifiers/ModDurability.java b/mods/tinker/tconstruct/modifiers/ModDurability.java index 9eb9674f..1bdf9413 100644 --- a/mods/tinker/tconstruct/modifiers/ModDurability.java +++ b/mods/tinker/tconstruct/modifiers/ModDurability.java @@ -1,6 +1,6 @@ package mods.tinker.tconstruct.modifiers; -import mods.tinker.tconstruct.library.ToolMod; +import mods.tinker.tconstruct.library.tools.ToolMod; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/mods/tinker/tconstruct/modifiers/ModElectric.java b/mods/tinker/tconstruct/modifiers/ModElectric.java index 9e83c715..fde69766 100644 --- a/mods/tinker/tconstruct/modifiers/ModElectric.java +++ b/mods/tinker/tconstruct/modifiers/ModElectric.java @@ -4,7 +4,7 @@ import ic2.api.item.IElectricItem; import java.util.ArrayList; -import mods.tinker.tconstruct.library.ToolCore; +import mods.tinker.tconstruct.library.tools.ToolCore; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/mods/tinker/tconstruct/modifiers/ModExtraModifier.java b/mods/tinker/tconstruct/modifiers/ModExtraModifier.java index 576631cb..16f9f67a 100644 --- a/mods/tinker/tconstruct/modifiers/ModExtraModifier.java +++ b/mods/tinker/tconstruct/modifiers/ModExtraModifier.java @@ -2,8 +2,8 @@ package mods.tinker.tconstruct.modifiers; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import mods.tinker.tconstruct.library.ToolMod; import mods.tinker.tconstruct.library.crafting.PatternBuilder; +import mods.tinker.tconstruct.library.tools.ToolMod; public class ModExtraModifier extends ToolMod { diff --git a/mods/tinker/tconstruct/modifiers/ModInteger.java b/mods/tinker/tconstruct/modifiers/ModInteger.java index d6768d88..2d1fccb5 100644 --- a/mods/tinker/tconstruct/modifiers/ModInteger.java +++ b/mods/tinker/tconstruct/modifiers/ModInteger.java @@ -1,6 +1,6 @@ package mods.tinker.tconstruct.modifiers; -import mods.tinker.tconstruct.library.ToolMod; +import mods.tinker.tconstruct.library.tools.ToolMod; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/mods/tinker/tconstruct/modifiers/ModLapis.java b/mods/tinker/tconstruct/modifiers/ModLapis.java index c6b40a73..6e5a71ab 100644 --- a/mods/tinker/tconstruct/modifiers/ModLapis.java +++ b/mods/tinker/tconstruct/modifiers/ModLapis.java @@ -5,9 +5,9 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import mods.tinker.tconstruct.library.ToolCore; -import mods.tinker.tconstruct.library.ToolMod; -import mods.tinker.tconstruct.library.Weapon; +import mods.tinker.tconstruct.library.tools.ToolCore; +import mods.tinker.tconstruct.library.tools.ToolMod; +import mods.tinker.tconstruct.library.tools.Weapon; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.item.ItemStack; diff --git a/mods/tinker/tconstruct/modifiers/ModPotion.java b/mods/tinker/tconstruct/modifiers/ModPotion.java index ba086f1c..7ade0994 100644 --- a/mods/tinker/tconstruct/modifiers/ModPotion.java +++ b/mods/tinker/tconstruct/modifiers/ModPotion.java @@ -1,6 +1,6 @@ package mods.tinker.tconstruct.modifiers; -import mods.tinker.tconstruct.library.ToolMod; +import mods.tinker.tconstruct.library.tools.ToolMod; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/mods/tinker/tconstruct/modifiers/ModRedstone.java b/mods/tinker/tconstruct/modifiers/ModRedstone.java index 5f6219dc..bba9f032 100644 --- a/mods/tinker/tconstruct/modifiers/ModRedstone.java +++ b/mods/tinker/tconstruct/modifiers/ModRedstone.java @@ -3,8 +3,8 @@ package mods.tinker.tconstruct.modifiers; import java.util.Arrays; import java.util.List; -import mods.tinker.tconstruct.library.ToolCore; -import mods.tinker.tconstruct.library.ToolMod; +import mods.tinker.tconstruct.library.tools.ToolCore; +import mods.tinker.tconstruct.library.tools.ToolMod; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/mods/tinker/tconstruct/modifiers/ModRepair.java b/mods/tinker/tconstruct/modifiers/ModRepair.java index 8f1d2e0d..706680bf 100644 --- a/mods/tinker/tconstruct/modifiers/ModRepair.java +++ b/mods/tinker/tconstruct/modifiers/ModRepair.java @@ -1,7 +1,7 @@ package mods.tinker.tconstruct.modifiers; -import mods.tinker.tconstruct.library.ToolMod; import mods.tinker.tconstruct.library.crafting.PatternBuilder; +import mods.tinker.tconstruct.library.tools.ToolMod; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/mods/tinker/tconstruct/util/TCraftingHandler.java b/mods/tinker/tconstruct/util/TCraftingHandler.java index 4cd2c753..d38e707b 100644 --- a/mods/tinker/tconstruct/util/TCraftingHandler.java +++ b/mods/tinker/tconstruct/util/TCraftingHandler.java @@ -1,7 +1,7 @@ package mods.tinker.tconstruct.util; import mods.tinker.tconstruct.common.TContent; -import mods.tinker.tconstruct.library.AbilityHelper; +import mods.tinker.tconstruct.library.tools.AbilityHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; diff --git a/mods/tinker/tconstruct/util/network/TGuiHandler.java b/mods/tinker/tconstruct/util/network/TGuiHandler.java index 980beb15..03f6dd8e 100644 --- a/mods/tinker/tconstruct/util/network/TGuiHandler.java +++ b/mods/tinker/tconstruct/util/network/TGuiHandler.java @@ -17,7 +17,7 @@ import mods.tinker.tconstruct.client.gui.PatternShaperGui; import mods.tinker.tconstruct.client.gui.SmelteryGui; import mods.tinker.tconstruct.client.gui.ToolStationGui; import mods.tinker.tconstruct.inventory.ArmorExtendedContainer; -import mods.tinker.tconstruct.library.InventoryLogic; +import mods.tinker.tconstruct.library.blocks.InventoryLogic; import mods.tinker.tconstruct.util.player.TPlayerStats; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; diff --git a/mods/tinker/tconstruct/util/network/TPacketHandler.java b/mods/tinker/tconstruct/util/network/TPacketHandler.java index d11bbcfb..bcbd9354 100644 --- a/mods/tinker/tconstruct/util/network/TPacketHandler.java +++ b/mods/tinker/tconstruct/util/network/TPacketHandler.java @@ -7,7 +7,7 @@ import java.io.IOException; import mods.tinker.tconstruct.TConstruct; import mods.tinker.tconstruct.blocks.logic.ToolStationLogic; import mods.tinker.tconstruct.inventory.SmelteryContainer; -import mods.tinker.tconstruct.library.InventoryLogic; +import mods.tinker.tconstruct.library.blocks.InventoryLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.network.INetworkManager; diff --git a/mods/tinker/tconstruct/util/player/TPlayerHandler.java b/mods/tinker/tconstruct/util/player/TPlayerHandler.java index 153bf9b8..be152a2f 100644 --- a/mods/tinker/tconstruct/util/player/TPlayerHandler.java +++ b/mods/tinker/tconstruct/util/player/TPlayerHandler.java @@ -7,7 +7,7 @@ import java.util.concurrent.ConcurrentHashMap; import mods.tinker.tconstruct.client.TProxyClient; import mods.tinker.tconstruct.common.TContent; -import mods.tinker.tconstruct.library.AbilityHelper; +import mods.tinker.tconstruct.library.tools.AbilityHelper; import mods.tinker.tconstruct.util.PHConstruct; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; diff --git a/mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java b/mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java index 17173bd5..039fc068 100644 --- a/mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java +++ b/mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java @@ -3,7 +3,7 @@ package mods.tinker.tconstruct.worldgen; import java.util.Random; import mods.tinker.tconstruct.common.TContent; -import mods.tinker.tconstruct.library.CoordTuple; +import mods.tinker.tconstruct.library.util.CoordTuple; import mods.tinker.tconstruct.util.PHConstruct; import net.minecraft.block.Block; import net.minecraft.world.World; diff --git a/mods/tinker/tconstruct/worldgen/village/ComponentSmeltery.java b/mods/tinker/tconstruct/worldgen/village/ComponentSmeltery.java index 04453a01..57686682 100644 --- a/mods/tinker/tconstruct/worldgen/village/ComponentSmeltery.java +++ b/mods/tinker/tconstruct/worldgen/village/ComponentSmeltery.java @@ -5,7 +5,7 @@ import java.util.Random; import mods.tinker.tconstruct.blocks.logic.SmelteryLogic; import mods.tinker.tconstruct.common.TContent; -import mods.tinker.tconstruct.library.CoordTuple; +import mods.tinker.tconstruct.library.util.CoordTuple; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.structure.ComponentVillage;