diff --git a/.github/workflows/cicd-workflow.yml b/.github/workflows/cicd-workflow.yml index 5c009db..72d8a36 100644 --- a/.github/workflows/cicd-workflow.yml +++ b/.github/workflows/cicd-workflow.yml @@ -6,7 +6,7 @@ on: workflow_dispatch: push: branches: [ "*" ] - tags: ["1.18*"] + tags: ["1.19*"] pull_request: branches: [ "*" ] diff --git a/CHANGELOG.md b/CHANGELOG.md index dd60d52..7d696c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Forge Recommended Versioning](https://mcforge.readthedocs.io/en/latest/conventions/versioning/). +## [1.19-3.1.0.0] - 2022-07-06 +### Changed +- Update to Forge 1.19-41.0.62 #62 +- Update BucketLib mod to 1.19-1.0.0.0 #62 + ## [1.18.2-3.0.4.0] - 2022-05-15 ### Changed - Update to Forge 1.18.2-40.0.18 diff --git a/build.gradle b/build.gradle index bcc908a..5952d64 100644 --- a/build.gradle +++ b/build.gradle @@ -116,7 +116,6 @@ dependencies { // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied. // The userdev artifact is a special name and will get all sorts of transformations applied to it. minecraft "net.minecraftforge:forge:${project.minecraft_version}-${project.forge_version}" - implementation 'org.jetbrains:annotations:22.0.0' // compile against the BucketLib API but do not include it at runtime compileOnly fg.deobf("com.github.cech12:BucketLib:${project.bucketlib_version}:api") diff --git a/gradle.properties b/gradle.properties index dd0ba13..a9d7bed 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,14 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false mod_id=ceramicbucket -mod_version=3.0.4.0 -minecraft_version=1.18.2 -forge_version=40.0.18 +mod_version=3.1.0.0 +minecraft_version=1.19 +forge_version=41.0.62 #Bucket Lib -bucketlib_version=1.18.2-0.5.3.2 +bucketlib_version=1.19-1.0.0.0 #Curseforge curseforge_id=363799 curseforge_release=release -curseforge_versions=1.18.2 +curseforge_versions=1.19 diff --git a/src/main/java/cech12/ceramicbucket/CeramicBucketMod.java b/src/main/java/cech12/ceramicbucket/CeramicBucketMod.java index 0af20e1..247c010 100644 --- a/src/main/java/cech12/ceramicbucket/CeramicBucketMod.java +++ b/src/main/java/cech12/ceramicbucket/CeramicBucketMod.java @@ -7,7 +7,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; -import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.ModLoadingContext; @@ -19,6 +18,7 @@ import net.minecraftforge.fml.loading.FMLPaths; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.MissingMappingsEvent; import net.minecraftforge.registries.RegistryObject; import java.util.Arrays; @@ -70,10 +70,10 @@ private void sendImc(InterModEnqueueEvent evt) { } @SubscribeEvent - public static void remapOldIds(RegistryEvent.MissingMappings event) { + public static void remapOldIds(MissingMappingsEvent event) { //to support old versions of this mod - event.getMappings(MOD_ID).forEach(itemMapping -> { - if (oldResourceLocations.stream().anyMatch(itemMapping.key::equals)) { + event.getMappings(ForgeRegistries.ITEMS.getRegistryKey(), MOD_ID).forEach(itemMapping -> { + if (oldResourceLocations.stream().anyMatch(itemMapping.getKey()::equals)) { itemMapping.remap(CERAMIC_BUCKET.get()); } }); diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 14b28ff..bde98b7 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[40,)" +loaderVersion="[41,)" issueTrackerURL="https://github.com/cech12/CeramicBucket/issues" license="The MIT License (MIT)" [[mods]] @@ -15,18 +15,18 @@ license="The MIT License (MIT)" [[dependencies.ceramicbucket]] modId="forge" mandatory=true - versionRange="[40.0.18,)" + versionRange="[41.0.62,)" ordering="NONE" side="BOTH" [[dependencies.ceramicbucket]] modId="minecraft" mandatory=true - versionRange="[1.18.2,1.19)" + versionRange="[1.19,1.20)" ordering="NONE" side="BOTH" [[dependencies.ceramicbucket]] modId="bucketlib" mandatory=true - versionRange="[1.18.2-0.5.3.2,)" + versionRange="[1.19-1.0.0.0,)" ordering="NONE" side="BOTH" \ No newline at end of file diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 231f206..18f56ae 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,8 @@ { "pack": { "description": "Ceramic Bucket resources", - "pack_format": 9 + "pack_format": 10, + "forge:resource_pack_format": 9, + "forge:data_pack_format": 10 } }