From 3465c5723075bbf6ece3c98239230155faad958f Mon Sep 17 00:00:00 2001 From: bspkrs Date: Sat, 14 Dec 2013 17:59:11 -0500 Subject: maybe finished with model/render code for Briefcase Speakers --- .../briefcasespeakers/block/BlockSmelter.java | 25 +++---- .../client/render/ModelBriefcaseSpeakers.java | 76 ++++++++++++++++++++++ .../render/TileEntityRenderBriefcaseSpeakers.java | 62 +++++++++++++++++- .../briefcasespeakers/config/ConfigHandler.java | 22 +++---- 4 files changed, 160 insertions(+), 25 deletions(-) create mode 100644 common/bspkrs/briefcasespeakers/client/render/ModelBriefcaseSpeakers.java (limited to 'common') diff --git a/common/bspkrs/briefcasespeakers/block/BlockSmelter.java b/common/bspkrs/briefcasespeakers/block/BlockSmelter.java index 6ad80d5..153949f 100644 --- a/common/bspkrs/briefcasespeakers/block/BlockSmelter.java +++ b/common/bspkrs/briefcasespeakers/block/BlockSmelter.java @@ -1,12 +1,12 @@ 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.World; +import bspkrs.briefcasespeakers.tileentity.TileEntitySmelter; public class BlockSmelter extends BlockContainer { @@ -30,26 +30,29 @@ public class BlockSmelter extends BlockContainer @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); + TileEntitySmelter te = (TileEntitySmelter) world.getBlockTileEntity(i, j, k); ItemStack item = entityPlayer.inventory.getCurrentItem(); - if(te != null && !world.isRemote) + if (te != null && !world.isRemote) { - if(!te.hasMetal && !te.hasMoltenMetal && item != null && item.getDisplayName().contains("Ingot")) + 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!"); + 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)); + if (te.hasMetal && entityPlayer.isSneaking()) + { + entityPlayer.dropPlayerItem(new ItemStack(te.metalID, 1, 0)); te.hasMetal = false; - } + } world.setBlockTileEntity(i, j, k, te); } return true; diff --git a/common/bspkrs/briefcasespeakers/client/render/ModelBriefcaseSpeakers.java b/common/bspkrs/briefcasespeakers/client/render/ModelBriefcaseSpeakers.java new file mode 100644 index 0000000..0e23d11 --- /dev/null +++ b/common/bspkrs/briefcasespeakers/client/render/ModelBriefcaseSpeakers.java @@ -0,0 +1,76 @@ +package bspkrs.briefcasespeakers.client.render; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +// Date: 12/14/2013 5:18:00 PM +// Template version 1.1 +// Java generated by Techne +// Keep in mind that you still need to fill in some blanks +// - ZeuX + +@SideOnly(Side.CLIENT) +public class ModelBriefcaseSpeakers extends ModelBase +{ + ModelRenderer suitcase; + ModelRenderer speaker1; + ModelRenderer speaker3; + ModelRenderer handle3; + ModelRenderer handle2; + ModelRenderer handle1; + ModelRenderer latch2; + ModelRenderer latch1; + + public ModelBriefcaseSpeakers() + { + textureWidth = 64; + textureHeight = 32; + + suitcase = new ModelRenderer(this, 0, 0); + suitcase.addBox(0F, 0F, 0F, 14, 10, 5); + suitcase.setTextureSize(64, 32); + suitcase.mirror = true; + speaker1 = new ModelRenderer(this, 38, 0); + speaker1.addBox(0F, 0F, 0F, 5, 7, 1); + speaker1.setTextureSize(64, 32); + speaker1.mirror = true; + speaker3 = new ModelRenderer(this, 38, 0); + speaker3.addBox(0F, 0F, 0F, 5, 7, 1); + speaker3.setTextureSize(64, 32); + speaker3.mirror = true; + handle3 = new ModelRenderer(this, 5, 5); + handle3.addBox(0F, 0F, 0F, 1, 1, 1); + handle3.setTextureSize(64, 32); + handle3.mirror = true; + handle2 = new ModelRenderer(this, 5, 5); + handle2.addBox(0F, 0F, 0F, 1, 1, 1); + handle2.setTextureSize(64, 32); + handle2.mirror = true; + handle1 = new ModelRenderer(this, 5, 5); + handle1.addBox(0F, 0F, 0F, 6, 1, 1); + handle1.setTextureSize(64, 32); + handle1.mirror = true; + latch2 = new ModelRenderer(this, 38, 8); + latch2.addBox(0F, 0F, 0F, 1, 1, 2); + latch2.setTextureSize(64, 32); + latch2.mirror = true; + latch1 = new ModelRenderer(this, 38, 8); + latch1.addBox(0F, 0F, 0F, 1, 1, 2); + latch1.setTextureSize(64, 32); + latch1.mirror = true; + } + + public void renderBriefcaseSpeakers(float f5) + { + suitcase.render(f5); + speaker1.render(f5); + speaker3.render(f5); + handle3.render(f5); + handle2.render(f5); + handle1.render(f5); + latch2.render(f5); + latch1.render(f5); + } +} diff --git a/common/bspkrs/briefcasespeakers/client/render/TileEntityRenderBriefcaseSpeakers.java b/common/bspkrs/briefcasespeakers/client/render/TileEntityRenderBriefcaseSpeakers.java index 5ec065d..246eac2 100644 --- a/common/bspkrs/briefcasespeakers/client/render/TileEntityRenderBriefcaseSpeakers.java +++ b/common/bspkrs/briefcasespeakers/client/render/TileEntityRenderBriefcaseSpeakers.java @@ -1,14 +1,70 @@ package bspkrs.briefcasespeakers.client.render; +import net.minecraft.block.Block; +import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; + +import bspkrs.briefcasespeakers.tileentity.TileEntityBriefcaseSpeakers; public class TileEntityRenderBriefcaseSpeakers extends TileEntitySpecialRenderer { - @Override - public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f) + private static final ResourceLocation field_110638_a = new ResourceLocation("textures/entity/sign.png"); + + /** The ModelSign instance used by the TileEntitySignRenderer */ + private final ModelBriefcaseSpeakers modelBS = new ModelBriefcaseSpeakers(); + + public void renderTileEntityBriefcaseSpeakersAt(TileEntityBriefcaseSpeakers tebs, double par2, double par4, double par6, float par8) { - // TODO Auto-generated method stub + Block block = tebs.getBlockType(); + GL11.glPushMatrix(); + float f1 = 0.6666667F; + float f2 = 0.0F; + + int i = tebs.getBlockMetadata(); + + if (i == 2) + { + f2 = 180.0F; + } + + if (i == 4) + { + f2 = 90.0F; + } + if (i == 5) + { + f2 = -90.0F; + } + + GL11.glTranslatef((float) par2 + 0.5F, (float) par4 + 0.75F * f1, (float) par6 + 0.5F); + GL11.glRotatef(-f2, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(0.0F, -0.3125F, -0.4375F); + + this.bindTexture(field_110638_a); + GL11.glPushMatrix(); + GL11.glScalef(f1, -f1, -f1); + this.modelBS.renderBriefcaseSpeakers(1.0f); + GL11.glPopMatrix(); + FontRenderer fontrenderer = this.getFontRenderer(); + f2 = 0.016666668F * f1; + GL11.glTranslatef(0.0F, 0.5F * f1, 0.07F * f1); + GL11.glScalef(f2, -f2, f2); + GL11.glNormal3f(0.0F, 0.0F, -1.0F * f2); + GL11.glDepthMask(false); + + GL11.glDepthMask(true); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glPopMatrix(); + } + + @Override + public void renderTileEntityAt(TileEntity par1TileEntity, double par2, double par4, double par6, float par8) + { + this.renderTileEntityBriefcaseSpeakersAt((TileEntityBriefcaseSpeakers) par1TileEntity, par2, par4, par6, par8); } } diff --git a/common/bspkrs/briefcasespeakers/config/ConfigHandler.java b/common/bspkrs/briefcasespeakers/config/ConfigHandler.java index 41e2bf6..4b990bd 100644 --- a/common/bspkrs/briefcasespeakers/config/ConfigHandler.java +++ b/common/bspkrs/briefcasespeakers/config/ConfigHandler.java @@ -6,20 +6,20 @@ 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 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 idBriefcaseSpeakers = 1749; - public static int idShadowOre = 200; - public static int idSmelter = 201; - public static int idMolder = 202; - public static int idJewelCraftingTable= 203; + 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; + private static boolean isInitialized = false; public static void preInit(FMLPreInitializationEvent e) { -- cgit v1.2.3 From 943f1a493b27c630e95730b385e6524643d98564 Mon Sep 17 00:00:00 2001 From: bspkrs Date: Sat, 14 Dec 2013 20:51:01 -0500 Subject: changed mod back to being Jewelrycraft and removed all Briefcase Speakers code Let's face it, they don't belong together in the same mod... I'll still help you with the SMP compatibility like you originally asked me to, but I'd rather keep my mod idea for another day instead of have it be part of a mod that I'm not really that interested in. Let me know when your code is far enough that you're ready for SMP stuff. --- .../briefcasespeakers/BriefcaseSpeakersMod.java | 115 ------------------- common/bspkrs/briefcasespeakers/CommonProxy.java | 24 ---- .../bspkrs/briefcasespeakers/block/BlockBase.java | 19 ---- .../block/BlockBriefcaseSpeakers.java | 27 ----- .../bspkrs/briefcasespeakers/block/BlockList.java | 37 ------- .../briefcasespeakers/block/BlockMolder.java | 27 ----- .../briefcasespeakers/block/BlockSmelter.java | 60 ---------- .../client/BriefcaseSpeakersClient.java | 16 --- .../briefcasespeakers/client/ClientProxy.java | 8 -- .../briefcasespeakers/client/gui/GuiRemote.java | 8 -- .../client/render/ModelBriefcaseSpeakers.java | 76 ------------- .../render/TileEntityRenderBriefcaseSpeakers.java | 70 ------------ .../briefcasespeakers/config/ConfigHandler.java | 50 --------- common/bspkrs/briefcasespeakers/item/ItemBase.java | 18 --- common/bspkrs/briefcasespeakers/item/ItemList.java | 29 ----- .../bspkrs/briefcasespeakers/item/ItemRemote.java | 9 -- .../briefcasespeakers/item/ItemThiefGloves.java | 64 ----------- common/bspkrs/briefcasespeakers/lib/Reference.java | 9 -- .../briefcasespeakers/recipes/CraftingRecipes.java | 22 ---- .../server/BriefcaseSpeakersServer.java | 16 --- .../tileentity/TileEntityBriefcaseSpeakers.java | 8 -- .../tileentity/TileEntityMolder.java | 8 -- .../tileentity/TileEntitySmelter.java | 60 ---------- .../briefcasespeakers/worldGen/Generation.java | 45 -------- common/darkknight/jewelrycraft/CommonProxy.java | 24 ++++ .../darkknight/jewelrycraft/JewelrycraftMod.java | 122 +++++++++++++++++++++ .../darkknight/jewelrycraft/block/BlockBase.java | 19 ++++ .../darkknight/jewelrycraft/block/BlockList.java | 37 +++++++ .../darkknight/jewelrycraft/block/BlockMolder.java | 27 +++++ .../jewelrycraft/block/BlockSmelter.java | 60 ++++++++++ .../jewelrycraft/client/ClientProxy.java | 8 ++ .../jewelrycraft/client/JewelryCraftClient.java | 16 +++ .../jewelrycraft/config/ConfigHandler.java | 39 +++++++ common/darkknight/jewelrycraft/item/ItemBase.java | 18 +++ common/darkknight/jewelrycraft/item/ItemList.java | 24 ++++ .../jewelrycraft/item/ItemThiefGloves.java | 64 +++++++++++ common/darkknight/jewelrycraft/lib/Reference.java | 9 ++ .../jewelrycraft/recipes/CraftingRecipes.java | 22 ++++ .../jewelrycraft/server/JewelryCraftServer.java | 16 +++ .../jewelrycraft/tileentity/TileEntityMolder.java | 8 ++ .../jewelrycraft/tileentity/TileEntitySmelter.java | 60 ++++++++++ .../jewelrycraft/worldGen/Generation.java | 45 ++++++++ 42 files changed, 618 insertions(+), 825 deletions(-) delete mode 100644 common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java delete mode 100644 common/bspkrs/briefcasespeakers/CommonProxy.java delete mode 100644 common/bspkrs/briefcasespeakers/block/BlockBase.java delete mode 100644 common/bspkrs/briefcasespeakers/block/BlockBriefcaseSpeakers.java delete mode 100644 common/bspkrs/briefcasespeakers/block/BlockList.java delete mode 100644 common/bspkrs/briefcasespeakers/block/BlockMolder.java delete mode 100644 common/bspkrs/briefcasespeakers/block/BlockSmelter.java delete mode 100644 common/bspkrs/briefcasespeakers/client/BriefcaseSpeakersClient.java delete mode 100644 common/bspkrs/briefcasespeakers/client/ClientProxy.java delete mode 100644 common/bspkrs/briefcasespeakers/client/gui/GuiRemote.java delete mode 100644 common/bspkrs/briefcasespeakers/client/render/ModelBriefcaseSpeakers.java delete mode 100644 common/bspkrs/briefcasespeakers/client/render/TileEntityRenderBriefcaseSpeakers.java delete mode 100644 common/bspkrs/briefcasespeakers/config/ConfigHandler.java delete mode 100644 common/bspkrs/briefcasespeakers/item/ItemBase.java delete mode 100644 common/bspkrs/briefcasespeakers/item/ItemList.java delete mode 100644 common/bspkrs/briefcasespeakers/item/ItemRemote.java delete mode 100644 common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java delete mode 100644 common/bspkrs/briefcasespeakers/lib/Reference.java delete mode 100644 common/bspkrs/briefcasespeakers/recipes/CraftingRecipes.java delete mode 100644 common/bspkrs/briefcasespeakers/server/BriefcaseSpeakersServer.java delete mode 100644 common/bspkrs/briefcasespeakers/tileentity/TileEntityBriefcaseSpeakers.java delete mode 100644 common/bspkrs/briefcasespeakers/tileentity/TileEntityMolder.java delete mode 100644 common/bspkrs/briefcasespeakers/tileentity/TileEntitySmelter.java delete mode 100644 common/bspkrs/briefcasespeakers/worldGen/Generation.java create mode 100644 common/darkknight/jewelrycraft/CommonProxy.java create mode 100644 common/darkknight/jewelrycraft/JewelrycraftMod.java create mode 100644 common/darkknight/jewelrycraft/block/BlockBase.java create mode 100644 common/darkknight/jewelrycraft/block/BlockList.java create mode 100644 common/darkknight/jewelrycraft/block/BlockMolder.java create mode 100644 common/darkknight/jewelrycraft/block/BlockSmelter.java create mode 100644 common/darkknight/jewelrycraft/client/ClientProxy.java create mode 100644 common/darkknight/jewelrycraft/client/JewelryCraftClient.java create mode 100644 common/darkknight/jewelrycraft/config/ConfigHandler.java create mode 100644 common/darkknight/jewelrycraft/item/ItemBase.java create mode 100644 common/darkknight/jewelrycraft/item/ItemList.java create mode 100644 common/darkknight/jewelrycraft/item/ItemThiefGloves.java create mode 100644 common/darkknight/jewelrycraft/lib/Reference.java create mode 100644 common/darkknight/jewelrycraft/recipes/CraftingRecipes.java create mode 100644 common/darkknight/jewelrycraft/server/JewelryCraftServer.java create mode 100644 common/darkknight/jewelrycraft/tileentity/TileEntityMolder.java create mode 100644 common/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java create mode 100644 common/darkknight/jewelrycraft/worldGen/Generation.java (limited to 'common') diff --git a/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java b/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java deleted file mode 100644 index e54e1e8..0000000 --- a/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java +++ /dev/null @@ -1,115 +0,0 @@ -package bspkrs.briefcasespeakers; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.ItemStack; -import net.minecraft.network.INetworkManager; -import net.minecraft.network.NetLoginHandler; -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; -import cpw.mods.fml.common.Mod.Metadata; -import cpw.mods.fml.common.ModMetadata; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.network.IConnectionHandler; -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; - -@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 -{ - @Instance(Reference.MODID) - public static BriefcaseSpeakersMod 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);}}; - - @EventHandler - public void preInit(FMLPreInitializationEvent e) - { - ConfigHandler.preInit(e); - ItemList.preInit(e); - BlockList.preInit(e); - CraftingRecipes.preInit(e); - } - - @EventHandler - public void init(FMLInitializationEvent e) - { - OreDictionary.registerOre("ingotShadow", new ItemStack(ItemList.shadowIngot)); - 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/CommonProxy.java b/common/bspkrs/briefcasespeakers/CommonProxy.java deleted file mode 100644 index c961322..0000000 --- a/common/bspkrs/briefcasespeakers/CommonProxy.java +++ /dev/null @@ -1,24 +0,0 @@ -package bspkrs.briefcasespeakers; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; -import cpw.mods.fml.common.network.IGuiHandler; - -public class CommonProxy implements IGuiHandler -{ - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) - { - // TODO Auto-generated method stub - return null; - } - - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) - { - // TODO Auto-generated method stub - return null; - } - -} diff --git a/common/bspkrs/briefcasespeakers/block/BlockBase.java b/common/bspkrs/briefcasespeakers/block/BlockBase.java deleted file mode 100644 index a895483..0000000 --- a/common/bspkrs/briefcasespeakers/block/BlockBase.java +++ /dev/null @@ -1,19 +0,0 @@ -package bspkrs.briefcasespeakers.block; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; - -public class BlockBase extends Block -{ - public BlockBase(int par1, Material mat) - { - super(par1, mat); - } - - @Override - public Block setUnlocalizedName(String name) - { - Block r = super.setUnlocalizedName(name); - return r.setTextureName(name.replaceAll("\\.", ":")); - } -} 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/BlockList.java b/common/bspkrs/briefcasespeakers/block/BlockList.java deleted file mode 100644 index 282134f..0000000 --- a/common/bspkrs/briefcasespeakers/block/BlockList.java +++ /dev/null @@ -1,37 +0,0 @@ -package bspkrs.briefcasespeakers.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.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.registry.GameRegistry; - -public class BlockList -{ - public static Block shadowOre; - public static Block smelter; - public static Block molder; - public static Block jewelCraftingTable; - - private static boolean isInitialized = false; - - public static void preInit(FMLPreInitializationEvent e) - { - 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); - - GameRegistry.registerBlock(shadowOre, "shadowOre"); - GameRegistry.registerBlock(smelter, "Smelter"); - GameRegistry.registerBlock(molder, "Molder"); - GameRegistry.registerBlock(jewelCraftingTable, "jewelCraftingTable"); - - GameRegistry.registerTileEntity(TileEntitySmelter.class, "30"); - } - } -} diff --git a/common/bspkrs/briefcasespeakers/block/BlockMolder.java b/common/bspkrs/briefcasespeakers/block/BlockMolder.java deleted file mode 100644 index a4e4337..0000000 --- a/common/bspkrs/briefcasespeakers/block/BlockMolder.java +++ /dev/null @@ -1,27 +0,0 @@ -package bspkrs.briefcasespeakers.block; - -import bspkrs.briefcasespeakers.tileentity.TileEntityMolder; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -public class BlockMolder extends BlockContainer -{ - protected BlockMolder(int par1, Material par2Material) - { - super(par1, par2Material); - } - - @Override - public TileEntity createNewTileEntity(World world) - { - return new TileEntityMolder(); - } - - @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 153949f..0000000 --- a/common/bspkrs/briefcasespeakers/block/BlockSmelter.java +++ /dev/null @@ -1,60 +0,0 @@ -package bspkrs.briefcasespeakers.block; - -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.World; -import bspkrs.briefcasespeakers.tileentity.TileEntitySmelter; - -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; - } -} diff --git a/common/bspkrs/briefcasespeakers/client/BriefcaseSpeakersClient.java b/common/bspkrs/briefcasespeakers/client/BriefcaseSpeakersClient.java deleted file mode 100644 index bd08761..0000000 --- a/common/bspkrs/briefcasespeakers/client/BriefcaseSpeakersClient.java +++ /dev/null @@ -1,16 +0,0 @@ -package bspkrs.briefcasespeakers.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 BriefcaseSpeakersClient implements IPacketHandler -{ - @Override - public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player) - { - // TODO Auto-generated method stub - - } -} 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/ModelBriefcaseSpeakers.java b/common/bspkrs/briefcasespeakers/client/render/ModelBriefcaseSpeakers.java deleted file mode 100644 index 0e23d11..0000000 --- a/common/bspkrs/briefcasespeakers/client/render/ModelBriefcaseSpeakers.java +++ /dev/null @@ -1,76 +0,0 @@ -package bspkrs.briefcasespeakers.client.render; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -// Date: 12/14/2013 5:18:00 PM -// Template version 1.1 -// Java generated by Techne -// Keep in mind that you still need to fill in some blanks -// - ZeuX - -@SideOnly(Side.CLIENT) -public class ModelBriefcaseSpeakers extends ModelBase -{ - ModelRenderer suitcase; - ModelRenderer speaker1; - ModelRenderer speaker3; - ModelRenderer handle3; - ModelRenderer handle2; - ModelRenderer handle1; - ModelRenderer latch2; - ModelRenderer latch1; - - public ModelBriefcaseSpeakers() - { - textureWidth = 64; - textureHeight = 32; - - suitcase = new ModelRenderer(this, 0, 0); - suitcase.addBox(0F, 0F, 0F, 14, 10, 5); - suitcase.setTextureSize(64, 32); - suitcase.mirror = true; - speaker1 = new ModelRenderer(this, 38, 0); - speaker1.addBox(0F, 0F, 0F, 5, 7, 1); - speaker1.setTextureSize(64, 32); - speaker1.mirror = true; - speaker3 = new ModelRenderer(this, 38, 0); - speaker3.addBox(0F, 0F, 0F, 5, 7, 1); - speaker3.setTextureSize(64, 32); - speaker3.mirror = true; - handle3 = new ModelRenderer(this, 5, 5); - handle3.addBox(0F, 0F, 0F, 1, 1, 1); - handle3.setTextureSize(64, 32); - handle3.mirror = true; - handle2 = new ModelRenderer(this, 5, 5); - handle2.addBox(0F, 0F, 0F, 1, 1, 1); - handle2.setTextureSize(64, 32); - handle2.mirror = true; - handle1 = new ModelRenderer(this, 5, 5); - handle1.addBox(0F, 0F, 0F, 6, 1, 1); - handle1.setTextureSize(64, 32); - handle1.mirror = true; - latch2 = new ModelRenderer(this, 38, 8); - latch2.addBox(0F, 0F, 0F, 1, 1, 2); - latch2.setTextureSize(64, 32); - latch2.mirror = true; - latch1 = new ModelRenderer(this, 38, 8); - latch1.addBox(0F, 0F, 0F, 1, 1, 2); - latch1.setTextureSize(64, 32); - latch1.mirror = true; - } - - public void renderBriefcaseSpeakers(float f5) - { - suitcase.render(f5); - speaker1.render(f5); - speaker3.render(f5); - handle3.render(f5); - handle2.render(f5); - handle1.render(f5); - latch2.render(f5); - latch1.render(f5); - } -} diff --git a/common/bspkrs/briefcasespeakers/client/render/TileEntityRenderBriefcaseSpeakers.java b/common/bspkrs/briefcasespeakers/client/render/TileEntityRenderBriefcaseSpeakers.java deleted file mode 100644 index 246eac2..0000000 --- a/common/bspkrs/briefcasespeakers/client/render/TileEntityRenderBriefcaseSpeakers.java +++ /dev/null @@ -1,70 +0,0 @@ -package bspkrs.briefcasespeakers.client.render; - -import net.minecraft.block.Block; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - -import bspkrs.briefcasespeakers.tileentity.TileEntityBriefcaseSpeakers; - -public class TileEntityRenderBriefcaseSpeakers extends TileEntitySpecialRenderer -{ - private static final ResourceLocation field_110638_a = new ResourceLocation("textures/entity/sign.png"); - - /** The ModelSign instance used by the TileEntitySignRenderer */ - private final ModelBriefcaseSpeakers modelBS = new ModelBriefcaseSpeakers(); - - public void renderTileEntityBriefcaseSpeakersAt(TileEntityBriefcaseSpeakers tebs, double par2, double par4, double par6, float par8) - { - Block block = tebs.getBlockType(); - GL11.glPushMatrix(); - float f1 = 0.6666667F; - float f2 = 0.0F; - - int i = tebs.getBlockMetadata(); - - if (i == 2) - { - f2 = 180.0F; - } - - if (i == 4) - { - f2 = 90.0F; - } - - if (i == 5) - { - f2 = -90.0F; - } - - GL11.glTranslatef((float) par2 + 0.5F, (float) par4 + 0.75F * f1, (float) par6 + 0.5F); - GL11.glRotatef(-f2, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(0.0F, -0.3125F, -0.4375F); - - this.bindTexture(field_110638_a); - GL11.glPushMatrix(); - GL11.glScalef(f1, -f1, -f1); - this.modelBS.renderBriefcaseSpeakers(1.0f); - GL11.glPopMatrix(); - FontRenderer fontrenderer = this.getFontRenderer(); - f2 = 0.016666668F * f1; - GL11.glTranslatef(0.0F, 0.5F * f1, 0.07F * f1); - GL11.glScalef(f2, -f2, f2); - GL11.glNormal3f(0.0F, 0.0F, -1.0F * f2); - GL11.glDepthMask(false); - - GL11.glDepthMask(true); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glPopMatrix(); - } - - @Override - public void renderTileEntityAt(TileEntity par1TileEntity, double par2, double par4, double par6, float par8) - { - this.renderTileEntityBriefcaseSpeakersAt((TileEntityBriefcaseSpeakers) par1TileEntity, par2, par4, par6, par8); - } -} diff --git a/common/bspkrs/briefcasespeakers/config/ConfigHandler.java b/common/bspkrs/briefcasespeakers/config/ConfigHandler.java deleted file mode 100644 index 4b990bd..0000000 --- a/common/bspkrs/briefcasespeakers/config/ConfigHandler.java +++ /dev/null @@ -1,50 +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/ItemBase.java b/common/bspkrs/briefcasespeakers/item/ItemBase.java deleted file mode 100644 index 9a017b6..0000000 --- a/common/bspkrs/briefcasespeakers/item/ItemBase.java +++ /dev/null @@ -1,18 +0,0 @@ -package bspkrs.briefcasespeakers.item; - -import net.minecraft.item.Item; - -public class ItemBase extends Item -{ - public ItemBase(int par1) - { - super(par1); - } - - @Override - public Item setUnlocalizedName(String name) - { - Item r = super.setUnlocalizedName(name); - return r.setTextureName(name.replaceAll("\\.", ":")); - } -} 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/item/ItemThiefGloves.java b/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java deleted file mode 100644 index d80da55..0000000 --- a/common/bspkrs/briefcasespeakers/item/ItemThiefGloves.java +++ /dev/null @@ -1,64 +0,0 @@ -package bspkrs.briefcasespeakers.item; - -import java.util.Iterator; -import java.util.Random; - -import cpw.mods.fml.relauncher.ReflectionHelper; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.passive.EntityVillager; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.village.MerchantRecipe; -import net.minecraft.village.MerchantRecipeList; - -public class ItemThiefGloves extends ItemBase -{ - public Random rand; - public ItemThiefGloves(int par1) - { - super(par1); - this.setCreativeTab(CreativeTabs.tabTools); - } - - @Override - public boolean itemInteractionForEntity(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, EntityLivingBase par3EntityLivingBase) - { - if (par3EntityLivingBase instanceof EntityVillager) - { - EntityVillager villager = (EntityVillager) par3EntityLivingBase; - int wealth = (Integer) ReflectionHelper.getPrivateValue(EntityVillager.class, villager, "wealth", "field_70956_bz"); - MerchantRecipeList buyingList = (MerchantRecipeList) ReflectionHelper.getPrivateValue(EntityVillager.class, villager, "buyingList", "field_70963_i"); - if(buyingList!=null) - { - Iterator iterator = buyingList.iterator(); - while(iterator.hasNext()) - { - MerchantRecipe recipe = (MerchantRecipe)iterator.next(); - int quantity; - if(recipe.getItemToSell().isStackable()) quantity = recipe.getItemToSell().stackSize * 7; - else quantity = 1; - ItemStack s = new ItemStack(recipe.getItemToSell().itemID, quantity, recipe.getItemToSell().getItemDamage()); - s.setTagCompound(recipe.getItemToSell().getTagCompound()); - if(par2EntityPlayer.inventory.addItemStackToInventory(s)); - else villager.entityDropItem(s, 0); - par2EntityPlayer.addChatMessage("Villager #" + villager.getProfession() + ": Hmmm... I seem to have lost my " + s.getDisplayName() + "!"); - } - buyingList.clear(); - ReflectionHelper.setPrivateValue(EntityVillager.class, villager, 300, "timeUntilReset", "field_70961_j"); - ReflectionHelper.setPrivateValue(EntityVillager.class, villager, true, "needsInitilization", "field_70959_by"); - } - - villager.dropItem(Item.emerald.itemID, wealth); - ReflectionHelper.setPrivateValue(EntityVillager.class, villager, 0, "wealth", "field_70956_bz"); - return true; - } - else - { - return super.itemInteractionForEntity(par1ItemStack, par2EntityPlayer, par3EntityLivingBase); - } - } - -} 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/recipes/CraftingRecipes.java b/common/bspkrs/briefcasespeakers/recipes/CraftingRecipes.java deleted file mode 100644 index 7b6f97b..0000000 --- a/common/bspkrs/briefcasespeakers/recipes/CraftingRecipes.java +++ /dev/null @@ -1,22 +0,0 @@ -package bspkrs.briefcasespeakers.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; - -public class CraftingRecipes -{ - private static boolean isInitialized = false; - - public static void preInit(FMLPreInitializationEvent e) - { - if (!isInitialized) - { - GameRegistry.addRecipe(new ItemStack(ItemList.thiefGloves), "x x", "yxy", "yxy", 'x', ItemList.shadowIngot, 'y', new ItemStack(Block.cloth, 1, 15)); - GameRegistry.addSmelting(BlockList.shadowOre.blockID, new ItemStack(ItemList.shadowIngot), 1.5f); - } - } -} diff --git a/common/bspkrs/briefcasespeakers/server/BriefcaseSpeakersServer.java b/common/bspkrs/briefcasespeakers/server/BriefcaseSpeakersServer.java deleted file mode 100644 index d01feb0..0000000 --- a/common/bspkrs/briefcasespeakers/server/BriefcaseSpeakersServer.java +++ /dev/null @@ -1,16 +0,0 @@ -package bspkrs.briefcasespeakers.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 BriefcaseSpeakersServer implements IPacketHandler -{ - @Override - public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player) - { - // TODO Auto-generated method stub - - } -} 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/tileentity/TileEntityMolder.java b/common/bspkrs/briefcasespeakers/tileentity/TileEntityMolder.java deleted file mode 100644 index 73d89e5..0000000 --- a/common/bspkrs/briefcasespeakers/tileentity/TileEntityMolder.java +++ /dev/null @@ -1,8 +0,0 @@ -package bspkrs.briefcasespeakers.tileentity; - -import net.minecraft.tileentity.TileEntity; - -public class TileEntityMolder extends TileEntity -{ - -} diff --git a/common/bspkrs/briefcasespeakers/tileentity/TileEntitySmelter.java b/common/bspkrs/briefcasespeakers/tileentity/TileEntitySmelter.java deleted file mode 100644 index e93f67e..0000000 --- a/common/bspkrs/briefcasespeakers/tileentity/TileEntitySmelter.java +++ /dev/null @@ -1,60 +0,0 @@ -package bspkrs.briefcasespeakers.tileentity; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; - -public class TileEntitySmelter extends TileEntity -{ - public int moltenMetalID, metalID, melting; - public boolean hasMetal, hasMoltenMetal; - - public TileEntitySmelter() - { - this.moltenMetalID = 0; - this.metalID = 0; - this.melting = 0; - this.hasMetal = false; - this.hasMoltenMetal= false; - } - - @Override - public void writeToNBT(NBTTagCompound par1) - { - super.writeToNBT(par1); - par1.setInteger("moltenMetalID", moltenMetalID); - par1.setInteger("metalID", metalID); - par1.setInteger("melting", melting); - par1.setBoolean("hasMetal", hasMetal); - par1.setBoolean("hasMoltenMetal", hasMoltenMetal); - } - - @Override - public void readFromNBT(NBTTagCompound par1) - { - super.readFromNBT(par1); - this.moltenMetalID = par1.getInteger("moltenMetalID"); - this.metalID = par1.getInteger("metalID"); - this.melting = par1.getInteger("melting"); - this.hasMetal = par1.getBoolean("hasMetal"); - this.hasMoltenMetal = par1.getBoolean("hasMoltenMetal"); - } - - public void updateEntity() - { - super.updateEntity(); - if(this.hasMetal) - { - while(melting > 0){ - this.melting--; - System.out.println(melting); - } - if(melting == 0) - { - this.hasMetal = false; - this.moltenMetalID = metalID; - this.metalID = 0; - this.hasMoltenMetal = true; - } - } - } -} diff --git a/common/bspkrs/briefcasespeakers/worldGen/Generation.java b/common/bspkrs/briefcasespeakers/worldGen/Generation.java deleted file mode 100644 index 5be3e26..0000000 --- a/common/bspkrs/briefcasespeakers/worldGen/Generation.java +++ /dev/null @@ -1,45 +0,0 @@ -package bspkrs.briefcasespeakers.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; - -public class Generation implements IWorldGenerator -{ - - @Override - public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) - { - switch(world.provider.dimensionId){ - case -1: - generateNether(world, random, chunkX * 16, chunkZ * 16); - break; - case 0: - generateSurface(world, random, chunkX * 16, chunkZ * 16); - break; - case 1: - generateEnd(world, random, chunkX * 16, chunkZ * 16); - break; - } - } - - private void generateEnd(World world, Random random, int i, int j) {} - - private void generateSurface(World world, Random random, int i, int j) - { - for(int k = 0; k < 1; k++) { - int x = i + random.nextInt(16); - int y = random.nextInt(5); - int z = j + random.nextInt(16); - (new WorldGenMinable(BlockList.shadowOre.blockID, 1)).generate(world, random, x, y, z); - } - } - - private void generateNether(World world, Random random, int i, int j) {} - -} diff --git a/common/darkknight/jewelrycraft/CommonProxy.java b/common/darkknight/jewelrycraft/CommonProxy.java new file mode 100644 index 0000000..28ca770 --- /dev/null +++ b/common/darkknight/jewelrycraft/CommonProxy.java @@ -0,0 +1,24 @@ +package darkknight.jewelrycraft; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; +import cpw.mods.fml.common.network.IGuiHandler; + +public class CommonProxy implements IGuiHandler +{ + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) + { + // TODO Auto-generated method stub + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) + { + // TODO Auto-generated method stub + return null; + } + +} diff --git a/common/darkknight/jewelrycraft/JewelrycraftMod.java b/common/darkknight/jewelrycraft/JewelrycraftMod.java new file mode 100644 index 0000000..d7a2939 --- /dev/null +++ b/common/darkknight/jewelrycraft/JewelrycraftMod.java @@ -0,0 +1,122 @@ +package darkknight.jewelrycraft; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.NetLoginHandler; +import net.minecraft.network.packet.NetHandler; +import net.minecraft.network.packet.Packet1Login; +import net.minecraft.server.MinecraftServer; +import net.minecraftforge.oredict.OreDictionary; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.Mod.Instance; +import cpw.mods.fml.common.Mod.Metadata; +import cpw.mods.fml.common.ModMetadata; +import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.network.IConnectionHandler; +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 = JewelryCraftClient.class), + serverPacketHandlerSpec = @SidedPacketHandler(channels = { Reference.PACKET_CHANNEL }, packetHandler = JewelryCraftServer.class), + connectionHandler = JewelrycraftMod.class) +public class JewelrycraftMod implements IConnectionHandler +{ + @Instance(Reference.MODID) + public static JewelrycraftMod instance; + + @Metadata(Reference.MODID) + 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) + { + ConfigHandler.preInit(e); + ItemList.preInit(e); + BlockList.preInit(e); + CraftingRecipes.preInit(e); + } + + @EventHandler + public void init(FMLInitializationEvent e) + { + OreDictionary.registerOre("ingotShadow", new ItemStack(ItemList.shadowIngot)); + 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/darkknight/jewelrycraft/block/BlockBase.java b/common/darkknight/jewelrycraft/block/BlockBase.java new file mode 100644 index 0000000..0378fb5 --- /dev/null +++ b/common/darkknight/jewelrycraft/block/BlockBase.java @@ -0,0 +1,19 @@ +package darkknight.jewelrycraft.block; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class BlockBase extends Block +{ + public BlockBase(int par1, Material mat) + { + super(par1, mat); + } + + @Override + public Block setUnlocalizedName(String name) + { + Block r = super.setUnlocalizedName(name); + return r.setTextureName(name.replaceAll("\\.", ":")); + } +} diff --git a/common/darkknight/jewelrycraft/block/BlockList.java b/common/darkknight/jewelrycraft/block/BlockList.java new file mode 100644 index 0000000..18bdb5b --- /dev/null +++ b/common/darkknight/jewelrycraft/block/BlockList.java @@ -0,0 +1,37 @@ +package darkknight.jewelrycraft.block; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +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.tileentity.TileEntitySmelter; + +public class BlockList +{ + public static Block shadowOre; + public static Block smelter; + public static Block molder; + public static Block jewelCraftingTable; + + private static boolean isInitialized = false; + + public static void preInit(FMLPreInitializationEvent e) + { + if (!isInitialized) + { + 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"); + GameRegistry.registerBlock(molder, "Molder"); + GameRegistry.registerBlock(jewelCraftingTable, "jewelCraftingTable"); + + GameRegistry.registerTileEntity(TileEntitySmelter.class, "30"); + } + } +} diff --git a/common/darkknight/jewelrycraft/block/BlockMolder.java b/common/darkknight/jewelrycraft/block/BlockMolder.java new file mode 100644 index 0000000..05b7b0a --- /dev/null +++ b/common/darkknight/jewelrycraft/block/BlockMolder.java @@ -0,0 +1,27 @@ +package darkknight.jewelrycraft.block; + +import darkknight.jewelrycraft.tileentity.TileEntityMolder; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class BlockMolder extends BlockContainer +{ + protected BlockMolder(int par1, Material par2Material) + { + super(par1, par2Material); + } + + @Override + public TileEntity createNewTileEntity(World world) + { + return new TileEntityMolder(); + } + + @Override + public boolean renderAsNormalBlock() + { + return false; + } +} diff --git a/common/darkknight/jewelrycraft/block/BlockSmelter.java b/common/darkknight/jewelrycraft/block/BlockSmelter.java new file mode 100644 index 0000000..2be6743 --- /dev/null +++ b/common/darkknight/jewelrycraft/block/BlockSmelter.java @@ -0,0 +1,60 @@ +package darkknight.jewelrycraft.block; + +import darkknight.jewelrycraft.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.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; + } +} 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/darkknight/jewelrycraft/client/JewelryCraftClient.java b/common/darkknight/jewelrycraft/client/JewelryCraftClient.java new file mode 100644 index 0000000..734e9d5 --- /dev/null +++ b/common/darkknight/jewelrycraft/client/JewelryCraftClient.java @@ -0,0 +1,16 @@ +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 JewelryCraftClient implements IPacketHandler +{ + @Override + public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player) + { + // TODO Auto-generated method stub + + } +} diff --git a/common/darkknight/jewelrycraft/config/ConfigHandler.java b/common/darkknight/jewelrycraft/config/ConfigHandler.java new file mode 100644 index 0000000..e90a69b --- /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/darkknight/jewelrycraft/item/ItemBase.java b/common/darkknight/jewelrycraft/item/ItemBase.java new file mode 100644 index 0000000..7f806bf --- /dev/null +++ b/common/darkknight/jewelrycraft/item/ItemBase.java @@ -0,0 +1,18 @@ +package darkknight.jewelrycraft.item; + +import net.minecraft.item.Item; + +public class ItemBase extends Item +{ + public ItemBase(int par1) + { + super(par1); + } + + @Override + public Item setUnlocalizedName(String name) + { + Item r = super.setUnlocalizedName(name); + return r.setTextureName(name.replaceAll("\\.", ":")); + } +} 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/darkknight/jewelrycraft/item/ItemThiefGloves.java b/common/darkknight/jewelrycraft/item/ItemThiefGloves.java new file mode 100644 index 0000000..97d83cd --- /dev/null +++ b/common/darkknight/jewelrycraft/item/ItemThiefGloves.java @@ -0,0 +1,64 @@ +package darkknight.jewelrycraft.item; + +import java.util.Iterator; +import java.util.Random; + +import cpw.mods.fml.relauncher.ReflectionHelper; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.passive.EntityVillager; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.village.MerchantRecipe; +import net.minecraft.village.MerchantRecipeList; + +public class ItemThiefGloves extends ItemBase +{ + public Random rand; + public ItemThiefGloves(int par1) + { + super(par1); + this.setCreativeTab(CreativeTabs.tabTools); + } + + @Override + public boolean itemInteractionForEntity(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, EntityLivingBase par3EntityLivingBase) + { + if (par3EntityLivingBase instanceof EntityVillager) + { + EntityVillager villager = (EntityVillager) par3EntityLivingBase; + int wealth = (Integer) ReflectionHelper.getPrivateValue(EntityVillager.class, villager, "wealth", "field_70956_bz"); + MerchantRecipeList buyingList = (MerchantRecipeList) ReflectionHelper.getPrivateValue(EntityVillager.class, villager, "buyingList", "field_70963_i"); + if(buyingList!=null) + { + Iterator iterator = buyingList.iterator(); + while(iterator.hasNext()) + { + MerchantRecipe recipe = (MerchantRecipe)iterator.next(); + int quantity; + if(recipe.getItemToSell().isStackable()) quantity = recipe.getItemToSell().stackSize * 7; + else quantity = 1; + ItemStack s = new ItemStack(recipe.getItemToSell().itemID, quantity, recipe.getItemToSell().getItemDamage()); + s.setTagCompound(recipe.getItemToSell().getTagCompound()); + if(par2EntityPlayer.inventory.addItemStackToInventory(s)); + else villager.entityDropItem(s, 0); + par2EntityPlayer.addChatMessage("Villager #" + villager.getProfession() + ": Hmmm... I seem to have lost my " + s.getDisplayName() + "!"); + } + buyingList.clear(); + ReflectionHelper.setPrivateValue(EntityVillager.class, villager, 300, "timeUntilReset", "field_70961_j"); + ReflectionHelper.setPrivateValue(EntityVillager.class, villager, true, "needsInitilization", "field_70959_by"); + } + + villager.dropItem(Item.emerald.itemID, wealth); + ReflectionHelper.setPrivateValue(EntityVillager.class, villager, 0, "wealth", "field_70956_bz"); + return true; + } + else + { + return super.itemInteractionForEntity(par1ItemStack, par2EntityPlayer, par3EntityLivingBase); + } + } + +} 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/recipes/CraftingRecipes.java b/common/darkknight/jewelrycraft/recipes/CraftingRecipes.java new file mode 100644 index 0000000..57d28fa --- /dev/null +++ b/common/darkknight/jewelrycraft/recipes/CraftingRecipes.java @@ -0,0 +1,22 @@ +package darkknight.jewelrycraft.recipes; + +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 +{ + private static boolean isInitialized = false; + + public static void preInit(FMLPreInitializationEvent e) + { + if (!isInitialized) + { + GameRegistry.addRecipe(new ItemStack(ItemList.thiefGloves), "x x", "yxy", "yxy", 'x', ItemList.shadowIngot, 'y', new ItemStack(Block.cloth, 1, 15)); + GameRegistry.addSmelting(BlockList.shadowOre.blockID, new ItemStack(ItemList.shadowIngot), 1.5f); + } + } +} diff --git a/common/darkknight/jewelrycraft/server/JewelryCraftServer.java b/common/darkknight/jewelrycraft/server/JewelryCraftServer.java new file mode 100644 index 0000000..061175c --- /dev/null +++ b/common/darkknight/jewelrycraft/server/JewelryCraftServer.java @@ -0,0 +1,16 @@ +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 JewelryCraftServer implements IPacketHandler +{ + @Override + public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player) + { + // TODO Auto-generated method stub + + } +} diff --git a/common/darkknight/jewelrycraft/tileentity/TileEntityMolder.java b/common/darkknight/jewelrycraft/tileentity/TileEntityMolder.java new file mode 100644 index 0000000..fbf7203 --- /dev/null +++ b/common/darkknight/jewelrycraft/tileentity/TileEntityMolder.java @@ -0,0 +1,8 @@ +package darkknight.jewelrycraft.tileentity; + +import net.minecraft.tileentity.TileEntity; + +public class TileEntityMolder extends TileEntity +{ + +} diff --git a/common/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java b/common/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java new file mode 100644 index 0000000..1a9ce66 --- /dev/null +++ b/common/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java @@ -0,0 +1,60 @@ +package darkknight.jewelrycraft.tileentity; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; + +public class TileEntitySmelter extends TileEntity +{ + public int moltenMetalID, metalID, melting; + public boolean hasMetal, hasMoltenMetal; + + public TileEntitySmelter() + { + this.moltenMetalID = 0; + this.metalID = 0; + this.melting = 0; + this.hasMetal = false; + this.hasMoltenMetal= false; + } + + @Override + public void writeToNBT(NBTTagCompound par1) + { + super.writeToNBT(par1); + par1.setInteger("moltenMetalID", moltenMetalID); + par1.setInteger("metalID", metalID); + par1.setInteger("melting", melting); + par1.setBoolean("hasMetal", hasMetal); + par1.setBoolean("hasMoltenMetal", hasMoltenMetal); + } + + @Override + public void readFromNBT(NBTTagCompound par1) + { + super.readFromNBT(par1); + this.moltenMetalID = par1.getInteger("moltenMetalID"); + this.metalID = par1.getInteger("metalID"); + this.melting = par1.getInteger("melting"); + this.hasMetal = par1.getBoolean("hasMetal"); + this.hasMoltenMetal = par1.getBoolean("hasMoltenMetal"); + } + + public void updateEntity() + { + super.updateEntity(); + if(this.hasMetal) + { + while(melting > 0){ + this.melting--; + System.out.println(melting); + } + if(melting == 0) + { + this.hasMetal = false; + this.moltenMetalID = metalID; + this.metalID = 0; + this.hasMoltenMetal = true; + } + } + } +} diff --git a/common/darkknight/jewelrycraft/worldGen/Generation.java b/common/darkknight/jewelrycraft/worldGen/Generation.java new file mode 100644 index 0000000..341b91e --- /dev/null +++ b/common/darkknight/jewelrycraft/worldGen/Generation.java @@ -0,0 +1,45 @@ +package darkknight.jewelrycraft.worldGen; + +import java.util.Random; + + +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 +{ + + @Override + public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) + { + switch(world.provider.dimensionId){ + case -1: + generateNether(world, random, chunkX * 16, chunkZ * 16); + break; + case 0: + generateSurface(world, random, chunkX * 16, chunkZ * 16); + break; + case 1: + generateEnd(world, random, chunkX * 16, chunkZ * 16); + break; + } + } + + private void generateEnd(World world, Random random, int i, int j) {} + + private void generateSurface(World world, Random random, int i, int j) + { + for(int k = 0; k < 1; k++) { + int x = i + random.nextInt(16); + int y = random.nextInt(5); + int z = j + random.nextInt(16); + (new WorldGenMinable(BlockList.shadowOre.blockID, 1)).generate(world, random, x, y, z); + } + } + + private void generateNether(World world, Random random, int i, int j) {} + +} -- cgit v1.2.3