Merge branch '1.20.5' into 1.20.4

emilyploszaj · Sep 8, 2024 · fc5bda5 · fc5bda5
2 parents ca2176f + e185463
commit fc5bda5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 775 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ### Tweaks
-* Tweaked JEI/EMI compatibility disabling to not load plugins earlier than previously expected
+* Added new JEI features to JEI/EMI compatibility
 
 ### Fixes
-* Fixed regression in item group querying causing errors to cascade outside of single groups
+* Fixed JEI subtype compatibility on previous versions #686
+* Fixed various new JEI compatibility issues #683 #682 #687
+* Fixed scrolling not taking exclusion areas into consideration #685
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ minecraft_version=1.20.4
 enabled_platforms=fabric,neoforge
 
 archives_base_name=emi
-mod_version=1.1.12
+mod_version=1.1.13
 maven_group=dev.emi
 
 architectury_version=4.9.83

diff --git a/xplat/src/main/java/dev/emi/emi/config/EmiConfig.java b/xplat/src/main/java/dev/emi/emi/config/EmiConfig.java
@@ -342,7 +342,7 @@ public class EmiConfig {
 	@ConfigValue("binds.toggle-visibility")
 	public static EmiBind toggleVisibility = new EmiBind("key.emi.toggle_visibility", EmiInput.CONTROL_MASK, GLFW.GLFW_KEY_O);
 
-	@Comment("Focuse the search bar.")
+	@Comment("Focuses the search bar.")
 	@ConfigValue("binds.focus-search")
 	public static EmiBind focusSearch = new EmiBind("key.emi.focus_search", EmiInput.CONTROL_MASK, GLFW.GLFW_KEY_F);
 

diff --git a/xplat/src/main/java/dev/emi/emi/screen/EmiScreenManager.java b/xplat/src/main/java/dev/emi/emi/screen/EmiScreenManager.java
@@ -903,6 +903,13 @@ public static boolean mouseScrolled(double mouseX, double mouseY, double amount)
 		recalculate();
 		SidebarPanel panel = getHoveredPanel((int) mouseX, (int) mouseY);
 		if (panel != null) {
+			int mx = (int) mouseX;
+			int my = (int) mouseY;
+			for (Bounds bounds : EmiExclusionAreas.getExclusion(EmiScreenBase.getCurrent())) {
+				if (bounds.contains(mx, my)) {
+					return false;
+				}
+			}
 			panel.scroll(-sa);
 			return true;
 		}