From 6d7690b3410e6aa837089987c08598cb9ecbe45a Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sat, 10 Apr 2021 14:30:41 +0800 Subject: Change how EntryStack.Settings is exposed Signed-off-by: shedaniel --- .../rei/api/client/util/ClientEntryStacks.java | 28 ++++++++++++++++++ .../shedaniel/rei/api/common/entry/EntryStack.java | 34 +++++++++++++--------- 2 files changed, 48 insertions(+), 14 deletions(-) (limited to 'api/src/main/java') 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 EntryStack setNotRenderer(EntryStack stack) { + return setRenderer(stack, EntryRenderer.empty()); + } + + public static EntryStack setRenderer(EntryStack stack, EntryRenderer renderer) { + return stack.setting(EntryStack.Settings.RENDERER, s -> renderer); + } + + @SuppressWarnings("rawtypes") + public static EntryStack setRenderer(EntryStack stack, Function, EntryRenderer> rendererProvider) { + return stack.setting(EntryStack.Settings.RENDERER, (Function) rendererProvider); + } + + @SuppressWarnings("rawtypes") + public static EntryStack setTooltipProcessor(EntryStack stack, BiFunction, Tooltip, Tooltip> processor) { + return stack.setting(EntryStack.Settings.TOOLTIP_PROCESSOR, (BiFunction) processor); + } + + public static EntryStack setFluidRenderRatio(EntryStack 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 660605f32..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; @@ -103,7 +105,7 @@ public interface EntryStack extends TextRepresentable, Renderer { @Environment(EnvType.CLIENT) default EntryRenderer getRenderer() { - EntryRenderer renderer = get(Settings.RENDER).apply(this); + EntryRenderer renderer = get(Settings.RENDERER).apply(this); return renderer == null ? EntryRenderer.empty() : renderer.cast(); } @@ -138,39 +140,43 @@ public interface EntryStack extends TextRepresentable, Renderer { R get(Settings settings); + @Environment(EnvType.CLIENT) default EntryStack tooltip(Component... tooltips) { return tooltip(Arrays.asList(tooltips)); } + @Environment(EnvType.CLIENT) default EntryStack tooltip(List tooltips) { return tooltip(stack -> tooltips); } + @Environment(EnvType.CLIENT) default EntryStack tooltip(Function, List> tooltipProvider) { return setting(Settings.TOOLTIP_APPEND_EXTRA, tooltipProvider); } + @Deprecated class Settings { @ApiStatus.Internal private static final List> SETTINGS = new ArrayList<>(); - public static final Supplier TRUE = () -> true; - public static final Supplier FALSE = () -> false; @Environment(EnvType.CLIENT) - public static final Function, EntryRenderer> DEFAULT_RENDERER = stack -> stack.getDefinition().getRenderer(); + public static Settings, EntryRenderer>> RENDERER; @Environment(EnvType.CLIENT) - public static final Function, EntryRenderer> EMPTY_RENDERER = stack -> EntryRenderer.empty(); - public static final BiFunction, Tooltip, Tooltip> DEFAULT_TOOLTIP_PROCESSOR = (stack, tooltip) -> tooltip; + public static Settings, Tooltip, Tooltip>> TOOLTIP_PROCESSOR; @Environment(EnvType.CLIENT) - public static final Settings, EntryRenderer>> RENDER = new Settings<>(DEFAULT_RENDERER); - @Deprecated - public static final Settings, Tooltip, Tooltip>> TOOLTIP_PROCESSOR = new Settings<>(DEFAULT_TOOLTIP_PROCESSOR); - @Deprecated - public static final Settings, List>> TOOLTIP_APPEND_EXTRA = new Settings<>(stack -> Collections.emptyList()); + public static Settings, List>> TOOLTIP_APPEND_EXTRA; @Environment(EnvType.CLIENT) - public static final Float DEFAULT_RENDER_RATIO = 1.0F; - @Environment(EnvType.CLIENT) - public static final Settings FLUID_RENDER_RATIO = new Settings<>(DEFAULT_RENDER_RATIO); + public static Settings 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; -- cgit