Merge branch '1.19.4' into 1.19.3

emilyploszaj · Oct 19, 2023 · 052acfa · 052acfa
2 parents 4719cb3 + d9b2d34
commit 052acfa
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,4 @@
-### Tweaks
-* Tweaked how dev mode settings overlap visually in the index
-
 ### Fixes
-* Fixed fabric disconnect issue in 1.20.2 #322
+* Fixed JEMI tooltips #330
+* Fixed slot highlight misalignment #328
+* Fixed slot highlight for mod search
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ minecraft_version=1.19.3
 enabled_platforms=fabric,forge
 
 archives_base_name=emi
-mod_version=1.0.22
+mod_version=1.0.23
 maven_group=dev.emi
 
 architectury_version=4.9.83

diff --git a/xplat/src/main/java/dev/emi/emi/jemi/JemiRecipe.java b/xplat/src/main/java/dev/emi/emi/jemi/JemiRecipe.java
@@ -161,7 +161,7 @@ public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
 
 		@Override
 		public List<TooltipComponent> getTooltip(int mouseX, int mouseY) {
-			return category.getTooltipStrings(recipe, recipeLayoutDrawable.getRecipeSlotsView(), x, y)
+			return category.getTooltipStrings(recipe, recipeLayoutDrawable.getRecipeSlotsView(), mouseX, mouseY)
 				.stream()
 				.map(t -> TooltipComponent.of(t.asOrderedText()))
 				.toList();

diff --git a/xplat/src/main/java/dev/emi/emi/screen/EmiScreenManager.java b/xplat/src/main/java/dev/emi/emi/screen/EmiScreenManager.java
@@ -43,6 +43,7 @@
 import dev.emi.emi.config.SidebarType;
 import dev.emi.emi.input.EmiBind;
 import dev.emi.emi.input.EmiInput;
+import dev.emi.emi.mixin.accessor.HandledScreenAccessor;
 import dev.emi.emi.network.CreateItemC2SPacket;
 import dev.emi.emi.network.EmiNetwork;
 import dev.emi.emi.platform.EmiClient;
@@ -804,9 +805,9 @@ private static void renderSlotOverlays(EmiDrawContext context, int mouseX, int m
 				}
 			}
 		}
-		if (screen instanceof HandledScreen<?> hs && screen instanceof EmiScreen emi) {
+		if (screen instanceof HandledScreen<?> hs && hs instanceof HandledScreenAccessor hsa) {
 			context.push();
-			context.matrices().translate(emi.emi$getLeft(), emi.emi$getTop(), 0);
+			context.matrices().translate(hsa.getX(), hsa.getY(), 0);
 			for (Slot slot : hs.getScreenHandler().slots) {
 				EmiStack stack = EmiStack.of(slot.getStack());
 				context.push();

diff --git a/xplat/src/main/java/dev/emi/emi/search/ModQuery.java b/xplat/src/main/java/dev/emi/emi/search/ModQuery.java
@@ -4,17 +4,25 @@
 
 import com.google.common.collect.Sets;
 
+import dev.emi.emi.EmiUtil;
 import dev.emi.emi.api.stack.EmiStack;
 
 public class ModQuery extends Query {
 	private final Set<EmiStack> valid = Sets.newIdentityHashSet();
+	private final String name;
 
 	public ModQuery(String name) {
-		EmiSearch.mods.findAll(name.toLowerCase()).forEach(s -> valid.add(s.stack));
+		this.name = name.toLowerCase();
+		EmiSearch.mods.findAll(this.name).forEach(s -> valid.add(s.stack));
 	}
 
 	@Override
 	public boolean matches(EmiStack stack) {
 		return valid.contains(stack);
 	}
+
+	@Override
+	public boolean matchesUnbaked(EmiStack stack) {
+		return EmiUtil.getModName(stack.getId().getNamespace()).toLowerCase().contains(name);
+	}
 }