From b441a39323ee6815bf3acae1bd3ded3cd1d4654e Mon Sep 17 00:00:00 2001 From: ChaoticByte Date: Sat, 14 Sep 2024 22:56:36 +0200 Subject: [PATCH 1/7] Backport to Minecraft 1.20.1 --- gradle.properties | 8 ++++---- .../net/chaoticbyte/hardboiled/HardBoiledItems.java | 4 ++-- .../{recipe => recipes}/hardboiled_egg_campfire.json | 4 +--- .../{recipe => recipes}/hardboiled_egg_furnace.json | 4 +--- src/main/resources/fabric.mod.json | 10 ++++------ 5 files changed, 12 insertions(+), 18 deletions(-) rename src/main/resources/data/hardboiled/{recipe => recipes}/hardboiled_egg_campfire.json (70%) rename src/main/resources/data/hardboiled/{recipe => recipes}/hardboiled_egg_furnace.json (68%) diff --git a/gradle.properties b/gradle.properties index 2ff0ccf..61819d2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,14 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21.1 -yarn_mappings=1.21.1+build.3 +minecraft_version=1.20.1 +yarn_mappings=1.20.1+build.10 loader_version=0.16.5 # Mod Properties -mod_version=1.0.0 +mod_version=1.0.1 maven_group=net.chaoticbyte.hardboiled archives_base_name=hardboiled # Dependencies -fabric_version=0.104.0+1.21.1 \ No newline at end of file +fabric_version=0.92.2+1.20.1 \ No newline at end of file diff --git a/src/main/java/net/chaoticbyte/hardboiled/HardBoiledItems.java b/src/main/java/net/chaoticbyte/hardboiled/HardBoiledItems.java index b22a356..0cd134d 100644 --- a/src/main/java/net/chaoticbyte/hardboiled/HardBoiledItems.java +++ b/src/main/java/net/chaoticbyte/hardboiled/HardBoiledItems.java @@ -1,6 +1,6 @@ package net.chaoticbyte.hardboiled; -import net.minecraft.component.type.FoodComponent; +import net.minecraft.item.FoodComponent; import net.minecraft.item.Item; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; @@ -9,7 +9,7 @@ import net.minecraft.util.Identifier; public class HardBoiledItems { // default food component public static final FoodComponent foodComponent = new FoodComponent.Builder() - .nutrition(3) + .hunger(3) .snack() .build(); // register item diff --git a/src/main/resources/data/hardboiled/recipe/hardboiled_egg_campfire.json b/src/main/resources/data/hardboiled/recipes/hardboiled_egg_campfire.json similarity index 70% rename from src/main/resources/data/hardboiled/recipe/hardboiled_egg_campfire.json rename to src/main/resources/data/hardboiled/recipes/hardboiled_egg_campfire.json index 0dbb2d5..f836278 100644 --- a/src/main/resources/data/hardboiled/recipe/hardboiled_egg_campfire.json +++ b/src/main/resources/data/hardboiled/recipes/hardboiled_egg_campfire.json @@ -3,9 +3,7 @@ "ingredient": { "item": "minecraft:egg" }, - "result": { - "id": "hardboiled:hardboiled_egg" - }, + "result": "hardboiled:hardboiled_egg", "experience": 0.25, "cookingtime": 200 } \ No newline at end of file diff --git a/src/main/resources/data/hardboiled/recipe/hardboiled_egg_furnace.json b/src/main/resources/data/hardboiled/recipes/hardboiled_egg_furnace.json similarity index 68% rename from src/main/resources/data/hardboiled/recipe/hardboiled_egg_furnace.json rename to src/main/resources/data/hardboiled/recipes/hardboiled_egg_furnace.json index 287c277..1377897 100644 --- a/src/main/resources/data/hardboiled/recipe/hardboiled_egg_furnace.json +++ b/src/main/resources/data/hardboiled/recipes/hardboiled_egg_furnace.json @@ -3,9 +3,7 @@ "ingredient": { "item": "minecraft:egg" }, - "result": { - "id": "hardboiled:hardboiled_egg" - }, + "result": "hardboiled:hardboiled_egg", "experience": 0.25, "cookingtime": 200 } \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 71442a6..17559a7 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -21,12 +21,10 @@ }, "mixins": [], "depends": { - "fabricloader": ">=0.16.5", - "minecraft": "~1.21.1", - "java": ">=21", + "fabricloader": ">=0.16.0", + "minecraft": "~1.20.1", + "java": ">=17", "fabric-api": "*" }, - "suggests": { - "another-mod": "*" - } + "suggests": {} } \ No newline at end of file From 2a7532be2ba3977646ee7305ef98ff1f47587478 Mon Sep 17 00:00:00 2001 From: ChaoticByte Date: Sat, 14 Sep 2024 23:00:05 +0200 Subject: [PATCH 2/7] Update README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 4952494..d495594 100644 --- a/README.md +++ b/README.md @@ -11,4 +11,5 @@ This is a Fabric-only mod. The following Minecraft versions are supported: +- 1.20.1 - 1.21.1 From 1d1510eb0f8bc01941fca189aababf7ca844cd2b Mon Sep 17 00:00:00 2001 From: ChaoticByte Date: Sat, 14 Sep 2024 23:00:05 +0200 Subject: [PATCH 3/7] Update README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 4952494..d495594 100644 --- a/README.md +++ b/README.md @@ -11,4 +11,5 @@ This is a Fabric-only mod. The following Minecraft versions are supported: +- 1.20.1 - 1.21.1 From c97416d113a5227aac89c55b32c84b1644cbf4df Mon Sep 17 00:00:00 2001 From: ChaoticByte Date: Sat, 14 Sep 2024 23:02:45 +0200 Subject: [PATCH 4/7] Remove 'another-mod' from suggests field in fabric.mod.json (leftover from template) and bump version to 1.0.1 --- gradle.properties | 2 +- src/main/resources/fabric.mod.json | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2ff0ccf..2c96f32 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ yarn_mappings=1.21.1+build.3 loader_version=0.16.5 # Mod Properties -mod_version=1.0.0 +mod_version=1.0.1 maven_group=net.chaoticbyte.hardboiled archives_base_name=hardboiled diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 71442a6..13dfdc0 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -26,7 +26,5 @@ "java": ">=21", "fabric-api": "*" }, - "suggests": { - "another-mod": "*" - } + "suggests": {} } \ No newline at end of file From 99d16627ea1b7c2cf41012123aa02fbd73931cd9 Mon Sep 17 00:00:00 2001 From: ChaoticByte Date: Sat, 14 Sep 2024 23:13:58 +0200 Subject: [PATCH 5/7] Set Java version in build.gradle back to 17 --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 4c83ad7..ef65712 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ processResources { } tasks.withType(JavaCompile).configureEach { - it.options.release = 21 + it.options.release = 17 } java { @@ -47,8 +47,8 @@ java { // If you remove this line, sources will not be generated. withSourcesJar() - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } jar { From 5df8395298e9867f2c44bdb0c715426ad349735e Mon Sep 17 00:00:00 2001 From: ChaoticByte Date: Fri, 1 Nov 2024 21:37:33 +0100 Subject: [PATCH 6/7] Updated code and dependencies for minecraft 1.21.3 --- README.md | 11 +---------- gradle.properties | 10 +++++----- .../net/chaoticbyte/hardboiled/HardBoiledItems.java | 11 +++++------ .../hardboiled/recipe/hardboiled_egg_campfire.json | 4 +--- .../hardboiled/recipe/hardboiled_egg_furnace.json | 4 +--- src/main/resources/fabric.mod.json | 4 ++-- 6 files changed, 15 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index d495594..98a39ef 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,6 @@ # Hard Boiled -This Minecraft mod allows cooking egg into hard-boiled egg, using +This Minecraft Fabric mod allows cooking egg into hard-boiled egg, using - a campfire - a furnace - -## Supported Minecraft Versions / Mod Loaders - -This is a Fabric-only mod. - -The following Minecraft versions are supported: - -- 1.20.1 -- 1.21.1 diff --git a/gradle.properties b/gradle.properties index 2c96f32..dc2ead3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,14 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21.1 -yarn_mappings=1.21.1+build.3 -loader_version=0.16.5 +minecraft_version=1.21.3 +yarn_mappings=1.21.3+build.2 +loader_version=0.16.9 # Mod Properties -mod_version=1.0.1 +mod_version=1.0.3 maven_group=net.chaoticbyte.hardboiled archives_base_name=hardboiled # Dependencies -fabric_version=0.104.0+1.21.1 \ No newline at end of file +fabric_version=0.107.0+1.21.3 \ No newline at end of file diff --git a/src/main/java/net/chaoticbyte/hardboiled/HardBoiledItems.java b/src/main/java/net/chaoticbyte/hardboiled/HardBoiledItems.java index b22a356..ae360da 100644 --- a/src/main/java/net/chaoticbyte/hardboiled/HardBoiledItems.java +++ b/src/main/java/net/chaoticbyte/hardboiled/HardBoiledItems.java @@ -2,22 +2,21 @@ package net.chaoticbyte.hardboiled; import net.minecraft.component.type.FoodComponent; import net.minecraft.item.Item; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; +import net.minecraft.item.Items; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; import net.minecraft.util.Identifier; public class HardBoiledItems { // default food component public static final FoodComponent foodComponent = new FoodComponent.Builder() .nutrition(3) - .snack() .build(); // register item public static Item register(String id) { + final RegistryKey regKey = RegistryKey.of(RegistryKeys.ITEM, Identifier.of(HardBoiled.MOD_ID, id)); Item.Settings settings = new Item.Settings().food(foodComponent); - Identifier itemId = Identifier.of(HardBoiled.MOD_ID, id); - Item item = new Item(settings); - return Registry.register(Registries.ITEM, itemId, item); + return Items.register(regKey, Item::new, settings); } // dummy init method public static void init() {} diff --git a/src/main/resources/data/hardboiled/recipe/hardboiled_egg_campfire.json b/src/main/resources/data/hardboiled/recipe/hardboiled_egg_campfire.json index 0dbb2d5..c898a70 100644 --- a/src/main/resources/data/hardboiled/recipe/hardboiled_egg_campfire.json +++ b/src/main/resources/data/hardboiled/recipe/hardboiled_egg_campfire.json @@ -1,8 +1,6 @@ { "type": "minecraft:campfire_cooking", - "ingredient": { - "item": "minecraft:egg" - }, + "ingredient": "minecraft:egg", "result": { "id": "hardboiled:hardboiled_egg" }, diff --git a/src/main/resources/data/hardboiled/recipe/hardboiled_egg_furnace.json b/src/main/resources/data/hardboiled/recipe/hardboiled_egg_furnace.json index 287c277..1e0043d 100644 --- a/src/main/resources/data/hardboiled/recipe/hardboiled_egg_furnace.json +++ b/src/main/resources/data/hardboiled/recipe/hardboiled_egg_furnace.json @@ -1,8 +1,6 @@ { "type": "minecraft:smelting", - "ingredient": { - "item": "minecraft:egg" - }, + "ingredient": "minecraft:egg", "result": { "id": "hardboiled:hardboiled_egg" }, diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 13dfdc0..0beaa70 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -21,8 +21,8 @@ }, "mixins": [], "depends": { - "fabricloader": ">=0.16.5", - "minecraft": "~1.21.1", + "fabricloader": ">=0.16.9", + "minecraft": "1.21.3", "java": ">=21", "fabric-api": "*" }, From 50ab5f9a7efd296c9ed8c277da6da22cd5b7df7f Mon Sep 17 00:00:00 2001 From: ChaoticByte Date: Sun, 16 Mar 2025 10:52:31 +0100 Subject: [PATCH 7/7] Update dependencies and code for Minecraft 1.21.4 --- gradle.properties | 10 +++++----- .../assets/hardboiled/items/hardboiled_egg.json | 6 ++++++ .../assets/hardboiled/models/item/hardboiled_egg.json | 2 +- src/main/resources/fabric.mod.json | 4 ++-- 4 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/assets/hardboiled/items/hardboiled_egg.json diff --git a/gradle.properties b/gradle.properties index dc2ead3..2e669d1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,14 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21.3 -yarn_mappings=1.21.3+build.2 -loader_version=0.16.9 +minecraft_version=1.21.4 +yarn_mappings=1.21.4+build.8 +loader_version=0.16.10 # Mod Properties -mod_version=1.0.3 +mod_version=1.0.4 maven_group=net.chaoticbyte.hardboiled archives_base_name=hardboiled # Dependencies -fabric_version=0.107.0+1.21.3 \ No newline at end of file +fabric_version=0.118.5+1.21.4 \ No newline at end of file diff --git a/src/main/resources/assets/hardboiled/items/hardboiled_egg.json b/src/main/resources/assets/hardboiled/items/hardboiled_egg.json new file mode 100644 index 0000000..dba5176 --- /dev/null +++ b/src/main/resources/assets/hardboiled/items/hardboiled_egg.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "hardboiled:item/hardboiled_egg" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hardboiled/models/item/hardboiled_egg.json b/src/main/resources/assets/hardboiled/models/item/hardboiled_egg.json index d82ca36..bd02133 100644 --- a/src/main/resources/assets/hardboiled/models/item/hardboiled_egg.json +++ b/src/main/resources/assets/hardboiled/models/item/hardboiled_egg.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "hardboiled:item/hardboiled_egg" } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 0beaa70..9c0dbd9 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -21,8 +21,8 @@ }, "mixins": [], "depends": { - "fabricloader": ">=0.16.9", - "minecraft": "1.21.3", + "fabricloader": ">=0.16.10", + "minecraft": "1.21.4", "java": ">=21", "fabric-api": "*" },