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

Merge 08e7319e5c into c4d5a5631f

This commit is contained in:
Mitchell 2016-02-06 16:43:55 +00:00
parent c4d5a5631f 08e7319e5c
commit 36c15ae9f9
50 changed files with 596 additions and 382 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
src/main/java/cpw/mods/ironchest/ChestChangerType.java
View File

@ -6,96 +6,89 @@
******************************************************************************/
package cpw.mods.ironchest;
import static cpw.mods.ironchest.IronChestType.COPPER;
import static cpw.mods.ironchest.IronChestType.CRYSTAL;
import static cpw.mods.ironchest.IronChestType.DIAMOND;
import static cpw.mods.ironchest.IronChestType.GOLD;
import static cpw.mods.ironchest.IronChestType.IRON;
import static cpw.mods.ironchest.IronChestType.OBSIDIAN;
import static cpw.mods.ironchest.IronChestType.SILVER;
import static cpw.mods.ironchest.IronChestType.WOOD;
import static cpw.mods.ironchest.IronChestTypeSimple.COPPER;
import static cpw.mods.ironchest.IronChestTypeSimple.CRYSTAL;
import static cpw.mods.ironchest.IronChestTypeSimple.DIAMOND;
import static cpw.mods.ironchest.IronChestTypeSimple.GOLD;
import static cpw.mods.ironchest.IronChestTypeSimple.IRON;
import static cpw.mods.ironchest.IronChestTypeSimple.OBSIDIAN;
import static cpw.mods.ironchest.IronChestTypeSimple.SILVER;
import static cpw.mods.ironchest.IronChestTypeSimple.WOOD;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.registry.GameRegistry;
import cpw.mods.ironchest.client.ModelHelper;
import net.minecraftforge.fml.relauncher.Side;
import cpw.mods.ironchest.client.ModelHelper;
public enum ChestChangerType {
IRONGOLD(IRON, GOLD, "ironGoldUpgrade", "Iron to Gold Chest Upgrade", "mmm", "msm", "mmm"),
GOLDDIAMOND(GOLD, DIAMOND, "goldDiamondUpgrade", "Gold to Diamond Chest Upgrade", "GGG", "msm", "GGG"),
COPPERSILVER(COPPER, SILVER, "copperSilverUpgrade", "Copper to Silver Chest Upgrade", "mmm", "msm", "mmm"),
SILVERGOLD(SILVER, GOLD, "silverGoldUpgrade", "Silver to Gold Chest Upgrade", "mGm", "GsG", "mGm"),
COPPERIRON(COPPER, IRON, "copperIronUpgrade", "Copper to Iron Chest Upgrade", "mGm", "GsG", "mGm"),
DIAMONDCRYSTAL(DIAMOND, CRYSTAL, "diamondCrystalUpgrade", "Diamond to Crystal Chest Upgrade", "GGG", "GOG", "GGG"),
WOODIRON(WOOD, IRON, "woodIronUpgrade", "Normal chest to Iron Chest Upgrade", "mmm", "msm", "mmm"),
WOODCOPPER(WOOD, COPPER, "woodCopperUpgrade", "Normal chest to Copper Chest Upgrade", "mmm", "msm", "mmm"),
DIAMONDOBSIDIAN(DIAMOND, OBSIDIAN, "diamondObsidianUpgrade", "Diamond to Obsidian Chest Upgrade", "mmm", "mGm", "mmm");
WOOD_UPGRADE(WOOD, new IronChestTypeSimple[] {IRON, GOLD, DIAMOND, OBSIDIAN}, "woodUpgrade", new String[][] {{"ttt", "tst", "ttt"}, {"ttt", "tst", "ttt"}, {"GGG", "tst", "GGG"}, {"tst", "tGt", "ttt"}}),
IRON_UPGRADE(IRON, new IronChestTypeSimple[] {GOLD, DIAMOND, OBSIDIAN}, "ironUpgrade", new String[][] {{"ttt", "tst", "ttt"}, {"GGG", "tst", "GGG"}, {"tst", "tGt", "ttt"}}),
GOLD_UPGRADE(GOLD, new IronChestTypeSimple[] {DIAMOND, OBSIDIAN}, "goldUpgrade", new String[][] {{"GGG", "tst", "GGG"}, {"tst", "tGt", "ttt"}}),
DIAMOND_OBSIDIAN_UPGRADE(DIAMOND, new IronChestTypeSimple[] {OBSIDIAN}, "diamondObsidianUpgrade", new String[][] {{"tst", "tGt", "ttt"}}),
DIAMOND_CRYSTAL_UPGRADE(DIAMOND, new IronChestTypeSimple[] {CRYSTAL}, "diamondCrystalUpgrade", new String[][] {{"GsG", "GOG", "GGG"}}),
COPPER_UPGRADE(COPPER, new IronChestTypeSimple[] {IRON, GOLD, DIAMOND, OBSIDIAN}, "copperUpgrade", new String[][] {{"tGt", "GsG", "tGt"}, {"ttt", "tst", "ttt"}, {"GGG", "tst", "GGG"}, {"tst", "tGt", "ttt"}}),
SILVER_UPGRADE(SILVER, new IronChestTypeSimple[] {GOLD, DIAMOND, OBSIDIAN}, "silverUpgrade", new String[][] {{"tGt", "GsG", "tGt"}, {"GGG", "tst", "GGG"}, {"tst", "tGt", "ttt"}});
private IronChestType source;
private IronChestType target;
public String itemName;
public String descriptiveName;
private IronChestTypeSimple source;
IronChestTypeSimple[] upgradeChain;
public ItemChestChanger item;
private String[] recipe;
public String itemName;
private String[][] recipe;
private ChestChangerType(IronChestType source, IronChestType target, String itemName, String descriptiveName, String... recipe)
{
private ChestChangerType(IronChestTypeSimple source, IronChestTypeSimple[] upgradeChain, String itemName, String[][] recipes) {
this.source = source;
this.target = target;
this.upgradeChain = upgradeChain;
this.itemName = itemName;
this.descriptiveName = descriptiveName;
this.recipe = recipe;
this.recipe = recipes;
}
public IronChestType getSource(){
public IronChestTypeSimple getSource() {
return source;
}
public boolean canUpgrade(IronChestType from)
{
public boolean canUpgrade(IronChestTypeSimple from) {
return from == this.source;
}
public int getTarget()
{
return this.target.ordinal();
public int getTarget(int meta) {
return this.upgradeChain[meta].ordinal();
}
public ItemChestChanger buildItem()
{
public String getTargetName(int meta) {
return this.upgradeChain[meta].getName();
}
public ItemChestChanger buildItem() {
item = new ItemChestChanger(this);
GameRegistry.registerItem(item, itemName);
if(FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT)
ModelHelper.registerItem(item, "ironchest:" + itemName);
if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) {
for (int i = 0; i < this.upgradeChain.length; i ++) {
String targetName = this.upgradeChain[i].getName().substring(0, 1).toUpperCase() + this.upgradeChain[i].getName().substring(1);
ModelHelper.registerItem(item, i, itemName + targetName);
}
}
return item;
}
public void addRecipes()
{
for (String sourceMat : source.getMatList())
{
for (String targetMat : target.getMatList())
{
Object targetMaterial = IronChestType.translateOreName(targetMat);
Object sourceMaterial = IronChestType.translateOreName(sourceMat);
IronChestType.addRecipe(new ItemStack(item), recipe, 'm', targetMaterial, 's', sourceMaterial, 'G', "blockGlass", 'O', Blocks.obsidian);
}
public void addRecipes() {
Object sourceMaterial = this.source.toObject();
Object targetMaterial = this.upgradeChain[0].toObject();
IronChestType.addRecipe(new ItemStack(item), recipe[0], 's', sourceMaterial, 't', targetMaterial, 'G', "blockGlass", 'O', Blocks.obsidian);
for (int i = 1; i < this.upgradeChain.length; i ++) {
targetMaterial = this.upgradeChain[i].toObject();
IronChestType.addRecipe(new ItemStack(item, 1, i), recipe[i], 's', new ItemStack(this.item, 1, i - 1), 't', targetMaterial, 'G', "blockGlass", 'O', Blocks.obsidian);
}
}
public static void buildItems()
{
for (ChestChangerType type : values())
{
public static void buildItems() {
for (ChestChangerType type : values()) {
type.buildItem();
}
}
public static void generateRecipes()
{
for (ChestChangerType item : values())
{
public static void generateRecipes() {
for (ChestChangerType item : values()) {
item.addRecipes();
}
}

12
src/main/java/cpw/mods/ironchest/IronChest.java
View File

@ -10,14 +10,7 @@
******************************************************************************/
package cpw.mods.ironchest;
import io.netty.buffer.ByteBuf;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.client.renderer.entity.RenderFireball;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.entity.projectile.EntitySmallFireball;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.client.registry.IRenderFactory;
import net.minecraftforge.fml.client.registry.RenderingRegistry;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.Mod.Instance;
@ -25,12 +18,7 @@ import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.network.NetworkRegistry;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.Side;
@Mod(modid = "IronChest", name = "Iron Chests", dependencies = "required-after:Forge@[11.15.0,12.0]", acceptedMinecraftVersions="[1.8,1.8.9]")
public class IronChest

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

@ -38,6 +38,7 @@ public enum IronChestType implements IStringSerializable
int size;
private int rowLength;
public String friendlyName;
public String tierName;
private boolean tieredChest;
private String modelTexture;
private int textureRow;
@ -58,6 +59,7 @@ public enum IronChestType implements IStringSerializable
this.rowLength = rowLength;
this.tieredChest = tieredChest;
this.friendlyName = friendlyName;
this.tierName = friendlyName.replace(" Chest", "").replace(" 9000", "");
this.modelTexture = modelTexture;
this.textureRow = textureRow;
this.clazz = clazz;

33
src/main/java/cpw/mods/ironchest/IronChestTypeSimple.java Normal file
View File

@ -0,0 +1,33 @@
package cpw.mods.ironchest;
import net.minecraft.init.Blocks;
public enum IronChestTypeSimple {
IRON("ingotIron"),
GOLD("ingotGold"),
DIAMOND("gemDiamond"),
COPPER("ingotCopper"),
SILVER("ingotSilver"),
CRYSTAL("blockGlass"),
OBSIDIAN("obsidian"),
DIRTCHEST9000("dirt"),
WOOD("plankWood");
private String material;
IronChestTypeSimple(String material) {
this.material = material;
}
public String getMaterial() { return this.material; }
public Object toObject() {
if (this == OBSIDIAN) return Blocks.obsidian;
if (this == DIRTCHEST9000) return Blocks.dirt;
return this.material;
}
public String getName() {
return name().toLowerCase();
}
}

87
src/main/java/cpw/mods/ironchest/ItemChestChanger.java
View File

@ -10,7 +10,10 @@
******************************************************************************/
package cpw.mods.ironchest;
import java.util.List;
import net.minecraft.block.BlockChest;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@ -20,62 +23,56 @@ import net.minecraft.tileentity.TileEntityChest;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class ItemChestChanger extends Item
{
public class ItemChestChanger extends Item {
private ChestChangerType type;
public ItemChestChanger(ChestChangerType type)
{
public ItemChestChanger(ChestChangerType type) {
this.type = type;
this.setHasSubtypes(true);
this.setMaxStackSize(1);
this.setUnlocalizedName("ironchest:" + type.name());
this.setCreativeTab(CreativeTabs.tabMisc);
}
@Override
public boolean onItemUseFirst (ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ)
{
if (world.isRemote)
return false;
if(this.type.canUpgrade(IronChestType.WOOD)){
if(!(world.getBlockState(pos).getBlock() instanceof BlockChest)){
return false;
}
}else{
if(world.getBlockState(pos) != IronChest.ironChestBlock.getStateFromMeta(IronChestType.valueOf(type.getSource().getName().toUpperCase()).ordinal())){
return false;
}
@Override public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) {
if (world.isRemote) return false;
if (this.type.canUpgrade(IronChestTypeSimple.WOOD)) {
if (!(world.getBlockState(pos).getBlock() instanceof BlockChest)) { return false; }
} else {
if (world.getBlockState(pos) != IronChest.ironChestBlock.getStateFromMeta(IronChestType.valueOf(type.getSource().getName().toUpperCase()).ordinal())) { return false; }
}
TileEntity te = world.getTileEntity(pos);
TileEntityIronChest newchest = new TileEntityIronChest();
ItemStack[] chestContents = new ItemStack[27];
if (te != null)
{
if (te instanceof TileEntityIronChest)
{
int chestFacing = 0;
if (te != null) {
if (te instanceof TileEntityIronChest) {
chestContents = ((TileEntityIronChest) te).chestContents;
newchest = IronChestType.makeEntity(this.getTargetChestOrdinal(this.type.ordinal()));
if (newchest == null)
return false;
}
else if (te instanceof TileEntityChest)
{
if (((TileEntityChest) te).numPlayersUsing > 0)
return false;
if (!getType().canUpgrade(IronChestType.WOOD))
return false;
chestFacing = ((TileEntityIronChest) te).getFacing();
newchest = IronChestType.makeEntity(this.getTargetChestOrdinal(this.type.ordinal(), stack.getItemDamage()));
if (newchest == null) return false;
} else if (te instanceof TileEntityChest) {
IBlockState chestState = world.getBlockState(pos);
EnumFacing facing = chestState.getValue(BlockChest.FACING);
if (facing == EnumFacing.NORTH) chestFacing = 2;
if (facing == EnumFacing.EAST) chestFacing = 5;
if (facing == EnumFacing.SOUTH) chestFacing = 3;
if (facing == EnumFacing.WEST) chestFacing = 4;
if (((TileEntityChest) te).numPlayersUsing > 0) return false;
if (!getType().canUpgrade(IronChestTypeSimple.WOOD)) return false;
chestContents = new ItemStack[((TileEntityChest) te).getSizeInventory()];
for (int i = 0; i < chestContents.length; i++)
for (int i = 0; i < chestContents.length; i ++)
chestContents[i] = ((TileEntityChest) te).getStackInSlot(i);
newchest = IronChestType.makeEntity(this.getTargetChestOrdinal(this.type.ordinal()));
newchest = IronChestType.makeEntity(this.getTargetChestOrdinal(this.type.ordinal(), stack.getItemDamage()));
}
}
te.updateContainingBlockInfo();
if (te instanceof TileEntityChest)
((TileEntityChest) te).checkForAdjacentChests();
if (te instanceof TileEntityChest) ((TileEntityChest) te).checkForAdjacentChests();
world.removeTileEntity(pos);
world.setBlockToAir(pos);
@ -86,22 +83,28 @@ public class ItemChestChanger extends Item
world.markBlockForUpdate(pos);
TileEntity te2 = world.getTileEntity(pos);
if (te2 instanceof TileEntityIronChest)
{
if (te2 instanceof TileEntityIronChest) {
((TileEntityIronChest) te2).setContents(chestContents);
((TileEntityIronChest) te2).setFacing((byte) chestFacing);
}
stack.stackSize = player.capabilities.isCreativeMode ? stack.stackSize : stack.stackSize - 1;
return true;
}
public int getTargetChestOrdinal(int sourceOrdinal)
{
return type.getTarget();
@Override @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
for (int i = 0; i < this.type.upgradeChain.length; i ++) list.add(new ItemStack(item, 1, i));
}
public ChestChangerType getType()
{
@Override public String getUnlocalizedName(ItemStack stack) {
return super.getUnlocalizedName(stack) + "_" + this.type.getTargetName(stack.getItemDamage()).toUpperCase();
}
public int getTargetChestOrdinal(int sourceOrdinal, int meta) {
return type.getTarget(meta);
}
public ChestChangerType getType() {
return type;
}
}

36
src/main/java/cpw/mods/ironchest/client/ModelHelper.java
View File

@ -10,35 +10,41 @@
******************************************************************************/
package cpw.mods.ironchest.client;
import net.minecraft.block.Block;
import java.util.ArrayList;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.ItemModelMesher;
import net.minecraft.client.resources.model.ModelBakery;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.item.Item;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelHelper
{
public static void registerItem(Item item, int metadata, String itemName)
{
public class ModelHelper {
public static void registerItemInternal(Item item, String[] registryNames, int[] registryMetas) {
if (registryNames.length != registryMetas.length) { return; }
ItemModelMesher mesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher();
mesher.register(item, metadata, new ModelResourceLocation(itemName, "inventory"));
for (int i = 0; i < registryNames.length; i ++) {
mesher.register(item, registryMetas[i], new ModelResourceLocation("ironchest:" + registryNames[i], "inventory"));
}
}
public static void registerBlock(Block block, int metadata, String blockName)
{
registerItem(Item.getItemFromBlock(block), metadata, blockName);
public static void registerItem(Item item, String[] registryNames, int[] registryMetas) {
ModelBakery.registerItemVariants(item, generateVariants(registryNames));
registerItemInternal(item, registryNames, registryMetas);
}
public static void registerBlock(Block block, String blockName)
{
registerBlock(block, 0, blockName);
public static void registerItem(Item item, int meta, String registryName) {
registerItem(item, new String[] {registryName}, new int[] {meta});
}
public static void registerItem(Item item, String itemName)
{
registerItem(item, 0, itemName);
static ResourceLocation[] generateVariants(String[] registryNames) {
ArrayList<ResourceLocation> ret = new ArrayList<ResourceLocation>();
for (String aString : registryNames) {
ret.add(new ResourceLocation("ironchest", aString.contains("ironchest:") ? aString.replace("ironchest:", "") : aString));
}
return ret.toArray(new ResourceLocation[] {});
}
}

27
src/main/resources/assets/ironchest/lang/en_US.lang
View File

@ -7,15 +7,24 @@ tile.ironchest:CRYSTAL.name=Crystal Chest
tile.ironchest:OBSIDIAN.name=Obsidian Chest
tile.ironchest:DIRTCHEST9000.name=DirtChest 9000!
item.ironchest:IRONGOLD.name=Iron to Gold Chest Upgrade
item.ironchest:GOLDDIAMOND.name=Gold to Diamond Chest Upgrade
item.ironchest:COPPERSILVER.name=Copper to Silver Chest Upgrade
item.ironchest:SILVERGOLD.name=Silver to Gold Chest Upgrade
item.ironchest:COPPERIRON.name=Copper to Iron Chest Upgrade
item.ironchest:DIAMONDCRYSTAL.name=Diamond to Crystal Chest Upgrade
item.ironchest:WOODIRON.name=Wood to Iron Chest Upgrade
item.ironchest:WOODCOPPER.name=Wood to Copper Chest Upgrade
item.ironchest:DIAMONDOBSIDIAN.name=Diamond to Obsidian Chest Upgrade
item.ironchest:WOOD_UPGRADE_IRON.name=Wood to Iron Chest Upgrade
item.ironchest:WOOD_UPGRADE_GOLD.name=Wood to Gold Chest Upgrade
item.ironchest:WOOD_UPGRADE_DIAMOND.name=Wood to Diamond Chest Upgrade
item.ironchest:WOOD_UPGRADE_OBSIDIAN.name=Wood to Obsidian Chest Upgrade
item.ironchest:IRON_UPGRADE_GOLD.name=Iron to Gold Chest Upgrade
item.ironchest:IRON_UPGRADE_DIAMOND.name=Iron to Diamond Chest Upgrade
item.ironchest:IRON_UPGRADE_OBSIDIAN.name=Iron to Obsidian Chest Upgrade
item.ironchest:GOLD_UPGRADE_DIAMOND.name=Gold to Diamond Chest Upgrade
item.ironchest:GOLD_UPGRADE_OBSIDIAN.name=Gold to Obsidian Chest Upgrade
item.ironchest:DIAMOND_OBSIDIAN_UPGRADE_OBSIDIAN.name=Diamond to Obsidian Chest Upgrade
item.ironchest:DIAMOND_CRYSTAL_UPGRADE_CRYSTAL.name=Diamond to Crystal Chest Upgrade
item.ironchest:COPPER_UPGRADE_IRON.name=Copper to Iron Chest Upgrade
item.ironchest:COPPER_UPGRADE_GOLD.name=Copper to Gold Chest Upgrade
item.ironchest:COPPER_UPGRADE_DIAMOND.name=Copper to Diamond Chest Upgrade
item.ironchest:COPPER_UPGRADE_OBSIDIAN.name=Copper to Obsidian Chest Upgrade
item.ironchest:SILVER_UPGRADE_GOLD.name=Silver to Gold Chest Upgrade
item.ironchest:SILVER_UPGRADE_DIAMOND.name=Silver to Diamond Chest Upgrade
item.ironchest:SILVER_UPGRADE_OBSIDIAN.name=Silver to Obsidian Chest Upgrade
book.ironchest:dirtchest9000.title=How to use your DirtChest 9000!
book.ironchest:dirtchest9000.page1=Welcome to your new DirtChest 9000! We hope you will enjoy many happy years of storing your stack of dirt in our storage utility.

19
src/main/resources/assets/ironchest/models/item/copperUpgradeDiamond.json Normal file
View File

@ -0,0 +1,19 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "ironchest:items/copperChest",
"layer1": "ironchest:items/diamondUpgrade"
},
"display": {
"thirdperson": {
"rotation": [ -90, 0, 0 ],
"translation": [ 0, 1, -3 ],
"scale": [ 0.55, 0.55, 0.55 ]
},
"firstperson": {
"rotation": [ 0, -135, 25 ],
"translation": [ 0, 4, 2 ],
"scale": [ 1.7, 1.7, 1.7 ]
}
}
}

3
src/main/resources/assets/ironchest/models/item/diamondObsidianUpgrade.json → src/main/resources/assets/ironchest/models/item/copperUpgradeGold.json
View File

@ -1,7 +1,8 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "ironchest:items/diamondObsidianUpgrade"
"layer0": "ironchest:items/copperChest",
"layer1": "ironchest:items/goldUpgrade"
},
"display": {
"thirdperson": {

19
src/main/resources/assets/ironchest/models/item/copperUpgradeIron.json Normal file
View File

@ -0,0 +1,19 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "ironchest:items/copperChest",
"layer1": "ironchest:items/ironUpgrade"
},
"display": {
"thirdperson": {
"rotation": [ -90, 0, 0 ],
"translation": [ 0, 1, -3 ],
"scale": [ 0.55, 0.55, 0.55 ]
},
"firstperson": {
"rotation": [ 0, -135, 25 ],
"translation": [ 0, 4, 2 ],
"scale": [ 1.7, 1.7, 1.7 ]
}
}
}

19
src/main/resources/assets/ironchest/models/item/copperUpgradeObsidian.json Normal file
View File

@ -0,0 +1,19 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "ironchest:items/copperChest",
"layer1": "ironchest:items/obsidianUpgrade"
},
"display": {
"thirdperson": {
"rotation": [ -90, 0, 0 ],
"translation": [ 0, 1, -3 ],
"scale": [ 0.55, 0.55, 0.55 ]
},
"firstperson": {
"rotation": [ 0, -135, 25 ],
"translation": [ 0, 4, 2 ],
"scale": [ 1.7, 1.7, 1.7 ]
}
}
}

19
src/main/resources/assets/ironchest/models/item/diamondCrystalUpgradeCrystal.json Normal file
View File

@ -0,0 +1,19 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "ironchest:items/diamondChest",
"layer1": "ironchest:items/crystalUpgrade"
},
"display": {
"thirdperson": {
"rotation": [ -90, 0, 0 ],
"translation": [ 0, 1, -3 ],
"scale": [ 0.55, 0.55, 0.55 ]
},
"firstperson": {
"rotation": [ 0, -135, 25 ],
"translation": [ 0, 4, 2 ],
"scale": [ 1.7, 1.7, 1.7 ]
}
}
}

19
src/main/resources/assets/ironchest/models/item/diamondObsidianUpgradeObsidian.json Normal file
View File

@ -0,0 +1,19 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "ironchest:items/diamondChest",
"layer1": "ironchest:items/obsidianUpgrade"
},
"display": {
"thirdperson": {
"rotation": [ -90, 0, 0 ],
"translation": [ 0, 1, -3 ],
"scale": [ 0.55, 0.55, 0.55 ]
},
"firstperson": {
"rotation": [ 0, -135, 25 ],
"translation": [ 0, 4, 2 ],
"scale": [ 1.7, 1.7, 1.7 ]
}
}
}

18
src/main/resources/assets/ironchest/models/item/goldDiamondUpgrade.json
View File

@ -1,18 +0,0 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "ironchest:items/goldDiamondUpgrade"
},
"display": {
"thirdperson": {
"rotation": [ -90, 0, 0 ],
"translation": [ 0, 1, -3 ],
"scale": [ 0.55, 0.55, 0.55 ]
},
"firstperson": {
"rotation": [ 0, -135, 25 ],
"translation": [ 0, 4, 2 ],
"scale": [ 1.7, 1.7, 1.7 ]
}
}
}

19
src/main/resources/assets/ironchest/models/item/goldUpgradeDiamond.json Normal file
View File

@ -0,0 +1,19 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "ironchest:items/goldChest",
"layer1": "ironchest:items/diamondUpgrade"
},
"display": {
"thirdperson": {
"rotation": [ -90, 0, 0 ],
"translation": [ 0, 1, -3 ],
"scale": [ 0.55, 0.55, 0.55 ]
},
"firstperson": {
"rotation": [ 0, -135, 25 ],
"translation": [ 0, 4, 2 ],
"scale": [ 1.7, 1.7, 1.7 ]
}
}
}

19
src/main/resources/assets/ironchest/models/item/goldUpgradeObsidian.json Normal file
View File

@ -0,0 +1,19 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "ironchest:items/goldChest",
"layer1": "ironchest:items/obsidianUpgrade"
},
"display": {
"thirdperson": {
"rotation": [ -90, 0, 0 ],
"translation": [ 0, 1, -3 ],
"scale": [ 0.55, 0.55, 0.55 ]
},
"firstperson": {
"rotation": [ 0, -135, 25 ],
"translation": [ 0, 4, 2 ],
"scale": [ 1.7, 1.7, 1.7 ]
}
}
}

18
src/main/resources/assets/ironchest/models/item/ironGoldUpgrade.json
View File

@ -1,18 +0,0 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "ironchest:items/ironGoldUpgrade"
},
"display": {
"thirdperson": {
"rotation": [ -90, 0, 0 ],
"translation": [ 0, 1, -3 ],
"scale": [ 0.55, 0.55, 0.55 ]
},
"firstperson": {
"rotation": [ 0, -135, 25 ],
"translation": [ 0, 4, 2 ],
"scale": [ 1.7, 1.7, 1.7 ]
}
}
}

19
src/main/resources/assets/ironchest/models/item/ironUpgradeDiamond.json Normal file
View File

@ -0,0 +1,19 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "ironchest:items/ironChest",
"layer1": "ironchest:items/diamondUpgrade"
},
"display": {
"thirdperson": {
"rotation": [ -90, 0, 0 ],
"translation": [ 0, 1, -3 ],
"scale": [ 0.55, 0.55, 0.55 ]
},
"firstperson": {
"rotation": [ 0, -135, 25 ],
"translation": [ 0, 4, 2 ],
"scale": [ 1.7, 1.7, 1.7 ]
}
}
}

3
src/main/resources/assets/ironchest/models/item/copperIronUpgrade.json → src/main/resources/assets/ironchest/models/item/ironUpgradeGold.json
View File

@ -1,7 +1,8 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "ironchest:items/copperIronUpgrade"
"layer0": "ironchest:items/ironChest",
"layer1": "ironchest:items/goldUpgrade"
},
"display": {
"thirdperson": {

19
src/main/resources/assets/ironchest/models/item/ironUpgradeObsidian.json Normal file
View File

@ -0,0 +1,19 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "ironchest:items/ironChest",
"layer1": "ironchest:items/obsidianUpgrade"
},
"display": {
"thirdperson": {
"rotation": [ -90, 0, 0 ],
"translation": [ 0, 1, -3 ],
"scale": [ 0.55, 0.55, 0.55 ]
},
"firstperson": {
"rotation": [ 0, -135, 25 ],
"translation": [ 0, 4, 2 ],
"scale": [ 1.7, 1.7, 1.7 ]
}
}
}

18
src/main/resources/assets/ironchest/models/item/silverGoldUpgrade.json
View File

@ -1,18 +0,0 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "ironchest:items/silverGoldUpgrade"
},
"display": {
"thirdperson": {
"rotation": [ -90, 0, 0 ],
"translation": [ 0, 1, -3 ],
"scale": [ 0.55, 0.55, 0.55 ]
},
"firstperson": {
"rotation": [ 0, -135, 25 ],
"translation": [ 0, 4, 2 ],
"scale": [ 1.7, 1.7, 1.7 ]
}
}
}

19
src/main/resources/assets/ironchest/models/item/silverUpgradeDiamond.json Normal file
View File

@ -0,0 +1,19 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "ironchest:items/silverChest",
"layer1": "ironchest:items/diamondUpgrade"
},
"display": {
"thirdperson": {
"rotation": [ -90, 0, 0 ],
"translation": [ 0, 1, -3 ],
"scale": [ 0.55, 0.55, 0.55 ]
},
"firstperson": {
"rotation": [ 0, -135, 25 ],
"translation": [ 0, 4, 2 ],
"scale": [ 1.7, 1.7, 1.7 ]
}
}
}

19
src/main/resources/assets/ironchest/models/item/silverUpgradeGold.json Normal file
View File

@ -0,0 +1,19 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "ironchest:items/silverChest",
"layer1": "ironchest:items/goldUpgrade"
},
"display": {
"thirdperson": {
"rotation": [ -90, 0, 0 ],
"translation": [ 0, 1, -3 ],
"scale": [ 0.55, 0.55, 0.55 ]
},
"firstperson": {
"rotation": [ 0, -135, 25 ],
"translation": [ 0, 4, 2 ],
"scale": [ 1.7, 1.7, 1.7 ]
}
}
}

19
src/main/resources/assets/ironchest/models/item/silverUpgradeObsidian.json Normal file
View File

@ -0,0 +1,19 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "ironchest:items/silverChest",
"layer1": "ironchest:items/obsidianUpgrade"
},
"display": {
"thirdperson": {
"rotation": [ -90, 0, 0 ],
"translation": [ 0, 1, -3 ],
"scale": [ 0.55, 0.55, 0.55 ]
},
"firstperson": {
"rotation": [ 0, -135, 25 ],
"translation": [ 0, 4, 2 ],
"scale": [ 1.7, 1.7, 1.7 ]
}
}
}

18
src/main/resources/assets/ironchest/models/item/woodCopperUpgrade.json
View File

@ -1,18 +0,0 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "ironchest:items/woodCopperUpgrade"
},
"display": {
"thirdperson": {
"rotation": [ -90, 0, 0 ],
"translation": [ 0, 1, -3 ],
"scale": [ 0.55, 0.55, 0.55 ]
},
"firstperson": {
"rotation": [ 0, -135, 25 ],
"translation": [ 0, 4, 2 ],
"scale": [ 1.7, 1.7, 1.7 ]
}
}
}

18
src/main/resources/assets/ironchest/models/item/woodIronUpgrade.json
View File

@ -1,18 +0,0 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "ironchest:items/woodIronUpgrade"
},
"display": {
"thirdperson": {
"rotation": [ -90, 0, 0 ],
"translation": [ 0, 1, -3 ],
"scale": [ 0.55, 0.55, 0.55 ]
},
"firstperson": {
"rotation": [ 0, -135, 25 ],
"translation": [ 0, 4, 2 ],
"scale": [ 1.7, 1.7, 1.7 ]
}
}
}

19
src/main/resources/assets/ironchest/models/item/woodUpgradeDiamond.json Normal file
View File

@ -0,0 +1,19 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "ironchest:items/woodChest",
"layer1": "ironchest:items/diamondUpgrade"
},
"display": {
"thirdperson": {
"rotation": [ -90, 0, 0 ],
"translation": [ 0, 1, -3 ],
"scale": [ 0.55, 0.55, 0.55 ]
},
"firstperson": {
"rotation": [ 0, -135, 25 ],
"translation": [ 0, 4, 2 ],
"scale": [ 1.7, 1.7, 1.7 ]
}
}
}

3
src/main/resources/assets/ironchest/models/item/copperSilverUpgrade.json → src/main/resources/assets/ironchest/models/item/woodUpgradeGold.json Executable file → Normal file
View File

@ -1,7 +1,8 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "ironchest:items/copperSilverUpgrade"
"layer0": "ironchest:items/woodChest",
"layer1": "ironchest:items/goldUpgrade"
},
"display": {
"thirdperson": {

3
src/main/resources/assets/ironchest/models/item/diamondCrystalUpgrade.json → src/main/resources/assets/ironchest/models/item/woodUpgradeIron.json
View File

@ -1,7 +1,8 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "ironchest:items/diamondCrystalUpgrade"
"layer0": "ironchest:items/woodChest",
"layer1": "ironchest:items/ironUpgrade"
},
"display": {
"thirdperson": {

19
src/main/resources/assets/ironchest/models/item/woodUpgradeObsidian.json Normal file
View File

@ -0,0 +1,19 @@
{
"parent": "builtin/generated",
"textures": {
"layer0": "ironchest:items/woodChest",
"layer1": "ironchest:items/obsidianUpgrade"
},
"display": {
"thirdperson": {
"rotation": [ -90, 0, 0 ],
"translation": [ 0, 1, -3 ],
"scale": [ 0.55, 0.55, 0.55 ]
},
"firstperson": {
"rotation": [ 0, -135, 25 ],
"translation": [ 0, 4, 2 ],
"scale": [ 1.7, 1.7, 1.7 ]
}
}
}

BIN
src/main/resources/assets/ironchest/textures/items/copperChest.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 511 B

BIN
src/main/resources/assets/ironchest/textures/items/copperIronUpgrade.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 480 B

BIN
src/main/resources/assets/ironchest/textures/items/copperSilverUpgrade.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 480 B

BIN
src/main/resources/assets/ironchest/textures/items/crystalUpgrade.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 280 B

BIN
src/main/resources/assets/ironchest/textures/items/diamondChest.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 503 B

BIN
src/main/resources/assets/ironchest/textures/items/diamondCrystalUpgrade.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 418 B

BIN
src/main/resources/assets/ironchest/textures/items/diamondObsidianUpgrade.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 466 B

BIN
src/main/resources/assets/ironchest/textures/items/diamondUpgrade.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 351 B

BIN
src/main/resources/assets/ironchest/textures/items/goldChest.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 511 B

BIN
src/main/resources/assets/ironchest/textures/items/goldDiamondUpgrade.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 480 B

BIN
src/main/resources/assets/ironchest/textures/items/goldUpgrade.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 375 B

BIN
src/main/resources/assets/ironchest/textures/items/ironChest.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 499 B

BIN
src/main/resources/assets/ironchest/textures/items/ironGoldUpgrade.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 526 B

BIN
src/main/resources/assets/ironchest/textures/items/ironUpgrade.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 335 B

BIN
src/main/resources/assets/ironchest/textures/items/obsidianUpgrade.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 319 B

BIN
src/main/resources/assets/ironchest/textures/items/silverChest.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 447 B

BIN
src/main/resources/assets/ironchest/textures/items/silverGoldUpgrade.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 526 B

BIN
src/main/resources/assets/ironchest/textures/items/woodChest.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 553 B

BIN
src/main/resources/assets/ironchest/textures/items/woodCopperUpgrade.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 542 B

BIN
src/main/resources/assets/ironchest/textures/items/woodIronUpgrade.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 540 B