Bring the 1.16 branch up to speed.

blackd · Jun 24, 2021 · 71641c2 · 71641c2
1 parent 15ee894
commit 71641c2
Show file tree

Hide file tree

Showing 47 changed files with 863 additions and 1,319 deletions.
diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -5,9 +5,9 @@ name: CI
 
 on:
   push:
-    branches: [ fabric-1.17 ]
+    branches: [ fabric_1.16 ]
   pull_request:
-    branches: [ fabric-1.17 ]
+    branches: [ fabric_1.16 ]
 
 jobs:
   build:

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -29,8 +29,8 @@ repositories {
 }
 
 java {
-  sourceCompatibility = JavaVersion.VERSION_16
-  targetCompatibility = JavaVersion.VERSION_16
+  sourceCompatibility = JavaVersion.VERSION_1_8
+  targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 base {
@@ -50,7 +50,7 @@ tasks.withType<JavaCompile> {
 
 tasks.compileKotlin {
   kotlinOptions {
-    jvmTarget = "15"
+    jvmTarget = "1.8"
     freeCompilerArgs = listOf("-Xopt-in=kotlin.ExperimentalStdlibApi")
   }
 }
@@ -158,8 +158,8 @@ tasks.shadowJar {
   dependencies {
     include(dependency("org.jetbrains.kotlin:kotlin-stdlib"))
     include(dependency("org.jetbrains.kotlin:kotlin-stdlib-common"))
-    //include(dependency("org.jetbrains.kotlin:kotlin-stdlib-jdk7"))
-    //include(dependency("org.jetbrains.kotlin:kotlin-stdlib-jdk8"))
+    include(dependency("org.jetbrains.kotlin:kotlin-stdlib-jdk7"))
+    include(dependency("org.jetbrains.kotlin:kotlin-stdlib-jdk8"))
     include(dependency("org.antlr:antlr4-runtime"))
   }
   relocate("kotlin", "org.anti_ad.mc.common.embedded.kotlin")
@@ -175,6 +175,7 @@ tasks.shadowJar {
 
 val proguard by tasks.registering(ProGuardTask::class) {
   configuration("proguard.txt")
+  verbose()
 
   injars("build/libs/$buildBaseName-all.jar")
   outjars("build/libs/$buildBaseName-all-proguard.jar")

diff --git a/buildSrc/src/main/kotlin/GradleProperties.kt b/buildSrc/src/main/kotlin/GradleProperties.kt
@@ -6,9 +6,9 @@ const val mod_version = "0.7.3"
 const val maven_group = "org.anti_ad.mc"
 const val mod_id = "inventoryprofilesnext"
 
-const val minecraft_version = "1.17"
+const val minecraft_version = "1.16.5"
 
-val supported_minecraft_versions = arrayOf("1.17", "1.17.1-pre1")
+val supported_minecraft_versions = arrayOf("1.15.4", "1.16.5")
 
 // ============
 // mod loader
@@ -22,15 +22,15 @@ const val mod_loader = "fabric"
 
 // Fabric Properties
 // Check these on https://modmuss50.me/fabric.html
-const val yarn_mappings = "1.17+build.5:v2"
+const val yarn_mappings = "1.16.5+build.9:v2"
 const val loader_version = "0.11.6"
 
-const val loom_version = "0.8.9"
+const val loom_version = "0.7.32"
 
-const val fabric_version = "0.35.2+1.17"
+const val fabric_version = "0.36.0+1.16"
 
 // Dependencies
 // currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
 //  fabric_version=0.13.1+build.370-1.16
 // https://maven.fabricmc.net/io/github/prospector/modmenu/
-const val mod_menu_version = "2.0.2"
+const val mod_menu_version = "1.16.9"
diff --git a/proguard.txt b/proguard.txt
@@ -1,5 +1,5 @@
-#-libraryjars <java.home>/lib/rt.jar
--libraryjars  <java.home>/jmods/java.base.jmod(!**.jar;!module-info.class)
+-libraryjars <java.home>/lib/rt.jar
+#-libraryjars  <java.home>/jmods/java.base.jmod(!**.jar;!module-info.class)
 -keep class !org.anti_ad.mc.common.embedded.** { *; }
 #-ignorewarnings
 -optimizationpasses 9 # (828K -> 811K)

diff --git a/src/main/java/org/anti_ad/mc/common/gui/screen/BaseScreen.kt b/src/main/java/org/anti_ad/mc/common/gui/screen/BaseScreen.kt
@@ -17,14 +17,18 @@ import org.anti_ad.mc.common.vanilla.render.rStandardGlState
 abstract class BaseScreen(text: Text) : Screen(text) {
     constructor() : this(LiteralText(""))
 
+    var isClosing: Boolean = false
+
     var parent: Screen? = null
     val titleString: String
         get() = this.title.string // todo .asFormattedString()
     open val screenInfo
         get() = ScreenInfo.default
 
     open fun closeScreen() {
+        this.isClosing = true
         VanillaUtil.openScreenNullable(parent)
+        this.isClosing = false
     }
 
     fun hasParent(screen: Screen): Boolean {
@@ -81,8 +85,8 @@ abstract class BaseScreen(text: Text) : Screen(text) {
                         i: Int,
                         j: Int,
                         f: Float) {
-        //rMatrixStack = matrixStack ?: MatrixStack().also { Log.debug("null matrixStack") }
-        rMatrixStack = matrixStack ?: RenderSystem.getModelViewStack().also { Log.debug("null matrixStack") }
+        rMatrixStack = matrixStack ?: MatrixStack().also { Log.debug("null matrixStack") }
+        //rMatrixStack = matrixStack ?: RenderSystem.getModelViewStack().also { Log.debug("null matrixStack") }
         render(i,
                j,
                f)
@@ -93,7 +97,10 @@ abstract class BaseScreen(text: Text) : Screen(text) {
     // ============
     final override fun isPauseScreen(): Boolean = screenInfo.isPauseScreen
     final override fun onClose() {
-        closeScreen()
+        if (!isClosing) {
+            closeScreen()
+        }
+        isClosing = false
     }
 
     // ============

diff --git a/src/main/java/org/anti_ad/mc/common/gui/widgets/ScrollableContainerWidget.kt b/src/main/java/org/anti_ad/mc/common/gui/widgets/ScrollableContainerWidget.kt
@@ -1,6 +1,5 @@
 package org.anti_ad.mc.common.gui.widgets
 
-import org.anti_ad.mc.common.Log
 import org.anti_ad.mc.common.gui.widget.AnchorStyles
 import org.anti_ad.mc.common.gui.widget.Overflow.HIDDEN
 import org.anti_ad.mc.common.math2d.Rectangle

diff --git a/src/main/java/org/anti_ad/mc/common/gui/widgets/VanillaWidgets.kt b/src/main/java/org/anti_ad/mc/common/gui/widgets/VanillaWidgets.kt
@@ -1,5 +1,7 @@
 package org.anti_ad.mc.common.gui.widgets
 
+import net.minecraft.client.util.math.MatrixStack
+import net.minecraft.util.math.MathHelper
 import org.anti_ad.mc.common.math2d.Rectangle
 import org.anti_ad.mc.common.vanilla.Vanilla
 import org.anti_ad.mc.common.vanilla.alias.ClickableWidget
@@ -9,8 +11,6 @@ import org.anti_ad.mc.common.vanilla.render.rDrawDynamicSizeSprite
 import org.anti_ad.mc.common.vanilla.render.rMatrixStack
 import org.anti_ad.mc.common.vanilla.render.rStandardGlState
 import org.anti_ad.mc.common.vanilla.render.rVanillaButtonSprite
-import net.minecraft.client.util.math.MatrixStack
-import net.minecraft.util.math.MathHelper
 import org.anti_ad.mc.common.vanilla.alias.SliderWidget as VanillaSliderWidget
 import org.anti_ad.mc.common.vanilla.alias.TextFieldWidget as VanillaTextFieldWidget
 
@@ -165,10 +165,11 @@ private class CustomVanillaSliderWidget(val minValue: Double,
                                absoluteBounds)
 
         // ref: AbstractButtonWidget.renderButton()
-        renderBackground(matrixStack,
-                         Vanilla.mc(),
-                         i,
-                         j)
+        //renderBackground(
+        renderBg(matrixStack,
+                 Vanilla.mc(),
+                 i,
+                 j)
 //    val l = if (active) 16777215 else 10526880
         val l = if (active) if (hovered) 16777120 else 14737632 else 10526880
         drawCenteredText(

diff --git a/src/main/java/org/anti_ad/mc/common/mixin/MixinKeyboard.java b/src/main/java/org/anti_ad/mc/common/mixin/MixinKeyboard.java
@@ -1,10 +1,10 @@
 package org.anti_ad.mc.common.mixin;
 
+import net.minecraft.client.Keyboard;
+import net.minecraft.client.gui.screen.Screen;
 import org.anti_ad.mc.common.input.GlobalInputHandler;
 import org.anti_ad.mc.common.input.GlobalScreenEventListener;
 import org.anti_ad.mc.common.vanilla.Vanilla;
-import net.minecraft.client.Keyboard;
-import net.minecraft.client.gui.screen.Screen;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;

diff --git a/src/main/java/org/anti_ad/mc/common/mixin/MixinMouse.java b/src/main/java/org/anti_ad/mc/common/mixin/MixinMouse.java
@@ -1,10 +1,10 @@
 package org.anti_ad.mc.common.mixin;
 
+import net.minecraft.client.Mouse;
+import net.minecraft.client.gui.screen.Screen;
 import org.anti_ad.mc.common.input.GlobalInputHandler;
 import org.anti_ad.mc.common.input.GlobalScreenEventListener;
 import org.anti_ad.mc.common.vanilla.Vanilla;
-import net.minecraft.client.Mouse;
-import net.minecraft.client.gui.screen.Screen;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

diff --git a/src/main/java/org/anti_ad/mc/common/util/Node.kt b/src/main/java/org/anti_ad/mc/common/util/Node.kt
@@ -52,4 +52,5 @@ class Node<T>(val value: T) {
             Log.unindent()
         }
     }
+
 }
diff --git a/src/main/java/org/anti_ad/mc/common/vanilla/alias/gui.kt b/src/main/java/org/anti_ad/mc/common/vanilla/alias/gui.kt
@@ -3,16 +3,16 @@ package org.anti_ad.mc.common.vanilla.alias
 import net.minecraft.client.gui.screen.Screen
 import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen
 import net.minecraft.client.gui.screen.ingame.HandledScreen
-import net.minecraft.client.gui.widget.ClickableWidget
-import net.minecraft.client.gui.Selectable;
+import net.minecraft.client.gui.widget.AbstractButtonWidget
+//import net.minecraft.client.gui.Selectable;
 import net.minecraft.client.gui.widget.SliderWidget
 import net.minecraft.client.gui.widget.TextFieldWidget
 
 typealias Screen = Screen
 typealias ContainerScreen<T> = HandledScreen<T>
 typealias CreativeInventoryScreen = CreativeInventoryScreen
 
-typealias ClickableWidget = ClickableWidget
-typealias Selectable = Selectable
+typealias ClickableWidget = AbstractButtonWidget
+//typealias Selectable = Selectable
 typealias SliderWidget = SliderWidget
 typealias TextFieldWidget = TextFieldWidget
diff --git a/src/main/java/org/anti_ad/mc/common/vanilla/alias/item.kt b/src/main/java/org/anti_ad/mc/common/vanilla/alias/item.kt
@@ -7,15 +7,13 @@ import net.minecraft.item.Item
 import net.minecraft.item.ItemGroup
 import net.minecraft.item.ItemStack
 import net.minecraft.item.Items
-import net.minecraft.nbt.AbstractNbtList
-import net.minecraft.nbt.AbstractNbtNumber
-import net.minecraft.nbt.NbtCompound
+import net.minecraft.nbt.*
 import net.minecraft.nbt.NbtHelper
 import net.minecraft.nbt.StringNbtReader
 import net.minecraft.potion.PotionUtil
 import net.minecraft.tag.ItemTags
 import net.minecraft.tag.TagGroup
-import net.minecraft.nbt.NbtElement
+import net.minecraft.nbt.Tag as NbtTag
 import net.minecraft.tag.Tag as TagTag
 
 typealias Item = Item
@@ -32,11 +30,11 @@ typealias TagGroup<T> = TagGroup<T>
 // nbt
 // ============
 
-typealias NbtCompound = NbtCompound
-typealias NbtElement = NbtElement
+typealias NbtCompound = CompoundTag
+typealias NbtElement = NbtTag
 
-typealias AbstractNbtNumber = AbstractNbtNumber
-typealias AbstractNbtList<T> = AbstractNbtList<T>
+typealias AbstractNbtNumber = AbstractNumberTag
+typealias AbstractNbtList<T> = AbstractListTag<T>
 
 typealias NbtPathArgumentType = NbtPathArgumentType
 typealias NbtPathArgumentTypeNbtPath = NbtPathArgumentType.NbtPath

diff --git a/src/main/java/org/anti_ad/mc/common/vanilla/alias/render.kt b/src/main/java/org/anti_ad/mc/common/vanilla/alias/render.kt
@@ -10,6 +10,8 @@ import net.minecraft.text.LiteralText
 import net.minecraft.text.Text
 import net.minecraft.text.TranslatableText
 
+import net.minecraft.client.gui.widget.ButtonWidget
+
 typealias Text = Text
 typealias LiteralText = LiteralText
 typealias TranslatableText = TranslatableText