diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-03-27 01:12:02 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-03-27 01:12:02 +0800 |
| commit | b11c3866aada638f0ad758ced4068c71e620ce23 (patch) | |
| tree | 332f3ddab9be3da68b06d84823683608028d5b4c /runtime/src/main/java/me/shedaniel/rei/impl/client | |
| parent | 659027baa60c56b5aeab38d4f7c676c37857ec68 (diff) | |
| download | RoughlyEnoughItems-b11c3866aada638f0ad758ced4068c71e620ce23.tar.gz RoughlyEnoughItems-b11c3866aada638f0ad758ced4068c71e620ce23.tar.bz2 RoughlyEnoughItems-b11c3866aada638f0ad758ced4068c71e620ce23.zip | |
Make Recipe Transfer work
Signed-off-by: shedaniel <daniel@shedaniel.me>
Diffstat (limited to 'runtime/src/main/java/me/shedaniel/rei/impl/client')
4 files changed, 10 insertions, 10 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/InternalWidgets.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/InternalWidgets.java index d3fc3b757..8db620c00 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/InternalWidgets.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/InternalWidgets.java @@ -101,11 +101,12 @@ public final class InternalWidgets { visible[0] = false; IntList redSlots = null; TransferHandler.Context context = TransferHandler.Context.create(false, containerScreen, displaySupplier.get()); - for (TransferHandler autoTransferHandler : TransferHandlerRegistry.getInstance()) { + for (TransferHandler transferHandler : TransferHandlerRegistry.getInstance()) { try { - TransferHandler.Result result = autoTransferHandler.handle(context); - if (result.isApplicable()) + TransferHandler.Result result = transferHandler.handle(context); + if (result.isApplicable()) { visible[0] = true; + } if (result.isSuccessful()) { button.setEnabled(true); error = null; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java index 2635039fc..1fa56fe0b 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java @@ -51,6 +51,10 @@ public class DisplayRegistryImpl extends RecipeManagerContextImpl<REIClientPlugi private final List<DisplayFiller<?, ?>> fillers = new ArrayList<>(); private final MutableInt displayCount = new MutableInt(0); + public DisplayRegistryImpl() { + super(RecipeManagerContextImpl.supplier()); + } + @Override public void acceptPlugin(REIClientPlugin plugin) { plugin.registerDisplays(this); diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/Argument.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/Argument.java index f654ce076..67520b666 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/Argument.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/Argument.java @@ -51,7 +51,7 @@ import java.util.regex.Pattern; @Environment(EnvType.CLIENT) public class Argument<T, R> { public static final String SPACE = " ", EMPTY = ""; - static final Argument<Unit, Unit> ALWAYS = new Argument<>(AlwaysMatchingArgumentType.INSTANCE, EMPTY, true, -1, -1); + static final Argument<Unit, Unit> ALWAYS = new Argument<>(AlwaysMatchingArgumentType.INSTANCE, EMPTY, true, -1, -1, true); private ArgumentType<T, R> argumentType; private String text; private T filterData; @@ -60,10 +60,6 @@ public class Argument<T, R> { private final int end; private static final Pattern SPLIT_PATTERN = Pattern.compile("(?:\"([^\"]*)\")|([^\\s]+)"); - public Argument(ArgumentType<T, R> argumentType, String text, boolean regular, int start, int end) { - this(argumentType, text, regular, start, end, true); - } - public Argument(ArgumentType<T, R> argumentType, String text, boolean regular, int start, int end, boolean lowercase) { this.argumentType = argumentType; this.text = lowercase ? text.toLowerCase(Locale.ROOT) : text; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/TagArgumentType.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/TagArgumentType.java index a46e07317..a6495fc41 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/TagArgumentType.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/TagArgumentType.java @@ -26,7 +26,6 @@ package me.shedaniel.rei.impl.client.search.argument.type; import me.shedaniel.rei.api.client.config.ConfigObject; import me.shedaniel.rei.api.client.gui.config.SearchMode; import me.shedaniel.rei.api.common.entry.EntryStack; -import me.shedaniel.rei.api.common.entry.type.EntryDefinition; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.network.chat.Style; @@ -70,7 +69,7 @@ public final class TagArgumentType extends ArgumentType<Unit, String[]> { @Override public boolean matches(Mutable<String[]> data, EntryStack<?> stack, String searchText, Unit filterData) { if (data.getValue() == null) { - Collection<ResourceLocation> tags = ((EntryDefinition<Object>) stack.getDefinition()).getTagsFor((EntryStack<Object>) stack, stack.getValue()); + Collection<ResourceLocation> tags = stack.getTagsFor(); if (tags.isEmpty()) { data.setValue(EMPTY_ARRAY); } else { |
