GloopMaster/TinkersConstruct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor, Reorganize, Redo!

Browse Source
This commit is contained in:
mDiyo 2013-04-28 02:25:06 -07:00
parent b3bac49dfb
commit 8a9348bed0
169 changed files with 407 additions and 402 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mods/tinker/tconstruct/TConstruct.java
View File

@ -1,8 +1,14 @@
package mods.tinker.tconstruct; 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.TConstructRegistry;
import mods.tinker.tconstruct.library.TabTools; 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.TBaseWorldGenerator;
import mods.tinker.tconstruct.worldgen.village.TVillageTrades; import mods.tinker.tconstruct.worldgen.village.TVillageTrades;
import mods.tinker.tconstruct.worldgen.village.VillageSmelteryHandler; 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,)") @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 public class TConstruct
{ {
/** The value of one ingot in millibuckets */ /** The value of one ingot in millibuckets */
@ -58,10 +64,10 @@ public class TConstruct
content.oreRegistry(); content.oreRegistry();
proxy.registerRenderer(); proxy.registerRenderer();
proxy.registerTickHandler(); //proxy.registerTickHandler();
proxy.addNames(); proxy.addNames();
proxy.readManuals(); proxy.readManuals();
proxy.registerKeys(); //proxy.registerKeys();
GameRegistry.registerWorldGenerator(new TBaseWorldGenerator()); GameRegistry.registerWorldGenerator(new TBaseWorldGenerator());
GameRegistry.registerFuelHandler(content); GameRegistry.registerFuelHandler(content);

8
mods/tinker/tconstruct/blocks/EquipBlock.java
View File

@ -2,11 +2,11 @@ package mods.tinker.tconstruct.blocks;
import java.util.Random; import java.util.Random;
import mods.tinker.common.InventoryBlock;
import mods.tinker.tconstruct.TConstruct; import mods.tinker.tconstruct.TConstruct;
import mods.tinker.tconstruct.TGuiHandler; import mods.tinker.tconstruct.blocks.logic.FrypanLogic;
import mods.tinker.tconstruct.client.blockrender.FrypanRender; import mods.tinker.tconstruct.client.block.FrypanRender;
import mods.tinker.tconstruct.logic.FrypanLogic; import mods.tinker.tconstruct.library.InventoryBlock;
import mods.tinker.tconstruct.util.network.TGuiHandler;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.client.renderer.texture.IconRegister;

6
mods/tinker/tconstruct/blocks/GolemCoreBlock.java
View File

@ -1,10 +1,10 @@
package mods.tinker.tconstruct.blocks; package mods.tinker.tconstruct.blocks;
import mods.tinker.common.InventoryBlock;
import mods.tinker.tconstruct.TConstruct; 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.library.TConstructRegistry;
import mods.tinker.tconstruct.logic.GolemCoreLogic;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;

4
mods/tinker/tconstruct/blocks/GolemHeadBlock.java
View File

@ -1,7 +1,7 @@
package mods.tinker.tconstruct.blocks; package mods.tinker.tconstruct.blocks;
import mods.tinker.tconstruct.TContent; import mods.tinker.tconstruct.blocks.logic.GolemCoreLogic;
import mods.tinker.tconstruct.logic.GolemCoreLogic; import mods.tinker.tconstruct.common.TContent;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.client.renderer.texture.IconRegister;

4
mods/tinker/tconstruct/blocks/GolemPedestalBlock.java
View File

@ -2,8 +2,8 @@ package mods.tinker.tconstruct.blocks;
import java.util.Random; import java.util.Random;
import mods.tinker.common.InventoryBlock; import mods.tinker.tconstruct.blocks.logic.GolemPedestalLogic;
import mods.tinker.tconstruct.logic.GolemPedestalLogic; import mods.tinker.tconstruct.library.InventoryBlock;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;

6
mods/tinker/tconstruct/blocks/LavaTankBlock.java
View File

@ -2,10 +2,10 @@ package mods.tinker.tconstruct.blocks;
import java.util.List; import java.util.List;
import mods.tinker.common.IServantLogic; import mods.tinker.tconstruct.blocks.logic.LavaTankLogic;
import mods.tinker.tconstruct.client.blockrender.TankRender; import mods.tinker.tconstruct.client.block.TankRender;
import mods.tinker.tconstruct.library.IServantLogic;
import mods.tinker.tconstruct.library.TConstructRegistry; import mods.tinker.tconstruct.library.TConstructRegistry;
import mods.tinker.tconstruct.logic.LavaTankLogic;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer; import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;

6
mods/tinker/tconstruct/blocks/LiquidMetalBase.java
View File

@ -3,9 +3,9 @@ package mods.tinker.tconstruct.blocks;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import mods.tinker.tconstruct.TContent; import mods.tinker.tconstruct.blocks.logic.LiquidTextureLogic;
import mods.tinker.tconstruct.client.blockrender.FluidRender; import mods.tinker.tconstruct.client.block.FluidRender;
import mods.tinker.tconstruct.logic.LiquidTextureLogic; import mods.tinker.tconstruct.common.TContent;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.client.renderer.texture.IconRegister;

4
mods/tinker/tconstruct/blocks/LiquidMetalFlowing.java
View File

@ -2,8 +2,8 @@ package mods.tinker.tconstruct.blocks;
import java.util.Random; import java.util.Random;
import mods.tinker.tconstruct.TContent; import mods.tinker.tconstruct.blocks.logic.LiquidTextureLogic;
import mods.tinker.tconstruct.logic.LiquidTextureLogic; import mods.tinker.tconstruct.common.TContent;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;

4
mods/tinker/tconstruct/blocks/LiquidMetalStill.java
View File

@ -2,8 +2,8 @@ package mods.tinker.tconstruct.blocks;
import java.util.Random; import java.util.Random;
import mods.tinker.tconstruct.TContent; import mods.tinker.tconstruct.blocks.logic.LiquidTextureLogic;
import mods.tinker.tconstruct.logic.LiquidTextureLogic; import mods.tinker.tconstruct.common.TContent;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;

4
mods/tinker/tconstruct/blocks/OreberryBush.java
View File

@ -3,8 +3,8 @@ package mods.tinker.tconstruct.blocks;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import mods.tinker.tconstruct.TContent; import mods.tinker.tconstruct.client.block.OreberryRender;
import mods.tinker.tconstruct.client.blockrender.OreberryRender; import mods.tinker.tconstruct.common.TContent;
import mods.tinker.tconstruct.library.TConstructRegistry; import mods.tinker.tconstruct.library.TConstructRegistry;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockLeavesBase; import net.minecraft.block.BlockLeavesBase;

4
mods/tinker/tconstruct/blocks/RedstoneBallRepeater.java
View File

@ -2,8 +2,8 @@ package mods.tinker.tconstruct.blocks;
import java.util.Random; import java.util.Random;
import mods.tinker.tconstruct.TContent; import mods.tinker.tconstruct.client.block.BallRepeaterRender;
import mods.tinker.tconstruct.client.blockrender.BallRepeaterRender; import mods.tinker.tconstruct.common.TContent;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockRedstoneLogic; import net.minecraft.block.BlockRedstoneLogic;
import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.client.renderer.texture.IconRegister;

10
mods/tinker/tconstruct/blocks/SearedBlock.java
View File

@ -2,13 +2,13 @@ package mods.tinker.tconstruct.blocks;
import java.util.List; import java.util.List;
import mods.tinker.common.InventoryBlock;
import mods.tinker.tconstruct.TConstruct; 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.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.block.material.Material;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItem;

18
mods/tinker/tconstruct/blocks/SmelteryBlock.java
View File

@ -3,17 +3,17 @@ package mods.tinker.tconstruct.blocks;
import java.util.List; import java.util.List;
import java.util.Random; 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.TConstruct;
import mods.tinker.tconstruct.TGuiHandler; import mods.tinker.tconstruct.blocks.logic.MultiServantLogic;
import mods.tinker.tconstruct.client.blockrender.SmelteryRender; import mods.tinker.tconstruct.blocks.logic.SmelteryDrainLogic;
import mods.tinker.tconstruct.blocks.logic.SmelteryLogic;
import mods.tinker.tconstruct.client.block.SmelteryRender;
import mods.tinker.tconstruct.library.IFacingLogic;
import mods.tinker.tconstruct.library.IMasterLogic;
import mods.tinker.tconstruct.library.IServantLogic;
import mods.tinker.tconstruct.library.InventoryBlock;
import mods.tinker.tconstruct.library.TConstructRegistry; import mods.tinker.tconstruct.library.TConstructRegistry;
import mods.tinker.tconstruct.logic.MultiServantLogic; import mods.tinker.tconstruct.util.network.TGuiHandler;
import mods.tinker.tconstruct.logic.SmelteryDrainLogic;
import mods.tinker.tconstruct.logic.SmelteryLogic;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLiving;

3
mods/tinker/tconstruct/blocks/infiblocks/SpeedBlock.java → mods/tinker/tconstruct/blocks/SpeedBlock.java
View File

@ -1,8 +1,7 @@
package mods.tinker.tconstruct.blocks.infiblocks; package mods.tinker.tconstruct.blocks;
import java.util.List; import java.util.List;
import mods.tinker.tconstruct.blocks.TConstructBlock;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;

12
mods/tinker/tconstruct/blocks/ToolStationBlock.java
View File

@ -2,14 +2,14 @@ package mods.tinker.tconstruct.blocks;
import java.util.List; import java.util.List;
import mods.tinker.common.InventoryBlock;
import mods.tinker.tconstruct.TConstruct; 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.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.block.material.Material;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;

10
mods/tinker/tconstruct/logic/CastingBasinLogic.java → mods/tinker/tconstruct/blocks/logic/CastingBasinLogic.java
View File

@ -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.TConstruct;
import mods.tinker.tconstruct.crafting.CastingRecipe; import mods.tinker.tconstruct.library.IPattern;
import mods.tinker.tconstruct.crafting.LiquidBlockCasting; 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.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
import net.minecraft.inventory.ISidedInventory; import net.minecraft.inventory.ISidedInventory;

10
mods/tinker/tconstruct/logic/CastingTableLogic.java → mods/tinker/tconstruct/blocks/logic/CastingTableLogic.java
View File

@ -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.TConstruct;
import mods.tinker.tconstruct.crafting.CastingRecipe; import mods.tinker.tconstruct.library.IPattern;
import mods.tinker.tconstruct.crafting.LiquidCasting; 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.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
import net.minecraft.inventory.ISidedInventory; import net.minecraft.inventory.ISidedInventory;

4
mods/tinker/tconstruct/logic/EquipLogic.java → mods/tinker/tconstruct/blocks/logic/EquipLogic.java
View File

@ -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; import net.minecraft.item.ItemStack;
/* Slots /* Slots

6
mods/tinker/tconstruct/logic/FaucetLogic.java → mods/tinker/tconstruct/blocks/logic/FaucetLogic.java
View File

@ -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.TConstruct;
import mods.tinker.tconstruct.library.IActiveLogic;
import mods.tinker.tconstruct.library.IFacingLogic;
import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLiving;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager; import net.minecraft.network.INetworkManager;

6
mods/tinker/tconstruct/logic/FrypanLogic.java → mods/tinker/tconstruct/blocks/logic/FrypanLogic.java
View File

@ -1,7 +1,7 @@
package mods.tinker.tconstruct.logic; package mods.tinker.tconstruct.blocks.logic;
import mods.tinker.common.IActiveLogic; import mods.tinker.tconstruct.inventory.FrypanContainer;
import mods.tinker.tconstruct.container.FrypanContainer; import mods.tinker.tconstruct.library.IActiveLogic;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

4
mods/tinker/tconstruct/logic/GolemCoreLogic.java → mods/tinker/tconstruct/blocks/logic/GolemCoreLogic.java
View File

@ -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.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;

2
mods/tinker/tconstruct/logic/GolemPedestalLogic.java → mods/tinker/tconstruct/blocks/logic/GolemPedestalLogic.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct.logic; package mods.tinker.tconstruct.blocks.logic;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;

2
mods/tinker/tconstruct/logic/LavaTankLogic.java → mods/tinker/tconstruct/blocks/logic/LavaTankLogic.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct.logic; package mods.tinker.tconstruct.blocks.logic;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;

2
mods/tinker/tconstruct/logic/LiquidTextureLogic.java → mods/tinker/tconstruct/blocks/logic/LiquidTextureLogic.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct.logic; package mods.tinker.tconstruct.blocks.logic;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager; import net.minecraft.network.INetworkManager;

8
mods/tinker/tconstruct/logic/MultiServantLogic.java → mods/tinker/tconstruct/blocks/logic/MultiServantLogic.java
View File

@ -1,8 +1,8 @@
package mods.tinker.tconstruct.logic; package mods.tinker.tconstruct.blocks.logic;
import mods.tinker.common.CoordTuple; import mods.tinker.tconstruct.library.CoordTuple;
import mods.tinker.common.IMasterLogic; import mods.tinker.tconstruct.library.IMasterLogic;
import mods.tinker.common.IServantLogic; import mods.tinker.tconstruct.library.IServantLogic;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagList;
import net.minecraft.network.INetworkManager; import net.minecraft.network.INetworkManager;

12
mods/tinker/tconstruct/logic/PartCrafterLogic.java → mods/tinker/tconstruct/blocks/logic/PartCrafterLogic.java
View File

@ -1,10 +1,10 @@
package mods.tinker.tconstruct.logic; package mods.tinker.tconstruct.blocks.logic;
import mods.tinker.common.IPattern; import mods.tinker.tconstruct.inventory.PartCrafterChestContainer;
import mods.tinker.common.InventoryLogic; import mods.tinker.tconstruct.inventory.PartCrafterContainer;
import mods.tinker.tconstruct.container.PartCrafterChestContainer; import mods.tinker.tconstruct.library.IPattern;
import mods.tinker.tconstruct.container.PartCrafterContainer; import mods.tinker.tconstruct.library.InventoryLogic;
import mods.tinker.tconstruct.crafting.PatternBuilder; import mods.tinker.tconstruct.library.crafting.PatternBuilder;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
import net.minecraft.inventory.ISidedInventory; import net.minecraft.inventory.ISidedInventory;

6
mods/tinker/tconstruct/logic/PatternChestLogic.java → mods/tinker/tconstruct/blocks/logic/PatternChestLogic.java
View File

@ -1,7 +1,7 @@
package mods.tinker.tconstruct.logic; package mods.tinker.tconstruct.blocks.logic;
import mods.tinker.common.InventoryLogic; import mods.tinker.tconstruct.inventory.PatternChestContainer;
import mods.tinker.tconstruct.container.PatternChestContainer; import mods.tinker.tconstruct.library.InventoryLogic;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
import net.minecraft.world.World; import net.minecraft.world.World;

8
mods/tinker/tconstruct/logic/PatternShaperLogic.java → mods/tinker/tconstruct/blocks/logic/PatternShaperLogic.java
View File

@ -1,8 +1,8 @@
package mods.tinker.tconstruct.logic; package mods.tinker.tconstruct.blocks.logic;
import mods.tinker.common.InventoryLogic; import mods.tinker.tconstruct.common.TContent;
import mods.tinker.tconstruct.TContent; import mods.tinker.tconstruct.inventory.PatternShaperContainer;
import mods.tinker.tconstruct.container.PatternShaperContainer; import mods.tinker.tconstruct.library.InventoryLogic;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
import net.minecraft.inventory.ISidedInventory; import net.minecraft.inventory.ISidedInventory;

4
mods/tinker/tconstruct/logic/SmelteryDrainLogic.java → mods/tinker/tconstruct/blocks/logic/SmelteryDrainLogic.java
View File

@ -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.entity.EntityLiving;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager; import net.minecraft.network.INetworkManager;

18
mods/tinker/tconstruct/logic/SmelteryLogic.java → mods/tinker/tconstruct/blocks/logic/SmelteryLogic.java
View File

@ -1,16 +1,16 @@
package mods.tinker.tconstruct.logic; package mods.tinker.tconstruct.blocks.logic;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Random; import java.util.Random;
import mods.tinker.common.CoordTuple; import mods.tinker.tconstruct.common.TContent;
import mods.tinker.common.IActiveLogic; import mods.tinker.tconstruct.inventory.SmelteryContainer;
import mods.tinker.common.IFacingLogic; import mods.tinker.tconstruct.library.CoordTuple;
import mods.tinker.common.IMasterLogic; import mods.tinker.tconstruct.library.IActiveLogic;
import mods.tinker.common.InventoryLogic; import mods.tinker.tconstruct.library.IFacingLogic;
import mods.tinker.tconstruct.TContent; import mods.tinker.tconstruct.library.IMasterLogic;
import mods.tinker.tconstruct.container.SmelteryContainer; import mods.tinker.tconstruct.library.InventoryLogic;
import mods.tinker.tconstruct.crafting.Smeltery; import mods.tinker.tconstruct.library.crafting.Smeltery;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItem;

8
mods/tinker/tconstruct/logic/ToolStationLogic.java → mods/tinker/tconstruct/blocks/logic/ToolStationLogic.java
View File

@ -1,8 +1,8 @@
package mods.tinker.tconstruct.logic; package mods.tinker.tconstruct.blocks.logic;
import mods.tinker.common.InventoryLogic; import mods.tinker.tconstruct.inventory.ToolStationContainer;
import mods.tinker.tconstruct.container.ToolStationContainer; import mods.tinker.tconstruct.library.InventoryLogic;
import mods.tinker.tconstruct.crafting.ToolBuilder; import mods.tinker.tconstruct.library.crafting.ToolBuilder;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
import net.minecraft.inventory.ISidedInventory; import net.minecraft.inventory.ISidedInventory;

2
mods/tinker/tconstruct/client/TClientTickHandler.java
View File

@ -2,7 +2,7 @@ package mods.tinker.tconstruct.client;
import java.util.EnumSet; import java.util.EnumSet;
import mods.tinker.tconstruct.TContent; import mods.tinker.tconstruct.common.TContent;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.gui.ScaledResolution;

2
mods/tinker/tconstruct/client/TControls.java
View File

@ -5,7 +5,7 @@ import java.io.DataOutputStream;
import java.util.EnumSet; import java.util.EnumSet;
import mods.tinker.tconstruct.TConstruct; 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.Minecraft;
import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.client.settings.KeyBinding; import net.minecraft.client.settings.KeyBinding;

54
mods/tinker/tconstruct/client/TProxyClient.java
View File

@ -12,28 +12,30 @@ import javax.xml.parsers.DocumentBuilderFactory;
import mods.tinker.common.fancyitem.FancyEntityItem; import mods.tinker.common.fancyitem.FancyEntityItem;
import mods.tinker.common.fancyitem.FancyItemRender; import mods.tinker.common.fancyitem.FancyItemRender;
import mods.tinker.tconstruct.TConstruct; import mods.tinker.tconstruct.TConstruct;
import mods.tinker.tconstruct.TContent; import mods.tinker.tconstruct.blocks.logic.CastingBasinLogic;
import mods.tinker.tconstruct.TProxyCommon; import mods.tinker.tconstruct.blocks.logic.CastingTableLogic;
import mods.tinker.tconstruct.client.blockrender.CastingBasinSpecialRender; import mods.tinker.tconstruct.blocks.logic.GolemCoreLogic;
import mods.tinker.tconstruct.client.blockrender.CastingTableSpecialRenderer; import mods.tinker.tconstruct.client.block.CastingBasinSpecialRender;
import mods.tinker.tconstruct.client.blockrender.FluidRender; import mods.tinker.tconstruct.client.block.CastingTableSpecialRenderer;
import mods.tinker.tconstruct.client.blockrender.FrypanRender; import mods.tinker.tconstruct.client.block.FluidRender;
import mods.tinker.tconstruct.client.blockrender.GolemCoreRender; import mods.tinker.tconstruct.client.block.FrypanRender;
import mods.tinker.tconstruct.client.blockrender.GolemCoreSpecialRender; import mods.tinker.tconstruct.client.block.GolemCoreRender;
import mods.tinker.tconstruct.client.blockrender.OreberryRender; import mods.tinker.tconstruct.client.block.GolemCoreSpecialRender;
import mods.tinker.tconstruct.client.blockrender.SearedRender; import mods.tinker.tconstruct.client.block.OreberryRender;
import mods.tinker.tconstruct.client.blockrender.SmallFontRenderer; import mods.tinker.tconstruct.client.block.SearedRender;
import mods.tinker.tconstruct.client.blockrender.SmelteryRender; import mods.tinker.tconstruct.client.block.SmallFontRenderer;
import mods.tinker.tconstruct.client.blockrender.TableRender; import mods.tinker.tconstruct.client.block.SmelteryRender;
import mods.tinker.tconstruct.client.blockrender.TankRender; import mods.tinker.tconstruct.client.block.TableRender;
import mods.tinker.tconstruct.client.entityrender.CartRender; import mods.tinker.tconstruct.client.block.TankRender;
import mods.tinker.tconstruct.client.entityrender.CrystalRender; import mods.tinker.tconstruct.client.entity.CartRender;
import mods.tinker.tconstruct.client.entityrender.GolemRender; import mods.tinker.tconstruct.client.entity.CrystalRender;
import mods.tinker.tconstruct.client.entityrender.SkylaRender; import mods.tinker.tconstruct.client.entity.GolemRender;
import mods.tinker.tconstruct.client.entityrender.SlimeRender; import mods.tinker.tconstruct.client.entity.SkylaRender;
import mods.tinker.tconstruct.client.projectilerender.DaggerRender; import mods.tinker.tconstruct.client.entity.SlimeRender;
import mods.tinker.tconstruct.client.projectilerender.LaunchedItemRender; import mods.tinker.tconstruct.client.entity.projectile.DaggerRender;
import mods.tinker.tconstruct.crafting.ToolBuilder; 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.BlueSlime;
import mods.tinker.tconstruct.entity.CartEntity; import mods.tinker.tconstruct.entity.CartEntity;
import mods.tinker.tconstruct.entity.Crystal; 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.Skyla;
import mods.tinker.tconstruct.entity.projectile.DaggerEntity; import mods.tinker.tconstruct.entity.projectile.DaggerEntity;
import mods.tinker.tconstruct.entity.projectile.LaunchedPotion; 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.TConstructRegistry;
import mods.tinker.tconstruct.library.ToolCore; import mods.tinker.tconstruct.library.ToolCore;
import mods.tinker.tconstruct.library.client.TConstructClientRegistry; import mods.tinker.tconstruct.library.client.TConstructClientRegistry;
import mods.tinker.tconstruct.library.client.ToolGuiElement; import mods.tinker.tconstruct.library.client.ToolGuiElement;
import mods.tinker.tconstruct.logic.CastingBasinLogic; import mods.tinker.tconstruct.library.crafting.ToolBuilder;
import mods.tinker.tconstruct.logic.CastingTableLogic; import mods.tinker.tconstruct.util.player.ArmorExtended;
import mods.tinker.tconstruct.logic.GolemCoreLogic;
import mods.tinker.tconstruct.player.ArmorExtended;
import mods.tinker.tconstruct.tools.Dagger;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;

2
mods/tinker/tconstruct/client/blockrender/AxleRender.java → mods/tinker/tconstruct/client/block/AxleRender.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct.client.blockrender; package mods.tinker.tconstruct.client.block;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderBlocks;

2
mods/tinker/tconstruct/client/blockrender/BallRepeaterRender.java → mods/tinker/tconstruct/client/block/BallRepeaterRender.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct.client.blockrender; package mods.tinker.tconstruct.client.block;
import mods.tinker.tconstruct.blocks.RedstoneBallRepeater; import mods.tinker.tconstruct.blocks.RedstoneBallRepeater;
import net.minecraft.block.Block; import net.minecraft.block.Block;

2
mods/tinker/common/BlockSkinRenderHelper.java → mods/tinker/tconstruct/client/block/BlockSkinRenderHelper.java
View File

@ -1,4 +1,4 @@
package mods.tinker.common; package mods.tinker.tconstruct.client.block;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockGrass; import net.minecraft.block.BlockGrass;

2
mods/tinker/tconstruct/client/blockrender/BreakingFX.java → mods/tinker/tconstruct/client/block/BreakingFX.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct.client.blockrender; package mods.tinker.tconstruct.client.block;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.particle.EntityFX; import net.minecraft.client.particle.EntityFX;

4
mods/tinker/tconstruct/client/blockrender/CastingBasinSpecialRender.java → mods/tinker/tconstruct/client/block/CastingBasinSpecialRender.java
View File

@ -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.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.RenderItem;
import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

4
mods/tinker/tconstruct/client/blockrender/CastingTableSpecialRenderer.java → mods/tinker/tconstruct/client/block/CastingTableSpecialRenderer.java
View File

@ -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.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.RenderItem;
import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

2
mods/tinker/tconstruct/client/blockrender/FluidRender.java → mods/tinker/tconstruct/client/block/FluidRender.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct.client.blockrender; package mods.tinker.tconstruct.client.block;
import mods.tinker.tconstruct.blocks.LiquidMetalBase; import mods.tinker.tconstruct.blocks.LiquidMetalBase;
import net.minecraft.block.Block; import net.minecraft.block.Block;

2
mods/tinker/tconstruct/client/blockrender/FrypanRender.java → mods/tinker/tconstruct/client/block/FrypanRender.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct.client.blockrender; package mods.tinker.tconstruct.client.block;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderBlocks;

2
mods/tinker/tconstruct/client/blockrender/GolemCoreRender.java → mods/tinker/tconstruct/client/block/GolemCoreRender.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct.client.blockrender; package mods.tinker.tconstruct.client.block;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

4
mods/tinker/tconstruct/client/blockrender/GolemCoreSpecialRender.java → mods/tinker/tconstruct/client/block/GolemCoreSpecialRender.java
View File

@ -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.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.RenderItem;
import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

2
mods/tinker/tconstruct/client/blockrender/OreberryRender.java → mods/tinker/tconstruct/client/block/OreberryRender.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct.client.blockrender; package mods.tinker.tconstruct.client.block;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderBlocks;

11
mods/tinker/tconstruct/client/blockrender/SearedRender.java → mods/tinker/tconstruct/client/block/SearedRender.java
View File

@ -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.blocks.logic.CastingBasinLogic;
import mods.tinker.tconstruct.TContent; import mods.tinker.tconstruct.blocks.logic.CastingTableLogic;
import mods.tinker.tconstruct.logic.CastingBasinLogic; import mods.tinker.tconstruct.blocks.logic.FaucetLogic;
import mods.tinker.tconstruct.logic.CastingTableLogic; import mods.tinker.tconstruct.common.TContent;
import mods.tinker.tconstruct.logic.FaucetLogic;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;

2
mods/tinker/tconstruct/client/blockrender/SmallFontRenderer.java → mods/tinker/tconstruct/client/block/SmallFontRenderer.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct.client.blockrender; package mods.tinker.tconstruct.client.block;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.IOException; import java.io.IOException;

7
mods/tinker/tconstruct/client/blockrender/SmelteryRender.java → mods/tinker/tconstruct/client/block/SmelteryRender.java
View File

@ -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.blocks.logic.SmelteryLogic;
import mods.tinker.tconstruct.crafting.Smeltery; import mods.tinker.tconstruct.library.crafting.Smeltery;
import mods.tinker.tconstruct.logic.SmelteryLogic;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;

2
mods/tinker/tconstruct/client/blockrender/TableRender.java → mods/tinker/tconstruct/client/block/TableRender.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct.client.blockrender; package mods.tinker.tconstruct.client.block;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderBlocks;

5
mods/tinker/tconstruct/client/blockrender/TankRender.java → mods/tinker/tconstruct/client/block/TankRender.java
View File

@ -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.blocks.logic.LavaTankLogic;
import mods.tinker.tconstruct.logic.LavaTankLogic;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;

2
mods/tinker/tconstruct/client/entityrender/CartRender.java → mods/tinker/tconstruct/client/entity/CartRender.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct.client.entityrender; package mods.tinker.tconstruct.client.entity;
import mods.tinker.tconstruct.entity.CartEntity; import mods.tinker.tconstruct.entity.CartEntity;
import net.minecraft.block.Block; import net.minecraft.block.Block;

2
mods/tinker/tconstruct/client/entityrender/CrystalModel.java → mods/tinker/tconstruct/client/entity/CrystalModel.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct.client.entityrender; package mods.tinker.tconstruct.client.entity;
import mods.tinker.tconstruct.client.tmt.ModelRendererTurbo; import mods.tinker.tconstruct.client.tmt.ModelRendererTurbo;
import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBase;

2
mods/tinker/tconstruct/client/entityrender/CrystalRender.java → mods/tinker/tconstruct/client/entity/CrystalRender.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct.client.entityrender; package mods.tinker.tconstruct.client.entity;
import mods.tinker.tconstruct.entity.Crystal; import mods.tinker.tconstruct.entity.Crystal;
import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBase;

2
mods/tinker/tconstruct/client/entityrender/GolemBaseModel.java → mods/tinker/tconstruct/client/entity/GolemBaseModel.java
View File

@ -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.ModelPig;
import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.model.ModelRenderer;

2
mods/tinker/tconstruct/client/entityrender/GolemRender.java → mods/tinker/tconstruct/client/entity/GolemRender.java
View File

@ -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.ItemRenderType.EQUIPPED;
import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.BLOCK_3D; import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.BLOCK_3D;

2
mods/tinker/tconstruct/client/entityrender/ModelPullcart.java → mods/tinker/tconstruct/client/entity/ModelPullcart.java
View File

@ -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.ModelBase;
import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.model.ModelRenderer;

2
mods/tinker/tconstruct/client/entityrender/ModelWagon.java → mods/tinker/tconstruct/client/entity/ModelWagon.java
View File

@ -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.ModelBase;
import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.model.ModelRenderer;

2
mods/tinker/tconstruct/client/entityrender/SkylaModel.java → mods/tinker/tconstruct/client/entity/SkylaModel.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct.client.entityrender; package mods.tinker.tconstruct.client.entity;
import mods.tinker.tconstruct.client.tmt.ModelRendererTurbo; import mods.tinker.tconstruct.client.tmt.ModelRendererTurbo;
import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBase;

2
mods/tinker/tconstruct/client/entityrender/SkylaRender.java → mods/tinker/tconstruct/client/entity/SkylaRender.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct.client.entityrender; package mods.tinker.tconstruct.client.entity;
import mods.tinker.tconstruct.entity.Skyla; import mods.tinker.tconstruct.entity.Skyla;
import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBase;

2
mods/tinker/tconstruct/client/entityrender/SlimeModel.java → mods/tinker/tconstruct/client/entity/SlimeModel.java
View File

@ -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.ModelBase;
import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.model.ModelRenderer;

2
mods/tinker/tconstruct/client/entityrender/SlimeRender.java → mods/tinker/tconstruct/client/entity/SlimeRender.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct.client.entityrender; package mods.tinker.tconstruct.client.entity;
import mods.tinker.tconstruct.entity.BlueSlime; import mods.tinker.tconstruct.entity.BlueSlime;
import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBase;

2
mods/tinker/tconstruct/client/projectilerender/DaggerRender.java → mods/tinker/tconstruct/client/entity/projectile/DaggerRender.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct.client.projectilerender; package mods.tinker.tconstruct.client.entity.projectile;
import java.util.Random; import java.util.Random;

2
mods/tinker/tconstruct/client/projectilerender/DaggerRenderOld.java → mods/tinker/tconstruct/client/entity/projectile/DaggerRenderOld.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct.client.projectilerender; package mods.tinker.tconstruct.client.entity.projectile;
import java.util.Random; import java.util.Random;
import mods.tinker.tconstruct.entity.projectile.DaggerEntity; import mods.tinker.tconstruct.entity.projectile.DaggerEntity;

2
mods/tinker/tconstruct/client/projectilerender/LaunchedItemRender.java → mods/tinker/tconstruct/client/entity/projectile/LaunchedItemRender.java
View File

@ -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 mods.tinker.tconstruct.entity.projectile.LaunchedPotion;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;

2
mods/tinker/tconstruct/client/projectilerender/RangedRenderBase.java → mods/tinker/tconstruct/client/entity/projectile/RangedRenderBase.java
View File

@ -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.Tessellator;
import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.Render;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;

6
mods/tinker/tconstruct/client/gui/ArmorExtendedGui.java
View File

@ -1,8 +1,8 @@
package mods.tinker.tconstruct.client.gui; package mods.tinker.tconstruct.client.gui;
import mods.tinker.tconstruct.container.ArmorExtendedContainer; import mods.tinker.tconstruct.inventory.ArmorExtendedContainer;
import mods.tinker.tconstruct.player.ArmorExtended; import mods.tinker.tconstruct.util.player.ArmorExtended;
import mods.tinker.tconstruct.player.TPlayerStats; import mods.tinker.tconstruct.util.player.TPlayerStats;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.InventoryEffectRenderer; import net.minecraft.client.renderer.InventoryEffectRenderer;
import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.OpenGlHelper;

2
mods/tinker/tconstruct/client/gui/FrypanGui.java
View File

@ -1,6 +1,6 @@
package mods.tinker.tconstruct.client.gui; 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.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;

2
mods/tinker/tconstruct/client/gui/GuiManual.java
View File

@ -1,10 +1,10 @@
package mods.tinker.tconstruct.client.gui; package mods.tinker.tconstruct.client.gui;
import mods.tinker.tconstruct.client.TProxyClient; import mods.tinker.tconstruct.client.TProxyClient;
import mods.tinker.tconstruct.crafting.PatternBuilder;
import mods.tinker.tconstruct.library.TConstructRegistry; import mods.tinker.tconstruct.library.TConstructRegistry;
import mods.tinker.tconstruct.library.ToolMaterial; import mods.tinker.tconstruct.library.ToolMaterial;
import mods.tinker.tconstruct.library.client.TConstructClientRegistry; import mods.tinker.tconstruct.library.client.TConstructClientRegistry;
import mods.tinker.tconstruct.library.crafting.PatternBuilder;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiParticle; import net.minecraft.client.gui.GuiParticle;

4
mods/tinker/tconstruct/client/gui/NewContainerGui.java
View File

@ -6,8 +6,8 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import mods.tinker.tconstruct.container.ActiveContainer; import mods.tinker.tconstruct.inventory.ActiveContainer;
import mods.tinker.tconstruct.container.ActiveSlot; import mods.tinker.tconstruct.inventory.ActiveSlot;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.OpenGlHelper;

8
mods/tinker/tconstruct/client/gui/PartCrafterGui.java
View File

@ -1,11 +1,11 @@
package mods.tinker.tconstruct.client.gui; package mods.tinker.tconstruct.client.gui;
import mods.tinker.tconstruct.container.ActiveContainer; import mods.tinker.tconstruct.blocks.logic.PartCrafterLogic;
import mods.tinker.tconstruct.container.PartCrafterChestContainer; import mods.tinker.tconstruct.inventory.ActiveContainer;
import mods.tinker.tconstruct.crafting.PatternBuilder; import mods.tinker.tconstruct.inventory.PartCrafterChestContainer;
import mods.tinker.tconstruct.library.TConstructRegistry; import mods.tinker.tconstruct.library.TConstructRegistry;
import mods.tinker.tconstruct.library.ToolMaterial; 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.Minecraft;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiScreen;

2
mods/tinker/tconstruct/client/gui/PatternChestGui.java
View File

@ -1,6 +1,6 @@
package mods.tinker.tconstruct.client.gui; 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.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;

6
mods/tinker/tconstruct/client/gui/PatternShaperGui.java
View File

@ -3,9 +3,9 @@ package mods.tinker.tconstruct.client.gui;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import mods.tinker.tconstruct.TContent; import mods.tinker.tconstruct.blocks.logic.PatternShaperLogic;
import mods.tinker.tconstruct.container.PatternShaperContainer; import mods.tinker.tconstruct.common.TContent;
import mods.tinker.tconstruct.logic.PatternShaperLogic; import mods.tinker.tconstruct.inventory.PatternShaperContainer;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

6
mods/tinker/tconstruct/client/gui/SmelteryGui.java
View File

@ -3,9 +3,9 @@ package mods.tinker.tconstruct.client.gui;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import mods.tinker.tconstruct.container.ActiveContainer; import mods.tinker.tconstruct.blocks.logic.SmelteryLogic;
import mods.tinker.tconstruct.container.SmelteryContainer; import mods.tinker.tconstruct.inventory.ActiveContainer;
import mods.tinker.tconstruct.logic.SmelteryLogic; import mods.tinker.tconstruct.inventory.SmelteryContainer;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;

6
mods/tinker/tconstruct/client/gui/ToolStationGui.java
View File

@ -3,13 +3,13 @@ package mods.tinker.tconstruct.client.gui;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import mods.tinker.tconstruct.container.ActiveContainer; import mods.tinker.tconstruct.blocks.logic.ToolStationLogic;
import mods.tinker.tconstruct.container.ToolStationContainer; import mods.tinker.tconstruct.inventory.ActiveContainer;
import mods.tinker.tconstruct.inventory.ToolStationContainer;
import mods.tinker.tconstruct.library.ToolCore; import mods.tinker.tconstruct.library.ToolCore;
import mods.tinker.tconstruct.library.Weapon; import mods.tinker.tconstruct.library.Weapon;
import mods.tinker.tconstruct.library.client.TConstructClientRegistry; import mods.tinker.tconstruct.library.client.TConstructClientRegistry;
import mods.tinker.tconstruct.library.client.ToolGuiElement; import mods.tinker.tconstruct.library.client.ToolGuiElement;
import mods.tinker.tconstruct.logic.ToolStationLogic;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.GuiTextField;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

74
mods/tinker/tconstruct/TContent.java → mods/tinker/tconstruct/common/TContent.java
View File

@ -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.common.fancyitem.FancyEntityItem;
import mods.tinker.tconstruct.TConstruct;
import mods.tinker.tconstruct.blocks.EquipBlock; import mods.tinker.tconstruct.blocks.EquipBlock;
import mods.tinker.tconstruct.blocks.GravelOre; import mods.tinker.tconstruct.blocks.GravelOre;
import mods.tinker.tconstruct.blocks.LavaTankBlock; 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.OreberryBush;
import mods.tinker.tconstruct.blocks.SearedBlock; import mods.tinker.tconstruct.blocks.SearedBlock;
import mods.tinker.tconstruct.blocks.SmelteryBlock; import mods.tinker.tconstruct.blocks.SmelteryBlock;
import mods.tinker.tconstruct.blocks.SpeedBlock;
import mods.tinker.tconstruct.blocks.StoneTorch; import mods.tinker.tconstruct.blocks.StoneTorch;
import mods.tinker.tconstruct.blocks.TConstructBlock; import mods.tinker.tconstruct.blocks.TConstructBlock;
import mods.tinker.tconstruct.blocks.TMetalBlock; import mods.tinker.tconstruct.blocks.TMetalBlock;
import mods.tinker.tconstruct.blocks.ToolStationBlock; import mods.tinker.tconstruct.blocks.ToolStationBlock;
import mods.tinker.tconstruct.blocks.infiblocks.SpeedBlock; import mods.tinker.tconstruct.blocks.logic.CastingBasinLogic;
import mods.tinker.tconstruct.crafting.LiquidBlockCasting; import mods.tinker.tconstruct.blocks.logic.CastingTableLogic;
import mods.tinker.tconstruct.crafting.LiquidCasting; import mods.tinker.tconstruct.blocks.logic.FaucetLogic;
import mods.tinker.tconstruct.crafting.PatternBuilder; import mods.tinker.tconstruct.blocks.logic.FrypanLogic;
import mods.tinker.tconstruct.crafting.Smeltery; import mods.tinker.tconstruct.blocks.logic.LavaTankLogic;
import mods.tinker.tconstruct.crafting.ToolBuilder; 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.BlueSlime;
import mods.tinker.tconstruct.entity.NitroCreeper; import mods.tinker.tconstruct.entity.NitroCreeper;
import mods.tinker.tconstruct.entity.projectile.DaggerEntity; 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.MetalPattern;
import mods.tinker.tconstruct.items.OreBerries; import mods.tinker.tconstruct.items.OreBerries;
import mods.tinker.tconstruct.items.Pattern; 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.StrangeFood;
import mods.tinker.tconstruct.items.TitleIcon; import mods.tinker.tconstruct.items.TitleIcon;
import mods.tinker.tconstruct.items.ToolPart; 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.SmelteryItemBlock;
import mods.tinker.tconstruct.items.blocks.SpeedBlockItem; import mods.tinker.tconstruct.items.blocks.SpeedBlockItem;
import mods.tinker.tconstruct.items.blocks.ToolStationItemBlock; 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.TConstructRegistry;
import mods.tinker.tconstruct.library.ToolCore; import mods.tinker.tconstruct.library.ToolCore;
import mods.tinker.tconstruct.library.client.TConstructClientRegistry; import mods.tinker.tconstruct.library.client.TConstructClientRegistry;
import mods.tinker.tconstruct.logic.CastingBasinLogic; import mods.tinker.tconstruct.library.crafting.LiquidBlockCasting;
import mods.tinker.tconstruct.logic.CastingTableLogic; import mods.tinker.tconstruct.library.crafting.LiquidCasting;
import mods.tinker.tconstruct.logic.FaucetLogic; import mods.tinker.tconstruct.library.crafting.PatternBuilder;
import mods.tinker.tconstruct.logic.FrypanLogic; import mods.tinker.tconstruct.library.crafting.Smeltery;
import mods.tinker.tconstruct.logic.LavaTankLogic; import mods.tinker.tconstruct.library.crafting.ToolBuilder;
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.modifiers.ModAttack; import mods.tinker.tconstruct.modifiers.ModAttack;
import mods.tinker.tconstruct.modifiers.ModBlaze; import mods.tinker.tconstruct.modifiers.ModBlaze;
import mods.tinker.tconstruct.modifiers.ModBoolean; 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.ModLapis;
import mods.tinker.tconstruct.modifiers.ModRedstone; import mods.tinker.tconstruct.modifiers.ModRedstone;
import mods.tinker.tconstruct.modifiers.ModRepair; import mods.tinker.tconstruct.modifiers.ModRepair;
import mods.tinker.tconstruct.tools.Axe; import mods.tinker.tconstruct.util.PHConstruct;
import mods.tinker.tconstruct.tools.BattleSign; import mods.tinker.tconstruct.util.RecipeRemover;
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 net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.MapColor; import net.minecraft.block.material.MapColor;
import net.minecraft.block.material.Material; 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"); metalPattern = new MetalPattern(PHConstruct.metalPattern, "MetalPattern", "cast_", "materials/").setUnlocalizedName("tconstruct.MetalPattern");
//netherPattern = new Pattern(PHTools.netherPattern, 128, patternTexture).setUnlocalizedName("tconstruct.Pattern"); //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); buckets = new FilledBucket(PHConstruct.buckets);
pickaxe = new Pickaxe(PHConstruct.pickaxe); pickaxe = new Pickaxe(PHConstruct.pickaxe);

2
mods/tinker/tconstruct/TProxyCommon.java → mods/tinker/tconstruct/common/TProxyCommon.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct; package mods.tinker.tconstruct.common;
import java.io.File; import java.io.File;

2
mods/tinker/tconstruct/entity/BlueSlime.java
View File

@ -1,7 +1,7 @@
package mods.tinker.tconstruct.entity; package mods.tinker.tconstruct.entity;
import mods.tinker.tconstruct.TConstruct; 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.EntityLiving;
import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.monster.EntitySkeleton;
import net.minecraft.entity.monster.IMob; import net.minecraft.entity.monster.IMob;

2
mods/tinker/tconstruct/entity/GolemBase.java
View File

@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.Random; import java.util.Random;
import mods.tinker.common.fancyitem.FancyEntityItem; 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.EntityCreature;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;

2
mods/tinker/tconstruct/entity/MetalSlime.java
View File

@ -1,6 +1,6 @@
package mods.tinker.tconstruct.entity; 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.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;

2
mods/tinker/tconstruct/ai/CoreAI.java → mods/tinker/tconstruct/entity/ai/CoreAI.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct.ai; package mods.tinker.tconstruct.entity.ai;
import mods.tinker.tconstruct.entity.GolemBase; import mods.tinker.tconstruct.entity.GolemBase;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;

2
mods/tinker/tconstruct/entity/projectile/DaggerEntity.java
View File

@ -1,8 +1,8 @@
package mods.tinker.tconstruct.entity.projectile; package mods.tinker.tconstruct.entity.projectile;
import mods.tinker.tconstruct.items.tools.Dagger;
import mods.tinker.tconstruct.library.AbilityHelper; import mods.tinker.tconstruct.library.AbilityHelper;
import mods.tinker.tconstruct.library.ToolCore; import mods.tinker.tconstruct.library.ToolCore;
import mods.tinker.tconstruct.tools.Dagger;
import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;

4
mods/tinker/tconstruct/container/ActiveContainer.java → mods/tinker/tconstruct/inventory/ActiveContainer.java
View File

@ -1,9 +1,9 @@
package mods.tinker.tconstruct.container; package mods.tinker.tconstruct.inventory;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; 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.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;

2
mods/tinker/tconstruct/container/ActiveSlot.java → mods/tinker/tconstruct/inventory/ActiveSlot.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct.container; package mods.tinker.tconstruct.inventory;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;

6
mods/tinker/tconstruct/container/ArmorExtendedContainer.java → mods/tinker/tconstruct/inventory/ArmorExtendedContainer.java
View File

@ -1,7 +1,7 @@
package mods.tinker.tconstruct.container; package mods.tinker.tconstruct.inventory;
import mods.tinker.tconstruct.player.ArmorExtended; import mods.tinker.tconstruct.util.player.ArmorExtended;
import mods.tinker.tconstruct.player.TPlayerStats; import mods.tinker.tconstruct.util.player.TPlayerStats;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;

4
mods/tinker/tconstruct/container/FrypanContainer.java → mods/tinker/tconstruct/inventory/FrypanContainer.java
View File

@ -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.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;

8
mods/tinker/tconstruct/container/PartCrafterChestContainer.java → mods/tinker/tconstruct/inventory/PartCrafterChestContainer.java
View File

@ -1,8 +1,8 @@
package mods.tinker.tconstruct.container; package mods.tinker.tconstruct.inventory;
import mods.tinker.common.IPattern; import mods.tinker.tconstruct.blocks.logic.PartCrafterLogic;
import mods.tinker.tconstruct.logic.PartCrafterLogic; import mods.tinker.tconstruct.blocks.logic.PatternChestLogic;
import mods.tinker.tconstruct.logic.PatternChestLogic; import mods.tinker.tconstruct.library.IPattern;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;

6
mods/tinker/tconstruct/container/PartCrafterContainer.java → mods/tinker/tconstruct/inventory/PartCrafterContainer.java
View File

@ -1,7 +1,7 @@
package mods.tinker.tconstruct.container; package mods.tinker.tconstruct.inventory;
import mods.tinker.common.IPattern; import mods.tinker.tconstruct.blocks.logic.PartCrafterLogic;
import mods.tinker.tconstruct.logic.PartCrafterLogic; import mods.tinker.tconstruct.library.IPattern;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;

6
mods/tinker/tconstruct/container/PatternChestContainer.java → mods/tinker/tconstruct/inventory/PatternChestContainer.java
View File

@ -1,7 +1,7 @@
package mods.tinker.tconstruct.container; package mods.tinker.tconstruct.inventory;
import mods.tinker.common.IPattern; import mods.tinker.tconstruct.blocks.logic.PatternChestLogic;
import mods.tinker.tconstruct.logic.PatternChestLogic; import mods.tinker.tconstruct.library.IPattern;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;

4
mods/tinker/tconstruct/container/PatternShaperContainer.java → mods/tinker/tconstruct/inventory/PatternShaperContainer.java
View File

@ -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.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;

2
mods/tinker/tconstruct/container/SlotArmorCopy.java → mods/tinker/tconstruct/inventory/SlotArmorCopy.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct.container; package mods.tinker.tconstruct.inventory;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;

2
mods/tinker/tconstruct/container/SlotOnlyTake.java → mods/tinker/tconstruct/inventory/SlotOnlyTake.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct.container; package mods.tinker.tconstruct.inventory;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;

2
mods/tinker/tconstruct/container/SlotPartBuilder.java → mods/tinker/tconstruct/inventory/SlotPartBuilder.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct.container; package mods.tinker.tconstruct.inventory;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;

4
mods/tinker/tconstruct/container/SlotPattern.java → mods/tinker/tconstruct/inventory/SlotPattern.java
View File

@ -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.IInventory;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;

2
mods/tinker/tconstruct/container/SlotTool.java → mods/tinker/tconstruct/inventory/SlotTool.java
View File

@ -1,4 +1,4 @@
package mods.tinker.tconstruct.container; package mods.tinker.tconstruct.inventory;
import java.util.Random; import java.util.Random;

4
mods/tinker/tconstruct/container/SmelteryContainer.java → mods/tinker/tconstruct/inventory/SmelteryContainer.java
View File

@ -1,9 +1,9 @@
package mods.tinker.tconstruct.container; package mods.tinker.tconstruct.inventory;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; 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.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;

4
mods/tinker/tconstruct/container/ToolStationContainer.java → mods/tinker/tconstruct/inventory/ToolStationContainer.java
View File

@ -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.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;

4
mods/tinker/tconstruct/items/FilledBucket.java
View File

@ -2,8 +2,8 @@ package mods.tinker.tconstruct.items;
import java.util.List; import java.util.List;
import mods.tinker.tconstruct.TContent; import mods.tinker.tconstruct.blocks.logic.LiquidTextureLogic;
import mods.tinker.tconstruct.logic.LiquidTextureLogic; import mods.tinker.tconstruct.common.TContent;
import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;

8
mods/tinker/tconstruct/items/PatternManual.java → mods/tinker/tconstruct/items/Manual.java
View File

@ -5,17 +5,17 @@ import java.util.List;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import mods.tinker.tconstruct.TConstruct; import mods.tinker.tconstruct.TConstruct;
import mods.tinker.tconstruct.TContent; import mods.tinker.tconstruct.common.TContent;
import mods.tinker.tconstruct.TGuiHandler; import mods.tinker.tconstruct.util.network.TGuiHandler;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.world.World; 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[] name = new String[] { "beginner", "toolstation", "smeltery" };
static String[] textureName = new String[] { "tinkerbook_diary", "tinkerbook_toolstation", "tinkerbook_smeltery" }; static String[] textureName = new String[] { "tinkerbook_diary", "tinkerbook_toolstation", "tinkerbook_smeltery" };
public PatternManual(int id) public Manual(int id)
{ {
super(id, name, textureName, ""); super(id, name, textureName, "");
setUnlocalizedName("tconstruct.manual"); setUnlocalizedName("tconstruct.manual");

6
mods/tinker/tconstruct/items/Pattern.java
View File

@ -2,9 +2,9 @@ package mods.tinker.tconstruct.items;
import java.util.List; import java.util.List;
import mods.tinker.common.IPattern; import mods.tinker.tconstruct.common.TContent;
import mods.tinker.tconstruct.TContent; import mods.tinker.tconstruct.library.IPattern;
import mods.tinker.tconstruct.crafting.PatternBuilder.MaterialSet; import mods.tinker.tconstruct.library.crafting.PatternBuilder.MaterialSet;
import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;

2
mods/tinker/tconstruct/items/RedstoneBallRepeaterItem.java
View File

@ -2,7 +2,7 @@ package mods.tinker.tconstruct.items;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; 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.block.Block;
import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;

Some files were not shown because too many files have changed in this diff Show More