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

update stuff in prep for release

This commit is contained in:
Progwml6 2014-10-06 16:32:07 -04:00
parent ccaed69884
commit beb5ebb2e1
5 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -37,7 +37,7 @@ archivesBaseName = "ironchest"
// Setup the forge minecraft plugin data. Specify the preferred forge/minecraft version here // Setup the forge minecraft plugin data. Specify the preferred forge/minecraft version here
minecraft { minecraft {
version = "1.8-7.10.93.1001-1.8" version = "1.8-7.10.99.1005-1.8"
mappings = 'snapshot_20140930' mappings = 'snapshot_20140930'
} }

27
src/main/java/cpw/mods/ironchest/IronChestType.java
View File

@ -15,6 +15,7 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;
import net.minecraft.item.Item; import net.minecraft.item.Item;
@ -114,7 +115,7 @@ public enum IronChestType implements IStringSerializable
{ {
generateRecipesForType(blockResult, previous, typ); generateRecipesForType(blockResult, previous, typ);
ItemStack chest = new ItemStack(blockResult, 1, typ.ordinal()); ItemStack chest = new ItemStack(blockResult, 1, typ.ordinal());
if (typ.isValidForCreativeMode()) GameRegistry.registerCustomItemStack(typ.friendlyName, chest); //if (typ.isValidForCreativeMode()) GameRegistry.registerCustomItemStack(typ.friendlyName, chest);//TODO fix this!!
if (typ.tieredChest) previous = chest; if (typ.tieredChest) previous = chest;
} }
} }
@ -151,13 +152,33 @@ public enum IronChestType implements IStringSerializable
{ {
return Blocks.dirt; return Blocks.dirt;
} }
else if (mat.equals("ingotIron"))//TODO get rid of this when forge is out
{
return Items.iron_ingot;
}
else if (mat.equals("ingotGold"))//TODO get rid of this when forge is out
{
return Items.gold_ingot;
}
else if (mat.equals("gemDiamond"))//TODO get rid of this when forge is out
{
return Items.diamond;
}
else if (mat.equals("blockGlass"))//TODO get rid of this when forge is out
{
return Blocks.glass;
}
else if(mat.equals("plankWood"))//TODO get rid of this when forge is out
{
return Blocks.planks;
}
return mat; return mat;
} }
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);//TODO re-enable this as shaped instead use GameRegistry.addRecipe(oreRecipe);
//GameRegistry.addRecipe(oreRecipe); //GameRegistry.addRecipe(is, parts);
} }
public int getRowCount() public int getRowCount()

2
src/main/java/cpw/mods/ironchest/RegistryHelper.java
View File

@ -31,7 +31,7 @@ public class RegistryHelper
block = GameRegistry.registerBlock(block, itemclass, name, itemCtorArgs); block = GameRegistry.registerBlock(block, itemclass, name, itemCtorArgs);
Item associatedItem = GameRegistry.findItem("ironchest", name); Item associatedItem = GameRegistry.findItem("ironchest", name);
Map itemBlockMap = (Map)ObfuscationReflectionHelper.getPrivateValue(Item.class, null, "field_179220_a"); Map itemBlockMap = (Map)ObfuscationReflectionHelper.getPrivateValue(Item.class, null, "BLOCK_TO_ITEM", "field_179220_a");
if (!itemBlockMap.containsKey(block)) itemBlockMap.put(block, associatedItem); if (!itemBlockMap.containsKey(block)) itemBlockMap.put(block, associatedItem);

4
src/main/java/cpw/mods/ironchest/client/ClientProxy.java
View File

@ -11,7 +11,7 @@
package cpw.mods.ironchest.client; package cpw.mods.ironchest.client;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.tileentity.TileEntityRendererChestHelper; import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer;
import net.minecraft.client.resources.IReloadableResourceManager; import net.minecraft.client.resources.IReloadableResourceManager;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
@ -37,7 +37,7 @@ public class ClientProxy extends CommonProxy
} }
} }
TileEntityRendererChestHelper.instance = new IronChestRenderHelper(); TileEntityItemStackRenderer.instance = new IronChestRenderHelper();
} }
@Override @Override

4
src/main/java/cpw/mods/ironchest/client/IronChestRenderHelper.java
View File

@ -13,7 +13,7 @@ package cpw.mods.ironchest.client;
import java.util.Map; import java.util.Map;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.renderer.tileentity.TileEntityRendererChestHelper; import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer;
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -23,7 +23,7 @@ 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;
public class IronChestRenderHelper extends TileEntityRendererChestHelper public class IronChestRenderHelper extends TileEntityItemStackRenderer
{ {
private Map<Integer, TileEntityIronChest> itemRenders = Maps.newHashMap(); private Map<Integer, TileEntityIronChest> itemRenders = Maps.newHashMap();