Merge remote-tracking branch 'origin/1.20.x/dev' into 1.20.x/dev

# Conflicts: # build.gradle # gradle/wrapper/gradle-wrapper.properties
ChachyDev · Apr 16, 2024 · a8b8625 · a8b8625
2 parents 8e89b84 + a560e3c
commit a8b8625
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 19 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "fabric-loom" version "1.2-SNAPSHOT"
+    id "fabric-loom" version "1.3-SNAPSHOT"
 }
 
 java {
@@ -10,13 +10,13 @@ java {
     withSourcesJar()
 }
 
-version = "0.3.3"
+version = "0.3.5"
 group = "dev.chachy"
 
 dependencies {
-    minecraft "com.mojang:minecraft:1.20"
-    mappings "net.fabricmc:yarn:1.20+build.1:v2"
-    modImplementation "net.fabricmc:fabric-loader:0.14.21"
+    minecraft "com.mojang:minecraft:1.20.4"
+    mappings "net.fabricmc:yarn:1.20.4+build.1:v2"
+    modImplementation "net.fabricmc:fabric-loader:0.15.0"
 }
 
 processResources {
@@ -34,7 +34,7 @@ tasks.withType(JavaCompile).configureEach {
 
 jar {
     from("LICENSE") {
-        rename { "${it}_${project.archivesBaseName}" }
+        rename { "${it}_${project.name}" }
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/...in/java/dev/chachy/lazylanguageloader/client/mixin/ui/searchbar/MixinEntryListWidget.java b/...in/java/dev/chachy/lazylanguageloader/client/mixin/ui/searchbar/MixinEntryListWidget.java
@@ -3,19 +3,24 @@
 import dev.chachy.lazylanguageloader.client.api.scroll.Scrollable;
 import net.minecraft.client.gui.widget.EntryListWidget;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(EntryListWidget.class)
 public class MixinEntryListWidget implements Scrollable {
+    @Unique
     private boolean scrolled;
 
+
     @Inject(method = "mouseScrolled", at = @At("HEAD"))
-    private void mouseScrolled(double mouseX, double mouseY, double amount, CallbackInfoReturnable<Boolean> cir) {
-        scrolled = true;
+    private void mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount, CallbackInfoReturnable<Boolean> cir) {
+        this.scrolled = true;
     }
 
+
+    @SuppressWarnings("AddedMixinMembersNamePattern")
     @Override
     public boolean hasScrolled() {
         return scrolled;

diff --git a/...a/dev/chachy/lazylanguageloader/client/mixin/ui/searchbar/MixinLanguageOptionsScreen.java b/...a/dev/chachy/lazylanguageloader/client/mixin/ui/searchbar/MixinLanguageOptionsScreen.java
@@ -34,14 +34,7 @@ protected MixinLanguageOptionsScreen(Text title) {
         super(title);
     }
 
-    @Inject(
-        method = "init",
-        at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/client/gui/screen/option/LanguageOptionsScreen;addSelectableChild(Lnet/minecraft/client/gui/Element;)Lnet/minecraft/client/gui/Element;",
-            shift = At.Shift.AFTER
-        )
-    )
+    @Inject(method = "init", at = @At("TAIL"))
     private void lazyLanguageLoader$$init(CallbackInfo ci) {
         initialComponents = new ArrayList<>(languageSelectionList.children());
 
@@ -59,7 +52,7 @@ protected MixinLanguageOptionsScreen(Text title) {
     private void lazyLanguageLoader$$handleText(String text) {
         List<LanguageOptionsScreen.LanguageSelectionListWidget.LanguageEntry> children = languageSelectionList.children();
 
-        if (text.isBlank() || text.isBlank()) {
+        if (text.isBlank()) {
             int initialSize = initialComponents.size();
             int currentSize = children.size();
 
@@ -119,6 +112,7 @@ protected MixinLanguageOptionsScreen(Text title) {
         }
     }
 
+    @Unique
     private String lazyLanguageLoader$$addTruncationMarker(String text, String marker) {
         return text.length() > marker.length() ? text.substring(0, text.length() - marker.length()) : marker;
     }

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -26,7 +26,7 @@
   "accessWidener": "lazy-language-loader.accesswidener",
   "depends": {
     "fabricloader": ">=0.12.3",
-    "minecraft": ">=1.20",
+    "minecraft": ">=1.20.2",
     "java": ">=17"
   }
 }