Added some bees and shit.

Added Force.
Updated how GT++ material components get localized.

4 files changed, 39 insertions, 14 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java
index b3f12bc9d5..488ef2ea0b 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java
@@ -1,17 +1,18 @@
 package gtPlusPlus.xmod.forestry.bees.handler;
 
-import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_LanguageManager;
+import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
+import net.minecraft.item.ItemStack;
 
 public enum GTPP_CombType {
 
-	DRAGONBLOOD(0, "Dragon Blood", true, Materials._NULL, 30, Utils.rgbtoHexValue(220, 20, 20), Utils.rgbtoHexValue(20, 20, 20)),
-	FORCE(1, "Force", true, Materials.Force, 30, Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5));
+	DRAGONBLOOD(0, "Dragon Blood", true, 30, Utils.rgbtoHexValue(220, 20, 20), Utils.rgbtoHexValue(20, 20, 20)),
+	FORCE(1, "Force", true, 30, Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5));
 
 	public boolean mShowInList;
-	public Materials mMaterial;
+	public Material mMaterial;
 	public int mChance;
 	public int mID;
 
@@ -27,15 +28,15 @@ public enum GTPP_CombType {
 		return GTPP_Bees.sCombMappings.get(aID);
 	}
 
-	GTPP_CombType(int aID, String aName, boolean aShow, Materials aMaterial, int aChance, int... aColour) {
+	GTPP_CombType(int aID, String aName, boolean aShow, int aChance, int... aColour) {
 		this.mID = aID;
 		this.mName = aName;
 		this.mNameUnlocal = aName.toLowerCase().replaceAll(" ", "");
-		this.mMaterial = aMaterial;
 		this.mChance = aChance;
 		this.mShowInList = aShow;
 		this.mColour = aColour;
 		map(aID, this);
+		this.mMaterial = GTPP_Bees.sMaterialMappings.get(aName.toLowerCase().replaceAll(" ", ""));
 	}
 
 	public void setHidden() {
@@ -49,4 +50,8 @@ public enum GTPP_CombType {
 	public int[] getColours() {
 		return mColour == null || mColour.length != 2 ? new int[]{0, 0} : mColour;
 	}
+
+	public ItemStack getStackForType(int count) {
+		return new ItemStack(GTPP_Bees.combs, count, mID);
+	}
 }
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java
index 70333fdf2d..60b8a18e48 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java
@@ -1,16 +1,18 @@
 package gtPlusPlus.xmod.forestry.bees.handler;
 
-import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_LanguageManager;
+import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
+import net.minecraft.item.ItemStack;
 
 public enum GTPP_DropType {
 
-	DRAGONBLOOD(0, "Dragon Blood", true, Utils.rgbtoHexValue(220, 20, 20), Utils.rgbtoHexValue(20, 20, 20));
+	DRAGONBLOOD(0, "Dragon Blood", true, Utils.rgbtoHexValue(220, 20, 20), Utils.rgbtoHexValue(20, 20, 20)),
+	FORCE(1, "Force", true, Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5));
     
 	public boolean mShowInList;
-	public Materials mMaterial;
+	public Material mMaterial;
 	public int mChance;
 	public int mID;
 
@@ -33,6 +35,7 @@ public enum GTPP_DropType {
         this.mShowInList = aShow;
         this.mColour = aColour;
 		map(aID, this);
+		this.mMaterial = GTPP_Bees.sMaterialMappings.get(aName.toLowerCase().replaceAll(" ", ""));
     }
 
     public void setHidden() {
@@ -46,4 +49,8 @@ public enum GTPP_DropType {
     public int[] getColours() {
         return mColour;
     }
+
+	public ItemStack getStackForType(int count) {
+		return new ItemStack(GTPP_Bees.drop, count, mID);
+	}
 }
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java
index cf0543ebf1..70dae45d06 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java
@@ -1,16 +1,17 @@
 package gtPlusPlus.xmod.forestry.bees.handler;
 
-import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_LanguageManager;
+import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
+import net.minecraft.item.ItemStack;
 
 public enum GTPP_PollenType {
 
 	DRAGONBLOOD(0, "Dragon Blood", true, Utils.rgbtoHexValue(220, 20, 20), Utils.rgbtoHexValue(20, 20, 20));
 
 	public boolean mShowInList;
-	public Materials mMaterial;
+	public Material mMaterial;
 	public int mChance;
 	public int mID;
 
@@ -33,6 +34,7 @@ public enum GTPP_PollenType {
 		this.mShowInList = aShow;
 		this.mColour = aColour;
 		map(aID, this);
+		this.mMaterial = GTPP_Bees.sMaterialMappings.get(aName.toLowerCase().replaceAll(" ", ""));
 	}
 
 	public void setHidden() {
@@ -46,4 +48,8 @@ public enum GTPP_PollenType {
 	public int[] getColours() {
 		return mColour;
 	}
+
+	public ItemStack getStackForType(int count) {
+		return new ItemStack(GTPP_Bees.pollen, count, mID);
+	}
 }
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java
index a989b4d9cb..20e4f31008 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java
@@ -1,16 +1,18 @@
 package gtPlusPlus.xmod.forestry.bees.handler;
 
-import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_LanguageManager;
+import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.forestry.bees.registry.GTPP_Bees;
+import net.minecraft.item.ItemStack;
 
 public enum GTPP_PropolisType {
 
-    DRAGONBLOOD(0, "Dragon Blood", true, Utils.rgbtoHexValue(220, 20, 20));
+    DRAGONBLOOD(0, "Dragon Blood", true, Utils.rgbtoHexValue(220, 20, 20)),
+    FORCE(1, "Force", true, Utils.rgbtoHexValue(250, 250, 20));
 
 	public boolean mShowInList;
-	public Materials mMaterial;
+	public Material mMaterial;
 	public int mChance;
 	public int mID;
 
@@ -33,6 +35,7 @@ public enum GTPP_PropolisType {
         this.mShowInList = aShow;
         this.mColour = aColour;
 		map(aID, this);
+		this.mMaterial = GTPP_Bees.sMaterialMappings.get(aName.toLowerCase().replaceAll(" ", ""));
     }
 
     public void setHidden() {
@@ -46,4 +49,8 @@ public enum GTPP_PropolisType {
     public int getColours() {
         return mColour;
     }
+
+	public ItemStack getStackForType(int count) {
+		return new ItemStack(GTPP_Bees.propolis, count, mID);
+	}
 }