Fixed NEI

This commit is contained in:
TheDarkDnKTv 2021-02-08 19:31:25 +02:00
parent 9ec241a968
commit a8adc5f266
17 changed files with 37 additions and 38 deletions

View file

@ -2,6 +2,7 @@ package gregtechmod.mistaqur.nei;
import gregtechmod.api.GregTech_API; import gregtechmod.api.GregTech_API;
import gregtechmod.api.recipe.Recipe; import gregtechmod.api.recipe.Recipe;
import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Log; import gregtechmod.api.util.GT_Log;
import gregtechmod.api.util.GT_Utility; import gregtechmod.api.util.GT_Utility;
import gregtechmod.common.gui.GT_GUIContainer_BasicMachine_AlloySmelter; import gregtechmod.common.gui.GT_GUIContainer_BasicMachine_AlloySmelter;
@ -14,7 +15,6 @@ import gregtechmod.common.recipe.RecipeMaps;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
@ -88,7 +88,7 @@ public class AlloySmelterRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public List<Recipe> getRecipeList() { public RecipeMap<?> getRecipeList() {
return RecipeMaps.ALLOY_SMELTING; return RecipeMaps.ALLOY_SMELTING;
} }

View file

@ -2,6 +2,7 @@ package gregtechmod.mistaqur.nei;
import gregtechmod.api.GregTech_API; import gregtechmod.api.GregTech_API;
import gregtechmod.api.recipe.Recipe; import gregtechmod.api.recipe.Recipe;
import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Log; import gregtechmod.api.util.GT_Log;
import gregtechmod.api.util.GT_Utility; import gregtechmod.api.util.GT_Utility;
import gregtechmod.common.gui.GT_GUIContainer_BasicMachine_Assembler; import gregtechmod.common.gui.GT_GUIContainer_BasicMachine_Assembler;
@ -9,7 +10,6 @@ import gregtechmod.common.recipe.RecipeMaps;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
@ -53,7 +53,7 @@ public class AssemblerRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public List<Recipe> getRecipeList() { public RecipeMap<?> getRecipeList() {
return RecipeMaps.ASSEMBLING; return RecipeMaps.ASSEMBLING;
} }

View file

@ -2,6 +2,7 @@ package gregtechmod.mistaqur.nei;
import gregtechmod.api.GregTech_API; import gregtechmod.api.GregTech_API;
import gregtechmod.api.recipe.Recipe; import gregtechmod.api.recipe.Recipe;
import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Log; import gregtechmod.api.util.GT_Log;
import gregtechmod.api.util.GT_Utility; import gregtechmod.api.util.GT_Utility;
import gregtechmod.common.gui.GT_GUIContainer_BasicMachine_Bender; import gregtechmod.common.gui.GT_GUIContainer_BasicMachine_Bender;
@ -9,7 +10,6 @@ import gregtechmod.common.recipe.RecipeMaps;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
@ -53,7 +53,7 @@ public class BenderRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public List<Recipe> getRecipeList() { public RecipeMap<?> getRecipeList() {
return RecipeMaps.BENDING; return RecipeMaps.BENDING;
} }

View file

@ -2,6 +2,7 @@ package gregtechmod.mistaqur.nei;
import gregtechmod.api.GregTech_API; import gregtechmod.api.GregTech_API;
import gregtechmod.api.recipe.Recipe; import gregtechmod.api.recipe.Recipe;
import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Log; import gregtechmod.api.util.GT_Log;
import gregtechmod.api.util.GT_Utility; import gregtechmod.api.util.GT_Utility;
import gregtechmod.common.gui.GT_GUIContainer_BlastFurnace; import gregtechmod.common.gui.GT_GUIContainer_BlastFurnace;
@ -9,7 +10,6 @@ import gregtechmod.common.recipe.RecipeMaps;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
@ -24,7 +24,7 @@ public class BlastRecipeHandler extends GT_RecipeHandler {
public CachedBlastRecipe(Recipe aRecipe) { public CachedBlastRecipe(Recipe aRecipe) {
super(aRecipe); super(aRecipe);
mStartEU = aRecipe.mStartEU; mStartEU = aRecipe.getEUtoStart();
} }
@Override @Override
@ -72,7 +72,7 @@ public class BlastRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public List<Recipe> getRecipeList() { public RecipeMap<?> getRecipeList() {
return RecipeMaps.BLAST_FURNANCE; return RecipeMaps.BLAST_FURNANCE;
} }

View file

@ -2,6 +2,7 @@ package gregtechmod.mistaqur.nei;
import gregtechmod.api.GregTech_API; import gregtechmod.api.GregTech_API;
import gregtechmod.api.recipe.Recipe; import gregtechmod.api.recipe.Recipe;
import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Log; import gregtechmod.api.util.GT_Log;
import gregtechmod.api.util.GT_Utility; import gregtechmod.api.util.GT_Utility;
import gregtechmod.common.gui.GT_GUIContainer_BasicMachine_Canner; import gregtechmod.common.gui.GT_GUIContainer_BasicMachine_Canner;
@ -9,7 +10,6 @@ import gregtechmod.common.recipe.RecipeMaps;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
@ -53,7 +53,7 @@ public class CannerRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public List<Recipe> getRecipeList() { public RecipeMap<?> getRecipeList() {
return RecipeMaps.CANINNING; return RecipeMaps.CANINNING;
} }
@ -67,7 +67,7 @@ public class CannerRecipeHandler extends GT_RecipeHandler {
@Override @Override
protected Pair<Integer, Integer> getOutputAligment(int itemIdx) { protected Pair<Integer, Integer> getOutputAligment(int itemIdx) {
return Pair.of(107 - sOffsetX * (18 * itemIdx), 25 - sOffsetY); return Pair.of(107 - sOffsetX + (18 * itemIdx), 25 - sOffsetY);
} }
}; };
} }

View file

@ -2,6 +2,7 @@ package gregtechmod.mistaqur.nei;
import gregtechmod.api.GregTech_API; import gregtechmod.api.GregTech_API;
import gregtechmod.api.recipe.Recipe; import gregtechmod.api.recipe.Recipe;
import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Log; import gregtechmod.api.util.GT_Log;
import gregtechmod.api.util.GT_Utility; import gregtechmod.api.util.GT_Utility;
import gregtechmod.common.gui.GT_GUIContainer_Centrifuge; import gregtechmod.common.gui.GT_GUIContainer_Centrifuge;
@ -9,7 +10,6 @@ import gregtechmod.common.recipe.RecipeMaps;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
@ -59,7 +59,7 @@ public class CentrifugeRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public List<Recipe> getRecipeList() { public RecipeMap<?> getRecipeList() {
return RecipeMaps.CENTRIFUGE; return RecipeMaps.CENTRIFUGE;
} }

View file

@ -2,6 +2,7 @@ package gregtechmod.mistaqur.nei;
import gregtechmod.api.GregTech_API; import gregtechmod.api.GregTech_API;
import gregtechmod.api.recipe.Recipe; import gregtechmod.api.recipe.Recipe;
import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Log; import gregtechmod.api.util.GT_Log;
import gregtechmod.api.util.GT_Utility; import gregtechmod.api.util.GT_Utility;
import gregtechmod.common.gui.GT_GUIContainer_BasicMachine_Cutter; import gregtechmod.common.gui.GT_GUIContainer_BasicMachine_Cutter;
@ -9,7 +10,6 @@ import gregtechmod.common.recipe.RecipeMaps;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
@ -53,7 +53,7 @@ public class CutterRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public List<Recipe> getRecipeList() { public RecipeMap<?> getRecipeList() {
return RecipeMaps.CUTTING; return RecipeMaps.CUTTING;
} }

View file

@ -2,6 +2,7 @@ package gregtechmod.mistaqur.nei;
import gregtechmod.api.GregTech_API; import gregtechmod.api.GregTech_API;
import gregtechmod.api.recipe.Recipe; import gregtechmod.api.recipe.Recipe;
import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Log; import gregtechmod.api.util.GT_Log;
import gregtechmod.api.util.GT_Utility; import gregtechmod.api.util.GT_Utility;
import gregtechmod.common.gui.GT_GUIContainer_DistillationTower; import gregtechmod.common.gui.GT_GUIContainer_DistillationTower;
@ -9,7 +10,6 @@ import gregtechmod.common.recipe.RecipeMaps;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
@ -53,7 +53,7 @@ public class DistillationRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public List<Recipe> getRecipeList() { public RecipeMap<?> getRecipeList() {
return RecipeMaps.DISTILLATION; return RecipeMaps.DISTILLATION;
} }

View file

@ -2,6 +2,7 @@ package gregtechmod.mistaqur.nei;
import gregtechmod.api.GregTech_API; import gregtechmod.api.GregTech_API;
import gregtechmod.api.recipe.Recipe; import gregtechmod.api.recipe.Recipe;
import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Log; import gregtechmod.api.util.GT_Log;
import gregtechmod.api.util.GT_Utility; import gregtechmod.api.util.GT_Utility;
import gregtechmod.common.gui.GT_GUIContainer_Electrolyzer; import gregtechmod.common.gui.GT_GUIContainer_Electrolyzer;
@ -9,8 +10,6 @@ import gregtechmod.common.recipe.RecipeMaps;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
@ -53,7 +52,7 @@ public class ElectrolyzerRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public List<Recipe> getRecipeList() { public RecipeMap<?> getRecipeList() {
return RecipeMaps.ELECTROLYZER; return RecipeMaps.ELECTROLYZER;
} }

View file

@ -1,13 +1,13 @@
package gregtechmod.mistaqur.nei; package gregtechmod.mistaqur.nei;
import java.util.Collections; import java.util.Collections;
import java.util.List;
import java.awt.Rectangle; import java.awt.Rectangle;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import gregtechmod.api.GregTech_API; import gregtechmod.api.GregTech_API;
import gregtechmod.api.recipe.Recipe; import gregtechmod.api.recipe.Recipe;
import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Log; import gregtechmod.api.util.GT_Log;
import gregtechmod.api.util.GT_Utility; import gregtechmod.api.util.GT_Utility;
import gregtechmod.common.gui.GT_GUIContainer_BasicMachine_Extruder; import gregtechmod.common.gui.GT_GUIContainer_BasicMachine_Extruder;
@ -43,7 +43,7 @@ public class ExtruderRecipeHandler extends GT_RecipeHandler {
return "gregtech.extruder"; return "gregtech.extruder";
} }
public List<Recipe> getRecipeList() { public RecipeMap<?> getRecipeList() {
return RecipeMaps.EXTRUDING; return RecipeMaps.EXTRUDING;
} }

View file

@ -2,6 +2,7 @@ package gregtechmod.mistaqur.nei;
import gregtechmod.api.GregTech_API; import gregtechmod.api.GregTech_API;
import gregtechmod.api.recipe.Recipe; import gregtechmod.api.recipe.Recipe;
import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Log; import gregtechmod.api.util.GT_Log;
import gregtechmod.api.util.GT_Utility; import gregtechmod.api.util.GT_Utility;
import gregtechmod.common.gui.GT_GUIContainer_FusionComputer; import gregtechmod.common.gui.GT_GUIContainer_FusionComputer;
@ -9,7 +10,6 @@ import gregtechmod.common.recipe.RecipeMaps;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
@ -24,7 +24,7 @@ public class FusionRecipeHandler extends GT_RecipeHandler {
public CachedFusionRecipe(Recipe irecipe) { public CachedFusionRecipe(Recipe irecipe) {
super(irecipe); super(irecipe);
mStartEU = irecipe.mStartEU; mStartEU = irecipe.getEUtoStart();
} }
@Override @Override
@ -72,7 +72,7 @@ public class FusionRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public List<Recipe> getRecipeList() { public RecipeMap<?> getRecipeList() {
return RecipeMaps.FUSION_REACTOR; return RecipeMaps.FUSION_REACTOR;
} }

View file

@ -2,6 +2,7 @@ package gregtechmod.mistaqur.nei;
import gregtechmod.api.GregTech_API; import gregtechmod.api.GregTech_API;
import gregtechmod.api.recipe.Recipe; import gregtechmod.api.recipe.Recipe;
import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Log; import gregtechmod.api.util.GT_Log;
import gregtechmod.api.util.GT_Utility; import gregtechmod.api.util.GT_Utility;
import gregtechmod.common.gui.GT_GUIContainer_Grinder; import gregtechmod.common.gui.GT_GUIContainer_Grinder;
@ -9,7 +10,6 @@ import gregtechmod.common.recipe.RecipeMaps;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
@ -53,7 +53,7 @@ public class GrinderRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public List<Recipe> getRecipeList() { public RecipeMap<?> getRecipeList() {
return RecipeMaps.GRINDER; return RecipeMaps.GRINDER;
} }

View file

@ -2,6 +2,7 @@ package gregtechmod.mistaqur.nei;
import gregtechmod.api.GregTech_API; import gregtechmod.api.GregTech_API;
import gregtechmod.api.recipe.Recipe; import gregtechmod.api.recipe.Recipe;
import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Log; import gregtechmod.api.util.GT_Log;
import gregtechmod.api.util.GT_Utility; import gregtechmod.api.util.GT_Utility;
import gregtechmod.common.gui.GT_GUIContainer_ImplosionCompressor; import gregtechmod.common.gui.GT_GUIContainer_ImplosionCompressor;
@ -9,7 +10,6 @@ import gregtechmod.common.recipe.RecipeMaps;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
@ -53,7 +53,7 @@ public class ImplosionRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public List<Recipe> getRecipeList() { public RecipeMap<?> getRecipeList() {
return RecipeMaps.IMPLOSION_COMPRESSOR; return RecipeMaps.IMPLOSION_COMPRESSOR;
} }

View file

@ -2,6 +2,7 @@ package gregtechmod.mistaqur.nei;
import gregtechmod.api.GregTech_API; import gregtechmod.api.GregTech_API;
import gregtechmod.api.recipe.Recipe; import gregtechmod.api.recipe.Recipe;
import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Log; import gregtechmod.api.util.GT_Log;
import gregtechmod.api.util.GT_Utility; import gregtechmod.api.util.GT_Utility;
import gregtechmod.common.gui.GT_GUIContainer_BasicMachine_Lathe; import gregtechmod.common.gui.GT_GUIContainer_BasicMachine_Lathe;
@ -9,7 +10,6 @@ import gregtechmod.common.recipe.RecipeMaps;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
@ -53,7 +53,7 @@ public class LatheRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public List<Recipe> getRecipeList() { public RecipeMap<?> getRecipeList() {
return RecipeMaps.LATHE; return RecipeMaps.LATHE;
} }

View file

@ -2,6 +2,7 @@ package gregtechmod.mistaqur.nei;
import gregtechmod.api.GregTech_API; import gregtechmod.api.GregTech_API;
import gregtechmod.api.recipe.Recipe; import gregtechmod.api.recipe.Recipe;
import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Log; import gregtechmod.api.util.GT_Log;
import gregtechmod.api.util.GT_Utility; import gregtechmod.api.util.GT_Utility;
import gregtechmod.common.gui.GT_GUIContainer_Sawmill; import gregtechmod.common.gui.GT_GUIContainer_Sawmill;
@ -9,7 +10,6 @@ import gregtechmod.common.recipe.RecipeMaps;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
@ -52,7 +52,7 @@ public class SawmillRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public List<Recipe> getRecipeList() { public RecipeMap<?> getRecipeList() {
return RecipeMaps.SAWMILL; return RecipeMaps.SAWMILL;
} }

View file

@ -2,6 +2,7 @@ package gregtechmod.mistaqur.nei;
import gregtechmod.api.GregTech_API; import gregtechmod.api.GregTech_API;
import gregtechmod.api.recipe.Recipe; import gregtechmod.api.recipe.Recipe;
import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Log; import gregtechmod.api.util.GT_Log;
import gregtechmod.api.util.GT_Utility; import gregtechmod.api.util.GT_Utility;
import gregtechmod.common.gui.GT_GUIContainer_VacuumFreezer; import gregtechmod.common.gui.GT_GUIContainer_VacuumFreezer;
@ -9,7 +10,6 @@ import gregtechmod.common.recipe.RecipeMaps;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
@ -53,7 +53,7 @@ public class VacuumFreezerRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public List<Recipe> getRecipeList() { public RecipeMap<?> getRecipeList() {
return RecipeMaps.VACUUM_FREEZER; return RecipeMaps.VACUUM_FREEZER;
} }

View file

@ -2,6 +2,7 @@ package gregtechmod.mistaqur.nei;
import gregtechmod.api.GregTech_API; import gregtechmod.api.GregTech_API;
import gregtechmod.api.recipe.Recipe; import gregtechmod.api.recipe.Recipe;
import gregtechmod.api.recipe.RecipeMap;
import gregtechmod.api.util.GT_Log; import gregtechmod.api.util.GT_Log;
import gregtechmod.api.util.GT_Utility; import gregtechmod.api.util.GT_Utility;
import gregtechmod.common.gui.GT_GUIContainer_BasicMachine_Wiremill; import gregtechmod.common.gui.GT_GUIContainer_BasicMachine_Wiremill;
@ -9,7 +10,6 @@ import gregtechmod.common.recipe.RecipeMaps;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
@ -52,7 +52,7 @@ public class WiremillRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public List<Recipe> getRecipeList() { public RecipeMap<?> getRecipeList() {
return RecipeMaps.WIREMILL; return RecipeMaps.WIREMILL;
} }