Close #135

6 files changed, 20 insertions, 5 deletions

diff --git a/src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java
index d75f064ef..6430708cb 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java
@@ -143,10 +143,10 @@ public class AutoCraftingButtonWidget extends ButtonWidget {
             if (errorTooltip == null)
                 return Optional.ofNullable(I18n.translate("text.auto_craft.move_items") + extraTooltip);
             else
-                return Optional.ofNullable("§c" + I18n.translate(errorTooltip) + extraTooltip);
+                return Optional.ofNullable(Formatting.RED.toString() + I18n.translate(errorTooltip) + extraTooltip);
         if (errorTooltip == null)
             return Optional.ofNullable(I18n.translate("text.auto_craft.move_items"));
         else
-            return Optional.ofNullable("§c" + I18n.translate(errorTooltip));
+            return Optional.ofNullable(Formatting.RED.toString() + I18n.translate(errorTooltip));
     }
 }
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java
index cc2d30887..95c922f2a 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java
@@ -28,6 +28,7 @@ import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
 import net.minecraft.text.Text;
 import net.minecraft.util.ActionResult;
+import net.minecraft.util.Formatting;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.registry.Registry;
 import org.apache.commons.lang3.StringUtils;
@@ -306,7 +307,7 @@ public class EntryListWidget extends Widget {
                     @Override
                     protected List<String> getExtraFluidToolTips(Fluid fluid) {
                         if (MinecraftClient.getInstance().options.advancedItemTooltips)
-                            return Collections.singletonList("§8" + Registry.FLUID.getId(fluid).toString());
+                            return Collections.singletonList(Formatting.DARK_GRAY.toString() + Registry.FLUID.getId(fluid).toString());
                         return super.getExtraFluidToolTips(fluid);
                     }
                     
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/RecipeArrowWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/RecipeArrowWidget.java
index daecf8e8a..e3b6a748a 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/RecipeArrowWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/RecipeArrowWidget.java
@@ -1,3 +1,8 @@
+/*
+ * Roughly Enough Items by Danielshe.
+ * Licensed under the MIT License.
+ */
+
 package me.shedaniel.rei.gui.widget;
 
 import com.mojang.blaze3d.platform.GlStateManager;
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/SearchFieldWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/SearchFieldWidget.java
index b4f5e2b22..40a54f1df 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/SearchFieldWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/SearchFieldWidget.java
@@ -7,6 +7,7 @@ package me.shedaniel.rei.gui.widget;
 
 import com.mojang.blaze3d.platform.GlStateManager;
 import net.minecraft.client.render.GuiLighting;
+import net.minecraft.client.resource.language.I18n;
 import net.minecraft.client.sound.PositionedSoundInstance;
 import net.minecraft.sound.SoundEvents;
 
@@ -24,6 +25,7 @@ public class SearchFieldWidget extends TextFieldWidget {
         GuiLighting.disable();
         GlStateManager.disableDepthTest();
         setEditableColor(isSearching ? -1313241 : 14737632);
+        setSuggestion(!isFocused() && getText().isEmpty() ? I18n.translate("text.rei.search.field.suggestion") : null);
         super.render(int_1, int_2, float_1);
         GlStateManager.enableDepthTest();
     }
@@ -32,7 +34,7 @@ public class SearchFieldWidget extends TextFieldWidget {
     public void renderBorder() {
         if (!isSearching)
             super.renderBorder();
-        else {
+        else if (this.hasBorder()) {
             fill(this.getBounds().x - 1, this.getBounds().y - 1, this.getBounds().x + this.getBounds().width + 1, this.getBounds().y + this.getBounds().height + 1, -1313241);
             fill(this.getBounds().x, this.getBounds().y, this.getBounds().x + this.getBounds().width, this.getBounds().y + this.getBounds().height, -16777216);
         }
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java
index 924dcb680..1b5274af1 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java
@@ -13,6 +13,7 @@ import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.render.BufferBuilder;
 import net.minecraft.client.render.Tessellator;
 import net.minecraft.client.render.VertexFormats;
+import net.minecraft.util.Tickable;
 import net.minecraft.util.math.MathHelper;
 
 import java.util.Collections;
@@ -22,7 +23,7 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
-public class TextFieldWidget extends WidgetWithBounds {
+public class TextFieldWidget extends WidgetWithBounds implements Tickable {
     
     public Function<String, String> stripInvaild;
     protected int focusedTicks;
@@ -87,6 +88,7 @@ public class TextFieldWidget extends WidgetWithBounds {
         this.renderTextProvider = biFunction_1;
     }
     
+    @Override
     public void tick() {
         ++this.focusedTicks;
     }
diff --git a/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java b/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java
index 18bb3f2e0..9a1feba0d 100644
--- a/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java
+++ b/src/main/java/me/shedaniel/rei/impl/ScreenHelper.java
@@ -12,6 +12,7 @@ import me.shedaniel.rei.gui.ContainerScreenOverlay;
 import me.shedaniel.rei.gui.widget.SearchFieldWidget;
 import me.shedaniel.rei.listeners.ContainerScreenHooks;
 import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.event.client.ClientTickCallback;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.ingame.AbstractContainerScreen;
 import net.minecraft.client.util.Window;
@@ -92,6 +93,10 @@ public class ScreenHelper implements ClientModInitializer {
                 lastContainerScreen = (AbstractContainerScreen<?>) screen;
             return ActionResult.PASS;
         });
+        ClientTickCallback.EVENT.register(minecraftClient -> {
+            if (isOverlayVisible() && searchField != null)
+                searchField.tick();
+        });
     }
     
 }