Update JEI support, in a few places I could not figure it out, so there may be some issues.

This commit is contained in:
modmuss50 2016-11-28 15:28:32 +00:00
parent 9c33676b3d
commit c72c3b5851
51 changed files with 72 additions and 403 deletions

View file

@ -10,6 +10,7 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
@ -91,5 +92,9 @@ public class BlockMachineCasing extends BlockMultiblockBase {
return b != this && super.shouldSideBeRendered(blockState, worldIn, pos, side);
}
@Override
public boolean canRenderInLayer(BlockRenderLayer layer) {
return true;
}
}

View file

@ -3,6 +3,7 @@ package techreborn.compat.jei;
import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.BlankRecipeWrapper;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
import techreborn.api.recipe.BaseRecipe;
@ -13,11 +14,14 @@ public abstract class BaseRecipeWrapper<T extends BaseRecipe> extends BlankRecip
protected final T baseRecipe;
@Nonnull
private final List<List<ItemStack>> inputs;
@Nonnull
private final List<List<ItemStack>> outputs;
public BaseRecipeWrapper(T baseRecipe) {
this.baseRecipe = baseRecipe;
inputs = new ArrayList<>();
outputs = new ArrayList<>();
for (ItemStack input : baseRecipe.getInputs()) {
if (baseRecipe.useOreDic()) {
List<ItemStack> oreDictInputs = expandOreDict(input);
@ -26,6 +30,14 @@ public abstract class BaseRecipeWrapper<T extends BaseRecipe> extends BlankRecip
inputs.add(Collections.singletonList(input));
}
}
for (ItemStack input : baseRecipe.getOutputs()) {
if (baseRecipe.useOreDic()) {
List<ItemStack> oreDictInputs = expandOreDict(input);
outputs.add(oreDictInputs);
} else {
outputs.add(Collections.singletonList(input));
}
}
}
private static List<ItemStack> expandOreDict(ItemStack itemStack) {
@ -39,9 +51,9 @@ public abstract class BaseRecipeWrapper<T extends BaseRecipe> extends BlankRecip
String oreName = OreDictionary.getOreName(oreId);
List<ItemStack> ores = OreDictionary.getOres(oreName);
for (ItemStack ore : ores) {
if (ore.getCount() != itemStack.stackSize) {
if (ore.getCount() != itemStack.getCount()) {
ItemStack oreCopy = ore.copy();
oreCopy.stackSize = itemStack.stackSize;
oreCopy.setCount(itemStack.getCount());
itemStackSet.add(oreCopy);
} else {
itemStackSet.add(ore);
@ -60,14 +72,20 @@ public abstract class BaseRecipeWrapper<T extends BaseRecipe> extends BlankRecip
}
@Nonnull
@Override
public List<List<ItemStack>> getInputs() {
return inputs;
}
public List<FluidStack> getFluidInputs(){
return new ArrayList<>();
}
@Nonnull
@Override
public List<ItemStack> getOutputs() {
return baseRecipe.getOutputs();
List<ItemStack> stacks = new ArrayList<>();
for(List<ItemStack> stackList : outputs){
stacks.addAll(stackList);
}
return stacks;
}
}

View file

@ -100,13 +100,14 @@ public class RecipeUtil {
}
}
if (fluidOutputSlots != null) {
List<FluidStack> fluidOutputs = recipe.getFluidOutputs();
for (int i = 0; i < fluidOutputs.size() && i < fluidOutputSlots.length; i++) {
int outputTank = fluidOutputSlots[i];
guiFluidStacks.set(outputTank, fluidOutputs.get(i));
}
}
//TODO 1.11
// if (fluidOutputSlots != null) {
// List<FluidStack> fluidOutputs = recipe.getFluidOutputs();
// for (int i = 0; i < fluidOutputs.size() && i < fluidOutputSlots.length; i++) {
// int outputTank = fluidOutputSlots[i];
// guiFluidStacks.set(outputTank, fluidOutputs.get(i));
// }
// }
}
public static void setRecipeItems(
@ -134,7 +135,7 @@ public class RecipeUtil {
}
if (itemOutputSlots != null) {
List<ItemStack> outputs = ingredients.getOutputs(ItemStack.class);
List<List<ItemStack>> outputs = ingredients.getOutputs(ItemStack.class);
for (int i = 0; i < outputs.size() && i < itemOutputSlots.length; i++) {
int outputSlot = itemOutputSlots[i];
guiItemStacks.set(outputSlot, outputs.get(i));
@ -150,7 +151,7 @@ public class RecipeUtil {
}
if (fluidOutputSlots != null) {
List<FluidStack> fluidOutputs = ingredients.getOutputs(FluidStack.class);
List<List<FluidStack>> fluidOutputs = ingredients.getOutputs(FluidStack.class);
for (int i = 0; i < fluidOutputs.size() && i < fluidOutputSlots.length; i++) {
int outputTank = fluidOutputSlots[i];
guiFluidStacks.set(outputTank, fluidOutputs.get(i));

View file

@ -249,7 +249,6 @@ public class TechRebornJeiPlugin extends BlankModPlugin {
recipeTransferRegistry
.addRecipeTransferHandler(ContainerCompressor.class, RecipeCategoryUids.COMPRESSOR, 0, 1, 2, 36);
registry.getJeiHelpers().getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.pump));
if (CompatManager.isQuantumStorageLoaded) {
registry.getJeiHelpers().getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.quantumChest));

View file

@ -53,20 +53,6 @@ public class AlloySmelterRecipeCategory extends BlankRecipeCategory<AlloySmelter
electricity.draw(minecraft, 10, 20);
}
@Override
public void setRecipe(
@Nonnull
IRecipeLayout recipeLayout,
@Nonnull
AlloySmelterRecipeWrapper recipeWrapper) {
IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks();
guiItemStacks.init(INPUT_SLOTS[0], true, 0, 0);
guiItemStacks.init(INPUT_SLOTS[1], true, 18, 0);
guiItemStacks.init(OUTPUT_SLOTS[0], false, 69, 18);
RecipeUtil.setRecipeItems(recipeLayout, recipeWrapper, INPUT_SLOTS, OUTPUT_SLOTS, null, null);
}
@Override
public void setRecipe(
@Nonnull

View file

@ -24,12 +24,6 @@ public class AlloySmelterRecipeHandler implements IRecipeHandler<AlloySmelterRec
return AlloySmelterRecipe.class;
}
@Nonnull
@Override
public String getRecipeCategoryUid() {
return RecipeCategoryUids.ALLOY_SMELTER;
}
@Nonnull
@Override
public String getRecipeCategoryUid(

View file

@ -27,10 +27,8 @@ public class AlloySmelterRecipeWrapper extends BaseRecipeWrapper<AlloySmelterRec
}
@Override
public void drawAnimations(
@Nonnull
Minecraft minecraft, int recipeWidth, int recipeHeight) {
super.drawAnimations(minecraft, recipeWidth, recipeHeight);
public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY);
arrow.draw(minecraft, 33, 19);
int x = recipeWidth / 2;
@ -39,6 +37,6 @@ public class AlloySmelterRecipeWrapper extends BaseRecipeWrapper<AlloySmelterRec
minecraft.fontRendererObj.drawString("Time: " + (baseRecipe.tickTime / 20) + " secs", x, y, 0x444444);
minecraft.fontRendererObj.drawString("EU: " + baseRecipe.euPerTick + " EU/t", x, y += lineHeight, 0x444444);
}
}

View file

@ -53,19 +53,6 @@ public class AssemblingMachineRecipeCategory extends BlankRecipeCategory<Assembl
electricity.draw(minecraft, 10, 20);
}
@Override
public void setRecipe(
@Nonnull
IRecipeLayout recipeLayout,
@Nonnull
AssemblingMachineRecipeWrapper recipeWrapper) {
IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks();
guiItemStacks.init(INPUT_SLOTS[0], true, 0, 0);
guiItemStacks.init(INPUT_SLOTS[1], true, 18, 0);
guiItemStacks.init(OUTPUT_SLOTS[0], false, 69, 18);
RecipeUtil.setRecipeItems(recipeLayout, recipeWrapper, INPUT_SLOTS, OUTPUT_SLOTS, null, null);
}
@Override
public void setRecipe(

View file

@ -24,12 +24,6 @@ public class AssemblingMachineRecipeHandler implements IRecipeHandler<Assembling
return AssemblingMachineRecipe.class;
}
@Nonnull
@Override
public String getRecipeCategoryUid() {
return RecipeCategoryUids.ASSEMBLING_MACHINE;
}
@Nonnull
@Override
public String getRecipeCategoryUid(

View file

@ -27,10 +27,8 @@ public class AssemblingMachineRecipeWrapper extends BaseRecipeWrapper<Assembling
}
@Override
public void drawAnimations(
@Nonnull
Minecraft minecraft, int recipeWidth, int recipeHeight) {
super.drawAnimations(minecraft, recipeWidth, recipeHeight);
public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY);
progress.draw(minecraft, 40, 18);
}
}

View file

@ -43,20 +43,6 @@ public class BlastFurnaceRecipeCategory extends BlankRecipeCategory<BlastFurnace
return background;
}
@Override
public void setRecipe(
@Nonnull
IRecipeLayout recipeLayout,
@Nonnull
BlastFurnaceRecipeWrapper recipeWrapper) {
IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks();
guiItemStacks.init(INPUT_SLOTS[0], true, 0, 0);
guiItemStacks.init(INPUT_SLOTS[1], true, 0, 18);
guiItemStacks.init(OUTPUT_SLOTS[0], false, 60, 10);
guiItemStacks.init(OUTPUT_SLOTS[1], false, 78, 10);
RecipeUtil.setRecipeItems(recipeLayout, recipeWrapper, INPUT_SLOTS, OUTPUT_SLOTS, null, null);
}
@Override
public void setRecipe(

View file

@ -24,12 +24,6 @@ public class BlastFurnaceRecipeHandler implements IRecipeHandler<BlastFurnaceRec
return BlastFurnaceRecipe.class;
}
@Nonnull
@Override
public String getRecipeCategoryUid() {
return RecipeCategoryUids.BLAST_FURNACE;
}
@Nonnull
@Override
public String getRecipeCategoryUid(

View file

@ -27,10 +27,8 @@ public class BlastFurnaceRecipeWrapper extends BaseRecipeWrapper<BlastFurnaceRec
}
@Override
public void drawAnimations(
@Nonnull
Minecraft minecraft, int recipeWidth, int recipeHeight) {
super.drawAnimations(minecraft, recipeWidth, recipeHeight);
public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY);
progress.draw(minecraft, 54 - 29, 13);
int x = recipeWidth / 3;

View file

@ -43,24 +43,6 @@ public class CentrifugeRecipeCategory extends BlankRecipeCategory<CentrifugeReci
return background;
}
@Override
public void setRecipe(
@Nonnull
IRecipeLayout recipeLayout,
@Nonnull
CentrifugeRecipeWrapper recipeWrapper) {
IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks();
guiItemStacks.init(INPUT_SLOTS[0], true, 30, 30);
guiItemStacks.init(INPUT_SLOTS[1], true, 0, 0);
guiItemStacks.init(OUTPUT_SLOTS[0], false, 30, 0);
guiItemStacks.init(OUTPUT_SLOTS[1], false, 60, 30);
guiItemStacks.init(OUTPUT_SLOTS[2], false, 30, 60);
guiItemStacks.init(OUTPUT_SLOTS[3], false, 0, 30);
RecipeUtil.setRecipeItems(recipeLayout, recipeWrapper, INPUT_SLOTS, OUTPUT_SLOTS, null, null);
}
@Override
public void setRecipe(
@Nonnull

View file

@ -24,11 +24,6 @@ public class CentrifugeRecipeHandler implements IRecipeHandler<CentrifugeRecipe>
return CentrifugeRecipe.class;
}
@Nonnull
@Override
public String getRecipeCategoryUid() {
return RecipeCategoryUids.CENTRIFUGE;
}
@Nonnull
@Override

View file

@ -42,10 +42,8 @@ public class CentrifugeRecipeWrapper extends BaseRecipeWrapper<CentrifugeRecipe>
}
@Override
public void drawAnimations(
@Nonnull
Minecraft minecraft, int recipeWidth, int recipeHeight) {
super.drawAnimations(minecraft, recipeWidth, recipeHeight);
public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY);
progressUp.draw(minecraft, 33, 18);
progressLeft.draw(minecraft, 18, 33);
progressDown.draw(minecraft, 33, 48);

View file

@ -43,20 +43,6 @@ public class ChemicalReactorRecipeCategory extends BlankRecipeCategory<ChemicalR
return background;
}
@Override
public void setRecipe(
@Nonnull
IRecipeLayout recipeLayout,
@Nonnull
ChemicalReactorRecipeWrapper recipeWrapper) {
IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks();
guiItemStacks.init(INPUT_SLOTS[0], true, 0, 0);
guiItemStacks.init(INPUT_SLOTS[1], true, 20, 0);
guiItemStacks.init(OUTPUT_SLOTS[0], false, 10, 30);
RecipeUtil.setRecipeItems(recipeLayout, recipeWrapper, INPUT_SLOTS, OUTPUT_SLOTS, null, null);
}
@Override
public void setRecipe(

View file

@ -24,11 +24,6 @@ public class ChemicalReactorRecipeHandler implements IRecipeHandler<ChemicalReac
return ChemicalReactorRecipe.class;
}
@Nonnull
@Override
public String getRecipeCategoryUid() {
return RecipeCategoryUids.CHEMICAL_REACTOR;
}
@Nonnull
@Override

View file

@ -29,10 +29,8 @@ public class ChemicalReactorRecipeWrapper extends BaseRecipeWrapper<ChemicalReac
}
@Override
public void drawAnimations(
@Nonnull
Minecraft minecraft, int recipeWidth, int recipeHeight) {
super.drawAnimations(minecraft, recipeWidth, recipeHeight);
public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY);
progress.draw(minecraft, 3, 18);
int x = (int) (-recipeWidth * 1.6f);

View file

@ -43,19 +43,7 @@ public class CompressorRecipeCategory extends BlankRecipeCategory<CompressorReci
return background;
}
@Override
public void setRecipe(
@Nonnull
IRecipeLayout recipeLayout,
@Nonnull
CompressorRecipeWrapper recipeWrapper) {
IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks();
guiItemStacks.init(INPUT_SLOTS[0], true, 0, 3);
guiItemStacks.init(OUTPUT_SLOTS[0], false, 60, 4);
RecipeUtil.setRecipeItems(recipeLayout, recipeWrapper, INPUT_SLOTS, OUTPUT_SLOTS, null, null);
}
@Override
public void setRecipe(

View file

@ -24,11 +24,6 @@ public class CompressorRecipeHandler implements IRecipeHandler<CompressorRecipe>
return CompressorRecipe.class;
}
@Nonnull
@Override
public String getRecipeCategoryUid() {
return RecipeCategoryUids.COMPRESSOR;
}
@Nonnull
@Override

View file

@ -29,10 +29,8 @@ public class CompressorRecipeWrapper extends BaseRecipeWrapper<CompressorRecipe>
}
@Override
public void drawAnimations(
@Nonnull
Minecraft minecraft, int recipeWidth, int recipeHeight) {
super.drawAnimations(minecraft, recipeWidth, recipeHeight);
public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY);
progress.draw(minecraft, 25, 7);
int x = -45;

View file

@ -43,19 +43,7 @@ public class ExtractorRecipeCategory extends BlankRecipeCategory<ExtractorRecipe
return background;
}
@Override
public void setRecipe(
@Nonnull
IRecipeLayout recipeLayout,
@Nonnull
ExtractorRecipeWrapper recipeWrapper) {
IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks();
guiItemStacks.init(INPUT_SLOTS[0], true, 0, 3);
guiItemStacks.init(OUTPUT_SLOTS[0], false, 60, 4);
RecipeUtil.setRecipeItems(recipeLayout, recipeWrapper, INPUT_SLOTS, OUTPUT_SLOTS, null, null);
}
@Override
public void setRecipe(

View file

@ -24,11 +24,6 @@ public class ExtractorRecipeHandler implements IRecipeHandler<ExtractorRecipe> {
return ExtractorRecipe.class;
}
@Nonnull
@Override
public String getRecipeCategoryUid() {
return RecipeCategoryUids.EXTRACTOR;
}
@Nonnull
@Override

View file

@ -29,10 +29,8 @@ public class ExtractorRecipeWrapper extends BaseRecipeWrapper<ExtractorRecipe> {
}
@Override
public void drawAnimations(
@Nonnull
Minecraft minecraft, int recipeWidth, int recipeHeight) {
super.drawAnimations(minecraft, recipeWidth, recipeHeight);
public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY);
progress.draw(minecraft, 25, 7);
int x = -45;

View file

@ -47,21 +47,6 @@ public class FusionReactorRecipeCategory extends BlankRecipeCategory<FusionReact
return background;
}
@Override
public void setRecipe(
@Nonnull
IRecipeLayout recipeLayout,
@Nonnull
FusionReactorRecipeWrapper recipeWrapper) {
IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks();
itemStacks.init(inputSlotTop, true, 21, 0);
itemStacks.init(inputSlotBottom, true, 21, 36);
itemStacks.init(outputSlot, false, 81, 18);
itemStacks.set(inputSlotTop, recipeWrapper.getTopInput());
itemStacks.set(inputSlotBottom, recipeWrapper.getBottomInput());
itemStacks.set(outputSlot, recipeWrapper.getOutputs());
}
@Override
public void setRecipe(
@ -78,7 +63,7 @@ public class FusionReactorRecipeCategory extends BlankRecipeCategory<FusionReact
itemStacks.set(inputSlotTop, recipeWrapper.getTopInput());
itemStacks.set(inputSlotBottom, recipeWrapper.getBottomInput());
itemStacks.set(outputSlot, ingredients.getOutputs(ItemStack.class));
itemStacks.set(outputSlot, ingredients.getOutputs(ItemStack.class).get(0));
}
}

View file

@ -15,11 +15,6 @@ public class FusionReactorRecipeHandler implements IRecipeHandler<FusionReactorR
return FusionReactorRecipe.class;
}
@Nonnull
@Override
public String getRecipeCategoryUid() {
return RecipeCategoryUids.FUSION_REACTOR;
}
@Nonnull
@Override

View file

@ -27,17 +27,6 @@ public class FusionReactorRecipeWrapper extends BlankRecipeWrapper {
ingredients.setInput(ItemStack.class, baseRecipe.getOutput());
}
@Override
@Nonnull
public List<ItemStack> getInputs() {
return Arrays.asList(baseRecipe.getTopInput(), baseRecipe.getBottomInput());
}
@Override
@Nonnull
public List<ItemStack> getOutputs() {
return Collections.singletonList(baseRecipe.getOutput());
}
public ItemStack getTopInput() {
return baseRecipe.getTopInput();

View file

@ -43,19 +43,6 @@ public class GrinderRecipeCategory extends BlankRecipeCategory<GrinderRecipeWrap
return background;
}
@Override
public void setRecipe(
@Nonnull
IRecipeLayout recipeLayout,
@Nonnull
GrinderRecipeWrapper recipeWrapper) {
IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks();
guiItemStacks.init(INPUT_SLOTS[0], true, 0, 3);
guiItemStacks.init(OUTPUT_SLOTS[0], false, 60, 4);
RecipeUtil.setRecipeItems(recipeLayout, recipeWrapper, INPUT_SLOTS, OUTPUT_SLOTS, null, null);
}
@Override
public void setRecipe(

View file

@ -24,11 +24,6 @@ public class GrinderRecipeHandler implements IRecipeHandler<GrinderRecipe> {
return GrinderRecipe.class;
}
@Nonnull
@Override
public String getRecipeCategoryUid() {
return RecipeCategoryUids.GRINDER;
}
@Nonnull
@Override

View file

@ -29,10 +29,8 @@ public class GrinderRecipeWrapper extends BaseRecipeWrapper<GrinderRecipe> {
}
@Override
public void drawAnimations(
@Nonnull
Minecraft minecraft, int recipeWidth, int recipeHeight) {
super.drawAnimations(minecraft, recipeWidth, recipeHeight);
public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY);
progress.draw(minecraft, 25, 7);
int x = -45;

View file

@ -47,28 +47,11 @@ public class ImplosionCompressorRecipeCategory extends BlankRecipeCategory<Implo
}
@Override
public void drawAnimations(
@Nonnull
Minecraft minecraft) {
public void drawExtras(Minecraft minecraft) {
super.drawExtras(minecraft);
electricity.draw(minecraft, 0, 12);
}
@Override
public void setRecipe(
@Nonnull
IRecipeLayout recipeLayout,
@Nonnull
ImplosionCompressorRecipeWrapper recipeWrapper) {
IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks();
guiItemStacks.init(INPUT_SLOTS[0], true, 20, 0);
guiItemStacks.init(INPUT_SLOTS[1], true, 20, 18);
guiItemStacks.init(OUTPUT_SLOTS[0], false, 76, 9);
guiItemStacks.init(OUTPUT_SLOTS[1], false, 94, 9);
RecipeUtil.setRecipeItems(recipeLayout, recipeWrapper, INPUT_SLOTS, OUTPUT_SLOTS, null, null);
}
@Override
public void setRecipe(
@Nonnull

View file

@ -24,11 +24,6 @@ public class ImplosionCompressorRecipeHandler implements IRecipeHandler<Implosio
return ImplosionCompressorRecipe.class;
}
@Nonnull
@Override
public String getRecipeCategoryUid() {
return RecipeCategoryUids.IMPLOSION_COMPRESSOR;
}
@Nonnull
@Override

View file

@ -27,10 +27,8 @@ public class ImplosionCompressorRecipeWrapper extends BaseRecipeWrapper<Implosio
}
@Override
public void drawAnimations(
@Nonnull
Minecraft minecraft, int recipeWidth, int recipeHeight) {
super.drawAnimations(minecraft, recipeWidth, recipeHeight);
public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY);
progress.draw(minecraft, 44, 13);
int x = -45;

View file

@ -43,22 +43,6 @@ public class IndustrialElectrolyzerRecipeCategory extends BlankRecipeCategory<In
return background;
}
@Override
public void setRecipe(
@Nonnull
IRecipeLayout recipeLayout,
@Nonnull
IndustrialElectrolyzerRecipeWrapper recipeWrapper) {
IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks();
guiItemStacks.init(INPUT_SLOTS[0], true, 30, 32);
guiItemStacks.init(INPUT_SLOTS[1], true, 0, 32);
guiItemStacks.init(OUTPUT_SLOTS[0], false, 0, 0);
guiItemStacks.init(OUTPUT_SLOTS[1], false, 20, 0);
guiItemStacks.init(OUTPUT_SLOTS[2], false, 40, 0);
guiItemStacks.init(OUTPUT_SLOTS[3], false, 60, 0);
RecipeUtil.setRecipeItems(recipeLayout, recipeWrapper, INPUT_SLOTS, OUTPUT_SLOTS, null, null);
}
@Override
public void setRecipe(

View file

@ -24,11 +24,6 @@ public class IndustrialElectrolyzerRecipeHandler implements IRecipeHandler<Indus
return IndustrialElectrolyzerRecipe.class;
}
@Nonnull
@Override
public String getRecipeCategoryUid() {
return RecipeCategoryUids.INDUSTRIAL_ELECTROLYZER;
}
@Nonnull
@Override

View file

@ -27,10 +27,8 @@ public class IndustrialElectrolyzerRecipeWrapper extends BaseRecipeWrapper<Indus
}
@Override
public void drawAnimations(
@Nonnull
Minecraft minecraft, int recipeWidth, int recipeHeight) {
super.drawAnimations(minecraft, recipeWidth, recipeHeight);
public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY);
progress.draw(minecraft, 24, 20);
int x = 60;

View file

@ -59,26 +59,6 @@ public class IndustrialGrinderRecipeCategory extends BlankRecipeCategory<Industr
blankArea.draw(minecraft, 129, 49);
}
@Override
public void setRecipe(
@Nonnull
IRecipeLayout recipeLayout,
@Nonnull
IndustrialGrinderRecipeWrapper recipeWrapper) {
IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks();
guiItemStacks.init(INPUT_SLOTS[0], true, 24, 10);
guiItemStacks.init(INPUT_SLOTS[1], true, 24, 28);
guiItemStacks.init(OUTPUT_SLOTS[0], false, 69, 19);
guiItemStacks.init(OUTPUT_SLOTS[1], false, 87, 19);
guiItemStacks.init(OUTPUT_SLOTS[2], false, 105, 19);
guiItemStacks.init(OUTPUT_SLOTS[3], false, 123, 19);
IGuiFluidStackGroup guiFluidStacks = recipeLayout.getFluidStacks();
guiFluidStacks.init(INPUT_TANKS[0], true, 4, 4, 12, 47, TileIndustrialGrinder.TANK_CAPACITY, true, tankOverlay);
RecipeUtil.setRecipeItems(recipeLayout, recipeWrapper, INPUT_SLOTS, OUTPUT_SLOTS, INPUT_TANKS, null);
}
@Override
public void setRecipe(

View file

@ -24,11 +24,6 @@ public class IndustrialGrinderRecipeHandler implements IRecipeHandler<Industrial
return IndustrialGrinderRecipe.class;
}
@Nonnull
@Override
public String getRecipeCategoryUid() {
return RecipeCategoryUids.INDUSTRIAL_GRINDER;
}
@Nonnull
@Override

View file

@ -42,10 +42,8 @@ public class IndustrialGrinderRecipeWrapper extends BaseRecipeWrapper<Industrial
}
@Override
public void drawAnimations(
@Nonnull
Minecraft minecraft, int recipeWidth, int recipeHeight) {
super.drawAnimations(minecraft, recipeWidth, recipeHeight);
public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY);
progress.draw(minecraft, 44, 20);
int x = 70;

View file

@ -50,32 +50,12 @@ public class RollingMachineRecipeCategory extends BlankRecipeCategory<RollingMac
}
@Override
public void drawAnimations(
public void drawExtras(
@Nonnull
Minecraft minecraft) {
progress.draw(minecraft, 62, 18);
}
@Override
public void setRecipe(
@Nonnull
IRecipeLayout recipeLayout,
@Nonnull
RollingMachineRecipeWrapper recipeWrapper) {
IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks();
for (int l = 0; l < 3; l++) {
for (int k1 = 0; k1 < 3; k1++) {
int i = k1 + l * 3;
guiItemStacks.init(INPUT_SLOTS[i], true, k1 * 18, l * 18);
}
}
guiItemStacks.init(OUTPUT_SLOTS[0], false, 94, 18);
craftingGridHelper.setInput(guiItemStacks, recipeWrapper.getInputs());
craftingGridHelper.setOutput(guiItemStacks, recipeWrapper.getOutputs());
}
@Override
public void setRecipe(
@Nonnull
@ -95,6 +75,6 @@ public class RollingMachineRecipeCategory extends BlankRecipeCategory<RollingMac
guiItemStacks.init(OUTPUT_SLOTS[0], false, 94, 18);
craftingGridHelper.setInputStacks(guiItemStacks, ingredients.getInputs(ItemStack.class));
craftingGridHelper.setOutput(guiItemStacks, ingredients.getOutputs(ItemStack.class));
craftingGridHelper.setOutput(guiItemStacks, ingredients.getOutputs(ItemStack.class).get(0));
}
}

View file

@ -13,12 +13,6 @@ public class RollingMachineRecipeHandler implements IRecipeHandler<RollingMachin
return RollingMachineRecipeWrapper.class;
}
@Nonnull
@Override
public String getRecipeCategoryUid() {
return RecipeCategoryUids.ROLLING_MACHINE;
}
@Nonnull
@Override
public String getRecipeCategoryUid(

View file

@ -34,7 +34,7 @@ public class RollingMachineRecipeWrapper extends BlankRecipeWrapper implements I
IGuiHelper guiHelper = jeiHelpers.getGuiHelper();
ICraftingRecipeWrapper recipeWrapper;
if (baseRecipe instanceof ShapelessRecipes) {
recipeWrapper = new ShapelessRecipesWrapper(guiHelper, (ShapelessRecipes) baseRecipe);
recipeWrapper = new ShapelessRecipesWrapper((ShapelessRecipes) baseRecipe);
} else if (baseRecipe instanceof ShapedRecipes) {
recipeWrapper = new ShapedRecipesWrapper((ShapedRecipes) baseRecipe);
} else if (baseRecipe instanceof ShapedOreRecipe) {
@ -55,15 +55,4 @@ public class RollingMachineRecipeWrapper extends BlankRecipeWrapper implements I
baseRecipe.getIngredients(ingredients);
}
@Override
@Nonnull
public List getInputs() {
return baseRecipe.getInputs();
}
@Override
@Nonnull
public List<ItemStack> getOutputs() {
return baseRecipe.getOutputs();
}
}

View file

@ -43,20 +43,6 @@ public class ScrapboxRecipeCategory extends BlankRecipeCategory<ScrapboxRecipeWr
return background;
}
@Override
public void setRecipe(
@Nonnull
IRecipeLayout recipeLayout,
@Nonnull
ScrapboxRecipeWrapper recipeWrapper) {
IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks();
guiItemStacks.init(INPUT_SLOTS[0], true, 0, 3);
guiItemStacks.init(OUTPUT_SLOTS[0], false, 60, 4);
RecipeUtil.setRecipeItems(recipeLayout, recipeWrapper, INPUT_SLOTS, OUTPUT_SLOTS, null, null);
}
@Override
public void setRecipe(
@Nonnull

View file

@ -24,11 +24,6 @@ public class ScrapboxRecipeHandler implements IRecipeHandler<ScrapboxRecipe> {
return ScrapboxRecipe.class;
}
@Nonnull
@Override
public String getRecipeCategoryUid() {
return RecipeCategoryUids.SCRAPBOX;
}
@Nonnull
@Override

View file

@ -29,10 +29,8 @@ public class ScrapboxRecipeWrapper extends BaseRecipeWrapper<ScrapboxRecipe> {
}
@Override
public void drawAnimations(
@Nonnull
Minecraft minecraft, int recipeWidth, int recipeHeight) {
super.drawAnimations(minecraft, recipeWidth, recipeHeight);
public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY);
progress.draw(minecraft, 25, 7);
}
}

View file

@ -43,20 +43,6 @@ public class VacuumFreezerRecipeCategory extends BlankRecipeCategory<VacuumFreez
return background;
}
@Override
public void setRecipe(
@Nonnull
IRecipeLayout recipeLayout,
@Nonnull
VacuumFreezerRecipeWrapper recipeWrapper) {
IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks();
guiItemStacks.init(INPUT_SLOTS[0], true, 0, 3);
guiItemStacks.init(OUTPUT_SLOTS[0], false, 60, 4);
RecipeUtil.setRecipeItems(recipeLayout, recipeWrapper, INPUT_SLOTS, OUTPUT_SLOTS, null, null);
}
@Override
public void setRecipe(
@Nonnull

View file

@ -24,12 +24,6 @@ public class VacuumFreezerRecipeHandler implements IRecipeHandler<VacuumFreezerR
return VacuumFreezerRecipe.class;
}
@Nonnull
@Override
public String getRecipeCategoryUid() {
return RecipeCategoryUids.VACUUM_FREEZER;
}
@Nonnull
@Override
public String getRecipeCategoryUid(

View file

@ -29,10 +29,8 @@ public class VacuumFreezerRecipeWrapper extends BaseRecipeWrapper<VacuumFreezerR
}
@Override
public void drawAnimations(
@Nonnull
Minecraft minecraft, int recipeWidth, int recipeHeight) {
super.drawAnimations(minecraft, recipeWidth, recipeHeight);
public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY);
progress.draw(minecraft, 25, 7);
}
}