From 357542959259c939d790bc543ff3882885d5feb9 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Fri, 8 Dec 2023 21:07:27 +0800 Subject: [PATCH] Update to 1.20.4 --- .github/workflows/1.20.3_pr.yml | 2 +- .github/workflows/1.20.3_push.yml | 2 +- fabric/build.gradle | 2 +- .../imitator/ArchitecturyBucketItem.java | 4 ++++ .../hooks/forgelike/ForgeLikeHooks.java | 6 ++++++ gradle.properties | 16 +++++++------- minecraftforge/build.gradle | 2 +- .../forgelike/forge/ForgeLikeHooksImpl.java | 4 ++++ .../src/main/resources/META-INF/mods.toml | 2 +- neoforge/build.gradle | 2 +- .../forgelike/forge/ForgeLikeHooksImpl.java | 21 +++++++++++++++++++ .../src/main/resources/META-INF/mods.toml | 4 ++-- settings.gradle | 10 ++++----- testmod-forge/build.gradle | 6 ------ 14 files changed, 56 insertions(+), 27 deletions(-) diff --git a/.github/workflows/1.20.3_pr.yml b/.github/workflows/1.20.3_pr.yml index 9e3bbd562..da8276b8a 100644 --- a/.github/workflows/1.20.3_pr.yml +++ b/.github/workflows/1.20.3_pr.yml @@ -7,7 +7,7 @@ on: - '**.properties' - '**/src/**' branches: - - "1.20.3" + - "1.20.4" types: [ opened, synchronize, reopened ] jobs: validate-gradle: diff --git a/.github/workflows/1.20.3_push.yml b/.github/workflows/1.20.3_push.yml index 49f76c2a6..3ad816d55 100644 --- a/.github/workflows/1.20.3_push.yml +++ b/.github/workflows/1.20.3_push.yml @@ -7,7 +7,7 @@ on: - '**.properties' - '**/src/**' branches: - - "1.20.3" + - "1.20.4" workflow_dispatch: inputs: norelease: diff --git a/fabric/build.gradle b/fabric/build.gradle index 6ee7d4683..4a5b8d050 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -128,7 +128,7 @@ unifiedPublishing { curseforge { token = CURSE_API_KEY id = rootProject.curseforge_id - gameVersions.addAll "Java 17", "1.20.3-Snapshot"//, project.minecraft_version + gameVersions.addAll "Java 17", "1.20.4-Snapshot", project.minecraft_version } } diff --git a/forge/src/main/java/dev/architectury/core/item/forge/imitator/ArchitecturyBucketItem.java b/forge/src/main/java/dev/architectury/core/item/forge/imitator/ArchitecturyBucketItem.java index f1578b9ec..ad9a9d219 100644 --- a/forge/src/main/java/dev/architectury/core/item/forge/imitator/ArchitecturyBucketItem.java +++ b/forge/src/main/java/dev/architectury/core/item/forge/imitator/ArchitecturyBucketItem.java @@ -19,6 +19,8 @@ package dev.architectury.core.item.forge.imitator; +import dev.architectury.hooks.forgelike.ForgeLikeHooks; +import dev.architectury.injectables.annotations.PlatformOnly; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.BucketItem; import net.minecraft.world.item.ItemStack; @@ -32,6 +34,7 @@ public class ArchitecturyBucketItem extends BucketItem { public ArchitecturyBucketItem(Supplier fluid, Properties properties) { super(fluid, properties); + ForgeLikeHooks.registerBucketItemCapability(this); } public final Fluid getContainedFluid() { @@ -39,6 +42,7 @@ public final Fluid getContainedFluid() { } @Override + @PlatformOnly(PlatformOnly.FORGE) public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable CompoundTag nbt) { return this.getClass() == ArchitecturyBucketItem.class ? new FluidBucketWrapper(stack) : super.initCapabilities(stack, nbt); } diff --git a/forge/src/main/java/dev/architectury/hooks/forgelike/ForgeLikeHooks.java b/forge/src/main/java/dev/architectury/hooks/forgelike/ForgeLikeHooks.java index 0c743a924..c0d5aeac9 100644 --- a/forge/src/main/java/dev/architectury/hooks/forgelike/ForgeLikeHooks.java +++ b/forge/src/main/java/dev/architectury/hooks/forgelike/ForgeLikeHooks.java @@ -22,6 +22,7 @@ import com.mojang.serialization.Codec; import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.Item; import net.minecraftforge.common.world.BiomeModifier; import org.jetbrains.annotations.ApiStatus; @@ -33,4 +34,9 @@ public class ForgeLikeHooks { public static void registerBiomeModifier(ResourceLocation id, Supplier> codecSupplier) { throw new AssertionError(); } + + @ExpectPlatform + public static void registerBucketItemCapability(Item item) { + throw new AssertionError(); + } } diff --git a/gradle.properties b/gradle.properties index 0070f213e..197249330 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,24 +1,24 @@ org.gradle.jvmargs=-Xmx6G org.gradle.daemon=false -platforms=fabric +platforms=fabric,forge,neoforge -minecraft_version=1.20.3-pre1 -supported_version=1.20.3-pre1 +minecraft_version=1.20.4 +supported_version=1.20.4 -artifact_type=beta +artifact_type=release archives_base_name=architectury archives_base_name_snapshot=architectury-snapshot base_version=11.0 maven_group=dev.architectury -fabric_loader_version=0.14.23 -fabric_api_version=0.90.11+1.20.3 +fabric_loader_version=0.15.1 +fabric_api_version=0.91.1+1.20.4 mod_menu_version=7.0.0 -forge_version=48.0.38 -neoforge_version=20.2.59-beta +forge_version=49.0.3 +neoforge_version=20.4.3-beta curseforge_id=419699 modrinth_id=lhGA9TYQ diff --git a/minecraftforge/build.gradle b/minecraftforge/build.gradle index 2d870236b..e19234fb6 100644 --- a/minecraftforge/build.gradle +++ b/minecraftforge/build.gradle @@ -129,7 +129,7 @@ unifiedPublishing { displayName = "[MinecraftForge $rootProject.supported_version] v$project.version" releaseType = "$rootProject.artifact_type" changelog = releaseChangelog() - gameVersions = ["1.20.2"] + gameVersions = ["1.20.4"] gameLoaders = ["forge"] mainPublication renameJarForPublication diff --git a/minecraftforge/src/main/java/dev/architectury/hooks/forgelike/forge/ForgeLikeHooksImpl.java b/minecraftforge/src/main/java/dev/architectury/hooks/forgelike/forge/ForgeLikeHooksImpl.java index fbb4b4fb7..544d0e81c 100644 --- a/minecraftforge/src/main/java/dev/architectury/hooks/forgelike/forge/ForgeLikeHooksImpl.java +++ b/minecraftforge/src/main/java/dev/architectury/hooks/forgelike/forge/ForgeLikeHooksImpl.java @@ -23,6 +23,7 @@ import dev.architectury.platform.hooks.EventBusesHooks; import dev.architectury.utils.ArchitecturyConstants; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.Item; import net.minecraftforge.common.world.BiomeModifier; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegisterEvent; @@ -39,4 +40,7 @@ public static void registerBiomeModifier(ResourceLocation id, Supplier> codecSupplier) { EventBusesHooksImpl.whenAvailable(ArchitecturyConstants.MOD_ID, bus -> { bus.addListener(event -> { @@ -39,4 +48,16 @@ public static void registerBiomeModifier(ResourceLocation id, Supplier { + bus.addListener(event -> { + if (BuiltInRegistries.ITEM.containsValue(item)) { + event.registerItem(Capabilities.FluidHandler.ITEM, (stack, ctx) -> new FluidBucketWrapper(stack), item); + } else { + LOGGER.warn("Tried to register a bucket item capability for an item that is not registered: {}", item); + } + }); + }); + } } diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml index f620b277d..7be9f169f 100644 --- a/neoforge/src/main/resources/META-INF/mods.toml +++ b/neoforge/src/main/resources/META-INF/mods.toml @@ -17,14 +17,14 @@ license = "LGPL-3" [[dependencies.architectury]] modId = "minecraft" mandatory = true -versionRange = "[1.20.2,)" +versionRange = "[1.20.3,)" ordering = "NONE" side = "BOTH" [[dependencies.architectury]] modId = "neoforge" mandatory = true -versionRange = "[20.2.58,)" +versionRange = "[20.3,)" ordering = "NONE" side = "BOTH" diff --git a/settings.gradle b/settings.gradle index 7f514a9ea..e11ead5d2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -13,12 +13,12 @@ if (JavaVersion.current().ordinal() + 1 < 17) { include("common") include("fabric") -//include("forge") -//include("minecraftforge") -//include("neoforge") +include("forge") +include("minecraftforge") +include("neoforge") include("testmod-common") include("testmod-fabric") -//include("testmod-forge") -//include("testmod-neoforge") +include("testmod-forge") +include("testmod-neoforge") rootProject.name = "architectury" diff --git a/testmod-forge/build.gradle b/testmod-forge/build.gradle index 4a102223b..93c6798d1 100644 --- a/testmod-forge/build.gradle +++ b/testmod-forge/build.gradle @@ -6,12 +6,6 @@ plugins { loom { accessWidenerPath = project(":common").loom.accessWidenerPath - mods { - forge { - sourceSet project(":minecraftforge").sourceSets.main - } - } - forge { mixinConfig "architectury.mixins.json" }