diff --git a/.tangled/workflows/build.yml b/.tangled/workflows/build.yml new file mode 100644 index 0000000..99597e8 --- /dev/null +++ b/.tangled/workflows/build.yml @@ -0,0 +1,15 @@ +when: + - event: ["push"] + branch: ["**"] + +engine: "nixery" + +dependencies: + nixpkgs: + - temurin-bin-25 + - findutils + - gnused + +steps: + - name: Build + command: ./gradlew build diff --git a/.tangled/workflows/publish-all.yml b/.tangled/workflows/publish-all.yml new file mode 100644 index 0000000..5639515 --- /dev/null +++ b/.tangled/workflows/publish-all.yml @@ -0,0 +1,26 @@ +when: + - event: ["manual"] + branch: ["*"] + - event: ["push"] + branch: ["publish-all/*"] + +engine: "nixery" + +environment: + RELEASE_TYPE: "releases" + +dependencies: + nixpkgs: + - temurin-bin-25 + - findutils + - gnused + +steps: + - name: Build + command: ./gradlew build + - name: Publish to CurseForge + command: ./gradlew publishCurseforge + - name: Publish to Modrinth + command: ./gradlew publishModrinth + - name: Publish to Maven + command: ./gradlew publish diff --git a/.tangled/workflows/publish-curseforge.yml b/.tangled/workflows/publish-curseforge.yml new file mode 100644 index 0000000..cfc4849 --- /dev/null +++ b/.tangled/workflows/publish-curseforge.yml @@ -0,0 +1,20 @@ +when: + - event: ["manual"] + branch: ["*"] + +engine: "nixery" + +environment: + RELEASE_TYPE: "releases" + +dependencies: + nixpkgs: + - temurin-bin-25 + - findutils + - gnused + +steps: + - name: Build + command: ./gradlew build + - name: Publish to CurseForge + command: ./gradlew publishCurseforge diff --git a/.tangled/workflows/publish-maven-snapshot.yml b/.tangled/workflows/publish-maven-snapshot.yml new file mode 100644 index 0000000..32898bd --- /dev/null +++ b/.tangled/workflows/publish-maven-snapshot.yml @@ -0,0 +1,20 @@ +when: + - event: ["push", "manual"] + branch: ["*"] + +engine: "nixery" + +environment: + RELEASE_TYPE: "snapshots" + +dependencies: + nixpkgs: + - temurin-bin-25 + - findutils + - gnused + +steps: + - name: Build + command: ./gradlew build + - name: Publish to Maven + command: ./gradlew publish diff --git a/.tangled/workflows/publish-maven.yml b/.tangled/workflows/publish-maven.yml new file mode 100644 index 0000000..83a10a8 --- /dev/null +++ b/.tangled/workflows/publish-maven.yml @@ -0,0 +1,22 @@ +when: + - event: ["manual"] + branch: ["*"] + - event: ["push"] + branch: ["publish-maven/*"] + +engine: "nixery" + +environment: + RELEASE_TYPE: "releases" + +dependencies: + nixpkgs: + - temurin-bin-25 + - findutils + - gnused + +steps: + - name: Build + command: ./gradlew build + - name: Publish to Maven + command: ./gradlew publish diff --git a/.tangled/workflows/publish-modrinth.yml b/.tangled/workflows/publish-modrinth.yml new file mode 100644 index 0000000..f09b82c --- /dev/null +++ b/.tangled/workflows/publish-modrinth.yml @@ -0,0 +1,22 @@ +when: + - event: ["manual"] + branch: ["*"] + - event: ["push"] + branch: ["publish-modrinth/*"] + +engine: "nixery" + +environment: + RELEASE_TYPE: "releases" + +dependencies: + nixpkgs: + - temurin-bin-25 + - findutils + - gnused + +steps: + - name: Build + command: ./gradlew build + - name: Publish to Modrinth + command: ./gradlew publishModrinth diff --git a/README.md b/README.md index 245a1e8..acf3a45 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,8 @@ The below is for Kotlin DSL, you will need to adjust this for Groovy DSL. ```kotlin repositories { - maven("https://maven.greenhouse.lgbt/releases") { - name = "Greenhouse Maven" + maven("https://maven.sylv.gay/releases") { + name = "Sylv Maven" } } diff --git a/build_logic/src/main/kotlin/lgbt/greenhouse/config/gradle/Properties.kt b/build_logic/src/main/kotlin/lgbt/greenhouse/config/gradle/Properties.kt index b760685..5ba6e53 100644 --- a/build_logic/src/main/kotlin/lgbt/greenhouse/config/gradle/Properties.kt +++ b/build_logic/src/main/kotlin/lgbt/greenhouse/config/gradle/Properties.kt @@ -2,7 +2,7 @@ package lgbt.greenhouse.config.gradle object Properties { val MOD_VERSION = mapModVersion("3.1.0") - val FRIENDLY_MINECRAFT_VERSION = mapMinecraftVersion("26.2.x") + val FRIENDLY_MINECRAFT_VERSION = mapMinecraftVersion("26.3.x") const val JAVA_VERSION = 25 const val GROUP = "lgbt.greenhouse.config" @@ -10,33 +10,33 @@ object Properties { const val MOD_ID = "greenhouse_config" val ARCHIVES_BASE_NAME = MOD_ID.replace("_", "-") const val MOD_AUTHOR = "Greenhouse Modding" - val MOD_CONTRIBUTORS = listOf("ChrysanthCow", "Kneelawk") + val MOD_CONTRIBUTORS = listOf("ChrysanthCow", "Kneelawk", "Sylv ") const val DESCRIPTION = "Powerful codec oriented config library made for my own use case." const val LICENSE = "MPL-2.0" - val SUPPORTED_MINECRAFT_VERSIONS = listOf("26.2") + val SUPPORTED_MINECRAFT_VERSIONS = listOf("26.3") - const val FABRIC_LOADER_VERSION_RANGE = ">=0.18" + const val FABRIC_LOADER_VERSION_RANGE = ">=0.19" const val FABRIC_API_VERSION_RANGE = "*" - const val FABRIC_MINECRAFT_VERSION_RANGE = "~26.2" + const val FABRIC_MINECRAFT_VERSION_RANGE = "~26.3" const val NEOFORGE_LOADER_VERSION_RANGE = "[4,)" - const val NEOFORGE_VERSION_RANGE = "[26.2,26.3)" - const val NEOFORGE_MINECRAFT_VERSION_RANGE = "[26.2,26.3)" + const val NEOFORGE_VERSION_RANGE = "[26.3,26.4)" + const val NEOFORGE_MINECRAFT_VERSION_RANGE = "[26.3,26.4)" const val MODRINTH_PAGE = "https://modrinth.com/project/greenhouse-config" - const val MODRINTH_PROJECT_ID = "bpUy6uOF" + const val MODRINTH_PROJECT_ID = "v2EoYgTM" const val FORGEJO_URL = "https://git.greenhouse.lgbt" const val FORGEJO_REPO = "Modding/greenhouse-config" - const val FORGEJO_COMMITISH = "26.2.x" + const val FORGEJO_COMMITISH = "26.3.x" - val MAVEN_URL = mapMavenUrl("https://maven.greenhouse.lgbt/") + val MAVEN_URL = mapMavenUrl("https://maven.sylv.gay/") } fun mapModVersion(modVersion: String): String { if (System.getenv("RELEASE_TYPE") != "releases") { - return "${modVersion}-dev" + return "${modVersion}+dev" } return modVersion } @@ -44,7 +44,7 @@ fun mapModVersion(modVersion: String): String { fun mapMinecraftVersion(minecraftVersion: String): String { if (System.getenv("RELEASE_TYPE") != "releases" && System.getenv("FORGEJO_SHA") != null) { val sha = "${System.getenv("FORGEJO_SHA")}" - return "${minecraftVersion}-${sha}" + return "${minecraftVersion}+${sha}" } return minecraftVersion } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a6c2a94..93687b4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -minecraft = "26.2" +minecraft = "26.3" # Xplat mixin = "0.17.1+mixin.0.8.7" @@ -7,22 +7,22 @@ mixin_extras = "0.5.4" # Fabric fabric_loader = "0.19.3" -fabric_api = "0.154.2+26.2" -mod_menu = "20.0.1" +fabric_api = "0.160.7+26.3" +mod_menu = "21.0.0-beta.1" # NeoForge -neoforge = "26.2.0.8-beta" +neoforge = "26.3.0.4-beta" # Dependencies polyamory = "0.1.1" polyamory_dfu = "0.1.5" polyamory_lang_jsonc = "0.1.2" -yumi_mc_foundation = "1.1.1+26.2" +yumi_mc_foundation = "1.1.3+26.2" # Gradle loom = "1.17.+" -moddev = "2.0.141" +moddev = "2.0.147" mod_publish = "2.1.1" yumi_licenser = "4.0.+" @@ -47,4 +47,3 @@ loom = { id = "net.fabricmc.fabric-loom", version.ref = "loom" } moddev = { id = "net.neoforged.moddev", version.ref = "moddev" } mod_publish = { id = "me.modmuss50.mod-publish-plugin", version.ref = "mod_publish" } yumi_licenser = { id = "dev.yumi.gradle.licenser", version.ref = "yumi_licenser" } - diff --git a/xplat/src/main/java/lgbt/greenhouse/config/impl/codec/LateHolderCodec.java b/xplat/src/main/java/lgbt/greenhouse/config/impl/codec/LateHolderCodec.java index ea63ebe..b5a813e 100644 --- a/xplat/src/main/java/lgbt/greenhouse/config/impl/codec/LateHolderCodec.java +++ b/xplat/src/main/java/lgbt/greenhouse/config/impl/codec/LateHolderCodec.java @@ -15,14 +15,14 @@ import com.mojang.serialization.DynamicOps; import lgbt.greenhouse.config.api.v3.registry.LateHolder; import net.minecraft.core.Holder; import net.minecraft.core.Registry; +import net.minecraft.core.registries.codec.RegistryFixedCodec; import net.minecraft.resources.Identifier; -import net.minecraft.resources.RegistryFixedCodec; import net.minecraft.resources.ResourceKey; public class LateHolderCodec implements Codec> { private final ResourceKey> registryKey; - private final RegistryFixedCodec registryFixedCodec; + private final Codec> registryFixedCodec; public LateHolderCodec(ResourceKey> registry) { this.registryKey = registry; diff --git a/xplat/src/testmod/java/lgbt/greenhouse/config/testmod/client/gui/GradientRectRenderState.java b/xplat/src/testmod/java/lgbt/greenhouse/config/testmod/client/gui/GradientRectRenderState.java index e8c6538..477db33 100644 --- a/xplat/src/testmod/java/lgbt/greenhouse/config/testmod/client/gui/GradientRectRenderState.java +++ b/xplat/src/testmod/java/lgbt/greenhouse/config/testmod/client/gui/GradientRectRenderState.java @@ -8,8 +8,8 @@ package lgbt.greenhouse.config.testmod.client.gui; -import com.mojang.blaze3d.pipeline.RenderPipeline; import com.mojang.blaze3d.vertex.VertexConsumer; +import com.mojang.renderpearl.api.pipeline.RenderPipeline; import lgbt.greenhouse.config.testmod.mixin.client.Accessor_GuiGraphicsExtractor; import net.minecraft.client.gui.GuiGraphicsExtractor; import net.minecraft.client.gui.navigation.ScreenRectangle; diff --git a/xplat/src/testmod/java/lgbt/greenhouse/config/testmod/client/screen/widget/ColorWidget.java b/xplat/src/testmod/java/lgbt/greenhouse/config/testmod/client/screen/widget/ColorWidget.java index b019250..5062be3 100644 --- a/xplat/src/testmod/java/lgbt/greenhouse/config/testmod/client/screen/widget/ColorWidget.java +++ b/xplat/src/testmod/java/lgbt/greenhouse/config/testmod/client/screen/widget/ColorWidget.java @@ -74,7 +74,8 @@ public class ColorWidget extends AbstractColorWidget { mouseX, mouseY, DefaultTooltipPositioner.INSTANCE, - null + null, + false ); } @@ -232,7 +233,8 @@ public class ColorWidget extends AbstractColorWidget { mouseX, mouseY, DefaultTooltipPositioner.INSTANCE, - null + null, + false ); }