diff options
Diffstat (limited to 'api/src')
6 files changed, 132 insertions, 6 deletions
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java b/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java index 791d2cd39..20165ffc1 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java @@ -111,6 +111,8 @@ public interface ConfigObject { boolean doDebugRenderTimeRequired(); + boolean doMergeDisplayUnderOne(); + ModifierKeyCode getFavoriteKeyCode(); ModifierKeyCode getRecipeKeybind(); diff --git a/api/src/main/java/me/shedaniel/rei/api/client/registry/display/DisplayCategory.java b/api/src/main/java/me/shedaniel/rei/api/client/registry/display/DisplayCategory.java index 5be94aa76..9202a18ca 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/registry/display/DisplayCategory.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/registry/display/DisplayCategory.java @@ -31,12 +31,14 @@ import me.shedaniel.rei.api.client.gui.widgets.Widget; import me.shedaniel.rei.api.client.gui.widgets.Widgets; import me.shedaniel.rei.api.common.category.CategoryIdentifier; import me.shedaniel.rei.api.common.display.Display; +import me.shedaniel.rei.api.common.display.DisplayMerger; import me.shedaniel.rei.api.common.util.Identifiable; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.Nullable; import java.util.Collections; import java.util.List; @@ -119,6 +121,28 @@ public interface DisplayCategory<T extends Display> extends Identifiable { CategoryIdentifier<? extends T> getCategoryIdentifier(); + @Nullable + default DisplayMerger<T> getDisplayMerger() { + return null; + } + + static <T extends Display> DisplayMerger<T> getContentMerger() { + return new DisplayMerger<T>() { + @Override + public boolean canMerge(T first, T second) { + if (!first.getCategoryIdentifier().equals(second.getCategoryIdentifier())) return false; + if (!first.getInputEntries().equals(second.getInputEntries())) return false; + if (!first.getOutputEntries().equals(second.getOutputEntries())) return false; + return true; + } + + @Override + public int hashOf(T display) { + return display.getCategoryIdentifier().hashCode() * 31 * 31 * 31 + display.getInputEntries().hashCode() * 31 * 31 + display.getOutputEntries().hashCode(); + } + }; + } + @Override default ResourceLocation getIdentifier() { return getCategoryIdentifier().getIdentifier(); diff --git a/api/src/main/java/me/shedaniel/rei/api/client/view/ViewSearchBuilder.java b/api/src/main/java/me/shedaniel/rei/api/client/view/ViewSearchBuilder.java index 589970db9..9b8a7582c 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/view/ViewSearchBuilder.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/view/ViewSearchBuilder.java @@ -31,12 +31,11 @@ import me.shedaniel.rei.api.common.display.Display; import me.shedaniel.rei.api.common.entry.EntryStack; import me.shedaniel.rei.api.common.util.CollectionUtils; import me.shedaniel.rei.impl.ClientInternals; +import me.shedaniel.rei.impl.display.DisplaySpec; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; public interface ViewSearchBuilder { static ViewSearchBuilder builder() { @@ -66,7 +65,18 @@ public interface ViewSearchBuilder { @Nullable CategoryIdentifier<?> getPreferredOpenedCategory(); - Map<DisplayCategory<?>, List<Display>> buildMap(); + @Deprecated + @ApiStatus.ScheduledForRemoval + default Map<DisplayCategory<?>, List<Display>> buildMap() { + Map<DisplayCategory<?>, List<Display>> map = new HashMap<>(); + for (Map.Entry<DisplayCategory<?>, List<DisplaySpec>> entry : buildMapInternal().entrySet()) { + map.put(entry.getKey(), CollectionUtils.map(entry.getValue(), DisplaySpec::provideInternalDisplay)); + } + return map; + } + + @ApiStatus.Internal + Map<DisplayCategory<?>, List<DisplaySpec>> buildMapInternal(); default boolean open() { return ClientHelper.getInstance().openView(this); diff --git a/api/src/main/java/me/shedaniel/rei/api/common/display/Display.java b/api/src/main/java/me/shedaniel/rei/api/common/display/Display.java index 14db33133..1ee2515e3 100644 --- a/api/src/main/java/me/shedaniel/rei/api/common/display/Display.java +++ b/api/src/main/java/me/shedaniel/rei/api/common/display/Display.java @@ -25,8 +25,12 @@ package me.shedaniel.rei.api.common.display; import me.shedaniel.rei.api.common.category.CategoryIdentifier; import me.shedaniel.rei.api.common.entry.EntryIngredient; +import me.shedaniel.rei.impl.display.DisplaySpec; import net.minecraft.resources.ResourceLocation; +import org.jetbrains.annotations.ApiStatus; +import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.Optional; @@ -37,7 +41,7 @@ import java.util.Optional; * @see me.shedaniel.rei.api.common.display.basic.BasicDisplay * @see me.shedaniel.rei.api.client.registry.display.DisplayRegistry */ -public interface Display { +public interface Display extends DisplaySpec { /** * @return a list of inputs */ @@ -72,4 +76,21 @@ public interface Display { default Optional<ResourceLocation> getDisplayLocation() { return Optional.empty(); } + + @Override + @ApiStatus.NonExtendable + default Display provideInternalDisplay() { + return this; + } + + @Override + @ApiStatus.NonExtendable + default Collection<ResourceLocation> provideInternalDisplayIds() { + Optional<ResourceLocation> location = getDisplayLocation(); + if (location.isPresent()) { + return Collections.singletonList(location.get()); + } else { + return Collections.emptyList(); + } + } } diff --git a/api/src/main/java/me/shedaniel/rei/api/common/display/DisplayMerger.java b/api/src/main/java/me/shedaniel/rei/api/common/display/DisplayMerger.java new file mode 100644 index 000000000..e13e24cc1 --- /dev/null +++ b/api/src/main/java/me/shedaniel/rei/api/common/display/DisplayMerger.java @@ -0,0 +1,30 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020, 2021 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.common.display; + +public interface DisplayMerger<T extends Display> { + boolean canMerge(T first, T second); + + int hashOf(T display); +} diff --git a/api/src/main/java/me/shedaniel/rei/impl/display/DisplaySpec.java b/api/src/main/java/me/shedaniel/rei/impl/display/DisplaySpec.java new file mode 100644 index 000000000..399386a32 --- /dev/null +++ b/api/src/main/java/me/shedaniel/rei/impl/display/DisplaySpec.java @@ -0,0 +1,39 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020, 2021 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.display; + +import me.shedaniel.rei.api.common.display.Display; +import net.minecraft.resources.ResourceLocation; +import org.jetbrains.annotations.ApiStatus; + +import java.util.Collection; + +@ApiStatus.Internal +public interface DisplaySpec { + @ApiStatus.Internal + Display provideInternalDisplay(); + + @ApiStatus.Internal + Collection<ResourceLocation> provideInternalDisplayIds(); +} |