fixed #61, well at least it doesn't dump error.

blackd · Dec 9, 2021 · 04c0351 · 04c0351
1 parent 0efd851
commit 04c0351
Show file tree

Hide file tree

Showing 20 changed files with 189 additions and 116 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,7 +10,7 @@ buildscript {
 }
 
 
-val versionObj = Version("1", "2", "0",
+val versionObj = Version("1", "2", "1",
                          preRelease = (System.getenv("IPNEXT_RELEASE") == null))
 
 
@@ -192,11 +192,14 @@ afterEvaluate {
 @Suppress("MemberVisibilityCanBePrivate")
 class Version(val major: String, val minor: String, val revision: String, val preRelease: Boolean = false) {
 
+    val gitHash
+        get() = getGitHash()
+
     override fun toString(): String {
         return if (!preRelease)
             "$major.$minor.$revision"
         else //Only use git hash if it's a prerelease.
-            "$major.$minor.$revision-BETA+C${getGitHash()}-SNAPSHOT"
+            "$major.$minor.$revision-BETA+C$gitHash-SNAPSHOT"
     }
 
     fun toCleanString(): String {

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -25,6 +25,10 @@ buildscript {
 dependencies {
     //"implementation"("com.github.jengelman.gradle.plugins:shadow:7.1.0")
     //implementation(kotlin("stdlib-jdk8"))
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.0")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0")
     implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.0")
 }
 val compileKotlin: KotlinCompile by tasks

diff --git a/changelog.md b/changelog.md
@@ -1,19 +1,20 @@
 <!-- latest begin -->
 
-### Support for Forge 1.18 is in *BETA STATE*
-PLEASE, IF SOMETHING DOESN'T WORK **DON'T COMPLAIN IN THE COMMENTS** REPORT AN ISSUE!
-
-### 1.2.0
-- added support for Loyalty enchanted items. Throwing a loyalty trident will not trigger refill to allow the thrown one to return to the same slot.
-- new auto refill feature. You can now allow non-enchanted items to break if their max durability is below a preset value.
-- native 1.18 version.
-
+### 1.2.1
+- fixes mode matching/all not moving all expected items.
+- fixed handling of overstacked items. Now we will just leave them in place.
+- forge 1.18 support looks stable enough 
 
 <!-- latest end -->
 
 
 <!-- rest begin -->
 
+### 1.2.0
+- added support for Loyalty enchanted items. Throwing a loyalty trident will not trigger refill to allow the thrown one to return to the same slot.
+- new auto refill feature. You can now allow non-enchanted items to break if their max durability is below a preset value.
+- native 1.18 version.
+
 ### 1.1.9
 - fixed locked slots behaviour when a chest or other container is opened and swipe drop/move is used.
 - native 1.18 version.
@@ -47,6 +48,7 @@ This is the last release of Inventory Profiles Next for Minecraft 1.14.x
 - some changes under the hood
 - added updates check. The check is done once you enter a word/connect ot a server and message is displayed if there is new version available.
 
+<!-- rest end -->
 
 ### 1.1.4
 - added 1.15+ and 1.14.1+ versions. Just to be on par with the old mod
@@ -135,4 +137,4 @@ This is the last release of Inventory Profiles Next for Minecraft 1.14.x
 [1]: https://discord.gg/23YCxmveUM
 [2]: https://img.shields.io/discord/861171785897738240?label=Discord&logo=discord&style=plastic
 
-<!-- rest end -->
+
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -22,6 +22,10 @@ dependencies {
     val antlrVersion = "4.9.3"
     "antlr"("org.antlr:antlr4:$antlrVersion")
     "implementation"("org.antlr:antlr4-runtime:$antlrVersion")
+    "shadedApi"("org.jetbrains.kotlin:kotlin-stdlib:1.6.0")
+    "shadedApi"("org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0")
+    "shadedApi"("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0")
+    "shadedApi"("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0")
     "implementation"("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.1")
     "compileOnlyApi"(group = "org.apache.logging.log4j",
                      name = "log4j-api",

diff --git a/common/src/main/resources/assets/inventoryprofilesnext/config/ModIntegrationHints.json b/common/src/main/resources/assets/inventoryprofilesnext/config/ModIntegrationHints.json
@@ -1,77 +1,120 @@
 {
-    "de.maxhenkel.camera.gui.ImageScreen": {
+    "de.maxhenkel.camera.gui.ImageScreen":                       {
         "ignore": true
     },
     "tfar.dankstorage.client.screens.AbstractDankStorageScreen": {
-        "ignore": true,
+        "ignore":     true,
         "playerOnly": true
     },
-    "tfar.dankstorage.container.DankMenu": {
-        "ignore": true,
+    "tfar.dankstorage.container.DankMenu":                       {
+        "ignore":     true,
         "playerOnly": true
     },
     "tfar.dankstorage.client.screens.PortableDankStorageScreen": {
-        "ignore": true,
+        "ignore":     true,
         "playerOnly": true
     },
-    "agap.main.LifeSupportScreen": {
-        "ignore": true,
+    "agap.main.LifeSupportScreen":                               {
+        "ignore":     true,
         "playerOnly": true
     },
-    "agap.main.PowerGenScreen": {
-        "ignore": true,
+    "agap.main.PowerGenScreen":                                  {
+        "ignore":     true,
         "playerOnly": true
     },
-    "agap.main.PortalBeamBlockScreen": {
-        "ignore": true,
+    "agap.main.PortalBeamBlockScreen":                           {
+        "ignore":     true,
         "playerOnly": true
     },
-    "agap.main.Machines.PackerScreen": {
-        "ignore": true,
+    "agap.main.Machines.PackerScreen":                           {
+        "ignore":     true,
         "playerOnly": true
     },
-    "agap.main.Machines.PressScreen": {
-        "ignore": true,
+    "agap.main.Machines.PressScreen":                            {
+        "ignore":     true,
         "playerOnly": true
     },
-    "agap.main.Machines.Machine1InputScreen": {
-        "ignore": true,
+    "agap.main.Machines.Machine1InputScreen":                    {
+        "ignore":     true,
         "playerOnly": true
     },
-    "agap.main.Machines.PowerFurnaceScreen": {
-        "ignore": true,
+    "agap.main.Machines.PowerFurnaceScreen":                     {
+        "ignore":     true,
         "playerOnly": true
     },
-    "agap.main.Machines.BatteryBlockScreen": {
-        "ignore": true,
+    "agap.main.Machines.BatteryBlockScreen":                     {
+        "ignore":     true,
         "playerOnly": true
     },
-    "agap.main.ElectrolyzerScreen": {
-        "ignore": true,
+    "agap.main.ElectrolyzerScreen":                              {
+        "ignore":     true,
         "playerOnly": true
     },
-    "agap.main.Machines.AutoConstructorScreen": {
-        "ignore": true,
+    "agap.main.Machines.AutoConstructorScreen":                  {
+        "ignore":     true,
         "playerOnly": true
     },
-    "agap.main.CatalyzerScreen": {
-        "ignore": true,
+    "agap.main.CatalyzerScreen":                                 {
+        "ignore":     true,
         "playerOnly": true
     },
-    "agap.main.RocketStationScreen": {
-        "ignore": true,
+    "agap.main.RocketStationScreen":                             {
+        "ignore":     true,
         "playerOnly": true
     },
-    "agap.main.StarshipControlScreen": {
-        "ignore": true,
+    "agap.main.StarshipControlScreen":                           {
+        "ignore":     true,
         "playerOnly": true
     },
-    "agap.main.ColonyCommandScreen": {
-        "ignore": true,
+    "agap.main.ColonyCommandScreen":                             {
+        "ignore":     true,
         "playerOnly": true
     },
-    "dev.cammiescorner.arcanus.client.screens.BookshelfScreen": {
-        "ignore": true,
+    "dev.cammiescorner.arcanus.client.screens.BookshelfScreen":  {
+        "ignore":     true,
         "playerOnly": true
+    },
+    "net.p3pp3rf1y.sophisticatedbackpacks.client.gui.BackpackScreen": {
+        "buttonHints": {
+            "MOVE_TO_PLAYER": {
+                "horizontalOffset": 30
+            },
+            "SORT" : {
+                "horizontalOffset": 30
+            },
+            "SORT_COLUMNS" : {
+                "horizontalOffset": 30
+            },
+            "SORT_ROWS" : {
+                "horizontalOffset": 30
+            },
+            "MOVE_TO_CONTAINER": {
+                "bottom": 2
+            }
+
+        }
+    },
+    "vazkii.quark.addons.oddities.client.screen.BackpackInventoryScreen": {
+        "buttonHints": {
+            "SORT" : {
+                "horizontalOffset": 1,
+                "bottom": 72
+            },
+            "SORT_COLUMNS" : {
+                "horizontalOffset": 13,
+                "bottom": 60
+            },
+            "SORT_ROWS" : {
+                "horizontalOffset": 13,
+                "bottom": 60
+            },
+            "CONTINUOUS_CRAFTING" : {
+                "bottom": 60
+            },
+            "MOVE_TO_CONTAINER": {
+                "horizontalOffset": 13,
+                "bottom": 60
+            }
+        }
     }
 }
diff --git a/description/description.md b/description/description.md
@@ -45,33 +45,11 @@ This mod will:
 
 ## Requirements
 
-- Forge 1.16.5 >= 36.1.32
+- Forge - always use the latest version for your minecraft version
 
-or
-
-- Forge 1.17.x >= 37.0.17
-
-or
-
-- Fabric Loader >= 0.11.6 (see [Updating Fabric](#updating-fabric))
+- Fabric Loader >= 0.11.6 
 - Mod Menu >= 2.0.2 - _optional_
 
-## Migrate from Inventory Profiles
-
-1. Move <span class="red"><strong>MINECRAFTHOME/config/inventoryprofiles</strong></span> somewhere
-2. Remove the old mod
-3. Install this mod
-4. Move back the <span class="red"><strong>inventoryprofiles</strong></span> folder from above
-5. Rename it to <span class="green"><strong>inventoryprofilesnext</strong></span>
-
-**Note:** If you're a Windows user, your **MINECRAFTHOME** is probably **%appdata%/.minecraft**
-
-## Updating Fabric
-
-For the official launcher make sure you don't have the game or the launcher running and follow [this guide](https://fabricmc.net/wiki/player:tutorials:install_mcl:windows)
-
-For the other launchers... really you should know how to do it :)
-
 ## Contributing
 
 If something doesn't work, please file an issue [here](https://github.com/blackd/Inventory-Profiles/issues)

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-7.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/platforms/fabric-1.15/build.gradle.kts b/platforms/fabric-1.15/build.gradle.kts
@@ -66,6 +66,11 @@ tasks.withType<JavaCompile> {
 
 dependencies {
     "shadedApi"(project(":common"))
+    "shadedApi"("org.jetbrains.kotlin:kotlin-stdlib:1.6.0")
+    "shadedApi"("org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0")
+    "shadedApi"("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0")
+    "shadedApi"("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0")
+
     "implementation"("com.guardsquare:proguard-gradle:7.1.1")
     minecraft("com.mojang:minecraft:1.15.2")
     mappings("net.fabricmc:yarn:1.15.2+build.17")

diff --git a/platforms/fabric-1.16/build.gradle.kts b/platforms/fabric-1.16/build.gradle.kts
@@ -70,6 +70,10 @@ configure<JavaPluginExtension> {
 
 dependencies {
     "shadedApi"(project(":common"))
+    "shadedApi"("org.jetbrains.kotlin:kotlin-stdlib:1.6.0")
+    "shadedApi"("org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0")
+    "shadedApi"("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0")
+    "shadedApi"("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0")
 
     implementation("com.guardsquare:proguard-gradle:7.1.1")
     minecraft("com.mojang:minecraft:1.16.5")

diff --git a/platforms/fabric-1.17/build.gradle.kts b/platforms/fabric-1.17/build.gradle.kts
@@ -68,6 +68,8 @@ group = "org.anti-ad.mc"
 
 dependencies {
     "shadedApi"(project(":common"))
+    "shadedApi"("org.jetbrains.kotlin:kotlin-stdlib:1.6.0")
+    "shadedApi"("org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0")
     implementation("com.guardsquare:proguard-gradle:7.1.1")
     minecraft("com.mojang:minecraft:$minecraft_version")
     mappings("net.fabricmc:yarn:$mappings_version:v2")

diff --git a/platforms/fabric-1.18/build.gradle.kts b/platforms/fabric-1.18/build.gradle.kts
@@ -63,6 +63,9 @@ compileKotlin.kotlinOptions {
 
 dependencies {
     "shadedApi"(project(":common"))
+    "shadedApi"("org.jetbrains.kotlin:kotlin-stdlib:1.6.0")
+    "shadedApi"("org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0")
+
     implementation("com.guardsquare:proguard-gradle:7.2.0-beta2")
     minecraft("com.mojang:minecraft:$minecraft_version")
     mappings("net.fabricmc:yarn:$mappings_version:v2")

diff --git a/platforms/forge-1.16/build.gradle.kts b/platforms/forge-1.16/build.gradle.kts
@@ -90,10 +90,10 @@ repositories {
 
 dependencies {
     "shadedApi"(project(":common"))
-    "implementation"("org.jetbrains.kotlin:kotlin-stdlib")
-    "implementation"("org.jetbrains.kotlin:kotlin-stdlib-common")
-    "implementation"("org.jetbrains.kotlin:kotlin-stdlib-jdk7")
-    "implementation"("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    "shadedApi"("org.jetbrains.kotlin:kotlin-stdlib:1.6.0")
+    "shadedApi"("org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0")
+    "shadedApi"("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0")
+    "shadedApi"("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0")
     "minecraft"("net.minecraftforge:forge:$minecraft_version-$forge_version")
     "annotationProcessor"("org.spongepowered:mixin:0.8.3-SNAPSHOT:processor")
 }

diff --git a/platforms/forge-1.17/build.gradle.kts b/platforms/forge-1.17/build.gradle.kts
@@ -96,8 +96,8 @@ repositories {
 dependencies {
     "shadedApi"(project(":common"))
 
-    "shadedApi"("org.jetbrains.kotlin:kotlin-stdlib:1.5.21")
-    "shadedApi"("org.jetbrains.kotlin:kotlin-stdlib-common:1.5.21")
+    "shadedApi"("org.jetbrains.kotlin:kotlin-stdlib:1.6.0")
+    "shadedApi"("org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0")
 
     //"implementation"("org.jetbrains.kotlin:kotlin-stdlib:1.5.21")
     //"implementation"("org.jetbrains.kotlin:kotlin-stdlib-common:1.5.21")