+ Added some new dummy items for Assembly Line research, so as not to conflict with existing recipes.

% Rewrote some of ItemGenericToken.java to allow other classes to extend it.
$ Fixed recipe overlap. Closes #431.

5 files changed, 46 insertions, 28 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 912e3ff30d..8057f6bbe1 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -37,6 +37,7 @@ import gtPlusPlus.core.item.chemistry.IonParticles;
 import gtPlusPlus.core.item.chemistry.NuclearChem;
 import gtPlusPlus.core.item.chemistry.RocketFuels;
 import gtPlusPlus.core.item.chemistry.StandardBaseParticles;
+import gtPlusPlus.core.item.crafting.ItemDummyResearch;
 import gtPlusPlus.core.item.effects.RarityUncommon;
 import gtPlusPlus.core.item.general.BaseItemGrindle;
 import gtPlusPlus.core.item.general.BufferCore;
@@ -308,7 +309,7 @@ public final class ModItems {
 
 	public static GregtechPump toolGregtechPump;
 
-	public static Item itemGenericToken;
+	public static ItemGenericToken itemGenericToken;
 
 	public static Item itemControlCore;
 
@@ -332,7 +333,9 @@ public final class ModItems {
 	public static BatteryPackBaseBauble itemChargePack3;
 	public static BatteryPackBaseBauble itemChargePack4;
 
-	public static Item itemDebugScanner;
+	public static DebugScanner itemDebugScanner;
+
+	public static ItemDummyResearch itemDummyResearch;
 
 	static {
 		Logger.INFO("Items!");
@@ -343,11 +346,12 @@ public final class ModItems {
 
 	public static final void init(){
 		
-		itemDebugScanner = new DebugScanner().setTextureName(CORE.MODID + ":itemStickyRubber");
+		itemDebugScanner = new DebugScanner();
 		
 		itemAlkalusDisk = new BaseItemDamageable("itemAlkalusDisk", AddToCreativeTab.tabMisc, 1, 0, "Unknown Use", EnumRarity.rare, EnumChatFormatting.AQUA, false, null);
 		itemBigEgg = new ItemGiantEgg("itemBigEgg", "Ginourmous Chicken Egg", tabMisc, 64, 0, "I had best try disassemble this.. for science!", "fuelLargeChickenEgg", 5000, 0).setTextureName(CORE.MODID + ":itemBigEgg");
 		itemGenericToken = new ItemGenericToken();
+		itemDummyResearch = new ItemDummyResearch();
 		
 		//Debug Loading
 		if (CORE.DEBUG){
@@ -1076,10 +1080,10 @@ public final class ModItems {
 	}
 	
 	public static void registerCustomTokens() {
-		ItemGenericToken.register(0, "BitCoin", 16, "Can be used on the dark web");
-		ItemGenericToken.register(1, "Hand Pump Trade Token I", 1, "Craft into a Tier I Hand pump");
-		ItemGenericToken.register(2, "Hand Pump Trade Token II", 1, "Craft into a Tier II Hand pump");
-		ItemGenericToken.register(3, "Hand Pump Trade Token III", 1, "Craft into a Tier III Hand pump");
-		ItemGenericToken.register(4, "Hand Pump Trade Token IV", 1, "Craft into a Tier IV Hand pump");
+		itemGenericToken.register(0, "BitCoin", 16, "Can be used on the dark web");
+		itemGenericToken.register(1, "Hand Pump Trade Token I", 1, "Craft into a Tier I Hand pump");
+		itemGenericToken.register(2, "Hand Pump Trade Token II", 1, "Craft into a Tier II Hand pump");
+		itemGenericToken.register(3, "Hand Pump Trade Token III", 1, "Craft into a Tier III Hand pump");
+		itemGenericToken.register(4, "Hand Pump Trade Token IV", 1, "Craft into a Tier IV Hand pump");
 	}
 }
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemGenericToken.java b/src/Java/gtPlusPlus/core/item/general/ItemGenericToken.java
index dfd5eca203..c076bf5c95 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemGenericToken.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemGenericToken.java
@@ -19,37 +19,38 @@ import net.minecraft.util.IIcon;
 
 public class ItemGenericToken extends CoreItem {
 
-	public final static HashMap<Integer, String> mLocalNames;
-	public final static HashMap<Integer, Integer> mMaxStackSizes;
-	public final static HashMap<Integer, String[]> mDescriptionArrays;
-	public final static HashMap<Integer, EnumRarity> mRarities;
-	public final static HashMap<Integer, EnumChatFormatting> mCustomNameColours;
-	public final static HashMap<Integer, IIcon> mIcons;
-
-	static {
+	public final HashMap<Integer, String> mLocalNames;
+	public final HashMap<Integer, Integer> mMaxStackSizes;
+	public final HashMap<Integer, String[]> mDescriptionArrays;
+	public final HashMap<Integer, EnumRarity> mRarities;
+	public final HashMap<Integer, EnumChatFormatting> mCustomNameColours;
+	public final HashMap<Integer, IIcon> mIcons;
+	private final String mTextureDir;
+
+	public ItemGenericToken() {
+		this("itemGenericToken", "Token", new String[] { "Can be reclaimed in some way, shape or form" }, "token");
+	}
+	
+	public ItemGenericToken(String aUnlocalName, String aInternalName, String[] aBaseTooltip, String aTextureDir) {
+		super(aUnlocalName, aInternalName, AddToCreativeTab.tabMisc, 64, 1000, aBaseTooltip, EnumRarity.common,	EnumChatFormatting.RESET, false, null);
 		mLocalNames = new HashMap<Integer, String>();
 		mMaxStackSizes = new HashMap<Integer, Integer>();
 		mDescriptionArrays = new HashMap<Integer, String[]>();
 		mRarities = new HashMap<Integer, EnumRarity>();
 		mCustomNameColours = new HashMap<Integer, EnumChatFormatting>();
 		mIcons = new HashMap<Integer, IIcon>();
+		mTextureDir = aTextureDir;
 	}
 
-	public ItemGenericToken() {
-		super("itemGenericToken", "Token", AddToCreativeTab.tabMisc, 64, 1000,
-				new String[] { "Can be reclaimed in some way, shape or form" }, EnumRarity.common,
-				EnumChatFormatting.RESET, false, null);
-	}
-
-	public static boolean register(int id, String aLocalName, int aMaxStack, String aDescript) {
+	public boolean register(int id, String aLocalName, int aMaxStack, String aDescript) {
 		return register(id, aLocalName, aMaxStack, new String[] { aDescript });
 	}
 
-	public static boolean register(int id, String aLocalName, int aMaxStack, String[] aDescript) {
+	public boolean register(int id, String aLocalName, int aMaxStack, String[] aDescript) {
 		return register(id, aLocalName, aMaxStack, aDescript, EnumRarity.common, EnumChatFormatting.RESET);
 	}
 
-	public static boolean register(int id, String aLocalName, int aMaxStack, String[] aDescript, EnumRarity aRarity,
+	public boolean register(int id, String aLocalName, int aMaxStack, String[] aDescript, EnumRarity aRarity,
 			EnumChatFormatting aCustomNameColour) {
 		int[][] sizes = new int[2][6];
 		sizes[0][0] = mLocalNames.size();
@@ -153,9 +154,9 @@ public class ItemGenericToken extends CoreItem {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public final void registerIcons(final IIconRegister aIconRegister) {
+	public void registerIcons(final IIconRegister aIconRegister) {
 		for (int i = 0, j = mLocalNames.size(); i < j; i++) {
-			mIcons.put(i, aIconRegister.registerIcon(CORE.MODID + ":" + "token" + "/" + i));
+			mIcons.put(i, aIconRegister.registerIcon(CORE.MODID + ":" + mTextureDir + "/" + i));
 		}
 	}
 
diff --git a/src/Java/gtPlusPlus/core/item/tool/misc/DebugScanner.java b/src/Java/gtPlusPlus/core/item/tool/misc/DebugScanner.java
index bc252c95a9..d0f3005d00 100644
--- a/src/Java/gtPlusPlus/core/item/tool/misc/DebugScanner.java
+++ b/src/Java/gtPlusPlus/core/item/tool/misc/DebugScanner.java
@@ -2,6 +2,7 @@ package gtPlusPlus.core.item.tool.misc;
 
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.base.CoreItem;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
@@ -20,6 +21,7 @@ public class DebugScanner extends CoreItem {
 					"Right Click to use",
 					},
 				EnumRarity.epic);
+		setTextureName(CORE.MODID + ":itemStickyRubber");
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 6210f9726c..6e9cb11cd2 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -17,6 +17,8 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.item.chemistry.IonParticles;
+import gtPlusPlus.core.item.crafting.ItemDummyResearch;
+import gtPlusPlus.core.item.crafting.ItemDummyResearch.ASSEMBLY_LINE_RESEARCH;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.ALLOY;
@@ -137,7 +139,7 @@ public class RECIPES_GREGTECH {
 		
 		//Containment Casings
 		CORE.RA.addAssemblylineRecipe(
-				ItemList.Field_Generator_IV.get(1), 
+				ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_1_CONTAINMENT, 1), 
 				20 * 60 * 30,
 				new ItemStack[] {
 						ItemList.Field_Generator_IV.get(GTNH ? 32 : 16),
@@ -424,6 +426,15 @@ public class RECIPES_GREGTECH {
 				ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getDust(1),
 				20 * 60 * 5,
 				MaterialUtils.getVoltageForTier(ELEMENT.STANDALONE.CHRONOMATIC_GLASS.vTier));	
+
+		
+		GT_Values.RA.addLaserEngraverRecipe(
+				CI.getFieldGenerator(6, 1),
+				CI.getEmitter(7, 2),
+				ItemDummyResearch.getResearchStack(ASSEMBLY_LINE_RESEARCH.RESEARCH_1_CONTAINMENT, 1),
+				20 * 60 * 5,
+				MaterialUtils.getVoltageForTier(5));
+		
 		
 	}
 
diff --git a/src/resources/assets/miscutils/textures/items/research/note.png b/src/resources/assets/miscutils/textures/items/research/note.png
new file mode 100644
index 0000000000..795eaeb193
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/research/note.png