Update for minecraft 1.5

This commit is contained in:
Christian 2013-03-09 16:27:20 -05:00
parent 1031f66720
commit ed2df512e4
25 changed files with 62 additions and 25 deletions

View File

@ -18,6 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
@ -38,6 +39,9 @@ public class BlockIronChest extends BlockContainer {
private Random random;
@SideOnly(Side.CLIENT)
private Icon[][] icons;
public BlockIronChest(int id)
{
super(id, Material.iron);
@ -108,21 +112,17 @@ public class BlockIronChest extends BlockContainer {
// }
// }
// @Override
// public Icon getBlockTextureFromSideAndMetadata(int i, int j)
// {
// IronChestType typ = IronChestType.values()[j];
// switch (i)
// {
// case 0:
// case 1:
// return typ.getTextureRow() * 16 + 1;
// case 3:
// return typ.getTextureRow() * 16 + 2;
// default:
// return typ.getTextureRow() * 16;
// }
// }
@SideOnly(Side.CLIENT)
@Override
public Icon getBlockTextureFromSideAndMetadata(int i, int j)
{
if (j < IronChestType.values().length)
{
IronChestType type = IronChestType.values()[j];
return type.getIcon(i);
}
return null;
}
@Override
public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer player, int i1, float f1, float f2, float f3)
@ -271,4 +271,13 @@ public class BlockIronChest extends BlockContainer {
}
@Override
@SideOnly(Side.CLIENT)
public void func_94332_a(IconRegister par1IconRegister)
{
for (IronChestType typ: IronChestType.values())
{
typ.makeIcons(par1IconRegister);
}
}
}

View File

@ -15,10 +15,14 @@ import java.util.ArrayList;
import java.util.List;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraftforge.oredict.ShapedOreRecipe;
public enum IronChestType {
@ -47,7 +51,7 @@ public enum IronChestType {
this.rowLength = rowLength;
this.tieredChest = tieredChest;
this.friendlyName = friendlyName;
this.modelTexture = "/cpw/mods/ironchest/sprites/" + modelTexture;
this.modelTexture = "/mods/ironchest/textures/model/" + modelTexture;
this.textureRow = textureRow;
this.clazz = clazz;
this.recipes = recipes;
@ -199,4 +203,30 @@ public enum IronChestType {
return this == OBSIDIAN;
}
@SideOnly(Side.CLIENT)
private Icon[] icons;
@SideOnly(Side.CLIENT)
public void makeIcons(IconRegister par1IconRegister)
{
if (isValidForCreativeMode())
{
icons = new Icon[3];
int i = 0;
for (String s : sideNames)
{
icons[i++] = par1IconRegister.func_94245_a(String.format("ironchest:%s_%s",name().toLowerCase(),s));
}
}
}
@SideOnly(Side.CLIENT)
public Icon getIcon(int side)
{
return icons[sideMapping[side]];
}
private static String[] sideNames = { "top", "front", "side" };
private static int[] sideMapping = { 0, 0, 2, 1, 2, 2, 2 };
}

View File

@ -26,8 +26,6 @@ public class ClientProxy extends CommonProxy {
public void registerRenderInformation()
{
ChestItemRenderHelper.instance = new IronChestRenderHelper();
MinecraftForgeClient.preloadTexture("/cpw/mods/ironchest/sprites/block_textures.png");
MinecraftForgeClient.preloadTexture("/cpw/mods/ironchest/sprites/item_textures.png");
}
@Override

View File

@ -22,13 +22,13 @@ import cpw.mods.ironchest.TileEntityIronChest;
public class GUIChest extends GuiContainer {
public enum GUI {
IRON(184, 202, "/cpw/mods/ironchest/sprites/ironcontainer.png", IronChestType.IRON),
GOLD(184, 256, "/cpw/mods/ironchest/sprites/goldcontainer.png", IronChestType.GOLD),
DIAMOND(238, 256, "/cpw/mods/ironchest/sprites/diamondcontainer.png", IronChestType.DIAMOND),
COPPER(184, 184, "/cpw/mods/ironchest/sprites/coppercontainer.png", IronChestType.COPPER),
SILVER(184, 238, "/cpw/mods/ironchest/sprites/silvercontainer.png", IronChestType.SILVER),
CRYSTAL(238, 256, "/cpw/mods/ironchest/sprites/diamondcontainer.png", IronChestType.CRYSTAL),
OBSIDIAN(238, 256, "/cpw/mods/ironchest/sprites/diamondcontainer.png", IronChestType.OBSIDIAN);
IRON(184, 202, "/mods/ironchest/textures/gui/ironcontainer.png", IronChestType.IRON),
GOLD(184, 256, "/mods/ironchest/textures/gui/goldcontainer.png", IronChestType.GOLD),
DIAMOND(238, 256, "/mods/ironchest/textures/gui/diamondcontainer.png", IronChestType.DIAMOND),
COPPER(184, 184, "/mods/ironchest/textures/gui/coppercontainer.png", IronChestType.COPPER),
SILVER(184, 238, "/mods/ironchest/textures/gui/silvercontainer.png", IronChestType.SILVER),
CRYSTAL(238, 256, "/mods/ironchest/textures/gui/diamondcontainer.png", IronChestType.CRYSTAL),
OBSIDIAN(238, 256, "/mods/ironchest/textures/gui/diamondcontainer.png", IronChestType.OBSIDIAN);
private int xSize;
private int ySize;

View File

Before

Width:  |  Height:  |  Size: 726 B

After

Width:  |  Height:  |  Size: 726 B

View File

Before

Width:  |  Height:  |  Size: 572 B

After

Width:  |  Height:  |  Size: 572 B

View File

Before

Width:  |  Height:  |  Size: 726 B

After

Width:  |  Height:  |  Size: 726 B

View File

Before

Width:  |  Height:  |  Size: 572 B

After

Width:  |  Height:  |  Size: 572 B