From efa6473635db55e41e6c3a6c8c330f1500c3734a Mon Sep 17 00:00:00 2001 From: Patbox <39821509+Patbox@users.noreply.github.com> Date: Mon, 16 Oct 2023 16:16:39 +0200 Subject: [PATCH] Update mixin extras --- gradle.properties | 4 ++-- polymer-blocks/build.gradle | 5 +++-- .../eu/pb4/polymer/common/impl/CommonImpl.java | 1 - polymer-core/build.gradle | 16 ++++++++++------ .../stone_slab_from_stone_stonecutting.json | 8 ++++++++ polymer-resource-pack/build.gradle | 4 +++- polymer-virtual-entity/build.gradle | 8 ++++++-- 7 files changed, 32 insertions(+), 14 deletions(-) create mode 100644 polymer-core/src/testmod/resources/data/polymertest/recipes/stone_slab_from_stone_stonecutting.json diff --git a/gradle.properties b/gradle.properties index 4dd6e952..d5ec046c 100644 --- 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 index aab7b315..9daff2c5 100644 --- 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 index 92023daa..1de1d4ae 100644 --- 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 loadConfig(String name, Class 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 index 942f0126..8159f8ea 100644 --- 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/polymer-core/src/testmod/resources/data/polymertest/recipes/stone_slab_from_stone_stonecutting.json b/polymer-core/src/testmod/resources/data/polymertest/recipes/stone_slab_from_stone_stonecutting.json new file mode 100644 index 00000000..32308339 --- /dev/null +++ b/polymer-core/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" +} \ No newline at end of file diff --git a/polymer-resource-pack/build.gradle b/polymer-resource-pack/build.gradle index 33b1790f..8a33dd4a 100644 --- 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 index 131aa6d6..34b4e8da 100644 --- 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 {