diff options
| author | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2013-12-14 21:12:38 +0200 |
|---|---|---|
| committer | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2013-12-14 21:12:38 +0200 |
| commit | 797382881f366e733312ee4ae3c59067ffbe171a (patch) | |
| tree | f8c60cd646c9ebb48c0f0071fd19d103c0c958cc /common/bspkrs/briefcasespeakers/config/ConfigHandler.java | |
| parent | 40ca1a9e481601ca258ec1895e6e10e8f3dec3e0 (diff) | |
| parent | 446f372cb361279f19438a2fa75bfcf85ff67aa8 (diff) | |
Merge branch 'master' of https://github.com/sor1n/Modjam-Mod
Conflicts:
common/bspkrs/briefcasespeakers/config/ConfigHandler.java
common/bspkrs/briefcasespeakers/item/ItemList.java
Diffstat (limited to 'common/bspkrs/briefcasespeakers/config/ConfigHandler.java')
| -rw-r--r-- | common/bspkrs/briefcasespeakers/config/ConfigHandler.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/common/bspkrs/briefcasespeakers/config/ConfigHandler.java b/common/bspkrs/briefcasespeakers/config/ConfigHandler.java index d843d27..6fc14db 100644 --- a/common/bspkrs/briefcasespeakers/config/ConfigHandler.java +++ b/common/bspkrs/briefcasespeakers/config/ConfigHandler.java @@ -7,11 +7,13 @@ 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; public static int idShadowIngot = 17497; + public static int idBriefcaseSpeakers = 1749; + public static int idShadowOre = 200; private static boolean isInitialized = false; @@ -24,8 +26,11 @@ public class ConfigHandler config.load(); + // Blocks + idBriefcaseSpeakers = config.getBlock("id.BriefcaseSpeakers", idBriefcaseSpeakers).getInt(); + + // Items 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(); idShadowIngot = config.getItem("id.ShadowIngot", idShadowIngot).getInt(); |