diff options
Diffstat (limited to 'common')
27 files changed, 95 insertions, 302 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/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/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..d7a2939 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,24 +22,39 @@ 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; + public static ModMetadata metadata; - @SidedProxy(clientSide = "bspkrs.briefcasespeakers.client.ClientProxy", serverSide = "bspkrs.briefcasespeakers.CommonProxy") - public static CommonProxy proxy; + @SidedProxy(clientSide = "darkknight.jewelrycraft.client.ClientProxy", serverSide = "darkknight.jewelrycraft.CommonProxy") + public static CommonProxy proxy; - public static CreativeTabs shadowspkrs = new CreativeTabs("shadowspkrs") {public ItemStack getIconItemStack() {return new ItemStack(ItemList.shadowIngot, 1, 0);}}; + public static CreativeTabs jewelrycraft = new CreativeTabs("JewelryCraft") + { + @Override + public ItemStack getIconItemStack() + { + return new ItemStack(ItemList.shadowIngot, 1, 0); + } + }; @EventHandler public void preInit(FMLPreInitializationEvent e) @@ -60,7 +67,7 @@ public class BriefcaseSpeakersMod implements IConnectionHandler @EventHandler public void init(FMLInitializationEvent e) - { + { OreDictionary.registerOre("ingotShadow", new ItemStack(ItemList.shadowIngot)); GameRegistry.registerWorldGenerator(new Generation()); } 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..18bdb5b 100644 --- a/common/bspkrs/briefcasespeakers/block/BlockList.java +++ b/common/darkknight/jewelrycraft/block/BlockList.java @@ -1,12 +1,12 @@ -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.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 { @@ -21,10 +21,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"); 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/bspkrs/briefcasespeakers/block/BlockSmelter.java b/common/darkknight/jewelrycraft/block/BlockSmelter.java index 153949f..2be6743 100644 --- a/common/bspkrs/briefcasespeakers/block/BlockSmelter.java +++ b/common/darkknight/jewelrycraft/block/BlockSmelter.java @@ -1,12 +1,12 @@ -package bspkrs.briefcasespeakers.block; +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; -import bspkrs.briefcasespeakers.tileentity.TileEntitySmelter; public class BlockSmelter extends BlockContainer { 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/bspkrs/briefcasespeakers/config/ConfigHandler.java b/common/darkknight/jewelrycraft/config/ConfigHandler.java index 4b990bd..e90a69b 100644 --- a/common/bspkrs/briefcasespeakers/config/ConfigHandler.java +++ b/common/darkknight/jewelrycraft/config/ConfigHandler.java @@ -1,4 +1,4 @@ -package bspkrs.briefcasespeakers.config; +package darkknight.jewelrycraft.config; import net.minecraftforge.common.Configuration; import cpw.mods.fml.common.event.FMLPreInitializationEvent; @@ -7,13 +7,8 @@ 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; @@ -29,13 +24,7 @@ public class ConfigHandler 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(); 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/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/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 e93f67e..1a9ce66 100644 --- a/common/bspkrs/briefcasespeakers/tileentity/TileEntitySmelter.java +++ b/common/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java @@ -1,4 +1,4 @@ -package bspkrs.briefcasespeakers.tileentity; +package darkknight.jewelrycraft.tileentity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; 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 { |