0.6.10b

Fixed crash on Quilt (Closes #475)
tom5454 · Aug 15, 2023 · e7d6275 · e7d6275
1 parent 364d8fd
commit e7d6275
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 16 deletions.
diff --git a/Blockbench/README.MD b/Blockbench/README.MD
@@ -1,8 +1,8 @@
 # Customizable Player Models Blockbench Plugin  
 **This plugin is in beta, some features are not supported yet**  
-- Animations only work from Blockbench to CPM (you can't edit CPM animations yet)  
+- CPM animations may break when importing  
 
-Tested with Blockbench desktop 4.7.4 portable
+Tested with Blockbench desktop 4.8.1 portable
 
 If you find a bug report it here [Bugtracker](https://github.com/tom5454/CustomPlayerModels/issues) / Click on issues, and create an issue with screenshots and your blockbench project attached in a .zip file.  
 

diff --git a/CustomPlayerModelsFabric-1.20.2/src/main/resources/cpm.mixins.of.json b/CustomPlayerModelsFabric-1.20.2/src/main/resources/cpm.mixins.of.json
@@ -4,14 +4,13 @@
   "package": "com.tom.cpm.mixin.of",
   "plugin": "com.tom.cpm.mixinplugin.CPMMixinPlugin",
   "compatibilityLevel": "JAVA_17",
-  "refmap": "CustomPlayerModels-Fabric-1.20-refmap.json",
+  "refmap": "CustomPlayerModels-Fabric-1.20.2-refmap.json",
   "mixins": [
   ],
   "client": [
     "AbstractTextureMixin_OF",
     "ModelPartMixin_OF",
-    "BlockEntityWithoutLevelRendererMixinFabric_OF",
-	"VRArmRendererMixin_VR"
+    "BlockEntityWithoutLevelRendererMixinFabric_OF"
   ],
   "injectors": {
     "defaultRequire": 1

diff --git a/CustomPlayerModelsQuilt-1.20/build.gradle b/CustomPlayerModelsQuilt-1.20/build.gradle
@@ -42,10 +42,12 @@ dependencies {
 
 	modImplementation("com.terraformersmc:modmenu:7.1.0") {
         exclude(group: "net.fabricmc.fabric-api")
+        exclude(group: "net.fabricmc")
     }
 
 	modImplementation ('com.github.Virtuoel:Pehkui:3.7.5') {
         exclude(group: "net.fabricmc.fabric-api")
+        exclude(group: "net.fabricmc")
     }
 
 	compileOnly files("../CustomPlayerModels-1.20/of.jar")

diff --git a/CustomPlayerModelsQuilt-1.20/gradle.properties b/CustomPlayerModelsQuilt-1.20/gradle.properties
@@ -2,6 +2,6 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Mod Properties
-mod_version=0.6.10a
+mod_version=0.6.10b
 maven_group = com.tom
 archives_base_name = CustomPlayerModels-Quilt-1.20
diff --git a/CustomPlayerModelsQuilt-1.20/gradle/libs.versions.toml b/CustomPlayerModelsQuilt-1.20/gradle/libs.versions.toml
@@ -1,10 +1,10 @@
 [versions]
 # The latest versions are available at https://lambdaurora.dev/tools/import_quilt.html
 minecraft = "1.20.1"
-quilt_mappings = "1.20.1+build.1"
-quilt_loader = "0.19.1"
+quilt_mappings = "1.20.1+build.23"
+quilt_loader = "0.19.2"
 
-quilted_fabric_api = "7.1.0+0.86.1-1.20.1"
+quilted_fabric_api = "7.1.1+0.86.1-1.20.1"
 
 [libraries]
 minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
@@ -19,4 +19,4 @@ quilted_fabric_api_deprecated = { module = "org.quiltmc.quilted-fabric-api:quilt
 quilted_fabric_api = ["quilted_fabric_api", "quilted_fabric_api_deprecated"]
 
 [plugins]
-quilt_loom = { id = "org.quiltmc.loom", version = "1.2.+" }
+quilt_loom = { id = "org.quiltmc.loom", version = "1.3.+" }
diff --git a/CustomPlayerModelsQuilt-1.20/src/main/resources/cpm.mixins.of.json b/CustomPlayerModelsQuilt-1.20/src/main/resources/cpm.mixins.of.json
@@ -4,7 +4,7 @@
   "package": "com.tom.cpm.mixin.of",
   "plugin": "com.tom.cpm.mixinplugin.CPMMixinPlugin",
   "compatibilityLevel": "JAVA_17",
-  "refmap": "CustomPlayerModels-Fabric-1.20-refmap.json",
+  "refmap": "CustomPlayerModels-Quilt-1.20-refmap.json",
   "mixins": [
   ],
   "client": [

diff --git a/CustomPlayerModelsQuilt-1.20/src/main/resources/quilt.mod.json b/CustomPlayerModelsQuilt-1.20/src/main/resources/quilt.mod.json
@@ -48,6 +48,6 @@
 			}
 		]
 	},
-	"accessWidener": "cpm.accesswidener",
+	"access_widener": "cpm.accesswidener",
 	"mixin": "cpm.mixins.json"
 }
diff --git a/version-check.json b/version-check.json
@@ -41,8 +41,8 @@
     "1.20.1-latest": "0.6.10a",
     "1.20.1-fabric-latest": "0.6.10a",
     "1.20.2-fabric-latest": "0.6.10a",
-    "1.20-quilt-latest": "0.6.10a",
-    "1.20.1-quilt-latest": "0.6.10a"
+    "1.20-quilt-latest": "0.6.10b",
+    "1.20.1-quilt-latest": "0.6.10b"
   },
   "1.12.2": {
     "0.0.5a": "First release",
@@ -983,9 +983,11 @@
     "0.6.10a": "Added: set custom icon for .cpmmodel files\nAdded item and block tag system\n- Only available through OSC for now\nNew animation: Light Level\nPorted to Quilt 1.20\nPorted to Fabric 23w32a\n\nUpdated ViveCraft support\nUpdated Chinese Translation (#457)\nAdded Spanish translations (#466)\nFixed text fields not rendering correctly on 1.20 (Closes #461)\nFixed rounding and made functions runnable in spinners (#456)\nFixed color picker not rendering correctly on 1.20\nFixed pencil not working correctly on 1.20\nFixed render scale effecting part lighting"
   },
   "1.20-quilt": {
-    "0.6.10a": "Added: set custom icon for .cpmmodel files\nAdded item and block tag system\n- Only available through OSC for now\nNew animation: Light Level\nPorted to Quilt 1.20\nPorted to Fabric 23w32a\n\nUpdated ViveCraft support\nUpdated Chinese Translation (#457)\nAdded Spanish translations (#466)\nFixed text fields not rendering correctly on 1.20 (Closes #461)\nFixed rounding and made functions runnable in spinners (#456)\nFixed color picker not rendering correctly on 1.20\nFixed pencil not working correctly on 1.20\nFixed render scale effecting part lighting"
+    "0.6.10a": "Added: set custom icon for .cpmmodel files\nAdded item and block tag system\n- Only available through OSC for now\nNew animation: Light Level\nPorted to Quilt 1.20\nPorted to Fabric 23w32a\n\nUpdated ViveCraft support\nUpdated Chinese Translation (#457)\nAdded Spanish translations (#466)\nFixed text fields not rendering correctly on 1.20 (Closes #461)\nFixed rounding and made functions runnable in spinners (#456)\nFixed color picker not rendering correctly on 1.20\nFixed pencil not working correctly on 1.20\nFixed render scale effecting part lighting",
+    "0.6.10b": "Fixed crash on Quilt (Closes #475)"
   },
   "1.20.1-quilt": {
-    "0.6.10a": "Added: set custom icon for .cpmmodel files\nAdded item and block tag system\n- Only available through OSC for now\nNew animation: Light Level\nPorted to Quilt 1.20\nPorted to Fabric 23w32a\n\nUpdated ViveCraft support\nUpdated Chinese Translation (#457)\nAdded Spanish translations (#466)\nFixed text fields not rendering correctly on 1.20 (Closes #461)\nFixed rounding and made functions runnable in spinners (#456)\nFixed color picker not rendering correctly on 1.20\nFixed pencil not working correctly on 1.20\nFixed render scale effecting part lighting"
+    "0.6.10a": "Added: set custom icon for .cpmmodel files\nAdded item and block tag system\n- Only available through OSC for now\nNew animation: Light Level\nPorted to Quilt 1.20\nPorted to Fabric 23w32a\n\nUpdated ViveCraft support\nUpdated Chinese Translation (#457)\nAdded Spanish translations (#466)\nFixed text fields not rendering correctly on 1.20 (Closes #461)\nFixed rounding and made functions runnable in spinners (#456)\nFixed color picker not rendering correctly on 1.20\nFixed pencil not working correctly on 1.20\nFixed render scale effecting part lighting",
+    "0.6.10b": "Fixed crash on Quilt (Closes #475)"
   }
 }