Fix recycler recipe display.

This commit is contained in:
drcrazy 2022-08-08 17:14:30 +03:00
parent 1ac4881bfa
commit 6a72d5011a

View file

@ -190,9 +190,7 @@ public class ReiPlugin implements REIClientPlugin {
@Override @Override
public void registerFluidSupport(FluidSupportProvider support) { public void registerFluidSupport(FluidSupportProvider support) {
support.register(new FluidSupportProvider.Provider() { support.register(stack -> {
@Override
public CompoundEventResult<Stream<EntryStack<FluidStack>>> itemToFluid(EntryStack<? extends ItemStack> stack) {
ItemStack itemStack = stack.getValue(); ItemStack itemStack = stack.getValue();
if (itemStack.getItem() instanceof ItemFluidInfo) { if (itemStack.getItem() instanceof ItemFluidInfo) {
Fluid fluid = ((ItemFluidInfo) itemStack.getItem()).getFluid(itemStack); Fluid fluid = ((ItemFluidInfo) itemStack.getItem()).getFluid(itemStack);
@ -200,7 +198,6 @@ public class ReiPlugin implements REIClientPlugin {
return CompoundEventResult.interruptTrue(Stream.of(EntryStacks.of(fluid))); return CompoundEventResult.interruptTrue(Stream.of(EntryStacks.of(fluid)));
} }
return CompoundEventResult.pass(); return CompoundEventResult.pass();
}
}); });
} }
@ -217,6 +214,9 @@ public class ReiPlugin implements REIClientPlugin {
} }
private <R extends RebornRecipe> void registerMachineRecipe(DisplayRegistry registry, RebornRecipeType<R> recipeType) { private <R extends RebornRecipe> void registerMachineRecipe(DisplayRegistry registry, RebornRecipeType<R> recipeType) {
if (recipeType == ModRecipes.RECYCLER) {
return;
}
Function<R, Display> recipeDisplay = r -> new MachineRecipeDisplay<>((RebornRecipe) r); Function<R, Display> recipeDisplay = r -> new MachineRecipeDisplay<>((RebornRecipe) r);
if (recipeType == ModRecipes.ROLLING_MACHINE) { if (recipeType == ModRecipes.ROLLING_MACHINE) {
@ -234,7 +234,7 @@ public class ReiPlugin implements REIClientPlugin {
} }
registry.registerFiller(RebornRecipe.class, recipe -> { registry.registerFiller(RebornRecipe.class, recipe -> {
if (recipe instanceof RebornRecipe) { if (recipe != null) {
return recipe.getRebornRecipeType() == recipeType; return recipe.getRebornRecipeType() == recipeType;
} }
return false; return false;