Merge pull request RobertSkalko#192 from TUsama/1.20-Forge

RobertSkalko · web-flow · commit 39e151eaf974 · 2025-04-21T17:49:48.000+02:00
add search keywords
diff --git a/.gitignore b/.gitignore
@@ -37,4 +37,5 @@ eclipse
 run
 ignore/
 remappedSrc
-remappedSrc/
+remappedSrc/
+/libs
diff --git a/src/main/java/com/robertx22/mine_and_slash/gui/screens/skill_tree/SkillTreeRenderType.java b/src/main/java/com/robertx22/mine_and_slash/gui/screens/skill_tree/SkillTreeRenderType.java
@@ -17,10 +17,6 @@ public SkillTreeRenderType(String pName, Runnable pSetupState, Runnable pClearSt
         super(pName, pSetupState, pClearState);
     }
 
-    public static RenderType CONNECTION = getSkillTreeRenderType("connection", SlashRef.id("textures/gui/skill_tree/skill_connection.png"));
-
-    private static final TransparencyStateShard blend = new TransparencyStateShard("boring_blend", RenderSystem::enableBlend, RenderSystem::disableBlend);
-
 
 
     public static RenderType getSkillTreeRenderType(String name, ResourceLocation texture) {
diff --git a/src/main/java/com/robertx22/mine_and_slash/gui/screens/skill_tree/SkillTreeScreen.java b/src/main/java/com/robertx22/mine_and_slash/gui/screens/skill_tree/SkillTreeScreen.java
@@ -18,6 +18,7 @@
 import com.robertx22.mine_and_slash.gui.screens.skill_tree.buttons.PerkConnectionRender;
 import com.robertx22.mine_and_slash.gui.screens.skill_tree.buttons.PerkPointPair;
 import com.robertx22.mine_and_slash.gui.screens.skill_tree.buttons.PerkScreenContext;
+import com.robertx22.mine_and_slash.gui.screens.skill_tree.component.TipsWidget;
 import com.robertx22.mine_and_slash.mmorpg.MMORPG;
 import com.robertx22.mine_and_slash.mmorpg.SlashRef;
 import com.robertx22.mine_and_slash.saveclasses.PointData;
@@ -49,6 +50,7 @@ public abstract class SkillTreeScreen extends BaseScreen implements INamedScreen
 
     static ResourceLocation CON = SlashRef.id("textures/gui/skill_tree/skill_connection.png");
     public VertexContainer vertexContainer = new VertexContainer();
+    private TipsWidget tips;
 
 
     private void renderConnection(GuiGraphics graphics, PerkConnectionRender renderer) {
@@ -237,7 +239,8 @@ protected void init() {
             this.school = ExileDB.TalentTrees().getFilterWrapped(x -> x.getSchool_type().equals(this.schoolType)).list.get(0);
 
             refreshButtons();
-
+            this.tips = new TipsWidget(0, 0, 10, 10, Gui.TALENT_SCREEN_SEARCH_TIPS.locName(Gui.TALENT_SCREEN_SEARCH_KEYWORD_ALL.locName().withStyle(ChatFormatting.GOLD), Gui.TALENT_SCREEN_SEARCH_KEYWORD_GAME_CHANGER.locName().withStyle(ChatFormatting.GOLD)));
+            addWidget(tips);
 
             goToCenter();
         } catch (Exception e) {
@@ -439,6 +442,7 @@ public void render(GuiGraphics gui, int x, int y, float ticks) {
         renderBackgroundDirt(gui, this, 0);
         zoom = Mth.lerp(ClientConfigs.getConfig().SKILL_TREE_ZOOM_SPEED.get().floatValue(), zoom, targetZoom);
         renderPanels(gui);
+        tips.render(gui, x, y, ticks);
         gui.pose().scale(zoom, zoom, zoom);
 
         try {
@@ -548,6 +552,9 @@ private void renderPanels(GuiGraphics gui) {
         SkillTreeScreen.SEARCH.setY(yx);
         SkillTreeScreen.SEARCH.render(gui, 0, 0, 0);
 
+        tips.setX(tx + SkillTreeScreen.SEARCH.getWidth() - tips.getWidth() - 2);
+        tips.setY(yx + (SkillTreeScreen.SEARCH.getHeight() - tips.getHeight()) / 2);
+
 
         if (MMORPG.RUN_DEV_TOOLS) {
             MutableComponent debug = Component.literal("Widgets: " + this.children().size() + " - " + msstring);
diff --git a/src/main/java/com/robertx22/mine_and_slash/gui/screens/skill_tree/buttons/PerkButton.java b/src/main/java/com/robertx22/mine_and_slash/gui/screens/skill_tree/buttons/PerkButton.java
@@ -16,6 +16,7 @@
 import com.robertx22.mine_and_slash.saveclasses.gearitem.gear_bases.ModRange;
 import com.robertx22.mine_and_slash.saveclasses.gearitem.gear_bases.StatRangeInfo;
 import com.robertx22.mine_and_slash.uncommon.MathHelper;
+import com.robertx22.mine_and_slash.uncommon.localization.Gui;
 import com.robertx22.mine_and_slash.vanilla_mc.packets.perks.PerkChangePacket;
 import com.robertx22.library_of_exile.main.Packets;
 import com.robertx22.library_of_exile.utils.GuiUtils;
@@ -188,21 +189,24 @@ public void renderWidget(GuiGraphics gui, int mouseX, int mouseY, float pPartial
         var search = SkillTreeScreen.SEARCH.getValue();
 
 
-        float opacity;
+        float opacity = 0.2f;
 
         if (!search.isEmpty()) {
-            if (search.equals("all")) {
-                if (status != PerkStatus.CONNECTED) {
-                    opacity = 0.2F;
-                } else {
+            if (search.equals(Gui.TALENT_SCREEN_SEARCH_KEYWORD_ALL.locName().getString())) {
+                if (status == PerkStatus.CONNECTED) {
                     opacity = 1;
                 }
-            } else {
-                boolean containsSearchStat = perk.stats.stream()
+            } else if (perk.stats.stream()
+                    .anyMatch(item -> item.getStat().locName().getString().toLowerCase().contains(search.toLowerCase())) || perk.locName().getString().toLowerCase().contains(search.toLowerCase())){
+                /*boolean containsSearchStat = perk.stats.stream()
                         .anyMatch(item -> item.getStat().locName().getString().toLowerCase().contains(search.toLowerCase()));
 
-                boolean containsName = perk.locName().getString().toLowerCase().contains(search.toLowerCase());
-                opacity = containsSearchStat || containsName ? 1F : 0.2f;
+                boolean containsName = perk.locName().getString().toLowerCase().contains(search.toLowerCase());*/
+                opacity = 1F;
+            } else if (search.equals(Gui.TALENT_SCREEN_SEARCH_KEYWORD_GAME_CHANGER.locName().getString())) {
+                if (perk.getType().equals(Perk.PerkType.MAJOR)){
+                    opacity = 1F;
+                }
             }
         } else {
             opacity = status.getOpacity();
diff --git a/src/main/java/com/robertx22/mine_and_slash/gui/screens/skill_tree/component/TipsWidget.java b/src/main/java/com/robertx22/mine_and_slash/gui/screens/skill_tree/component/TipsWidget.java
@@ -0,0 +1,33 @@
+package com.robertx22.mine_and_slash.gui.screens.skill_tree.component;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.robertx22.mine_and_slash.mmorpg.SlashRef;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.components.Tooltip;
+import net.minecraft.client.gui.narration.NarrationElementOutput;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+
+public class TipsWidget extends AbstractWidget {
+    static ResourceLocation TIPS = SlashRef.id("textures/gui/skill_tree/tips.png");
+
+    public TipsWidget(int pX, int pY, int pWidth, int pHeight, Component pMessage) {
+        super(pX, pY, pWidth, pHeight, pMessage);
+        setTooltip(Tooltip.create(pMessage));
+    }
+
+    @Override
+    protected void renderWidget(GuiGraphics guiGraphics, int i, int i1, float v) {
+        PoseStack pose = guiGraphics.pose();
+        pose.pushPose();
+        pose.translate(0, 0, 10);
+        guiGraphics.blit(TIPS, getX(), getY(), getWidth(), getHeight(), 0, 0, 32, 32, 32, 32);
+        pose.popPose();
+    }
+
+    @Override
+    protected void updateWidgetNarration(NarrationElementOutput narrationElementOutput) {
+
+    }
+}
diff --git a/src/main/java/com/robertx22/mine_and_slash/uncommon/localization/Gui.java b/src/main/java/com/robertx22/mine_and_slash/uncommon/localization/Gui.java
@@ -7,6 +7,9 @@
 import java.util.Locale;
 
 public enum Gui implements IAutoLocName {
+    TALENT_SCREEN_SEARCH_KEYWORD_GAME_CHANGER("game changer"),
+    TALENT_SCREEN_SEARCH_KEYWORD_ALL("all"),
+    TALENT_SCREEN_SEARCH_TIPS("Search Keywords: \n\n%1$s: show all allocated talents\n\n%2$s: show all game changer talents"),
     STATION_LOCK_RECIPE("Lock Recipe"),
     STATION_UNLOCK_RECIPE("Unlock Recipe"),
     STATION_START_CRAFTING("Start Crafting"),
diff --git a/src/main/resources/assets/mmorpg/lang/en_us.json b/src/main/resources/assets/mmorpg/lang/en_us.json
diff --git a/src/main/resources/assets/mmorpg/textures/gui/skill_tree/tips.png b/src/main/resources/assets/mmorpg/textures/gui/skill_tree/tips.png

Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,6 @@ public SkillTreeRenderType(String pName, Runnable pSetupState, Runnable pClearSt`
`17`	`17`	`super(pName, pSetupState, pClearState);`
`18`	`18`	`}`
`19`	`19`
`20`		`- public static RenderType CONNECTION = getSkillTreeRenderType("connection", SlashRef.id("textures/gui/skill_tree/skill_connection.png"));`
`21`		`-`
`22`		`- private static final TransparencyStateShard blend = new TransparencyStateShard("boring_blend", RenderSystem::enableBlend, RenderSystem::disableBlend);`
`23`		`-`
`24`	`20`
`25`	`21`
`26`	`22`	`public static RenderType getSkillTreeRenderType(String name, ResourceLocation texture) {`