Created new items for the trading machine.

Each Item has it's own recipe. Then you craft the trading machine using the items.
Recon1991 · Aug 14, 2013 · d6aa56d · d6aa56d
1 parent c80d6e9
commit d6aa56d
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 1 deletion.
diff --git a/minecraft/pixelmon/config/PixelmonItems.java b/minecraft/pixelmon/config/PixelmonItems.java
@@ -91,7 +91,12 @@ public class PixelmonItems {
  public static int bootsAluminiumID;
  public static int newRunningShoesID;
  public static int oldRunningShoesID;
-
+
+ public static int tradeMonitorID;
+ public static int tradeHolderRightID;
+ public static int LtradeHolderLeftID;
+ public static int tradePanelID;
+
  public static int aluminiumIngotID;
  public static int aluminiumPlateID;
 
@@ -226,6 +231,17 @@ public class PixelmonItems {
  public static Item goodRod;
  @Mod.Item(name = "Super Rod", typeClass = "pixelmon.items.ItemFishingRod")
  public static Item superRod;
+
+ @Mod.Item(name = "Tradeing Machine Monitor", typeClass = "pixelmon.items.ItemTradingMachine")
+ public static Item tradeMonitor;
+ @Mod.Item(name = "Tradeing Machine Holder Right", typeClass = "pixelmon.items.ItemTradingMachine")
+ public static Item tradeHolderRight;
+ @Mod.Item(name = "Tradeing Machine Holder Left", typeClass = "pixelmon.items.ItemTradingMachineL")
+ public static Item LtradeHolderLeft;
+ @Mod.Item(name = "Tradeing Machine Control Panel", typeClass = "pixelmon.items.ItemTradingMachine")
+ public static Item tradePanel;
+
+
 
  public static void load(Configuration cfg) {
  PixelmonItemsPokeballs.load(cfg);
@@ -298,6 +314,11 @@ public static void load(Configuration cfg) {
  oldRodID = cfg.get("item", "Old Rod", 10137).getInt();
  goodRodID = cfg.get("item", "Good Rod", 10138).getInt();
  superRodID = cfg.get("item", "Super Rod", 10139).getInt();
+
+ tradeMonitorID = cfg.get("item", "Trade Monitor", 10140).getInt();
+ tradeHolderRightID = cfg.get("item", "Trade Holder Right", 10141).getInt();
+ LtradeHolderLeftID = cfg.get("item", "Trade Holder Left", 10143).getInt();
+ tradePanelID = cfg.get("item", "Trade Panel", 10144).getInt();
 
  pokeDex = new ItemPokedex(pokeDexID).setMaxStackSize(1);
  rareCandy = new PixelmonItem(rareCandyID, "healingitems/rarecandy", "Rare Candy").setCreativeTab(PixelmonCreativeTabs.restoration);
@@ -361,6 +382,11 @@ public static void load(Configuration cfg) {
  oldRod = new ItemFishingRod(oldRodID, EnumRodType.OldRod, "Old Rod");
  goodRod = new ItemFishingRod(goodRodID, EnumRodType.GoodRod, "Good Rod");
  superRod = new ItemFishingRod(superRodID, EnumRodType.SuperRod, "Super Rod");
+
+ tradeMonitor = new PixelmonItem(tradeMonitorID, "tradingmachinepieces/tradingMonitor", "Trade Monitor");
+ tradeHolderRight = new PixelmonItem(tradeHolderRightID, "tradingmachinepieces/tradingHolderR", "Trade Holder Right");
+ LtradeHolderLeft = new PixelmonItem(LtradeHolderLeftID, "tradingmachinepieces/tradingHolderL", "Trade Holder Left");
+ tradePanel = new PixelmonItem(tradePanelID, "tradingmachinepieces/tradingPanel", "Trade Panel");
 
  // TODO make correct icons for mossyrock and icyrock, instead of using
  // anvil

diff --git a/minecraft/pixelmon/config/PixelmonRecipes.java b/minecraft/pixelmon/config/PixelmonRecipes.java
@@ -3,6 +3,7 @@
 import java.util.Random;
 
 import net.minecraft.block.Block;
+import net.minecraft.block.BlockPane;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import pixelmon.enums.EnumApricorns;
@@ -94,7 +95,20 @@ public static void addRecipes() {
  GameRegistry.addRecipe(new ItemStack(PixelmonItems.oldRod, 1), new Object[] { " S", " ST", "S P", Character.valueOf('S'), Item.stick,
  Character.valueOf('T'), Item.silk, Character.valueOf('P'), PixelmonItemsPokeballs.pokeBall });
 
+ GameRegistry.addRecipe(new ItemStack(PixelmonItems.LtradeHolderLeft, 1), new Object[] { "APA", "AAA", " ", Character.valueOf('A'), PixelmonItems.aluminiumPlate, Character.valueOf('P'), PixelmonItemsPokeballs.pokeBall});
 
+ GameRegistry.addRecipe(new ItemStack(PixelmonItems.tradeHolderRight, 1), new Object[] { "APA", "AAA", " A ", Character.valueOf('A'), PixelmonItems.aluminiumPlate, Character.valueOf('P'), PixelmonItemsPokeballs.pokeBall});
+
+ GameRegistry.addRecipe(new ItemStack(PixelmonItems.tradeMonitor, 1), new Object[] { "AAA", "AGA", "AAA", Character.valueOf('A'), PixelmonItems.aluminiumPlate,
+ Character.valueOf('G'), Block.thinGlass});
+
+ GameRegistry.addRecipe(new ItemStack(PixelmonItems.tradePanel, 1), new Object[] { "AAA", "RRR", "ARA", Character.valueOf('A'), PixelmonItems.aluminiumPlate,
+ Character.valueOf('R'), Item.redstone});
+
+
+ GameRegistry.addRecipe(new ItemStack(PixelmonItems.tradeMachineItem, 1), new Object[] { " M ", "LPR", " ", Character.valueOf('M'), PixelmonItems.tradeMonitor,
+ Character.valueOf('R'), PixelmonItems.tradeHolderRight, Character.valueOf('P'), PixelmonItems.tradePanel, Character.valueOf('L'), PixelmonItems.LtradeHolderLeft});
+
 
  GameRegistry.addRecipe(new ItemStack(PixelmonItems.anvilItem, 1), new Object[] { "XXX", "XX ", "XXX", Character.valueOf('X'), Item.ingotIron });