diff options
Diffstat (limited to 'api')
3 files changed, 48 insertions, 14 deletions
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/EntryRenderer.java b/api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/EntryRenderer.java index caabdbabd..e5b78b788 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/EntryRenderer.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/entry/renderer/EntryRenderer.java @@ -36,7 +36,7 @@ import org.jetbrains.annotations.Nullable; /** * A renderer to render a {@link EntryStack}. - * Use {@link EntryStack.Settings#RENDERER} to change the {@link EntryRenderer} for a {@link EntryStack}. + * Use {@link me.shedaniel.rei.api.client.util.ClientEntryStacks#setRenderer} to change the {@link EntryRenderer} for a {@link EntryStack}. * * @param <T> the entry type * @see BatchedEntryRenderer diff --git a/api/src/main/java/me/shedaniel/rei/api/client/util/ClientEntryStacks.java b/api/src/main/java/me/shedaniel/rei/api/client/util/ClientEntryStacks.java index 537a658f2..7409f1150 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/util/ClientEntryStacks.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/util/ClientEntryStacks.java @@ -23,10 +23,16 @@ package me.shedaniel.rei.api.client.util; +import me.shedaniel.architectury.fluid.FluidStack; +import me.shedaniel.rei.api.client.entry.renderer.EntryRenderer; import me.shedaniel.rei.api.client.entry.type.BuiltinClientEntryTypes; import me.shedaniel.rei.api.client.gui.Renderer; +import me.shedaniel.rei.api.client.gui.widgets.Tooltip; import me.shedaniel.rei.api.common.entry.EntryStack; +import java.util.function.BiFunction; +import java.util.function.Function; + public final class ClientEntryStacks { private ClientEntryStacks() {} @@ -37,4 +43,26 @@ public final class ClientEntryStacks { return EntryStack.of(BuiltinClientEntryTypes.RENDERING, renderer); } + + public static <T> EntryStack<T> setNotRenderer(EntryStack<T> stack) { + return setRenderer(stack, EntryRenderer.empty()); + } + + public static <T> EntryStack<T> setRenderer(EntryStack<T> stack, EntryRenderer<T> renderer) { + return stack.setting(EntryStack.Settings.RENDERER, s -> renderer); + } + + @SuppressWarnings("rawtypes") + public static <T> EntryStack<T> setRenderer(EntryStack<T> stack, Function<EntryStack<T>, EntryRenderer<T>> rendererProvider) { + return stack.setting(EntryStack.Settings.RENDERER, (Function) rendererProvider); + } + + @SuppressWarnings("rawtypes") + public static <T> EntryStack<T> setTooltipProcessor(EntryStack<T> stack, BiFunction<EntryStack<T>, Tooltip, Tooltip> processor) { + return stack.setting(EntryStack.Settings.TOOLTIP_PROCESSOR, (BiFunction) processor); + } + + public static EntryStack<FluidStack> setFluidRenderRatio(EntryStack<FluidStack> stack, float ratio) { + return stack.setting(EntryStack.Settings.FLUID_RENDER_RATIO, ratio); + } } diff --git a/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java b/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java index d6f73a7cf..3b0f6b454 100644 --- a/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java +++ b/api/src/main/java/me/shedaniel/rei/api/common/entry/EntryStack.java @@ -23,6 +23,8 @@ package me.shedaniel.rei.api.common.entry; +import me.shedaniel.architectury.utils.Env; +import me.shedaniel.architectury.utils.EnvExecutor; import me.shedaniel.math.Point; import me.shedaniel.rei.api.client.config.ConfigObject; import me.shedaniel.rei.api.client.entry.renderer.EntryRenderer; @@ -138,39 +140,43 @@ public interface EntryStack<T> extends TextRepresentable, Renderer { <R> R get(Settings<R> settings); + @Environment(EnvType.CLIENT) default EntryStack<T> tooltip(Component... tooltips) { return tooltip(Arrays.asList(tooltips)); } + @Environment(EnvType.CLIENT) default EntryStack<T> tooltip(List<Component> tooltips) { return tooltip(stack -> tooltips); } + @Environment(EnvType.CLIENT) default EntryStack<T> tooltip(Function<EntryStack<?>, List<Component>> tooltipProvider) { return setting(Settings.TOOLTIP_APPEND_EXTRA, tooltipProvider); } + @Deprecated class Settings<R> { @ApiStatus.Internal private static final List<Settings<?>> SETTINGS = new ArrayList<>(); - public static final Supplier<Boolean> TRUE = () -> true; - public static final Supplier<Boolean> FALSE = () -> false; @Environment(EnvType.CLIENT) - public static final Function<EntryStack<?>, EntryRenderer<?>> DEFAULT_RENDERER = stack -> stack.getDefinition().getRenderer(); + public static Settings<Function<EntryStack<?>, EntryRenderer<?>>> RENDERER; @Environment(EnvType.CLIENT) - public static final Function<EntryStack<?>, EntryRenderer<?>> EMPTY_RENDERER = stack -> EntryRenderer.empty(); - public static final BiFunction<EntryStack<?>, Tooltip, Tooltip> DEFAULT_TOOLTIP_PROCESSOR = (stack, tooltip) -> tooltip; + public static Settings<BiFunction<EntryStack<?>, Tooltip, Tooltip>> TOOLTIP_PROCESSOR; @Environment(EnvType.CLIENT) - public static final Settings<Function<EntryStack<?>, EntryRenderer<?>>> RENDERER = new Settings<>(DEFAULT_RENDERER); - @Deprecated - public static final Settings<BiFunction<EntryStack<?>, Tooltip, Tooltip>> TOOLTIP_PROCESSOR = new Settings<>(DEFAULT_TOOLTIP_PROCESSOR); - @Deprecated - public static final Settings<Function<EntryStack<?>, List<Component>>> TOOLTIP_APPEND_EXTRA = new Settings<>(stack -> Collections.emptyList()); + public static Settings<Function<EntryStack<?>, List<Component>>> TOOLTIP_APPEND_EXTRA; @Environment(EnvType.CLIENT) - public static final Float DEFAULT_RENDER_RATIO = 1.0F; - @Environment(EnvType.CLIENT) - public static final Settings<Float> FLUID_RENDER_RATIO = new Settings<>(DEFAULT_RENDER_RATIO); + public static Settings<Float> FLUID_RENDER_RATIO; + + static { + EnvExecutor.runInEnv(Env.CLIENT, () -> () -> { + RENDERER = new Settings<>(stack -> stack.getDefinition().getRenderer()); + TOOLTIP_PROCESSOR = new Settings<>((stack, tooltip) -> tooltip); + TOOLTIP_APPEND_EXTRA = new Settings<>(stack -> Collections.emptyList()); + FLUID_RENDER_RATIO = new Settings<>(1.0F); + }); + } private R defaultValue; private short id; |