-
-
Notifications
You must be signed in to change notification settings - Fork 65
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/11.x-1.19.4' into 12.x-1.20
# Conflicts: # api/src/main/java/me/shedaniel/rei/api/client/registry/transfer/simple/SimpleTransferHandler.java
- Loading branch information
Showing
8 changed files
with
261 additions
and
146 deletions.
There are no files selected for viewing
48 changes: 48 additions & 0 deletions
48
api/src/main/java/me/shedaniel/rei/api/client/registry/transfer/TransferHandlerMeta.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * This file is licensed under the MIT License, part of Roughly Enough Items. | ||
| * Copyright (c) 2018, 2019, 2020, 2021, 2022, 2023 shedaniel | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
|
|
||
| package me.shedaniel.rei.api.client.registry.transfer; | ||
|
|
||
| import net.minecraft.world.item.ItemStack; | ||
| import org.jetbrains.annotations.ApiStatus; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| /** | ||
| * A meta interface for {@link TransferHandler}. | ||
| */ | ||
| @ApiStatus.Experimental | ||
| public interface TransferHandlerMeta { | ||
| /** | ||
| * Returns the available ingredients for the transfer handler. | ||
| * This is used in the craftable filter, and the quick transfer tooltip to quickly determine if the handler can handle the recipe. | ||
| * <p> | ||
| * If this interface is not implemented, REI will assume stacks only from the player's inventory are available. | ||
| * | ||
| * @param context the context | ||
| * @return the available ingredients | ||
| */ | ||
| default Iterable<ItemStack> getAvailableIngredients(TransferHandler.Context context) { | ||
| return List.of(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
175 changes: 175 additions & 0 deletions
175
...e/src/main/java/me/shedaniel/rei/impl/client/gui/craftable/CraftableFilterCalculator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,175 @@ | ||
| /* | ||
| * This file is licensed under the MIT License, part of Roughly Enough Items. | ||
| * Copyright (c) 2018, 2019, 2020, 2021, 2022, 2023 shedaniel | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
|
|
||
| package me.shedaniel.rei.impl.client.gui.craftable; | ||
|
|
||
| import com.google.common.base.Suppliers; | ||
| import it.unimi.dsi.fastutil.longs.*; | ||
| import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet; | ||
| import me.shedaniel.rei.api.client.REIRuntime; | ||
| import me.shedaniel.rei.api.client.registry.display.DisplayRegistry; | ||
| import me.shedaniel.rei.api.client.registry.transfer.TransferHandler; | ||
| import me.shedaniel.rei.api.client.registry.transfer.TransferHandlerMeta; | ||
| import me.shedaniel.rei.api.client.registry.transfer.TransferHandlerRegistry; | ||
| import me.shedaniel.rei.api.common.display.Display; | ||
| import me.shedaniel.rei.api.common.entry.EntryIngredient; | ||
| import me.shedaniel.rei.api.common.entry.EntryStack; | ||
| import me.shedaniel.rei.api.common.entry.comparison.ComparisonContext; | ||
| import me.shedaniel.rei.api.common.entry.type.EntryDefinition; | ||
| import me.shedaniel.rei.api.common.entry.type.VanillaEntryTypes; | ||
| import me.shedaniel.rei.api.common.util.EntryStacks; | ||
| import me.shedaniel.rei.impl.client.registry.display.DisplayCache; | ||
| import me.shedaniel.rei.impl.client.registry.display.DisplayRegistryImpl; | ||
| import me.shedaniel.rei.impl.common.util.HashedEntryStackWrapper; | ||
| import me.shedaniel.rei.plugin.autocrafting.DefaultCategoryHandler; | ||
| import net.minecraft.world.item.ItemStack; | ||
| import org.jetbrains.annotations.Nullable; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.Set; | ||
| import java.util.function.Predicate; | ||
| import java.util.function.Supplier; | ||
|
|
||
| public class CraftableFilterCalculator implements Predicate<HashedEntryStackWrapper> { | ||
| private final Supplier<DisplayCache> displayCache = Suppliers.memoize(() -> ((DisplayRegistryImpl) DisplayRegistry.getInstance()).displaysHolder().cache()); | ||
| private Set<Display> checkedCraftableDisplays = Collections.synchronizedSet(new ReferenceOpenHashSet<>()); | ||
| private Set<Display> checkedUncraftableDisplays = Collections.synchronizedSet(new ReferenceOpenHashSet<>()); | ||
| private LongSet checkedCraftableEntries = LongSets.synchronize(new LongOpenHashSet()); | ||
|
|
||
| @Override | ||
| public boolean test(HashedEntryStackWrapper wrapper) { | ||
| EntryStack<?> stack = wrapper.unwrap(); | ||
| if (stack.getType() != VanillaEntryTypes.ITEM || stack.isEmpty()) return false; | ||
| if (checkedCraftableEntries.contains(wrapper.hashExact())) return true; | ||
| DisplayCache cache = this.displayCache.get(); | ||
| for (Display display : cache.getAllDisplaysByOutputs(List.of(stack))) { | ||
| if (checkCraftableCachedByResult(display)) return true; | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| private boolean checkCraftableCachedByDisplay(Display display) { | ||
| if (checkedCraftableDisplays.contains(display)) return true; | ||
| if (checkedUncraftableDisplays.contains(display)) return false; | ||
| boolean checkCraftable = checkCraftable(display); | ||
| if (checkCraftable) { | ||
| checkedCraftableDisplays.add(display); | ||
| } else { | ||
| checkedUncraftableDisplays.add(display); | ||
| } | ||
| return checkCraftable; | ||
| } | ||
|
|
||
| private boolean checkCraftableCachedByResult(Display display) { | ||
| boolean checkCraftable = checkCraftableCachedByDisplay(display); | ||
| if (checkCraftable) { | ||
| for (EntryIngredient ingredient : display.getOutputEntries()) { | ||
| for (EntryStack<?> stack : ingredient) { | ||
| if (stack.getType() != VanillaEntryTypes.ITEM || stack.isEmpty()) continue; | ||
| checkedCraftableEntries.add(EntryStacks.hashExact(stack)); | ||
| } | ||
| } | ||
| } | ||
| return checkCraftable; | ||
| } | ||
|
|
||
| private boolean checkCraftable(Display display) { | ||
| @Nullable Long2LongMap ingredients = chooseHandler(display); | ||
| if (ingredients == null) { | ||
| return false; | ||
| } | ||
|
|
||
| List<EntryIngredient> requiredEntries = display.getRequiredEntries(); | ||
| if (requiredEntries.isEmpty()) { | ||
| return false; | ||
| } | ||
|
|
||
| int slotsCraftable = 0; | ||
| boolean containsNonEmpty = false; | ||
|
|
||
| for (EntryIngredient slot : requiredEntries) { | ||
| if (slot.isEmpty()) { | ||
| slotsCraftable++; | ||
| continue; | ||
| } | ||
| for (EntryStack<?> slotPossible : slot) { | ||
| if (slotPossible.getType() != VanillaEntryTypes.ITEM) continue; | ||
| ItemStack stack = slotPossible.castValue(); | ||
| long hashFuzzy = EntryStacks.hashFuzzy(slotPossible); | ||
| long availableAmount = ingredients.get(hashFuzzy); | ||
| if (availableAmount >= stack.getCount()) { | ||
| ingredients.put(hashFuzzy, availableAmount - stack.getCount()); | ||
| containsNonEmpty = true; | ||
| slotsCraftable++; | ||
| break; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return slotsCraftable == requiredEntries.size() && containsNonEmpty; | ||
| } | ||
|
|
||
| @Nullable | ||
| public Long2LongMap chooseHandler(Display display) { | ||
| TransferHandler.Context transferContext = TransferHandler.Context.create(false, false, REIRuntime.getInstance().getPreviousContainerScreen(), display); | ||
| DefaultCategoryHandler legacyHandler = null; | ||
| for (TransferHandler handler : TransferHandlerRegistry.getInstance()) { | ||
| if (handler instanceof DefaultCategoryHandler) { | ||
| legacyHandler = (DefaultCategoryHandler) handler; | ||
| } else { | ||
| TransferHandler.ApplicabilityResult result = handler.checkApplicable(transferContext); | ||
| if (result.isSuccessful()) { | ||
| if (handler instanceof TransferHandlerMeta) { | ||
| return extractIngredients(((TransferHandlerMeta) handler).getAvailableIngredients(transferContext)); | ||
| } else { | ||
| return CraftableFilter.INSTANCE.getInvStacks(); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (legacyHandler != null) { | ||
| TransferHandler.ApplicabilityResult result = legacyHandler.checkApplicable(transferContext); | ||
| if (result.isSuccessful()) { | ||
| return CraftableFilter.INSTANCE.getInvStacks(); | ||
| } | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
|
|
||
| private static Long2LongMap extractIngredients(Iterable<ItemStack> ingredients) { | ||
| EntryDefinition<ItemStack> definition = VanillaEntryTypes.ITEM.getDefinition(); | ||
|
|
||
| Long2LongMap map = new Long2LongOpenHashMap(); | ||
| for (ItemStack stack : ingredients) { | ||
| if (!stack.isEmpty()) { | ||
| long hash = definition.hash(null, stack, ComparisonContext.FUZZY); | ||
| long newCount = map.getOrDefault(hash, 0) + Math.max(0, stack.getCount()); | ||
| map.put(hash, newCount); | ||
| } | ||
| } | ||
| return map; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.