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/build.gradle b/build.gradle index ef65712..4c83ad7 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ processResources { } tasks.withType(JavaCompile).configureEach { - it.options.release = 17 + it.options.release = 21 } java { @@ -47,8 +47,8 @@ java { // If you remove this line, sources will not be generated. withSourcesJar() - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } jar { diff --git a/gradle.properties b/gradle.properties index 61819d2..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.20.1 -yarn_mappings=1.20.1+build.10 -loader_version=0.16.5 +minecraft_version=1.21.4 +yarn_mappings=1.21.4+build.8 +loader_version=0.16.10 # Mod Properties -mod_version=1.0.1 +mod_version=1.0.4 maven_group=net.chaoticbyte.hardboiled archives_base_name=hardboiled # Dependencies -fabric_version=0.92.2+1.20.1 \ 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/java/net/chaoticbyte/hardboiled/HardBoiledItems.java b/src/main/java/net/chaoticbyte/hardboiled/HardBoiledItems.java index 0cd134d..ae360da 100644 --- a/src/main/java/net/chaoticbyte/hardboiled/HardBoiledItems.java +++ b/src/main/java/net/chaoticbyte/hardboiled/HardBoiledItems.java @@ -1,23 +1,22 @@ package net.chaoticbyte.hardboiled; -import net.minecraft.item.FoodComponent; +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() - .hunger(3) - .snack() + .nutrition(3) .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/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/data/hardboiled/recipes/hardboiled_egg_campfire.json b/src/main/resources/data/hardboiled/recipe/hardboiled_egg_campfire.json similarity index 50% rename from src/main/resources/data/hardboiled/recipes/hardboiled_egg_campfire.json rename to src/main/resources/data/hardboiled/recipe/hardboiled_egg_campfire.json index f836278..c898a70 100644 --- a/src/main/resources/data/hardboiled/recipes/hardboiled_egg_campfire.json +++ b/src/main/resources/data/hardboiled/recipe/hardboiled_egg_campfire.json @@ -1,9 +1,9 @@ { "type": "minecraft:campfire_cooking", - "ingredient": { - "item": "minecraft:egg" + "ingredient": "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/recipe/hardboiled_egg_furnace.json new file mode 100644 index 0000000..1e0043d --- /dev/null +++ b/src/main/resources/data/hardboiled/recipe/hardboiled_egg_furnace.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": "minecraft:egg", + "result": { + "id": "hardboiled:hardboiled_egg" + }, + "experience": 0.25, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/main/resources/data/hardboiled/recipes/hardboiled_egg_furnace.json b/src/main/resources/data/hardboiled/recipes/hardboiled_egg_furnace.json deleted file mode 100644 index 1377897..0000000 --- a/src/main/resources/data/hardboiled/recipes/hardboiled_egg_furnace.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "item": "minecraft: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 17559a7..9c0dbd9 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -21,9 +21,9 @@ }, "mixins": [], "depends": { - "fabricloader": ">=0.16.0", - "minecraft": "~1.20.1", - "java": ">=17", + "fabricloader": ">=0.16.10", + "minecraft": "1.21.4", + "java": ">=21", "fabric-api": "*" }, "suggests": {}