From 66200e0675e10192e8a347add3022e9509aa37d6 Mon Sep 17 00:00:00 2001 From: ziro Date: Sat, 16 Mar 2024 14:36:49 +0700 Subject: [PATCH] chore: Drop Create 0.5.0 support --- build.gradle | 6 +++++- gradle.properties | 4 ++-- .../mixin/{fluid => create}/CreateFluidReactionsMixin.java | 4 ++-- src/main/resources/cobblegen.mixins.json | 2 +- src/main/resources/fabric.mod.json | 3 +++ 5 files changed, 13 insertions(+), 6 deletions(-) rename src/main/java/io/github/null2264/cobblegen/mixin/{fluid => create}/CreateFluidReactionsMixin.java (92%) diff --git a/build.gradle b/build.gradle index a2add19..47a48fd 100644 --- a/build.gradle +++ b/build.gradle @@ -50,6 +50,7 @@ repositories { maven { url = "https://maven.tterrag.com/" } maven { url = "https://maven.theillusivec4.top/" } maven { url = "https://maven.neoforged.net/releases" } + maven { url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/" } } archivesBaseName = project.archives_base_name @@ -149,6 +150,9 @@ dependencies { // These act like a dummy, technically only here to provide their modules/packages if (isFabric) { modCompileOnly("io.github.fabricators_of_create:Porting-Lib:${project.port_lib_version_1_18_2}") + modCompileOnly("com.simibubi.create:create-fabric-${project.minecraft_version_1_18_2}:${project.create_version_1_18_2}") + } else { + modCompileOnly("com.simibubi.create:create-1.18.2:0.5.1.e-318:slim") { transitive = false } } // <- EMI @@ -403,4 +407,4 @@ publishMods { } } } -} +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 16c6d19..80fee19 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,8 +21,8 @@ recipe_viewer=none # Dependencies jankson_version=1.2.3 emi_version=1.0.26 -manifold_version=2024.1.3 +manifold_version=2024.1.5 # Version Specific Dependencies -create_version_1_18_2=0.5.0.i-1002+1.18.2 +create_version_1_18_2=0.5.1-f-build.1333+mc1.18.2 port_lib_version_1_18_2=1.2.869-beta+1.18.2 \ No newline at end of file diff --git a/src/main/java/io/github/null2264/cobblegen/mixin/fluid/CreateFluidReactionsMixin.java b/src/main/java/io/github/null2264/cobblegen/mixin/create/CreateFluidReactionsMixin.java similarity index 92% rename from src/main/java/io/github/null2264/cobblegen/mixin/fluid/CreateFluidReactionsMixin.java rename to src/main/java/io/github/null2264/cobblegen/mixin/create/CreateFluidReactionsMixin.java index baf08be..a0ed047 100644 --- a/src/main/java/io/github/null2264/cobblegen/mixin/fluid/CreateFluidReactionsMixin.java +++ b/src/main/java/io/github/null2264/cobblegen/mixin/create/CreateFluidReactionsMixin.java @@ -1,5 +1,5 @@ //#if MC>1.16.5 -package io.github.null2264.cobblegen.mixin.fluid; +package io.github.null2264.cobblegen.mixin.create; //#if FABRIC>=1 import io.github.fabricators_of_create.porting_lib.util.FluidStack; @@ -27,7 +27,7 @@ @SuppressWarnings("UnresolvedMixinReference") // False positive @Pseudo -@Mixin(targets = {"com.simibubi.create.content.contraptions.fluids.FluidReactions", "com.simibubi.create.content.fluids.FluidReactions"}) +@Mixin(com.simibubi.create.content.fluids.FluidReactions.class) public abstract class CreateFluidReactionsMixin { @Unique diff --git a/src/main/resources/cobblegen.mixins.json b/src/main/resources/cobblegen.mixins.json index 9c85244..dcac59c 100644 --- a/src/main/resources/cobblegen.mixins.json +++ b/src/main/resources/cobblegen.mixins.json @@ -14,7 +14,7 @@ "CommandsMixin", "MinecraftServerMixin", //#if MC>1.16.5 - "fluid.CreateFluidReactionsMixin", + "create.CreateFluidReactionsMixin", //#endif "fluid.FluidEventMixin", "fluid.LavaEventMixin" diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index d03c7d1..0f3dfda 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -50,5 +50,8 @@ "depends": { "fabricloader": "*", "minecraft": "${mcversion}" + }, + "breaks": { + "create": ">=0.5.1" } } \ No newline at end of file