aboutsummaryrefslogtreecommitdiff
path: root/runtime/src/main/java/me
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2021-06-02 18:46:40 +0800
committershedaniel <daniel@shedaniel.me>2021-06-02 18:46:40 +0800
commit572ebd36c32c0248f2c826cc518eeedbc0701287 (patch)
treee50b4c1fbc502bdca3494fe58f77c31adb3dd67c /runtime/src/main/java/me
parentfd4026dd30a2f8ba4c261f344a16b3adee9823a4 (diff)
downloadRoughlyEnoughItems-572ebd36c32c0248f2c826cc518eeedbc0701287.tar.gz
RoughlyEnoughItems-572ebd36c32c0248f2c826cc518eeedbc0701287.tar.bz2
RoughlyEnoughItems-572ebd36c32c0248f2c826cc518eeedbc0701287.zip
Reformat code
Diffstat (limited to 'runtime/src/main/java/me')
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java2
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/ClientHelperImpl.java1
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringAddRuleScreen.java2
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringRuleOptionsScreen.java8
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringRulesScreen.java5
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/RecipeScreenTypeEntry.java1
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/ReloadPluginsEntry.java1
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/SearchFilterSyntaxHighlightingEntry.java1
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java4
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/DefaultDisplayViewingScreen.java2
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/WarningAndErrorScreen.java11
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/BatchedEntryRendererManager.java2
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/DynamicErrorFreeEntryListWidget.java13
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/InternalWidgets.java20
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/basewidgets/TexturedDrawableConsumer.java1
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/search/SearchProviderImpl.java4
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/ArgumentType.java3
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/common/entry/EntryIngredientImpl.java37
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/common/entry/comparison/EntryComparatorRegistryImpl.java4
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/common/entry/comparison/NbtHasherProviderImpl.java2
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/plugin/client/entry/FluidEntryDefinition.java4
21 files changed, 58 insertions, 70 deletions
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;
}
-
+
public abstract List<? extends NarratableEntry> narratables();
-
+
void updateNarration(NarrationElementOutput narrationElementOutput) {
List<? extends NarratableEntry> list = this.narratables();
Screen.NarratableSearchResult narratableSearchResult = Screen.findNarratableWidget(list, this.lastNarratable);
@@ -582,17 +581,17 @@ public abstract class DynamicErrorFreeEntryListWidget<E extends DynamicErrorFree
if (narratableSearchResult.priority.isTerminal()) {
this.lastNarratable = narratableSearchResult.entry;
}
-
+
if (list.size() > 1) {
- narrationElementOutput.add(NarratedElementType.POSITION, new TranslatableComponent("narrator.position.object_list", new Object[]{narratableSearchResult.index + 1, list.size()}));
+ narrationElementOutput.add(NarratedElementType.POSITION, new TranslatableComponent("narrator.position.object_list", narratableSearchResult.index + 1, list.size()));
if (narratableSearchResult.priority == NarrationPriority.FOCUSED) {
narrationElementOutput.add(NarratedElementType.USAGE, new TranslatableComponent("narration.component_list.usage"));
}
}
-
+
narratableSearchResult.entry.updateNarration(narrationElementOutput.nest());
}
-
+
}
}
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 cdf5e893d..6cc34b3b1 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
@@ -261,52 +261,52 @@ public final class InternalWidgets {
public boolean isRenderingPanel(Panel panel) {
return PanelWidget.isRendering(panel);
}
-
+
@Override
public Widget createDrawableWidget(DrawableConsumer drawable) {
return new DrawableWidget(drawable);
}
-
+
@Override
public me.shedaniel.rei.api.client.gui.widgets.Slot createSlot(Point point) {
return new EntryWidget(point);
}
-
+
@Override
public me.shedaniel.rei.api.client.gui.widgets.Slot createSlot(Rectangle bounds) {
return new EntryWidget(bounds);
}
-
+
@Override
public Button createButton(Rectangle bounds, Component text) {
return new ButtonWidget(bounds, text);
}
-
+
@Override
public Panel createPanelWidget(Rectangle bounds) {
return new PanelWidget(bounds);
}
-
+
@Override
public Label createLabel(Point point, FormattedText text) {
return new LabelWidget(point, text);
}
-
+
@Override
public Arrow createArrow(Rectangle rectangle) {
return new ArrowWidget(rectangle);
}
-
+
@Override
public BurningFire createBurningFire(Rectangle rectangle) {
return new BurningFireWidget(rectangle);
}
-
+
@Override
public DrawableConsumer createTexturedConsumer(ResourceLocation texture, int x, int y, int width, int height, float u, float v, int uWidth, int vHeight, int textureWidth, int textureHeight) {
return new TexturedDrawableConsumer(texture, x, y, width, height, u, v, uWidth, vHeight, textureWidth, textureHeight);
}
-
+
@Override
public DrawableConsumer createFillRectangleConsumer(Rectangle rectangle, int color) {
return new FillRectangleDrawableConsumer(rectangle, color);
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/basewidgets/TexturedDrawableConsumer.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/basewidgets/TexturedDrawableConsumer.java
index 8babd9f93..0a8d7494e 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/basewidgets/TexturedDrawableConsumer.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/basewidgets/TexturedDrawableConsumer.java
@@ -27,7 +27,6 @@ import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.*;
import com.mojang.math.Matrix4f;
import me.shedaniel.rei.api.client.gui.DrawableConsumer;
-import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiComponent;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.resources.ResourceLocation;
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/SearchProviderImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/SearchProviderImpl.java
index 82b9bf60c..530bfa266 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/SearchProviderImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/SearchProviderImpl.java
@@ -61,7 +61,7 @@ public class SearchProviderImpl implements SearchProvider {
public String getFilter() {
return filter;
}
-
+
@Override
public boolean equals(Object o) {
if (this == o) return true;
@@ -69,7 +69,7 @@ public class SearchProviderImpl implements SearchProvider {
SearchFilterImpl that = (SearchFilterImpl) o;
return Objects.equals(filter, that.filter);
}
-
+
@Override
public int hashCode() {
return Objects.hash(filter);
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/ArgumentType.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/ArgumentType.java
index 2c1f61d4d..be32abeff 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/ArgumentType.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/argument/type/ArgumentType.java
@@ -77,7 +77,8 @@ public abstract class ArgumentType<T, R> {
private ArgumentApplicableResult checkApplicable(String text, String prefix) {
if (prefix == null) return ArgumentApplicableResult.notApplicable();
if (text.startsWith("-" + prefix)) return ArgumentApplicableResult.applyInverted(text.substring(1 + prefix.length())).grammar(0, prefix.length() + 1);
- if (!prefix.isEmpty() && text.startsWith(prefix + "-")) return ArgumentApplicableResult.applyInverted(text.substring(1 + prefix.length())).grammar(0, prefix.length() + 1);
+ if (!prefix.isEmpty() && text.startsWith(prefix + "-"))
+ return ArgumentApplicableResult.applyInverted(text.substring(1 + prefix.length())).grammar(0, prefix.length() + 1);
if (text.startsWith(prefix)) return ArgumentApplicableResult.apply(text.substring(prefix.length())).grammar(0, prefix.length());
return ArgumentApplicableResult.notApplicable();
}
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/EntryIngredientImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/EntryIngredientImpl.java
index 4df84955e..b6a706d9d 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/EntryIngredientImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/EntryIngredientImpl.java
@@ -70,12 +70,12 @@ public class EntryIngredientImpl {
private EntryIngredient _of(EntryStack<?>... stacks) {
return new ArrayIngredient(stacks);
}
-
+
@Override
public EntryIngredient.Builder builder() {
return new EntryIngredientBuilder(0);
}
-
+
@Override
public EntryIngredient.Builder builder(int initialCapacity) {
return new EntryIngredientBuilder(initialCapacity);
@@ -86,17 +86,17 @@ public class EntryIngredientImpl {
private static class EntryIngredientBuilder implements EntryIngredient.Builder {
private EntryStack<?>[] contents;
private int size = 0;
-
+
public EntryIngredientBuilder(int initialCapacity) {
this.contents = new EntryStack[initialCapacity];
}
-
+
private void ensureCapacity(int minCapacity) {
if (contents.length < minCapacity) {
this.contents = Arrays.copyOf(this.contents, expandedCapacity(contents.length, minCapacity));
}
}
-
+
static int expandedCapacity(int oldCapacity, int minCapacity) {
int newCapacity = oldCapacity + (oldCapacity >> 1) + 1;
if (newCapacity < minCapacity) {
@@ -107,14 +107,14 @@ public class EntryIngredientImpl {
}
return newCapacity;
}
-
+
@Override
public EntryIngredient.Builder add(EntryStack<?> stack) {
ensureCapacity(size + 1);
contents[size++] = stack;
return this;
}
-
+
@Override
public EntryIngredient.Builder add(EntryStack<?>... stacks) {
ensureCapacity(size + stacks.length);
@@ -122,7 +122,7 @@ public class EntryIngredientImpl {
size += stacks.length;
return this;
}
-
+
@Override
public EntryIngredient.Builder addAll(Iterable<? extends EntryStack<?>> stacks) {
if (stacks instanceof Collection) {
@@ -134,7 +134,7 @@ public class EntryIngredientImpl {
}
return this;
}
-
+
@Override
public EntryIngredient build() {
if (contents.length > size) {
@@ -146,6 +146,7 @@ public class EntryIngredientImpl {
private static class EmptyEntryIngredient extends AbstractList<EntryStack<?>> implements EntryIngredient, RandomAccess {
private static final EmptyEntryIngredient EMPTY = new EmptyEntryIngredient();
+
@Override
public Iterator<EntryStack<?>> iterator() {
return Collections.emptyIterator();
@@ -227,17 +228,17 @@ public class EntryIngredientImpl {
public Spliterator<EntryStack<?>> spliterator() {
return Spliterators.emptySpliterator();
}
-
+
@Override
public ListTag save() {
return new ListTag();
}
-
+
@Override
public EntryIngredient filter(Predicate<EntryStack<?>> filter) {
return this;
}
-
+
@Override
public EntryIngredient map(UnaryOperator<EntryStack<?>> transformer) {
return this;
@@ -346,14 +347,14 @@ public class EntryIngredientImpl {
}
};
}
-
+
@Override
public ListTag save() {
ListTag listTag = new ListTag();
listTag.add(stack.save());
return listTag;
}
-
+
@Override
public EntryIngredient filter(Predicate<EntryStack<?>> filter) {
if (filter.test(stack)) {
@@ -361,7 +362,7 @@ public class EntryIngredientImpl {
}