Update mixin extras

Patbox · Oct 16, 2023 · efa6473 · efa6473
1 parent 656382e
commit efa6473
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 14 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -12,11 +12,11 @@ fabric_version=0.83.0+1.20.1
 
 maven_group = eu.pb4
 
-mod_version = 0.5.15
+mod_version = 0.5.16
 
 minecraft_version_supported = ">=1.20-"
 
 packet_tweaker_version = 0.4.0+1.19.4
-mixin_extras_version = 0.2.0-rc.1
+mixin_extras_version = 0.2.0
 
 is_stable = true
diff --git a/polymer-blocks/build.gradle b/polymer-blocks/build.gradle
@@ -39,8 +39,9 @@ dependencies {
     //modCompileOnly "fr.catcore:server-translations-api:1.4.9+1.18.2-rc1"
 
     //modCompileOnly 'nl.theepicblock:PolyMc:PolyMc:5.1.0+1.19'
-    modCompileOnly ('com.github.TheEpicBlock:PolyMc:5.1.0')
-
+    modCompileOnly ('com.github.TheEpicBlock:PolyMc:5.4.0') {
+        exclude(group: "org.quiltmc", module: "quilt-loader")
+    }
     testmodImplementation sourceSets.main.output
     //testmodImplementation project(":polymer-core").sourceSets.testmod.output
 }

diff --git a/polymer-common/src/main/java/eu/pb4/polymer/common/impl/CommonImpl.java b/polymer-common/src/main/java/eu/pb4/polymer/common/impl/CommonImpl.java
@@ -146,7 +146,6 @@ public static <T> T loadConfig(String name, Class<T> clazz) {
         try {
             var obj = clazz.getConstructor().newInstance();
             saveConfig(name, obj);
-
             return obj;
         } catch (Exception e) {
             LOGGER.error("Invalid config class! " + clazz.toString());

diff --git a/polymer-core/build.gradle b/polymer-core/build.gradle
@@ -47,7 +47,9 @@ dependencies {
     modCompileOnly('maven.modrinth:lithium:mc1.20.1-0.11.2')
 
     //modCompileOnly ('nl.theepicblock:PolyMc:5.1.0+1.19')
-    modCompileOnly('com.github.TheEpicBlock:PolyMc:5.1.0')
+    modCompileOnly('com.github.TheEpicBlock:PolyMc:5.4.0') {
+        exclude(group: "org.quiltmc", module: "quilt-loader")
+    }
 
 
     modCompileOnly /*modLocalRuntime*/("curse.maven:jade-324717:4328555")
@@ -64,7 +66,7 @@ dependencies {
 
     //modCompileOnlyApi modLocalRuntime("mezz.jei:jei-1.19-common:11.0.0.206")
     //modCompileOnlyApi modLocalRuntime("mezz.jei:jei-1.19-fabric:11.0.0.206")
-    modCompileOnly /*modRuntimeOnly*/("maven.modrinth:jei:12.2.0.17")
+    modCompileOnly /*modRuntimeOnly*/("maven.modrinth:jei:lIRFslED")
 
     //modCompileOnly ("mcjty.theoneprobe:theoneprobe-fabric:1.18.2-5.0.9")
     //modRuntimeOnly ("mcjty.theoneprobe:theoneprobe-fabric:1.18.2-5.0.9")
@@ -81,10 +83,12 @@ dependencies {
     modCompileOnly("xyz.nucleoid:server-translations-api:2.0.0-beta.2+1.19.4-pre2")
     modLocalRuntime("xyz.nucleoid:server-translations-api:2.0.0-beta.2+1.19.4-pre2")
 
-    modCompileOnly 'com.github.iPortalTeam.ImmersivePortalsMod:imm_ptl_core:v3.0.2-mc1.20'
-    //modLocalRuntime 'com.github.iPortalTeam.ImmersivePortalsMod:imm_ptl_core:v3.0.2-mc1.20'
-    modCompileOnly 'com.github.iPortalTeam.ImmersivePortalsMod:q_misc_util:v3.0.2-mc1.20'
-    //modLocalRuntime 'com.github.iPortalTeam.ImmersivePortalsMod:q_misc_util:v3.0.2-mc1.20'
+    modCompileOnly('com.github.iPortalTeam.ImmersivePortalsMod:imm_ptl_core:v3.3.3-mc1.20.1') {
+        exclude(group: "com.github.llamalad7.mixinextras")
+    }
+    modCompileOnly('com.github.iPortalTeam.ImmersivePortalsMod:q_misc_util:v3.3.3-mc1.20.1') {
+        exclude(group: "com.github.llamalad7.mixinextras")
+    }
 
     //modLocalRuntime 'maven.modrinth:immersiveportals:v3.0.2-mc1.20'
     // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.

diff --git a/...re/src/testmod/resources/data/polymertest/recipes/stone_slab_from_stone_stonecutting.json b/...re/src/testmod/resources/data/polymertest/recipes/stone_slab_from_stone_stonecutting.json
@@ -0,0 +1,8 @@
+{
+  "type": "minecraft:stonecutting",
+  "count": 2,
+  "ingredient": {
+    "item": "minecraft:stone"
+  },
+  "result": "test:potato_block"
+}
diff --git a/polymer-resource-pack/build.gradle b/polymer-resource-pack/build.gradle
@@ -15,7 +15,9 @@ loom {
 
 dependencies {
     //modCompileOnly ('nl.theepicblock:PolyMc:5.1.0+1.19')
-    modCompileOnly ('com.github.TheEpicBlock:PolyMc:5.1.0')
+    modCompileOnly ('com.github.TheEpicBlock:PolyMc:5.4.0') {
+        exclude(group: "org.quiltmc", module: "quilt-loader")
+    }
     api include(project(path: ':polymer-common', configuration: 'namedElements'))
 }
 

diff --git a/polymer-virtual-entity/build.gradle b/polymer-virtual-entity/build.gradle
@@ -17,8 +17,12 @@ dependencies {
     //modCompileOnly ('nl.theepicblock:PolyMc:5.1.0+1.19')
     api include(project(path: ':polymer-common', configuration: 'namedElements'))
 
-    modCompileOnly 'com.github.iPortalTeam.ImmersivePortalsMod:imm_ptl_core:v3.0.2-mc1.20'
-    modCompileOnly 'com.github.iPortalTeam.ImmersivePortalsMod:q_misc_util:v3.0.2-mc1.20'
+    modCompileOnly('com.github.iPortalTeam.ImmersivePortalsMod:imm_ptl_core:v3.3.3-mc1.20.1') {
+        exclude(group: "com.github.llamalad7.mixinextras")
+    }
+    modCompileOnly('com.github.iPortalTeam.ImmersivePortalsMod:q_misc_util:v3.3.3-mc1.20.1') {
+        exclude(group: "com.github.llamalad7.mixinextras")
+    }
 }
 
 afterEvaluate {