From 8a9348bed0a2bfd72bf8c90e5e38332ee1b69fdb Mon Sep 17 00:00:00 2001 From: mDiyo Date: Sun, 28 Apr 2013 02:25:06 -0700 Subject: [PATCH] Refactor, Reorganize, Redo! --- mods/tinker/tconstruct/TConstruct.java | 14 +++- mods/tinker/tconstruct/blocks/EquipBlock.java | 8 +- .../tconstruct/blocks/GolemCoreBlock.java | 6 +- .../tconstruct/blocks/GolemHeadBlock.java | 4 +- .../tconstruct/blocks/GolemPedestalBlock.java | 4 +- .../tconstruct/blocks/LavaTankBlock.java | 6 +- .../tconstruct/blocks/LiquidMetalBase.java | 6 +- .../tconstruct/blocks/LiquidMetalFlowing.java | 4 +- .../tconstruct/blocks/LiquidMetalStill.java | 4 +- .../tconstruct/blocks/OreberryBush.java | 4 +- .../blocks/RedstoneBallRepeater.java | 4 +- .../tinker/tconstruct/blocks/SearedBlock.java | 10 +-- .../tconstruct/blocks/SmelteryBlock.java | 18 ++--- .../blocks/{infiblocks => }/SpeedBlock.java | 3 +- .../tconstruct/blocks/ToolStationBlock.java | 12 +-- .../{ => blocks}/logic/CastingBasinLogic.java | 10 +-- .../{ => blocks}/logic/CastingTableLogic.java | 10 +-- .../{ => blocks}/logic/EquipLogic.java | 4 +- .../{ => blocks}/logic/FaucetLogic.java | 6 +- .../{ => blocks}/logic/FrypanLogic.java | 6 +- .../{ => blocks}/logic/GolemCoreLogic.java | 4 +- .../logic/GolemPedestalLogic.java | 2 +- .../{ => blocks}/logic/LavaTankLogic.java | 2 +- .../logic/LiquidTextureLogic.java | 2 +- .../{ => blocks}/logic/MultiServantLogic.java | 8 +- .../{ => blocks}/logic/PartCrafterLogic.java | 12 +-- .../{ => blocks}/logic/PatternChestLogic.java | 6 +- .../logic/PatternShaperLogic.java | 8 +- .../logic/SmelteryDrainLogic.java | 4 +- .../{ => blocks}/logic/SmelteryLogic.java | 18 ++--- .../{ => blocks}/logic/ToolStationLogic.java | 8 +- .../tconstruct/client/TClientTickHandler.java | 2 +- mods/tinker/tconstruct/client/TControls.java | 2 +- .../tconstruct/client/TProxyClient.java | 54 +++++++------- .../{blockrender => block}/AxleRender.java | 2 +- .../BallRepeaterRender.java | 2 +- .../client/block}/BlockSkinRenderHelper.java | 2 +- .../{blockrender => block}/BreakingFX.java | 2 +- .../CastingBasinSpecialRender.java | 4 +- .../CastingTableSpecialRenderer.java | 4 +- .../{blockrender => block}/FluidRender.java | 2 +- .../{blockrender => block}/FrypanRender.java | 2 +- .../GolemCoreRender.java | 2 +- .../GolemCoreSpecialRender.java | 4 +- .../OreberryRender.java | 2 +- .../{blockrender => block}/SearedRender.java | 11 ++- .../SmallFontRenderer.java | 2 +- .../SmelteryRender.java | 7 +- .../{blockrender => block}/TableRender.java | 2 +- .../{blockrender => block}/TankRender.java | 5 +- .../{entityrender => entity}/CartRender.java | 2 +- .../CrystalModel.java | 2 +- .../CrystalRender.java | 2 +- .../GolemBaseModel.java | 2 +- .../{entityrender => entity}/GolemRender.java | 2 +- .../ModelPullcart.java | 2 +- .../{entityrender => entity}/ModelWagon.java | 2 +- .../{entityrender => entity}/SkylaModel.java | 2 +- .../{entityrender => entity}/SkylaRender.java | 2 +- .../{entityrender => entity}/SlimeModel.java | 2 +- .../{entityrender => entity}/SlimeRender.java | 2 +- .../projectile}/DaggerRender.java | 2 +- .../projectile}/DaggerRenderOld.java | 2 +- .../projectile}/LaunchedItemRender.java | 2 +- .../projectile}/RangedRenderBase.java | 2 +- .../client/gui/ArmorExtendedGui.java | 6 +- .../tconstruct/client/gui/FrypanGui.java | 2 +- .../tconstruct/client/gui/GuiManual.java | 2 +- .../client/gui/NewContainerGui.java | 4 +- .../tconstruct/client/gui/PartCrafterGui.java | 8 +- .../client/gui/PatternChestGui.java | 2 +- .../client/gui/PatternShaperGui.java | 6 +- .../tconstruct/client/gui/SmelteryGui.java | 6 +- .../tconstruct/client/gui/ToolStationGui.java | 6 +- .../tconstruct/{ => common}/TContent.java | 74 ++++++++++--------- .../tconstruct/{ => common}/TProxyCommon.java | 2 +- mods/tinker/tconstruct/entity/BlueSlime.java | 2 +- mods/tinker/tconstruct/entity/GolemBase.java | 2 +- mods/tinker/tconstruct/entity/MetalSlime.java | 2 +- .../tconstruct/{ => entity}/ai/CoreAI.java | 2 +- .../entity/projectile/DaggerEntity.java | 2 +- .../ActiveContainer.java | 4 +- .../{container => inventory}/ActiveSlot.java | 2 +- .../ArmorExtendedContainer.java | 6 +- .../FrypanContainer.java | 4 +- .../PartCrafterChestContainer.java | 8 +- .../PartCrafterContainer.java | 6 +- .../PatternChestContainer.java | 6 +- .../PatternShaperContainer.java | 4 +- .../SlotArmorCopy.java | 2 +- .../SlotOnlyTake.java | 2 +- .../SlotPartBuilder.java | 2 +- .../{container => inventory}/SlotPattern.java | 4 +- .../{container => inventory}/SlotTool.java | 2 +- .../SmelteryContainer.java | 4 +- .../ToolStationContainer.java | 4 +- .../tinker/tconstruct/items/FilledBucket.java | 4 +- .../items/{PatternManual.java => Manual.java} | 8 +- mods/tinker/tconstruct/items/Pattern.java | 6 +- .../items/RedstoneBallRepeaterItem.java | 2 +- mods/tinker/tconstruct/items/ToolPart.java | 2 +- .../items/blocks/OreberryBushItem.java | 7 +- .../items/blocks/OreberryBushSecondItem.java | 7 +- .../tconstruct/{ => items}/tools/Axe.java | 4 +- .../{ => items}/tools/BattleSign.java | 4 +- .../{ => items}/tools/Broadsword.java | 4 +- .../tconstruct/{ => items}/tools/Chisel.java | 4 +- .../tconstruct/{ => items}/tools/Dagger.java | 4 +- .../{ => items}/tools/FryingPan.java | 6 +- .../tconstruct/{ => items}/tools/Hammer.java | 2 +- .../{ => items}/tools/Longsword.java | 4 +- .../{ => items}/tools/LumberAxe.java | 4 +- .../tconstruct/{ => items}/tools/Mattock.java | 4 +- .../tconstruct/{ => items}/tools/Pickaxe.java | 4 +- .../{ => items}/tools/PotionLauncher.java | 2 +- .../{ => items/tools}/RangedWeapon.java | 4 +- .../tconstruct/{ => items}/tools/Rapier.java | 4 +- .../tconstruct/{ => items}/tools/Shovel.java | 4 +- .../tconstruct/library/AbilityHelper.java | 1 - .../library}/CoordTuple.java | 2 +- .../tconstruct/library/HarvestTool.java | 2 +- .../library}/IActiveLogic.java | 2 +- .../library}/IFacingLogic.java | 2 +- .../library}/IMasterLogic.java | 2 +- .../library}/IPattern.java | 4 +- .../library}/IServantLogic.java | 2 +- .../library}/IToolPart.java | 2 +- .../library}/InventoryBlock.java | 2 +- .../library}/InventoryLogic.java | 2 +- .../library}/PiercingEntityDamage.java | 2 +- mods/tinker/tconstruct/library/ToolCore.java | 3 +- .../library}/ToolMod.java | 3 +- mods/tinker/tconstruct/library/Weapon.java | 2 +- .../client/TConstructClientRegistry.java | 2 +- .../{ => library}/crafting/AlloyMix.java | 2 +- .../{ => library}/crafting/CastingRecipe.java | 2 +- .../crafting/LiquidBlockCasting.java | 2 +- .../{ => library}/crafting/LiquidCasting.java | 2 +- .../crafting/PatternBuilder.java | 4 +- .../{ => library}/crafting/Smeltery.java | 2 +- .../{ => library}/crafting/ToolBuilder.java | 6 +- .../{ => library}/crafting/ToolRecipe.java | 2 +- .../tconstruct/modifiers/ModAttack.java | 2 +- .../tinker/tconstruct/modifiers/ModBlaze.java | 2 +- .../tconstruct/modifiers/ModBoolean.java | 2 +- .../tconstruct/modifiers/ModDurability.java | 2 +- .../modifiers/ModExtraModifier.java | 4 +- .../tconstruct/modifiers/ModInteger.java | 2 +- .../tinker/tconstruct/modifiers/ModLapis.java | 2 +- .../tconstruct/modifiers/ModPotion.java | 2 +- .../tconstruct/modifiers/ModRedstone.java | 2 +- .../tconstruct/modifiers/ModRepair.java | 4 +- .../tconstruct/{ => util}/PHConstruct.java | 3 +- .../util}/RecipeRemover.java | 2 +- .../{ => util}/TCraftingHandler.java | 3 +- .../tconstruct/{ => util}/TEventHandler.java | 12 +-- .../{ => util/network}/TGuiHandler.java | 21 +++--- .../{ => util/network}/TPacketHandler.java | 9 ++- .../{ => util}/player/ArmorExtended.java | 4 +- .../{ => util}/player/TFoodStats.java | 2 +- .../{ => util}/player/TPlayerHandler.java | 6 +- .../{ => util}/player/TPlayerStats.java | 2 +- .../tconstruct/worldgen/OreberryBushGen.java | 2 +- .../{ => worldgen}/OverworldProvider.java | 2 +- .../tconstruct/worldgen/SurfaceOreGen.java | 2 +- .../worldgen/TBaseWorldGenerator.java | 6 +- .../worldgen/village/ComponentSmeltery.java | 6 +- .../village/ComponentToolWorkshop.java | 2 +- .../worldgen/village/TVillageTrades.java | 2 +- 169 files changed, 407 insertions(+), 402 deletions(-) rename mods/tinker/tconstruct/blocks/{infiblocks => }/SpeedBlock.java (93%) rename mods/tinker/tconstruct/{ => blocks}/logic/CastingBasinLogic.java (96%) rename mods/tinker/tconstruct/{ => blocks}/logic/CastingTableLogic.java (96%) rename mods/tinker/tconstruct/{ => blocks}/logic/EquipLogic.java (88%) rename mods/tinker/tconstruct/{ => blocks}/logic/FaucetLogic.java (97%) rename mods/tinker/tconstruct/{ => blocks}/logic/FrypanLogic.java (97%) rename mods/tinker/tconstruct/{ => blocks}/logic/GolemCoreLogic.java (95%) rename mods/tinker/tconstruct/{ => blocks}/logic/GolemPedestalLogic.java (99%) rename mods/tinker/tconstruct/{ => blocks}/logic/LavaTankLogic.java (98%) rename mods/tinker/tconstruct/{ => blocks}/logic/LiquidTextureLogic.java (96%) rename mods/tinker/tconstruct/{ => blocks}/logic/MultiServantLogic.java (94%) rename mods/tinker/tconstruct/{ => blocks}/logic/PartCrafterLogic.java (92%) rename mods/tinker/tconstruct/{ => blocks}/logic/PatternChestLogic.java (77%) rename mods/tinker/tconstruct/{ => blocks}/logic/PatternShaperLogic.java (92%) rename mods/tinker/tconstruct/{ => blocks}/logic/SmelteryDrainLogic.java (97%) rename mods/tinker/tconstruct/{ => blocks}/logic/SmelteryLogic.java (98%) rename mods/tinker/tconstruct/{ => blocks}/logic/ToolStationLogic.java (90%) rename mods/tinker/tconstruct/client/{blockrender => block}/AxleRender.java (97%) rename mods/tinker/tconstruct/client/{blockrender => block}/BallRepeaterRender.java (99%) rename mods/tinker/{common => tconstruct/client/block}/BlockSkinRenderHelper.java (99%) rename mods/tinker/tconstruct/client/{blockrender => block}/BreakingFX.java (98%) rename mods/tinker/tconstruct/client/{blockrender => block}/CastingBasinSpecialRender.java (94%) rename mods/tinker/tconstruct/client/{blockrender => block}/CastingTableSpecialRenderer.java (95%) rename mods/tinker/tconstruct/client/{blockrender => block}/FluidRender.java (99%) rename mods/tinker/tconstruct/client/{blockrender => block}/FrypanRender.java (96%) rename mods/tinker/tconstruct/client/{blockrender => block}/GolemCoreRender.java (99%) rename mods/tinker/tconstruct/client/{blockrender => block}/GolemCoreSpecialRender.java (94%) rename mods/tinker/tconstruct/client/{blockrender => block}/OreberryRender.java (98%) rename mods/tinker/tconstruct/client/{blockrender => block}/SearedRender.java (98%) rename mods/tinker/tconstruct/client/{blockrender => block}/SmallFontRenderer.java (99%) rename mods/tinker/tconstruct/client/{blockrender => block}/SmelteryRender.java (97%) rename mods/tinker/tconstruct/client/{blockrender => block}/TableRender.java (98%) rename mods/tinker/tconstruct/client/{blockrender => block}/TankRender.java (97%) rename mods/tinker/tconstruct/client/{entityrender => entity}/CartRender.java (98%) rename mods/tinker/tconstruct/client/{entityrender => entity}/CrystalModel.java (96%) rename mods/tinker/tconstruct/client/{entityrender => entity}/CrystalRender.java (98%) rename mods/tinker/tconstruct/client/{entityrender => entity}/GolemBaseModel.java (98%) rename mods/tinker/tconstruct/client/{entityrender => entity}/GolemRender.java (99%) rename mods/tinker/tconstruct/client/{entityrender => entity}/ModelPullcart.java (99%) rename mods/tinker/tconstruct/client/{entityrender => entity}/ModelWagon.java (99%) rename mods/tinker/tconstruct/client/{entityrender => entity}/SkylaModel.java (99%) rename mods/tinker/tconstruct/client/{entityrender => entity}/SkylaRender.java (97%) rename mods/tinker/tconstruct/client/{entityrender => entity}/SlimeModel.java (97%) rename mods/tinker/tconstruct/client/{entityrender => entity}/SlimeRender.java (97%) rename mods/tinker/tconstruct/client/{projectilerender => entity/projectile}/DaggerRender.java (99%) rename mods/tinker/tconstruct/client/{projectilerender => entity/projectile}/DaggerRenderOld.java (97%) rename mods/tinker/tconstruct/client/{projectilerender => entity/projectile}/LaunchedItemRender.java (98%) rename mods/tinker/tconstruct/client/{projectilerender => entity/projectile}/RangedRenderBase.java (98%) rename mods/tinker/tconstruct/{ => common}/TContent.java (97%) rename mods/tinker/tconstruct/{ => common}/TProxyCommon.java (99%) rename mods/tinker/tconstruct/{ => entity}/ai/CoreAI.java (94%) rename mods/tinker/tconstruct/{container => inventory}/ActiveContainer.java (87%) rename mods/tinker/tconstruct/{container => inventory}/ActiveSlot.java (92%) rename mods/tinker/tconstruct/{container => inventory}/ArmorExtendedContainer.java (92%) rename mods/tinker/tconstruct/{container => inventory}/FrypanContainer.java (97%) rename mods/tinker/tconstruct/{container => inventory}/PartCrafterChestContainer.java (93%) rename mods/tinker/tconstruct/{container => inventory}/PartCrafterContainer.java (94%) rename mods/tinker/tconstruct/{container => inventory}/PatternChestContainer.java (94%) rename mods/tinker/tconstruct/{container => inventory}/PatternShaperContainer.java (96%) rename mods/tinker/tconstruct/{container => inventory}/SlotArmorCopy.java (97%) rename mods/tinker/tconstruct/{container => inventory}/SlotOnlyTake.java (92%) rename mods/tinker/tconstruct/{container => inventory}/SlotPartBuilder.java (89%) rename mods/tinker/tconstruct/{container => inventory}/SlotPattern.java (85%) rename mods/tinker/tconstruct/{container => inventory}/SlotTool.java (98%) rename mods/tinker/tconstruct/{container => inventory}/SmelteryContainer.java (98%) rename mods/tinker/tconstruct/{container => inventory}/ToolStationContainer.java (98%) rename mods/tinker/tconstruct/items/{PatternManual.java => Manual.java} (89%) rename mods/tinker/tconstruct/{ => items}/tools/Axe.java (95%) rename mods/tinker/tconstruct/{ => items}/tools/BattleSign.java (97%) rename mods/tinker/tconstruct/{ => items}/tools/Broadsword.java (90%) rename mods/tinker/tconstruct/{ => items}/tools/Chisel.java (94%) rename mods/tinker/tconstruct/{ => items}/tools/Dagger.java (96%) rename mods/tinker/tconstruct/{ => items}/tools/FryingPan.java (95%) rename mods/tinker/tconstruct/{ => items}/tools/Hammer.java (98%) rename mods/tinker/tconstruct/{ => items}/tools/Longsword.java (96%) rename mods/tinker/tconstruct/{ => items}/tools/LumberAxe.java (98%) rename mods/tinker/tconstruct/{ => items}/tools/Mattock.java (95%) rename mods/tinker/tconstruct/{ => items}/tools/Pickaxe.java (93%) rename mods/tinker/tconstruct/{ => items}/tools/PotionLauncher.java (99%) rename mods/tinker/tconstruct/{ => items/tools}/RangedWeapon.java (98%) rename mods/tinker/tconstruct/{ => items}/tools/Rapier.java (96%) rename mods/tinker/tconstruct/{ => items}/tools/Shovel.java (96%) rename mods/tinker/{common => tconstruct/library}/CoordTuple.java (96%) rename mods/tinker/{common => tconstruct/library}/IActiveLogic.java (71%) rename mods/tinker/{common => tconstruct/library}/IFacingLogic.java (87%) rename mods/tinker/{common => tconstruct/library}/IMasterLogic.java (67%) rename mods/tinker/{common => tconstruct/library}/IPattern.java (61%) rename mods/tinker/{common => tconstruct/library}/IServantLogic.java (84%) rename mods/tinker/{common => tconstruct/library}/IToolPart.java (74%) rename mods/tinker/{common => tconstruct/library}/InventoryBlock.java (99%) rename mods/tinker/{common => tconstruct/library}/InventoryLogic.java (99%) rename mods/tinker/{common => tconstruct/library}/PiercingEntityDamage.java (87%) rename mods/tinker/{common => tconstruct/library}/ToolMod.java (98%) rename mods/tinker/tconstruct/{ => library}/crafting/AlloyMix.java (97%) rename mods/tinker/tconstruct/{ => library}/crafting/CastingRecipe.java (93%) rename mods/tinker/tconstruct/{ => library}/crafting/LiquidBlockCasting.java (98%) rename mods/tinker/tconstruct/{ => library}/crafting/LiquidCasting.java (98%) rename mods/tinker/tconstruct/{ => library}/crafting/PatternBuilder.java (98%) rename mods/tinker/tconstruct/{ => library}/crafting/Smeltery.java (99%) rename mods/tinker/tconstruct/{ => library}/crafting/ToolBuilder.java (98%) rename mods/tinker/tconstruct/{ => library}/crafting/ToolRecipe.java (95%) rename mods/tinker/tconstruct/{ => util}/PHConstruct.java (99%) rename mods/tinker/{common => tconstruct/util}/RecipeRemover.java (95%) rename mods/tinker/tconstruct/{ => util}/TCraftingHandler.java (94%) rename mods/tinker/tconstruct/{ => util}/TEventHandler.java (98%) rename mods/tinker/tconstruct/{ => util/network}/TGuiHandler.java (85%) rename mods/tinker/tconstruct/{ => util/network}/TPacketHandler.java (93%) rename mods/tinker/tconstruct/{ => util}/player/ArmorExtended.java (97%) rename mods/tinker/tconstruct/{ => util}/player/TFoodStats.java (99%) rename mods/tinker/tconstruct/{ => util}/player/TPlayerHandler.java (98%) rename mods/tinker/tconstruct/{ => util}/player/TPlayerStats.java (91%) rename mods/tinker/tconstruct/{ => worldgen}/OverworldProvider.java (94%) diff --git a/mods/tinker/tconstruct/TConstruct.java b/mods/tinker/tconstruct/TConstruct.java index bf76374c..4109c970 100644 --- a/mods/tinker/tconstruct/TConstruct.java +++ b/mods/tinker/tconstruct/TConstruct.java @@ -1,8 +1,14 @@ 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.player.TPlayerHandler; +import mods.tinker.tconstruct.util.PHConstruct; +import mods.tinker.tconstruct.util.TCraftingHandler; +import mods.tinker.tconstruct.util.TEventHandler; +import mods.tinker.tconstruct.util.network.TGuiHandler; +import mods.tinker.tconstruct.util.player.TPlayerHandler; import mods.tinker.tconstruct.worldgen.TBaseWorldGenerator; import mods.tinker.tconstruct.worldgen.village.TVillageTrades; import mods.tinker.tconstruct.worldgen.village.VillageSmelteryHandler; @@ -29,7 +35,7 @@ import cpw.mods.fml.common.registry.VillagerRegistry; */ @Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.3.2.dev26", dependencies = "required-after:Forge@[7.7.1.659,)") -@NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = mods.tinker.tconstruct.TPacketHandler.class) +@NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = mods.tinker.tconstruct.util.network.TPacketHandler.class) public class TConstruct { /** The value of one ingot in millibuckets */ @@ -58,10 +64,10 @@ public class TConstruct content.oreRegistry(); proxy.registerRenderer(); - proxy.registerTickHandler(); + //proxy.registerTickHandler(); proxy.addNames(); proxy.readManuals(); - proxy.registerKeys(); + //proxy.registerKeys(); GameRegistry.registerWorldGenerator(new TBaseWorldGenerator()); GameRegistry.registerFuelHandler(content); diff --git a/mods/tinker/tconstruct/blocks/EquipBlock.java b/mods/tinker/tconstruct/blocks/EquipBlock.java index cbe47d63..2d06e916 100644 --- a/mods/tinker/tconstruct/blocks/EquipBlock.java +++ b/mods/tinker/tconstruct/blocks/EquipBlock.java @@ -2,11 +2,11 @@ package mods.tinker.tconstruct.blocks; import java.util.Random; -import mods.tinker.common.InventoryBlock; import mods.tinker.tconstruct.TConstruct; -import mods.tinker.tconstruct.TGuiHandler; -import mods.tinker.tconstruct.client.blockrender.FrypanRender; -import mods.tinker.tconstruct.logic.FrypanLogic; +import mods.tinker.tconstruct.blocks.logic.FrypanLogic; +import mods.tinker.tconstruct.client.block.FrypanRender; +import mods.tinker.tconstruct.library.InventoryBlock; +import mods.tinker.tconstruct.util.network.TGuiHandler; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/mods/tinker/tconstruct/blocks/GolemCoreBlock.java b/mods/tinker/tconstruct/blocks/GolemCoreBlock.java index bc6c2a28..17833341 100644 --- a/mods/tinker/tconstruct/blocks/GolemCoreBlock.java +++ b/mods/tinker/tconstruct/blocks/GolemCoreBlock.java @@ -1,10 +1,10 @@ package mods.tinker.tconstruct.blocks; -import mods.tinker.common.InventoryBlock; import mods.tinker.tconstruct.TConstruct; -import mods.tinker.tconstruct.client.blockrender.GolemCoreRender; +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.logic.GolemCoreLogic; 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/GolemHeadBlock.java b/mods/tinker/tconstruct/blocks/GolemHeadBlock.java index 887bf28d..f017b218 100644 --- a/mods/tinker/tconstruct/blocks/GolemHeadBlock.java +++ b/mods/tinker/tconstruct/blocks/GolemHeadBlock.java @@ -1,7 +1,7 @@ package mods.tinker.tconstruct.blocks; -import mods.tinker.tconstruct.TContent; -import mods.tinker.tconstruct.logic.GolemCoreLogic; +import mods.tinker.tconstruct.blocks.logic.GolemCoreLogic; +import mods.tinker.tconstruct.common.TContent; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/mods/tinker/tconstruct/blocks/GolemPedestalBlock.java b/mods/tinker/tconstruct/blocks/GolemPedestalBlock.java index 275082c4..eb9c6b95 100644 --- a/mods/tinker/tconstruct/blocks/GolemPedestalBlock.java +++ b/mods/tinker/tconstruct/blocks/GolemPedestalBlock.java @@ -2,8 +2,8 @@ package mods.tinker.tconstruct.blocks; import java.util.Random; -import mods.tinker.common.InventoryBlock; -import mods.tinker.tconstruct.logic.GolemPedestalLogic; +import mods.tinker.tconstruct.blocks.logic.GolemPedestalLogic; +import mods.tinker.tconstruct.library.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 356784ef..6ee11c5b 100644 --- a/mods/tinker/tconstruct/blocks/LavaTankBlock.java +++ b/mods/tinker/tconstruct/blocks/LavaTankBlock.java @@ -2,10 +2,10 @@ package mods.tinker.tconstruct.blocks; import java.util.List; -import mods.tinker.common.IServantLogic; -import mods.tinker.tconstruct.client.blockrender.TankRender; +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.logic.LavaTankLogic; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/mods/tinker/tconstruct/blocks/LiquidMetalBase.java b/mods/tinker/tconstruct/blocks/LiquidMetalBase.java index a75f5a8b..e8355c01 100644 --- a/mods/tinker/tconstruct/blocks/LiquidMetalBase.java +++ b/mods/tinker/tconstruct/blocks/LiquidMetalBase.java @@ -3,9 +3,9 @@ package mods.tinker.tconstruct.blocks; import java.util.List; import java.util.Random; -import mods.tinker.tconstruct.TContent; -import mods.tinker.tconstruct.client.blockrender.FluidRender; -import mods.tinker.tconstruct.logic.LiquidTextureLogic; +import mods.tinker.tconstruct.blocks.logic.LiquidTextureLogic; +import mods.tinker.tconstruct.client.block.FluidRender; +import mods.tinker.tconstruct.common.TContent; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/mods/tinker/tconstruct/blocks/LiquidMetalFlowing.java b/mods/tinker/tconstruct/blocks/LiquidMetalFlowing.java index f7bc390f..d21d9185 100644 --- a/mods/tinker/tconstruct/blocks/LiquidMetalFlowing.java +++ b/mods/tinker/tconstruct/blocks/LiquidMetalFlowing.java @@ -2,8 +2,8 @@ package mods.tinker.tconstruct.blocks; import java.util.Random; -import mods.tinker.tconstruct.TContent; -import mods.tinker.tconstruct.logic.LiquidTextureLogic; +import mods.tinker.tconstruct.blocks.logic.LiquidTextureLogic; +import mods.tinker.tconstruct.common.TContent; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; diff --git a/mods/tinker/tconstruct/blocks/LiquidMetalStill.java b/mods/tinker/tconstruct/blocks/LiquidMetalStill.java index 693a2632..a8e34bed 100644 --- a/mods/tinker/tconstruct/blocks/LiquidMetalStill.java +++ b/mods/tinker/tconstruct/blocks/LiquidMetalStill.java @@ -2,8 +2,8 @@ package mods.tinker.tconstruct.blocks; import java.util.Random; -import mods.tinker.tconstruct.TContent; -import mods.tinker.tconstruct.logic.LiquidTextureLogic; +import mods.tinker.tconstruct.blocks.logic.LiquidTextureLogic; +import mods.tinker.tconstruct.common.TContent; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; diff --git a/mods/tinker/tconstruct/blocks/OreberryBush.java b/mods/tinker/tconstruct/blocks/OreberryBush.java index 4fb2326f..ead2663e 100644 --- a/mods/tinker/tconstruct/blocks/OreberryBush.java +++ b/mods/tinker/tconstruct/blocks/OreberryBush.java @@ -3,8 +3,8 @@ package mods.tinker.tconstruct.blocks; import java.util.List; import java.util.Random; -import mods.tinker.tconstruct.TContent; -import mods.tinker.tconstruct.client.blockrender.OreberryRender; +import mods.tinker.tconstruct.client.block.OreberryRender; +import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.library.TConstructRegistry; import net.minecraft.block.Block; import net.minecraft.block.BlockLeavesBase; diff --git a/mods/tinker/tconstruct/blocks/RedstoneBallRepeater.java b/mods/tinker/tconstruct/blocks/RedstoneBallRepeater.java index 1687edf4..d188aa00 100644 --- a/mods/tinker/tconstruct/blocks/RedstoneBallRepeater.java +++ b/mods/tinker/tconstruct/blocks/RedstoneBallRepeater.java @@ -2,8 +2,8 @@ package mods.tinker.tconstruct.blocks; import java.util.Random; -import mods.tinker.tconstruct.TContent; -import mods.tinker.tconstruct.client.blockrender.BallRepeaterRender; +import mods.tinker.tconstruct.client.block.BallRepeaterRender; +import mods.tinker.tconstruct.common.TContent; import net.minecraft.block.Block; import net.minecraft.block.BlockRedstoneLogic; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/mods/tinker/tconstruct/blocks/SearedBlock.java b/mods/tinker/tconstruct/blocks/SearedBlock.java index 12866a96..da4f78d7 100644 --- a/mods/tinker/tconstruct/blocks/SearedBlock.java +++ b/mods/tinker/tconstruct/blocks/SearedBlock.java @@ -2,13 +2,13 @@ package mods.tinker.tconstruct.blocks; import java.util.List; -import mods.tinker.common.InventoryBlock; import mods.tinker.tconstruct.TConstruct; -import mods.tinker.tconstruct.client.blockrender.SearedRender; +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.logic.CastingBasinLogic; -import mods.tinker.tconstruct.logic.CastingTableLogic; -import mods.tinker.tconstruct.logic.FaucetLogic; 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 48c63fe3..c5e595b5 100644 --- a/mods/tinker/tconstruct/blocks/SmelteryBlock.java +++ b/mods/tinker/tconstruct/blocks/SmelteryBlock.java @@ -3,17 +3,17 @@ package mods.tinker.tconstruct.blocks; import java.util.List; import java.util.Random; -import mods.tinker.common.IFacingLogic; -import mods.tinker.common.IMasterLogic; -import mods.tinker.common.IServantLogic; -import mods.tinker.common.InventoryBlock; import mods.tinker.tconstruct.TConstruct; -import mods.tinker.tconstruct.TGuiHandler; -import mods.tinker.tconstruct.client.blockrender.SmelteryRender; +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.logic.MultiServantLogic; -import mods.tinker.tconstruct.logic.SmelteryDrainLogic; -import mods.tinker.tconstruct.logic.SmelteryLogic; +import mods.tinker.tconstruct.util.network.TGuiHandler; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLiving; diff --git a/mods/tinker/tconstruct/blocks/infiblocks/SpeedBlock.java b/mods/tinker/tconstruct/blocks/SpeedBlock.java similarity index 93% rename from mods/tinker/tconstruct/blocks/infiblocks/SpeedBlock.java rename to mods/tinker/tconstruct/blocks/SpeedBlock.java index 4a9bb285..fd9f88d7 100644 --- a/mods/tinker/tconstruct/blocks/infiblocks/SpeedBlock.java +++ b/mods/tinker/tconstruct/blocks/SpeedBlock.java @@ -1,8 +1,7 @@ -package mods.tinker.tconstruct.blocks.infiblocks; +package mods.tinker.tconstruct.blocks; import java.util.List; -import mods.tinker.tconstruct.blocks.TConstructBlock; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; diff --git a/mods/tinker/tconstruct/blocks/ToolStationBlock.java b/mods/tinker/tconstruct/blocks/ToolStationBlock.java index 757ad810..503ad3bc 100644 --- a/mods/tinker/tconstruct/blocks/ToolStationBlock.java +++ b/mods/tinker/tconstruct/blocks/ToolStationBlock.java @@ -2,14 +2,14 @@ package mods.tinker.tconstruct.blocks; import java.util.List; -import mods.tinker.common.InventoryBlock; import mods.tinker.tconstruct.TConstruct; -import mods.tinker.tconstruct.client.blockrender.TableRender; +import mods.tinker.tconstruct.blocks.logic.PartCrafterLogic; +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.logic.PartCrafterLogic; -import mods.tinker.tconstruct.logic.PatternChestLogic; -import mods.tinker.tconstruct.logic.PatternShaperLogic; -import mods.tinker.tconstruct.logic.ToolStationLogic; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; diff --git a/mods/tinker/tconstruct/logic/CastingBasinLogic.java b/mods/tinker/tconstruct/blocks/logic/CastingBasinLogic.java similarity index 96% rename from mods/tinker/tconstruct/logic/CastingBasinLogic.java rename to mods/tinker/tconstruct/blocks/logic/CastingBasinLogic.java index d98d20c5..2a613b82 100644 --- a/mods/tinker/tconstruct/logic/CastingBasinLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/CastingBasinLogic.java @@ -1,10 +1,10 @@ -package mods.tinker.tconstruct.logic; +package mods.tinker.tconstruct.blocks.logic; -import mods.tinker.common.IPattern; -import mods.tinker.common.InventoryLogic; import mods.tinker.tconstruct.TConstruct; -import mods.tinker.tconstruct.crafting.CastingRecipe; -import mods.tinker.tconstruct.crafting.LiquidBlockCasting; +import mods.tinker.tconstruct.library.IPattern; +import mods.tinker.tconstruct.library.InventoryLogic; +import mods.tinker.tconstruct.library.crafting.CastingRecipe; +import mods.tinker.tconstruct.library.crafting.LiquidBlockCasting; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; diff --git a/mods/tinker/tconstruct/logic/CastingTableLogic.java b/mods/tinker/tconstruct/blocks/logic/CastingTableLogic.java similarity index 96% rename from mods/tinker/tconstruct/logic/CastingTableLogic.java rename to mods/tinker/tconstruct/blocks/logic/CastingTableLogic.java index 121ec476..1f7e375a 100644 --- a/mods/tinker/tconstruct/logic/CastingTableLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/CastingTableLogic.java @@ -1,10 +1,10 @@ -package mods.tinker.tconstruct.logic; +package mods.tinker.tconstruct.blocks.logic; -import mods.tinker.common.IPattern; -import mods.tinker.common.InventoryLogic; import mods.tinker.tconstruct.TConstruct; -import mods.tinker.tconstruct.crafting.CastingRecipe; -import mods.tinker.tconstruct.crafting.LiquidCasting; +import mods.tinker.tconstruct.library.IPattern; +import mods.tinker.tconstruct.library.InventoryLogic; +import mods.tinker.tconstruct.library.crafting.CastingRecipe; +import mods.tinker.tconstruct.library.crafting.LiquidCasting; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; diff --git a/mods/tinker/tconstruct/logic/EquipLogic.java b/mods/tinker/tconstruct/blocks/logic/EquipLogic.java similarity index 88% rename from mods/tinker/tconstruct/logic/EquipLogic.java rename to mods/tinker/tconstruct/blocks/logic/EquipLogic.java index dbbf5a65..dff875b6 100644 --- a/mods/tinker/tconstruct/logic/EquipLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/EquipLogic.java @@ -1,6 +1,6 @@ -package mods.tinker.tconstruct.logic; +package mods.tinker.tconstruct.blocks.logic; -import mods.tinker.common.InventoryLogic; +import mods.tinker.tconstruct.library.InventoryLogic; import net.minecraft.item.ItemStack; /* Slots diff --git a/mods/tinker/tconstruct/logic/FaucetLogic.java b/mods/tinker/tconstruct/blocks/logic/FaucetLogic.java similarity index 97% rename from mods/tinker/tconstruct/logic/FaucetLogic.java rename to mods/tinker/tconstruct/blocks/logic/FaucetLogic.java index e68530e3..cac833b5 100644 --- a/mods/tinker/tconstruct/logic/FaucetLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/FaucetLogic.java @@ -1,8 +1,8 @@ -package mods.tinker.tconstruct.logic; +package mods.tinker.tconstruct.blocks.logic; -import mods.tinker.common.IActiveLogic; -import mods.tinker.common.IFacingLogic; import mods.tinker.tconstruct.TConstruct; +import mods.tinker.tconstruct.library.IActiveLogic; +import mods.tinker.tconstruct.library.IFacingLogic; import net.minecraft.entity.EntityLiving; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.INetworkManager; diff --git a/mods/tinker/tconstruct/logic/FrypanLogic.java b/mods/tinker/tconstruct/blocks/logic/FrypanLogic.java similarity index 97% rename from mods/tinker/tconstruct/logic/FrypanLogic.java rename to mods/tinker/tconstruct/blocks/logic/FrypanLogic.java index 9bc477f3..84a7ccb1 100644 --- a/mods/tinker/tconstruct/logic/FrypanLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/FrypanLogic.java @@ -1,7 +1,7 @@ -package mods.tinker.tconstruct.logic; +package mods.tinker.tconstruct.blocks.logic; -import mods.tinker.common.IActiveLogic; -import mods.tinker.tconstruct.container.FrypanContainer; +import mods.tinker.tconstruct.inventory.FrypanContainer; +import mods.tinker.tconstruct.library.IActiveLogic; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.InventoryPlayer; diff --git a/mods/tinker/tconstruct/logic/GolemCoreLogic.java b/mods/tinker/tconstruct/blocks/logic/GolemCoreLogic.java similarity index 95% rename from mods/tinker/tconstruct/logic/GolemCoreLogic.java rename to mods/tinker/tconstruct/blocks/logic/GolemCoreLogic.java index bfde6504..14fed5ff 100644 --- a/mods/tinker/tconstruct/logic/GolemCoreLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/GolemCoreLogic.java @@ -1,6 +1,6 @@ -package mods.tinker.tconstruct.logic; +package mods.tinker.tconstruct.blocks.logic; -import mods.tinker.common.InventoryLogic; +import mods.tinker.tconstruct.library.InventoryLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/mods/tinker/tconstruct/logic/GolemPedestalLogic.java b/mods/tinker/tconstruct/blocks/logic/GolemPedestalLogic.java similarity index 99% rename from mods/tinker/tconstruct/logic/GolemPedestalLogic.java rename to mods/tinker/tconstruct/blocks/logic/GolemPedestalLogic.java index 6cb71e22..e018718f 100644 --- a/mods/tinker/tconstruct/logic/GolemPedestalLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/GolemPedestalLogic.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.logic; +package mods.tinker.tconstruct.blocks.logic; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/mods/tinker/tconstruct/logic/LavaTankLogic.java b/mods/tinker/tconstruct/blocks/logic/LavaTankLogic.java similarity index 98% rename from mods/tinker/tconstruct/logic/LavaTankLogic.java rename to mods/tinker/tconstruct/blocks/logic/LavaTankLogic.java index b0e146fe..7c7f7bb8 100644 --- a/mods/tinker/tconstruct/logic/LavaTankLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/LavaTankLogic.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.logic; +package mods.tinker.tconstruct.blocks.logic; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; diff --git a/mods/tinker/tconstruct/logic/LiquidTextureLogic.java b/mods/tinker/tconstruct/blocks/logic/LiquidTextureLogic.java similarity index 96% rename from mods/tinker/tconstruct/logic/LiquidTextureLogic.java rename to mods/tinker/tconstruct/blocks/logic/LiquidTextureLogic.java index 394a48a3..a61771f7 100644 --- a/mods/tinker/tconstruct/logic/LiquidTextureLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/LiquidTextureLogic.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.logic; +package mods.tinker.tconstruct.blocks.logic; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.INetworkManager; diff --git a/mods/tinker/tconstruct/logic/MultiServantLogic.java b/mods/tinker/tconstruct/blocks/logic/MultiServantLogic.java similarity index 94% rename from mods/tinker/tconstruct/logic/MultiServantLogic.java rename to mods/tinker/tconstruct/blocks/logic/MultiServantLogic.java index 10c4d128..fe1cd1f6 100644 --- a/mods/tinker/tconstruct/logic/MultiServantLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/MultiServantLogic.java @@ -1,8 +1,8 @@ -package mods.tinker.tconstruct.logic; +package mods.tinker.tconstruct.blocks.logic; -import mods.tinker.common.CoordTuple; -import mods.tinker.common.IMasterLogic; -import mods.tinker.common.IServantLogic; +import mods.tinker.tconstruct.library.CoordTuple; +import mods.tinker.tconstruct.library.IMasterLogic; +import mods.tinker.tconstruct.library.IServantLogic; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.network.INetworkManager; diff --git a/mods/tinker/tconstruct/logic/PartCrafterLogic.java b/mods/tinker/tconstruct/blocks/logic/PartCrafterLogic.java similarity index 92% rename from mods/tinker/tconstruct/logic/PartCrafterLogic.java rename to mods/tinker/tconstruct/blocks/logic/PartCrafterLogic.java index 5f6b5062..e3ee95af 100644 --- a/mods/tinker/tconstruct/logic/PartCrafterLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/PartCrafterLogic.java @@ -1,10 +1,10 @@ -package mods.tinker.tconstruct.logic; +package mods.tinker.tconstruct.blocks.logic; -import mods.tinker.common.IPattern; -import mods.tinker.common.InventoryLogic; -import mods.tinker.tconstruct.container.PartCrafterChestContainer; -import mods.tinker.tconstruct.container.PartCrafterContainer; -import mods.tinker.tconstruct.crafting.PatternBuilder; +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.crafting.PatternBuilder; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; diff --git a/mods/tinker/tconstruct/logic/PatternChestLogic.java b/mods/tinker/tconstruct/blocks/logic/PatternChestLogic.java similarity index 77% rename from mods/tinker/tconstruct/logic/PatternChestLogic.java rename to mods/tinker/tconstruct/blocks/logic/PatternChestLogic.java index d14a26cf..d29a0713 100644 --- a/mods/tinker/tconstruct/logic/PatternChestLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/PatternChestLogic.java @@ -1,7 +1,7 @@ -package mods.tinker.tconstruct.logic; +package mods.tinker.tconstruct.blocks.logic; -import mods.tinker.common.InventoryLogic; -import mods.tinker.tconstruct.container.PatternChestContainer; +import mods.tinker.tconstruct.inventory.PatternChestContainer; +import mods.tinker.tconstruct.library.InventoryLogic; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.world.World; diff --git a/mods/tinker/tconstruct/logic/PatternShaperLogic.java b/mods/tinker/tconstruct/blocks/logic/PatternShaperLogic.java similarity index 92% rename from mods/tinker/tconstruct/logic/PatternShaperLogic.java rename to mods/tinker/tconstruct/blocks/logic/PatternShaperLogic.java index d894b685..e6a1a7fb 100644 --- a/mods/tinker/tconstruct/logic/PatternShaperLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/PatternShaperLogic.java @@ -1,8 +1,8 @@ -package mods.tinker.tconstruct.logic; +package mods.tinker.tconstruct.blocks.logic; -import mods.tinker.common.InventoryLogic; -import mods.tinker.tconstruct.TContent; -import mods.tinker.tconstruct.container.PatternShaperContainer; +import mods.tinker.tconstruct.common.TContent; +import mods.tinker.tconstruct.inventory.PatternShaperContainer; +import mods.tinker.tconstruct.library.InventoryLogic; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; diff --git a/mods/tinker/tconstruct/logic/SmelteryDrainLogic.java b/mods/tinker/tconstruct/blocks/logic/SmelteryDrainLogic.java similarity index 97% rename from mods/tinker/tconstruct/logic/SmelteryDrainLogic.java rename to mods/tinker/tconstruct/blocks/logic/SmelteryDrainLogic.java index eb7c5e31..ee1c02dd 100644 --- a/mods/tinker/tconstruct/logic/SmelteryDrainLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/SmelteryDrainLogic.java @@ -1,6 +1,6 @@ -package mods.tinker.tconstruct.logic; +package mods.tinker.tconstruct.blocks.logic; -import mods.tinker.common.IFacingLogic; +import mods.tinker.tconstruct.library.IFacingLogic; import net.minecraft.entity.EntityLiving; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.INetworkManager; diff --git a/mods/tinker/tconstruct/logic/SmelteryLogic.java b/mods/tinker/tconstruct/blocks/logic/SmelteryLogic.java similarity index 98% rename from mods/tinker/tconstruct/logic/SmelteryLogic.java rename to mods/tinker/tconstruct/blocks/logic/SmelteryLogic.java index a4dcbd7f..e02fdf2c 100644 --- a/mods/tinker/tconstruct/logic/SmelteryLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/SmelteryLogic.java @@ -1,16 +1,16 @@ -package mods.tinker.tconstruct.logic; +package mods.tinker.tconstruct.blocks.logic; import java.util.ArrayList; import java.util.Random; -import mods.tinker.common.CoordTuple; -import mods.tinker.common.IActiveLogic; -import mods.tinker.common.IFacingLogic; -import mods.tinker.common.IMasterLogic; -import mods.tinker.common.InventoryLogic; -import mods.tinker.tconstruct.TContent; -import mods.tinker.tconstruct.container.SmelteryContainer; -import mods.tinker.tconstruct.crafting.Smeltery; +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.crafting.Smeltery; import net.minecraft.block.Block; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.item.EntityItem; diff --git a/mods/tinker/tconstruct/logic/ToolStationLogic.java b/mods/tinker/tconstruct/blocks/logic/ToolStationLogic.java similarity index 90% rename from mods/tinker/tconstruct/logic/ToolStationLogic.java rename to mods/tinker/tconstruct/blocks/logic/ToolStationLogic.java index 6d01c2e4..e4991e58 100644 --- a/mods/tinker/tconstruct/logic/ToolStationLogic.java +++ b/mods/tinker/tconstruct/blocks/logic/ToolStationLogic.java @@ -1,8 +1,8 @@ -package mods.tinker.tconstruct.logic; +package mods.tinker.tconstruct.blocks.logic; -import mods.tinker.common.InventoryLogic; -import mods.tinker.tconstruct.container.ToolStationContainer; -import mods.tinker.tconstruct.crafting.ToolBuilder; +import mods.tinker.tconstruct.inventory.ToolStationContainer; +import mods.tinker.tconstruct.library.InventoryLogic; +import mods.tinker.tconstruct.library.crafting.ToolBuilder; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; diff --git a/mods/tinker/tconstruct/client/TClientTickHandler.java b/mods/tinker/tconstruct/client/TClientTickHandler.java index 14c99025..5692c521 100644 --- a/mods/tinker/tconstruct/client/TClientTickHandler.java +++ b/mods/tinker/tconstruct/client/TClientTickHandler.java @@ -2,7 +2,7 @@ package mods.tinker.tconstruct.client; import java.util.EnumSet; -import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.common.TContent; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; diff --git a/mods/tinker/tconstruct/client/TControls.java b/mods/tinker/tconstruct/client/TControls.java index dac02461..9391b413 100644 --- a/mods/tinker/tconstruct/client/TControls.java +++ b/mods/tinker/tconstruct/client/TControls.java @@ -5,7 +5,7 @@ import java.io.DataOutputStream; import java.util.EnumSet; import mods.tinker.tconstruct.TConstruct; -import mods.tinker.tconstruct.TGuiHandler; +import mods.tinker.tconstruct.util.network.TGuiHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.settings.KeyBinding; diff --git a/mods/tinker/tconstruct/client/TProxyClient.java b/mods/tinker/tconstruct/client/TProxyClient.java index 466916a9..bd4011ce 100644 --- a/mods/tinker/tconstruct/client/TProxyClient.java +++ b/mods/tinker/tconstruct/client/TProxyClient.java @@ -12,28 +12,30 @@ import javax.xml.parsers.DocumentBuilderFactory; import mods.tinker.common.fancyitem.FancyEntityItem; import mods.tinker.common.fancyitem.FancyItemRender; import mods.tinker.tconstruct.TConstruct; -import mods.tinker.tconstruct.TContent; -import mods.tinker.tconstruct.TProxyCommon; -import mods.tinker.tconstruct.client.blockrender.CastingBasinSpecialRender; -import mods.tinker.tconstruct.client.blockrender.CastingTableSpecialRenderer; -import mods.tinker.tconstruct.client.blockrender.FluidRender; -import mods.tinker.tconstruct.client.blockrender.FrypanRender; -import mods.tinker.tconstruct.client.blockrender.GolemCoreRender; -import mods.tinker.tconstruct.client.blockrender.GolemCoreSpecialRender; -import mods.tinker.tconstruct.client.blockrender.OreberryRender; -import mods.tinker.tconstruct.client.blockrender.SearedRender; -import mods.tinker.tconstruct.client.blockrender.SmallFontRenderer; -import mods.tinker.tconstruct.client.blockrender.SmelteryRender; -import mods.tinker.tconstruct.client.blockrender.TableRender; -import mods.tinker.tconstruct.client.blockrender.TankRender; -import mods.tinker.tconstruct.client.entityrender.CartRender; -import mods.tinker.tconstruct.client.entityrender.CrystalRender; -import mods.tinker.tconstruct.client.entityrender.GolemRender; -import mods.tinker.tconstruct.client.entityrender.SkylaRender; -import mods.tinker.tconstruct.client.entityrender.SlimeRender; -import mods.tinker.tconstruct.client.projectilerender.DaggerRender; -import mods.tinker.tconstruct.client.projectilerender.LaunchedItemRender; -import mods.tinker.tconstruct.crafting.ToolBuilder; +import mods.tinker.tconstruct.blocks.logic.CastingBasinLogic; +import mods.tinker.tconstruct.blocks.logic.CastingTableLogic; +import mods.tinker.tconstruct.blocks.logic.GolemCoreLogic; +import mods.tinker.tconstruct.client.block.CastingBasinSpecialRender; +import mods.tinker.tconstruct.client.block.CastingTableSpecialRenderer; +import mods.tinker.tconstruct.client.block.FluidRender; +import mods.tinker.tconstruct.client.block.FrypanRender; +import mods.tinker.tconstruct.client.block.GolemCoreRender; +import mods.tinker.tconstruct.client.block.GolemCoreSpecialRender; +import mods.tinker.tconstruct.client.block.OreberryRender; +import mods.tinker.tconstruct.client.block.SearedRender; +import mods.tinker.tconstruct.client.block.SmallFontRenderer; +import mods.tinker.tconstruct.client.block.SmelteryRender; +import mods.tinker.tconstruct.client.block.TableRender; +import mods.tinker.tconstruct.client.block.TankRender; +import mods.tinker.tconstruct.client.entity.CartRender; +import mods.tinker.tconstruct.client.entity.CrystalRender; +import mods.tinker.tconstruct.client.entity.GolemRender; +import mods.tinker.tconstruct.client.entity.SkylaRender; +import mods.tinker.tconstruct.client.entity.SlimeRender; +import mods.tinker.tconstruct.client.entity.projectile.DaggerRender; +import mods.tinker.tconstruct.client.entity.projectile.LaunchedItemRender; +import mods.tinker.tconstruct.common.TContent; +import mods.tinker.tconstruct.common.TProxyCommon; import mods.tinker.tconstruct.entity.BlueSlime; import mods.tinker.tconstruct.entity.CartEntity; import mods.tinker.tconstruct.entity.Crystal; @@ -42,15 +44,13 @@ import mods.tinker.tconstruct.entity.NitroCreeper; import mods.tinker.tconstruct.entity.Skyla; 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.logic.CastingBasinLogic; -import mods.tinker.tconstruct.logic.CastingTableLogic; -import mods.tinker.tconstruct.logic.GolemCoreLogic; -import mods.tinker.tconstruct.player.ArmorExtended; -import mods.tinker.tconstruct.tools.Dagger; +import mods.tinker.tconstruct.library.crafting.ToolBuilder; +import mods.tinker.tconstruct.util.player.ArmorExtended; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; diff --git a/mods/tinker/tconstruct/client/blockrender/AxleRender.java b/mods/tinker/tconstruct/client/block/AxleRender.java similarity index 97% rename from mods/tinker/tconstruct/client/blockrender/AxleRender.java rename to mods/tinker/tconstruct/client/block/AxleRender.java index 7ed1ed56..17a8a280 100644 --- a/mods/tinker/tconstruct/client/blockrender/AxleRender.java +++ b/mods/tinker/tconstruct/client/block/AxleRender.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.client.blockrender; +package mods.tinker.tconstruct.client.block; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/mods/tinker/tconstruct/client/blockrender/BallRepeaterRender.java b/mods/tinker/tconstruct/client/block/BallRepeaterRender.java similarity index 99% rename from mods/tinker/tconstruct/client/blockrender/BallRepeaterRender.java rename to mods/tinker/tconstruct/client/block/BallRepeaterRender.java index a069d8a6..e1d857ce 100644 --- a/mods/tinker/tconstruct/client/blockrender/BallRepeaterRender.java +++ b/mods/tinker/tconstruct/client/block/BallRepeaterRender.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.client.blockrender; +package mods.tinker.tconstruct.client.block; import mods.tinker.tconstruct.blocks.RedstoneBallRepeater; import net.minecraft.block.Block; diff --git a/mods/tinker/common/BlockSkinRenderHelper.java b/mods/tinker/tconstruct/client/block/BlockSkinRenderHelper.java similarity index 99% rename from mods/tinker/common/BlockSkinRenderHelper.java rename to mods/tinker/tconstruct/client/block/BlockSkinRenderHelper.java index 60ee8df7..a8a8a615 100644 --- a/mods/tinker/common/BlockSkinRenderHelper.java +++ b/mods/tinker/tconstruct/client/block/BlockSkinRenderHelper.java @@ -1,4 +1,4 @@ -package mods.tinker.common; +package mods.tinker.tconstruct.client.block; import net.minecraft.block.Block; import net.minecraft.block.BlockGrass; diff --git a/mods/tinker/tconstruct/client/blockrender/BreakingFX.java b/mods/tinker/tconstruct/client/block/BreakingFX.java similarity index 98% rename from mods/tinker/tconstruct/client/blockrender/BreakingFX.java rename to mods/tinker/tconstruct/client/block/BreakingFX.java index b886e23c..902ff25d 100644 --- a/mods/tinker/tconstruct/client/blockrender/BreakingFX.java +++ b/mods/tinker/tconstruct/client/block/BreakingFX.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.client.blockrender; +package mods.tinker.tconstruct.client.block; import net.minecraft.block.Block; import net.minecraft.client.particle.EntityFX; diff --git a/mods/tinker/tconstruct/client/blockrender/CastingBasinSpecialRender.java b/mods/tinker/tconstruct/client/block/CastingBasinSpecialRender.java similarity index 94% rename from mods/tinker/tconstruct/client/blockrender/CastingBasinSpecialRender.java rename to mods/tinker/tconstruct/client/block/CastingBasinSpecialRender.java index 6a70a760..d99a8755 100644 --- a/mods/tinker/tconstruct/client/blockrender/CastingBasinSpecialRender.java +++ b/mods/tinker/tconstruct/client/block/CastingBasinSpecialRender.java @@ -1,7 +1,7 @@ -package mods.tinker.tconstruct.client.blockrender; +package mods.tinker.tconstruct.client.block; import mods.tinker.common.fancyitem.FancyEntityItem; -import mods.tinker.tconstruct.logic.CastingBasinLogic; +import mods.tinker.tconstruct.blocks.logic.CastingBasinLogic; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/mods/tinker/tconstruct/client/blockrender/CastingTableSpecialRenderer.java b/mods/tinker/tconstruct/client/block/CastingTableSpecialRenderer.java similarity index 95% rename from mods/tinker/tconstruct/client/blockrender/CastingTableSpecialRenderer.java rename to mods/tinker/tconstruct/client/block/CastingTableSpecialRenderer.java index bd14513f..4c92cf9b 100644 --- a/mods/tinker/tconstruct/client/blockrender/CastingTableSpecialRenderer.java +++ b/mods/tinker/tconstruct/client/block/CastingTableSpecialRenderer.java @@ -1,7 +1,7 @@ -package mods.tinker.tconstruct.client.blockrender; +package mods.tinker.tconstruct.client.block; import mods.tinker.common.fancyitem.FancyEntityItem; -import mods.tinker.tconstruct.logic.CastingTableLogic; +import mods.tinker.tconstruct.blocks.logic.CastingTableLogic; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/mods/tinker/tconstruct/client/blockrender/FluidRender.java b/mods/tinker/tconstruct/client/block/FluidRender.java similarity index 99% rename from mods/tinker/tconstruct/client/blockrender/FluidRender.java rename to mods/tinker/tconstruct/client/block/FluidRender.java index e20cd2fd..29ee1ee5 100644 --- a/mods/tinker/tconstruct/client/blockrender/FluidRender.java +++ b/mods/tinker/tconstruct/client/block/FluidRender.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.client.blockrender; +package mods.tinker.tconstruct.client.block; import mods.tinker.tconstruct.blocks.LiquidMetalBase; import net.minecraft.block.Block; diff --git a/mods/tinker/tconstruct/client/blockrender/FrypanRender.java b/mods/tinker/tconstruct/client/block/FrypanRender.java similarity index 96% rename from mods/tinker/tconstruct/client/blockrender/FrypanRender.java rename to mods/tinker/tconstruct/client/block/FrypanRender.java index 3b0de4a4..d8688193 100644 --- a/mods/tinker/tconstruct/client/blockrender/FrypanRender.java +++ b/mods/tinker/tconstruct/client/block/FrypanRender.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.client.blockrender; +package mods.tinker.tconstruct.client.block; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/mods/tinker/tconstruct/client/blockrender/GolemCoreRender.java b/mods/tinker/tconstruct/client/block/GolemCoreRender.java similarity index 99% rename from mods/tinker/tconstruct/client/blockrender/GolemCoreRender.java rename to mods/tinker/tconstruct/client/block/GolemCoreRender.java index e73e6183..380e608e 100644 --- a/mods/tinker/tconstruct/client/blockrender/GolemCoreRender.java +++ b/mods/tinker/tconstruct/client/block/GolemCoreRender.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.client.blockrender; +package mods.tinker.tconstruct.client.block; import org.lwjgl.opengl.GL11; diff --git a/mods/tinker/tconstruct/client/blockrender/GolemCoreSpecialRender.java b/mods/tinker/tconstruct/client/block/GolemCoreSpecialRender.java similarity index 94% rename from mods/tinker/tconstruct/client/blockrender/GolemCoreSpecialRender.java rename to mods/tinker/tconstruct/client/block/GolemCoreSpecialRender.java index 7a59b0f2..db2f4a02 100644 --- a/mods/tinker/tconstruct/client/blockrender/GolemCoreSpecialRender.java +++ b/mods/tinker/tconstruct/client/block/GolemCoreSpecialRender.java @@ -1,7 +1,7 @@ -package mods.tinker.tconstruct.client.blockrender; +package mods.tinker.tconstruct.client.block; import mods.tinker.common.fancyitem.FancyEntityItem; -import mods.tinker.tconstruct.logic.GolemCoreLogic; +import mods.tinker.tconstruct.blocks.logic.GolemCoreLogic; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/mods/tinker/tconstruct/client/blockrender/OreberryRender.java b/mods/tinker/tconstruct/client/block/OreberryRender.java similarity index 98% rename from mods/tinker/tconstruct/client/blockrender/OreberryRender.java rename to mods/tinker/tconstruct/client/block/OreberryRender.java index 7d2aea67..20d0acb8 100644 --- a/mods/tinker/tconstruct/client/blockrender/OreberryRender.java +++ b/mods/tinker/tconstruct/client/block/OreberryRender.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.client.blockrender; +package mods.tinker.tconstruct.client.block; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/mods/tinker/tconstruct/client/blockrender/SearedRender.java b/mods/tinker/tconstruct/client/block/SearedRender.java similarity index 98% rename from mods/tinker/tconstruct/client/blockrender/SearedRender.java rename to mods/tinker/tconstruct/client/block/SearedRender.java index a0e2d23e..6368217c 100644 --- a/mods/tinker/tconstruct/client/blockrender/SearedRender.java +++ b/mods/tinker/tconstruct/client/block/SearedRender.java @@ -1,10 +1,9 @@ -package mods.tinker.tconstruct.client.blockrender; +package mods.tinker.tconstruct.client.block; -import mods.tinker.common.BlockSkinRenderHelper; -import mods.tinker.tconstruct.TContent; -import mods.tinker.tconstruct.logic.CastingBasinLogic; -import mods.tinker.tconstruct.logic.CastingTableLogic; -import mods.tinker.tconstruct.logic.FaucetLogic; +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.common.TContent; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; diff --git a/mods/tinker/tconstruct/client/blockrender/SmallFontRenderer.java b/mods/tinker/tconstruct/client/block/SmallFontRenderer.java similarity index 99% rename from mods/tinker/tconstruct/client/blockrender/SmallFontRenderer.java rename to mods/tinker/tconstruct/client/block/SmallFontRenderer.java index f136c0d5..8d536263 100644 --- a/mods/tinker/tconstruct/client/blockrender/SmallFontRenderer.java +++ b/mods/tinker/tconstruct/client/block/SmallFontRenderer.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.client.blockrender; +package mods.tinker.tconstruct.client.block; import java.awt.image.BufferedImage; import java.io.IOException; diff --git a/mods/tinker/tconstruct/client/blockrender/SmelteryRender.java b/mods/tinker/tconstruct/client/block/SmelteryRender.java similarity index 97% rename from mods/tinker/tconstruct/client/blockrender/SmelteryRender.java rename to mods/tinker/tconstruct/client/block/SmelteryRender.java index b684dac8..5c66579e 100644 --- a/mods/tinker/tconstruct/client/blockrender/SmelteryRender.java +++ b/mods/tinker/tconstruct/client/block/SmelteryRender.java @@ -1,8 +1,7 @@ -package mods.tinker.tconstruct.client.blockrender; +package mods.tinker.tconstruct.client.block; -import mods.tinker.common.BlockSkinRenderHelper; -import mods.tinker.tconstruct.crafting.Smeltery; -import mods.tinker.tconstruct.logic.SmelteryLogic; +import mods.tinker.tconstruct.blocks.logic.SmelteryLogic; +import mods.tinker.tconstruct.library.crafting.Smeltery; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; diff --git a/mods/tinker/tconstruct/client/blockrender/TableRender.java b/mods/tinker/tconstruct/client/block/TableRender.java similarity index 98% rename from mods/tinker/tconstruct/client/blockrender/TableRender.java rename to mods/tinker/tconstruct/client/block/TableRender.java index a68542ff..c57b53e3 100644 --- a/mods/tinker/tconstruct/client/blockrender/TableRender.java +++ b/mods/tinker/tconstruct/client/block/TableRender.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.client.blockrender; +package mods.tinker.tconstruct.client.block; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/mods/tinker/tconstruct/client/blockrender/TankRender.java b/mods/tinker/tconstruct/client/block/TankRender.java similarity index 97% rename from mods/tinker/tconstruct/client/blockrender/TankRender.java rename to mods/tinker/tconstruct/client/block/TankRender.java index 5fe82376..9f0cce7b 100644 --- a/mods/tinker/tconstruct/client/blockrender/TankRender.java +++ b/mods/tinker/tconstruct/client/block/TankRender.java @@ -1,7 +1,6 @@ -package mods.tinker.tconstruct.client.blockrender; +package mods.tinker.tconstruct.client.block; -import mods.tinker.common.BlockSkinRenderHelper; -import mods.tinker.tconstruct.logic.LavaTankLogic; +import mods.tinker.tconstruct.blocks.logic.LavaTankLogic; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; diff --git a/mods/tinker/tconstruct/client/entityrender/CartRender.java b/mods/tinker/tconstruct/client/entity/CartRender.java similarity index 98% rename from mods/tinker/tconstruct/client/entityrender/CartRender.java rename to mods/tinker/tconstruct/client/entity/CartRender.java index f22f03cc..72a0e873 100644 --- a/mods/tinker/tconstruct/client/entityrender/CartRender.java +++ b/mods/tinker/tconstruct/client/entity/CartRender.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.client.entityrender; +package mods.tinker.tconstruct.client.entity; import mods.tinker.tconstruct.entity.CartEntity; import net.minecraft.block.Block; diff --git a/mods/tinker/tconstruct/client/entityrender/CrystalModel.java b/mods/tinker/tconstruct/client/entity/CrystalModel.java similarity index 96% rename from mods/tinker/tconstruct/client/entityrender/CrystalModel.java rename to mods/tinker/tconstruct/client/entity/CrystalModel.java index ec86d559..3ce753e2 100644 --- a/mods/tinker/tconstruct/client/entityrender/CrystalModel.java +++ b/mods/tinker/tconstruct/client/entity/CrystalModel.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.client.entityrender; +package mods.tinker.tconstruct.client.entity; import mods.tinker.tconstruct.client.tmt.ModelRendererTurbo; import net.minecraft.client.model.ModelBase; diff --git a/mods/tinker/tconstruct/client/entityrender/CrystalRender.java b/mods/tinker/tconstruct/client/entity/CrystalRender.java similarity index 98% rename from mods/tinker/tconstruct/client/entityrender/CrystalRender.java rename to mods/tinker/tconstruct/client/entity/CrystalRender.java index 83ba1672..7eb6807a 100644 --- a/mods/tinker/tconstruct/client/entityrender/CrystalRender.java +++ b/mods/tinker/tconstruct/client/entity/CrystalRender.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.client.entityrender; +package mods.tinker.tconstruct.client.entity; import mods.tinker.tconstruct.entity.Crystal; import net.minecraft.client.model.ModelBase; diff --git a/mods/tinker/tconstruct/client/entityrender/GolemBaseModel.java b/mods/tinker/tconstruct/client/entity/GolemBaseModel.java similarity index 98% rename from mods/tinker/tconstruct/client/entityrender/GolemBaseModel.java rename to mods/tinker/tconstruct/client/entity/GolemBaseModel.java index e33f3374..c29cc5a8 100644 --- a/mods/tinker/tconstruct/client/entityrender/GolemBaseModel.java +++ b/mods/tinker/tconstruct/client/entity/GolemBaseModel.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.client.entityrender; +package mods.tinker.tconstruct.client.entity; import net.minecraft.client.model.ModelPig; import net.minecraft.client.model.ModelRenderer; diff --git a/mods/tinker/tconstruct/client/entityrender/GolemRender.java b/mods/tinker/tconstruct/client/entity/GolemRender.java similarity index 99% rename from mods/tinker/tconstruct/client/entityrender/GolemRender.java rename to mods/tinker/tconstruct/client/entity/GolemRender.java index f5202e0b..fafd33e2 100644 --- a/mods/tinker/tconstruct/client/entityrender/GolemRender.java +++ b/mods/tinker/tconstruct/client/entity/GolemRender.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.client.entityrender; +package mods.tinker.tconstruct.client.entity; import static net.minecraftforge.client.IItemRenderer.ItemRenderType.EQUIPPED; import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.BLOCK_3D; diff --git a/mods/tinker/tconstruct/client/entityrender/ModelPullcart.java b/mods/tinker/tconstruct/client/entity/ModelPullcart.java similarity index 99% rename from mods/tinker/tconstruct/client/entityrender/ModelPullcart.java rename to mods/tinker/tconstruct/client/entity/ModelPullcart.java index d9835b6d..d3819cf6 100644 --- a/mods/tinker/tconstruct/client/entityrender/ModelPullcart.java +++ b/mods/tinker/tconstruct/client/entity/ModelPullcart.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.client.entityrender; +package mods.tinker.tconstruct.client.entity; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/mods/tinker/tconstruct/client/entityrender/ModelWagon.java b/mods/tinker/tconstruct/client/entity/ModelWagon.java similarity index 99% rename from mods/tinker/tconstruct/client/entityrender/ModelWagon.java rename to mods/tinker/tconstruct/client/entity/ModelWagon.java index 516a2fcc..47edbd93 100644 --- a/mods/tinker/tconstruct/client/entityrender/ModelWagon.java +++ b/mods/tinker/tconstruct/client/entity/ModelWagon.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.client.entityrender; +package mods.tinker.tconstruct.client.entity; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/mods/tinker/tconstruct/client/entityrender/SkylaModel.java b/mods/tinker/tconstruct/client/entity/SkylaModel.java similarity index 99% rename from mods/tinker/tconstruct/client/entityrender/SkylaModel.java rename to mods/tinker/tconstruct/client/entity/SkylaModel.java index 26b569e3..277e2ab9 100644 --- a/mods/tinker/tconstruct/client/entityrender/SkylaModel.java +++ b/mods/tinker/tconstruct/client/entity/SkylaModel.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.client.entityrender; +package mods.tinker.tconstruct.client.entity; import mods.tinker.tconstruct.client.tmt.ModelRendererTurbo; import net.minecraft.client.model.ModelBase; diff --git a/mods/tinker/tconstruct/client/entityrender/SkylaRender.java b/mods/tinker/tconstruct/client/entity/SkylaRender.java similarity index 97% rename from mods/tinker/tconstruct/client/entityrender/SkylaRender.java rename to mods/tinker/tconstruct/client/entity/SkylaRender.java index 721e786e..c5f5022b 100644 --- a/mods/tinker/tconstruct/client/entityrender/SkylaRender.java +++ b/mods/tinker/tconstruct/client/entity/SkylaRender.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.client.entityrender; +package mods.tinker.tconstruct.client.entity; import mods.tinker.tconstruct.entity.Skyla; import net.minecraft.client.model.ModelBase; diff --git a/mods/tinker/tconstruct/client/entityrender/SlimeModel.java b/mods/tinker/tconstruct/client/entity/SlimeModel.java similarity index 97% rename from mods/tinker/tconstruct/client/entityrender/SlimeModel.java rename to mods/tinker/tconstruct/client/entity/SlimeModel.java index 920c24af..a2b3a4a1 100644 --- a/mods/tinker/tconstruct/client/entityrender/SlimeModel.java +++ b/mods/tinker/tconstruct/client/entity/SlimeModel.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.client.entityrender; +package mods.tinker.tconstruct.client.entity; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/mods/tinker/tconstruct/client/entityrender/SlimeRender.java b/mods/tinker/tconstruct/client/entity/SlimeRender.java similarity index 97% rename from mods/tinker/tconstruct/client/entityrender/SlimeRender.java rename to mods/tinker/tconstruct/client/entity/SlimeRender.java index ebaf36e0..1109780d 100644 --- a/mods/tinker/tconstruct/client/entityrender/SlimeRender.java +++ b/mods/tinker/tconstruct/client/entity/SlimeRender.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.client.entityrender; +package mods.tinker.tconstruct.client.entity; import mods.tinker.tconstruct.entity.BlueSlime; import net.minecraft.client.model.ModelBase; diff --git a/mods/tinker/tconstruct/client/projectilerender/DaggerRender.java b/mods/tinker/tconstruct/client/entity/projectile/DaggerRender.java similarity index 99% rename from mods/tinker/tconstruct/client/projectilerender/DaggerRender.java rename to mods/tinker/tconstruct/client/entity/projectile/DaggerRender.java index e5819434..435dd268 100644 --- a/mods/tinker/tconstruct/client/projectilerender/DaggerRender.java +++ b/mods/tinker/tconstruct/client/entity/projectile/DaggerRender.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.client.projectilerender; +package mods.tinker.tconstruct.client.entity.projectile; import java.util.Random; diff --git a/mods/tinker/tconstruct/client/projectilerender/DaggerRenderOld.java b/mods/tinker/tconstruct/client/entity/projectile/DaggerRenderOld.java similarity index 97% rename from mods/tinker/tconstruct/client/projectilerender/DaggerRenderOld.java rename to mods/tinker/tconstruct/client/entity/projectile/DaggerRenderOld.java index 2b9af3f3..f95f8720 100644 --- a/mods/tinker/tconstruct/client/projectilerender/DaggerRenderOld.java +++ b/mods/tinker/tconstruct/client/entity/projectile/DaggerRenderOld.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.client.projectilerender; +package mods.tinker.tconstruct.client.entity.projectile; import java.util.Random; import mods.tinker.tconstruct.entity.projectile.DaggerEntity; diff --git a/mods/tinker/tconstruct/client/projectilerender/LaunchedItemRender.java b/mods/tinker/tconstruct/client/entity/projectile/LaunchedItemRender.java similarity index 98% rename from mods/tinker/tconstruct/client/projectilerender/LaunchedItemRender.java rename to mods/tinker/tconstruct/client/entity/projectile/LaunchedItemRender.java index 1031684e..e14e82c3 100644 --- a/mods/tinker/tconstruct/client/projectilerender/LaunchedItemRender.java +++ b/mods/tinker/tconstruct/client/entity/projectile/LaunchedItemRender.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.client.projectilerender; +package mods.tinker.tconstruct.client.entity.projectile; import mods.tinker.tconstruct.entity.projectile.LaunchedPotion; import net.minecraft.client.renderer.Tessellator; diff --git a/mods/tinker/tconstruct/client/projectilerender/RangedRenderBase.java b/mods/tinker/tconstruct/client/entity/projectile/RangedRenderBase.java similarity index 98% rename from mods/tinker/tconstruct/client/projectilerender/RangedRenderBase.java rename to mods/tinker/tconstruct/client/entity/projectile/RangedRenderBase.java index dc42a0a9..be33f052 100644 --- a/mods/tinker/tconstruct/client/projectilerender/RangedRenderBase.java +++ b/mods/tinker/tconstruct/client/entity/projectile/RangedRenderBase.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.client.projectilerender; +package mods.tinker.tconstruct.client.entity.projectile; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; diff --git a/mods/tinker/tconstruct/client/gui/ArmorExtendedGui.java b/mods/tinker/tconstruct/client/gui/ArmorExtendedGui.java index e052ca00..3d88d163 100644 --- a/mods/tinker/tconstruct/client/gui/ArmorExtendedGui.java +++ b/mods/tinker/tconstruct/client/gui/ArmorExtendedGui.java @@ -1,8 +1,8 @@ package mods.tinker.tconstruct.client.gui; -import mods.tinker.tconstruct.container.ArmorExtendedContainer; -import mods.tinker.tconstruct.player.ArmorExtended; -import mods.tinker.tconstruct.player.TPlayerStats; +import mods.tinker.tconstruct.inventory.ArmorExtendedContainer; +import mods.tinker.tconstruct.util.player.ArmorExtended; +import mods.tinker.tconstruct.util.player.TPlayerStats; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.InventoryEffectRenderer; import net.minecraft.client.renderer.OpenGlHelper; diff --git a/mods/tinker/tconstruct/client/gui/FrypanGui.java b/mods/tinker/tconstruct/client/gui/FrypanGui.java index babf5a02..1f973044 100644 --- a/mods/tinker/tconstruct/client/gui/FrypanGui.java +++ b/mods/tinker/tconstruct/client/gui/FrypanGui.java @@ -1,6 +1,6 @@ package mods.tinker.tconstruct.client.gui; -import mods.tinker.tconstruct.logic.FrypanLogic; +import mods.tinker.tconstruct.blocks.logic.FrypanLogic; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; diff --git a/mods/tinker/tconstruct/client/gui/GuiManual.java b/mods/tinker/tconstruct/client/gui/GuiManual.java index b4974843..b1316a8b 100644 --- a/mods/tinker/tconstruct/client/gui/GuiManual.java +++ b/mods/tinker/tconstruct/client/gui/GuiManual.java @@ -1,10 +1,10 @@ package mods.tinker.tconstruct.client.gui; import mods.tinker.tconstruct.client.TProxyClient; -import mods.tinker.tconstruct.crafting.PatternBuilder; 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 net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiParticle; diff --git a/mods/tinker/tconstruct/client/gui/NewContainerGui.java b/mods/tinker/tconstruct/client/gui/NewContainerGui.java index f58ae559..f6a4c1db 100644 --- a/mods/tinker/tconstruct/client/gui/NewContainerGui.java +++ b/mods/tinker/tconstruct/client/gui/NewContainerGui.java @@ -6,8 +6,8 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import mods.tinker.tconstruct.container.ActiveContainer; -import mods.tinker.tconstruct.container.ActiveSlot; +import mods.tinker.tconstruct.inventory.ActiveContainer; +import mods.tinker.tconstruct.inventory.ActiveSlot; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.OpenGlHelper; diff --git a/mods/tinker/tconstruct/client/gui/PartCrafterGui.java b/mods/tinker/tconstruct/client/gui/PartCrafterGui.java index 91bf9289..3c6c0b3d 100644 --- a/mods/tinker/tconstruct/client/gui/PartCrafterGui.java +++ b/mods/tinker/tconstruct/client/gui/PartCrafterGui.java @@ -1,11 +1,11 @@ package mods.tinker.tconstruct.client.gui; -import mods.tinker.tconstruct.container.ActiveContainer; -import mods.tinker.tconstruct.container.PartCrafterChestContainer; -import mods.tinker.tconstruct.crafting.PatternBuilder; +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.logic.PartCrafterLogic; +import mods.tinker.tconstruct.library.crafting.PatternBuilder; 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/PatternChestGui.java b/mods/tinker/tconstruct/client/gui/PatternChestGui.java index 10ae904f..5e4ef710 100644 --- a/mods/tinker/tconstruct/client/gui/PatternChestGui.java +++ b/mods/tinker/tconstruct/client/gui/PatternChestGui.java @@ -1,6 +1,6 @@ package mods.tinker.tconstruct.client.gui; -import mods.tinker.tconstruct.logic.PatternChestLogic; +import mods.tinker.tconstruct.blocks.logic.PatternChestLogic; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; diff --git a/mods/tinker/tconstruct/client/gui/PatternShaperGui.java b/mods/tinker/tconstruct/client/gui/PatternShaperGui.java index e96ceabc..3d5f533e 100644 --- a/mods/tinker/tconstruct/client/gui/PatternShaperGui.java +++ b/mods/tinker/tconstruct/client/gui/PatternShaperGui.java @@ -3,9 +3,9 @@ package mods.tinker.tconstruct.client.gui; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; -import mods.tinker.tconstruct.TContent; -import mods.tinker.tconstruct.container.PatternShaperContainer; -import mods.tinker.tconstruct.logic.PatternShaperLogic; +import mods.tinker.tconstruct.blocks.logic.PatternShaperLogic; +import mods.tinker.tconstruct.common.TContent; +import mods.tinker.tconstruct.inventory.PatternShaperContainer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/mods/tinker/tconstruct/client/gui/SmelteryGui.java b/mods/tinker/tconstruct/client/gui/SmelteryGui.java index eb5e1e95..e3dbc8a4 100644 --- a/mods/tinker/tconstruct/client/gui/SmelteryGui.java +++ b/mods/tinker/tconstruct/client/gui/SmelteryGui.java @@ -3,9 +3,9 @@ package mods.tinker.tconstruct.client.gui; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; -import mods.tinker.tconstruct.container.ActiveContainer; -import mods.tinker.tconstruct.container.SmelteryContainer; -import mods.tinker.tconstruct.logic.SmelteryLogic; +import mods.tinker.tconstruct.blocks.logic.SmelteryLogic; +import mods.tinker.tconstruct.inventory.ActiveContainer; +import mods.tinker.tconstruct.inventory.SmelteryContainer; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/mods/tinker/tconstruct/client/gui/ToolStationGui.java b/mods/tinker/tconstruct/client/gui/ToolStationGui.java index 2d5814f3..4d809356 100644 --- a/mods/tinker/tconstruct/client/gui/ToolStationGui.java +++ b/mods/tinker/tconstruct/client/gui/ToolStationGui.java @@ -3,13 +3,13 @@ package mods.tinker.tconstruct.client.gui; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; -import mods.tinker.tconstruct.container.ActiveContainer; -import mods.tinker.tconstruct.container.ToolStationContainer; +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.logic.ToolStationLogic; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; diff --git a/mods/tinker/tconstruct/TContent.java b/mods/tinker/tconstruct/common/TContent.java similarity index 97% rename from mods/tinker/tconstruct/TContent.java rename to mods/tinker/tconstruct/common/TContent.java index fdbe7f22..a390529a 100644 --- a/mods/tinker/tconstruct/TContent.java +++ b/mods/tinker/tconstruct/common/TContent.java @@ -1,8 +1,7 @@ -package mods.tinker.tconstruct; +package mods.tinker.tconstruct.common; -import mods.tinker.common.IPattern; -import mods.tinker.common.RecipeRemover; import mods.tinker.common.fancyitem.FancyEntityItem; +import mods.tinker.tconstruct.TConstruct; import mods.tinker.tconstruct.blocks.EquipBlock; import mods.tinker.tconstruct.blocks.GravelOre; import mods.tinker.tconstruct.blocks.LavaTankBlock; @@ -12,16 +11,24 @@ import mods.tinker.tconstruct.blocks.MetalOre; import mods.tinker.tconstruct.blocks.OreberryBush; import mods.tinker.tconstruct.blocks.SearedBlock; import mods.tinker.tconstruct.blocks.SmelteryBlock; +import mods.tinker.tconstruct.blocks.SpeedBlock; import mods.tinker.tconstruct.blocks.StoneTorch; import mods.tinker.tconstruct.blocks.TConstructBlock; import mods.tinker.tconstruct.blocks.TMetalBlock; import mods.tinker.tconstruct.blocks.ToolStationBlock; -import mods.tinker.tconstruct.blocks.infiblocks.SpeedBlock; -import mods.tinker.tconstruct.crafting.LiquidBlockCasting; -import mods.tinker.tconstruct.crafting.LiquidCasting; -import mods.tinker.tconstruct.crafting.PatternBuilder; -import mods.tinker.tconstruct.crafting.Smeltery; -import mods.tinker.tconstruct.crafting.ToolBuilder; +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.blocks.logic.FrypanLogic; +import mods.tinker.tconstruct.blocks.logic.LavaTankLogic; +import mods.tinker.tconstruct.blocks.logic.LiquidTextureLogic; +import mods.tinker.tconstruct.blocks.logic.MultiServantLogic; +import mods.tinker.tconstruct.blocks.logic.PartCrafterLogic; +import mods.tinker.tconstruct.blocks.logic.PatternChestLogic; +import mods.tinker.tconstruct.blocks.logic.PatternShaperLogic; +import mods.tinker.tconstruct.blocks.logic.SmelteryDrainLogic; +import mods.tinker.tconstruct.blocks.logic.SmelteryLogic; +import mods.tinker.tconstruct.blocks.logic.ToolStationLogic; import mods.tinker.tconstruct.entity.BlueSlime; import mods.tinker.tconstruct.entity.NitroCreeper; import mods.tinker.tconstruct.entity.projectile.DaggerEntity; @@ -31,7 +38,7 @@ import mods.tinker.tconstruct.items.HeartContainer; import mods.tinker.tconstruct.items.MetalPattern; import mods.tinker.tconstruct.items.OreBerries; import mods.tinker.tconstruct.items.Pattern; -import mods.tinker.tconstruct.items.PatternManual; +import mods.tinker.tconstruct.items.Manual; import mods.tinker.tconstruct.items.StrangeFood; import mods.tinker.tconstruct.items.TitleIcon; import mods.tinker.tconstruct.items.ToolPart; @@ -48,22 +55,27 @@ import mods.tinker.tconstruct.items.blocks.SearedTableItemBlock; import mods.tinker.tconstruct.items.blocks.SmelteryItemBlock; import mods.tinker.tconstruct.items.blocks.SpeedBlockItem; import mods.tinker.tconstruct.items.blocks.ToolStationItemBlock; +import mods.tinker.tconstruct.items.tools.Axe; +import mods.tinker.tconstruct.items.tools.BattleSign; +import mods.tinker.tconstruct.items.tools.Broadsword; +import mods.tinker.tconstruct.items.tools.Chisel; +import mods.tinker.tconstruct.items.tools.Dagger; +import mods.tinker.tconstruct.items.tools.FryingPan; +import mods.tinker.tconstruct.items.tools.Longsword; +import mods.tinker.tconstruct.items.tools.Mattock; +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.logic.CastingBasinLogic; -import mods.tinker.tconstruct.logic.CastingTableLogic; -import mods.tinker.tconstruct.logic.FaucetLogic; -import mods.tinker.tconstruct.logic.FrypanLogic; -import mods.tinker.tconstruct.logic.LavaTankLogic; -import mods.tinker.tconstruct.logic.LiquidTextureLogic; -import mods.tinker.tconstruct.logic.MultiServantLogic; -import mods.tinker.tconstruct.logic.PartCrafterLogic; -import mods.tinker.tconstruct.logic.PatternChestLogic; -import mods.tinker.tconstruct.logic.PatternShaperLogic; -import mods.tinker.tconstruct.logic.SmelteryDrainLogic; -import mods.tinker.tconstruct.logic.SmelteryLogic; -import mods.tinker.tconstruct.logic.ToolStationLogic; +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.modifiers.ModAttack; import mods.tinker.tconstruct.modifiers.ModBlaze; import mods.tinker.tconstruct.modifiers.ModBoolean; @@ -74,18 +86,8 @@ import mods.tinker.tconstruct.modifiers.ModInteger; import mods.tinker.tconstruct.modifiers.ModLapis; import mods.tinker.tconstruct.modifiers.ModRedstone; import mods.tinker.tconstruct.modifiers.ModRepair; -import mods.tinker.tconstruct.tools.Axe; -import mods.tinker.tconstruct.tools.BattleSign; -import mods.tinker.tconstruct.tools.Broadsword; -import mods.tinker.tconstruct.tools.Chisel; -import mods.tinker.tconstruct.tools.Dagger; -import mods.tinker.tconstruct.tools.FryingPan; -import mods.tinker.tconstruct.tools.Longsword; -import mods.tinker.tconstruct.tools.Mattock; -import mods.tinker.tconstruct.tools.Pickaxe; -import mods.tinker.tconstruct.tools.PotionLauncher; -import mods.tinker.tconstruct.tools.Rapier; -import mods.tinker.tconstruct.tools.Shovel; +import mods.tinker.tconstruct.util.PHConstruct; +import mods.tinker.tconstruct.util.RecipeRemover; import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; @@ -392,7 +394,7 @@ public class TContent implements IFuelHandler metalPattern = new MetalPattern(PHConstruct.metalPattern, "MetalPattern", "cast_", "materials/").setUnlocalizedName("tconstruct.MetalPattern"); //netherPattern = new Pattern(PHTools.netherPattern, 128, patternTexture).setUnlocalizedName("tconstruct.Pattern"); - manualBook = new PatternManual(PHConstruct.manual); + manualBook = new Manual(PHConstruct.manual); buckets = new FilledBucket(PHConstruct.buckets); pickaxe = new Pickaxe(PHConstruct.pickaxe); diff --git a/mods/tinker/tconstruct/TProxyCommon.java b/mods/tinker/tconstruct/common/TProxyCommon.java similarity index 99% rename from mods/tinker/tconstruct/TProxyCommon.java rename to mods/tinker/tconstruct/common/TProxyCommon.java index cdcedba9..96434647 100644 --- a/mods/tinker/tconstruct/TProxyCommon.java +++ b/mods/tinker/tconstruct/common/TProxyCommon.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct; +package mods.tinker.tconstruct.common; import java.io.File; diff --git a/mods/tinker/tconstruct/entity/BlueSlime.java b/mods/tinker/tconstruct/entity/BlueSlime.java index 315da079..7ffee59a 100644 --- a/mods/tinker/tconstruct/entity/BlueSlime.java +++ b/mods/tinker/tconstruct/entity/BlueSlime.java @@ -1,7 +1,7 @@ package mods.tinker.tconstruct.entity; import mods.tinker.tconstruct.TConstruct; -import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.common.TContent; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.monster.IMob; diff --git a/mods/tinker/tconstruct/entity/GolemBase.java b/mods/tinker/tconstruct/entity/GolemBase.java index 8b9130ed..86cb9258 100644 --- a/mods/tinker/tconstruct/entity/GolemBase.java +++ b/mods/tinker/tconstruct/entity/GolemBase.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Random; import mods.tinker.common.fancyitem.FancyEntityItem; -import mods.tinker.tconstruct.ai.CoreAI; +import mods.tinker.tconstruct.entity.ai.CoreAI; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/mods/tinker/tconstruct/entity/MetalSlime.java b/mods/tinker/tconstruct/entity/MetalSlime.java index f1e641a9..b440a942 100644 --- a/mods/tinker/tconstruct/entity/MetalSlime.java +++ b/mods/tinker/tconstruct/entity/MetalSlime.java @@ -1,6 +1,6 @@ package mods.tinker.tconstruct.entity; -import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.common.TContent; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/mods/tinker/tconstruct/ai/CoreAI.java b/mods/tinker/tconstruct/entity/ai/CoreAI.java similarity index 94% rename from mods/tinker/tconstruct/ai/CoreAI.java rename to mods/tinker/tconstruct/entity/ai/CoreAI.java index c03d98a5..073845bf 100644 --- a/mods/tinker/tconstruct/ai/CoreAI.java +++ b/mods/tinker/tconstruct/entity/ai/CoreAI.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.ai; +package mods.tinker.tconstruct.entity.ai; import mods.tinker.tconstruct.entity.GolemBase; import net.minecraft.entity.Entity; diff --git a/mods/tinker/tconstruct/entity/projectile/DaggerEntity.java b/mods/tinker/tconstruct/entity/projectile/DaggerEntity.java index abdaefa7..acbeaff1 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.tools.Dagger; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/mods/tinker/tconstruct/container/ActiveContainer.java b/mods/tinker/tconstruct/inventory/ActiveContainer.java similarity index 87% rename from mods/tinker/tconstruct/container/ActiveContainer.java rename to mods/tinker/tconstruct/inventory/ActiveContainer.java index 8072b272..d81397b5 100644 --- a/mods/tinker/tconstruct/container/ActiveContainer.java +++ b/mods/tinker/tconstruct/inventory/ActiveContainer.java @@ -1,9 +1,9 @@ -package mods.tinker.tconstruct.container; +package mods.tinker.tconstruct.inventory; import java.util.ArrayList; import java.util.List; -import mods.tinker.tconstruct.logic.SmelteryLogic; +import mods.tinker.tconstruct.blocks.logic.SmelteryLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/mods/tinker/tconstruct/container/ActiveSlot.java b/mods/tinker/tconstruct/inventory/ActiveSlot.java similarity index 92% rename from mods/tinker/tconstruct/container/ActiveSlot.java rename to mods/tinker/tconstruct/inventory/ActiveSlot.java index 97cb1e96..26fbf639 100644 --- a/mods/tinker/tconstruct/container/ActiveSlot.java +++ b/mods/tinker/tconstruct/inventory/ActiveSlot.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.container; +package mods.tinker.tconstruct.inventory; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/mods/tinker/tconstruct/container/ArmorExtendedContainer.java b/mods/tinker/tconstruct/inventory/ArmorExtendedContainer.java similarity index 92% rename from mods/tinker/tconstruct/container/ArmorExtendedContainer.java rename to mods/tinker/tconstruct/inventory/ArmorExtendedContainer.java index cbd258a3..36545074 100644 --- a/mods/tinker/tconstruct/container/ArmorExtendedContainer.java +++ b/mods/tinker/tconstruct/inventory/ArmorExtendedContainer.java @@ -1,7 +1,7 @@ -package mods.tinker.tconstruct.container; +package mods.tinker.tconstruct.inventory; -import mods.tinker.tconstruct.player.ArmorExtended; -import mods.tinker.tconstruct.player.TPlayerStats; +import mods.tinker.tconstruct.util.player.ArmorExtended; +import mods.tinker.tconstruct.util.player.TPlayerStats; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; diff --git a/mods/tinker/tconstruct/container/FrypanContainer.java b/mods/tinker/tconstruct/inventory/FrypanContainer.java similarity index 97% rename from mods/tinker/tconstruct/container/FrypanContainer.java rename to mods/tinker/tconstruct/inventory/FrypanContainer.java index f428a8ec..38591b99 100644 --- a/mods/tinker/tconstruct/container/FrypanContainer.java +++ b/mods/tinker/tconstruct/inventory/FrypanContainer.java @@ -1,6 +1,6 @@ -package mods.tinker.tconstruct.container; +package mods.tinker.tconstruct.inventory; -import mods.tinker.tconstruct.logic.FrypanLogic; +import mods.tinker.tconstruct.blocks.logic.FrypanLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/mods/tinker/tconstruct/container/PartCrafterChestContainer.java b/mods/tinker/tconstruct/inventory/PartCrafterChestContainer.java similarity index 93% rename from mods/tinker/tconstruct/container/PartCrafterChestContainer.java rename to mods/tinker/tconstruct/inventory/PartCrafterChestContainer.java index 011c62a6..b104c0a6 100644 --- a/mods/tinker/tconstruct/container/PartCrafterChestContainer.java +++ b/mods/tinker/tconstruct/inventory/PartCrafterChestContainer.java @@ -1,8 +1,8 @@ -package mods.tinker.tconstruct.container; +package mods.tinker.tconstruct.inventory; -import mods.tinker.common.IPattern; -import mods.tinker.tconstruct.logic.PartCrafterLogic; -import mods.tinker.tconstruct.logic.PatternChestLogic; +import mods.tinker.tconstruct.blocks.logic.PartCrafterLogic; +import mods.tinker.tconstruct.blocks.logic.PatternChestLogic; +import mods.tinker.tconstruct.library.IPattern; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; diff --git a/mods/tinker/tconstruct/container/PartCrafterContainer.java b/mods/tinker/tconstruct/inventory/PartCrafterContainer.java similarity index 94% rename from mods/tinker/tconstruct/container/PartCrafterContainer.java rename to mods/tinker/tconstruct/inventory/PartCrafterContainer.java index 76853a15..47b3c900 100644 --- a/mods/tinker/tconstruct/container/PartCrafterContainer.java +++ b/mods/tinker/tconstruct/inventory/PartCrafterContainer.java @@ -1,7 +1,7 @@ -package mods.tinker.tconstruct.container; +package mods.tinker.tconstruct.inventory; -import mods.tinker.common.IPattern; -import mods.tinker.tconstruct.logic.PartCrafterLogic; +import mods.tinker.tconstruct.blocks.logic.PartCrafterLogic; +import mods.tinker.tconstruct.library.IPattern; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/mods/tinker/tconstruct/container/PatternChestContainer.java b/mods/tinker/tconstruct/inventory/PatternChestContainer.java similarity index 94% rename from mods/tinker/tconstruct/container/PatternChestContainer.java rename to mods/tinker/tconstruct/inventory/PatternChestContainer.java index 83b9e111..44161ee9 100644 --- a/mods/tinker/tconstruct/container/PatternChestContainer.java +++ b/mods/tinker/tconstruct/inventory/PatternChestContainer.java @@ -1,7 +1,7 @@ -package mods.tinker.tconstruct.container; +package mods.tinker.tconstruct.inventory; -import mods.tinker.common.IPattern; -import mods.tinker.tconstruct.logic.PatternChestLogic; +import mods.tinker.tconstruct.blocks.logic.PatternChestLogic; +import mods.tinker.tconstruct.library.IPattern; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/mods/tinker/tconstruct/container/PatternShaperContainer.java b/mods/tinker/tconstruct/inventory/PatternShaperContainer.java similarity index 96% rename from mods/tinker/tconstruct/container/PatternShaperContainer.java rename to mods/tinker/tconstruct/inventory/PatternShaperContainer.java index 19a95da0..215826e0 100644 --- a/mods/tinker/tconstruct/container/PatternShaperContainer.java +++ b/mods/tinker/tconstruct/inventory/PatternShaperContainer.java @@ -1,6 +1,6 @@ -package mods.tinker.tconstruct.container; +package mods.tinker.tconstruct.inventory; -import mods.tinker.tconstruct.logic.PatternShaperLogic; +import mods.tinker.tconstruct.blocks.logic.PatternShaperLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/mods/tinker/tconstruct/container/SlotArmorCopy.java b/mods/tinker/tconstruct/inventory/SlotArmorCopy.java similarity index 97% rename from mods/tinker/tconstruct/container/SlotArmorCopy.java rename to mods/tinker/tconstruct/inventory/SlotArmorCopy.java index 35aa3c10..9cb425b9 100644 --- a/mods/tinker/tconstruct/container/SlotArmorCopy.java +++ b/mods/tinker/tconstruct/inventory/SlotArmorCopy.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.container; +package mods.tinker.tconstruct.inventory; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; diff --git a/mods/tinker/tconstruct/container/SlotOnlyTake.java b/mods/tinker/tconstruct/inventory/SlotOnlyTake.java similarity index 92% rename from mods/tinker/tconstruct/container/SlotOnlyTake.java rename to mods/tinker/tconstruct/inventory/SlotOnlyTake.java index cc97c113..5d3e569a 100644 --- a/mods/tinker/tconstruct/container/SlotOnlyTake.java +++ b/mods/tinker/tconstruct/inventory/SlotOnlyTake.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.container; +package mods.tinker.tconstruct.inventory; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/mods/tinker/tconstruct/container/SlotPartBuilder.java b/mods/tinker/tconstruct/inventory/SlotPartBuilder.java similarity index 89% rename from mods/tinker/tconstruct/container/SlotPartBuilder.java rename to mods/tinker/tconstruct/inventory/SlotPartBuilder.java index 41e7a8da..421cd31c 100644 --- a/mods/tinker/tconstruct/container/SlotPartBuilder.java +++ b/mods/tinker/tconstruct/inventory/SlotPartBuilder.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.container; +package mods.tinker.tconstruct.inventory; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/mods/tinker/tconstruct/container/SlotPattern.java b/mods/tinker/tconstruct/inventory/SlotPattern.java similarity index 85% rename from mods/tinker/tconstruct/container/SlotPattern.java rename to mods/tinker/tconstruct/inventory/SlotPattern.java index 7c80e8e3..56cf7ad4 100644 --- a/mods/tinker/tconstruct/container/SlotPattern.java +++ b/mods/tinker/tconstruct/inventory/SlotPattern.java @@ -1,6 +1,6 @@ -package mods.tinker.tconstruct.container; +package mods.tinker.tconstruct.inventory; -import mods.tinker.common.IPattern; +import mods.tinker.tconstruct.library.IPattern; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/mods/tinker/tconstruct/container/SlotTool.java b/mods/tinker/tconstruct/inventory/SlotTool.java similarity index 98% rename from mods/tinker/tconstruct/container/SlotTool.java rename to mods/tinker/tconstruct/inventory/SlotTool.java index 1d5e8f0b..9f68d88d 100644 --- a/mods/tinker/tconstruct/container/SlotTool.java +++ b/mods/tinker/tconstruct/inventory/SlotTool.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.container; +package mods.tinker.tconstruct.inventory; import java.util.Random; diff --git a/mods/tinker/tconstruct/container/SmelteryContainer.java b/mods/tinker/tconstruct/inventory/SmelteryContainer.java similarity index 98% rename from mods/tinker/tconstruct/container/SmelteryContainer.java rename to mods/tinker/tconstruct/inventory/SmelteryContainer.java index 98195784..86adf691 100644 --- a/mods/tinker/tconstruct/container/SmelteryContainer.java +++ b/mods/tinker/tconstruct/inventory/SmelteryContainer.java @@ -1,9 +1,9 @@ -package mods.tinker.tconstruct.container; +package mods.tinker.tconstruct.inventory; import java.util.ArrayList; import java.util.List; -import mods.tinker.tconstruct.logic.SmelteryLogic; +import mods.tinker.tconstruct.blocks.logic.SmelteryLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/mods/tinker/tconstruct/container/ToolStationContainer.java b/mods/tinker/tconstruct/inventory/ToolStationContainer.java similarity index 98% rename from mods/tinker/tconstruct/container/ToolStationContainer.java rename to mods/tinker/tconstruct/inventory/ToolStationContainer.java index d9ea78a5..38c5faf1 100644 --- a/mods/tinker/tconstruct/container/ToolStationContainer.java +++ b/mods/tinker/tconstruct/inventory/ToolStationContainer.java @@ -1,6 +1,6 @@ -package mods.tinker.tconstruct.container; +package mods.tinker.tconstruct.inventory; -import mods.tinker.tconstruct.logic.ToolStationLogic; +import mods.tinker.tconstruct.blocks.logic.ToolStationLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/mods/tinker/tconstruct/items/FilledBucket.java b/mods/tinker/tconstruct/items/FilledBucket.java index 13f595d4..ad0e4efd 100644 --- a/mods/tinker/tconstruct/items/FilledBucket.java +++ b/mods/tinker/tconstruct/items/FilledBucket.java @@ -2,8 +2,8 @@ package mods.tinker.tconstruct.items; import java.util.List; -import mods.tinker.tconstruct.TContent; -import mods.tinker.tconstruct.logic.LiquidTextureLogic; +import mods.tinker.tconstruct.blocks.logic.LiquidTextureLogic; +import mods.tinker.tconstruct.common.TContent; 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/PatternManual.java b/mods/tinker/tconstruct/items/Manual.java similarity index 89% rename from mods/tinker/tconstruct/items/PatternManual.java rename to mods/tinker/tconstruct/items/Manual.java index 39c4af5c..3b9d7fca 100644 --- a/mods/tinker/tconstruct/items/PatternManual.java +++ b/mods/tinker/tconstruct/items/Manual.java @@ -5,17 +5,17 @@ import java.util.List; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import mods.tinker.tconstruct.TConstruct; -import mods.tinker.tconstruct.TContent; -import mods.tinker.tconstruct.TGuiHandler; +import mods.tinker.tconstruct.common.TContent; +import mods.tinker.tconstruct.util.network.TGuiHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -public class PatternManual extends CraftingItem +public class Manual extends CraftingItem { static String[] name = new String[] { "beginner", "toolstation", "smeltery" }; static String[] textureName = new String[] { "tinkerbook_diary", "tinkerbook_toolstation", "tinkerbook_smeltery" }; - public PatternManual(int id) + public Manual(int id) { super(id, name, textureName, ""); setUnlocalizedName("tconstruct.manual"); diff --git a/mods/tinker/tconstruct/items/Pattern.java b/mods/tinker/tconstruct/items/Pattern.java index df263e91..fe9294b1 100644 --- a/mods/tinker/tconstruct/items/Pattern.java +++ b/mods/tinker/tconstruct/items/Pattern.java @@ -2,9 +2,9 @@ package mods.tinker.tconstruct.items; import java.util.List; -import mods.tinker.common.IPattern; -import mods.tinker.tconstruct.TContent; -import mods.tinker.tconstruct.crafting.PatternBuilder.MaterialSet; +import mods.tinker.tconstruct.common.TContent; +import mods.tinker.tconstruct.library.IPattern; +import mods.tinker.tconstruct.library.crafting.PatternBuilder.MaterialSet; 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/RedstoneBallRepeaterItem.java b/mods/tinker/tconstruct/items/RedstoneBallRepeaterItem.java index 529c6deb..e3934b4d 100644 --- a/mods/tinker/tconstruct/items/RedstoneBallRepeaterItem.java +++ b/mods/tinker/tconstruct/items/RedstoneBallRepeaterItem.java @@ -2,7 +2,7 @@ package mods.tinker.tconstruct.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.common.TContent; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; diff --git a/mods/tinker/tconstruct/items/ToolPart.java b/mods/tinker/tconstruct/items/ToolPart.java index d213d8a2..a6e0cd3a 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.common.IToolPart; +import mods.tinker.tconstruct.library.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/blocks/OreberryBushItem.java b/mods/tinker/tconstruct/items/blocks/OreberryBushItem.java index d3ee9b12..499c329e 100644 --- a/mods/tinker/tconstruct/items/blocks/OreberryBushItem.java +++ b/mods/tinker/tconstruct/items/blocks/OreberryBushItem.java @@ -2,10 +2,7 @@ package mods.tinker.tconstruct.items.blocks; import java.util.List; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import mods.natura.common.NContent; -import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.common.TContent; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; @@ -14,6 +11,8 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.IPlantable; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class OreberryBushItem extends ItemBlock { diff --git a/mods/tinker/tconstruct/items/blocks/OreberryBushSecondItem.java b/mods/tinker/tconstruct/items/blocks/OreberryBushSecondItem.java index c16b77fd..b6c7d84f 100644 --- a/mods/tinker/tconstruct/items/blocks/OreberryBushSecondItem.java +++ b/mods/tinker/tconstruct/items/blocks/OreberryBushSecondItem.java @@ -2,10 +2,7 @@ package mods.tinker.tconstruct.items.blocks; import java.util.List; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import mods.natura.common.NContent; -import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.common.TContent; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; @@ -14,6 +11,8 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.IPlantable; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class OreberryBushSecondItem extends ItemBlock { diff --git a/mods/tinker/tconstruct/tools/Axe.java b/mods/tinker/tconstruct/items/tools/Axe.java similarity index 95% rename from mods/tinker/tconstruct/tools/Axe.java rename to mods/tinker/tconstruct/items/tools/Axe.java index d1e98220..824b39f0 100644 --- a/mods/tinker/tconstruct/tools/Axe.java +++ b/mods/tinker/tconstruct/items/tools/Axe.java @@ -1,6 +1,6 @@ -package mods.tinker.tconstruct.tools; +package mods.tinker.tconstruct.items.tools; -import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.library.AbilityHelper; import mods.tinker.tconstruct.library.HarvestTool; import net.minecraft.block.Block; diff --git a/mods/tinker/tconstruct/tools/BattleSign.java b/mods/tinker/tconstruct/items/tools/BattleSign.java similarity index 97% rename from mods/tinker/tconstruct/tools/BattleSign.java rename to mods/tinker/tconstruct/items/tools/BattleSign.java index 3f70ed8b..1b0550fa 100644 --- a/mods/tinker/tconstruct/tools/BattleSign.java +++ b/mods/tinker/tconstruct/items/tools/BattleSign.java @@ -1,6 +1,6 @@ -package mods.tinker.tconstruct.tools; +package mods.tinker.tconstruct.items.tools; -import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.library.Weapon; import net.minecraft.item.Item; import cpw.mods.fml.relauncher.Side; diff --git a/mods/tinker/tconstruct/tools/Broadsword.java b/mods/tinker/tconstruct/items/tools/Broadsword.java similarity index 90% rename from mods/tinker/tconstruct/tools/Broadsword.java rename to mods/tinker/tconstruct/items/tools/Broadsword.java index 331f2db3..368fd956 100644 --- a/mods/tinker/tconstruct/tools/Broadsword.java +++ b/mods/tinker/tconstruct/items/tools/Broadsword.java @@ -1,6 +1,6 @@ -package mods.tinker.tconstruct.tools; +package mods.tinker.tconstruct.items.tools; -import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.library.Weapon; import net.minecraft.item.Item; diff --git a/mods/tinker/tconstruct/tools/Chisel.java b/mods/tinker/tconstruct/items/tools/Chisel.java similarity index 94% rename from mods/tinker/tconstruct/tools/Chisel.java rename to mods/tinker/tconstruct/items/tools/Chisel.java index afb6fcfc..45752e70 100644 --- a/mods/tinker/tconstruct/tools/Chisel.java +++ b/mods/tinker/tconstruct/items/tools/Chisel.java @@ -1,8 +1,8 @@ -package mods.tinker.tconstruct.tools; +package mods.tinker.tconstruct.items.tools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.library.ToolCore; import net.minecraft.item.Item; diff --git a/mods/tinker/tconstruct/tools/Dagger.java b/mods/tinker/tconstruct/items/tools/Dagger.java similarity index 96% rename from mods/tinker/tconstruct/tools/Dagger.java rename to mods/tinker/tconstruct/items/tools/Dagger.java index e0b1f5d5..0b7d7745 100644 --- a/mods/tinker/tconstruct/tools/Dagger.java +++ b/mods/tinker/tconstruct/items/tools/Dagger.java @@ -1,8 +1,8 @@ -package mods.tinker.tconstruct.tools; +package mods.tinker.tconstruct.items.tools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.entity.projectile.DaggerEntity; import mods.tinker.tconstruct.library.Weapon; import net.minecraft.entity.player.EntityPlayer; diff --git a/mods/tinker/tconstruct/tools/FryingPan.java b/mods/tinker/tconstruct/items/tools/FryingPan.java similarity index 95% rename from mods/tinker/tconstruct/tools/FryingPan.java rename to mods/tinker/tconstruct/items/tools/FryingPan.java index 777836c5..04765742 100644 --- a/mods/tinker/tconstruct/tools/FryingPan.java +++ b/mods/tinker/tconstruct/items/tools/FryingPan.java @@ -1,9 +1,9 @@ -package mods.tinker.tconstruct.tools; +package mods.tinker.tconstruct.items.tools; -import mods.tinker.tconstruct.TContent; +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.logic.EquipLogic; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/mods/tinker/tconstruct/tools/Hammer.java b/mods/tinker/tconstruct/items/tools/Hammer.java similarity index 98% rename from mods/tinker/tconstruct/tools/Hammer.java rename to mods/tinker/tconstruct/items/tools/Hammer.java index 13ea6459..ba6abe9f 100644 --- a/mods/tinker/tconstruct/tools/Hammer.java +++ b/mods/tinker/tconstruct/items/tools/Hammer.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.tools; +package mods.tinker.tconstruct.items.tools; import java.util.ArrayList; diff --git a/mods/tinker/tconstruct/tools/Longsword.java b/mods/tinker/tconstruct/items/tools/Longsword.java similarity index 96% rename from mods/tinker/tconstruct/tools/Longsword.java rename to mods/tinker/tconstruct/items/tools/Longsword.java index 08862e89..2d25353f 100644 --- a/mods/tinker/tconstruct/tools/Longsword.java +++ b/mods/tinker/tconstruct/items/tools/Longsword.java @@ -1,6 +1,6 @@ -package mods.tinker.tconstruct.tools; +package mods.tinker.tconstruct.items.tools; -import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.library.AbilityHelper; import mods.tinker.tconstruct.library.Weapon; import net.minecraft.entity.player.EntityPlayer; diff --git a/mods/tinker/tconstruct/tools/LumberAxe.java b/mods/tinker/tconstruct/items/tools/LumberAxe.java similarity index 98% rename from mods/tinker/tconstruct/tools/LumberAxe.java rename to mods/tinker/tconstruct/items/tools/LumberAxe.java index f9aad8f6..48fdd39f 100644 --- a/mods/tinker/tconstruct/tools/LumberAxe.java +++ b/mods/tinker/tconstruct/items/tools/LumberAxe.java @@ -1,8 +1,8 @@ -package mods.tinker.tconstruct.tools; +package mods.tinker.tconstruct.items.tools; import java.util.List; -import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.library.AbilityHelper; import mods.tinker.tconstruct.library.HarvestTool; import net.minecraft.block.Block; diff --git a/mods/tinker/tconstruct/tools/Mattock.java b/mods/tinker/tconstruct/items/tools/Mattock.java similarity index 95% rename from mods/tinker/tconstruct/tools/Mattock.java rename to mods/tinker/tconstruct/items/tools/Mattock.java index ea93d68b..6f08a6f6 100644 --- a/mods/tinker/tconstruct/tools/Mattock.java +++ b/mods/tinker/tconstruct/items/tools/Mattock.java @@ -1,6 +1,6 @@ -package mods.tinker.tconstruct.tools; +package mods.tinker.tconstruct.items.tools; -import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.library.AbilityHelper; import mods.tinker.tconstruct.library.DualHarvestTool; import net.minecraft.block.material.Material; diff --git a/mods/tinker/tconstruct/tools/Pickaxe.java b/mods/tinker/tconstruct/items/tools/Pickaxe.java similarity index 93% rename from mods/tinker/tconstruct/tools/Pickaxe.java rename to mods/tinker/tconstruct/items/tools/Pickaxe.java index b2b095be..2621a765 100644 --- a/mods/tinker/tconstruct/tools/Pickaxe.java +++ b/mods/tinker/tconstruct/items/tools/Pickaxe.java @@ -1,6 +1,6 @@ -package mods.tinker.tconstruct.tools; +package mods.tinker.tconstruct.items.tools; -import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.library.HarvestTool; import net.minecraft.block.material.Material; import net.minecraft.item.Item; diff --git a/mods/tinker/tconstruct/tools/PotionLauncher.java b/mods/tinker/tconstruct/items/tools/PotionLauncher.java similarity index 99% rename from mods/tinker/tconstruct/tools/PotionLauncher.java rename to mods/tinker/tconstruct/items/tools/PotionLauncher.java index 6b72033a..37d46a30 100644 --- a/mods/tinker/tconstruct/tools/PotionLauncher.java +++ b/mods/tinker/tconstruct/items/tools/PotionLauncher.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.tools; +package mods.tinker.tconstruct.items.tools; import java.util.List; diff --git a/mods/tinker/tconstruct/RangedWeapon.java b/mods/tinker/tconstruct/items/tools/RangedWeapon.java similarity index 98% rename from mods/tinker/tconstruct/RangedWeapon.java rename to mods/tinker/tconstruct/items/tools/RangedWeapon.java index 500dbbc8..4988563b 100644 --- a/mods/tinker/tconstruct/RangedWeapon.java +++ b/mods/tinker/tconstruct/items/tools/RangedWeapon.java @@ -1,6 +1,6 @@ -package mods.tinker.tconstruct; +package mods.tinker.tconstruct.items.tools; -import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.library.ToolCore; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; diff --git a/mods/tinker/tconstruct/tools/Rapier.java b/mods/tinker/tconstruct/items/tools/Rapier.java similarity index 96% rename from mods/tinker/tconstruct/tools/Rapier.java rename to mods/tinker/tconstruct/items/tools/Rapier.java index 83612252..2cdfe68a 100644 --- a/mods/tinker/tconstruct/tools/Rapier.java +++ b/mods/tinker/tconstruct/items/tools/Rapier.java @@ -1,6 +1,6 @@ -package mods.tinker.tconstruct.tools; +package mods.tinker.tconstruct.items.tools; -import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.library.AbilityHelper; import mods.tinker.tconstruct.library.Weapon; import net.minecraft.block.material.Material; diff --git a/mods/tinker/tconstruct/tools/Shovel.java b/mods/tinker/tconstruct/items/tools/Shovel.java similarity index 96% rename from mods/tinker/tconstruct/tools/Shovel.java rename to mods/tinker/tconstruct/items/tools/Shovel.java index 5aad3039..17a53883 100644 --- a/mods/tinker/tconstruct/tools/Shovel.java +++ b/mods/tinker/tconstruct/items/tools/Shovel.java @@ -1,6 +1,6 @@ -package mods.tinker.tconstruct.tools; +package mods.tinker.tconstruct.items.tools; -import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.library.HarvestTool; import net.minecraft.block.material.Material; import net.minecraft.item.Item; diff --git a/mods/tinker/tconstruct/library/AbilityHelper.java b/mods/tinker/tconstruct/library/AbilityHelper.java index c5f52d98..350bfcea 100644 --- a/mods/tinker/tconstruct/library/AbilityHelper.java +++ b/mods/tinker/tconstruct/library/AbilityHelper.java @@ -7,7 +7,6 @@ import java.util.Iterator; import java.util.List; import java.util.Random; -import mods.tinker.common.PiercingEntityDamage; import net.minecraft.block.Block; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.EnchantmentThorns; diff --git a/mods/tinker/common/CoordTuple.java b/mods/tinker/tconstruct/library/CoordTuple.java similarity index 96% rename from mods/tinker/common/CoordTuple.java rename to mods/tinker/tconstruct/library/CoordTuple.java index baf19214..9b4a539c 100644 --- a/mods/tinker/common/CoordTuple.java +++ b/mods/tinker/tconstruct/library/CoordTuple.java @@ -1,4 +1,4 @@ -package mods.tinker.common; +package mods.tinker.tconstruct.library; public class CoordTuple { diff --git a/mods/tinker/tconstruct/library/HarvestTool.java b/mods/tinker/tconstruct/library/HarvestTool.java index 71737502..029b1679 100644 --- a/mods/tinker/tconstruct/library/HarvestTool.java +++ b/mods/tinker/tconstruct/library/HarvestTool.java @@ -1,6 +1,6 @@ package mods.tinker.tconstruct.library; -import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.common.TContent; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.enchantment.Enchantment; diff --git a/mods/tinker/common/IActiveLogic.java b/mods/tinker/tconstruct/library/IActiveLogic.java similarity index 71% rename from mods/tinker/common/IActiveLogic.java rename to mods/tinker/tconstruct/library/IActiveLogic.java index de38e2bd..e2f01948 100644 --- a/mods/tinker/common/IActiveLogic.java +++ b/mods/tinker/tconstruct/library/IActiveLogic.java @@ -1,4 +1,4 @@ -package mods.tinker.common; +package mods.tinker.tconstruct.library; public interface IActiveLogic { diff --git a/mods/tinker/common/IFacingLogic.java b/mods/tinker/tconstruct/library/IFacingLogic.java similarity index 87% rename from mods/tinker/common/IFacingLogic.java rename to mods/tinker/tconstruct/library/IFacingLogic.java index 649e37f8..2c09be24 100644 --- a/mods/tinker/common/IFacingLogic.java +++ b/mods/tinker/tconstruct/library/IFacingLogic.java @@ -1,4 +1,4 @@ -package mods.tinker.common; +package mods.tinker.tconstruct.library; import net.minecraft.entity.EntityLiving; import net.minecraftforge.common.ForgeDirection; diff --git a/mods/tinker/common/IMasterLogic.java b/mods/tinker/tconstruct/library/IMasterLogic.java similarity index 67% rename from mods/tinker/common/IMasterLogic.java rename to mods/tinker/tconstruct/library/IMasterLogic.java index 9b484741..7af49720 100644 --- a/mods/tinker/common/IMasterLogic.java +++ b/mods/tinker/tconstruct/library/IMasterLogic.java @@ -1,4 +1,4 @@ -package mods.tinker.common; +package mods.tinker.tconstruct.library; public interface IMasterLogic { diff --git a/mods/tinker/common/IPattern.java b/mods/tinker/tconstruct/library/IPattern.java similarity index 61% rename from mods/tinker/common/IPattern.java rename to mods/tinker/tconstruct/library/IPattern.java index a8601450..4b65d630 100644 --- a/mods/tinker/common/IPattern.java +++ b/mods/tinker/tconstruct/library/IPattern.java @@ -1,6 +1,6 @@ -package mods.tinker.common; +package mods.tinker.tconstruct.library; -import mods.tinker.tconstruct.crafting.PatternBuilder.MaterialSet; +import mods.tinker.tconstruct.library.crafting.PatternBuilder.MaterialSet; import net.minecraft.item.ItemStack; public interface IPattern diff --git a/mods/tinker/common/IServantLogic.java b/mods/tinker/tconstruct/library/IServantLogic.java similarity index 84% rename from mods/tinker/common/IServantLogic.java rename to mods/tinker/tconstruct/library/IServantLogic.java index 88369ba1..b63ac42d 100644 --- a/mods/tinker/common/IServantLogic.java +++ b/mods/tinker/tconstruct/library/IServantLogic.java @@ -1,4 +1,4 @@ -package mods.tinker.common; +package mods.tinker.tconstruct.library; public interface IServantLogic { diff --git a/mods/tinker/common/IToolPart.java b/mods/tinker/tconstruct/library/IToolPart.java similarity index 74% rename from mods/tinker/common/IToolPart.java rename to mods/tinker/tconstruct/library/IToolPart.java index f4694d46..7da8fe15 100644 --- a/mods/tinker/common/IToolPart.java +++ b/mods/tinker/tconstruct/library/IToolPart.java @@ -1,4 +1,4 @@ -package mods.tinker.common; +package mods.tinker.tconstruct.library; import net.minecraft.item.ItemStack; diff --git a/mods/tinker/common/InventoryBlock.java b/mods/tinker/tconstruct/library/InventoryBlock.java similarity index 99% rename from mods/tinker/common/InventoryBlock.java rename to mods/tinker/tconstruct/library/InventoryBlock.java index a3cc1802..acfec2e0 100644 --- a/mods/tinker/common/InventoryBlock.java +++ b/mods/tinker/tconstruct/library/InventoryBlock.java @@ -1,4 +1,4 @@ -package mods.tinker.common; +package mods.tinker.tconstruct.library; import java.util.Random; diff --git a/mods/tinker/common/InventoryLogic.java b/mods/tinker/tconstruct/library/InventoryLogic.java similarity index 99% rename from mods/tinker/common/InventoryLogic.java rename to mods/tinker/tconstruct/library/InventoryLogic.java index 1761f54c..12768a1c 100644 --- a/mods/tinker/common/InventoryLogic.java +++ b/mods/tinker/tconstruct/library/InventoryLogic.java @@ -1,4 +1,4 @@ -package mods.tinker.common; +package mods.tinker.tconstruct.library; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/mods/tinker/common/PiercingEntityDamage.java b/mods/tinker/tconstruct/library/PiercingEntityDamage.java similarity index 87% rename from mods/tinker/common/PiercingEntityDamage.java rename to mods/tinker/tconstruct/library/PiercingEntityDamage.java index 53c625e4..f91d5624 100644 --- a/mods/tinker/common/PiercingEntityDamage.java +++ b/mods/tinker/tconstruct/library/PiercingEntityDamage.java @@ -1,4 +1,4 @@ -package mods.tinker.common; +package mods.tinker.tconstruct.library; import net.minecraft.entity.Entity; import net.minecraft.util.EntityDamageSource; diff --git a/mods/tinker/tconstruct/library/ToolCore.java b/mods/tinker/tconstruct/library/ToolCore.java index f9c37567..8f898de3 100644 --- a/mods/tinker/tconstruct/library/ToolCore.java +++ b/mods/tinker/tconstruct/library/ToolCore.java @@ -9,8 +9,7 @@ import java.util.List; import java.util.Map; import java.util.Random; -import mods.tinker.common.ToolMod; -import mods.tinker.tconstruct.crafting.ToolBuilder; +import mods.tinker.tconstruct.library.crafting.ToolBuilder; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; diff --git a/mods/tinker/common/ToolMod.java b/mods/tinker/tconstruct/library/ToolMod.java similarity index 98% rename from mods/tinker/common/ToolMod.java rename to mods/tinker/tconstruct/library/ToolMod.java index a448c817..9f36cf55 100644 --- a/mods/tinker/common/ToolMod.java +++ b/mods/tinker/tconstruct/library/ToolMod.java @@ -1,4 +1,4 @@ -package mods.tinker.common; +package mods.tinker.tconstruct.library; import java.util.ArrayList; import java.util.Arrays; @@ -6,7 +6,6 @@ import java.util.Iterator; import java.util.List; import java.util.Random; -import mods.tinker.tconstruct.library.ToolCore; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/mods/tinker/tconstruct/library/Weapon.java b/mods/tinker/tconstruct/library/Weapon.java index a21ec39f..2cb0f21c 100644 --- a/mods/tinker/tconstruct/library/Weapon.java +++ b/mods/tinker/tconstruct/library/Weapon.java @@ -1,6 +1,6 @@ package mods.tinker.tconstruct.library; -import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.common.TContent; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; diff --git a/mods/tinker/tconstruct/library/client/TConstructClientRegistry.java b/mods/tinker/tconstruct/library/client/TConstructClientRegistry.java index 83c7734d..ad4e8846 100644 --- a/mods/tinker/tconstruct/library/client/TConstructClientRegistry.java +++ b/mods/tinker/tconstruct/library/client/TConstructClientRegistry.java @@ -4,9 +4,9 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import mods.tinker.tconstruct.crafting.ToolBuilder; import mods.tinker.tconstruct.library.TConstructRegistry; import mods.tinker.tconstruct.library.ToolCore; +import mods.tinker.tconstruct.library.crafting.ToolBuilder; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/mods/tinker/tconstruct/crafting/AlloyMix.java b/mods/tinker/tconstruct/library/crafting/AlloyMix.java similarity index 97% rename from mods/tinker/tconstruct/crafting/AlloyMix.java rename to mods/tinker/tconstruct/library/crafting/AlloyMix.java index 9ed9c288..3aa6da69 100644 --- a/mods/tinker/tconstruct/crafting/AlloyMix.java +++ b/mods/tinker/tconstruct/library/crafting/AlloyMix.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.crafting; +package mods.tinker.tconstruct.library.crafting; import java.util.ArrayList; import java.util.Iterator; diff --git a/mods/tinker/tconstruct/crafting/CastingRecipe.java b/mods/tinker/tconstruct/library/crafting/CastingRecipe.java similarity index 93% rename from mods/tinker/tconstruct/crafting/CastingRecipe.java rename to mods/tinker/tconstruct/library/crafting/CastingRecipe.java index 39ea29ed..62203d2a 100644 --- a/mods/tinker/tconstruct/crafting/CastingRecipe.java +++ b/mods/tinker/tconstruct/library/crafting/CastingRecipe.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.crafting; +package mods.tinker.tconstruct.library.crafting; import net.minecraft.item.ItemStack; import net.minecraftforge.liquids.LiquidStack; diff --git a/mods/tinker/tconstruct/crafting/LiquidBlockCasting.java b/mods/tinker/tconstruct/library/crafting/LiquidBlockCasting.java similarity index 98% rename from mods/tinker/tconstruct/crafting/LiquidBlockCasting.java rename to mods/tinker/tconstruct/library/crafting/LiquidBlockCasting.java index f2947e31..5dc54222 100644 --- a/mods/tinker/tconstruct/crafting/LiquidBlockCasting.java +++ b/mods/tinker/tconstruct/library/crafting/LiquidBlockCasting.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.crafting; +package mods.tinker.tconstruct.library.crafting; import java.util.ArrayList; import java.util.Arrays; diff --git a/mods/tinker/tconstruct/crafting/LiquidCasting.java b/mods/tinker/tconstruct/library/crafting/LiquidCasting.java similarity index 98% rename from mods/tinker/tconstruct/crafting/LiquidCasting.java rename to mods/tinker/tconstruct/library/crafting/LiquidCasting.java index 8cb7d9a1..82241352 100644 --- a/mods/tinker/tconstruct/crafting/LiquidCasting.java +++ b/mods/tinker/tconstruct/library/crafting/LiquidCasting.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.crafting; +package mods.tinker.tconstruct.library.crafting; import java.util.ArrayList; import java.util.Arrays; diff --git a/mods/tinker/tconstruct/crafting/PatternBuilder.java b/mods/tinker/tconstruct/library/crafting/PatternBuilder.java similarity index 98% rename from mods/tinker/tconstruct/crafting/PatternBuilder.java rename to mods/tinker/tconstruct/library/crafting/PatternBuilder.java index 69ee74bd..f509feff 100644 --- a/mods/tinker/tconstruct/crafting/PatternBuilder.java +++ b/mods/tinker/tconstruct/library/crafting/PatternBuilder.java @@ -1,11 +1,11 @@ -package mods.tinker.tconstruct.crafting; +package mods.tinker.tconstruct.library.crafting; /** How to build tool parts? With patterns! */ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import mods.tinker.common.IPattern; +import mods.tinker.tconstruct.library.IPattern; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/mods/tinker/tconstruct/crafting/Smeltery.java b/mods/tinker/tconstruct/library/crafting/Smeltery.java similarity index 99% rename from mods/tinker/tconstruct/crafting/Smeltery.java rename to mods/tinker/tconstruct/library/crafting/Smeltery.java index 8b70b20d..22a0b789 100644 --- a/mods/tinker/tconstruct/crafting/Smeltery.java +++ b/mods/tinker/tconstruct/library/crafting/Smeltery.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.crafting; +package mods.tinker.tconstruct.library.crafting; import java.util.ArrayList; import java.util.Arrays; diff --git a/mods/tinker/tconstruct/crafting/ToolBuilder.java b/mods/tinker/tconstruct/library/crafting/ToolBuilder.java similarity index 98% rename from mods/tinker/tconstruct/crafting/ToolBuilder.java rename to mods/tinker/tconstruct/library/crafting/ToolBuilder.java index f79d27a4..a61a0f9b 100644 --- a/mods/tinker/tconstruct/crafting/ToolBuilder.java +++ b/mods/tinker/tconstruct/library/crafting/ToolBuilder.java @@ -1,15 +1,15 @@ -package mods.tinker.tconstruct.crafting; +package mods.tinker.tconstruct.library.crafting; /** Once upon a time, too many tools to count. Let's put them together automatically */ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import mods.tinker.common.IToolPart; -import mods.tinker.common.ToolMod; +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 net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/mods/tinker/tconstruct/crafting/ToolRecipe.java b/mods/tinker/tconstruct/library/crafting/ToolRecipe.java similarity index 95% rename from mods/tinker/tconstruct/crafting/ToolRecipe.java rename to mods/tinker/tconstruct/library/crafting/ToolRecipe.java index 704a3bbd..d30d4773 100644 --- a/mods/tinker/tconstruct/crafting/ToolRecipe.java +++ b/mods/tinker/tconstruct/library/crafting/ToolRecipe.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.crafting; +package mods.tinker.tconstruct.library.crafting; import mods.tinker.tconstruct.library.TConstructRegistry; import mods.tinker.tconstruct.library.ToolCore; diff --git a/mods/tinker/tconstruct/modifiers/ModAttack.java b/mods/tinker/tconstruct/modifiers/ModAttack.java index 910fbb7b..dc3d9fc0 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.common.ToolMod; import mods.tinker.tconstruct.library.ToolCore; +import mods.tinker.tconstruct.library.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 63919369..37507232 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.common.ToolMod; import mods.tinker.tconstruct.library.ToolCore; +import mods.tinker.tconstruct.library.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 a02286cf..467cb0cb 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.common.ToolMod; +import mods.tinker.tconstruct.library.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 2ba72759..9eb9674f 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.common.ToolMod; +import mods.tinker.tconstruct.library.ToolMod; 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 05b3659c..576631cb 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.common.ToolMod; -import mods.tinker.tconstruct.crafting.PatternBuilder; +import mods.tinker.tconstruct.library.ToolMod; +import mods.tinker.tconstruct.library.crafting.PatternBuilder; public class ModExtraModifier extends ToolMod { diff --git a/mods/tinker/tconstruct/modifiers/ModInteger.java b/mods/tinker/tconstruct/modifiers/ModInteger.java index 6b6c4562..d6768d88 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.common.ToolMod; +import mods.tinker.tconstruct.library.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 cbef5aa7..c6b40a73 100644 --- a/mods/tinker/tconstruct/modifiers/ModLapis.java +++ b/mods/tinker/tconstruct/modifiers/ModLapis.java @@ -5,8 +5,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import mods.tinker.common.ToolMod; import mods.tinker.tconstruct.library.ToolCore; +import mods.tinker.tconstruct.library.ToolMod; import mods.tinker.tconstruct.library.Weapon; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; diff --git a/mods/tinker/tconstruct/modifiers/ModPotion.java b/mods/tinker/tconstruct/modifiers/ModPotion.java index ee7252de..ba086f1c 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.common.ToolMod; +import mods.tinker.tconstruct.library.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 b990fbea..5f6219dc 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.common.ToolMod; import mods.tinker.tconstruct.library.ToolCore; +import mods.tinker.tconstruct.library.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 4508198e..8f1d2e0d 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.common.ToolMod; -import mods.tinker.tconstruct.crafting.PatternBuilder; +import mods.tinker.tconstruct.library.ToolMod; +import mods.tinker.tconstruct.library.crafting.PatternBuilder; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/mods/tinker/tconstruct/PHConstruct.java b/mods/tinker/tconstruct/util/PHConstruct.java similarity index 99% rename from mods/tinker/tconstruct/PHConstruct.java rename to mods/tinker/tconstruct/util/PHConstruct.java index 14db0578..d6d342b4 100644 --- a/mods/tinker/tconstruct/PHConstruct.java +++ b/mods/tinker/tconstruct/util/PHConstruct.java @@ -1,8 +1,9 @@ -package mods.tinker.tconstruct; +package mods.tinker.tconstruct.util; import java.io.File; import java.io.IOException; +import mods.tinker.tconstruct.TConstruct; import net.minecraftforge.common.Configuration; public class PHConstruct diff --git a/mods/tinker/common/RecipeRemover.java b/mods/tinker/tconstruct/util/RecipeRemover.java similarity index 95% rename from mods/tinker/common/RecipeRemover.java rename to mods/tinker/tconstruct/util/RecipeRemover.java index a01d12bd..de01c982 100644 --- a/mods/tinker/common/RecipeRemover.java +++ b/mods/tinker/tconstruct/util/RecipeRemover.java @@ -1,4 +1,4 @@ -package mods.tinker.common; +package mods.tinker.tconstruct.util; import java.util.List; diff --git a/mods/tinker/tconstruct/TCraftingHandler.java b/mods/tinker/tconstruct/util/TCraftingHandler.java similarity index 94% rename from mods/tinker/tconstruct/TCraftingHandler.java rename to mods/tinker/tconstruct/util/TCraftingHandler.java index 773ff786..4cd2c753 100644 --- a/mods/tinker/tconstruct/TCraftingHandler.java +++ b/mods/tinker/tconstruct/util/TCraftingHandler.java @@ -1,5 +1,6 @@ -package mods.tinker.tconstruct; +package mods.tinker.tconstruct.util; +import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.library.AbilityHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/mods/tinker/tconstruct/TEventHandler.java b/mods/tinker/tconstruct/util/TEventHandler.java similarity index 98% rename from mods/tinker/tconstruct/TEventHandler.java rename to mods/tinker/tconstruct/util/TEventHandler.java index 52ab6613..894244f2 100644 --- a/mods/tinker/tconstruct/TEventHandler.java +++ b/mods/tinker/tconstruct/util/TEventHandler.java @@ -1,13 +1,15 @@ -package mods.tinker.tconstruct; +package mods.tinker.tconstruct.util; import java.util.ArrayList; import java.util.Random; -import mods.tinker.tconstruct.crafting.PatternBuilder; -import mods.tinker.tconstruct.crafting.Smeltery; -import mods.tinker.tconstruct.crafting.ToolBuilder; +import mods.tinker.tconstruct.TConstruct; +import mods.tinker.tconstruct.blocks.logic.LiquidTextureLogic; +import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.entity.NitroCreeper; -import mods.tinker.tconstruct.logic.LiquidTextureLogic; +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.modifiers.ModAttack; import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.passive.EntityChicken; diff --git a/mods/tinker/tconstruct/TGuiHandler.java b/mods/tinker/tconstruct/util/network/TGuiHandler.java similarity index 85% rename from mods/tinker/tconstruct/TGuiHandler.java rename to mods/tinker/tconstruct/util/network/TGuiHandler.java index f5d40a86..980beb15 100644 --- a/mods/tinker/tconstruct/TGuiHandler.java +++ b/mods/tinker/tconstruct/util/network/TGuiHandler.java @@ -1,6 +1,12 @@ -package mods.tinker.tconstruct; +package mods.tinker.tconstruct.util.network; -import mods.tinker.common.InventoryLogic; +import mods.tinker.tconstruct.TConstruct; +import mods.tinker.tconstruct.blocks.logic.FrypanLogic; +import mods.tinker.tconstruct.blocks.logic.PartCrafterLogic; +import mods.tinker.tconstruct.blocks.logic.PatternChestLogic; +import mods.tinker.tconstruct.blocks.logic.PatternShaperLogic; +import mods.tinker.tconstruct.blocks.logic.SmelteryLogic; +import mods.tinker.tconstruct.blocks.logic.ToolStationLogic; import mods.tinker.tconstruct.client.TProxyClient; import mods.tinker.tconstruct.client.gui.ArmorExtendedGui; import mods.tinker.tconstruct.client.gui.FrypanGui; @@ -10,14 +16,9 @@ import mods.tinker.tconstruct.client.gui.PatternChestGui; 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.container.ArmorExtendedContainer; -import mods.tinker.tconstruct.logic.FrypanLogic; -import mods.tinker.tconstruct.logic.PartCrafterLogic; -import mods.tinker.tconstruct.logic.PatternChestLogic; -import mods.tinker.tconstruct.logic.PatternShaperLogic; -import mods.tinker.tconstruct.logic.SmelteryLogic; -import mods.tinker.tconstruct.logic.ToolStationLogic; -import mods.tinker.tconstruct.player.TPlayerStats; +import mods.tinker.tconstruct.inventory.ArmorExtendedContainer; +import mods.tinker.tconstruct.library.InventoryLogic; +import mods.tinker.tconstruct.util.player.TPlayerStats; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/mods/tinker/tconstruct/TPacketHandler.java b/mods/tinker/tconstruct/util/network/TPacketHandler.java similarity index 93% rename from mods/tinker/tconstruct/TPacketHandler.java rename to mods/tinker/tconstruct/util/network/TPacketHandler.java index 476baad3..d11bbcfb 100644 --- a/mods/tinker/tconstruct/TPacketHandler.java +++ b/mods/tinker/tconstruct/util/network/TPacketHandler.java @@ -1,12 +1,13 @@ -package mods.tinker.tconstruct; +package mods.tinker.tconstruct.util.network; import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.io.IOException; -import mods.tinker.common.InventoryLogic; -import mods.tinker.tconstruct.container.SmelteryContainer; -import mods.tinker.tconstruct.logic.ToolStationLogic; +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 net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.network.INetworkManager; diff --git a/mods/tinker/tconstruct/player/ArmorExtended.java b/mods/tinker/tconstruct/util/player/ArmorExtended.java similarity index 97% rename from mods/tinker/tconstruct/player/ArmorExtended.java rename to mods/tinker/tconstruct/util/player/ArmorExtended.java index 40ab71e2..e88229fb 100644 --- a/mods/tinker/tconstruct/player/ArmorExtended.java +++ b/mods/tinker/tconstruct/util/player/ArmorExtended.java @@ -1,8 +1,8 @@ -package mods.tinker.tconstruct.player; +package mods.tinker.tconstruct.util.player; import java.lang.ref.WeakReference; -import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.common.TContent; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; diff --git a/mods/tinker/tconstruct/player/TFoodStats.java b/mods/tinker/tconstruct/util/player/TFoodStats.java similarity index 99% rename from mods/tinker/tconstruct/player/TFoodStats.java rename to mods/tinker/tconstruct/util/player/TFoodStats.java index 773b76a4..6a987b9e 100644 --- a/mods/tinker/tconstruct/player/TFoodStats.java +++ b/mods/tinker/tconstruct/util/player/TFoodStats.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.player; +package mods.tinker.tconstruct.util.player; import mods.tinker.tconstruct.TConstruct; import net.minecraft.entity.player.EntityPlayer; diff --git a/mods/tinker/tconstruct/player/TPlayerHandler.java b/mods/tinker/tconstruct/util/player/TPlayerHandler.java similarity index 98% rename from mods/tinker/tconstruct/player/TPlayerHandler.java rename to mods/tinker/tconstruct/util/player/TPlayerHandler.java index 86236240..153bf9b8 100644 --- a/mods/tinker/tconstruct/player/TPlayerHandler.java +++ b/mods/tinker/tconstruct/util/player/TPlayerHandler.java @@ -1,14 +1,14 @@ -package mods.tinker.tconstruct.player; +package mods.tinker.tconstruct.util.player; import java.lang.ref.WeakReference; import java.util.HashMap; import java.util.Random; import java.util.concurrent.ConcurrentHashMap; -import mods.tinker.tconstruct.PHConstruct; -import mods.tinker.tconstruct.TContent; import mods.tinker.tconstruct.client.TProxyClient; +import mods.tinker.tconstruct.common.TContent; import mods.tinker.tconstruct.library.AbilityHelper; +import mods.tinker.tconstruct.util.PHConstruct; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; diff --git a/mods/tinker/tconstruct/player/TPlayerStats.java b/mods/tinker/tconstruct/util/player/TPlayerStats.java similarity index 91% rename from mods/tinker/tconstruct/player/TPlayerStats.java rename to mods/tinker/tconstruct/util/player/TPlayerStats.java index 82213df2..d6fccdeb 100644 --- a/mods/tinker/tconstruct/player/TPlayerStats.java +++ b/mods/tinker/tconstruct/util/player/TPlayerStats.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct.player; +package mods.tinker.tconstruct.util.player; import java.lang.ref.WeakReference; diff --git a/mods/tinker/tconstruct/worldgen/OreberryBushGen.java b/mods/tinker/tconstruct/worldgen/OreberryBushGen.java index ccd6cc10..6562341b 100644 --- a/mods/tinker/tconstruct/worldgen/OreberryBushGen.java +++ b/mods/tinker/tconstruct/worldgen/OreberryBushGen.java @@ -2,7 +2,7 @@ package mods.tinker.tconstruct.worldgen; import java.util.Random; -import mods.tinker.tconstruct.PHConstruct; +import mods.tinker.tconstruct.util.PHConstruct; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; diff --git a/mods/tinker/tconstruct/OverworldProvider.java b/mods/tinker/tconstruct/worldgen/OverworldProvider.java similarity index 94% rename from mods/tinker/tconstruct/OverworldProvider.java rename to mods/tinker/tconstruct/worldgen/OverworldProvider.java index 3870992b..e8b8f9a7 100644 --- a/mods/tinker/tconstruct/OverworldProvider.java +++ b/mods/tinker/tconstruct/worldgen/OverworldProvider.java @@ -1,4 +1,4 @@ -package mods.tinker.tconstruct; +package mods.tinker.tconstruct.worldgen; import net.minecraft.world.WorldProvider; diff --git a/mods/tinker/tconstruct/worldgen/SurfaceOreGen.java b/mods/tinker/tconstruct/worldgen/SurfaceOreGen.java index c0e378e0..a0a63d74 100644 --- a/mods/tinker/tconstruct/worldgen/SurfaceOreGen.java +++ b/mods/tinker/tconstruct/worldgen/SurfaceOreGen.java @@ -2,7 +2,7 @@ package mods.tinker.tconstruct.worldgen; import java.util.Random; -import mods.tinker.tconstruct.PHConstruct; +import mods.tinker.tconstruct.util.PHConstruct; import net.minecraft.block.Block; import net.minecraft.util.MathHelper; import net.minecraft.world.World; diff --git a/mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java b/mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java index a2afcdda..17173bd5 100644 --- a/mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java +++ b/mods/tinker/tconstruct/worldgen/TBaseWorldGenerator.java @@ -2,9 +2,9 @@ package mods.tinker.tconstruct.worldgen; import java.util.Random; -import mods.tinker.common.CoordTuple; -import mods.tinker.tconstruct.PHConstruct; -import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.common.TContent; +import mods.tinker.tconstruct.library.CoordTuple; +import mods.tinker.tconstruct.util.PHConstruct; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.WorldType; diff --git a/mods/tinker/tconstruct/worldgen/village/ComponentSmeltery.java b/mods/tinker/tconstruct/worldgen/village/ComponentSmeltery.java index 88317cd0..04453a01 100644 --- a/mods/tinker/tconstruct/worldgen/village/ComponentSmeltery.java +++ b/mods/tinker/tconstruct/worldgen/village/ComponentSmeltery.java @@ -3,9 +3,9 @@ package mods.tinker.tconstruct.worldgen.village; import java.util.List; import java.util.Random; -import mods.tinker.common.CoordTuple; -import mods.tinker.tconstruct.TContent; -import mods.tinker.tconstruct.logic.SmelteryLogic; +import mods.tinker.tconstruct.blocks.logic.SmelteryLogic; +import mods.tinker.tconstruct.common.TContent; +import mods.tinker.tconstruct.library.CoordTuple; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.structure.ComponentVillage; diff --git a/mods/tinker/tconstruct/worldgen/village/ComponentToolWorkshop.java b/mods/tinker/tconstruct/worldgen/village/ComponentToolWorkshop.java index 971523d0..9ec01a4e 100644 --- a/mods/tinker/tconstruct/worldgen/village/ComponentToolWorkshop.java +++ b/mods/tinker/tconstruct/worldgen/village/ComponentToolWorkshop.java @@ -3,7 +3,7 @@ package mods.tinker.tconstruct.worldgen.village; import java.util.List; import java.util.Random; -import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.common.TContent; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.structure.ComponentVillage; diff --git a/mods/tinker/tconstruct/worldgen/village/TVillageTrades.java b/mods/tinker/tconstruct/worldgen/village/TVillageTrades.java index 2b0c1161..eed46f62 100644 --- a/mods/tinker/tconstruct/worldgen/village/TVillageTrades.java +++ b/mods/tinker/tconstruct/worldgen/village/TVillageTrades.java @@ -2,7 +2,7 @@ package mods.tinker.tconstruct.worldgen.village; import java.util.Random; -import mods.tinker.tconstruct.TContent; +import mods.tinker.tconstruct.common.TContent; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.item.Item; import net.minecraft.item.ItemStack;