diff --git a/.github/workflows/cicd-workflow.yml b/.github/workflows/cicd-workflow.yml index 265b254..195faa8 100644 --- a/.github/workflows/cicd-workflow.yml +++ b/.github/workflows/cicd-workflow.yml @@ -51,7 +51,6 @@ jobs: title-prefix: forge- curseforge-id: 436874 game-versions: | - 1.21 1.21.1 release-type: release loaders: | @@ -70,7 +69,6 @@ jobs: title-prefix: forge- modrinth-id: IsSapAeq game-versions: | - 1.21 1.21.1 release-type: release loaders: | @@ -89,7 +87,6 @@ jobs: title-prefix: neoforge- curseforge-id: 436874 game-versions: | - 1.21 1.21.1 release-type: release loaders: | @@ -108,7 +105,6 @@ jobs: title-prefix: neoforge- modrinth-id: IsSapAeq game-versions: | - 1.21 1.21.1 release-type: release loaders: | @@ -127,7 +123,6 @@ jobs: title-prefix: fabric- curseforge-id: 436874 game-versions: | - 1.21 1.21.1 release-type: release loaders: | @@ -147,7 +142,6 @@ jobs: title-prefix: fabric- modrinth-id: IsSapAeq game-versions: | - 1.21 1.21.1 release-type: release loaders: | diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d6a0c6..0560b82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ 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.21.1-4.2.0.0] - 2024-10-27 +### Changed +- updated to Minecraft 1.21.1 (Fabric 0.105.0+1.21.1, Neoforge 21.1.62, Forge 52.0.21) +- updated Cloth Config support (15.0.140) (Fabric/Quilt) +- updated ModMenu support (11.0.2) (Fabric/Quilt) +- updated JEI support (19.19.0.219) (Forge & NeoForge) +- updated REI support (16.0.788) (Fabric/Quilt & NeoForge) +- updated The One Probe support (1.21_neo-12.0.3) (NeoForge) + +### Fixed +- fixed JEI loading errors since 19.19.0.219 (all loaders) +- fixed recipes and advancements by using the new common tags in Forge + ## [1.21-4.1.1.0] - 2024-08-30 ### Changed - number config options are now text fields instead of sliders (Fabric) diff --git a/common/src/main/java/de/cech12/solarcooker/jei/SolarCookingCategory.java b/common/src/main/java/de/cech12/solarcooker/jei/SolarCookingCategory.java index acf9569..1d01b4f 100644 --- a/common/src/main/java/de/cech12/solarcooker/jei/SolarCookingCategory.java +++ b/common/src/main/java/de/cech12/solarcooker/jei/SolarCookingCategory.java @@ -7,20 +7,18 @@ import mezz.jei.api.recipe.RecipeType; import mezz.jei.library.plugins.vanilla.cooking.AbstractCookingCategory; import net.minecraft.world.item.crafting.RecipeHolder; - -import javax.annotation.Nonnull; +import org.jetbrains.annotations.NotNull; public class SolarCookingCategory extends AbstractCookingCategory { public SolarCookingCategory(IGuiHelper guiHelper) { - super(guiHelper, Constants.SOLAR_COOKER_BLOCK.get(), "gui.jei.category.smelting", (int) (200 * Services.CONFIG.getCookTimeFactor())); + super(guiHelper, new RecipeType<>(Constants.id(Constants.SOLAR_COOKING_NAME), (Class>) (Object) RecipeHolder.class), + Constants.SOLAR_COOKER_BLOCK.get(), "gui.jei.category.smelting", (int) (200 * Services.CONFIG.getCookTimeFactor())); } @Override - @Nonnull - public RecipeType> getRecipeType() { - Class> holderClass = (Class>) (Object) RecipeHolder.class; - return new RecipeType<>(Constants.id(Constants.SOLAR_COOKING_NAME), holderClass); + public boolean isHandled(@NotNull RecipeHolder recipeHolder) { + return true; } } diff --git a/fabric/src/main/resources/data/solarcooker/advancement/recipes/building_blocks/shining_diamond_block.json b/common/src/main/resources/data/solarcooker/advancement/recipes/building_blocks/shining_diamond_block.json similarity index 100% rename from fabric/src/main/resources/data/solarcooker/advancement/recipes/building_blocks/shining_diamond_block.json rename to common/src/main/resources/data/solarcooker/advancement/recipes/building_blocks/shining_diamond_block.json diff --git a/fabric/src/main/resources/data/solarcooker/advancement/recipes/decorations/reflector.json b/common/src/main/resources/data/solarcooker/advancement/recipes/decorations/reflector.json similarity index 100% rename from fabric/src/main/resources/data/solarcooker/advancement/recipes/decorations/reflector.json rename to common/src/main/resources/data/solarcooker/advancement/recipes/decorations/reflector.json diff --git a/fabric/src/main/resources/data/solarcooker/advancement/recipes/decorations/solar_cooker.json b/common/src/main/resources/data/solarcooker/advancement/recipes/decorations/solar_cooker.json similarity index 100% rename from fabric/src/main/resources/data/solarcooker/advancement/recipes/decorations/solar_cooker.json rename to common/src/main/resources/data/solarcooker/advancement/recipes/decorations/solar_cooker.json diff --git a/fabric/src/main/resources/data/solarcooker/recipe/reflector.json b/common/src/main/resources/data/solarcooker/recipe/reflector.json similarity index 100% rename from fabric/src/main/resources/data/solarcooker/recipe/reflector.json rename to common/src/main/resources/data/solarcooker/recipe/reflector.json diff --git a/fabric/src/main/resources/data/solarcooker/recipe/shining_diamond_block.json b/common/src/main/resources/data/solarcooker/recipe/shining_diamond_block.json similarity index 100% rename from fabric/src/main/resources/data/solarcooker/recipe/shining_diamond_block.json rename to common/src/main/resources/data/solarcooker/recipe/shining_diamond_block.json diff --git a/fabric/src/main/resources/data/solarcooker/recipe/solar_cooker.json b/common/src/main/resources/data/solarcooker/recipe/solar_cooker.json similarity index 100% rename from fabric/src/main/resources/data/solarcooker/recipe/solar_cooker.json rename to common/src/main/resources/data/solarcooker/recipe/solar_cooker.json diff --git a/fabric/build.gradle b/fabric/build.gradle index a42ef1b..98c98ab 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id 'idea' id 'maven-publish' - id 'fabric-loom' version '[1.6.6,1.7)' + id 'fabric-loom' version '[1.7.4,1.8)' } base { archivesName = "${mod_id}-fabric" diff --git a/forge/src/main/java/de/cech12/solarcooker/ForgeSolarCookerMod.java b/forge/src/main/java/de/cech12/solarcooker/ForgeSolarCookerMod.java index ee51c9c..10e2848 100644 --- a/forge/src/main/java/de/cech12/solarcooker/ForgeSolarCookerMod.java +++ b/forge/src/main/java/de/cech12/solarcooker/ForgeSolarCookerMod.java @@ -21,8 +21,8 @@ @Mod.EventBusSubscriber(modid= Constants.MOD_ID, bus= Mod.EventBusSubscriber.Bus.MOD) public class ForgeSolarCookerMod { - public ForgeSolarCookerMod() { - final IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus(); + public ForgeSolarCookerMod(FMLJavaModLoadingContext context) { + final IEventBus eventBus = context.getModEventBus(); ModBlocks.BLOCKS.register(eventBus); ModBlockEntityTypes.BLOCK_ENTITY_TYPES.register(eventBus); ModItems.ITEMS.register(eventBus); diff --git a/forge/src/main/resources/data/solarcooker/advancement/recipes/building_blocks/shining_diamond_block.json b/forge/src/main/resources/data/solarcooker/advancement/recipes/building_blocks/shining_diamond_block.json deleted file mode 100644 index 6e3b489..0000000 --- a/forge/src/main/resources/data/solarcooker/advancement/recipes/building_blocks/shining_diamond_block.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "solarcooker:shining_diamond_block" - ] - }, - "criteria": { - "has_diamond_block": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#forge:storage_blocks/diamond" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "solarcooker:shining_diamond_block" - } - } - }, - "requirements": [ - [ - "has_diamond_block", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/forge/src/main/resources/data/solarcooker/advancement/recipes/decorations/reflector.json b/forge/src/main/resources/data/solarcooker/advancement/recipes/decorations/reflector.json deleted file mode 100644 index 20205d7..0000000 --- a/forge/src/main/resources/data/solarcooker/advancement/recipes/decorations/reflector.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "solarcooker:reflector" - ] - }, - "criteria": { - "has_chest": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#forge:chests/wooden" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "solarcooker:reflector" - } - } - }, - "requirements": [ - [ - "has_chest", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/forge/src/main/resources/data/solarcooker/advancement/recipes/decorations/solar_cooker.json b/forge/src/main/resources/data/solarcooker/advancement/recipes/decorations/solar_cooker.json deleted file mode 100644 index bf801a0..0000000 --- a/forge/src/main/resources/data/solarcooker/advancement/recipes/decorations/solar_cooker.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "solarcooker:solar_cooker" - ] - }, - "criteria": { - "has_chest": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#forge:chests/wooden" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "solarcooker:solar_cooker" - } - } - }, - "requirements": [ - [ - "has_chest", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/forge/src/main/resources/data/solarcooker/recipe/reflector.json b/forge/src/main/resources/data/solarcooker/recipe/reflector.json deleted file mode 100644 index c48100c..0000000 --- a/forge/src/main/resources/data/solarcooker/recipe/reflector.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "forge:glass_panes" - }, - { - "tag": "forge:ingots/iron" - }, - { - "tag": "minecraft:wooden_slabs" - } - ], - "result": { - "id": "solarcooker:reflector" - } -} \ No newline at end of file diff --git a/forge/src/main/resources/data/solarcooker/recipe/shining_diamond_block.json b/forge/src/main/resources/data/solarcooker/recipe/shining_diamond_block.json deleted file mode 100644 index dc55c5f..0000000 --- a/forge/src/main/resources/data/solarcooker/recipe/shining_diamond_block.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "solarcooker:solarcooking", - "category": "misc", - "ingredient": { - "tag": "forge:storage_blocks/diamond" - }, - "result": { - "id": "solarcooker:shining_diamond_block" - }, - "experience": 0.3, - "cookingtime": 3000 -} \ No newline at end of file diff --git a/forge/src/main/resources/data/solarcooker/recipe/solar_cooker.json b/forge/src/main/resources/data/solarcooker/recipe/solar_cooker.json deleted file mode 100644 index 8d74003..0000000 --- a/forge/src/main/resources/data/solarcooker/recipe/solar_cooker.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "misc", - "pattern": [ - "IRI", - "RCR", - "RRR" - ], - "key": { - "R": { - "item": "solarcooker:reflector" - }, - "I": { - "tag": "forge:ingots/iron" - }, - "C": { - "tag": "forge:chests/wooden" - } - }, - "result": { - "id": "solarcooker:solar_cooker" - } -} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 7f5c723..e327248 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ # Project group=de.cech12.solarcooker -mod_version=4.1.1.0 +mod_version=4.2.0.0 mod_id=solarcooker mod_name=Solar Cooker mod_author=Cech12 @@ -15,37 +15,37 @@ description=A mod which adds a Solar Cooker. # Common java_version=21 -minecraft_version=1.21 -minecraft_version_range=[1.21, 1.22) +minecraft_version=1.21.1 +minecraft_version_range=[1.21.1, 1.22) # Fabric -fabric_version=0.100.3+1.21 -fabric_loader_version=0.15.11 -cloth_config_version=15.0.127 -mod_menu_version=11.0.1 +fabric_version=0.105.0+1.21.1 +fabric_loader_version=0.16.5 +cloth_config_version=15.0.140 +mod_menu_version=11.0.2 # Forge -forge_version=51.0.18 -forge_version_range=[51.0.18,) +forge_version=52.0.21 +forge_version_range=[52.0.21,) forge_loader_version_range=[50,) # NeoForge -neoforge_version=21.0.94-beta -neoforge_version_range=[21.0.94-beta,) +neoforge_version=21.1.62 +neoforge_version_range=[21.1.62,) neoforge_loader_version_range=[2,) # jei -jei_version=19.0.0.11 -jei_version_range=[19.0.0.11,) +jei_version=19.19.0.219 +jei_version_range=[19.19.0.219,) # rei -rei_version=16.0.729 -rei_version_range=[16.0.729,) -architectury_version=13.0.2 +rei_version=16.0.788 +rei_version_range=[16.0.788,) +architectury_version=13.0.8 #the one probe -top_version=1.21_neo-12.0.0-1 -top_version_range=[1.21_neo-12.0.0,) +top_version=1.21_neo-12.0.3-5 +top_version_range=[1.21_neo-12.0.3,) # Gradle org.gradle.jvmargs=-Xmx3G diff --git a/neoforge/build.gradle b/neoforge/build.gradle index dabd9e7..760bbdd 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -1,7 +1,7 @@ plugins { id 'idea' id 'maven-publish' - id 'net.neoforged.gradle.userdev' version '7.0.150' + id 'net.neoforged.gradle.userdev' version '7.0.165' id 'java-library' } base { diff --git a/neoforge/src/main/resources/data/solarcooker/advancement/recipes/building_blocks/shining_diamond_block.json b/neoforge/src/main/resources/data/solarcooker/advancement/recipes/building_blocks/shining_diamond_block.json deleted file mode 100644 index efcc482..0000000 --- a/neoforge/src/main/resources/data/solarcooker/advancement/recipes/building_blocks/shining_diamond_block.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "solarcooker:shining_diamond_block" - ] - }, - "criteria": { - "has_diamond_block": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#c:storage_blocks/diamond" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "solarcooker:shining_diamond_block" - } - } - }, - "requirements": [ - [ - "has_diamond_block", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/solarcooker/advancement/recipes/decorations/reflector.json b/neoforge/src/main/resources/data/solarcooker/advancement/recipes/decorations/reflector.json deleted file mode 100644 index d139fa9..0000000 --- a/neoforge/src/main/resources/data/solarcooker/advancement/recipes/decorations/reflector.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "solarcooker:reflector" - ] - }, - "criteria": { - "has_chest": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#c:chests/wooden" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "solarcooker:reflector" - } - } - }, - "requirements": [ - [ - "has_chest", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/solarcooker/advancement/recipes/decorations/solar_cooker.json b/neoforge/src/main/resources/data/solarcooker/advancement/recipes/decorations/solar_cooker.json deleted file mode 100644 index 415c439..0000000 --- a/neoforge/src/main/resources/data/solarcooker/advancement/recipes/decorations/solar_cooker.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "solarcooker:solar_cooker" - ] - }, - "criteria": { - "has_chest": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#c:chests/wooden" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "solarcooker:solar_cooker" - } - } - }, - "requirements": [ - [ - "has_chest", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/solarcooker/recipe/reflector.json b/neoforge/src/main/resources/data/solarcooker/recipe/reflector.json deleted file mode 100644 index b0e48a7..0000000 --- a/neoforge/src/main/resources/data/solarcooker/recipe/reflector.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "tag": "c:glass_panes" - }, - { - "tag": "c:ingots/iron" - }, - { - "tag": "minecraft:wooden_slabs" - } - ], - "result": { - "id": "solarcooker:reflector" - } -} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/solarcooker/recipe/shining_diamond_block.json b/neoforge/src/main/resources/data/solarcooker/recipe/shining_diamond_block.json deleted file mode 100644 index afc438c..0000000 --- a/neoforge/src/main/resources/data/solarcooker/recipe/shining_diamond_block.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "solarcooker:solarcooking", - "category": "misc", - "ingredient": { - "tag": "c:storage_blocks/diamond" - }, - "result": { - "id": "solarcooker:shining_diamond_block" - }, - "experience": 0.3, - "cookingtime": 3000 -} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/solarcooker/recipe/solar_cooker.json b/neoforge/src/main/resources/data/solarcooker/recipe/solar_cooker.json deleted file mode 100644 index a75b64b..0000000 --- a/neoforge/src/main/resources/data/solarcooker/recipe/solar_cooker.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "misc", - "pattern": [ - "IRI", - "RCR", - "RRR" - ], - "key": { - "R": { - "item": "solarcooker:reflector" - }, - "I": { - "tag": "c:ingots/iron" - }, - "C": { - "tag": "c:chests/wooden" - } - }, - "result": { - "id": "solarcooker:solar_cooker" - } -} \ No newline at end of file