Adjusted the package hierarchy

This commit is contained in:
Taylor Shuler 2014-05-11 16:46:30 -04:00
parent df203807ee
commit 48e98565da
23 changed files with 102 additions and 48 deletions

View File

@ -1,14 +1,17 @@
package cpw.mods.ironchest.client; package cpw.ironchest.client;
import net.minecraft.client.renderer.tileentity.TileEntityRendererChestHelper; import net.minecraft.client.renderer.tileentity.TileEntityRendererChestHelper;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import cpw.ironchest.client.gui.GuiIronChest;
import cpw.ironchest.client.renderers.tile.IronChestRenderHelper;
import cpw.ironchest.client.renderers.tile.TileEntityIronChestRenderer;
import cpw.ironchest.common.CommonProxy;
import cpw.ironchest.common.lib.IronChestType;
import cpw.ironchest.common.tiles.TileEntityIronChest;
import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.ironchest.CommonProxy;
import cpw.mods.ironchest.IronChestType;
import cpw.mods.ironchest.TileEntityIronChest;
public class ClientProxy extends CommonProxy { public class ClientProxy extends CommonProxy {
@Override @Override

View File

@ -1,4 +1,4 @@
package cpw.mods.ironchest.client; package cpw.ironchest.client.gui;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
@ -7,9 +7,9 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import cpw.mods.ironchest.ContainerIronChest; import cpw.ironchest.common.containers.ContainerIronChest;
import cpw.mods.ironchest.IronChestType; import cpw.ironchest.common.lib.IronChestType;
import cpw.mods.ironchest.TileEntityIronChest; import cpw.ironchest.common.tiles.TileEntityIronChest;
public class GuiIronChest extends GuiContainer { public class GuiIronChest extends GuiContainer {
public enum ResourceList { public enum ResourceList {

View File

@ -1,4 +1,4 @@
package cpw.mods.ironchest.client; package cpw.ironchest.client.renderers.tile;
import java.util.Map; import java.util.Map;
@ -8,9 +8,9 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import cpw.mods.ironchest.IronChest; import cpw.ironchest.common.IronChest;
import cpw.mods.ironchest.IronChestType; import cpw.ironchest.common.lib.IronChestType;
import cpw.mods.ironchest.TileEntityIronChest; import cpw.ironchest.common.tiles.TileEntityIronChest;
public class IronChestRenderHelper extends TileEntityRendererChestHelper { public class IronChestRenderHelper extends TileEntityRendererChestHelper {
private Map<Integer, TileEntityIronChest> itemRenders = Maps.newHashMap(); private Map<Integer, TileEntityIronChest> itemRenders = Maps.newHashMap();

View File

@ -1,4 +1,4 @@
package cpw.mods.ironchest.client; package cpw.ironchest.client.renderers.tile;
import static org.lwjgl.opengl.GL11.glColor4f; import static org.lwjgl.opengl.GL11.glColor4f;
import static org.lwjgl.opengl.GL11.glDisable; import static org.lwjgl.opengl.GL11.glDisable;
@ -25,8 +25,8 @@ import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.ImmutableMap.Builder;
import com.google.common.primitives.SignedBytes; import com.google.common.primitives.SignedBytes;
import cpw.mods.ironchest.IronChestType; import cpw.ironchest.common.lib.IronChestType;
import cpw.mods.ironchest.TileEntityIronChest; import cpw.ironchest.common.tiles.TileEntityIronChest;
public class TileEntityIronChestRenderer extends TileEntitySpecialRenderer { public class TileEntityIronChestRenderer extends TileEntitySpecialRenderer {
private ModelChest model; private ModelChest model;

View File

@ -1,8 +1,11 @@
package cpw.mods.ironchest; package cpw.ironchest.common;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import cpw.ironchest.common.containers.ContainerIronChest;
import cpw.ironchest.common.lib.IronChestType;
import cpw.ironchest.common.tiles.TileEntityIronChest;
import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.IGuiHandler;
public class CommonProxy implements IGuiHandler { public class CommonProxy implements IGuiHandler {

View File

@ -1,8 +1,13 @@
package cpw.mods.ironchest; package cpw.ironchest.common;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import cpw.ironchest.common.blocks.BlockIronChest;
import cpw.ironchest.common.blocks.BlockIronChestItem;
import cpw.ironchest.common.lib.ChestChangerType;
import cpw.ironchest.common.lib.IronChestType;
import cpw.ironchest.common.lib.network.PacketHandler;
import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.Mod.Instance;
@ -27,7 +32,7 @@ public class IronChest {
} }
}; };
@SidedProxy(clientSide = "cpw.mods.ironchest.client.ClientProxy", serverSide = "cpw.mods.ironchest.CommonProxy") @SidedProxy(clientSide = "cpw.ironchest.client.ClientProxy", serverSide = "cpw.ironchest.CommonProxy")
public static CommonProxy proxy; public static CommonProxy proxy;
@Instance(modid) @Instance(modid)
@ -38,7 +43,7 @@ public class IronChest {
ChestChangerType.buildItems(); ChestChangerType.buildItems();
ironChestBlock = new BlockIronChest(); ironChestBlock = new BlockIronChest();
GameRegistry.registerBlock(ironChestBlock, ItemIronChest.class, "BlockIronChest"); GameRegistry.registerBlock(ironChestBlock, BlockIronChestItem.class, "BlockIronChest");
for (IronChestType typ : IronChestType.values()) { for (IronChestType typ : IronChestType.values()) {
GameRegistry.registerTileEntityWithAlternatives(typ.clazz, "IronChest." + typ.name(), typ.name()); GameRegistry.registerTileEntityWithAlternatives(typ.clazz, "IronChest." + typ.name(), typ.name());

View File

@ -1,4 +1,4 @@
package cpw.mods.ironchest; package cpw.ironchest.common.blocks;
import static net.minecraftforge.common.util.ForgeDirection.DOWN; import static net.minecraftforge.common.util.ForgeDirection.DOWN;
import static net.minecraftforge.common.util.ForgeDirection.UP; import static net.minecraftforge.common.util.ForgeDirection.UP;
@ -32,6 +32,9 @@ import net.minecraftforge.common.util.ForgeDirection;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import cpw.ironchest.common.IronChest;
import cpw.ironchest.common.lib.IronChestType;
import cpw.ironchest.common.tiles.TileEntityIronChest;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;

View File

@ -1,11 +1,12 @@
package cpw.mods.ironchest; package cpw.ironchest.common.blocks;
import cpw.ironchest.common.lib.IronChestType;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
public class ItemIronChest extends ItemBlock { public class BlockIronChestItem extends ItemBlock {
public ItemIronChest(Block block) { public BlockIronChestItem(Block block) {
super(block); super(block);
setMaxDamage(0); setMaxDamage(0);
setHasSubtypes(true); setHasSubtypes(true);

View File

@ -1,5 +1,6 @@
package cpw.mods.ironchest; package cpw.ironchest.common.containers;
import cpw.ironchest.common.lib.IronChestType;
import invtweaks.api.container.ChestContainer; import invtweaks.api.container.ChestContainer;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

View File

@ -1,5 +1,6 @@
package cpw.mods.ironchest; package cpw.ironchest.common.containers;
import cpw.ironchest.common.lib.IronChestType;
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;

View File

@ -1,4 +1,4 @@
package cpw.mods.ironchest; package cpw.ironchest.common.items;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -8,6 +8,11 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityChest; import net.minecraft.tileentity.TileEntityChest;
import net.minecraft.world.World; import net.minecraft.world.World;
import cpw.ironchest.common.IronChest;
import cpw.ironchest.common.blocks.BlockIronChest;
import cpw.ironchest.common.lib.ChestChangerType;
import cpw.ironchest.common.lib.IronChestType;
import cpw.ironchest.common.tiles.TileEntityIronChest;
import cpw.mods.fml.common.ObfuscationReflectionHelper; import cpw.mods.fml.common.ObfuscationReflectionHelper;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;

View File

@ -1,15 +1,16 @@
package cpw.mods.ironchest; package cpw.ironchest.common.lib;
import static cpw.mods.ironchest.IronChestType.COPPER; import static cpw.ironchest.common.lib.IronChestType.COPPER;
import static cpw.mods.ironchest.IronChestType.CRYSTAL; import static cpw.ironchest.common.lib.IronChestType.CRYSTAL;
import static cpw.mods.ironchest.IronChestType.DIAMOND; import static cpw.ironchest.common.lib.IronChestType.DIAMOND;
import static cpw.mods.ironchest.IronChestType.GOLD; import static cpw.ironchest.common.lib.IronChestType.GOLD;
import static cpw.mods.ironchest.IronChestType.IRON; import static cpw.ironchest.common.lib.IronChestType.IRON;
import static cpw.mods.ironchest.IronChestType.OBSIDIAN; import static cpw.ironchest.common.lib.IronChestType.OBSIDIAN;
import static cpw.mods.ironchest.IronChestType.SILVER; import static cpw.ironchest.common.lib.IronChestType.SILVER;
import static cpw.mods.ironchest.IronChestType.WOOD; import static cpw.ironchest.common.lib.IronChestType.WOOD;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import cpw.ironchest.common.items.ItemChestChanger;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
public enum ChestChangerType { public enum ChestChangerType {

View File

@ -1,4 +1,4 @@
package cpw.mods.ironchest; package cpw.ironchest.common.lib;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -14,6 +14,16 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagByte; import net.minecraft.nbt.NBTTagByte;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapedOreRecipe;
import cpw.ironchest.common.blocks.BlockIronChest;
import cpw.ironchest.common.containers.ValidatingSlot;
import cpw.ironchest.common.tiles.TileEntityCopperChest;
import cpw.ironchest.common.tiles.TileEntityCrystalChest;
import cpw.ironchest.common.tiles.TileEntityDiamondChest;
import cpw.ironchest.common.tiles.TileEntityDirtChest;
import cpw.ironchest.common.tiles.TileEntityGoldChest;
import cpw.ironchest.common.tiles.TileEntityIronChest;
import cpw.ironchest.common.tiles.TileEntityObsidianChest;
import cpw.ironchest.common.tiles.TileEntitySilverChest;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;

View File

@ -1,4 +1,4 @@
package cpw.mods.ironchest; package cpw.ironchest.common.lib;
import java.util.Properties; import java.util.Properties;

View File

@ -1,4 +1,4 @@
package cpw.mods.ironchest; package cpw.ironchest.common.lib.network;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
@ -9,6 +9,8 @@ import java.util.EnumMap;
import net.minecraft.network.Packet; import net.minecraft.network.Packet;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import cpw.ironchest.common.IronChest;
import cpw.ironchest.common.tiles.TileEntityIronChest;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.network.FMLEmbeddedChannel; import cpw.mods.fml.common.network.FMLEmbeddedChannel;
import cpw.mods.fml.common.network.FMLIndexedMessageToMessageCodec; import cpw.mods.fml.common.network.FMLIndexedMessageToMessageCodec;

View File

@ -1,4 +1,6 @@
package cpw.mods.ironchest; package cpw.ironchest.common.tiles;
import cpw.ironchest.common.lib.IronChestType;
public class TileEntityCopperChest extends TileEntityIronChest { public class TileEntityCopperChest extends TileEntityIronChest {
public TileEntityCopperChest() { public TileEntityCopperChest() {

View File

@ -1,4 +1,6 @@
package cpw.mods.ironchest; package cpw.ironchest.common.tiles;
import cpw.ironchest.common.lib.IronChestType;
public class TileEntityCrystalChest extends TileEntityIronChest { public class TileEntityCrystalChest extends TileEntityIronChest {
public TileEntityCrystalChest() { public TileEntityCrystalChest() {

View File

@ -1,4 +1,6 @@
package cpw.mods.ironchest; package cpw.ironchest.common.tiles;
import cpw.ironchest.common.lib.IronChestType;
public class TileEntityDiamondChest extends TileEntityIronChest { public class TileEntityDiamondChest extends TileEntityIronChest {
public TileEntityDiamondChest() { public TileEntityDiamondChest() {

View File

@ -1,5 +1,6 @@
package cpw.mods.ironchest; package cpw.ironchest.common.tiles;
import cpw.ironchest.common.lib.IronChestType;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;

View File

@ -1,4 +1,6 @@
package cpw.mods.ironchest; package cpw.ironchest.common.tiles;
import cpw.ironchest.common.lib.IronChestType;
public class TileEntityGoldChest extends TileEntityIronChest { public class TileEntityGoldChest extends TileEntityIronChest {
public TileEntityGoldChest() { public TileEntityGoldChest() {

View File

@ -1,10 +1,16 @@
package cpw.mods.ironchest; package cpw.ironchest.common.tiles;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import cpw.ironchest.common.IronChest;
import cpw.ironchest.common.blocks.BlockIronChest;
import cpw.ironchest.common.containers.ContainerIronChest;
import cpw.ironchest.common.items.ItemChestChanger;
import cpw.ironchest.common.lib.IronChestType;
import cpw.ironchest.common.lib.network.PacketHandler;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
@ -70,7 +76,7 @@ public class TileEntityIronChest extends TileEntity implements IInventory {
sortTopStacks(); sortTopStacks();
} }
protected void sortTopStacks() { public void sortTopStacks() {
if (!type.isTransparent() || (worldObj != null && worldObj.isRemote)) { if (!type.isTransparent() || (worldObj != null && worldObj.isRemote)) {
return; return;
} }
@ -380,7 +386,7 @@ public class TileEntityIronChest extends TileEntity implements IInventory {
return false; return false;
} }
void rotateAround(ForgeDirection axis) { public void rotateAround(ForgeDirection axis) {
setFacing((byte) ForgeDirection.getOrientation(facing).getRotation(axis).ordinal()); setFacing((byte) ForgeDirection.getOrientation(facing).getRotation(axis).ordinal());
worldObj.addBlockEvent(xCoord, yCoord, zCoord, IronChest.ironChestBlock, 2, getFacing()); worldObj.addBlockEvent(xCoord, yCoord, zCoord, IronChest.ironChestBlock, 2, getFacing());
} }

View File

@ -1,4 +1,6 @@
package cpw.mods.ironchest; package cpw.ironchest.common.tiles;
import cpw.ironchest.common.lib.IronChestType;
public class TileEntityObsidianChest extends TileEntityIronChest { public class TileEntityObsidianChest extends TileEntityIronChest {
public TileEntityObsidianChest() { public TileEntityObsidianChest() {

View File

@ -1,4 +1,6 @@
package cpw.mods.ironchest; package cpw.ironchest.common.tiles;
import cpw.ironchest.common.lib.IronChestType;
public class TileEntitySilverChest extends TileEntityIronChest { public class TileEntitySilverChest extends TileEntityIronChest {
public TileEntitySilverChest() { public TileEntitySilverChest() {