summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java4
-rw-r--r--common/bspkrs/briefcasespeakers/block/BlockList.java21
-rw-r--r--common/bspkrs/briefcasespeakers/config/ConfigHandler.java10
-rw-r--r--common/bspkrs/briefcasespeakers/item/ItemList.java1
-rw-r--r--common/bspkrs/briefcasespeakers/recipes/CraftingRecipes.java21
-rw-r--r--resources/assets/briefcasespeakers/lang/en_US.lang3
-rw-r--r--resources/assets/briefcasespeakers/textures/blocks/shadowOre.pngbin0 -> 2582 bytes
-rw-r--r--resources/assets/briefcasespeakers/textures/blocks/shadowOre.png.mcmeta5
-rw-r--r--resources/assets/briefcasespeakers/textures/items/ingotShadow.pngbin320 -> 552 bytes
-rw-r--r--resources/assets/briefcasespeakers/textures/items/shadowIngot.png.mcmeta5
10 files changed, 66 insertions, 4 deletions
diff --git a/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java b/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java
index f5dc840..758e371 100644
--- a/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java
+++ b/common/bspkrs/briefcasespeakers/BriefcaseSpeakersMod.java
@@ -5,10 +5,12 @@ 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.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 cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
@@ -45,6 +47,8 @@ public class BriefcaseSpeakersMod implements IConnectionHandler
{
ConfigHandler.preInit(e);
ItemList.preInit(e);
+ CraftingRecipes.preInit(e);
+ BlockList.preInit(e);
}
@EventHandler
diff --git a/common/bspkrs/briefcasespeakers/block/BlockList.java b/common/bspkrs/briefcasespeakers/block/BlockList.java
new file mode 100644
index 0000000..c340da6
--- /dev/null
+++ b/common/bspkrs/briefcasespeakers/block/BlockList.java
@@ -0,0 +1,21 @@
+package bspkrs.briefcasespeakers.block;
+
+import bspkrs.briefcasespeakers.config.ConfigHandler;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+
+public class BlockList
+{
+ public static Block shadowOre;
+
+ private static boolean isInitialized = false;
+
+ public static void preInit(FMLPreInitializationEvent e)
+ {
+ if (!isInitialized)
+ {
+ shadowOre = new Block(ConfigHandler.idShadowOre, Material.rock).setHardness(3.0F).setResistance(5.0F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("briefcasespeakers.oreShadow").setTextureName("briefcasespeakers:shadowOre");
+ }
+ }
+}
diff --git a/common/bspkrs/briefcasespeakers/config/ConfigHandler.java b/common/bspkrs/briefcasespeakers/config/ConfigHandler.java
index 6ea7453..6fc14db 100644
--- a/common/bspkrs/briefcasespeakers/config/ConfigHandler.java
+++ b/common/bspkrs/briefcasespeakers/config/ConfigHandler.java
@@ -7,12 +7,15 @@ public class ConfigHandler
{
private static Configuration config;
public static int idThiefGloves = 17493;
- public static int idSpeaker = 17494;
- public static int idRemote = 17495;
- public static int idShadowIngot = 17496;
+
+ 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;
public static void preInit(FMLPreInitializationEvent e)
@@ -31,6 +34,7 @@ public class ConfigHandler
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();
config.save();
diff --git a/common/bspkrs/briefcasespeakers/item/ItemList.java b/common/bspkrs/briefcasespeakers/item/ItemList.java
index c579cf9..66bd276 100644
--- a/common/bspkrs/briefcasespeakers/item/ItemList.java
+++ b/common/bspkrs/briefcasespeakers/item/ItemList.java
@@ -23,6 +23,7 @@ public class ItemList
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);
+
}
}
}
diff --git a/common/bspkrs/briefcasespeakers/recipes/CraftingRecipes.java b/common/bspkrs/briefcasespeakers/recipes/CraftingRecipes.java
new file mode 100644
index 0000000..61a5b78
--- /dev/null
+++ b/common/bspkrs/briefcasespeakers/recipes/CraftingRecipes.java
@@ -0,0 +1,21 @@
+package bspkrs.briefcasespeakers.recipes;
+
+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));
+
+ }
+ }
+}
diff --git a/resources/assets/briefcasespeakers/lang/en_US.lang b/resources/assets/briefcasespeakers/lang/en_US.lang
index d4979a3..4b58514 100644
--- a/resources/assets/briefcasespeakers/lang/en_US.lang
+++ b/resources/assets/briefcasespeakers/lang/en_US.lang
@@ -2,4 +2,5 @@ block.briefcasespeakers.briefcaseSpeakers.name=Briefcase Speakers
item.briefcasespeakers.remote.name=Audio Remote
item.briefcasespeakers.speaker.name=Speaker
item.briefcasespeakers.thiefGloves.name=Thiefing Gloves
-item.briefcasespeakers.ingotShadow.name=Shadow Ingot \ No newline at end of file
+item.briefcasespeakers.ingotShadow.name=Shadow Ingot
+block.briefcasespeakers.oreShadow=Shadow Ore \ No newline at end of file
diff --git a/resources/assets/briefcasespeakers/textures/blocks/shadowOre.png b/resources/assets/briefcasespeakers/textures/blocks/shadowOre.png
new file mode 100644
index 0000000..f248291
--- /dev/null
+++ b/resources/assets/briefcasespeakers/textures/blocks/shadowOre.png
Binary files differ
diff --git a/resources/assets/briefcasespeakers/textures/blocks/shadowOre.png.mcmeta b/resources/assets/briefcasespeakers/textures/blocks/shadowOre.png.mcmeta
new file mode 100644
index 0000000..09994da
--- /dev/null
+++ b/resources/assets/briefcasespeakers/textures/blocks/shadowOre.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation": {
+ "frametime": 4
+ }
+} \ No newline at end of file
diff --git a/resources/assets/briefcasespeakers/textures/items/ingotShadow.png b/resources/assets/briefcasespeakers/textures/items/ingotShadow.png
index 1736496..1522faf 100644
--- a/resources/assets/briefcasespeakers/textures/items/ingotShadow.png
+++ b/resources/assets/briefcasespeakers/textures/items/ingotShadow.png
Binary files differ
diff --git a/resources/assets/briefcasespeakers/textures/items/shadowIngot.png.mcmeta b/resources/assets/briefcasespeakers/textures/items/shadowIngot.png.mcmeta
new file mode 100644
index 0000000..09994da
--- /dev/null
+++ b/resources/assets/briefcasespeakers/textures/items/shadowIngot.png.mcmeta
@@ -0,0 +1,5 @@
+{
+ "animation": {
+ "frametime": 4
+ }
+} \ No newline at end of file