Merge pull request #57 from EssentialGG/feature/1.15.2-removal-cleanu…

…p and EssentialGG/feature/1.20.2-fabric Build: Remove 1.15.2 entries from api file Build: Port to 1.20.2-rc2 Fabric
EssentialGG · Sep 19, 2023 · 1ac9ca2 · 1ac9ca2
2 parents 151fbcf + 2b57f08
commit 1ac9ca2
Show file tree

Hide file tree

Showing 7 changed files with 143 additions and 146 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -55,8 +55,11 @@ jobs:
         # BuildSharedServiceManager) will not release any memory until all scheduled remapJar tasks have complete.
         run: |
           ./gradlew clean --stacktrace
+          ./gradlew :{1.{8.9,12.2}-forge,1.{19,19.1}-fabric,1.{16.2,17.1,18.1}-{forge,fabric}}:jar --stacktrace
+          ./gradlew :{1.20-fabric,1.{19.2,19.3,19.4,20.1}-{forge,fabric}}:jar --stacktrace
           ./gradlew jar --stacktrace
           ./gradlew :{1.{8.9,12.2}-forge,1.{19,19.1}-fabric,1.{16.2,17.1,18.1}-{forge,fabric}}:build --stacktrace
+          ./gradlew :{1.20-fabric,1.{19.2,19.3,19.4,20.1}-{forge,fabric}}:build --stacktrace
           ./gradlew build --stacktrace
 
       - name: Publish

diff --git a/api/UniversalCraft.api b/api/UniversalCraft.api
diff --git a/root.gradle.kts b/root.gradle.kts
@@ -9,6 +9,7 @@ plugins {
 version = versionFromBuildIdAndBranch()
 
 preprocess {
+    val fabric12002 = createNode("1.20.2-fabric", 12002, "yarn")
     val forge12001 = createNode("1.20.1-forge", 12001, "srg")
     val fabric12001 = createNode("1.20.1-fabric", 12001, "yarn")
     val fabric12000 = createNode("1.20-fabric", 12000, "yarn")
@@ -29,6 +30,7 @@ preprocess {
     val forge11202 = createNode("1.12.2-forge", 11202, "srg")
     val forge10809 = createNode("1.8.9-forge", 10809, "srg")
 
+    fabric12002.link(fabric12001)
     forge12001.link(fabric12001)
     fabric12001.link(fabric12000)
     fabric12000.link(fabric11904)

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -37,6 +37,7 @@ listOf(
     "1.20-fabric",
     "1.20.1-fabric",
     "1.20.1-forge",
+    "1.20.2-fabric",
 ).forEach { version ->
     include(":$version")
     project(":$version").apply {

diff --git a/src/main/kotlin/gg/essential/universal/UScreen.kt b/src/main/kotlin/gg/essential/universal/UScreen.kt
@@ -64,6 +64,7 @@ abstract class UScreen(
     //$$ private var lastDraggedDy = -1.0
     //$$ private var lastScrolledX = -1.0
     //$$ private var lastScrolledY = -1.0
+    //$$ private var lastScrolledDX = 0.0
     //$$
     //$$ final override fun init() {
     //$$     updateGuiScale()
@@ -124,7 +125,12 @@ abstract class UScreen(
     //$$     return false
     //$$ }
     //$$
+    //#if MC>=12002
+    //$$ override fun mouseScrolled(mouseX: Double, mouseY: Double, horizontalAmount: Double, delta: Double): Boolean {
+    //$$     lastScrolledDX = horizontalAmount
+    //#else
     //$$ final override fun mouseScrolled(mouseX: Double, mouseY: Double, delta: Double): Boolean {
+    //#endif
     //$$     lastScrolledX = mouseX
     //$$     lastScrolledY = mouseY
     //$$     onMouseScrolled(delta)
@@ -140,7 +146,17 @@ abstract class UScreen(
     //$$ }
     //$$
     //#if MC>=12000
+    //#if MC>=12002
+    //$$ private var lastBackgroundMouseX = 0
+    //$$ private var lastBackgroundMouseY = 0
+    //$$ private var lastBackgroundDelta = 0f
+    //$$ final override fun renderBackground(context: DrawContext, mouseX: Int, mouseY: Int, delta: Float) {
+    //$$     lastBackgroundMouseX = mouseX
+    //$$     lastBackgroundMouseY = mouseY
+    //$$     lastBackgroundDelta = delta
+    //#else
     //$$ final override fun renderBackground(context: DrawContext) {
+    //#endif
     //$$     drawContexts.add(context)
     //$$     onDrawBackgroundCompat(UMatrixStack(context.matrices), 0)
     //$$     drawContexts.removeLast()
@@ -321,7 +337,9 @@ abstract class UScreen(
     }
 
     open fun onMouseScrolled(delta: Double) {
-        //#if MC>=11502
+        //#if MC>=12002
+        //$$ super.mouseScrolled(lastScrolledX, lastScrolledY, lastScrolledDX, delta)
+        //#elseif MC>=11502
         //$$ super.mouseScrolled(lastScrolledX, lastScrolledY, delta)
         //#endif
     }
@@ -345,7 +363,11 @@ abstract class UScreen(
     open fun onDrawBackground(matrixStack: UMatrixStack, tint: Int) {
         //#if MC>=12000
         //$$ withDrawContext(matrixStack) { drawContext ->
-        //$$     super.renderBackground(drawContext)
+            //#if MC>=12002
+            //$$ super.renderBackground(drawContext, lastBackgroundMouseX, lastBackgroundMouseY, lastBackgroundDelta)
+            //#else
+            //$$ super.renderBackground(drawContext)
+            //#endif
         //$$ }
         //#elseif MC>=11904
         //$$ super.renderBackground(matrixStack.toMC())

diff --git a/src/main/kotlin/gg/essential/universal/wrappers/UPlayer.kt b/src/main/kotlin/gg/essential/universal/wrappers/UPlayer.kt
@@ -29,7 +29,11 @@ object UPlayer {
 
     @JvmStatic
     fun getUUID(): UUID {
+        //#if MC>=12002
+        //$$ return UMinecraft.getMinecraft().session.uuidOrNull!!
+        //#else
         return UMinecraft.getMinecraft().session.profile.id
+        //#endif
     }
 
     @JvmStatic

diff --git a/versions/1.20.2-fabric/gradle.properties b/versions/1.20.2-fabric/gradle.properties
@@ -0,0 +1,3 @@
+essential.defaults.loom.minecraft=com.mojang:minecraft:1.20.2-rc2
+essential.defaults.loom.mappings=net.fabricmc:yarn:1.20.2-rc2+build.1:v2
+essential.defaults.loom.fabric-loader=net.fabricmc:fabric-loader:0.14.22