Skip to content

Commit

Permalink
Update to Forge 1.19-41.0.62 & BucketLib to 1.19-1.0.0.0 #62
Browse files Browse the repository at this point in the history
  • Loading branch information
cech12 committed Jul 6, 2022
1 parent c52b019 commit d2a33e2
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cicd-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
workflow_dispatch:
push:
branches: [ "*" ]
tags: ["1.18*"]
tags: ["1.19*"]
pull_request:
branches: [ "*" ]

Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions src/main/java/cech12/ceramicbucket/CeramicBucketMod.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -70,10 +70,10 @@ private void sendImc(InterModEnqueueEvent evt) {
}

@SubscribeEvent
public static void remapOldIds(RegistryEvent.MissingMappings<Item> 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());
}
});
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
modLoader="javafml"
loaderVersion="[40,)"
loaderVersion="[41,)"
issueTrackerURL="https://github.com/cech12/CeramicBucket/issues"
license="The MIT License (MIT)"
[[mods]]
Expand All @@ -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"
4 changes: 3 additions & 1 deletion src/main/resources/pack.mcmeta
Original file line number Diff line number Diff line change
@@ -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
}
}

0 comments on commit d2a33e2

Please sign in to comment.