We get to main menu now :)

AppliedEnergistics · Nov 10, 2023 · 5ec5409 · 5ec5409
1 parent 98e2f9f
commit 5ec5409
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -24,6 +24,8 @@ plugins {
     id "de.undercouch.download"
 }
 
+evaluationDependsOn(":libs:markdown")
+
 sourceSets {
     main {
         java {
@@ -292,6 +294,38 @@ def commonSystemProperties = [
     'appeng.tests': 'true',
 ]
 
+// NG hacks to add our deps to the legacy classpath
+// If anything changes here you have to delete the build folder for the neoforge:...:writeMinecraftClasspath task
+import net.neoforged.gradle.userdev.runtime.tasks.ClasspathSerializer
+
+def libSrcSets = [
+        project(":libs:markdown").sourceSets.main
+]
+
+def legacyCPLibs = [
+        "io.methvin:directory-watcher:${directory_watcher_version}",
+        "org.yaml:snakeyaml:${snakeyaml_version}",
+        "com.google.flatbuffers:flatbuffers-java:${flatbuffers_version}",
+        "org.bytedeco:ffmpeg-platform:6.0-1.5.9",
+]
+
+tasks.withType(ClasspathSerializer).configureEach {
+    legacyCPLibs.each { lib ->
+        def libArtifact = lib.split(":")[1]
+        def libVersion = lib.split(":")[2]
+        def libJar = libArtifact + "-" + libVersion + ".jar"
+
+        def libFile = project.configurations.runtimeClasspath.find({
+            return it.name.equals(libJar)
+        })
+
+        it.inputFiles.from libFile
+    }
+    libSrcSets.each { srcSet ->
+        it.inputFiles.from srcSet.output
+    }
+}
+
 def commonRunProperties = {
     workingDirectory = project.file('run')
 //    jvmArgs "--add-opens", "java.base/sun.security.util=ALL-UNNAMED"

diff --git a/gradle.properties b/gradle.properties
@@ -11,8 +11,8 @@ artifact_basename=appliedenergistics2-neoforge
 minecraft_release=1.20
 minecraft_version=1.20.2
 minecraft_version_range=[1.20.2,1.20.3)
-neoforge_version=20.2.3-beta
-neoforge_version_range=[20.2.3-beta,)
+neoforge_version=20.2.43-beta
+neoforge_version_range=[20.2.43-beta,)
 
 #########################################################
 # Provided APIs                                         #
@@ -55,7 +55,7 @@ org.gradle.daemon=false
 
 # Temp fix for Spotless / Remove Unused Imports:
 # https://github.com/diffplug/spotless/issues/834
-org.gradle.jvmargs=-Xmx2G \
+org.gradle.jvmargs=-Xmx4G \
   --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
   --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
   --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
@@ -16,7 +16,7 @@ pluginManagement {
         mavenCentral()
     }
     plugins {
-        id 'net.neoforged.gradle.userdev' version '7.0.33'
+        id 'net.neoforged.gradle.userdev' version '7.0.41'
         id 'com.diffplug.spotless' version '5.12.4'
         id 'io.github.juuxel.loom-quiltflower' version '1.10.0'
         id 'com.github.johnrengelman.shadow' version '7.0.0'

diff --git a/src/main/java/appeng/core/AppEngClient.java b/src/main/java/appeng/core/AppEngClient.java
@@ -281,7 +281,7 @@ public void modelRegistryEvent(RegisterGeometryLoaders event) {
     }
 
     private void wheelEvent(final InputEvent.MouseScrollingEvent me) {
-        if (me.getScrollDelta() == 0) {
+        if (me.getScrollDeltaY() == 0) {
             return;
         }
 
@@ -293,7 +293,7 @@ private void wheelEvent(final InputEvent.MouseScrollingEvent me) {
             final boolean offHand = player.getItemInHand(InteractionHand.OFF_HAND).getItem() instanceof IMouseWheelItem;
 
             if (mainHand || offHand) {
-                NetworkHandler.instance().sendToServer(new MouseWheelPacket(me.getScrollDelta() > 0));
+                NetworkHandler.instance().sendToServer(new MouseWheelPacket(me.getScrollDeltaY() > 0));
                 me.setCanceled(true);
             }
         }

diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -13,7 +13,9 @@ modId="ae2"
 version="0.0.0"
 displayName="Applied Energistics 2"
 description="A Mod about Matter, Energy and using them to conquer the world.."
-mixin="ae2.mixins.json"
+
+[[mixins]]
+config="ae2.mixins.json"
 
 [[dependencies.ae2]]
     modId="neoforge"

diff --git a/src/main/resources/ae2.mixins.json b/src/main/resources/ae2.mixins.json
@@ -2,7 +2,6 @@
   "required": true,
   "minVersion": "0.8.3",
   "package": "appeng.mixins",
-  "refmap": "ae2.mixins.refmap.json",
   "compatibilityLevel": "JAVA_11",
   "plugin": "appeng.mixins.ConfigPlugin",
   "mixins": [