aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/nei
diff options
context:
space:
mode:
authorAlkalus <Draknyte1@hotmail.com>2020-04-14 19:35:14 +0100
committerAlkalus <Draknyte1@hotmail.com>2020-04-14 19:35:14 +0100
commit45ca80fa77d081c500cc6df0799a2e824912fd62 (patch)
tree7ef26a8acf4573c6c7ee77d9983a724fa1ce26da /src/Java/gtPlusPlus/nei
parente42c71394ca8e9b82a47ca8b35aad2d19ff16ac3 (diff)
downloadGT5-Unofficial-45ca80fa77d081c500cc6df0799a2e824912fd62.tar.gz
GT5-Unofficial-45ca80fa77d081c500cc6df0799a2e824912fd62.tar.bz2
GT5-Unofficial-45ca80fa77d081c500cc6df0799a2e824912fd62.zip
$ Added recipe hashing to prevent unwanted recipe changes.
$ Made certain TileEntities blacklisted against the World accelerator in both GT++ & GTNH.
Diffstat (limited to 'src/Java/gtPlusPlus/nei')
-rw-r--r--src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java6
-rw-r--r--src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandlerEx.java6
-rw-r--r--src/Java/gtPlusPlus/nei/GT_NEI_FlotationCell.java14
-rw-r--r--src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java18
-rw-r--r--src/Java/gtPlusPlus/nei/GT_NEI_MillingMachine.java16
-rw-r--r--src/Java/gtPlusPlus/nei/GT_NEI_MultiBlockHandler.java20
-rw-r--r--src/Java/gtPlusPlus/nei/GT_NEI_VacFurnace.java14
-rw-r--r--src/Java/gtPlusPlus/nei/NEI_GT_Config.java16
8 files changed, 55 insertions, 55 deletions
diff --git a/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java b/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java
index 279f45f756..12c1b501bd 100644
--- a/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java
+++ b/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandler.java
@@ -19,7 +19,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.Recipe_GT.Gregtech_Recipe_Map;
+import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
import gregtech.common.gui.GT_GUIContainer_FusionReactor;
import gregtech.common.gui.GT_GUIContainer_PrimitiveBlastFurnace;
import net.minecraft.client.Minecraft;
@@ -39,9 +39,9 @@ public class GTPP_NEI_DefaultHandler
GuiContainerManager.addTooltipHandler(new GT_RectHandler());
}
- protected final Gregtech_Recipe_Map mRecipeMap;
+ protected final GTPP_Recipe_Map mRecipeMap;
- public GTPP_NEI_DefaultHandler(Gregtech_Recipe_Map tMap) {
+ public GTPP_NEI_DefaultHandler(GTPP_Recipe_Map tMap) {
this.mRecipeMap = tMap;
this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), getOverlayIdentifier(), new Object[0]));
if (!NEI_GT_Config.sIsAdded) {
diff --git a/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandlerEx.java b/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandlerEx.java
index 8bf048730a..0d9fc52943 100644
--- a/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandlerEx.java
+++ b/src/Java/gtPlusPlus/nei/GTPP_NEI_DefaultHandlerEx.java
@@ -19,7 +19,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.Recipe_GT.Gregtech_Recipe_Map;
+import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
import gregtech.common.gui.GT_GUIContainer_FusionReactor;
import gregtech.common.gui.GT_GUIContainer_PrimitiveBlastFurnace;
import net.minecraft.client.Minecraft;
@@ -39,9 +39,9 @@ public class GTPP_NEI_DefaultHandlerEx
GuiContainerManager.addTooltipHandler(new GT_RectHandler());
}
- protected final Gregtech_Recipe_Map mRecipeMap;
+ protected final GTPP_Recipe_Map mRecipeMap;
- public GTPP_NEI_DefaultHandlerEx(Gregtech_Recipe_Map tMap) {
+ public GTPP_NEI_DefaultHandlerEx(GTPP_Recipe_Map tMap) {
this.mRecipeMap = tMap;
this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), getOverlayIdentifier(), new Object[0]));
if (!NEI_GT_Config.sIsAdded) {
diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_FlotationCell.java b/src/Java/gtPlusPlus/nei/GT_NEI_FlotationCell.java
index 0d4e84b4b7..c4eff20a27 100644
--- a/src/Java/gtPlusPlus/nei/GT_NEI_FlotationCell.java
+++ b/src/Java/gtPlusPlus/nei/GT_NEI_FlotationCell.java
@@ -19,7 +19,7 @@ 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 gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map;
+import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.inventory.GuiContainer;
@@ -41,7 +41,7 @@ extends TemplateRecipeHandler {
protected GT_Recipe_Map mRecipeMap;
public GT_NEI_FlotationCell() {
- this.mRecipeMap = Gregtech_Recipe_Map.sFlotationCellRecipes;
+ this.mRecipeMap = GTPP_Recipe_Map.sFlotationCellRecipes;
this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getRecipeMapName(), new Object[0]));
if (!NEI_GT_Config.sIsAdded) {
FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtechplusplus@" + this.getRecipeName() + "@" + this.getRecipeMapName());
@@ -50,8 +50,8 @@ extends TemplateRecipeHandler {
}
}
- public List<Recipe_GT> getSortedRecipes() {
- List<Recipe_GT> result = new ArrayList(this.mRecipeMap.mRecipeList);
+ public List<GTPP_Recipe> getSortedRecipes() {
+ List<GTPP_Recipe> result = new ArrayList(this.mRecipeMap.mRecipeList);
Collections.sort(result);
return result;
}
@@ -68,7 +68,7 @@ extends TemplateRecipeHandler {
@Override
public void loadCraftingRecipes(final String outputId, final Object... results) {
if (outputId.equals(getRecipeMapName())) {
- for (Recipe_GT tRecipe : getSortedRecipes()) {
+ for (GTPP_Recipe tRecipe : getSortedRecipes()) {
if (!tRecipe.mHidden) {
this.arecipes.add(new CachedDefaultRecipe(tRecipe));
}
@@ -99,7 +99,7 @@ extends TemplateRecipeHandler {
}
}
}
- for (Recipe_GT tRecipe : getSortedRecipes()) {
+ for (GTPP_Recipe tRecipe : getSortedRecipes()) {
if (!tRecipe.mHidden) {
CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe);
for (ItemStack tStack : tResults) {
@@ -133,7 +133,7 @@ extends TemplateRecipeHandler {
}
}
}
- for (Recipe_GT tRecipe : getSortedRecipes()) {
+ for (GTPP_Recipe tRecipe : getSortedRecipes()) {
if (!tRecipe.mHidden) {
CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe);
for (ItemStack tStack : tInputs) {
diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java b/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java
index 29c3cecb6f..57e6e1a899 100644
--- a/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java
+++ b/src/Java/gtPlusPlus/nei/GT_NEI_FluidReactor.java
@@ -26,8 +26,8 @@ import gregtech.api.objects.ItemData;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
-import gregtech.api.util.Recipe_GT;
-import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map;
+import gregtech.api.util.GTPP_Recipe;
+import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import net.minecraft.client.Minecraft;
@@ -47,10 +47,10 @@ extends TemplateRecipeHandler {
GuiContainerManager.addTooltipHandler(new GT_RectHandler());
}
- protected Gregtech_Recipe_Map mRecipeMap;
+ protected GTPP_Recipe_Map mRecipeMap;
public GT_NEI_FluidReactor() {
- this.mRecipeMap = Gregtech_Recipe_Map.sChemicalPlantRecipes;
+ this.mRecipeMap = GTPP_Recipe_Map.sChemicalPlantRecipes;
this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getRecipeMapName(), new Object[0]));
if (!NEI_GT_Config.sIsAdded) {
FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtechplusplus@" + this.getRecipeName() + "@" + this.getRecipeMapName());
@@ -59,8 +59,8 @@ extends TemplateRecipeHandler {
}
}
- public List<Recipe_GT> getSortedRecipes() {
- List<Recipe_GT> result = new ArrayList(this.mRecipeMap.mRecipeList);
+ public List<GTPP_Recipe> getSortedRecipes() {
+ List<GTPP_Recipe> result = new ArrayList(this.mRecipeMap.mRecipeList);
Collections.sort(result);
return result;
}
@@ -77,7 +77,7 @@ extends TemplateRecipeHandler {
@Override
public void loadCraftingRecipes(final String outputId, final Object... results) {
if (outputId.equals(getRecipeMapName())) {
- for (Recipe_GT tRecipe : getSortedRecipes()) {
+ for (GTPP_Recipe tRecipe : getSortedRecipes()) {
if (!tRecipe.mHidden) {
this.arecipes.add(new CachedDefaultRecipe(tRecipe));
}
@@ -108,7 +108,7 @@ extends TemplateRecipeHandler {
}
}
}
- for (Recipe_GT tRecipe : getSortedRecipes()) {
+ for (GTPP_Recipe tRecipe : getSortedRecipes()) {
if (!tRecipe.mHidden) {
CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe);
for (ItemStack tStack : tResults) {
@@ -142,7 +142,7 @@ extends TemplateRecipeHandler {
}
}
}
- for (Recipe_GT tRecipe : getSortedRecipes()) {
+ for (GTPP_Recipe tRecipe : getSortedRecipes()) {
if (!tRecipe.mHidden) {
CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe);
for (ItemStack tStack : tInputs) {
diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_MillingMachine.java b/src/Java/gtPlusPlus/nei/GT_NEI_MillingMachine.java
index b868c2422c..8aea87b6d4 100644
--- a/src/Java/gtPlusPlus/nei/GT_NEI_MillingMachine.java
+++ b/src/Java/gtPlusPlus/nei/GT_NEI_MillingMachine.java
@@ -28,8 +28,8 @@ import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gregtech.api.util.GT_Utility;
-import gregtech.api.util.Recipe_GT;
-import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map;
+import gregtech.api.util.GTPP_Recipe;
+import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.inventory.GuiContainer;
@@ -51,7 +51,7 @@ extends TemplateRecipeHandler {
protected GT_Recipe_Map mRecipeMap;
public GT_NEI_MillingMachine() {
- this.mRecipeMap = Gregtech_Recipe_Map.sOreMillRecipes;
+ this.mRecipeMap = GTPP_Recipe_Map.sOreMillRecipes;
this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getRecipeMapName(), new Object[0]));
if (!NEI_GT_Config.sIsAdded) {
FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtechplusplus@" + this.getRecipeName() + "@" + this.getRecipeMapName());
@@ -60,8 +60,8 @@ extends TemplateRecipeHandler {
}
}
- public List<Recipe_GT> getSortedRecipes() {
- List<Recipe_GT> result = new ArrayList(this.mRecipeMap.mRecipeList);
+ public List<GTPP_Recipe> getSortedRecipes() {
+ List<GTPP_Recipe> result = new ArrayList(this.mRecipeMap.mRecipeList);
Collections.sort(result);
return result;
}
@@ -78,7 +78,7 @@ extends TemplateRecipeHandler {
@Override
public void loadCraftingRecipes(final String outputId, final Object... results) {
if (outputId.equals(getRecipeMapName())) {
- for (Recipe_GT tRecipe : getSortedRecipes()) {
+ for (GTPP_Recipe tRecipe : getSortedRecipes()) {
if (!tRecipe.mHidden) {
this.arecipes.add(new CachedDefaultRecipe(tRecipe));
}
@@ -109,7 +109,7 @@ extends TemplateRecipeHandler {
}
}
}
- for (Recipe_GT tRecipe : getSortedRecipes()) {
+ for (GTPP_Recipe tRecipe : getSortedRecipes()) {
if (!tRecipe.mHidden) {
CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe);
for (ItemStack tStack : tResults) {
@@ -143,7 +143,7 @@ extends TemplateRecipeHandler {
}
}
}
- for (Recipe_GT tRecipe : getSortedRecipes()) {
+ for (GTPP_Recipe tRecipe : getSortedRecipes()) {
if (!tRecipe.mHidden) {
CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe);
for (ItemStack tStack : tInputs) {
diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_MultiBlockHandler.java b/src/Java/gtPlusPlus/nei/GT_NEI_MultiBlockHandler.java
index e3c980e6a4..e5bee4979f 100644
--- a/src/Java/gtPlusPlus/nei/GT_NEI_MultiBlockHandler.java
+++ b/src/Java/gtPlusPlus/nei/GT_NEI_MultiBlockHandler.java
@@ -19,7 +19,7 @@ import gregtech.api.gui.GT_GUIContainer_BasicMachine;
import gregtech.api.objects.GT_ItemStack;
import gregtech.api.objects.ItemData;
import gregtech.api.util.*;
-import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map;
+import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.inventory.GuiContainer;
@@ -46,9 +46,9 @@ extends TemplateRecipeHandler {
GuiContainerManager.addTooltipHandler(new GT_RectHandler());
}
- protected final Recipe_GT.Gregtech_Recipe_Map mRecipeMap;
+ protected final GTPP_Recipe.GTPP_Recipe_Map mRecipeMap;
- public GT_NEI_MultiBlockHandler(Gregtech_Recipe_Map aRecipeMap) {
+ public GT_NEI_MultiBlockHandler(GTPP_Recipe_Map aRecipeMap) {
this.mRecipeMap = aRecipeMap;
this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), getOverlayIdentifier(), new Object[0]));
if (!NEI_GT_Config.sIsAdded) {
@@ -58,8 +58,8 @@ extends TemplateRecipeHandler {
}
}
- public List<Recipe_GT> getSortedRecipes() {
- List<Recipe_GT> result = new ArrayList<>(this.mRecipeMap.mRecipeList);
+ public List<GTPP_Recipe> getSortedRecipes() {
+ List<GTPP_Recipe> result = new ArrayList<>(this.mRecipeMap.mRecipeList);
//List<Recipe_GT> resultReal = new ArrayList<Recipe_GT>();
/*for (Recipe_GT g : this.mRecipeMap.mRecipeList) {
@@ -80,7 +80,7 @@ extends TemplateRecipeHandler {
public void loadCraftingRecipes(String outputId, Object... results) {
if (outputId.equals(getOverlayIdentifier())) {
- for (Recipe_GT tRecipe : getSortedRecipes()) {
+ for (GTPP_Recipe tRecipe : getSortedRecipes()) {
if (!tRecipe.mHidden) {
this.arecipes.add(new CachedDefaultRecipe(tRecipe));
}
@@ -110,7 +110,7 @@ extends TemplateRecipeHandler {
}
}
}
- for (Recipe_GT tRecipe : getSortedRecipes()) {
+ for (GTPP_Recipe tRecipe : getSortedRecipes()) {
if (!tRecipe.mHidden) {
CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe);
for (ItemStack tStack : tResults) {
@@ -144,7 +144,7 @@ extends TemplateRecipeHandler {
}
}
}
- for (Recipe_GT tRecipe : getSortedRecipes()) {
+ for (GTPP_Recipe tRecipe : getSortedRecipes()) {
if (!tRecipe.mHidden) {
CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe);
for (ItemStack tStack : tInputs) {
@@ -359,11 +359,11 @@ extends TemplateRecipeHandler {
}
public class CachedDefaultRecipe extends TemplateRecipeHandler.CachedRecipe {
- public final Recipe_GT mRecipe;
+ public final GTPP_Recipe mRecipe;
public final List<PositionedStack> mOutputs;
public final List<PositionedStack> mInputs;
- public CachedDefaultRecipe(Recipe_GT aRecipe) {
+ public CachedDefaultRecipe(GTPP_Recipe aRecipe) {
super();
this.mRecipe = aRecipe;
diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_VacFurnace.java b/src/Java/gtPlusPlus/nei/GT_NEI_VacFurnace.java
index 571ee79ee6..fd07d66fed 100644
--- a/src/Java/gtPlusPlus/nei/GT_NEI_VacFurnace.java
+++ b/src/Java/gtPlusPlus/nei/GT_NEI_VacFurnace.java
@@ -19,7 +19,7 @@ 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 gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map;
+import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.nei.GT_NEI_MultiBlockHandler.FixedPositionedStack;
import net.minecraft.client.Minecraft;
@@ -42,7 +42,7 @@ extends TemplateRecipeHandler {
protected GT_Recipe_Map mRecipeMap;
public GT_NEI_VacFurnace() {
- this.mRecipeMap = Gregtech_Recipe_Map.sVacuumFurnaceRecipes;
+ this.mRecipeMap = GTPP_Recipe_Map.sVacuumFurnaceRecipes;
this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getRecipeMapName(), new Object[0]));
if (!NEI_GT_Config.sIsAdded) {
FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtechplusplus@" + this.getRecipeName() + "@" + this.getRecipeMapName());
@@ -51,8 +51,8 @@ extends TemplateRecipeHandler {
}
}
- public List<Recipe_GT> getSortedRecipes() {
- List<Recipe_GT> result = new ArrayList(this.mRecipeMap.mRecipeList);
+ public List<GTPP_Recipe> getSortedRecipes() {
+ List<GTPP_Recipe> result = new ArrayList(this.mRecipeMap.mRecipeList);
Collections.sort(result);
return result;
}
@@ -69,7 +69,7 @@ extends TemplateRecipeHandler {
@Override
public void loadCraftingRecipes(final String outputId, final Object... results) {
if (outputId.equals(getRecipeMapName())) {
- for (Recipe_GT tRecipe : getSortedRecipes()) {
+ for (GTPP_Recipe tRecipe : getSortedRecipes()) {
if (!tRecipe.mHidden) {
this.arecipes.add(new CachedDefaultRecipe(tRecipe));
}
@@ -100,7 +100,7 @@ extends TemplateRecipeHandler {
}
}
}
- for (Recipe_GT tRecipe : getSortedRecipes()) {
+ for (GTPP_Recipe tRecipe : getSortedRecipes()) {
if (!tRecipe.mHidden) {
CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe);
for (ItemStack tStack : tResults) {
@@ -134,7 +134,7 @@ extends TemplateRecipeHandler {
}
}
}
- for (Recipe_GT tRecipe : getSortedRecipes()) {
+ for (GTPP_Recipe tRecipe : getSortedRecipes()) {
if (!tRecipe.mHidden) {
CachedDefaultRecipe tNEIRecipe = new CachedDefaultRecipe(tRecipe);
for (ItemStack tStack : tInputs) {
diff --git a/src/Java/gtPlusPlus/nei/NEI_GT_Config.java b/src/Java/gtPlusPlus/nei/NEI_GT_Config.java
index 0a0ba9b9e8..514612752d 100644
--- a/src/Java/gtPlusPlus/nei/NEI_GT_Config.java
+++ b/src/Java/gtPlusPlus/nei/NEI_GT_Config.java
@@ -4,8 +4,8 @@ import codechicken.nei.api.API;
import codechicken.nei.api.IConfigureNEI;
import gregtech.api.util.CustomRecipeMap;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
-import gregtech.api.util.Recipe_GT;
-import gregtech.api.util.Recipe_GT.Gregtech_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.data.AutoMap;
@@ -19,10 +19,10 @@ implements IConfigureNEI {
public synchronized void loadConfig() {
sIsAdded = false;
- mUniqueRecipeMapHandling.add(Gregtech_Recipe_Map.sChemicalPlantRecipes.mUnlocalizedName);
- mUniqueRecipeMapHandling.add(Gregtech_Recipe_Map.sOreMillRecipes.mUnlocalizedName);
- mUniqueRecipeMapHandling.add(Gregtech_Recipe_Map.sFlotationCellRecipes.mUnlocalizedName);
- mUniqueRecipeMapHandling.add(Gregtech_Recipe_Map.sVacuumFurnaceRecipes.mUnlocalizedName);
+ mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sChemicalPlantRecipes.mUnlocalizedName);
+ mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sOreMillRecipes.mUnlocalizedName);
+ mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sFlotationCellRecipes.mUnlocalizedName);
+ mUniqueRecipeMapHandling.add(GTPP_Recipe_Map.sVacuumFurnaceRecipes.mUnlocalizedName);
// Custom Recipe Maps
for (final CustomRecipeMap tMap : CustomRecipeMap.sMappings) {
@@ -32,7 +32,7 @@ implements IConfigureNEI {
}
// Custom Recipe maps
- for (final Gregtech_Recipe_Map tMap : Recipe_GT.Gregtech_Recipe_Map.sMappings) {
+ for (final GTPP_Recipe_Map tMap : GTPP_Recipe.GTPP_Recipe_Map.sMappings) {
if (tMap.mNEIAllowed) {
if (!mUniqueRecipeMapHandling.contains(tMap.mUnlocalizedName)) {
new GTPP_NEI_DefaultHandler(tMap);
@@ -41,7 +41,7 @@ implements IConfigureNEI {
}
// Standard GT Recipe Maps
- for (final GT_Recipe_Map tMap : Recipe_GT.GTPP_Recipe_Map.sMappingsEx) {
+ for (final GT_Recipe_Map tMap : GTPP_Recipe.GTPP_Recipe_Map_Internal.sMappingsEx) {
if (tMap.mNEIAllowed) {
if (!mUniqueRecipeMapHandling.contains(tMap.mUnlocalizedName)) {
new GT_NEI_DefaultHandler(tMap);