summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOnyxDarkKnight <sor1n.iliutza16@gmail.com>2013-12-15 16:52:41 +0200
committerOnyxDarkKnight <sor1n.iliutza16@gmail.com>2013-12-15 16:52:41 +0200
commit06415dc21d71e8ac363dae5c56c5317971f7aede (patch)
tree7ddbe2cc709a5a39c3fe8b8a80d7ac77f336a220
parent9342967bd8a6a9451591325c7c5deb5416819adc (diff)
parent943f1a493b27c630e95730b385e6524643d98564 (diff)
Merge branch 'master' of https://github.com/sor1n/Modjam-Mod
As well as added the smelter and working on the molder
-rw-r--r--common/bspkrs/briefcasespeakers/block/BlockBriefcaseSpeakers.java27
-rw-r--r--common/bspkrs/briefcasespeakers/block/BlockSmelter.java68
-rw-r--r--common/bspkrs/briefcasespeakers/client/ClientProxy.java8
-rw-r--r--common/bspkrs/briefcasespeakers/client/gui/GuiRemote.java8
-rw-r--r--common/bspkrs/briefcasespeakers/client/render/TileEntityRenderBriefcaseSpeakers.java14
-rw-r--r--common/bspkrs/briefcasespeakers/config/ConfigHandler.java49
-rw-r--r--common/bspkrs/briefcasespeakers/item/ItemList.java29
-rw-r--r--common/bspkrs/briefcasespeakers/item/ItemRemote.java9
-rw-r--r--common/bspkrs/briefcasespeakers/lib/Reference.java9
-rw-r--r--common/bspkrs/briefcasespeakers/tileentity/TileEntityBriefcaseSpeakers.java8
-rw-r--r--common/darkknight/jewelrycraft/CommonProxy.java (renamed from common/bspkrs/briefcasespeakers/CommonProxy.java)2
-rw-r--r--common/darkknight/jewelrycraft/JewelrycraftMod.java (renamed from common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java)82
-rw-r--r--common/darkknight/jewelrycraft/block/BlockBase.java (renamed from common/bspkrs/briefcasespeakers/block/BlockBase.java)2
-rw-r--r--common/darkknight/jewelrycraft/block/BlockList.java (renamed from common/bspkrs/briefcasespeakers/block/BlockList.java)19
-rw-r--r--common/darkknight/jewelrycraft/block/BlockMolder.java (renamed from common/bspkrs/briefcasespeakers/block/BlockMolder.java)4
-rw-r--r--common/darkknight/jewelrycraft/block/BlockSmelter.java94
-rw-r--r--common/darkknight/jewelrycraft/client/ClientProxy.java8
-rw-r--r--common/darkknight/jewelrycraft/client/JewelryCraftClient.java (renamed from common/bspkrs/briefcasespeakers/server/BriefcaseSpeakersServer.java)4
-rw-r--r--common/darkknight/jewelrycraft/config/ConfigHandler.java39
-rw-r--r--common/darkknight/jewelrycraft/item/ItemBase.java (renamed from common/bspkrs/briefcasespeakers/item/ItemBase.java)2
-rw-r--r--common/darkknight/jewelrycraft/item/ItemList.java24
-rw-r--r--common/darkknight/jewelrycraft/item/ItemThiefGloves.java (renamed from common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java)2
-rw-r--r--common/darkknight/jewelrycraft/lib/Reference.java9
-rw-r--r--common/darkknight/jewelrycraft/model/ModelMolder.java83
-rw-r--r--common/darkknight/jewelrycraft/model/ModelSmelter.java276
-rw-r--r--common/darkknight/jewelrycraft/recipes/CraftingRecipes.java (renamed from common/bspkrs/briefcasespeakers/recipes/CraftingRecipes.java)6
-rw-r--r--common/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java88
-rw-r--r--common/darkknight/jewelrycraft/server/JewelryCraftServer.java (renamed from common/bspkrs/briefcasespeakers/client/BriefcaseSpeakersClient.java)4
-rw-r--r--common/darkknight/jewelrycraft/tileentity/TileEntityMolder.java (renamed from common/bspkrs/briefcasespeakers/tileentity/TileEntityMolder.java)2
-rw-r--r--common/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java (renamed from common/bspkrs/briefcasespeakers/tileentity/TileEntitySmelter.java)5
-rw-r--r--common/darkknight/jewelrycraft/worldGen/Generation.java (renamed from common/bspkrs/briefcasespeakers/worldGen/Generation.java)4
-rw-r--r--resources/BriefcaseSpeakers.pngbin492 -> 0 bytes
-rw-r--r--resources/assets/briefcasespeakers/lang/en_US.lang10
-rw-r--r--resources/assets/briefcasespeakers/textures/items/speakers.pngbin326 -> 0 bytes
-rw-r--r--resources/assets/jewelrycraft/Smelter.tcnbin0 -> 2089 bytes
-rw-r--r--resources/assets/jewelrycraft/lang/en_US.lang7
-rw-r--r--resources/assets/jewelrycraft/pack.mcmeta (renamed from resources/assets/briefcasespeakers/pack.mcmeta)2
-rw-r--r--resources/assets/jewelrycraft/textures/blocks/oreShadow.png (renamed from resources/assets/briefcasespeakers/textures/blocks/oreShadow.png)bin1882 -> 1882 bytes
-rw-r--r--resources/assets/jewelrycraft/textures/blocks/oreShadow.png.mcmeta (renamed from resources/assets/briefcasespeakers/textures/blocks/oreShadow.png.mcmeta)0
-rw-r--r--resources/assets/jewelrycraft/textures/blocks/smelter.pngbin0 -> 537 bytes
-rw-r--r--resources/assets/jewelrycraft/textures/items/ingotShadow.png (renamed from resources/assets/briefcasespeakers/textures/items/ingotShadow.png)bin552 -> 552 bytes
-rw-r--r--resources/assets/jewelrycraft/textures/items/ingotShadow.png.mcmeta (renamed from resources/assets/briefcasespeakers/textures/items/ingotShadow.png.mcmeta)0
-rw-r--r--resources/assets/jewelrycraft/textures/items/thiefGloves.png (renamed from resources/assets/briefcasespeakers/textures/items/thiefGloves.png)bin290 -> 290 bytes
-rw-r--r--resources/assets/jewelrycraft/textures/tileentities/Molder.pngbin0 -> 1020 bytes
-rw-r--r--resources/assets/jewelrycraft/textures/tileentities/Smelter.pngbin0 -> 886 bytes
-rw-r--r--resources/briefcase.pngbin219310 -> 0 bytes
-rw-r--r--resources/briefcasespeakers.tcnbin1456 -> 0 bytes
47 files changed, 704 insertions, 303 deletions
diff --git a/common/bspkrs/briefcasespeakers/block/BlockBriefcaseSpeakers.java b/common/bspkrs/briefcasespeakers/block/BlockBriefcaseSpeakers.java
deleted file mode 100644
index 36819ea..0000000
--- a/common/bspkrs/briefcasespeakers/block/BlockBriefcaseSpeakers.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package bspkrs.briefcasespeakers.block;
-
-import net.minecraft.block.BlockContainer;
-import net.minecraft.block.material.Material;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import bspkrs.briefcasespeakers.tileentity.TileEntityBriefcaseSpeakers;
-
-public class BlockBriefcaseSpeakers extends BlockContainer
-{
- protected BlockBriefcaseSpeakers(int par1, Material par2Material)
- {
- super(par1, par2Material);
- }
-
- @Override
- public TileEntity createNewTileEntity(World world)
- {
- return new TileEntityBriefcaseSpeakers();
- }
-
- @Override
- public boolean renderAsNormalBlock()
- {
- return false;
- }
-}
diff --git a/common/bspkrs/briefcasespeakers/block/BlockSmelter.java b/common/bspkrs/briefcasespeakers/block/BlockSmelter.java
deleted file mode 100644
index 745c5da..0000000
--- a/common/bspkrs/briefcasespeakers/block/BlockSmelter.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package bspkrs.briefcasespeakers.block;
-
-import bspkrs.briefcasespeakers.tileentity.TileEntitySmelter;
-import net.minecraft.block.BlockContainer;
-import net.minecraft.block.material.Material;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-
-public class BlockSmelter extends BlockContainer
-{
- protected BlockSmelter(int par1, Material par2Material)
- {
- super(par1, par2Material);
- }
-
- @Override
- public TileEntity createNewTileEntity(World world)
- {
- return new TileEntitySmelter();
- }
-
- @Override
- public boolean renderAsNormalBlock()
- {
- return false;
- }
-
- @Override
- public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9)
- {
- TileEntitySmelter te = (TileEntitySmelter)world.getBlockTileEntity(i, j, k);
- ItemStack item = entityPlayer.inventory.getCurrentItem();
- if(te != null && !world.isRemote)
- {
- if(!te.hasMetal && !te.hasMoltenMetal && item != null && item.getDisplayName().contains("Ingot"))
- {
- te.metalID = item.getItem().itemID;
- te.hasMetal = true;
- te.melting = 200000;
- --item.stackSize;
- }
- else if(te.hasMetal && !te.hasMoltenMetal && item != null && item.getDisplayName().contains("Ingot")) entityPlayer.addChatMessage("The Smelter already contains a " + new ItemStack(te.metalID, 1, 0).getDisplayName());
- else if(te.hasMoltenMetal && item != null && item.getDisplayName().contains("Ingot")) entityPlayer.addChatMessage("The Smelter contains molten " + new ItemStack(te.moltenMetalID, 1, 0).getDisplayName().toLowerCase().replace("ingot", ""));
- else if(item != null && !item.getDisplayName().contains("Ingot")) entityPlayer.addChatMessage("The item needs to be an ingot!");
-
- if(te.hasMetal && entityPlayer.isSneaking())
- {
- entityPlayer.dropPlayerItem(new ItemStack(te.metalID, 1, 0));
- te.hasMetal = false;
- }
- world.setBlockTileEntity(i, j, k, te);
- }
- return true;
- }
-
- public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l)
- {
- return false;
- }
-
- public boolean isOpaqueCube()
- {
- return false;
- }
-}
diff --git a/common/bspkrs/briefcasespeakers/client/ClientProxy.java b/common/bspkrs/briefcasespeakers/client/ClientProxy.java
deleted file mode 100644
index 190101d..0000000
--- a/common/bspkrs/briefcasespeakers/client/ClientProxy.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package bspkrs.briefcasespeakers.client;
-
-import bspkrs.briefcasespeakers.CommonProxy;
-
-public class ClientProxy extends CommonProxy
-{
-
-}
diff --git a/common/bspkrs/briefcasespeakers/client/gui/GuiRemote.java b/common/bspkrs/briefcasespeakers/client/gui/GuiRemote.java
deleted file mode 100644
index 79395c4..0000000
--- a/common/bspkrs/briefcasespeakers/client/gui/GuiRemote.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package bspkrs.briefcasespeakers.client.gui;
-
-import net.minecraft.client.gui.GuiScreen;
-
-public class GuiRemote extends GuiScreen
-{
-
-}
diff --git a/common/bspkrs/briefcasespeakers/client/render/TileEntityRenderBriefcaseSpeakers.java b/common/bspkrs/briefcasespeakers/client/render/TileEntityRenderBriefcaseSpeakers.java
deleted file mode 100644
index 5ec065d..0000000
--- a/common/bspkrs/briefcasespeakers/client/render/TileEntityRenderBriefcaseSpeakers.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package bspkrs.briefcasespeakers.client.render;
-
-import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.tileentity.TileEntity;
-
-public class TileEntityRenderBriefcaseSpeakers extends TileEntitySpecialRenderer
-{
- @Override
- public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f)
- {
- // TODO Auto-generated method stub
-
- }
-}
diff --git a/common/bspkrs/briefcasespeakers/config/ConfigHandler.java b/common/bspkrs/briefcasespeakers/config/ConfigHandler.java
deleted file mode 100644
index 5bc5515..0000000
--- a/common/bspkrs/briefcasespeakers/config/ConfigHandler.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package bspkrs.briefcasespeakers.config;
-
-import net.minecraftforge.common.Configuration;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-
-public class ConfigHandler
-{
- private static Configuration config;
- public static int idThiefGloves = 17493;
-
- public static int idSpeaker = 17495;
- public static int idRemote = 17496;
- public static int idShadowIngot = 17497;
-
- public static int idBriefcaseSpeakers = 1749;
- public static int idShadowOre = 1750;
- public static int idSmelter = 1751;
- public static int idMolder = 1752;
- public static int idJewelCraftingTable= 1753;
-
- private static boolean isInitialized = false;
-
- public static void preInit(FMLPreInitializationEvent e)
- {
- if (!isInitialized)
- {
- config = new Configuration(e.getSuggestedConfigurationFile());
-
- config.load();
-
- // Blocks
- idBriefcaseSpeakers = config.getBlock("id.BriefcaseSpeakers", idBriefcaseSpeakers).getInt();
-
- // Items
- idThiefGloves = config.getItem("id.ThiefGloves", idThiefGloves).getInt();
- idSpeaker = config.getItem("id.Speaker", idSpeaker).getInt();
- idRemote = config.getItem("id.Remote", idRemote).getInt();
- idShadowIngot = config.getItem("id.ShadowIngot", idShadowIngot).getInt();
- idShadowOre = config.getBlock("id.ShadowOre", idShadowOre).getInt();
- idSmelter = config.getBlock("id.Smelter", idSmelter).getInt();
- idMolder = config.getBlock("id.Molder", idMolder).getInt();
- idJewelCraftingTable = config.getBlock("id.JewelCraftingTable", idJewelCraftingTable).getInt();
-
- config.save();
-
- isInitialized = true;
- }
- }
-}
diff --git a/common/bspkrs/briefcasespeakers/item/ItemList.java b/common/bspkrs/briefcasespeakers/item/ItemList.java
deleted file mode 100644
index eb39976..0000000
--- a/common/bspkrs/briefcasespeakers/item/ItemList.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package bspkrs.briefcasespeakers.item;
-
-import net.minecraft.item.Item;
-import bspkrs.briefcasespeakers.BriefcaseSpeakersMod;
-import bspkrs.briefcasespeakers.config.ConfigHandler;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-
-public class ItemList
-{
- public static Item thiefGloves;
- public static Item briefcaseSpeakers;
- public static Item speaker;
- public static Item remote;
- public static Item shadowIngot;
-
- private static boolean isInitialized = false;
-
- public static void preInit(FMLPreInitializationEvent e)
- {
- if (!isInitialized)
- {
- thiefGloves = new ItemThiefGloves(ConfigHandler.idThiefGloves).setUnlocalizedName("briefcasespeakers.thiefGloves").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs);
- speaker = new ItemBase(ConfigHandler.idSpeaker).setUnlocalizedName("briefcasespeakers.speakers").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs);
- remote = new ItemRemote(ConfigHandler.idRemote).setUnlocalizedName("briefcasespeakers.remote").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs);
- shadowIngot = new ItemBase(ConfigHandler.idShadowIngot).setUnlocalizedName("briefcasespeakers.ingotShadow").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs);
-
- }
- }
-}
diff --git a/common/bspkrs/briefcasespeakers/item/ItemRemote.java b/common/bspkrs/briefcasespeakers/item/ItemRemote.java
deleted file mode 100644
index d9ba959..0000000
--- a/common/bspkrs/briefcasespeakers/item/ItemRemote.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package bspkrs.briefcasespeakers.item;
-
-public class ItemRemote extends ItemBase
-{
- public ItemRemote(int par1)
- {
- super(par1);
- }
-}
diff --git a/common/bspkrs/briefcasespeakers/lib/Reference.java b/common/bspkrs/briefcasespeakers/lib/Reference.java
deleted file mode 100644
index fe0a200..0000000
--- a/common/bspkrs/briefcasespeakers/lib/Reference.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package bspkrs.briefcasespeakers.lib;
-
-public class Reference
-{
- public static final String MODID = "BriefcaseSpeakers";
- public static final String MODNAME = "BriefcaseSpeakers";
- public static final String VERSION = "1.0.0";
- public static final String PACKET_CHANNEL = "bspeakers";
-}
diff --git a/common/bspkrs/briefcasespeakers/tileentity/TileEntityBriefcaseSpeakers.java b/common/bspkrs/briefcasespeakers/tileentity/TileEntityBriefcaseSpeakers.java
deleted file mode 100644
index 8125ac1..0000000
--- a/common/bspkrs/briefcasespeakers/tileentity/TileEntityBriefcaseSpeakers.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package bspkrs.briefcasespeakers.tileentity;
-
-import net.minecraft.tileentity.TileEntity;
-
-public class TileEntityBriefcaseSpeakers extends TileEntity
-{
-
-}
diff --git a/common/bspkrs/briefcasespeakers/CommonProxy.java b/common/darkknight/jewelrycraft/CommonProxy.java
index c961322..28ca770 100644
--- a/common/bspkrs/briefcasespeakers/CommonProxy.java
+++ b/common/darkknight/jewelrycraft/CommonProxy.java
@@ -1,4 +1,4 @@
-package bspkrs.briefcasespeakers;
+package darkknight.jewelrycraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
diff --git a/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java b/common/darkknight/jewelrycraft/JewelrycraftMod.java
index e54e1e8..2a63509 100644
--- a/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java
+++ b/common/darkknight/jewelrycraft/JewelrycraftMod.java
@@ -1,4 +1,4 @@
-package bspkrs.briefcasespeakers;
+package darkknight.jewelrycraft;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
@@ -8,14 +8,6 @@ import net.minecraft.network.packet.NetHandler;
import net.minecraft.network.packet.Packet1Login;
import net.minecraft.server.MinecraftServer;
import net.minecraftforge.oredict.OreDictionary;
-import bspkrs.briefcasespeakers.block.BlockList;
-import bspkrs.briefcasespeakers.client.BriefcaseSpeakersClient;
-import bspkrs.briefcasespeakers.config.ConfigHandler;
-import bspkrs.briefcasespeakers.item.ItemList;
-import bspkrs.briefcasespeakers.lib.Reference;
-import bspkrs.briefcasespeakers.recipes.CraftingRecipes;
-import bspkrs.briefcasespeakers.server.BriefcaseSpeakersServer;
-import bspkrs.briefcasespeakers.worldGen.Generation;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.Mod.Instance;
@@ -30,25 +22,40 @@ import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.network.NetworkMod.SidedPacketHandler;
import cpw.mods.fml.common.network.Player;
import cpw.mods.fml.common.registry.GameRegistry;
+import darkknight.jewelrycraft.block.BlockList;
+import darkknight.jewelrycraft.client.JewelryCraftClient;
+import darkknight.jewelrycraft.config.ConfigHandler;
+import darkknight.jewelrycraft.item.ItemList;
+import darkknight.jewelrycraft.lib.Reference;
+import darkknight.jewelrycraft.recipes.CraftingRecipes;
+import darkknight.jewelrycraft.server.JewelryCraftServer;
+import darkknight.jewelrycraft.worldGen.Generation;
@Mod(modid = Reference.MODID, name = Reference.MODNAME, version = Reference.VERSION)
@NetworkMod(clientSideRequired = false, serverSideRequired = false,
- clientPacketHandlerSpec = @SidedPacketHandler(channels = { Reference.PACKET_CHANNEL }, packetHandler = BriefcaseSpeakersClient.class),
- serverPacketHandlerSpec = @SidedPacketHandler(channels = { Reference.PACKET_CHANNEL }, packetHandler = BriefcaseSpeakersServer.class),
- connectionHandler = BriefcaseSpeakersMod.class)
-public class BriefcaseSpeakersMod implements IConnectionHandler
+clientPacketHandlerSpec = @SidedPacketHandler(channels = { Reference.PACKET_CHANNEL }, packetHandler = JewelryCraftClient.class),
+serverPacketHandlerSpec = @SidedPacketHandler(channels = { Reference.PACKET_CHANNEL }, packetHandler = JewelryCraftServer.class),
+connectionHandler = JewelrycraftMod.class)
+public class JewelrycraftMod implements IConnectionHandler
{
@Instance(Reference.MODID)
- public static BriefcaseSpeakersMod instance;
-
+ public static JewelrycraftMod instance;
+
@Metadata(Reference.MODID)
- public static ModMetadata metadata;
-
- @SidedProxy(clientSide = "bspkrs.briefcasespeakers.client.ClientProxy", serverSide = "bspkrs.briefcasespeakers.CommonProxy")
- public static CommonProxy proxy;
-
- public static CreativeTabs shadowspkrs = new CreativeTabs("shadowspkrs") {public ItemStack getIconItemStack() {return new ItemStack(ItemList.shadowIngot, 1, 0);}};
-
+ public static ModMetadata metadata;
+
+ @SidedProxy(clientSide = "darkknight.jewelrycraft.client.ClientProxy", serverSide = "darkknight.jewelrycraft.CommonProxy")
+ public static CommonProxy proxy;
+
+ public static CreativeTabs jewelrycraft = new CreativeTabs("JewelryCraft")
+ {
+ @Override
+ public ItemStack getIconItemStack()
+ {
+ return new ItemStack(ItemList.shadowIngot, 1, 0);
+ }
+ };
+
@EventHandler
public void preInit(FMLPreInitializationEvent e)
{
@@ -57,59 +64,60 @@ public class BriefcaseSpeakersMod implements IConnectionHandler
BlockList.preInit(e);
CraftingRecipes.preInit(e);
}
-
+
@EventHandler
public void init(FMLInitializationEvent e)
- {
+ {
OreDictionary.registerOre("ingotShadow", new ItemStack(ItemList.shadowIngot));
+ OreDictionary.registerOre("oreShadow", new ItemStack(BlockList.shadowOre));
GameRegistry.registerWorldGenerator(new Generation());
}
-
+
@EventHandler
public void postInit(FMLPostInitializationEvent e)
{
-
+
}
-
+
@Override
// 2) Called when a player logs into the server SERVER SIDE
public void playerLoggedIn(Player player, NetHandler netHandler, INetworkManager manager)
{
-
+
}
-
+
@Override
// If you don't want the connection to continue, return a non-empty string here SERVER SIDE
public String connectionReceived(NetLoginHandler netHandler, INetworkManager manager)
{
return null;
}
-
+
@Override
// 1) Fired when a remote connection is opened CLIENT SIDE
public void connectionOpened(NetHandler netClientHandler, String server, int port, INetworkManager manager)
{
-
+
}
-
+
@Override
// 1) Fired when a local connection is opened CLIENT SIDE
public void connectionOpened(NetHandler netClientHandler, MinecraftServer server, INetworkManager manager)
{
-
+
}
-
+
@Override
// Fired when a connection closes ALL SIDES
public void connectionClosed(INetworkManager manager)
{
-
+
}
-
+
@Override
// 3) Fired when the client established the connection to the server CLIENT SIDE
public void clientLoggedIn(NetHandler clientHandler, INetworkManager manager, Packet1Login login)
{
-
+
}
}
diff --git a/common/bspkrs/briefcasespeakers/block/BlockBase.java b/common/darkknight/jewelrycraft/block/BlockBase.java
index a895483..0378fb5 100644
--- a/common/bspkrs/briefcasespeakers/block/BlockBase.java
+++ b/common/darkknight/jewelrycraft/block/BlockBase.java
@@ -1,4 +1,4 @@
-package bspkrs.briefcasespeakers.block;
+package darkknight.jewelrycraft.block;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
diff --git a/common/bspkrs/briefcasespeakers/block/BlockList.java b/common/darkknight/jewelrycraft/block/BlockList.java
index 282134f..e29287d 100644
--- a/common/bspkrs/briefcasespeakers/block/BlockList.java
+++ b/common/darkknight/jewelrycraft/block/BlockList.java
@@ -1,12 +1,14 @@
-package bspkrs.briefcasespeakers.block;
+package darkknight.jewelrycraft.block;
-import bspkrs.briefcasespeakers.BriefcaseSpeakersMod;
-import bspkrs.briefcasespeakers.config.ConfigHandler;
-import bspkrs.briefcasespeakers.tileentity.TileEntitySmelter;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
+import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.registry.GameRegistry;
+import darkknight.jewelrycraft.JewelrycraftMod;
+import darkknight.jewelrycraft.config.ConfigHandler;
+import darkknight.jewelrycraft.renders.TileEntitySmelterRender;
+import darkknight.jewelrycraft.tileentity.TileEntitySmelter;
public class BlockList
{
@@ -21,10 +23,10 @@ public class BlockList
{
if (!isInitialized)
{
- shadowOre = new BlockBase(ConfigHandler.idShadowOre, Material.rock).setHardness(3.0F).setResistance(5.0F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("briefcasespeakers.oreShadow").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs);
- smelter = new BlockSmelter(ConfigHandler.idSmelter, Material.iron).setHardness(5.0F).setResistance(6.0F).setStepSound(Block.soundMetalFootstep).setUnlocalizedName("briefcasespeakers.smelter").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs);
- molder = new BlockMolder(ConfigHandler.idMolder, Material.iron).setHardness(5.0F).setResistance(6.0F).setStepSound(Block.soundMetalFootstep).setUnlocalizedName("briefcasespeakers.molder").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs);
- jewelCraftingTable = new BlockBase(ConfigHandler.idJewelCraftingTable, Material.rock).setHardness(3.0F).setResistance(5.0F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("briefcasespeakers.jewelCraftingTable").setCreativeTab(BriefcaseSpeakersMod.shadowspkrs);
+ shadowOre = new BlockBase(ConfigHandler.idShadowOre, Material.rock).setHardness(3.0F).setResistance(5.0F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("jewelrycraft.oreShadow").setCreativeTab(JewelrycraftMod.jewelrycraft);
+ smelter = new BlockSmelter(ConfigHandler.idSmelter, Material.iron).setHardness(5.0F).setResistance(6.0F).setStepSound(Block.soundMetalFootstep).setUnlocalizedName("jewelrycraft.smelter").setCreativeTab(JewelrycraftMod.jewelrycraft);
+ molder = new BlockMolder(ConfigHandler.idMolder, Material.iron).setHardness(5.0F).setResistance(6.0F).setStepSound(Block.soundMetalFootstep).setUnlocalizedName("jewelrycraft.molder").setCreativeTab(JewelrycraftMod.jewelrycraft);
+ jewelCraftingTable = new BlockBase(ConfigHandler.idJewelCraftingTable, Material.rock).setHardness(3.0F).setResistance(5.0F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("jewelrycraft.jewelCraftingTable").setCreativeTab(JewelrycraftMod.jewelrycraft);
GameRegistry.registerBlock(shadowOre, "shadowOre");
GameRegistry.registerBlock(smelter, "Smelter");
@@ -32,6 +34,7 @@ public class BlockList
GameRegistry.registerBlock(jewelCraftingTable, "jewelCraftingTable");
GameRegistry.registerTileEntity(TileEntitySmelter.class, "30");
+ ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySmelter.class, new TileEntitySmelterRender());
}
}
}
diff --git a/common/bspkrs/briefcasespeakers/block/BlockMolder.java b/common/darkknight/jewelrycraft/block/BlockMolder.java
index a4e4337..05b7b0a 100644
--- a/common/bspkrs/briefcasespeakers/block/BlockMolder.java
+++ b/common/darkknight/jewelrycraft/block/BlockMolder.java
@@ -1,6 +1,6 @@
-package bspkrs.briefcasespeakers.block;
+package darkknight.jewelrycraft.block;
-import bspkrs.briefcasespeakers.tileentity.TileEntityMolder;
+import darkknight.jewelrycraft.tileentity.TileEntityMolder;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.tileentity.TileEntity;
diff --git a/common/darkknight/jewelrycraft/block/BlockSmelter.java b/common/darkknight/jewelrycraft/block/BlockSmelter.java
new file mode 100644
index 0000000..eb22b63
--- /dev/null
+++ b/common/darkknight/jewelrycraft/block/BlockSmelter.java
@@ -0,0 +1,94 @@
+package darkknight.jewelrycraft.block;
+
+import darkknight.jewelrycraft.tileentity.TileEntitySmelter;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IconRegister;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockSmelter extends BlockContainer
+{
+ protected BlockSmelter(int par1, Material par2Material)
+ {
+ super(par1, par2Material);
+ }
+
+ @Override
+ public TileEntity createNewTileEntity(World world)
+ {
+ return new TileEntitySmelter();
+ }
+
+ @Override
+ public boolean renderAsNormalBlock()
+ {
+ return false;
+ }
+
+ @Override
+ public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9)
+ {
+ TileEntitySmelter te = (TileEntitySmelter) world.getBlockTileEntity(i, j, k);
+ ItemStack item = entityPlayer.inventory.getCurrentItem();
+ if (te != null && !world.isRemote)
+ {
+ if (!te.hasMetal && !te.hasMoltenMetal && item != null && item.getDisplayName().contains("Ingot"))
+ {
+ te.metalID = item.getItem().itemID;
+ te.metal = item;
+ te.hasMetal = true;
+ te.melting = 200000;
+ --item.stackSize;
+ }
+ else if (te.hasMetal && !te.hasMoltenMetal && item != null && item.getDisplayName().contains("Ingot"))
+ entityPlayer.addChatMessage("The Smelter already contains a " + new ItemStack(te.metalID, 1, 0).getDisplayName());
+ else if (te.hasMoltenMetal)
+ entityPlayer.addChatMessage("The Smelter contains molten " + new ItemStack(te.moltenMetalID, 1, 0).getDisplayName().toLowerCase().replace("ingot", ""));
+ else if (item != null && !item.getDisplayName().contains("Ingot"))
+ entityPlayer.addChatMessage("The item needs to be an ingot!");
+
+ if (te.hasMetal && entityPlayer.isSneaking())
+ {
+ entityPlayer.dropPlayerItem(new ItemStack(te.metalID, 1, 0));
+ te.hasMetal = false;
+ }
+ world.setBlockTileEntity(i, j, k, te);
+ }
+ return true;
+ }
+
+ public void onBlockPlacedBy(World world, int i, int j, int k, EntityLivingBase entityLiving, ItemStack par6ItemStack)
+ {
+ int rotation = MathHelper.floor_double((double)(entityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
+ world.setBlockMetadataWithNotify(i, j, k, rotation, 2);
+ System.out.println(world.getBlockMetadata(i, j, k));
+ }
+
+ public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l)
+ {
+ return false;
+ }
+
+ public boolean isOpaqueCube()
+ {
+ return false;
+ }
+
+ @Override
+ public int getRenderType()
+ {
+ return -1;
+ }
+
+ public void registerIcons(IconRegister icon)
+ {
+ this.blockIcon = icon.registerIcon("jewelrycraft:smelter");
+ }
+
+}
diff --git a/common/darkknight/jewelrycraft/client/ClientProxy.java b/common/darkknight/jewelrycraft/client/ClientProxy.java
new file mode 100644
index 0000000..e280402
--- /dev/null
+++ b/common/darkknight/jewelrycraft/client/ClientProxy.java
@@ -0,0 +1,8 @@
+package darkknight.jewelrycraft.client;
+
+import darkknight.jewelrycraft.CommonProxy;
+
+public class ClientProxy extends CommonProxy
+{
+
+}
diff --git a/common/bspkrs/briefcasespeakers/server/BriefcaseSpeakersServer.java b/common/darkknight/jewelrycraft/client/JewelryCraftClient.java
index d01feb0..734e9d5 100644
--- a/common/bspkrs/briefcasespeakers/server/BriefcaseSpeakersServer.java
+++ b/common/darkknight/jewelrycraft/client/JewelryCraftClient.java
@@ -1,11 +1,11 @@
-package bspkrs.briefcasespeakers.server;
+package darkknight.jewelrycraft.client;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import cpw.mods.fml.common.network.IPacketHandler;
import cpw.mods.fml.common.network.Player;
-public class BriefcaseSpeakersServer implements IPacketHandler
+public class JewelryCraftClient implements IPacketHandler
{
@Override
public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player)
diff --git a/common/darkknight/jewelrycraft/config/ConfigHandler.java b/common/darkknight/jewelrycraft/config/ConfigHandler.java
new file mode 100644
index 0000000..be671a3
--- /dev/null
+++ b/common/darkknight/jewelrycraft/config/ConfigHandler.java
@@ -0,0 +1,39 @@
+package darkknight.jewelrycraft.config;
+
+import net.minecraftforge.common.Configuration;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+
+public class ConfigHandler
+{
+ private static Configuration config;
+ public static int idThiefGloves = 17493;
+ public static int idShadowIngot = 17497;
+
+ public static int idShadowOre = 1750;
+ public static int idSmelter = 1751;
+ public static int idMolder = 1752;
+ public static int idJewelCraftingTable = 1753;
+
+ private static boolean isInitialized = false;
+
+ public static void preInit(FMLPreInitializationEvent e)
+ {
+ if (!isInitialized)
+ {
+ config = new Configuration(e.getSuggestedConfigurationFile());
+
+ config.load();
+
+ idThiefGloves = config.getItem("id.ThiefGloves", idThiefGloves).getInt();
+ idShadowIngot = config.getItem("id.ShadowIngot", idShadowIngot).getInt();
+ idShadowOre = config.getBlock("id.ShadowOre", idShadowOre).getInt();
+ idSmelter = config.getBlock("id.Smelter", idSmelter).getInt();
+ idMolder = config.getBlock("id.Molder", idMolder).getInt();
+ idJewelCraftingTable = config.getBlock("id.JewelCraftingTable", idJewelCraftingTable).getInt();
+
+ config.save();
+
+ isInitialized = true;
+ }
+ }
+}
diff --git a/common/bspkrs/briefcasespeakers/item/ItemBase.java b/common/darkknight/jewelrycraft/item/ItemBase.java
index 9a017b6..7f806bf 100644
--- a/common/bspkrs/briefcasespeakers/item/ItemBase.java
+++ b/common/darkknight/jewelrycraft/item/ItemBase.java
@@ -1,4 +1,4 @@
-package bspkrs.briefcasespeakers.item;
+package darkknight.jewelrycraft.item;
import net.minecraft.item.Item;
diff --git a/common/darkknight/jewelrycraft/item/ItemList.java b/common/darkknight/jewelrycraft/item/ItemList.java
new file mode 100644
index 0000000..7bf3705
--- /dev/null
+++ b/common/darkknight/jewelrycraft/item/ItemList.java
@@ -0,0 +1,24 @@
+package darkknight.jewelrycraft.item;
+
+import net.minecraft.item.Item;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import darkknight.jewelrycraft.JewelrycraftMod;
+import darkknight.jewelrycraft.config.ConfigHandler;
+
+public class ItemList
+{
+ public static Item thiefGloves;
+ public static Item shadowIngot;
+
+ private static boolean isInitialized = false;
+
+ public static void preInit(FMLPreInitializationEvent e)
+ {
+ if (!isInitialized)
+ {
+ thiefGloves = new ItemThiefGloves(ConfigHandler.idThiefGloves).setUnlocalizedName("jewelrycraft.thiefGloves").setCreativeTab(JewelrycraftMod.jewelrycraft);
+ shadowIngot = new ItemBase(ConfigHandler.idShadowIngot).setUnlocalizedName("jewelrycraft.ingotShadow").setCreativeTab(JewelrycraftMod.jewelrycraft);
+
+ }
+ }
+}
diff --git a/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java b/common/darkknight/jewelrycraft/item/ItemThiefGloves.java
index d80da55..97d83cd 100644
--- a/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java
+++ b/common/darkknight/jewelrycraft/item/ItemThiefGloves.java
@@ -1,4 +1,4 @@
-package bspkrs.briefcasespeakers.item;
+package darkknight.jewelrycraft.item;
import java.util.Iterator;
import java.util.Random;
diff --git a/common/darkknight/jewelrycraft/lib/Reference.java b/common/darkknight/jewelrycraft/lib/Reference.java
new file mode 100644
index 0000000..4514e5c
--- /dev/null
+++ b/common/darkknight/jewelrycraft/lib/Reference.java
@@ -0,0 +1,9 @@
+package darkknight.jewelrycraft.lib;
+
+public class Reference
+{
+ public static final String MODID = "Jewelrycraft";
+ public static final String MODNAME = "Jewelrycraft";
+ public static final String VERSION = "1.0.0";
+ public static final String PACKET_CHANNEL = "Jewelrycraft";
+}
diff --git a/common/darkknight/jewelrycraft/model/ModelMolder.java b/common/darkknight/jewelrycraft/model/ModelMolder.java
new file mode 100644
index 0000000..3c89e7d
--- /dev/null
+++ b/common/darkknight/jewelrycraft/model/ModelMolder.java
@@ -0,0 +1,83 @@
+// Date: 12/15/2013 4:51:25 PM
+// Template version 1.1
+// Java generated by Techne
+// Keep in mind that you still need to fill in some blanks
+// - ZeuX
+
+
+
+
+
+
+package net.minecraft.src;
+
+public class ModelMolder extends ModelBase
+{
+ //fields
+ ModelRenderer Base;
+ ModelRenderer Side;
+ ModelRenderer Side1;
+ ModelRenderer Side2;
+ ModelRenderer Side3;
+
+ public ModelMolder()
+ {
+ textureWidth = 64;
+ textureHeight = 32;
+
+ Base = new ModelRenderer(this, 0, 0);
+ Base.addBox(0F, 0F, 0F, 10, 1, 10);
+ Base.setRotationPoint(-5F, 23F, -5F);
+ Base.setTextureSize(64, 32);
+ Base.mirror = true;
+ setRotation(Base, 0F, 0F, 0F);
+ Side = new ModelRenderer(this, 0, 13);
+ Side.addBox(0F, 0F, 0F, 10, 2, 1);
+ Side.setRotationPoint(-5F, 21F, 5F);
+ Side.setTextureSize(64, 32);
+ Side.mirror = true;
+ setRotation(Side, 0F, 0F, 0F);
+ Side1 = new ModelRenderer(this, 0, 13);
+ Side1.addBox(0F, 0F, 0F, 10, 2, 1);
+ Side1.setRotationPoint(-5F, 21F, -6F);
+ Side1.setTextureSize(64, 32);
+ Side1.mirror = true;
+ setRotation(Side1, 0F, 0F, 0F);
+ Side2 = new ModelRenderer(this, 41, 0);
+ Side2.addBox(0F, 0F, 0F, 1, 2, 10);
+ Side2.setRotationPoint(-6F, 21F, -5F);
+ Side2.setTextureSize(64, 32);
+ Side2.mirror = true;
+ setRotation(Side2, 0F, 0F, 0F);
+ Side3 = new ModelRenderer(this, 41, 0);
+ Side3.addBox(0F, 0F, 0F, 1, 2, 10);
+ Side3.setRotationPoint(5F, 21F, -5F);
+ Side3.setTextureSize(64, 32);
+ Side3.mirror = true;
+ setRotation(Side3, 0F, 0F, 0F);
+ }
+
+ public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
+ {
+ super.render(entity, f, f1, f2, f3, f4, f5);
+ setRotationAngles(f, f1, f2, f3, f4, f5);
+ Base.render(f5);
+ Side.render(f5);
+ Side1.render(f5);
+ Side2.render(f5);
+ Side3.render(f5);
+ }
+
+ private void setRotation(ModelRenderer model, float x, float y, float z)
+ {
+ model.rotateAngleX = x;
+ model.rotateAngleY = y;
+ model.rotateAngleZ = z;
+ }
+
+ public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5)
+ {
+ super.setRotationAngles(f, f1, f2, f3, f4, f5);
+ }
+
+}
diff --git a/common/darkknight/jewelrycraft/model/ModelSmelter.java b/common/darkknight/jewelrycraft/model/ModelSmelter.java
new file mode 100644
index 0000000..2e71dac
--- /dev/null
+++ b/common/darkknight/jewelrycraft/model/ModelSmelter.java
@@ -0,0 +1,276 @@
+package darkknight.jewelrycraft.model;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
+public class ModelSmelter extends ModelBase
+{
+ //fields
+ ModelRenderer Support1;
+ ModelRenderer Support2;
+ ModelRenderer Hold1;
+ ModelRenderer Hold2;
+ ModelRenderer SmelterBase;
+ ModelRenderer SmelterSide1;
+ ModelRenderer SmelterSide2;
+ ModelRenderer SmelterSide3;
+ ModelRenderer SmelterSide4;
+ ModelRenderer SmelterSide5;
+ ModelRenderer SmelterSide6;
+ ModelRenderer SmelterSide7;
+ ModelRenderer SmelterSide8;
+ ModelRenderer SmelterSide9;
+ ModelRenderer SmelterSide10;
+ ModelRenderer SmelterSide11;
+ ModelRenderer SmelterSide12;
+ ModelRenderer HeatSourceSide1;
+ ModelRenderer HeatSourceSide2;
+ ModelRenderer HeatSourceSide3;
+ ModelRenderer HeatSourceSide4;
+ ModelRenderer HeatSourceSide5;
+ ModelRenderer HeatSourceBase;
+ ModelRenderer HeatSourceSide6;
+ ModelRenderer HeatSourceSide7;
+ ModelRenderer HeatSourceSide8;
+ ModelRenderer HeatSourceSide9;
+ ModelRenderer HeatSourceSide10;
+ ModelRenderer HeatSourceSide11;
+ ModelRenderer HeatSourceSide12;
+
+ public ModelSmelter()
+ {
+ textureWidth = 64;
+ textureHeight = 32;
+
+ Support1 = new ModelRenderer(this, 0, 0);
+ Support1.addBox(0F, 0F, 0F, 2, 15, 3);
+ Support1.setRotationPoint(6F, 9F, -1F);
+ Support1.setTextureSize(64, 32);
+ Support1.mirror = true;
+ setRotation(Support1, 0F, 0F, 0F);
+ Support2 = new ModelRenderer(this, 0, 0);
+ Support2.addBox(0F, 0F, 0F, 2, 15, 3);
+ Support2.setRotationPoint(-8F, 9F, -1F);
+ Support2.setTextureSize(64, 32);
+ Support2.mirror = true;
+ setRotation(Support2, 0F, 0F, 0F);
+ Hold1 = new ModelRenderer(this, 0, 0);
+ Hold1.addBox(0F, 0F, 0F, 2, 1, 1);
+ Hold1.setRotationPoint(4F, 11F, 0F);
+ Hold1.setTextureSize(64, 32);
+ Hold1.mirror = true;
+ setRotation(Hold1, 0F, 0F, 0F);
+ Hold2 = new ModelRenderer(this, 0, 0);
+ Hold2.addBox(0F, 0F, 0F, 2, 1, 1);
+ Hold2.setRotationPoint(-6F, 11F, 0F);
+ Hold2.setTextureSize(64, 32);
+ Hold2.mirror = true;
+ setRotation(Hold2, 0F, 0F, 0F);
+ SmelterBase = new ModelRenderer(this, 0, 0);
+ SmelterBase.addBox(0F, 0F, 0F, 4, 1, 5);
+ SmelterBase.setRotationPoint(-2F, 18F, -2F);
+ SmelterBase.setTextureSize(64, 32);
+ SmelterBase.mirror = true;
+ setRotation(SmelterBase, 0F, 0F, 0F);
+ SmelterSide1 = new ModelRenderer(this, 0, 0);
+ SmelterSide1.addBox(0F, 0F, 0F, 4, 2, 1);
+ SmelterSide1.setRotationPoint(-2F, 16F, -3F);
+ SmelterSide1.setTextureSize(64, 32);
+ SmelterSide1.mirror = true;
+ setRotation(SmelterSide1, 0F, 0F, 0F);
+ SmelterSide2 = new ModelRenderer(this, 0, 0);
+ SmelterSide2.addBox(0F, 0F, 0F, 4, 2, 1);
+ SmelterSide2.setRotationPoint(-2F, 16F, 3F);
+ SmelterSide2.setTextureSize(64, 32);
+ SmelterSide2.mirror = true;
+ setRotation(SmelterSide2, 0F, 0F, 0F);
+ SmelterSide3 = new ModelRenderer(this, 0, 0);
+ SmelterSide3.addBox(0F, 0F, 0F, 1, 2, 5);
+ SmelterSide3.setRotationPoint(2F, 16F, -2F);
+ SmelterSide3.setTextureSize(64, 32);
+ SmelterSide3.mirror = true;
+ setRotation(SmelterSide3, 0F, 0F, 0F);
+ SmelterSide4 = new ModelRenderer(this, 0, 0);
+ SmelterSide4.addBox(0F, 0F, 0F, 1, 2, 5);
+ SmelterSide4.setRotationPoint(-3F, 16F, -2F);
+ SmelterSide4.setTextureSize(64, 32);
+ SmelterSide4.mirror = true;
+ setRotation(SmelterSide4, 0F, 0F, 0F);
+ SmelterSide5 = new ModelRenderer(this, 0, 0);
+ SmelterSide5.addBox(0F, 0F, 0F, 1, 7, 5);
+ SmelterSide5.setRotationPoint(3F, 9F, -2F);
+ SmelterSide5.setTextureSize(64, 32);
+ SmelterSide5.mirror = true;
+ setRotation(SmelterSide5, 0F, 0F, 0F);
+ SmelterSide6 = new ModelRenderer(this, 0, 0);
+ SmelterSide6.addBox(0F, 0F, 0F, 1, 7, 5);
+ SmelterSide6.setRotationPoint(-4F, 9F, -2F);
+ SmelterSide6.setTextureSize(64, 32);
+ SmelterSide6.mirror = true;
+ setRotation(SmelterSide6, 0F, 0F, 0F);
+ SmelterSide7 = new ModelRenderer(this, 0, 0);
+ SmelterSide7.addBox(0F, 0F, 0F, 1, 7, 1);
+ SmelterSide7.setRotationPoint(2F, 9F, 3F);
+ SmelterSide7.setTextureSize(64, 32);
+ SmelterSide7.mirror = true;
+ setRotation(SmelterSide7, 0F, 0F, 0F);
+ SmelterSide8 = new ModelRenderer(this, 0, 0);
+ SmelterSide8.addBox(0F, 0F, 0F, 1, 7, 1);
+ SmelterSide8.setRotationPoint(-3F, 9F, 3F);
+ SmelterSide8.setTextureSize(64, 32);
+ SmelterSide8.mirror = true;
+ setRotation(SmelterSide8, 0F, 0F, 0F);
+ SmelterSide9 = new ModelRenderer(this, 0, 0);
+ SmelterSide9.addBox(0F, 0F, 0F, 4, 7, 1);
+ SmelterSide9.setRotationPoint(-2F, 9F, 4F);
+ SmelterSide9.setTextureSize(64, 32);
+ SmelterSide9.mirror = true;
+ setRotation(SmelterSide9, 0F, 0F, 0F);
+ SmelterSide10 = new ModelRenderer(this, 0, 0);
+ SmelterSide10.addBox(0F, 0F, 0F, 4, 7, 1);
+ SmelterSide10.setRotationPoint(-2F, 9F, -4F);
+ SmelterSide10.setTextureSize(64, 32);
+ SmelterSide10.mirror = true;
+ setRotation(SmelterSide10, 0F, 0F, 0F);
+ SmelterSide11 = new ModelRenderer(this, 0, 0);
+ SmelterSide11.addBox(0F, 0F, 0F, 1, 7, 1);
+ SmelterSide11.setRotationPoint(2F, 9F, -3F);
+ SmelterSide11.setTextureSize(64, 32);
+ SmelterSide11.mirror = true;
+ setRotation(SmelterSide11, 0F, 0F, 0F);
+ SmelterSide12 = new ModelRenderer(this, 0, 0);
+ SmelterSide12.addBox(0F, 0F, 0F, 1, 7, 1);
+ SmelterSide12.setRotationPoint(-3F, 9F, -3F);
+ SmelterSide12.setTextureSize(64, 32);
+ SmelterSide12.mirror = true;
+ setRotation(SmelterSide12, 0F, 0F, 0F);
+ HeatSourceSide1 = new ModelRenderer(this, 0, 0);
+ HeatSourceSide1.addBox(0F, 0F, 0F, 8, 2, 1);
+ HeatSourceSide1.setRotationPoint(-4F, 19F, 7F);
+ HeatSourceSide1.setTextureSize(64, 32);
+ HeatSourceSide1.mirror = true;
+ setRotation(HeatSourceSide1, 0F, 0F, 0F);
+ HeatSourceSide2 = new ModelRenderer(this, 0, 0);
+ HeatSourceSide2.addBox(0F, 0F, 0F, 1, 2, 12);
+ HeatSourceSide2.setRotationPoint(-6F, 19F, -6F);
+ HeatSourceSide2.setTextureSize(64, 32);
+ HeatSourceSide2.mirror = true;
+ setRotation(HeatSourceSide2, 0F, 0F, 0F);
+ HeatSourceSide3 = new ModelRenderer(this, 0, 0);
+ HeatSourceSide3.addBox(0F, 0F, 0F, 1, 2, 12);
+ HeatSourceSide3.setRotationPoint(5F, 19F, -6F);
+ HeatSourceSide3.setTextureSize(64, 32);
+ HeatSourceSide3.mirror = true;
+ setRotation(HeatSourceSide3, 0F, 0F, 0F);
+ HeatSourceSide4 = new ModelRenderer(this, 0, 0);
+ HeatSourceSide4.addBox(0F, 0F, 0F, 1, 2, 12);
+ HeatSourceSide4.setRotationPoint(4F, 21F, -6F);
+ HeatSourceSide4.setTextureSize(64, 32);
+ HeatSourceSide4.mirror = true;
+ setRotation(HeatSourceSide4, 0F, 0F, 0F);
+ HeatSourceSide5 = new ModelRenderer(this, 0, 0);
+ HeatSourceSide5.addBox(0F, 0F, 0F, 1, 2, 12);
+ HeatSourceSide5.setRotationPoint(-5F, 21F, -6F);
+ HeatSourceSide5.setTextureSize(64, 32);
+ HeatSourceSide5.mirror = true;
+ setRotation(HeatSourceSide5, 0F, 0F, 0F);
+ HeatSourceBase = new ModelRenderer(this, 0, 0);
+ HeatSourceBase.addBox(0F, 0F, 0F, 8, 1, 12);
+ HeatSourceBase.setRotationPoint(-4F, 23F, -6F);
+ HeatSourceBase.setTextureSize(64, 32);
+ HeatSourceBase.mirror = true;
+ setRotation(HeatSourceBase, 0F, 0F, 0F);
+ HeatSourceSide6 = new ModelRenderer(this, 0, 0);
+ HeatSourceSide6.addBox(0F, 0F, 0F, 8, 2, 1);
+ HeatSourceSide6.setRotationPoint(-4F, 21F, -7F);
+ HeatSourceSide6.setTextureSize(64, 32);
+ HeatSourceSide6.mirror = true;
+ setRotation(HeatSourceSide6, 0F, 0F, 0F);
+ HeatSourceSide7 = new ModelRenderer(this, 0, 0);
+ HeatSourceSide7.addBox(0F, 0F, 0F, 8, 2, 1);
+ HeatSourceSide7.setRotationPoint(-4F, 21F, 6F);
+ HeatSourceSide7.setTextureSize(64, 32);
+ HeatSourceSide7.mirror = true;
+ setRotation(HeatSourceSide7, 0F, 0F, 0F);
+ HeatSourceSide8 = new ModelRenderer(this, 0, 0);
+ HeatSourceSide8.addBox(0F, 0F, 0F, 1, 2, 1);
+ HeatSourceSide8.setRotationPoint(-5F, 19F, 6F);
+ HeatSourceSide8.setTextureSize(64, 32);
+ HeatSourceSide8.mirror = true;
+ setRotation(HeatSourceSide8, 0F, 0F, 0F);
+ HeatSourceSide9 = new ModelRenderer(this, 0, 0);
+ HeatSourceSide9.addBox(0F, 0F, 0F, 1, 2, 1);
+ HeatSourceSide9.setRotationPoint(4F, 19F, 6F);
+ HeatSourceSide9.setTextureSize(64, 32);
+ HeatSourceSide9.mirror = true;
+ setRotation(HeatSourceSide9, 0F, 0F, 0F);
+ HeatSourceSide10 = new ModelRenderer(this, 0, 0);
+ HeatSourceSide10.addBox(0F, 0F, 0F, 1, 2, 1);
+ HeatSourceSide10.setRotationPoint(4F, 19F, -7F);
+ HeatSourceSide10.setTextureSize(64, 32);
+ HeatSourceSide10.mirror = true;
+ setRotation(HeatSourceSide10, 0F, 0F, 0F);
+ HeatSourceSide11 = new ModelRenderer(this, 0, 0);
+ HeatSourceSide11.addBox(0F, 0F, 0F, 1, 2, 1);
+ HeatSourceSide11.setRotationPoint(-5F, 19F, -7F);
+ HeatSourceSide11.setTextureSize(64, 32);
+ HeatSourceSide11.mirror = true;
+ setRotation(HeatSourceSide11, 0F, 0F, 0F);
+ HeatSourceSide12 = new ModelRenderer(this, 0, 0);
+ HeatSourceSide12.addBox(0F, 0F, 0F, 8, 2, 1);
+ HeatSourceSide12.setRotationPoint(-4F, 19F, -8F);
+ HeatSourceSide12.setTextureSize(64, 32);
+ HeatSourceSide12.mirror = true;
+ setRotation(HeatSourceSide12, 0F, 0F, 0F);
+ }
+
+ public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
+ {
+ super.render(entity, f, f1, f2, f3, f4, f5);
+ setRotationAngles(f, f1, f2, f3, f4, f5);
+ Support1.render(f5);
+ Support2.render(f5);
+ Hold1.render(f5);
+ Hold2.render(f5);
+ SmelterBase.render(f5);
+ SmelterSide1.render(f5);
+ SmelterSide2.render(f5);
+ SmelterSide3.render(f5);
+ SmelterSide4.render(f5);
+ SmelterSide5.render(f5);
+ SmelterSide6.render(f5);
+ SmelterSide7.render(f5);
+ SmelterSide8.render(f5);
+ SmelterSide9.render(f5);
+ SmelterSide10.render(f5);
+ SmelterSide11.render(f5);
+ SmelterSide12.render(f5);
+ HeatSourceSide1.render(f5);
+ HeatSourceSide2.render(f5);
+ HeatSourceSide3.render(f5);
+ HeatSourceSide4.render(f5);
+ HeatSourceSide5.render(f5);
+ HeatSourceBase.render(f5);
+ HeatSourceSide6.render(f5);
+ HeatSourceSide7.render(f5);
+ HeatSourceSide8.render(f5);
+ HeatSourceSide9.render(f5);
+ HeatSourceSide10.render(f5);
+ HeatSourceSide11.render(f5);
+ HeatSourceSide12.render(f5);
+ }
+
+ private void setRotation(ModelRenderer model, float x, float y, float z)
+ {
+ model.rotateAngleX = x;
+ model.rotateAngleY = y;
+ model.rotateAngleZ = z;
+ }
+
+ public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5)
+ {
+ super.setRotationAngles(f, f1, f2, f3, f4, f5, null);
+ }
+
+}
diff --git a/common/bspkrs/briefcasespeakers/recipes/CraftingRecipes.java b/common/darkknight/jewelrycraft/recipes/CraftingRecipes.java
index 7b6f97b..57d28fa 100644
--- a/common/bspkrs/briefcasespeakers/recipes/CraftingRecipes.java
+++ b/common/darkknight/jewelrycraft/recipes/CraftingRecipes.java
@@ -1,11 +1,11 @@
-package bspkrs.briefcasespeakers.recipes;
+package darkknight.jewelrycraft.recipes;
-import bspkrs.briefcasespeakers.block.BlockList;
-import bspkrs.briefcasespeakers.item.ItemList;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.registry.GameRegistry;
+import darkknight.jewelrycraft.block.BlockList;
+import darkknight.jewelrycraft.item.ItemList;
public class CraftingRecipes
{
diff --git a/common/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java b/common/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java
new file mode 100644
index 0000000..d3cd2ad
--- /dev/null
+++ b/common/darkknight/jewelrycraft/renders/TileEntitySmelterRender.java
@@ -0,0 +1,88 @@
+package darkknight.jewelrycraft.renders;
+
+import org.lwjgl.opengl.GL11;
+
+import darkknight.jewelrycraft.model.ModelSmelter;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
+
+public class TileEntitySmelterRender extends TileEntitySpecialRenderer
+{
+ ModelSmelter modelSmelter = new ModelSmelter();
+ String texture = "textures/tileentities/Smelter.png", lava = "texture/blocks/lava_still.png";
+
+ @Override
+ public void renderTileEntityAt (TileEntity te, double x, double y, double z, float scale)
+ {
+ GL11.glPushMatrix();
+ GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
+
+ ResourceLocation blockTexture = new ResourceLocation("jewelrycraft", texture);
+ Tessellator tessellator = Tessellator.instance;
+ ResourceLocation lava = new ResourceLocation(null, "textures/blocks/lava_still.png");
+ Minecraft.getMinecraft().renderEngine.bindTexture(blockTexture);
+ int block = te.getBlockMetadata();
+
+ GL11.glPushMatrix();
+ if(block == 0) GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
+ else if(block == 1) GL11.glRotatef(180F, 1F, 0.0F, 1F);
+ else if(block == 2) GL11.glRotatef(180F, 1.0F, 0.0F, 0.0F);
+ else if(block == 3) GL11.glRotatef(180F, 1.0F, 0.0F, 1.0F);
+
+ modelSmelter.render((Entity)null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
+
+ //Mrkol's liquid render code base - thank you man for the help :) I used only the top
+ Minecraft.getMinecraft().renderEngine.bindTexture(lava);
+ Block.lavaStill.getIcon(3, 0).getInterpolatedU(0);
+ double minu = Block.lavaStill.getIcon(0, 0).getInterpolatedU(0);
+ double minv = Block.lavaStill.getIcon(0, 0).getInterpolatedV(0);
+ double maxu = Block.lavaStill.getIcon(0, 0).getInterpolatedU(16);
+ double maxv = Block.lavaStill.getIcon(0, 0).getInterpolatedV(16);
+ GL11.glPushMatrix();
+ GL11.glScalef(1f/16f, 1f/16f, 1f/16f);
+ GL11.glDisable(GL11.GL_LIGHTING);
+ // without F it scales it down to 0, 0, 0. That's because it is trying to make 0.0625 an integer, and 0.0625 without .0625 is 0.
+ tessellator.startDrawingQuads();
+ tessellator.addVertexWithUV(5, 20, 6, maxu, maxv);
+ tessellator.addVertexWithUV(-5, 20, 6, maxu, minv);
+ tessellator.addVertexWithUV(-5, 20, -6, minu, minv);
+ tessellator.addVertexWithUV(5, 20, -6, minu, maxv);
+
+ tessellator.addVertexWithUV(4, 20, -6, maxu, maxv);
+ tessellator.addVertexWithUV(-4, 20, -6, maxu, minv);
+ tessellator.addVertexWithUV(-4, 20, -7, minu, minv);
+ tessellator.addVertexWithUV(4, 20, -7, minu, maxv);
+
+ tessellator.addVertexWithUV(4, 20, 7, maxu, maxv);
+ tessellator.addVertexWithUV(-4, 20, 7, maxu, minv);
+ tessellator.addVertexWithUV(-4, 20, 6, minu, minv);
+ tessellator.addVertexWithUV(4, 20, 6, minu, maxv);
+ tessellator.draw();
+ GL11.glEnable(GL11.GL_LIGHTING);
+ GL11.glPopMatrix();
+
+ GL11.glPopMatrix();
+ GL11.glPopMatrix();
+ }
+
+ public void adjustLightFixture (World world, int i, int j, int k, Block block)
+ {
+ Tessellator tess = Tessellator.instance;
+ float brightness = block.getBlockBrightness(world, i, j, k);
+ int skyLight = world.getLightBrightnessForSkyBlocks(i, j, k, 0);
+ int modulousModifier = skyLight % 65536;
+ int divModifier = skyLight / 65536;
+ tess.setColorOpaque_F(brightness, brightness, brightness);
+ OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) modulousModifier, divModifier);
+ }
+
+
+}
diff --git a/common/bspkrs/briefcasespeakers/client/BriefcaseSpeakersClient.java b/common/darkknight/jewelrycraft/server/JewelryCraftServer.java
index bd08761..061175c 100644
--- a/common/bspkrs/briefcasespeakers/client/BriefcaseSpeakersClient.java
+++ b/common/darkknight/jewelrycraft/server/JewelryCraftServer.java
@@ -1,11 +1,11 @@
-package bspkrs.briefcasespeakers.client;
+package darkknight.jewelrycraft.server;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import cpw.mods.fml.common.network.IPacketHandler;
import cpw.mods.fml.common.network.Player;
-public class BriefcaseSpeakersClient implements IPacketHandler
+public class JewelryCraftServer implements IPacketHandler
{
@Override
public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player)
diff --git a/common/bspkrs/briefcasespeakers/tileentity/TileEntityMolder.java b/common/darkknight/jewelrycraft/tileentity/TileEntityMolder.java
index 73d89e5..fbf7203 100644
--- a/common/bspkrs/briefcasespeakers/tileentity/TileEntityMolder.java
+++ b/common/darkknight/jewelrycraft/tileentity/TileEntityMolder.java
@@ -1,4 +1,4 @@
-package bspkrs.briefcasespeakers.tileentity;
+package darkknight.jewelrycraft.tileentity;
import net.minecraft.tileentity.TileEntity;
diff --git a/common/bspkrs/briefcasespeakers/tileentity/TileEntitySmelter.java b/common/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java
index 7387cb5..f0c7918 100644
--- a/common/bspkrs/briefcasespeakers/tileentity/TileEntitySmelter.java
+++ b/common/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java
@@ -1,7 +1,7 @@
-package bspkrs.briefcasespeakers.tileentity;
+package darkknight.jewelrycraft.tileentity;
+import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.Packet132TileEntityData;
import net.minecraft.tileentity.TileEntity;
@@ -10,6 +10,7 @@ public class TileEntitySmelter extends TileEntity
{
public int moltenMetalID, metalID, melting;
public boolean hasMetal, hasMoltenMetal;
+ public ItemStack metal;
public TileEntitySmelter()
{
diff --git a/common/bspkrs/briefcasespeakers/worldGen/Generation.java b/common/darkknight/jewelrycraft/worldGen/Generation.java
index 5be3e26..341b91e 100644
--- a/common/bspkrs/briefcasespeakers/worldGen/Generation.java
+++ b/common/darkknight/jewelrycraft/worldGen/Generation.java
@@ -1,13 +1,13 @@
-package bspkrs.briefcasespeakers.worldGen;
+package darkknight.jewelrycraft.worldGen;
import java.util.Random;
-import bspkrs.briefcasespeakers.block.BlockList;
import net.minecraft.world.World;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraft.world.gen.feature.WorldGenMinable;
import cpw.mods.fml.common.IWorldGenerator;
+import darkknight.jewelrycraft.block.BlockList;
public class Generation implements IWorldGenerator
{
diff --git a/resources/BriefcaseSpeakers.png b/resources/BriefcaseSpeakers.png
deleted file mode 100644
index c808717..0000000
--- a/resources/BriefcaseSpeakers.png
+++ /dev/null
Binary files differ
diff --git a/resources/assets/briefcasespeakers/lang/en_US.lang b/resources/assets/briefcasespeakers/lang/en_US.lang
deleted file mode 100644
index da4908f..0000000
--- a/resources/assets/briefcasespeakers/lang/en_US.lang
+++ /dev/null
@@ -1,10 +0,0 @@
-item.briefcasespeakers.briefcaseSpeakers.name=Briefcase Speakers
-item.briefcasespeakers.remote.name=Audio Remote
-item.briefcasespeakers.speakers.name=Speakers
-item.briefcasespeakers.thiefGloves.name=Thiefing Gloves
-item.briefcasespeakers.ingotShadow.name=Shadow Ingot
-tile.briefcasespeakers.oreShadow.name=Shadow Ore
-tile.briefcasespeakers.smelter.name=Smelter
-tile.briefcasespeakers.molder.name=Molder
-tile.briefcasespeakers.jewelCraftingTable.name=Jewelers Crafting Table
-itemGroup.shadowspkrs=Jewelcraft/Randomcraft
diff --git a/resources/assets/briefcasespeakers/textures/items/speakers.png b/resources/assets/briefcasespeakers/textures/items/speakers.png
deleted file mode 100644
index bfe648d..0000000
--- a/resources/assets/briefcasespeakers/textures/items/speakers.png
+++ /dev/null
Binary files differ
diff --git a/resources/assets/jewelrycraft/Smelter.tcn b/resources/assets/jewelrycraft/Smelter.tcn
new file mode 100644
index 0000000..2f6597f
--- /dev/null
+++ b/resources/assets/jewelrycraft/Smelter.tcn
Binary files differ
diff --git a/resources/assets/jewelrycraft/lang/en_US.lang b/resources/assets/jewelrycraft/lang/en_US.lang
new file mode 100644
index 0000000..ed9778b
--- /dev/null
+++ b/resources/assets/jewelrycraft/lang/en_US.lang
@@ -0,0 +1,7 @@
+item.jewelrycraft.thiefGloves.name=Thiefing Gloves
+item.jewelrycraft.ingotShadow.name=Shadow Ingot
+tile.jewelrycraft.oreShadow.name=Shadow Ore
+tile.jewelrycraft.smelter.name=Smelter
+tile.jewelrycraft.molder.name=Molder
+tile.jewelrycraft.jewelCraftingTable.name=Jewelers Crafting Table
+itemGroup.JewelryCraft.name=Jewelrycraft
diff --git a/resources/assets/briefcasespeakers/pack.mcmeta b/resources/assets/jewelrycraft/pack.mcmeta
index 3aab978..0b04ef8 100644
--- a/resources/assets/briefcasespeakers/pack.mcmeta
+++ b/resources/assets/jewelrycraft/pack.mcmeta
@@ -1,6 +1,6 @@
{
"pack": {
"pack_format": 1,
- "description": "BriefcaseSpeakers"
+ "description": "Jewelrycraft"
}
} \ No newline at end of file
diff --git a/resources/assets/briefcasespeakers/textures/blocks/oreShadow.png b/resources/assets/jewelrycraft/textures/blocks/oreShadow.png
index 31ee2a6..31ee2a6 100644
--- a/resources/assets/briefcasespeakers/textures/blocks/oreShadow.png
+++ b/resources/assets/jewelrycraft/textures/blocks/oreShadow.png
Binary files differ
diff --git a/resources/assets/briefcasespeakers/textures/blocks/oreShadow.png.mcmeta b/resources/assets/jewelrycraft/textures/blocks/oreShadow.png.mcmeta
index bf4c01e..bf4c01e 100644
--- a/resources/assets/briefcasespeakers/textures/blocks/oreShadow.png.mcmeta
+++ b/resources/assets/jewelrycraft/textures/blocks/oreShadow.png.mcmeta
diff --git a/resources/assets/jewelrycraft/textures/blocks/smelter.png b/resources/assets/jewelrycraft/textures/blocks/smelter.png
new file mode 100644
index 0000000..4da0c0a
--- /dev/null
+++ b/resources/assets/jewelrycraft/textures/blocks/smelter.png
Binary files differ
diff --git a/resources/assets/briefcasespeakers/textures/items/ingotShadow.png b/resources/assets/jewelrycraft/textures/items/ingotShadow.png
index 1522faf..1522faf 100644
--- a/resources/assets/briefcasespeakers/textures/items/ingotShadow.png
+++ b/resources/assets/jewelrycraft/textures/items/ingotShadow.png
Binary files differ
diff --git a/resources/assets/briefcasespeakers/textures/items/ingotShadow.png.mcmeta b/resources/assets/jewelrycraft/textures/items/ingotShadow.png.mcmeta
index 09994da..09994da 100644
--- a/resources/assets/briefcasespeakers/textures/items/ingotShadow.png.mcmeta
+++ b/resources/assets/jewelrycraft/textures/items/ingotShadow.png.mcmeta
diff --git a/resources/assets/briefcasespeakers/textures/items/thiefGloves.png b/resources/assets/jewelrycraft/textures/items/thiefGloves.png
index b56e925..b56e925 100644
--- a/resources/assets/briefcasespeakers/textures/items/thiefGloves.png
+++ b/resources/assets/jewelrycraft/textures/items/thiefGloves.png
Binary files differ
diff --git a/resources/assets/jewelrycraft/textures/tileentities/Molder.png b/resources/assets/jewelrycraft/textures/tileentities/Molder.png
new file mode 100644
index 0000000..c5acc88
--- /dev/null
+++ b/resources/assets/jewelrycraft/textures/tileentities/Molder.png
Binary files differ
diff --git a/resources/assets/jewelrycraft/textures/tileentities/Smelter.png b/resources/assets/jewelrycraft/textures/tileentities/Smelter.png
new file mode 100644
index 0000000..6ec3595
--- /dev/null
+++ b/resources/assets/jewelrycraft/textures/tileentities/Smelter.png
Binary files differ
diff --git a/resources/briefcase.png b/resources/briefcase.png
deleted file mode 100644
index c81f707..0000000
--- a/resources/briefcase.png
+++ /dev/null
Binary files differ
diff --git a/resources/briefcasespeakers.tcn b/resources/briefcasespeakers.tcn
deleted file mode 100644
index 07967da..0000000
--- a/resources/briefcasespeakers.tcn
+++ /dev/null
Binary files differ