Merge pull request #71 from flowerinsnow-lights-opensource/upgrade-11…

…-forge

Fix #63

Upgrade fnml4j to 2.0.0-beta.3

Change license to MPL-2.0

Upgrade gradle wrapper to 8.9

Upgrade forge to 43.4.2

.github/workflows/tagged-release.yml

@@ -15,21 +15,21 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 21
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: 21
+          java-version: 17
           distribution: temurin
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
 
       - name: Distributions with Gradle Wrapper
         run: |
-          cd 24w14a-1.21.1-fabric/
+          cd 1.19.2-forge/
           ./gradlew build
 
       - name: Release
         uses: softprops/action-gh-release@v2
         with:
-          files: 24w14a-1.21.1-fabric/build/libs/*.jar
+          files: 1.19.2-forge/build/libs/*.jar

1.19.2-forge/build.gradle

@@ -133,7 +133,7 @@ repositories() {
     }
 
     maven() {
-        url = 'https://repo.flowerinsnow.online/repository/maven-public/'
+        url = 'https://repo.flowerinsnow.online/repository/maven-opensources/'
     }
 }
 
@@ -158,9 +158,11 @@ dependencies() {
     // For more info:
     // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
     // http://www.gradle.org/docs/current/userguide/dependency_management.html
-    implementation("online.flowerinsnow.fnml:fnml4j-core:${project.version_fnml4j}")
+    implementation("online.flowerinsnow.fnml4j:interface:${project.version_fnml4j}")
+    implementation("online.flowerinsnow.fnml4j:core:${project.version_fnml4j}")
 
-    jarJar("online.flowerinsnow.fnml:fnml4j-core:[${project.version_fnml4j}]")
+    jarJar("online.flowerinsnow.fnml4j:interface:[${project.version_fnml4j}]")
+    jarJar("online.flowerinsnow.fnml4j:core:[${project.version_fnml4j}]")
 
     annotationProcessor('org.spongepowered:mixin:0.8.5:processor')
 }

1.19.2-forge/gradle.properties

@@ -13,7 +13,7 @@ minecraft_version=1.19.2
 # as they do not follow standard versioning conventions.
 minecraft_version_range=[1.19.2]
 # The Forge version must agree with the Minecraft version to get a valid artifact
-forge_version=43.3.13
+forge_version=43.4.2
 # The Forge version range can use any version of Forge as bounds or match the loader version range
 forge_version_range=[43,44)
 # The loader version range can only use the major version of Forge/FML as bounds
@@ -46,9 +46,9 @@ mod_id=great_scrollable_tooltips
 # The human-readable display name for the mod.
 mod_name=Great Scrollable Tooltips
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
-mod_license=GPL-3.0
+mod_license=MPL-2.0
 # The mod version. See https://semver.org/
-mod_version=11.0.0-beta.1+forge
+mod_version=11.0.1-beta.1+forge
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html
@@ -59,4 +59,4 @@ mod_authors=flowerinsnow
 mod_description=Allow scrolling of item tooltips in the inventory.
 
 # Dependencies
-version_fnml4j=1.0.4
+version_fnml4j=2.0.0-beta.3

1.19.2-forge/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

1.19.2-forge/src/main/java/online/flowerinsnow/greatscrollabletooltips/GreatScrollableTooltips.java

@@ -57,7 +57,7 @@ public void onClientSetup(FMLClientSetupEvent event) {
         this.config.load();
 
         ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () ->
-            new ConfigScreenHandler.ConfigScreenFactory(parent -> new ConfigScreen(parent, GreatScrollableTooltips.this.config))
+            new ConfigScreenHandler.ConfigScreenFactory((client, parent) -> new ConfigScreen(parent, GreatScrollableTooltips.this.config))
         );
 
         IEventBus eventBus = MinecraftForge.EVENT_BUS;