+ Added locale for the two new alloys.

$ Fixed NEI handling for GTPP Recipes.

4 files changed, 47 insertions, 11 deletions

diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_DefaultHandler.java b/src/Java/gtPlusPlus/nei/GT_NEI_DefaultHandler.java
index f1b689b65c..24f54a1380 100644
--- a/src/Java/gtPlusPlus/nei/GT_NEI_DefaultHandler.java
+++ b/src/Java/gtPlusPlus/nei/GT_NEI_DefaultHandler.java
@@ -20,7 +20,7 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.gui.GT_GUIContainer_BasicMachine;
 import gregtech.api.objects.ItemData;
 import gregtech.api.util.*;
-
+import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.guihook.GuiContainerManager;
@@ -40,9 +40,9 @@ extends TemplateRecipeHandler {
 		GuiContainerManager.addTooltipHandler(new GT_RectHandler());
 	}
 
-	protected final CustomRecipeMap mRecipeMap;
+	protected final GT_Recipe_Map mRecipeMap;
 
-	public GT_NEI_DefaultHandler(final CustomRecipeMap tMap) {
+	public GT_NEI_DefaultHandler(final GT_Recipe_Map tMap) {
 		this.mRecipeMap = tMap;
 		this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getOverlayIdentifier(), new Object[0]));
 		if (!NEI_GT_Config.sIsAdded) {
diff --git a/src/Java/gtPlusPlus/nei/NEI_GT_Config.java b/src/Java/gtPlusPlus/nei/NEI_GT_Config.java
index bfe580099a..40826168d2 100644
--- a/src/Java/gtPlusPlus/nei/NEI_GT_Config.java
+++ b/src/Java/gtPlusPlus/nei/NEI_GT_Config.java
@@ -6,7 +6,6 @@ import gregtech.api.util.CustomRecipeMap;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.api.util.GTPP_Recipe;
 import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
-import gregtech.nei.GT_NEI_DefaultHandler;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 
@@ -38,7 +37,7 @@ implements IConfigureNEI {
 		}
 		
 		// Custom Recipe maps
-		Logger.INFO("NEI Registration: "+CustomRecipeMap.sMappings.size()+" sMappings");
+		Logger.INFO("NEI Registration: "+GTPP_Recipe.GTPP_Recipe_Map.sMappings.size()+" sMappings");
 		for (final GTPP_Recipe_Map tMap : GTPP_Recipe.GTPP_Recipe_Map.sMappings) {
 			if (tMap.mNEIAllowed) {				
 				if (!mUniqueRecipeMapHandling.contains(tMap.mUnlocalizedName)) {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index dfd4bd2144..41cb1724fb 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -21,7 +21,6 @@ import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.data.ArrayUtils;
-import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
@@ -505,10 +504,10 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 				Math.max(1, aEUt), 
 				aSpecialValue);   
 
-		int aSize = GTPP_Recipe.GTPP_Recipe_Map.sCyclotronRecipes.mRecipeList.size();
+		int aSize = GTPP_Recipe.GTPP_Recipe_Map.sAlloyBlastSmelterRecipes.mRecipeList.size();
 		int aSize2 = aSize;
-		GTPP_Recipe.GTPP_Recipe_Map.sCyclotronRecipes.add(aSpecialRecipe);
-		aSize = GTPP_Recipe.GTPP_Recipe_Map.sCyclotronRecipes.mRecipeList.size();
+		GTPP_Recipe.GTPP_Recipe_Map.sAlloyBlastSmelterRecipes.add(aSpecialRecipe);
+		aSize = GTPP_Recipe.GTPP_Recipe_Map.sAlloyBlastSmelterRecipes.mRecipeList.size();
 
 
 		/*GTPP_Recipe.GTPP_Recipe_Map.sAlloyBlastSmelterRecipes.addRecipe(true, aInput, aOutputStack, null,
diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang
index 1eb21aec5f..2d79aa5cba 100644
--- a/src/resources/assets/miscutils/lang/en_US.lang
+++ b/src/resources/assets/miscutils/lang/en_US.lang
@@ -3190,5 +3190,43 @@ entity.miscutils.AusSpider.name=Forest Spider
 entity.miscutils.AusOctopus.name=Octopus
 container.EggBox=Egg Hatching Box
 
-//Added24/05/20
-container.VolumetricFlaskSetter=Volumetric Flask Configurator
\ No newline at end of file
+//Added 24/05/20
+container.VolumetricFlaskSetter=Volumetric Flask Configurator
+
+//Added 26/05/20
+item.itemIngotLaurenium.name=Laurenium Ingot
+item.itemHotIngotLaurenium.name=Hot Laurenium Ingot
+item.itemDustLaurenium.name=Laurenium Dust
+item.itemDustTinyLaurenium.name=Tiny Pile of Laurenium Dust
+item.itemDustSmallLaurenium.name=Small Pile of Laurenium Dust
+item.itemNuggetLaurenium.name=Laurenium Nugget
+item.itemPlateLaurenium.name=Laurenium Plate
+item.itemPlateDoubleLaurenium.name=Double Laurenium Plate
+item.itemBoltLaurenium.name=Laurenium Bolt
+item.itemRodLaurenium.name=Laurenium Rod
+item.itemRodLongLaurenium.name=Long Laurenium Rod
+item.itemRingLaurenium.name=Laurenium Ring
+item.itemScrewLaurenium.name=Laurenium Screw
+item.itemRotorLaurenium.name=Laurenium Rotor
+item.itemGearLaurenium.name=Laurenium Gear
+item.itemCellLaurenium.name=Laurenium Cell
+tile.Block of Laurenium.name=Block of Laurenium
+tile.Laurenium Frame Box.name=Laurenium Frame Box
+item.itemIngotBotmium.name=Botmium Ingot
+item.itemHotIngotBotmium.name=Hot Botmium Ingot
+item.itemDustBotmium.name=Botmium Dust
+item.itemDustTinyBotmium.name=Tiny Pile of Botmium Dust
+item.itemDustSmallBotmium.name=Small Pile of Botmium Dust
+item.itemNuggetBotmium.name=Botmium Nugget
+item.itemPlateBotmium.name=Botmium Plate
+item.itemPlateDoubleBotmium.name=Double Botmium Plate
+item.itemBoltBotmium.name=Botmium Bolt
+item.itemRodBotmium.name=Botmium Rod
+item.itemRodLongBotmium.name=Long Botmium Rod
+item.itemRingBotmium.name=Botmium Ring
+item.itemScrewBotmium.name=Botmium Screw
+item.itemRotorBotmium.name=Botmium Rotor
+item.itemGearBotmium.name=Botmium Gear
+item.itemCellBotmium.name=Botmium Cell
+tile.Block of Botmium.name=Block of Botmium
+tile.Botmium Frame Box.name=Botmium Frame Box
\ No newline at end of file