diff --git a/IronChests2/.project b/IronChests2/.project index 1600a76..6790f97 100644 --- a/IronChests2/.project +++ b/IronChests2/.project @@ -15,6 +15,11 @@ org.eclipse.jdt.core.javanature + + common/assets + 2 + PROJECT_LOC/resources/assets + common/mcmod.info 1 diff --git a/IronChests2/common/cpw/mods/ironchest/BlockIronChest.java b/IronChests2/common/cpw/mods/ironchest/BlockIronChest.java index a236905..24f49fb 100644 --- a/IronChests2/common/cpw/mods/ironchest/BlockIronChest.java +++ b/IronChests2/common/cpw/mods/ironchest/BlockIronChest.java @@ -23,6 +23,7 @@ import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; @@ -152,7 +153,7 @@ public class BlockIronChest extends BlockContainer { } @Override - public void onBlockPlacedBy(World world, int i, int j, int k, EntityLiving entityliving, ItemStack itemStack) + public void onBlockPlacedBy(World world, int i, int j, int k, EntityLivingBase entityliving, ItemStack itemStack) { byte chestFacing = 0; int facing = MathHelper.floor_double((double) ((entityliving.rotationYaw * 4F) / 360F) + 0.5D) & 3; diff --git a/IronChests2/common/cpw/mods/ironchest/IronChest.java b/IronChests2/common/cpw/mods/ironchest/IronChest.java index 44e899d..43efe8f 100644 --- a/IronChests2/common/cpw/mods/ironchest/IronChest.java +++ b/IronChests2/common/cpw/mods/ironchest/IronChest.java @@ -18,6 +18,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.ForgeSubscribe; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Init; import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.Mod.PostInit; @@ -43,7 +44,7 @@ public class IronChest { public static boolean OCELOTS_SITONCHESTS = true; private int blockId; - @PreInit + @EventHandler public void preInit(FMLPreInitializationEvent event) { Version.init(event.getVersionProperties()); @@ -63,15 +64,16 @@ public class IronChest { } finally { - cfg.save(); + if (cfg.hasChanged()) + cfg.save(); } - } - - @Init - public void load(FMLInitializationEvent evt) - { ironChestBlock = new BlockIronChest(blockId); GameRegistry.registerBlock(ironChestBlock, ItemIronChest.class, "BlockIronChest"); + } + + @EventHandler + public void load(FMLInitializationEvent evt) + { for (IronChestType typ : IronChestType.values()) { GameRegistry.registerTileEntityWithAlternatives(typ.clazz, "IronChest."+typ.name(), typ.name()); @@ -93,7 +95,7 @@ public class IronChest { MinecraftForge.EVENT_BUS.register(this); } - @PostInit + @EventHandler public void modsLoaded(FMLPostInitializationEvent evt) { } diff --git a/IronChests2/common/cpw/mods/ironchest/IronChestType.java b/IronChests2/common/cpw/mods/ironchest/IronChestType.java index 2f6ca43..2802405 100644 --- a/IronChests2/common/cpw/mods/ironchest/IronChestType.java +++ b/IronChests2/common/cpw/mods/ironchest/IronChestType.java @@ -51,7 +51,7 @@ public enum IronChestType { this.rowLength = rowLength; this.tieredChest = tieredChest; this.friendlyName = friendlyName; - this.modelTexture = "/mods/ironchest/textures/model/" + modelTexture; + this.modelTexture = modelTexture; this.textureRow = textureRow; this.clazz = clazz; this.recipes = recipes; diff --git a/IronChests2/common/cpw/mods/ironchest/client/ClientProxy.java b/IronChests2/common/cpw/mods/ironchest/client/ClientProxy.java index a53360d..f33d182 100644 --- a/IronChests2/common/cpw/mods/ironchest/client/ClientProxy.java +++ b/IronChests2/common/cpw/mods/ironchest/client/ClientProxy.java @@ -10,7 +10,10 @@ ******************************************************************************/ package cpw.mods.ironchest.client; +import java.util.Map; + import net.minecraft.client.renderer.ChestItemRenderHelper; +import net.minecraft.client.resources.ResourceLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/IronChests2/common/cpw/mods/ironchest/client/GUIChest.java b/IronChests2/common/cpw/mods/ironchest/client/GUIChest.java index 9e2892e..7989d2e 100644 --- a/IronChests2/common/cpw/mods/ironchest/client/GUIChest.java +++ b/IronChests2/common/cpw/mods/ironchest/client/GUIChest.java @@ -11,6 +11,7 @@ package cpw.mods.ironchest.client; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.resources.ResourceLocation; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; @@ -21,26 +22,38 @@ import cpw.mods.ironchest.IronChestType; import cpw.mods.ironchest.TileEntityIronChest; public class GUIChest extends GuiContainer { + public enum ResourceList { + IRON(new ResourceLocation("ironchest", "textures/gui/ironcontainer.png")), + COPPER(new ResourceLocation("ironchest", "textures/gui/coppercontainer.png")), + SILVER(new ResourceLocation("ironchest", "textures/gui/silvercontainer.png")), + GOLD(new ResourceLocation("ironchest", "textures/gui/goldcontainer.png")), + DIAMOND(new ResourceLocation("ironchest", "textures/gui/diamondcontainer.png")); + public final ResourceLocation location; + private ResourceList(ResourceLocation loc) { + this.location = loc; + } + } public enum GUI { - 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); + IRON(184, 202, ResourceList.IRON, IronChestType.IRON), + GOLD(184, 256, ResourceList.GOLD, IronChestType.GOLD), + DIAMOND(238, 256, ResourceList.DIAMOND, IronChestType.DIAMOND), + COPPER(184, 184, ResourceList.COPPER, IronChestType.COPPER), + SILVER(184, 238, ResourceList.SILVER, IronChestType.SILVER), + CRYSTAL(238, 256, ResourceList.DIAMOND, IronChestType.CRYSTAL), + OBSIDIAN(238, 256, ResourceList.DIAMOND, IronChestType.OBSIDIAN); private int xSize; private int ySize; - private String guiTexture; + private ResourceList guiResourceList; private IronChestType mainType; - private GUI(int xSize, int ySize, String guiTexture, IronChestType mainType) + private GUI(int xSize, int ySize, ResourceList guiResourceList, IronChestType mainType) { this.xSize = xSize; this.ySize = ySize; - this.guiTexture = guiTexture; + this.guiResourceList = guiResourceList; this.mainType = mainType; + } protected Container makeContainer(IInventory player, IInventory chest) @@ -75,7 +88,7 @@ public class GUIChest extends GuiContainer { { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); // new "bind tex" - mc.renderEngine.bindTexture(type.guiTexture); + this.mc.func_110434_K().func_110577_a(type.guiResourceList.location); int x = (width - xSize) / 2; int y = (height - ySize) / 2; drawTexturedModalRect(x, y, 0, 0, xSize, ySize); diff --git a/IronChests2/common/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java b/IronChests2/common/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java index 32ec053..d2c9b5a 100644 --- a/IronChests2/common/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java +++ b/IronChests2/common/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java @@ -36,6 +36,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.resources.ResourceLocation; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -46,6 +47,8 @@ import net.minecraftforge.client.MinecraftForgeClient; import org.lwjgl.opengl.GL11; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap.Builder; import com.google.common.primitives.SignedBytes; import cpw.mods.fml.client.FMLClientHandler; @@ -57,6 +60,14 @@ import cpw.mods.ironchest.TileEntityIronChest; public class TileEntityIronChestRenderer extends TileEntitySpecialRenderer { private static Map renderList = new HashMap(); + private static Map locations; + static { + Builder builder = ImmutableMap.builder(); + for (IronChestType typ : IronChestType.values()) { + builder.put(typ, new ResourceLocation("ironchest","textures/model/"+typ.getModelTexture())); + } + locations = builder.build(); + } private Random random; private RenderBlocks renderBlocks; @@ -104,7 +115,7 @@ public class TileEntityIronChestRenderer extends TileEntitySpecialRenderer { int typ = tile.getWorldObj().getBlockMetadata(tile.xCoord, tile.yCoord, tile.zCoord); type = IronChestType.values()[typ]; } - bindTextureByName(type.getModelTexture()); + func_110628_a(locations.get(type)); glPushMatrix(); glEnable(32826 /* GL_RESCALE_NORMAL_EXT */); glColor4f(1.0F, 1.0F, 1.0F, 1.0F); diff --git a/IronChests2/resources/mods/ironchest/textures/blocks/copper_front.png b/IronChests2/resources/assets/ironchest/textures/blocks/copper_front.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/blocks/copper_front.png rename to IronChests2/resources/assets/ironchest/textures/blocks/copper_front.png diff --git a/IronChests2/resources/mods/ironchest/textures/blocks/copper_side.png b/IronChests2/resources/assets/ironchest/textures/blocks/copper_side.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/blocks/copper_side.png rename to IronChests2/resources/assets/ironchest/textures/blocks/copper_side.png diff --git a/IronChests2/resources/mods/ironchest/textures/blocks/copper_top.png b/IronChests2/resources/assets/ironchest/textures/blocks/copper_top.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/blocks/copper_top.png rename to IronChests2/resources/assets/ironchest/textures/blocks/copper_top.png diff --git a/IronChests2/resources/mods/ironchest/textures/blocks/crystal_front.png b/IronChests2/resources/assets/ironchest/textures/blocks/crystal_front.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/blocks/crystal_front.png rename to IronChests2/resources/assets/ironchest/textures/blocks/crystal_front.png diff --git a/IronChests2/resources/mods/ironchest/textures/blocks/crystal_side.png b/IronChests2/resources/assets/ironchest/textures/blocks/crystal_side.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/blocks/crystal_side.png rename to IronChests2/resources/assets/ironchest/textures/blocks/crystal_side.png diff --git a/IronChests2/resources/mods/ironchest/textures/blocks/crystal_top.png b/IronChests2/resources/assets/ironchest/textures/blocks/crystal_top.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/blocks/crystal_top.png rename to IronChests2/resources/assets/ironchest/textures/blocks/crystal_top.png diff --git a/IronChests2/resources/mods/ironchest/textures/blocks/diamond_front.png b/IronChests2/resources/assets/ironchest/textures/blocks/diamond_front.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/blocks/diamond_front.png rename to IronChests2/resources/assets/ironchest/textures/blocks/diamond_front.png diff --git a/IronChests2/resources/mods/ironchest/textures/blocks/diamond_side.png b/IronChests2/resources/assets/ironchest/textures/blocks/diamond_side.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/blocks/diamond_side.png rename to IronChests2/resources/assets/ironchest/textures/blocks/diamond_side.png diff --git a/IronChests2/resources/mods/ironchest/textures/blocks/diamond_top.png b/IronChests2/resources/assets/ironchest/textures/blocks/diamond_top.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/blocks/diamond_top.png rename to IronChests2/resources/assets/ironchest/textures/blocks/diamond_top.png diff --git a/IronChests2/resources/mods/ironchest/textures/blocks/gold_front.png b/IronChests2/resources/assets/ironchest/textures/blocks/gold_front.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/blocks/gold_front.png rename to IronChests2/resources/assets/ironchest/textures/blocks/gold_front.png diff --git a/IronChests2/resources/mods/ironchest/textures/blocks/gold_side.png b/IronChests2/resources/assets/ironchest/textures/blocks/gold_side.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/blocks/gold_side.png rename to IronChests2/resources/assets/ironchest/textures/blocks/gold_side.png diff --git a/IronChests2/resources/mods/ironchest/textures/blocks/gold_top.png b/IronChests2/resources/assets/ironchest/textures/blocks/gold_top.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/blocks/gold_top.png rename to IronChests2/resources/assets/ironchest/textures/blocks/gold_top.png diff --git a/IronChests2/resources/mods/ironchest/textures/blocks/iron_front.png b/IronChests2/resources/assets/ironchest/textures/blocks/iron_front.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/blocks/iron_front.png rename to IronChests2/resources/assets/ironchest/textures/blocks/iron_front.png diff --git a/IronChests2/resources/mods/ironchest/textures/blocks/iron_side.png b/IronChests2/resources/assets/ironchest/textures/blocks/iron_side.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/blocks/iron_side.png rename to IronChests2/resources/assets/ironchest/textures/blocks/iron_side.png diff --git a/IronChests2/resources/mods/ironchest/textures/blocks/iron_top.png b/IronChests2/resources/assets/ironchest/textures/blocks/iron_top.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/blocks/iron_top.png rename to IronChests2/resources/assets/ironchest/textures/blocks/iron_top.png diff --git a/IronChests2/resources/mods/ironchest/textures/blocks/obsidian_front.png b/IronChests2/resources/assets/ironchest/textures/blocks/obsidian_front.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/blocks/obsidian_front.png rename to IronChests2/resources/assets/ironchest/textures/blocks/obsidian_front.png diff --git a/IronChests2/resources/mods/ironchest/textures/blocks/obsidian_side.png b/IronChests2/resources/assets/ironchest/textures/blocks/obsidian_side.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/blocks/obsidian_side.png rename to IronChests2/resources/assets/ironchest/textures/blocks/obsidian_side.png diff --git a/IronChests2/resources/mods/ironchest/textures/blocks/obsidian_top.png b/IronChests2/resources/assets/ironchest/textures/blocks/obsidian_top.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/blocks/obsidian_top.png rename to IronChests2/resources/assets/ironchest/textures/blocks/obsidian_top.png diff --git a/IronChests2/resources/mods/ironchest/textures/blocks/silver_front.png b/IronChests2/resources/assets/ironchest/textures/blocks/silver_front.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/blocks/silver_front.png rename to IronChests2/resources/assets/ironchest/textures/blocks/silver_front.png diff --git a/IronChests2/resources/mods/ironchest/textures/blocks/silver_side.png b/IronChests2/resources/assets/ironchest/textures/blocks/silver_side.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/blocks/silver_side.png rename to IronChests2/resources/assets/ironchest/textures/blocks/silver_side.png diff --git a/IronChests2/resources/mods/ironchest/textures/blocks/silver_top.png b/IronChests2/resources/assets/ironchest/textures/blocks/silver_top.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/blocks/silver_top.png rename to IronChests2/resources/assets/ironchest/textures/blocks/silver_top.png diff --git a/IronChests2/resources/mods/ironchest/textures/gui/coppercontainer.png b/IronChests2/resources/assets/ironchest/textures/gui/coppercontainer.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/gui/coppercontainer.png rename to IronChests2/resources/assets/ironchest/textures/gui/coppercontainer.png diff --git a/IronChests2/resources/mods/ironchest/textures/gui/diamondcontainer.png b/IronChests2/resources/assets/ironchest/textures/gui/diamondcontainer.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/gui/diamondcontainer.png rename to IronChests2/resources/assets/ironchest/textures/gui/diamondcontainer.png diff --git a/IronChests2/resources/mods/ironchest/textures/gui/goldcontainer.png b/IronChests2/resources/assets/ironchest/textures/gui/goldcontainer.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/gui/goldcontainer.png rename to IronChests2/resources/assets/ironchest/textures/gui/goldcontainer.png diff --git a/IronChests2/resources/mods/ironchest/textures/gui/ironcontainer.png b/IronChests2/resources/assets/ironchest/textures/gui/ironcontainer.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/gui/ironcontainer.png rename to IronChests2/resources/assets/ironchest/textures/gui/ironcontainer.png diff --git a/IronChests2/resources/mods/ironchest/textures/gui/silvercontainer.png b/IronChests2/resources/assets/ironchest/textures/gui/silvercontainer.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/gui/silvercontainer.png rename to IronChests2/resources/assets/ironchest/textures/gui/silvercontainer.png diff --git a/IronChests2/resources/mods/ironchest/textures/items/copperIronUpgrade.png b/IronChests2/resources/assets/ironchest/textures/items/copperIronUpgrade.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/items/copperIronUpgrade.png rename to IronChests2/resources/assets/ironchest/textures/items/copperIronUpgrade.png diff --git a/IronChests2/resources/mods/ironchest/textures/items/copperSilverUpgrade.png b/IronChests2/resources/assets/ironchest/textures/items/copperSilverUpgrade.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/items/copperSilverUpgrade.png rename to IronChests2/resources/assets/ironchest/textures/items/copperSilverUpgrade.png diff --git a/IronChests2/resources/mods/ironchest/textures/items/diamondCrystalUpgrade.png b/IronChests2/resources/assets/ironchest/textures/items/diamondCrystalUpgrade.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/items/diamondCrystalUpgrade.png rename to IronChests2/resources/assets/ironchest/textures/items/diamondCrystalUpgrade.png diff --git a/IronChests2/resources/mods/ironchest/textures/items/diamondObsidianUpgrade.png b/IronChests2/resources/assets/ironchest/textures/items/diamondObsidianUpgrade.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/items/diamondObsidianUpgrade.png rename to IronChests2/resources/assets/ironchest/textures/items/diamondObsidianUpgrade.png diff --git a/IronChests2/resources/mods/ironchest/textures/items/goldDiamondUpgrade.png b/IronChests2/resources/assets/ironchest/textures/items/goldDiamondUpgrade.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/items/goldDiamondUpgrade.png rename to IronChests2/resources/assets/ironchest/textures/items/goldDiamondUpgrade.png diff --git a/IronChests2/resources/mods/ironchest/textures/items/ironGoldUpgrade.png b/IronChests2/resources/assets/ironchest/textures/items/ironGoldUpgrade.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/items/ironGoldUpgrade.png rename to IronChests2/resources/assets/ironchest/textures/items/ironGoldUpgrade.png diff --git a/IronChests2/resources/mods/ironchest/textures/items/silverGoldUpgrade.png b/IronChests2/resources/assets/ironchest/textures/items/silverGoldUpgrade.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/items/silverGoldUpgrade.png rename to IronChests2/resources/assets/ironchest/textures/items/silverGoldUpgrade.png diff --git a/IronChests2/resources/mods/ironchest/textures/items/woodCopperUpgrade.png b/IronChests2/resources/assets/ironchest/textures/items/woodCopperUpgrade.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/items/woodCopperUpgrade.png rename to IronChests2/resources/assets/ironchest/textures/items/woodCopperUpgrade.png diff --git a/IronChests2/resources/mods/ironchest/textures/items/woodIronUpgrade.png b/IronChests2/resources/assets/ironchest/textures/items/woodIronUpgrade.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/items/woodIronUpgrade.png rename to IronChests2/resources/assets/ironchest/textures/items/woodIronUpgrade.png diff --git a/IronChests2/resources/mods/ironchest/textures/model/copperchest.png b/IronChests2/resources/assets/ironchest/textures/model/copperchest.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/model/copperchest.png rename to IronChests2/resources/assets/ironchest/textures/model/copperchest.png diff --git a/IronChests2/resources/mods/ironchest/textures/model/crystalchest.png b/IronChests2/resources/assets/ironchest/textures/model/crystalchest.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/model/crystalchest.png rename to IronChests2/resources/assets/ironchest/textures/model/crystalchest.png diff --git a/IronChests2/resources/mods/ironchest/textures/model/diamondchest.png b/IronChests2/resources/assets/ironchest/textures/model/diamondchest.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/model/diamondchest.png rename to IronChests2/resources/assets/ironchest/textures/model/diamondchest.png diff --git a/IronChests2/resources/mods/ironchest/textures/model/goldchest.png b/IronChests2/resources/assets/ironchest/textures/model/goldchest.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/model/goldchest.png rename to IronChests2/resources/assets/ironchest/textures/model/goldchest.png diff --git a/IronChests2/resources/mods/ironchest/textures/model/ironchest.png b/IronChests2/resources/assets/ironchest/textures/model/ironchest.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/model/ironchest.png rename to IronChests2/resources/assets/ironchest/textures/model/ironchest.png diff --git a/IronChests2/resources/mods/ironchest/textures/model/obsidianchest.png b/IronChests2/resources/assets/ironchest/textures/model/obsidianchest.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/model/obsidianchest.png rename to IronChests2/resources/assets/ironchest/textures/model/obsidianchest.png diff --git a/IronChests2/resources/mods/ironchest/textures/model/silverchest.png b/IronChests2/resources/assets/ironchest/textures/model/silverchest.png similarity index 100% rename from IronChests2/resources/mods/ironchest/textures/model/silverchest.png rename to IronChests2/resources/assets/ironchest/textures/model/silverchest.png