From fce56ee48df4d7b7aa83e054a106b83b04c06236 Mon Sep 17 00:00:00 2001 From: bspkrs Date: Sat, 14 Dec 2013 13:28:36 -0500 Subject: removed unneeded item classes --- .../bspkrs/briefcasespeakers/item/ItemBriefcaseSpeakers.java | 12 ------------ common/bspkrs/briefcasespeakers/item/ItemSpeaker.java | 9 --------- 2 files changed, 21 deletions(-) delete mode 100644 common/bspkrs/briefcasespeakers/item/ItemBriefcaseSpeakers.java delete mode 100644 common/bspkrs/briefcasespeakers/item/ItemSpeaker.java diff --git a/common/bspkrs/briefcasespeakers/item/ItemBriefcaseSpeakers.java b/common/bspkrs/briefcasespeakers/item/ItemBriefcaseSpeakers.java deleted file mode 100644 index bf85153..0000000 --- a/common/bspkrs/briefcasespeakers/item/ItemBriefcaseSpeakers.java +++ /dev/null @@ -1,12 +0,0 @@ -package bspkrs.briefcasespeakers.item; - -import net.minecraft.creativetab.CreativeTabs; - -public class ItemBriefcaseSpeakers extends ItemBase -{ - public ItemBriefcaseSpeakers(int par1) - { - super(par1); - setCreativeTab(CreativeTabs.tabMaterials); - } -} diff --git a/common/bspkrs/briefcasespeakers/item/ItemSpeaker.java b/common/bspkrs/briefcasespeakers/item/ItemSpeaker.java deleted file mode 100644 index fe433be..0000000 --- a/common/bspkrs/briefcasespeakers/item/ItemSpeaker.java +++ /dev/null @@ -1,9 +0,0 @@ -package bspkrs.briefcasespeakers.item; - -public class ItemSpeaker extends ItemBase -{ - public ItemSpeaker(int par1) - { - super(par1); - } -} -- cgit v1.2.3 From d2122cd45973fe93fb80b2d0ab5338cc9de8d289 Mon Sep 17 00:00:00 2001 From: bspkrs Date: Sat, 14 Dec 2013 13:29:13 -0500 Subject: changed briefcase speakers ID to be a block (duh) --- common/bspkrs/briefcasespeakers/config/ConfigHandler.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/common/bspkrs/briefcasespeakers/config/ConfigHandler.java b/common/bspkrs/briefcasespeakers/config/ConfigHandler.java index 1e653fa..6ea7453 100644 --- a/common/bspkrs/briefcasespeakers/config/ConfigHandler.java +++ b/common/bspkrs/briefcasespeakers/config/ConfigHandler.java @@ -7,10 +7,11 @@ 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 idSpeaker = 17494; + public static int idRemote = 17495; + public static int idShadowIngot = 17496; + + public static int idBriefcaseSpeakers = 1749; private static boolean isInitialized = false; @@ -22,8 +23,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(); -- cgit v1.2.3 From 3d003fab4abc4bcb761956f8c52407753021c437 Mon Sep 17 00:00:00 2001 From: bspkrs Date: Sat, 14 Dec 2013 13:29:55 -0500 Subject: made ItemBase instantiable (sic) --- common/bspkrs/briefcasespeakers/item/ItemBase.java | 2 +- common/bspkrs/briefcasespeakers/item/ItemList.java | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/common/bspkrs/briefcasespeakers/item/ItemBase.java b/common/bspkrs/briefcasespeakers/item/ItemBase.java index a70f173..9a017b6 100644 --- a/common/bspkrs/briefcasespeakers/item/ItemBase.java +++ b/common/bspkrs/briefcasespeakers/item/ItemBase.java @@ -2,7 +2,7 @@ package bspkrs.briefcasespeakers.item; import net.minecraft.item.Item; -public abstract class ItemBase extends Item +public class ItemBase extends Item { public ItemBase(int par1) { diff --git a/common/bspkrs/briefcasespeakers/item/ItemList.java b/common/bspkrs/briefcasespeakers/item/ItemList.java index a283d7b..c579cf9 100644 --- a/common/bspkrs/briefcasespeakers/item/ItemList.java +++ b/common/bspkrs/briefcasespeakers/item/ItemList.java @@ -19,11 +19,10 @@ public class ItemList { 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"); - remote = new ItemRemote(ConfigHandler.idRemote).setUnlocalizedName("briefcasespeakers.remote"); - shadowIngot = new Item(ConfigHandler.idShadowIngot).setUnlocalizedName("briefcasespeakers.ingotShadow").setCreativeTab(CreativeTabs.tabMaterials).setTextureName("shadowIngot"); + thiefGloves = new ItemThiefGloves(ConfigHandler.idThiefGloves).setUnlocalizedName("briefcasespeakers.thiefGloves").setCreativeTab(CreativeTabs.tabCombat); + speaker = new ItemBase(ConfigHandler.idSpeaker).setUnlocalizedName("briefcasespeakers.speakers").setCreativeTab(CreativeTabs.tabMisc); + remote = new ItemRemote(ConfigHandler.idRemote).setUnlocalizedName("briefcasespeakers.remote").setCreativeTab(CreativeTabs.tabMisc); + shadowIngot = new ItemBase(ConfigHandler.idShadowIngot).setUnlocalizedName("briefcasespeakers.ingotShadow").setCreativeTab(CreativeTabs.tabMaterials); } } } -- cgit v1.2.3 From 446f372cb361279f19438a2fa75bfcf85ff67aa8 Mon Sep 17 00:00:00 2001 From: bspkrs Date: Sat, 14 Dec 2013 13:41:30 -0500 Subject: moved stuff from reference to resources... @.@ --- reference/assets/briefcasespeakers/lang/en_US.lang | 5 ----- reference/assets/briefcasespeakers/pack.mcmeta | 6 ------ .../textures/items/briefcaseSpeakers.png | 0 .../assets/briefcasespeakers/textures/items/remote.png | 0 .../briefcasespeakers/textures/items/shadowIngot.png | Bin 320 -> 0 bytes .../assets/briefcasespeakers/textures/items/speaker.png | 0 resources/assets/briefcasespeakers/lang/en_US.lang | 5 +++++ resources/assets/briefcasespeakers/pack.mcmeta | 6 ++++++ .../textures/items/briefcaseSpeakers.png | 0 .../assets/briefcasespeakers/textures/items/remote.png | 0 .../briefcasespeakers/textures/items/shadowIngot.png | Bin 0 -> 320 bytes .../assets/briefcasespeakers/textures/items/speaker.png | 0 12 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 reference/assets/briefcasespeakers/lang/en_US.lang delete mode 100644 reference/assets/briefcasespeakers/pack.mcmeta delete mode 100644 reference/assets/briefcasespeakers/textures/items/briefcaseSpeakers.png delete mode 100644 reference/assets/briefcasespeakers/textures/items/remote.png delete mode 100644 reference/assets/briefcasespeakers/textures/items/shadowIngot.png delete mode 100644 reference/assets/briefcasespeakers/textures/items/speaker.png create mode 100644 resources/assets/briefcasespeakers/lang/en_US.lang create mode 100644 resources/assets/briefcasespeakers/pack.mcmeta create mode 100644 resources/assets/briefcasespeakers/textures/items/briefcaseSpeakers.png create mode 100644 resources/assets/briefcasespeakers/textures/items/remote.png create mode 100644 resources/assets/briefcasespeakers/textures/items/shadowIngot.png create mode 100644 resources/assets/briefcasespeakers/textures/items/speaker.png diff --git a/reference/assets/briefcasespeakers/lang/en_US.lang b/reference/assets/briefcasespeakers/lang/en_US.lang deleted file mode 100644 index 1282df4..0000000 --- a/reference/assets/briefcasespeakers/lang/en_US.lang +++ /dev/null @@ -1,5 +0,0 @@ -item.briefcasespeakers.briefcaseSpeakers=Briefcase Speakers -item.briefcasespeakers.remote=Audio Remote -item.briefcasespeakers.speaker=Speaker -item.briefcasespeakers.thiefGloves=Thiefing Gloves -item.briefcasespeakers.ingotShadow=Shadow Ingot \ No newline at end of file diff --git a/reference/assets/briefcasespeakers/pack.mcmeta b/reference/assets/briefcasespeakers/pack.mcmeta deleted file mode 100644 index 3aab978..0000000 --- a/reference/assets/briefcasespeakers/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "pack_format": 1, - "description": "BriefcaseSpeakers" - } -} \ No newline at end of file diff --git a/reference/assets/briefcasespeakers/textures/items/briefcaseSpeakers.png b/reference/assets/briefcasespeakers/textures/items/briefcaseSpeakers.png deleted file mode 100644 index e69de29..0000000 diff --git a/reference/assets/briefcasespeakers/textures/items/remote.png b/reference/assets/briefcasespeakers/textures/items/remote.png deleted file mode 100644 index e69de29..0000000 diff --git a/reference/assets/briefcasespeakers/textures/items/shadowIngot.png b/reference/assets/briefcasespeakers/textures/items/shadowIngot.png deleted file mode 100644 index 1736496..0000000 Binary files a/reference/assets/briefcasespeakers/textures/items/shadowIngot.png and /dev/null differ diff --git a/reference/assets/briefcasespeakers/textures/items/speaker.png b/reference/assets/briefcasespeakers/textures/items/speaker.png deleted file mode 100644 index e69de29..0000000 diff --git a/resources/assets/briefcasespeakers/lang/en_US.lang b/resources/assets/briefcasespeakers/lang/en_US.lang new file mode 100644 index 0000000..1282df4 --- /dev/null +++ b/resources/assets/briefcasespeakers/lang/en_US.lang @@ -0,0 +1,5 @@ +item.briefcasespeakers.briefcaseSpeakers=Briefcase Speakers +item.briefcasespeakers.remote=Audio Remote +item.briefcasespeakers.speaker=Speaker +item.briefcasespeakers.thiefGloves=Thiefing Gloves +item.briefcasespeakers.ingotShadow=Shadow Ingot \ No newline at end of file diff --git a/resources/assets/briefcasespeakers/pack.mcmeta b/resources/assets/briefcasespeakers/pack.mcmeta new file mode 100644 index 0000000..3aab978 --- /dev/null +++ b/resources/assets/briefcasespeakers/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "pack_format": 1, + "description": "BriefcaseSpeakers" + } +} \ No newline at end of file diff --git a/resources/assets/briefcasespeakers/textures/items/briefcaseSpeakers.png b/resources/assets/briefcasespeakers/textures/items/briefcaseSpeakers.png new file mode 100644 index 0000000..e69de29 diff --git a/resources/assets/briefcasespeakers/textures/items/remote.png b/resources/assets/briefcasespeakers/textures/items/remote.png new file mode 100644 index 0000000..e69de29 diff --git a/resources/assets/briefcasespeakers/textures/items/shadowIngot.png b/resources/assets/briefcasespeakers/textures/items/shadowIngot.png new file mode 100644 index 0000000..1736496 Binary files /dev/null and b/resources/assets/briefcasespeakers/textures/items/shadowIngot.png differ diff --git a/resources/assets/briefcasespeakers/textures/items/speaker.png b/resources/assets/briefcasespeakers/textures/items/speaker.png new file mode 100644 index 0000000..e69de29 -- cgit v1.2.3