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

Fixed NEI overlays

Browse source 
Closes #99
This commit is contained in:
TheDarkDnKTv 2021-04-02 03:02:26 +03:00
parent 953ffad135
commit 9a544aaace
21 changed files with 84 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,6 +20,7 @@ import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
public class AlloySmelterRecipeHandler extends GT_RecipeHandler { public class AlloySmelterRecipeHandler extends GT_RecipeHandler {
@ -93,8 +94,8 @@ public class AlloySmelterRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public CachedGT_Recipe getRecipe(Recipe irecipe) { public CachedGT_Recipe getRecipe(Recipe irecipe, ItemStack activatedStack, boolean crafting) {
return new CachedGT_Recipe(irecipe) { return new CachedGT_Recipe(irecipe, activatedStack, crafting) {
@Override @Override
protected Pair<Integer, Integer> getInputAligment(int itemIdx) { protected Pair<Integer, Integer> getInputAligment(int itemIdx) {
return Pair.of(35 - sOffsetX + (18 * itemIdx), 25 - sOffsetY); return Pair.of(35 - sOffsetX + (18 * itemIdx), 25 - sOffsetY);

28
src/main/java/gregtechmod/mistaqur/nei/GT_RecipeHandler.java
View file

@ -24,6 +24,8 @@ import net.minecraftforge.fluids.FluidStack;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import com.google.common.collect.Lists;
import codechicken.lib.gui.GuiDraw; import codechicken.lib.gui.GuiDraw;
import codechicken.nei.NEIClientConfig; import codechicken.nei.NEIClientConfig;
import codechicken.nei.PositionedStack; import codechicken.nei.PositionedStack;
@ -58,7 +60,7 @@ public abstract class GT_RecipeHandler extends TemplateRecipeHandler {
public int mDuration, mEUt; public int mDuration, mEUt;
public CachedGT_Recipe(Recipe recipe) { public CachedGT_Recipe(Recipe recipe, ItemStack activatedStack, boolean crafting) {
resources = new ArrayList<>(); resources = new ArrayList<>();
products = new ArrayList<>(); products = new ArrayList<>();
fluidResources = new ArrayList<>(); fluidResources = new ArrayList<>();
@ -67,6 +69,7 @@ public abstract class GT_RecipeHandler extends TemplateRecipeHandler {
chanced = new HashMap<>(); chanced = new HashMap<>();
List<Ingredient> inputs = recipe.getInputs(); List<Ingredient> inputs = recipe.getInputs();
for (int i = 0; i < inputs.size(); i++) { for (int i = 0; i < inputs.size(); i++) {
Ingredient input = inputs.get(i); Ingredient input = inputs.get(i);
Pair<Integer, Integer> offsets = getInputAligment(i); Pair<Integer, Integer> offsets = getInputAligment(i);
@ -75,7 +78,12 @@ public abstract class GT_RecipeHandler extends TemplateRecipeHandler {
nonConsumables.add(GT_Utility.stackToInt(s)); nonConsumables.add(GT_Utility.stackToInt(s));
} }
} }
resources.add(new FixedPositionedStack(input.getVariants(), offsets.getKey(), offsets.getValue()));
List<ItemStack> items = !crafting && activatedStack != null && input.match(activatedStack) ?
Lists.newArrayList(GT_Utility.copyAmount(input.getCount() > 0 ? input.getCount() : 1, activatedStack)) :
input.getVariants();
resources.add(new FixedPositionedStack(items, offsets.getKey(), offsets.getValue()));
} }
int offset = 0; int offset = 0;
@ -155,7 +163,7 @@ public abstract class GT_RecipeHandler extends TemplateRecipeHandler {
public abstract RecipeMap<?> getRecipeList(); public abstract RecipeMap<?> getRecipeList();
public abstract CachedGT_Recipe getRecipe(Recipe irecipe); public abstract CachedGT_Recipe getRecipe(Recipe irecipe, ItemStack activatedStack, boolean crafting);
protected void provideTooltip(GuiRecipe gui, ItemStack stack, List<String> currenttip, CachedGT_Recipe recipe, Point relMouse) { protected void provideTooltip(GuiRecipe gui, ItemStack stack, List<String> currenttip, CachedGT_Recipe recipe, Point relMouse) {
for (PositionedFluidStack fluid : recipe.fluidResources) { for (PositionedFluidStack fluid : recipe.fluidResources) {
@ -282,7 +290,7 @@ public abstract class GT_RecipeHandler extends TemplateRecipeHandler {
this.loadCraftingRecipes((FluidStack) results[0]); this.loadCraftingRecipes((FluidStack) results[0]);
} else if(outputId.equals(getRecipeId())) { } else if(outputId.equals(getRecipeId())) {
for (Recipe irecipe : getRecipeList().getRecipes()) { for (Recipe irecipe : getRecipeList().getRecipes()) {
arecipes.add(getRecipe(irecipe)); arecipes.add(getRecipe(irecipe, null, false));
} }
} else super.loadCraftingRecipes(outputId, results); } else super.loadCraftingRecipes(outputId, results);
} }
@ -300,7 +308,7 @@ public abstract class GT_RecipeHandler extends TemplateRecipeHandler {
public void loadCraftingRecipes(ItemStack result) { public void loadCraftingRecipes(ItemStack result) {
FluidStack fluid = GT_Utility.getFluidForFilledItem(result); FluidStack fluid = GT_Utility.getFluidForFilledItem(result);
for (Recipe irecipe : getRecipeList().getRecipes()) { for (Recipe irecipe : getRecipeList().getRecipes()) {
CachedGT_Recipe recipe = getRecipe(irecipe); CachedGT_Recipe recipe = getRecipe(irecipe, result, true);
if (recipe.contains(recipe.products,result) || irecipe.getFluidOutputs().contains(fluid)) { if (recipe.contains(recipe.products,result) || irecipe.getFluidOutputs().contains(fluid)) {
arecipes.add(recipe); arecipes.add(recipe);
} }
@ -311,7 +319,7 @@ public abstract class GT_RecipeHandler extends TemplateRecipeHandler {
public void loadUsageRecipes(ItemStack ingredient) { public void loadUsageRecipes(ItemStack ingredient) {
FluidStack fluid = GT_Utility.getFluidForFilledItem(ingredient); FluidStack fluid = GT_Utility.getFluidForFilledItem(ingredient);
for (Recipe irecipe : getRecipeList().getRecipes()) { for (Recipe irecipe : getRecipeList().getRecipes()) {
CachedGT_Recipe recipe = getRecipe(irecipe); CachedGT_Recipe recipe = getRecipe(irecipe, ingredient, false);
if (recipe.contains(recipe.resources,ingredient) || irecipe.getFluidInputs().contains(fluid)) { if (recipe.contains(recipe.resources,ingredient) || irecipe.getFluidInputs().contains(fluid)) {
arecipes.add(recipe); arecipes.add(recipe);
} }
@ -321,14 +329,14 @@ public abstract class GT_RecipeHandler extends TemplateRecipeHandler {
public void loadUsageRecipes(FluidStack ingredient) { public void loadUsageRecipes(FluidStack ingredient) {
for (Recipe irecipe : getRecipeList().getRecipes()) { for (Recipe irecipe : getRecipeList().getRecipes()) {
if (irecipe.getFluidInputs().contains(ingredient)) { if (irecipe.getFluidInputs().contains(ingredient)) {
arecipes.add(getRecipe(irecipe)); arecipes.add(getRecipe(irecipe, null, false));
continue; continue;
} }
for (Ingredient ingr : irecipe.getInputs()) { for (Ingredient ingr : irecipe.getInputs()) {
ItemStack cell = GT_Utility.fillFluidContainer(ingredient, GT_Items.Cell_Empty.get(1)); ItemStack cell = GT_Utility.fillFluidContainer(ingredient, GT_Items.Cell_Empty.get(1));
if (ingr.match(cell)) { if (ingr.match(cell)) {
arecipes.add(getRecipe(irecipe)); arecipes.add(getRecipe(irecipe, cell, false));
} }
} }
} }
@ -337,14 +345,14 @@ public abstract class GT_RecipeHandler extends TemplateRecipeHandler {
public void loadCraftingRecipes(FluidStack result) { public void loadCraftingRecipes(FluidStack result) {
for (Recipe irecipe : getRecipeList().getRecipes()) { for (Recipe irecipe : getRecipeList().getRecipes()) {
if (irecipe.getFluidOutputs().contains(result)) { if (irecipe.getFluidOutputs().contains(result)) {
arecipes.add(getRecipe(irecipe)); arecipes.add(getRecipe(irecipe, null, true));
continue; continue;
} }
for (ItemStack stack : irecipe.getAllOutputs()) { for (ItemStack stack : irecipe.getAllOutputs()) {
FluidStack stack1 = GT_Utility.getFluidForFilledItem(stack); FluidStack stack1 = GT_Utility.getFluidForFilledItem(stack);
if (stack1 != null && result.isFluidEqual(stack1)) { if (stack1 != null && result.isFluidEqual(stack1)) {
arecipes.add(getRecipe(irecipe)); arecipes.add(getRecipe(irecipe, stack, true));
} }
} }
} }

5
src/main/java/gregtechmod/mistaqur/nei/handlers/AssemblerRecipeHandler.java
View file

@ -16,6 +16,7 @@ import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
public class AssemblerRecipeHandler extends GT_RecipeHandler { public class AssemblerRecipeHandler extends GT_RecipeHandler {
@ -59,8 +60,8 @@ public class AssemblerRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public CachedGT_Recipe getRecipe(Recipe irecipe) { public CachedGT_Recipe getRecipe(Recipe irecipe, ItemStack activatedStack, boolean crafting) {
return new CachedGT_Recipe(irecipe) { return new CachedGT_Recipe(irecipe, activatedStack, crafting) {
@Override @Override
protected Pair<Integer, Integer> getInputAligment(int itemIdx) { protected Pair<Integer, Integer> getInputAligment(int itemIdx) {
return Pair.of(35 - sOffsetX + (18 * itemIdx), 25 - sOffsetY); return Pair.of(35 - sOffsetX + (18 * itemIdx), 25 - sOffsetY);

5
src/main/java/gregtechmod/mistaqur/nei/handlers/BenderRecipeHandler.java
View file

@ -16,6 +16,7 @@ import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
public class BenderRecipeHandler extends GT_RecipeHandler { public class BenderRecipeHandler extends GT_RecipeHandler {
@ -59,8 +60,8 @@ public class BenderRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public CachedGT_Recipe getRecipe(Recipe irecipe) { public CachedGT_Recipe getRecipe(Recipe irecipe, ItemStack activatedStack, boolean crafting) {
return new CachedGT_Recipe(irecipe) { return new CachedGT_Recipe(irecipe, activatedStack, crafting) {
@Override @Override
protected Pair<Integer, Integer> getInputAligment(int itemIdx) { protected Pair<Integer, Integer> getInputAligment(int itemIdx) {
return Pair.of(35 - sOffsetX + (18 * itemIdx), 25 - sOffsetY); return Pair.of(35 - sOffsetX + (18 * itemIdx), 25 - sOffsetY);

9
src/main/java/gregtechmod/mistaqur/nei/handlers/BlastRecipeHandler.java
View file

@ -16,6 +16,7 @@ import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
public class BlastRecipeHandler extends GT_RecipeHandler { public class BlastRecipeHandler extends GT_RecipeHandler {
@ -23,8 +24,8 @@ public class BlastRecipeHandler extends GT_RecipeHandler {
public class CachedBlastRecipe extends CachedGT_Recipe { public class CachedBlastRecipe extends CachedGT_Recipe {
public int minTemp; public int minTemp;
public CachedBlastRecipe(Recipe aRecipe) { public CachedBlastRecipe(Recipe aRecipe, ItemStack activatedStack, boolean crafting) {
super(aRecipe); super(aRecipe, activatedStack, crafting);
minTemp = ((Integer)aRecipe.getMeta("minTemp")).intValue(); minTemp = ((Integer)aRecipe.getMeta("minTemp")).intValue();
} }
@ -78,8 +79,8 @@ public class BlastRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public CachedGT_Recipe getRecipe(Recipe irecipe) { public CachedGT_Recipe getRecipe(Recipe irecipe, ItemStack activatedStack, boolean crafting) {
return new CachedBlastRecipe(irecipe); return new CachedBlastRecipe(irecipe, activatedStack, crafting);
} }
@Override @Override

9
src/main/java/gregtechmod/mistaqur/nei/handlers/BronzeBlastRecipeHandler.java
View file

@ -14,6 +14,7 @@ import gregtechmod.common.recipe.RecipeMaps;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
/** /**
@ -24,8 +25,8 @@ public class BronzeBlastRecipeHandler extends BlastRecipeHandler {
public class CachedBronzeBlastRecipe extends CachedGT_Recipe { public class CachedBronzeBlastRecipe extends CachedGT_Recipe {
public CachedBronzeBlastRecipe(Recipe recipe) { public CachedBronzeBlastRecipe(Recipe recipe, ItemStack activatedStack, boolean crafting) {
super(recipe); super(recipe, activatedStack, crafting);
} }
@Override @Override
@ -73,8 +74,8 @@ public class BronzeBlastRecipeHandler extends BlastRecipeHandler {
} }
@Override @Override
public CachedGT_Recipe getRecipe(Recipe irecipe) { public CachedGT_Recipe getRecipe(Recipe irecipe, ItemStack activatedStack, boolean crafting) {
return new CachedBronzeBlastRecipe(irecipe); return new CachedBronzeBlastRecipe(irecipe, activatedStack, crafting);
} }
@Override @Override

5
src/main/java/gregtechmod/mistaqur/nei/handlers/CannerRecipeHandler.java
View file

@ -16,6 +16,7 @@ import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
public class CannerRecipeHandler extends GT_RecipeHandler { public class CannerRecipeHandler extends GT_RecipeHandler {
@ -59,8 +60,8 @@ public class CannerRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public CachedGT_Recipe getRecipe(Recipe irecipe) { public CachedGT_Recipe getRecipe(Recipe irecipe, ItemStack activatedStack, boolean crafting) {
return new CachedGT_Recipe(irecipe) { return new CachedGT_Recipe(irecipe, activatedStack, crafting) {
@Override @Override
protected Pair<Integer, Integer> getInputAligment(int itemIdx) { protected Pair<Integer, Integer> getInputAligment(int itemIdx) {
return Pair.of(35 - sOffsetX + (18 * itemIdx), 25 - sOffsetY); return Pair.of(35 - sOffsetX + (18 * itemIdx), 25 - sOffsetY);

5
src/main/java/gregtechmod/mistaqur/nei/handlers/CentrifugeRecipeHandler.java
View file

@ -16,6 +16,7 @@ import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
public class CentrifugeRecipeHandler extends GT_RecipeHandler { public class CentrifugeRecipeHandler extends GT_RecipeHandler {
@ -65,8 +66,8 @@ public class CentrifugeRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public CachedGT_Recipe getRecipe(Recipe irecipe) { public CachedGT_Recipe getRecipe(Recipe irecipe, ItemStack activatedStack, boolean crafting) {
return new CachedGT_Recipe(irecipe) { return new CachedGT_Recipe(irecipe, activatedStack, crafting) {
@Override @Override
protected Pair<Integer, Integer> getInputAligment(int itemIdx) { protected Pair<Integer, Integer> getInputAligment(int itemIdx) {
int x = itemIdx == 0 ? 80 - sOffsetX : 50 - sOffsetX; int x = itemIdx == 0 ? 80 - sOffsetX : 50 - sOffsetX;

5
src/main/java/gregtechmod/mistaqur/nei/handlers/ChemicalRecipeHandler.java
View file

@ -16,6 +16,7 @@ import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
public class ChemicalRecipeHandler extends GT_RecipeHandler { public class ChemicalRecipeHandler extends GT_RecipeHandler {
@ -58,8 +59,8 @@ public class ChemicalRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public CachedGT_Recipe getRecipe(Recipe irecipe) { public CachedGT_Recipe getRecipe(Recipe irecipe, ItemStack activatedStack, boolean crafting) {
return new CachedGT_Recipe(irecipe) { return new CachedGT_Recipe(irecipe, activatedStack, crafting) {
@Override @Override
protected Pair<Integer, Integer> getInputAligment(int itemIdx) { protected Pair<Integer, Integer> getInputAligment(int itemIdx) {
return Pair.of(70 - sOffsetX + (20 * itemIdx), 16 - sOffsetY); return Pair.of(70 - sOffsetX + (20 * itemIdx), 16 - sOffsetY);

5
src/main/java/gregtechmod/mistaqur/nei/handlers/CutterRecipeHandler.java
View file

@ -16,6 +16,7 @@ import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
public class CutterRecipeHandler extends GT_RecipeHandler { public class CutterRecipeHandler extends GT_RecipeHandler {
@ -59,8 +60,8 @@ public class CutterRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public CachedGT_Recipe getRecipe(Recipe irecipe) { public CachedGT_Recipe getRecipe(Recipe irecipe, ItemStack activatedStack, boolean crafting) {
return new CachedGT_Recipe(irecipe) { return new CachedGT_Recipe(irecipe, activatedStack, crafting) {
@Override @Override
protected Pair<Integer, Integer> getInputAligment(int itemIdx) { protected Pair<Integer, Integer> getInputAligment(int itemIdx) {
return Pair.of(53 - sOffsetX + (18 * itemIdx), 25 - sOffsetY); return Pair.of(53 - sOffsetX + (18 * itemIdx), 25 - sOffsetY);

5
src/main/java/gregtechmod/mistaqur/nei/handlers/DistillationRecipeHandler.java
View file

@ -16,6 +16,7 @@ import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
public class DistillationRecipeHandler extends GT_RecipeHandler { public class DistillationRecipeHandler extends GT_RecipeHandler {
@ -59,8 +60,8 @@ public class DistillationRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public CachedGT_Recipe getRecipe(Recipe irecipe) { public CachedGT_Recipe getRecipe(Recipe irecipe, ItemStack activatedStack, boolean crafting) {
return new CachedGT_Recipe(irecipe) { return new CachedGT_Recipe(irecipe, activatedStack, crafting) {
@Override @Override
protected Pair<Integer, Integer> getInputAligment(int itemIdx) { protected Pair<Integer, Integer> getInputAligment(int itemIdx) {
return Pair.of(62 - sOffsetX, 41 - sOffsetY + (18 * itemIdx)); return Pair.of(62 - sOffsetX, 41 - sOffsetY + (18 * itemIdx));

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

@ -15,6 +15,7 @@ import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
public class ElectrolyzerRecipeHandler extends GT_RecipeHandler { public class ElectrolyzerRecipeHandler extends GT_RecipeHandler {
@ -58,8 +59,8 @@ public class ElectrolyzerRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public CachedGT_Recipe getRecipe(Recipe irecipe) { public CachedGT_Recipe getRecipe(Recipe irecipe, ItemStack activatedStack, boolean crafting) {
return new CachedGT_Recipe(irecipe) { return new CachedGT_Recipe(irecipe, activatedStack, crafting) {
@Override @Override
protected Pair<Integer, Integer> getFluidInputAligment(int itemIdx) { protected Pair<Integer, Integer> getFluidInputAligment(int itemIdx) {
return Pair.of(110 - sOffsetX + (18 * itemIdx), 46 - sOffsetY); return Pair.of(110 - sOffsetX + (18 * itemIdx), 46 - sOffsetY);

5
src/main/java/gregtechmod/mistaqur/nei/handlers/ExtruderRecipeHandler.java
View file

@ -14,6 +14,7 @@ import gregtechmod.common.gui.GT_GUIContainer_BasicMachine_Extruder;
import gregtechmod.common.recipe.RecipeMaps; import gregtechmod.common.recipe.RecipeMaps;
import gregtechmod.mistaqur.nei.GT_RecipeHandler; import gregtechmod.mistaqur.nei.GT_RecipeHandler;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
public class ExtruderRecipeHandler extends GT_RecipeHandler { public class ExtruderRecipeHandler extends GT_RecipeHandler {
@ -49,8 +50,8 @@ public class ExtruderRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public CachedGT_Recipe getRecipe(Recipe irecipe) { public CachedGT_Recipe getRecipe(Recipe irecipe, ItemStack activatedStack, boolean crafting) {
return new CachedGT_Recipe(irecipe) { return new CachedGT_Recipe(irecipe, activatedStack, crafting) {
@Override @Override
protected Pair<Integer, Integer> getInputAligment(int itemIdx) { protected Pair<Integer, Integer> getInputAligment(int itemIdx) {
return Pair.of(35 - sOffsetX + (18 * itemIdx), 25 - sOffsetY); return Pair.of(35 - sOffsetX + (18 * itemIdx), 25 - sOffsetY);

9
src/main/java/gregtechmod/mistaqur/nei/handlers/FusionRecipeHandler.java
View file

@ -16,6 +16,7 @@ import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
public class FusionRecipeHandler extends GT_RecipeHandler { public class FusionRecipeHandler extends GT_RecipeHandler {
@ -23,8 +24,8 @@ public class FusionRecipeHandler extends GT_RecipeHandler {
public class CachedFusionRecipe extends CachedGT_Recipe { public class CachedFusionRecipe extends CachedGT_Recipe {
public int mStartEU; public int mStartEU;
public CachedFusionRecipe(Recipe irecipe) { public CachedFusionRecipe(Recipe irecipe, ItemStack activatedStack, boolean crafting) {
super(irecipe); super(irecipe, activatedStack, crafting);
mStartEU = irecipe.getEUtoStart(); mStartEU = irecipe.getEUtoStart();
} }
@ -88,8 +89,8 @@ public class FusionRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public CachedFusionRecipe getRecipe(Recipe irecipe) { public CachedFusionRecipe getRecipe(Recipe irecipe, ItemStack activatedStack, boolean crafting) {
return new CachedFusionRecipe(irecipe); return new CachedFusionRecipe(irecipe, activatedStack, crafting);
} }
@Override @Override

5
src/main/java/gregtechmod/mistaqur/nei/handlers/GeneratorHandler.java
View file

@ -16,6 +16,7 @@ import gregtechmod.api.util.GT_Utility;
import gregtechmod.mistaqur.nei.GT_RecipeHandler; import gregtechmod.mistaqur.nei.GT_RecipeHandler;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
/** /**
@ -86,8 +87,8 @@ public class GeneratorHandler extends GT_RecipeHandler {
} }
@Override @Override
public CachedGT_Recipe getRecipe(Recipe irecipe) { public CachedGT_Recipe getRecipe(Recipe irecipe, ItemStack activatedStack, boolean crafting) {
return new CachedGT_Recipe(irecipe) { return new CachedGT_Recipe(irecipe, activatedStack, crafting) {
protected Pair<Integer, Integer> getInputAligment(int itemIdx) { protected Pair<Integer, Integer> getInputAligment(int itemIdx) {
return Pair.of(67 - sOffsetY, 35 - sOffsetY + (itemIdx * 18)); return Pair.of(67 - sOffsetY, 35 - sOffsetY + (itemIdx * 18));
} }

5
src/main/java/gregtechmod/mistaqur/nei/handlers/GrinderRecipeHandler.java
View file

@ -16,6 +16,7 @@ import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
public class GrinderRecipeHandler extends GT_RecipeHandler { public class GrinderRecipeHandler extends GT_RecipeHandler {
@ -59,8 +60,8 @@ public class GrinderRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public CachedGT_Recipe getRecipe(Recipe irecipe) { public CachedGT_Recipe getRecipe(Recipe irecipe, ItemStack activatedStack, boolean crafting) {
return new CachedGT_Recipe(irecipe) { return new CachedGT_Recipe(irecipe, activatedStack, crafting) {
@Override @Override
protected Pair<Integer, Integer> getInputAligment(int itemIdx) { protected Pair<Integer, Integer> getInputAligment(int itemIdx) {
return Pair.of(34 - sOffsetX, 16 - sOffsetY + (18 * itemIdx)); return Pair.of(34 - sOffsetX, 16 - sOffsetY + (18 * itemIdx));

5
src/main/java/gregtechmod/mistaqur/nei/handlers/ImplosionRecipeHandler.java
View file

@ -16,6 +16,7 @@ import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
public class ImplosionRecipeHandler extends GT_RecipeHandler { public class ImplosionRecipeHandler extends GT_RecipeHandler {
@ -59,8 +60,8 @@ public class ImplosionRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public CachedGT_Recipe getRecipe(Recipe irecipe) { public CachedGT_Recipe getRecipe(Recipe irecipe, ItemStack activatedStack, boolean crafting) {
return new CachedGT_Recipe(irecipe) { return new CachedGT_Recipe(irecipe, activatedStack, crafting) {
@Override @Override
protected Pair<Integer, Integer> getInputAligment(int itemIdx) { protected Pair<Integer, Integer> getInputAligment(int itemIdx) {
return Pair.of(34 - sOffsetX , 16 - sOffsetY + (18 * itemIdx)); return Pair.of(34 - sOffsetX , 16 - sOffsetY + (18 * itemIdx));

5
src/main/java/gregtechmod/mistaqur/nei/handlers/LatheRecipeHandler.java
View file

@ -16,6 +16,7 @@ import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
public class LatheRecipeHandler extends GT_RecipeHandler { public class LatheRecipeHandler extends GT_RecipeHandler {
@ -59,8 +60,8 @@ public class LatheRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public CachedGT_Recipe getRecipe(Recipe irecipe) { public CachedGT_Recipe getRecipe(Recipe irecipe, ItemStack activatedStack, boolean crafting) {
return new CachedGT_Recipe(irecipe) { return new CachedGT_Recipe(irecipe, activatedStack, crafting) {
@Override @Override
protected Pair<Integer, Integer> getInputAligment(int itemIdx) { protected Pair<Integer, Integer> getInputAligment(int itemIdx) {
return Pair.of(53 - sOffsetX + (18 * itemIdx), 25 - sOffsetY); return Pair.of(53 - sOffsetX + (18 * itemIdx), 25 - sOffsetY);

5
src/main/java/gregtechmod/mistaqur/nei/handlers/SawmillRecipeHandler.java
View file

@ -16,6 +16,7 @@ import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
public class SawmillRecipeHandler extends GT_RecipeHandler { public class SawmillRecipeHandler extends GT_RecipeHandler {
@ -58,8 +59,8 @@ public class SawmillRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public CachedGT_Recipe getRecipe(Recipe irecipe) { public CachedGT_Recipe getRecipe(Recipe irecipe, ItemStack activatedStack, boolean crafting) {
return new CachedGT_Recipe(irecipe) { return new CachedGT_Recipe(irecipe, activatedStack, crafting) {
@Override @Override
protected Pair<Integer, Integer> getInputAligment(int itemIdx) { protected Pair<Integer, Integer> getInputAligment(int itemIdx) {
return Pair.of(29, 16 - sOffsetY + (itemIdx * 18)); return Pair.of(29, 16 - sOffsetY + (itemIdx * 18));

5
src/main/java/gregtechmod/mistaqur/nei/handlers/VacuumFreezerRecipeHandler.java
View file

@ -16,6 +16,7 @@ import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
public class VacuumFreezerRecipeHandler extends GT_RecipeHandler { public class VacuumFreezerRecipeHandler extends GT_RecipeHandler {
@ -59,8 +60,8 @@ public class VacuumFreezerRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public CachedGT_Recipe getRecipe(Recipe irecipe) { public CachedGT_Recipe getRecipe(Recipe irecipe, ItemStack activatedStack, boolean crafting) {
return new CachedGT_Recipe(irecipe) { return new CachedGT_Recipe(irecipe, activatedStack, crafting) {
@Override @Override
protected Pair<Integer, Integer> getInputAligment(int itemIdx) { protected Pair<Integer, Integer> getInputAligment(int itemIdx) {
return Pair.of(54 - sOffsetX - (18 * itemIdx), 25 - sOffsetY); return Pair.of(54 - sOffsetX - (18 * itemIdx), 25 - sOffsetY);

5
src/main/java/gregtechmod/mistaqur/nei/handlers/WiremillRecipeHandler.java
View file

@ -16,6 +16,7 @@ import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;
public class WiremillRecipeHandler extends GT_RecipeHandler { public class WiremillRecipeHandler extends GT_RecipeHandler {
@ -58,8 +59,8 @@ public class WiremillRecipeHandler extends GT_RecipeHandler {
} }
@Override @Override
public CachedGT_Recipe getRecipe(Recipe irecipe) { public CachedGT_Recipe getRecipe(Recipe irecipe, ItemStack activatedStack, boolean crafting) {
return new CachedGT_Recipe(irecipe) { return new CachedGT_Recipe(irecipe, activatedStack, crafting) {
@Override @Override
protected Pair<Integer, Integer> getInputAligment(int itemIdx) { protected Pair<Integer, Integer> getInputAligment(int itemIdx) {
return Pair.of(53 - sOffsetX + (54 * itemIdx), 25 - sOffsetY); return Pair.of(53 - sOffsetX + (54 * itemIdx), 25 - sOffsetY);