Ubujira
/
ironbarrels
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update for forge repackage

This commit is contained in:
Christian 2012-12-13 08:02:41 -05:00
parent fe8c306907
commit 0183b2d517
17 changed files with 84 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IronChests2/.classpath
View File

@ -3,6 +3,6 @@
<classpathentry kind="src" path="client"/> <classpathentry kind="src" path="client"/>
<classpathentry kind="src" path="common"/> <classpathentry kind="src" path="common"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/forge-client"/> <classpathentry combineaccessrules="false" kind="src" path="/Forge"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

8
IronChests2/client/cpw/mods/ironchest/client/ClientProxy.java
View File

@ -10,10 +10,10 @@
******************************************************************************/ ******************************************************************************/
package cpw.mods.ironchest.client; package cpw.mods.ironchest.client;
import net.minecraft.src.ChestItemRenderHelper; import net.minecraft.client.renderer.ChestItemRenderHelper;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.src.World; import net.minecraft.world.World;
import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.client.MinecraftForgeClient;
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;

16
IronChests2/client/cpw/mods/ironchest/client/GUIChest.java
View File

@ -4,15 +4,15 @@
* are made available under the terms of the GNU Public License v3.0 * are made available under the terms of the GNU Public License v3.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/gpl.html * http://www.gnu.org/licenses/gpl.html
* *
* Contributors: * Contributors:
* cpw - initial API and implementation * cpw - initial API and implementation
******************************************************************************/ ******************************************************************************/
package cpw.mods.ironchest.client; package cpw.mods.ironchest.client;
import net.minecraft.src.Container; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.src.GuiContainer; import net.minecraft.inventory.Container;
import net.minecraft.src.IInventory; import net.minecraft.inventory.IInventory;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
@ -28,7 +28,7 @@ public class GUIChest extends GuiContainer {
COPPER(184,184,"/cpw/mods/ironchest/sprites/coppercontainer.png",IronChestType.COPPER), COPPER(184,184,"/cpw/mods/ironchest/sprites/coppercontainer.png",IronChestType.COPPER),
SILVER(184,238,"/cpw/mods/ironchest/sprites/silvercontainer.png",IronChestType.SILVER), SILVER(184,238,"/cpw/mods/ironchest/sprites/silvercontainer.png",IronChestType.SILVER),
CRYSTAL(238,256,"/cpw/mods/ironchest/sprites/diamondcontainer.png",IronChestType.CRYSTAL); CRYSTAL(238,256,"/cpw/mods/ironchest/sprites/diamondcontainer.png",IronChestType.CRYSTAL);
private int xSize; private int xSize;
private int ySize; private int ySize;
private String guiTexture; private String guiTexture;
@ -40,11 +40,11 @@ public class GUIChest extends GuiContainer {
this.guiTexture=guiTexture; this.guiTexture=guiTexture;
this.mainType=mainType; this.mainType=mainType;
} }
protected Container makeContainer(IInventory player, IInventory chest) { protected Container makeContainer(IInventory player, IInventory chest) {
return new ContainerIronChestBase(player,chest, mainType, xSize, ySize); return new ContainerIronChestBase(player,chest, mainType, xSize, ySize);
} }
public static GUIChest buildGUI(IronChestType type, IInventory playerInventory, TileEntityIronChest chestInventory) { public static GUIChest buildGUI(IronChestType type, IInventory playerInventory, TileEntityIronChest chestInventory) {
return new GUIChest(values()[chestInventory.getType().ordinal()],playerInventory,chestInventory); return new GUIChest(values()[chestInventory.getType().ordinal()],playerInventory,chestInventory);
} }
@ -62,7 +62,7 @@ public class GUIChest extends GuiContainer {
this.ySize=type.ySize; this.ySize=type.ySize;
this.allowUserInput=false; this.allowUserInput=false;
} }
@Override @Override
protected void drawGuiContainerBackgroundLayer(float f, int i, int j) { protected void drawGuiContainerBackgroundLayer(float f, int i, int j) {
int tex = mc.renderEngine.getTexture(type.guiTexture); int tex = mc.renderEngine.getTexture(type.guiTexture);

7
IronChests2/client/cpw/mods/ironchest/client/IronChestRenderHelper.java
View File

@ -12,14 +12,15 @@ package cpw.mods.ironchest.client;
import java.util.Map; import java.util.Map;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.ChestItemRenderHelper;
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import cpw.mods.ironchest.IronChest; import cpw.mods.ironchest.IronChest;
import cpw.mods.ironchest.IronChestType; import cpw.mods.ironchest.IronChestType;
import cpw.mods.ironchest.TileEntityIronChest; import cpw.mods.ironchest.TileEntityIronChest;
import net.minecraft.src.Block;
import net.minecraft.src.ChestItemRenderHelper;
import net.minecraft.src.TileEntityRenderer;
public class IronChestRenderHelper extends ChestItemRenderHelper { public class IronChestRenderHelper extends ChestItemRenderHelper {
private Map<Integer, TileEntityIronChest> itemRenders = Maps.newHashMap(); private Map<Integer, TileEntityIronChest> itemRenders = Maps.newHashMap();

18
IronChests2/client/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java
View File

@ -28,15 +28,15 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Random; import java.util.Random;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.EntityItem; import net.minecraft.client.model.ModelChest;
import net.minecraft.src.Item; import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.src.ItemStack; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.src.ModelChest; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.src.RenderBlocks; import net.minecraft.entity.item.EntityItem;
import net.minecraft.src.Tessellator; import net.minecraft.item.Item;
import net.minecraft.src.TileEntity; import net.minecraft.item.ItemStack;
import net.minecraft.src.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.client.IItemRenderer;
import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.client.MinecraftForgeClient;

26
IronChests2/common/cpw/mods/ironchest/BlockIronChest.java
View File

@ -16,19 +16,19 @@ import java.util.Random;
import cpw.mods.fml.common.Side; import cpw.mods.fml.common.Side;
import cpw.mods.fml.common.asm.SideOnly; import cpw.mods.fml.common.asm.SideOnly;
import net.minecraft.src.BlockContainer; import net.minecraft.block.BlockContainer;
import net.minecraft.src.CreativeTabs; import net.minecraft.block.material.Material;
import net.minecraft.src.EntityItem; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.src.EntityLiving; import net.minecraft.entity.EntityLiving;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.item.EntityItem;
import net.minecraft.src.IBlockAccess; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.Material; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.src.MathHelper; import net.minecraft.tileentity.TileEntity;
import net.minecraft.src.NBTTagCompound; import net.minecraft.util.MathHelper;
import net.minecraft.src.TileEntity; import net.minecraft.world.IBlockAccess;
import net.minecraft.src.World; import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
public class BlockIronChest extends BlockContainer { public class BlockIronChest extends BlockContainer {

4
IronChests2/common/cpw/mods/ironchest/ChestChangerType.java
View File

@ -14,8 +14,8 @@ import static cpw.mods.ironchest.IronChestType.SILVER;
import static cpw.mods.ironchest.IronChestType.CRYSTAL; import static cpw.mods.ironchest.IronChestType.CRYSTAL;
import static cpw.mods.ironchest.IronChestType.WOOD; import static cpw.mods.ironchest.IronChestType.WOOD;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.common.Configuration; import net.minecraftforge.common.Configuration;
public enum ChestChangerType { public enum ChestChangerType {

7
IronChests2/common/cpw/mods/ironchest/CommonProxy.java
View File

@ -10,11 +10,10 @@
******************************************************************************/ ******************************************************************************/
package cpw.mods.ironchest; package cpw.mods.ironchest;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.IGuiHandler;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.TileEntity;
import net.minecraft.src.World;
public class CommonProxy implements IGuiHandler { public class CommonProxy implements IGuiHandler {
public void registerRenderInformation() public void registerRenderInformation()

12
IronChests2/common/cpw/mods/ironchest/ContainerIronChestBase.java
View File

@ -10,12 +10,12 @@
******************************************************************************/ ******************************************************************************/
package cpw.mods.ironchest; package cpw.mods.ironchest;
import net.minecraft.src.Container; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.src.IInventory; import net.minecraft.inventory.Container;
import net.minecraft.src.InventoryPlayer; import net.minecraft.inventory.IInventory;
import net.minecraft.src.ItemStack; import net.minecraft.inventory.Slot;
import net.minecraft.src.Slot; import net.minecraft.item.ItemStack;
public class ContainerIronChestBase extends Container { public class ContainerIronChestBase extends Container {
private IronChestType type; private IronChestType type;

6
IronChests2/common/cpw/mods/ironchest/IronChestAIOcelotSit.java
View File

@ -1,8 +1,8 @@
package cpw.mods.ironchest; package cpw.mods.ironchest;
import net.minecraft.src.EntityAIOcelotSit; import net.minecraft.entity.ai.EntityAIOcelotSit;
import net.minecraft.src.EntityOcelot; import net.minecraft.entity.passive.EntityOcelot;
import net.minecraft.src.World; import net.minecraft.world.World;
public class IronChestAIOcelotSit extends EntityAIOcelotSit { public class IronChestAIOcelotSit extends EntityAIOcelotSit {
public IronChestAIOcelotSit(EntityOcelot par1EntityOcelot, float par2) { public IronChestAIOcelotSit(EntityOcelot par1EntityOcelot, float par2) {

11
IronChests2/common/cpw/mods/ironchest/IronChestType.java
View File

@ -14,10 +14,11 @@ import java.util.Arrays;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import net.minecraft.src.Block; import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.src.CraftingManager;
import net.minecraft.src.Item; import net.minecraft.block.Block;
import net.minecraft.src.ItemStack; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapedOreRecipe;
public enum IronChestType { public enum IronChestType {
@ -129,7 +130,7 @@ public enum IronChestType {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static void addRecipe(ItemStack is, Object... parts) { public static void addRecipe(ItemStack is, Object... parts) {
ShapedOreRecipe oreRecipe = new ShapedOreRecipe(is, parts); ShapedOreRecipe oreRecipe = new ShapedOreRecipe(is, parts);
CraftingManager.getInstance().getRecipeList().add(oreRecipe); GameRegistry.addRecipe(oreRecipe);
} }
public int getRowCount() { public int getRowCount() {

14
IronChests2/common/cpw/mods/ironchest/ItemChestChanger.java
View File

@ -10,14 +10,14 @@
******************************************************************************/ ******************************************************************************/
package cpw.mods.ironchest; package cpw.mods.ironchest;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityChest;
import net.minecraft.world.World;
import cpw.mods.fml.common.ObfuscationReflectionHelper; import cpw.mods.fml.common.ObfuscationReflectionHelper;
import net.minecraft.src.CreativeTabs;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.Item;
import net.minecraft.src.ItemStack;
import net.minecraft.src.TileEntity;
import net.minecraft.src.TileEntityChest;
import net.minecraft.src.World;
public class ItemChestChanger extends Item { public class ItemChestChanger extends Item {

4
IronChests2/common/cpw/mods/ironchest/ItemIronChest.java
View File

@ -10,8 +10,8 @@
******************************************************************************/ ******************************************************************************/
package cpw.mods.ironchest; package cpw.mods.ironchest;
import net.minecraft.src.ItemBlock; import net.minecraft.item.ItemBlock;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public class ItemIronChest extends ItemBlock { public class ItemIronChest extends ItemBlock {

2
IronChests2/common/cpw/mods/ironchest/MappableItemStackWrapper.java
View File

@ -1,6 +1,6 @@
package cpw.mods.ironchest; package cpw.mods.ironchest;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public class MappableItemStackWrapper { public class MappableItemStackWrapper {
private ItemStack wrap; private ItemStack wrap;

6
IronChests2/common/cpw/mods/ironchest/OcelotsSitOnChestsHandler.java
View File

@ -2,9 +2,9 @@ package cpw.mods.ironchest;
import java.util.List; import java.util.List;
import net.minecraft.src.EntityAIOcelotSit; import net.minecraft.entity.ai.EntityAIOcelotSit;
import net.minecraft.src.EntityAITaskEntry; import net.minecraft.entity.ai.EntityAITaskEntry;
import net.minecraft.src.EntityOcelot; import net.minecraft.entity.passive.EntityOcelot;
import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.ForgeSubscribe;
import net.minecraftforge.event.entity.living.LivingEvent; import net.minecraftforge.event.entity.living.LivingEvent;

10
IronChests2/common/cpw/mods/ironchest/PacketHandler.java
View File

@ -14,11 +14,11 @@ import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import net.minecraft.src.INetworkManager; import net.minecraft.network.INetworkManager;
import net.minecraft.src.Packet; import net.minecraft.network.packet.Packet;
import net.minecraft.src.Packet250CustomPayload; import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.src.World; import net.minecraft.world.World;
import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataInput;
import com.google.common.io.ByteStreams; import com.google.common.io.ByteStreams;

14
IronChests2/common/cpw/mods/ironchest/TileEntityIronChest.java
View File

@ -13,13 +13,13 @@ package cpw.mods.ironchest;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.src.NBTTagList; import net.minecraft.nbt.NBTTagList;
import net.minecraft.src.Packet; import net.minecraft.network.packet.Packet;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
public class TileEntityIronChest extends TileEntity implements IInventory { public class TileEntityIronChest extends TileEntity implements IInventory {
private int ticksSinceSync; private int ticksSinceSync;