From 904e72acd61928dadf3ec40f2bbd9e9cb66e1d5e Mon Sep 17 00:00:00 2001 From: bspkrs Date: Fri, 13 Dec 2013 23:38:41 -0500 Subject: moved items from main class to ItemList.java added ConfigHandler.java --- .../briefcasespeakers/BriefcaseSpeakersMod.java | 10 +------ .../briefcasespeakers/config/ConfigHandler.java | 34 ++++++++++++++++++++++ common/bspkrs/briefcasespeakers/item/ItemList.java | 25 ++++++++++++++++ 3 files changed, 60 insertions(+), 9 deletions(-) create mode 100644 common/bspkrs/briefcasespeakers/config/ConfigHandler.java create mode 100644 common/bspkrs/briefcasespeakers/item/ItemList.java (limited to 'common/bspkrs') diff --git a/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java b/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java index 656ea1a..2d7f38b 100644 --- a/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java +++ b/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java @@ -1,14 +1,11 @@ package bspkrs.briefcasespeakers; -import net.minecraft.item.Item; 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 bspkrs.briefcasespeakers.client.BriefcaseSpeakersClient; -import bspkrs.briefcasespeakers.item.ItemBriefcaseSpeakers; -import bspkrs.briefcasespeakers.item.ItemThiefGloves; import bspkrs.briefcasespeakers.lib.Reference; import bspkrs.briefcasespeakers.server.BriefcaseSpeakersServer; import cpw.mods.fml.common.Mod; @@ -24,7 +21,6 @@ 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.LanguageRegistry; @Mod(modid = Reference.MODID, name = Reference.MODNAME, version = Reference.VERSION) @NetworkMod(clientSideRequired = false, serverSideRequired = false, @@ -42,9 +38,6 @@ public class BriefcaseSpeakersMod implements IConnectionHandler @SidedProxy(clientSide = "bspkrs.briefcasespeakers.client.ClientProxy", serverSide = "bspkrs.briefcasespeakers.CommonProxy") public static CommonProxy proxy; - public static Item bspkrs = new ItemBriefcaseSpeakers(1000).setUnlocalizedName("BriefcaseSpeakers"); - public static Item thief = new ItemThiefGloves(1001).setUnlocalizedName("ThiefGloves"); - @EventHandler public void preInit(FMLPreInitializationEvent e) { @@ -54,8 +47,7 @@ public class BriefcaseSpeakersMod implements IConnectionHandler @EventHandler public void init(FMLInitializationEvent e) { - LanguageRegistry.addName(bspkrs, "Briefcase Speakers"); - LanguageRegistry.addName(thief, "Thiefing Gloves"); + } @EventHandler diff --git a/common/bspkrs/briefcasespeakers/config/ConfigHandler.java b/common/bspkrs/briefcasespeakers/config/ConfigHandler.java new file mode 100644 index 0000000..00c088d --- /dev/null +++ b/common/bspkrs/briefcasespeakers/config/ConfigHandler.java @@ -0,0 +1,34 @@ +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 idBriefcaseSpeakers = 17494; + public static int idSpeaker = 17495; + public static int idRemote = 17496; + + 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(); + idBriefcaseSpeakers = config.getItem("id.BriefcaseSpeakers", idBriefcaseSpeakers).getInt(); + idSpeaker = config.getItem("id.Speaker", idSpeaker).getInt(); + idRemote = config.getItem("id.Remote", idRemote).getInt(); + + config.save(); + + isInitialized = true; + } + } +} diff --git a/common/bspkrs/briefcasespeakers/item/ItemList.java b/common/bspkrs/briefcasespeakers/item/ItemList.java new file mode 100644 index 0000000..3eaa537 --- /dev/null +++ b/common/bspkrs/briefcasespeakers/item/ItemList.java @@ -0,0 +1,25 @@ +package bspkrs.briefcasespeakers.item; + +import net.minecraft.item.Item; +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; + + private static boolean isInitialized = false; + + public void preInit(FMLPreInitializationEvent e) + { + if (!isInitialized) + { + thiefGloves = new ItemThiefGloves(ConfigHandler.idThiefGloves).setUnlocalizedName("briefcasespeakers.thiefGloves"); + briefcaseSpeakers = new ItemBriefcaseSpeakers(ConfigHandler.idBriefcaseSpeakers).setUnlocalizedName("briefcasespeakers.briefcaseSpeakers"); + speaker = new ItemSpeaker(ConfigHandler.idSpeaker).setUnlocalizedName("briefcasespeakers.speakers"); + } + } +} -- cgit v1.2.3