diff options
30 files changed, 78 insertions, 90 deletions
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/drag/DraggableStackProvider.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/drag/DraggableStackProvider.java index 4663aa832..4a641fed6 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/gui/drag/DraggableStackProvider.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/drag/DraggableStackProvider.java @@ -43,7 +43,7 @@ public interface DraggableStackProvider<T extends Screen> extends Comparable<Dra } return false; } - + @Override @Nullable public DraggableStack getHoveredStack(DraggingContext<T> context, double mouseX, double mouseY) { diff --git a/api/src/main/java/me/shedaniel/rei/api/common/display/DisplaySerializerRegistry.java b/api/src/main/java/me/shedaniel/rei/api/common/display/DisplaySerializerRegistry.java index df0009462..d54323b7a 100644 --- a/api/src/main/java/me/shedaniel/rei/api/common/display/DisplaySerializerRegistry.java +++ b/api/src/main/java/me/shedaniel/rei/api/common/display/DisplaySerializerRegistry.java @@ -33,10 +33,10 @@ import net.minecraft.nbt.CompoundTag; /** * The registry for display serializers used for display serialization, useful for persistent displays across reloads, * and server-client communication. - * + * * <p>This is mostly a fallback system for {@link me.shedaniel.rei.api.common.transfer.info.MenuInfo#save(MenuSerializationContext, Display)}. - * - * @see REIPlugin#registerDisplaySerializer(DisplaySerializerRegistry) + * + * @see REIPlugin#registerDisplaySerializer(DisplaySerializerRegistry) */ public interface DisplaySerializerRegistry extends Reloadable<REIPlugin<?>> { static DisplaySerializerRegistry getInstance() { diff --git a/api/src/main/java/me/shedaniel/rei/api/common/entry/type/EntryTypeRegistry.java b/api/src/main/java/me/shedaniel/rei/api/common/entry/type/EntryTypeRegistry.java index c376a2b88..a5928679c 100644 --- a/api/src/main/java/me/shedaniel/rei/api/common/entry/type/EntryTypeRegistry.java +++ b/api/src/main/java/me/shedaniel/rei/api/common/entry/type/EntryTypeRegistry.java @@ -35,16 +35,16 @@ import java.util.Set; * Registry for registering alternative entry types. * * <p>{@link EntryType} must be declared statically, deferring to the actual - * definition by the identifier of the type. During reload, plugins should + * definition by the identifier of the type. During reload, plugins should * register {@link EntryDefinition} for their deferred {@link EntryType}, * these definitions are dynamic. - * + * * <p>{@link EntryTypeBridge} may be used to convert and compare between * different types - * + * * @see EntryDefinition - * @see #registerBridge(EntryType, EntryType, EntryTypeBridge) - * @see REIPlugin#registerEntryTypes(EntryTypeRegistry) + * @see #registerBridge(EntryType, EntryType, EntryTypeBridge) + * @see REIPlugin#registerEntryTypes(EntryTypeRegistry) */ public interface EntryTypeRegistry extends Reloadable<REIPlugin<?>> { static EntryTypeRegistry getInstance() { diff --git a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfo.java b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfo.java index bf7927c2e..e9f87d51f 100644 --- a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfo.java +++ b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfo.java @@ -121,7 +121,7 @@ public interface MenuInfo<T extends AbstractContainerMenu, D extends Display> ex default List<List<ItemStack>> getInputs(MenuInfoContext<T, ?, D> context) { if (context.getDisplay() == null) return Collections.emptyList(); return CollectionUtils.map(context.getDisplay().getInputEntries(), inputEntry -> - CollectionUtils.<EntryStack<?>, ItemStack>filterAndMap(inputEntry, + CollectionUtils.<EntryStack<?>, ItemStack>filterAndMap(inputEntry, stack -> stack.getType() == VanillaEntryTypes.ITEM, EntryStack::castValue)); } diff --git a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfoRegistry.java b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfoRegistry.java index 44ca628b6..bd1b14ff6 100644 --- a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfoRegistry.java +++ b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfoRegistry.java @@ -45,8 +45,7 @@ public interface MenuInfoRegistry extends Reloadable<REIServerPlugin> { <D extends Display> void registerGeneric(Predicate<CategoryIdentifier<?>> categoryPredicate, MenuInfoProvider<?, D> menuInfo); - @Nullable - <C extends AbstractContainerMenu, D extends Display> MenuInfo<C, D> get(CategoryIdentifier<D> category, Class<C> menuClass); + @Nullable <C extends AbstractContainerMenu, D extends Display> MenuInfo<C, D> get(CategoryIdentifier<D> category, Class<C> menuClass); int infoSize(); } diff --git a/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java b/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java index 8b421e151..827db488c 100644 --- a/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java +++ b/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java @@ -80,7 +80,7 @@ public final class EntryStacks { EntryType<A> leftType = left.getType(); EntryType<B> rightType = right.getType(); if (leftType == rightType) { - return left.getDefinition().equals(left.getValue(), right.<A>castValue(), context); + return left.getDefinition().equals(left.getValue(), right.castValue(), context); } for (EntryTypeBridge<A, B> bridge : EntryTypeRegistry.getInstance().getBridgesFor(leftType, rightType)) { CompoundEventResult<Stream<EntryStack<B>>> holder = bridge.bridge(left); diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/GameModeFavoriteEntry.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/GameModeFavoriteEntry.java index df07e00c4..1db8d9667 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/GameModeFavoriteEntry.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/GameModeFavoriteEntry.java @@ -80,14 +80,14 @@ public class GameModeFavoriteEntry extends FavoriteEntry { public Tooltip getTooltip(Point mouse) { return Tooltip.create(mouse, new TranslatableComponent("text.rei.gamemode_button.tooltip.dropdown")); } - + @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; return hashCode() == o.hashCode(); } - + @Override public int hashCode() { return Objects.hash(getClass(), showcase); @@ -187,7 +187,7 @@ public class GameModeFavoriteEntry extends FavoriteEntry { public enum Type implements FavoriteEntryType<GameModeFavoriteEntry> { INSTANCE; - + @Override public GameModeFavoriteEntry read(CompoundTag object) { String stringValue = object.getString(KEY); @@ -199,7 +199,7 @@ public class GameModeFavoriteEntry extends FavoriteEntry { public GameModeFavoriteEntry fromArgs(Object... args) { return new GameModeFavoriteEntry((GameType) args[0]); } - + @Override public CompoundTag save(GameModeFavoriteEntry entry, CompoundTag tag) { tag.putString(KEY, entry.gameMode == null ? "NOT_SET" : entry.gameMode.name()); @@ -262,7 +262,7 @@ public class GameModeFavoriteEntry extends FavoriteEntry { } String s = text; if (disabled) { - s = ChatFormatting.STRIKETHROUGH.toString() + s; + s = ChatFormatting.STRIKETHROUGH + s; } font.draw(matrices, s, x + 2, y + 2, selected && !disabled ? 16777215 : 8947848); } diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/DefaultCraftingDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/DefaultCraftingDisplay.java index 10516c2b5..18baa55ab 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/DefaultCraftingDisplay.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/DefaultCraftingDisplay.java @@ -70,6 +70,7 @@ public abstract class DefaultCraftingDisplay<C extends Recipe<?>> extends BasicD list.add(Collections.emptyList()); } for (int i = 0; i < getInputEntries().size(); i++) { + @SuppressWarnings("RedundantTypeArguments") List<ItemStack> stacks = CollectionUtils.<EntryStack<?>, ItemStack>filterAndMap(getInputEntries().get(i), stack -> stack.getType() == VanillaEntryTypes.ITEM, EntryStack::castValue); list.set(getSlotWithSize(this, i, menuInfo.getCraftingWidth(container)), stacks); diff --git a/fabric/src/main/java/me/shedaniel/rei/fabric/PluginDetectorImpl.java b/fabric/src/main/java/me/shedaniel/rei/fabric/PluginDetectorImpl.java index 85e1c37e7..d5e2d2ddd 100644 --- a/fabric/src/main/java/me/shedaniel/rei/fabric/PluginDetectorImpl.java +++ b/fabric/src/main/java/me/shedaniel/rei/fabric/PluginDetectorImpl.java @@ -51,12 +51,12 @@ public class PluginDetectorImpl { public Collection<P> provide() { return plugin.provide(); } - + @Override public Class<P> getPluginProviderClass() { return plugin.getPluginProviderClass(); } - + @Override public String getPluginProviderName() { return plugin.getPluginProviderName() + " [" + container.getProvider().getMetadata().getId() + "]"; diff --git a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java index a81f177e5..58c77e7b9 100644 --- a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java +++ b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java @@ -217,7 +217,7 @@ public class RoughlyEnoughItemsCore { public EntryDefinition<Renderer> getDefinition() { return RenderingEntryDefinition.RENDERING; } - + @Override public int hashCode() { return hashCode; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java index 16525f545..25687723f 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java @@ -38,7 +38,6 @@ import me.shedaniel.rei.api.client.gui.config.DisplayScreenType; import me.shedaniel.rei.api.client.gui.screen.DisplayScreen; import me.shedaniel.rei.api.client.registry.display.DisplayCategory; import me.shedaniel.rei.api.client.view.ViewSearchBuilder; -import me.shedaniel.rei.api.client.view.Views; import me.shedaniel.rei.api.common.category.CategoryIdentifier; import me.shedaniel.rei.api.common.display.Display; import me.shedaniel.rei.api.common.entry.EntryStack; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringAddRuleScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringAddRuleScreen.java index 0d09a298a..ebac36923 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringAddRuleScreen.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringAddRuleScreen.java @@ -192,7 +192,7 @@ public class FilteringAddRuleScreen extends Screen { public List<? extends GuiEventListener> children() { return Collections.singletonList(addButton); } - + @Override public List<? extends NarratableEntry> narratables() { return Collections.singletonList(addButton); diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringRuleOptionsScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringRuleOptionsScreen.java index de973d768..69620a828 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringRuleOptionsScreen.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringRuleOptionsScreen.java @@ -148,7 +148,7 @@ public abstract class FilteringRuleOptionsScreen<T extends FilteringRule<?>> ext public List<? extends GuiEventListener> children() { return Collections.emptyList(); } - + @Override public List<? extends NarratableEntry> narratables() { return Collections.emptyList(); @@ -176,7 +176,7 @@ public abstract class FilteringRuleOptionsScreen<T extends FilteringRule<?>> ext public List<? extends GuiEventListener> children() { return Collections.emptyList(); } - + @Override public List<? extends NarratableEntry> narratables() { return Collections.emptyList(); @@ -212,7 +212,7 @@ public abstract class FilteringRuleOptionsScreen<T extends FilteringRule<?>> ext public List<? extends GuiEventListener> children() { return Collections.singletonList(widget); } - + @Override public List<? extends NarratableEntry> narratables() { return Collections.singletonList(widget); @@ -252,7 +252,7 @@ public abstract class FilteringRuleOptionsScreen<T extends FilteringRule<?>> ext public List<? extends GuiEventListener> children() { return Collections.singletonList(widget); } - + @Override public List<? extends NarratableEntry> narratables() { return Collections.singletonList(widget); diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringRulesScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringRulesScreen.java index ac81c87af..20ee0c7e2 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringRulesScreen.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringRulesScreen.java @@ -30,11 +30,8 @@ import me.shedaniel.rei.impl.client.entry.filtering.FilteringRule; import me.shedaniel.rei.impl.client.entry.filtering.rules.ManualFilteringRule; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.Button; -import net.minecraft.client.gui.components.ContainerObjectSelectionList; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.narration.NarratableEntry; -import net.minecraft.client.gui.narration.NarratedElementType; -import net.minecraft.client.gui.narration.NarrationElementOutput; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.resources.sounds.SimpleSoundInstance; import net.minecraft.locale.Language; @@ -248,7 +245,7 @@ public class FilteringRulesScreen extends Screen { public List<? extends GuiEventListener> children() { return Arrays.asList(configureButton, deleteButton); } - + @Override public List<? extends NarratableEntry> narratables() { return Arrays.asList(configureButton, deleteButton); diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/RecipeScreenTypeEntry.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/RecipeScreenTypeEntry.java index 7950a6f23..39b218bb1 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/RecipeScreenTypeEntry.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/RecipeScreenTypeEntry.java @@ -31,7 +31,6 @@ import me.shedaniel.rei.api.client.gui.config.DisplayScreenType; import me.shedaniel.rei.impl.client.gui.screen.UncertainDisplayViewingScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.chat.NarratorChatListener; -import net.minecraft.client.gui.components.AbstractButton; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.events.GuiEventListener; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/ReloadPluginsEntry.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/ReloadPluginsEntry.java index 9766b436c..273d115ae 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/ReloadPluginsEntry.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/ReloadPluginsEntry.java @@ -32,7 +32,6 @@ import me.shedaniel.rei.api.common.plugins.PluginManager; import me.shedaniel.rei.impl.client.gui.screen.ConfigReloadingScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.chat.NarratorChatListener; -import net.minecraft.client.gui.components.AbstractButton; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.events.GuiEventListener; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/SearchFilterSyntaxHighlightingEntry.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/SearchFilterSyntaxHighlightingEntry.java index ce853a3aa..bd4e96072 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/SearchFilterSyntaxHighlightingEntry.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/SearchFilterSyntaxHighlightingEntry.java @@ -30,7 +30,6 @@ import me.shedaniel.clothconfig2.gui.entries.TooltipListEntry; import me.shedaniel.rei.api.client.gui.config.SyntaxHighlightingMode; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.chat.NarratorChatListener; -import net.minecraft.client.gui.components.AbstractButton; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.events.GuiEventListener; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java index 3b35b4fed..c36abe3c5 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java @@ -33,8 +33,6 @@ import me.shedaniel.math.Rectangle; import me.shedaniel.math.impl.PointHelper; import me.shedaniel.rei.api.client.ClientHelper; import me.shedaniel.rei.api.client.REIRuntime; -import me.shedaniel.rei.api.client.overlay.OverlayListWidget; -import me.shedaniel.rei.api.client.overlay.ScreenOverlay; import me.shedaniel.rei.api.client.config.ConfigManager; import me.shedaniel.rei.api.client.config.ConfigObject; import me.shedaniel.rei.api.client.favorites.FavoriteEntry; @@ -46,6 +44,8 @@ import me.shedaniel.rei.api.client.gui.widgets.Button; import me.shedaniel.rei.api.client.gui.widgets.Tooltip; import me.shedaniel.rei.api.client.gui.widgets.Widget; import me.shedaniel.rei.api.client.gui.widgets.Widgets; +import me.shedaniel.rei.api.client.overlay.OverlayListWidget; +import me.shedaniel.rei.api.client.overlay.ScreenOverlay; import me.shedaniel.rei.api.client.registry.category.CategoryRegistry; import me.shedaniel.rei.api.client.registry.screen.ClickArea; import me.shedaniel.rei.api.client.registry.screen.OverlayDecider; diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/DefaultDisplayViewingScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/DefaultDisplayViewingScreen.java index add93ec0c..7239762ec 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/DefaultDisplayViewingScreen.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/DefaultDisplayViewingScreen.java @@ -281,7 +281,7 @@ public class DefaultDisplayViewingScreen extends AbstractDisplayViewingScreen { } } } - + _children().addAll(tabs); _children().addAll(widgets); _children().addAll(preWidgets); diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/WarningAndErrorScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/WarningAndErrorScreen.java index 69d1bd69f..c6d93b994 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/WarningAndErrorScreen.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/WarningAndErrorScreen.java @@ -38,7 +38,6 @@ import net.minecraft.client.gui.narration.NarratableEntry; import net.minecraft.client.gui.narration.NarratedElementType; import net.minecraft.client.gui.narration.NarrationElementOutput; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.gui.screens.controls.ControlList; import net.minecraft.client.resources.sounds.SimpleSoundInstance; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TextComponent; @@ -213,7 +212,7 @@ public class WarningAndErrorScreen extends Screen { public int getWidth() { return 0; } - + @Override public List<? extends NarratableEntry> narratables() { return Collections.emptyList(); @@ -246,14 +245,14 @@ public class WarningAndErrorScreen extends Screen { public int getWidth() { return Minecraft.getInstance().font.width(text) + 10; } - + @Override public List<? extends NarratableEntry> narratables() { return ImmutableList.of(new NarratableEntry() { public NarrationPriority narrationPriority() { return NarrationPriority.HOVERED; } - + public void updateNarration(NarrationElementOutput narrationElementOutput) { StringBuilder builder = new StringBuilder(); text.accept((i, style, j) -> { @@ -317,14 +316,14 @@ public class WarningAndErrorScreen extends Screen { } return false; } - + @Override public List<? extends NarratableEntry> narratables() { return ImmutableList.of(new NarratableEntry() { public NarrationPriority narrationPriority() { return NarrationPriority.HOVERED; } - + public void updateNarration(NarrationElementOutput narrationElementOutput) { StringBuilder builder = new StringBuilder(); text.accept((i, style, j) -> { diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/BatchedEntryRendererManager.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/BatchedEntryRendererManager.java index b023840f9..29bfeef7b 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/BatchedEntryRendererManager.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/BatchedEntryRendererManager.java @@ -71,7 +71,7 @@ public class BatchedEntryRendererManager { EntryStack<Object> cast = currentEntry.cast(); if (batchedRenderer.isBatched(cast)) { int hash = batchedRenderer.getBatchIdentifier(cast, widget.getBounds(), batchedRenderer.getExtraData(cast)) - ^ widget.getCurrentEntry().getType().hashCode(); + ^ widget.getCurrentEntry().getType().hashCode(); List<EntryWidget> entries = grouping.get(hash); if (entries == null) { grouping.put(hash, entries = new ArrayList<>()); diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/DynamicErrorFreeEntryListWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/DynamicErrorFreeEntryListWidget.java index f0b812687..7e2a9c184 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/DynamicErrorFreeEntryListWidget.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/DynamicErrorFreeEntryListWidget.java @@ -32,7 +32,6 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiComponent; -import net.minecraft.client.gui.components.AbstractSelectionList; import net.minecraft.client.gui.components.Widget; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.narration.NarratableEntry; @@ -572,9 +571,9 @@ public abstract class DynamicErrorFreeEntryListWidget<E extends DynamicErrorFree public int getMorePossibleHeight() { return -1; } - + |