diff options
16 files changed, 66 insertions, 68 deletions
diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/SyntaxHighlightingMode.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/SyntaxHighlightingMode.java index 23aac1f44..51dfe42f7 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/SyntaxHighlightingMode.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/SyntaxHighlightingMode.java @@ -23,13 +23,13 @@ package me.shedaniel.rei.gui.config; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.resources.language.I18n; +import net.minecraft.client.resources.I18n; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import java.util.Locale; -@Environment(EnvType.CLIENT) +@OnlyIn(Dist.CLIENT) public enum SyntaxHighlightingMode { PLAIN, PLAIN_UNDERSCORED, diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java index 9b0486f7b..fc8fd84dc 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java @@ -33,12 +33,12 @@ import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.util.IReorderingProcessor; import net.minecraft.util.SharedConstants; import net.minecraft.util.Util; -import net.minecraft.network.chat.Style; -import net.minecraft.util.FormattedCharSequence; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.vector.Matrix4f; +import net.minecraft.util.text.Style; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -632,9 +632,9 @@ public class TextFieldWidget extends WidgetWithBounds implements IScreen { public interface TextFormatter { TextFormatter DEFAULT = (widget, text, index) -> { - return FormattedCharSequence.forward(text, Style.EMPTY); + return IReorderingProcessor.forward(text, Style.EMPTY); }; - FormattedCharSequence format(TextFieldWidget widget, String text, int index); + IReorderingProcessor format(TextFieldWidget widget, String text, int index); } } diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/OverlaySearchField.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/OverlaySearchField.java index 3f67e2700..2e1ac994d 100644 --- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/OverlaySearchField.java +++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/OverlaySearchField.java @@ -39,16 +39,15 @@ import me.shedaniel.rei.impl.TextTransformations; import me.shedaniel.rei.impl.search.Argument; import me.shedaniel.rei.impl.search.ArgumentsRegistry; import me.shedaniel.rei.impl.search.TextArgument; -import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.SimpleSound; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.InputMappings; -import net.minecraft.network.chat.Style; -import net.minecraft.network.chat.TextColor; +import net.minecraft.util.IReorderingProcessor; import net.minecraft.util.SoundEvents; -import net.minecraft.util.FormattedCharSequence; import net.minecraft.util.Tuple; +import net.minecraft.util.text.Style; +import net.minecraft.util.text.TextFormatting; import org.jetbrains.annotations.ApiStatus; import java.util.List; @@ -58,9 +57,9 @@ import java.util.function.Consumer; public class OverlaySearchField extends TextFieldWidget implements TextFieldWidget.TextFormatter { public static boolean isHighlighting = false; - private static final Style SPLITTER_STYLE = Style.EMPTY.withColor(ChatFormatting.GRAY); - private static final Style QUOTES_STYLE = Style.EMPTY.withColor(ChatFormatting.GOLD); - private static final Style ERROR_STYLE = Style.EMPTY.withColor(TextColor.fromRgb(0xff5555)); + private static final Style SPLITTER_STYLE = Style.EMPTY.withColor(TextFormatting.GRAY); + private static final Style QUOTES_STYLE = Style.EMPTY.withColor(TextFormatting.GOLD); + private static final Style ERROR_STYLE = Style.EMPTY.withColor(net.minecraft.util.text.Color.fromRgb(0xff5555)); private final OverlaySearchFieldSyntaxHighlighter highlighter = new OverlaySearchFieldSyntaxHighlighter(this); public long keybindFocusTime = -1; public int keybindFocusKey = -1; @@ -76,7 +75,7 @@ public class OverlaySearchField extends TextFieldWidget implements TextFieldWidg } @Override - public FormattedCharSequence format(TextFieldWidget widget, String text, int index) { + public IReorderingProcessor format(TextFieldWidget widget, String text, int index) { boolean isPlain = ConfigObject.getInstance().getSyntaxHighlightingMode() == SyntaxHighlightingMode.PLAIN || ConfigObject.getInstance().getSyntaxHighlightingMode() == SyntaxHighlightingMode.PLAIN_UNDERSCORED; boolean hasUnderscore = ConfigObject.getInstance().getSyntaxHighlightingMode() == SyntaxHighlightingMode.PLAIN_UNDERSCORED || ConfigObject.getInstance().getSyntaxHighlightingMode() == SyntaxHighlightingMode.COLORFUL_UNDERSCORED; return TextTransformations.forwardWithTransformation(text, (s, charIndex, c) -> { @@ -106,7 +105,7 @@ public class OverlaySearchField extends TextFieldWidget implements TextFieldWidg return style; } int color = this.editable ? this.editableColor : this.notEditableColor; - return style.withColor(TextColor.fromRgb(Color.ofOpaque(style.getColor() == null ? color : style.getColor().getValue()).brighter(0.75).getColor())); + return style.withColor(net.minecraft.util.text.Color.fromRgb(Color.ofOpaque(style.getColor() == null ? color : style.getColor().getValue()).brighter(0.75).getColor())); }); } diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java index 55faa7081..0ac89e9bb 100644 --- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java +++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java @@ -342,7 +342,7 @@ public class VillagerRecipeViewingScreen extends Screen implements RecipeScreen Button button = iterator.next(); if (iterator.nextIndex() - 1 == selectedRecipeIndex) { - scrolling.scrollTo(Mth.clamp(yy - scrolling.getBounds().height / 2 + button.getBounds().height / 2, 0, scrolling.getMaxScroll()), true); + scrolling.scrollTo(MathHelper.clamp(yy - scrolling.getBounds().height / 2 + button.getBounds().height / 2, 0, scrolling.getMaxScroll()), true); break; } diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/config/entry/SearchFilterSyntaxHighlightingEntry.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/config/entry/SearchFilterSyntaxHighlightingEntry.java index a90dd2ef8..e4008c324 100644 --- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/config/entry/SearchFilterSyntaxHighlightingEntry.java +++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/config/entry/SearchFilterSyntaxHighlightingEntry.java @@ -24,17 +24,17 @@ package me.shedaniel.rei.gui.config.entry; import com.google.common.collect.ImmutableList; -import com.mojang.blaze3d.platform.Window; -import com.mojang.blaze3d.vertex.PoseStack; -import me.shedaniel.clothconfig2.gui.entries.TooltipListEntry; +import com.mojang.blaze3d.matrix.MatrixStack; +import me.shedaniel.clothconfig2.forge.gui.entries.TooltipListEntry; import me.shedaniel.rei.gui.config.SyntaxHighlightingMode; +import net.minecraft.client.MainWindow; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.IGuiEventListener; 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.events.GuiEventListener; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TextComponent; +import net.minecraft.client.gui.widget.Widget; +import net.minecraft.client.gui.widget.button.AbstractButton; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.StringTextComponent; import java.util.List; import java.util.Optional; @@ -45,22 +45,22 @@ public class SearchFilterSyntaxHighlightingEntry extends TooltipListEntry<Syntax private SyntaxHighlightingMode type; private SyntaxHighlightingMode defaultValue; private Consumer<SyntaxHighlightingMode> save; - private final AbstractWidget buttonWidget = new AbstractButton(0, 0, 0, 20, NarratorChatListener.NO_TITLE) { + private final Widget buttonWidget = new AbstractButton(0, 0, 0, 20, NarratorChatListener.NO_TITLE) { @Override public void onPress() { type = SyntaxHighlightingMode.values()[(type.ordinal() + 1) % SyntaxHighlightingMode.values().length]; } @Override - public void render(PoseStack matrices, int mouseX, int mouseY, float delta) { - setMessage(new TextComponent(type.toString())); + public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + setMessage(new StringTextComponent(type.toString())); super.render(matrices, mouseX, mouseY, delta); } }; - private final List<GuiEventListener> children = ImmutableList.of(buttonWidget); + private final List<IGuiEventListener> children = ImmutableList.of(buttonWidget); @SuppressWarnings("deprecation") - public SearchFilterSyntaxHighlightingEntry(Component fieldName, SyntaxHighlightingMode type, SyntaxHighlightingMode defaultValue, Consumer<SyntaxHighlightingMode> save) { + public SearchFilterSyntaxHighlightingEntry(ITextComponent fieldName, SyntaxHighlightingMode type, SyntaxHighlightingMode defaultValue, Consumer<SyntaxHighlightingMode> save) { super(fieldName, null); this.original = type; this.type = type; @@ -89,17 +89,17 @@ public class SearchFilterSyntaxHighlightingEntry extends TooltipListEntry<Syntax } @Override - public List<? extends GuiEventListener> children() { + public List<? extends IGuiEventListener> children() { return children; } @Override - public void render(PoseStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean isSelected, float delta) { + public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean isSelected, float delta) { super.render(matrices, index, y, x, entryWidth, entryHeight, mouseX, mouseY, isSelected, delta); - Window window = Minecraft.getInstance().getWindow(); + MainWindow window = Minecraft.getInstance().getWindow(); this.buttonWidget.active = this.isEditable(); this.buttonWidget.y = y; - Component displayedFieldName = this.getDisplayedFieldName(); + ITextComponent displayedFieldName = this.getDisplayedFieldName(); if (Minecraft.getInstance().font.isBidirectional()) { Minecraft.getInstance().font.drawShadow(matrices, displayedFieldName.getVisualOrderText(), window.getGuiScaledWidth() - x - Minecraft.getInstance().font.width(displayedFieldName), y + 6, 16777215); this.buttonWidget.x = x; diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/modules/Menu.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/modules/Menu.java index e4041a3a0..9fc3ed8ea 100644 --- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/modules/Menu.java +++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/modules/Menu.java @@ -42,7 +42,7 @@ import me.shedaniel.rei.gui.modules.entries.SubSubsetsMenuEntry; import me.shedaniel.rei.gui.widget.LateRenderable; import me.shedaniel.rei.gui.widget.WidgetWithBounds; import me.shedaniel.rei.utils.CollectionUtils; -import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.resources.I18n; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java index 7545d1b3a..14c8334e0 100644 --- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java +++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java @@ -168,7 +168,7 @@ public class ConfigManagerImpl implements ConfigManager { Collections.singletonList(new RecipeScreenTypeEntry(220, new TranslationTextComponent(i13n), getUnsafely(field, config, RecipeScreenType.UNSET), getUnsafely(field, defaults), type -> setUnsafely(field, config, type))) , (field) -> field.getType() == RecipeScreenType.class, ConfigObjectImpl.UseSpecialRecipeTypeScreen.class); guiRegistry.registerAnnotationProvider((i13n, field, config, defaults, guiProvider) -> - Collections.singletonList(new SearchFilterSyntaxHighlightingEntry( new TranslatableComponent(i13n), getUnsafely(field, config, SyntaxHighlightingMode.COLORFUL), getUnsafely(field, defaults), type -> setUnsafely(field, config, type))) + Collections.singletonList(new SearchFilterSyntaxHighlightingEntry( new TranslationTextComponent(i13n), getUnsafely(field, config, SyntaxHighlightingMode.COLORFUL), getUnsafely(field, defaults), type -> setUnsafely(field, config, type))) , (field) -> field.getType() == SyntaxHighlightingMode.class, ConfigObjectImpl.UseSpecialSearchFilterSyntaxHighlightingScreen.class); guiRegistry.registerAnnotationProvider((i13n, field, config, defaults, guiProvider) -> REIHelper.getInstance().getPreviousContainerScreen() == null || Minecraft.getInstance().getConnection() == null || Minecraft.getInstance().getConnection().getRecipeManager() == null ? diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/OverlaySearchFieldSyntaxHighlighter.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/OverlaySearchFieldSyntaxHighlighter.java index 62d4af27d..969664f73 100644 --- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/OverlaySearchFieldSyntaxHighlighter.java +++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/OverlaySearchFieldSyntaxHighlighter.java @@ -25,7 +25,7 @@ package me.shedaniel.rei.impl; import me.shedaniel.rei.gui.OverlaySearchField; import me.shedaniel.rei.impl.search.ArgumentsRegistry; -import net.minecraft.util.IntRange; +import net.minecraft.util.RangedInteger; import org.jetbrains.annotations.ApiStatus; import java.util.Collection; @@ -56,12 +56,12 @@ public class OverlaySearchFieldSyntaxHighlighter implements Consumer<String> { } @Override - public void addPart(SearchArgument<?, ?> argument, Collection<IntRange> grammarRanges, int index) { + public void addPart(SearchArgument<?, ?> argument, Collection<RangedInteger> grammarRanges, int index) { int argIndex = ArgumentsRegistry.ARGUMENT_LIST.indexOf(argument.getArgument()) * 2 + 1; for (int i = argument.start(); i < argument.end(); i++) { highlighted[i] = (byte) argIndex; } - for (IntRange grammarRange : grammarRanges) { + for (RangedInteger grammarRange : grammarRanges) { for (int i = grammarRange.getMinInclusive(); i <= grammarRange.getMaxInclusive(); i++) { highlighted[i + index] = (byte) (argIndex + 1); } diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/SearchArgument.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/SearchArgument.java index e305cd114..d38cfab71 100644 --- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/SearchArgument.java +++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/SearchArgument.java @@ -34,11 +34,11 @@ import me.shedaniel.rei.impl.search.ArgumentsRegistry; import me.shedaniel.rei.impl.search.MatchStatus; import me.shedaniel.rei.utils.CollectionUtils; import net.minecraft.client.Minecraft; +import net.minecraft.util.RangedInteger; +import net.minecraft.util.Unit; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.util.IntRange; -import net.minecraft.util.Unit; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.mutable.Mutable; import org.apache.commons.lang3.mutable.MutableObject; @@ -89,8 +89,8 @@ public class SearchArgument<T, R> { void addQuote(int index); void addSplitter(int index); - - void addPart(SearchArgument<?, ?> argument, Collection<IntRange> grammarRanges, int index); + + void addPart(SearchArgument<?, ?> argument, Collection<RangedInteger> grammarRanges, int index); } @ApiStatus.Internal diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/TextTransformations.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/TextTransformations.java index 4bd72155e..90a1b476d 100644 --- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/TextTransformations.java +++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/TextTransformations.java @@ -25,9 +25,9 @@ package me.shedaniel.rei.impl; import me.shedaniel.math.Color; import net.minecraft.client.Minecraft; -import net.minecraft.network.chat.Style; import net.minecraft.util.IReorderingProcessor; import net.minecraft.util.Util; +import net.minecraft.util.text.Style; import org.jetbrains.annotations.ApiStatus; @ApiStatus.Internal @@ -42,9 +42,9 @@ public class TextTransformations { }); } - public static FormattedCharSequence forwardWithTransformation(String text, CharSequenceTransformer transformer) { + public static IReorderingProcessor forwardWithTransformation(String text, CharSequenceTransformer transformer) { if (text.isEmpty()) { - return FormattedCharSequence.EMPTY; + return IReorderingProcessor.EMPTY; } return sink -> { int length = text.length(); diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/search/Argument.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/search/Argument.java index e9d31518a..6b8d20ae7 100644 --- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/search/Argument.java +++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/search/Argument.java @@ -24,9 +24,9 @@ package me.shedaniel.rei.impl.search; import me.shedaniel.rei.api.EntryStack; +import net.minecraft.util.text.Style; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.network.chat.Style; import org.apache.commons.lang3.mutable.Mutable; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/search/MatchStatus.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/search/MatchStatus.java index 5642502bb..ef9daa044 100644 --- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/search/MatchStatus.java +++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/search/MatchStatus.java @@ -23,7 +23,7 @@ package me.shedaniel.rei.impl.search; -import net.minecraft.util.IntRange; +import net.minecraft.util.RangedInteger; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -39,7 +39,7 @@ public final class MatchStatus { @Nullable private final String text; private final boolean preserveCasing; - private final List<IntRange> grammarRanges = new ArrayList<>(); + private final List<RangedInteger> grammarRanges = new ArrayList<>(); private MatchStatus(MatchType type, @Nullable String text, boolean preserveCasing) { this.type = type; @@ -71,13 +71,13 @@ public final class MatchStatus { return new MatchStatus(!inverted ? MatchType.MATCHED : MatchType.INVERT_MATCHED, Objects.requireNonNull(text), preserveCasing); } - public List<IntRange> grammarRanges() { + public List<RangedInteger> grammarRanges() { return grammarRanges; } public MatchStatus grammar(int start, int end) { if (end - 1 >= start) { - this.grammarRanges.add(IntRange.of(start, end - 1)); + this.grammarRanges.add(RangedInteger.of(start, end - 1)); } return this; } diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/search/ModArgument.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/search/ModArgument.java index bb14ec5c7..8a06e85af 100644 --- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/search/ModArgument.java +++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/search/ModArgument.java @@ -26,11 +26,11 @@ package me.shedaniel.rei.impl.search; import me.shedaniel.rei.api.ClientHelper; import me.shedaniel.rei.api.EntryStack; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Unit; +import net.minecraft.util.text.Color; +import net.minecraft.util.text.Style; import net.minecraftforge.api.distmarker.Dist; -import net.minecraft.network.chat.Style; -import net.minecraft.network.chat.TextColor; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.util.Unit; import org.apache.commons.lang3.mutable.Mutable; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -43,7 +43,7 @@ import java.util.Optional; @OnlyIn(Dist.CLIENT) public final class ModArgument extends Argument<Unit, ModArgument.@Nullable ModInfoPair> { public static final ModArgument INSTANCE = new ModArgument(); - private static final Style STYLE = Style.EMPTY.withColor(TextColor.fromRgb(0xffa8f3)); + private static final Style STYLE = Style.EMPTY.withColor(Color.fromRgb(0xffa8f3)); @Override public String getName() { diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/search/RegexArgument.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/search/RegexArgument.java index f184fd68e..81aa144fe 100644 --- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/search/RegexArgument.java +++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/search/RegexArgument.java @@ -24,10 +24,10 @@ package me.shedaniel.rei.impl.search; import me.shedaniel.rei.api.EntryStack; +import net.minecraft.util.text.Color; +import net.minecraft.util.text.Style; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.network.chat.Style; -import net.minecraft.network.chat.TextColor; import org.apache.commons.lang3.mutable.Mutable; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -41,7 +41,7 @@ import java.util.regex.PatternSyntaxException; @OnlyIn(Dist.CLIENT) public final class RegexArgument extends Argument<@Nullable Pattern, String> { public static final RegexArgument INSTANCE = new RegexArgument(); - private static final Style STYLE = Style.EMPTY.withColor(TextColor.fromRgb(0xbfffa8)); + private static final Style STYLE = Style.EMPTY.withColor(Color.fromRgb(0xbfffa8)); @Override public String getName() { diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/search/TagArgument.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/search/TagArgument.java index 0b07884b4..1d0d0ad5c 100644 --- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/search/TagArgument.java +++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/search/TagArgument.java @@ -26,13 +26,12 @@ package me.shedaniel.rei.impl.search; import me.shedaniel.rei.api.EntryStack; import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Unit; +import net.minecraft.util.text.Color; +import net.minecraft.util.text.Style; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.util.Unit; import org.apache.commons.lang3.mutable.Mutable; -import net.minecraft.network.chat.Style; -import net.minecraft.network.chat.TextColor; -import net.minecraft.resources.ResourceLocation; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -46,7 +45,7 @@ public final class TagArgument extends Argument<Unit, String[]> { public static final TagArgument INSTANCE = new TagArgument(); private static final Minecraft minecraft = Minecraft.getInstance(); private static final String[] EMPTY_ARRAY = new String[0]; - private static final Style STYLE = Style.EMPTY.withColor(TextColor.fromRgb(0x9efff4)); + private static final Style STYLE = Style.EMPTY.withColor(Color.fromRgb(0x9efff4)); @Override public String getName() { diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/search/TooltipArgument.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/search/TooltipArgument.java index 4ea71c8f4..bab86bc59 100644 --- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/search/TooltipArgument.java +++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/search/TooltipArgument.java @@ -25,11 +25,11 @@ package me.shedaniel.rei.impl.search; import me.shedaniel.rei.api.EntryStack; import me.shedaniel.rei.impl.SearchArgument; +import net.minecraft.util.Unit; +import net.minecraft.util.text.Color; +import net.minecraft.util.text.Style; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.network.chat.Style; -import net.minecraft.network.chat.TextColor; -import net.minecraft.util.Unit; import org.apache.commons.lang3.mutable.Mutable; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -41,7 +41,7 @@ import java.util.Locale; @OnlyIn(Dist.CLIENT) public final class TooltipArgument extends Argument<Unit, String> { public static final TooltipArgument INSTANCE = new TooltipArgument(); - private static final Style STYLE = Style.EMPTY.withColor(TextColor.fromRgb(0xffe0ad)); + private static final Style STYLE = Style.EMPTY.withColor(Color.fromRgb(0xffe0ad)); @Override public String getName() { |