Anvilcraft/GregTech4
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed NEI

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/gregtechmod/mistaqur/nei/AlloySmelterRecipeHandler.java
View file

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

4
src/main/java/gregtechmod/mistaqur/nei/AssemblerRecipeHandler.java
View file

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

4
src/main/java/gregtechmod/mistaqur/nei/BenderRecipeHandler.java
View file

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

6
src/main/java/gregtechmod/mistaqur/nei/BlastRecipeHandler.java
View file

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

6
src/main/java/gregtechmod/mistaqur/nei/CannerRecipeHandler.java
View file

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

4
src/main/java/gregtechmod/mistaqur/nei/CentrifugeRecipeHandler.java
View file

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

4
src/main/java/gregtechmod/mistaqur/nei/CutterRecipeHandler.java
View file

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

4
src/main/java/gregtechmod/mistaqur/nei/DistillationRecipeHandler.java
View file

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

5
src/main/java/gregtechmod/mistaqur/nei/ElectrolyzerRecipeHandler.java
View file

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

4
src/main/java/gregtechmod/mistaqur/nei/ExtruderRecipeHandler.java
View file

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

6
src/main/java/gregtechmod/mistaqur/nei/FusionRecipeHandler.java
View file

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

4
src/main/java/gregtechmod/mistaqur/nei/GrinderRecipeHandler.java
View file

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

4
src/main/java/gregtechmod/mistaqur/nei/ImplosionRecipeHandler.java
View file

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

4
src/main/java/gregtechmod/mistaqur/nei/LatheRecipeHandler.java
View file

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

4
src/main/java/gregtechmod/mistaqur/nei/SawmillRecipeHandler.java
View file

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

4
src/main/java/gregtechmod/mistaqur/nei/VacuumFreezerRecipeHandler.java
View file

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

4
src/main/java/gregtechmod/mistaqur/nei/WiremillRecipeHandler.java
View file

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