diff --git a/src/main/java/com/learning/Commands.java b/src/main/java/com/learning/Commands.java new file mode 100644 index 0000000..54259a9 --- /dev/null +++ b/src/main/java/com/learning/Commands.java @@ -0,0 +1,5 @@ +package com.learning; + +public class Commands { + +} diff --git a/src/main/java/com/learning/Learning.java b/src/main/java/com/learning/Learning.java index 214a4dd..179390e 100644 --- a/src/main/java/com/learning/Learning.java +++ b/src/main/java/com/learning/Learning.java @@ -1,11 +1,12 @@ package com.learning; +import com.learning.block.CustomBlocks; import net.fabricmc.api.ModInitializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.learning.item.CustomItem; +import com.learning.item.CustomItems; import com.learning.itemgroup.CustomItemGroup; public class Learning implements ModInitializer { @@ -23,7 +24,8 @@ public class Learning implements ModInitializer { // Proceed with mild caution. LOGGER.info("Hello Fabric world!"); - CustomItem.registerItems(); + CustomBlocks.registerBlocks(); + CustomItems.registerItems(); CustomItemGroup.registerItemGroup(); } } diff --git a/src/main/java/com/learning/component/Foods.java b/src/main/java/com/learning/component/Foods.java index 00a1e23..00936ed 100644 --- a/src/main/java/com/learning/component/Foods.java +++ b/src/main/java/com/learning/component/Foods.java @@ -3,6 +3,6 @@ package com.learning.component; import net.minecraft.component.type.FoodComponent; public class Foods { - public static FoodComponent toastFood = new FoodComponent.Builder().nutrition(2).build(); - public static FoodComponent bakedToastFood = new FoodComponent.Builder().nutrition(6).build(); + public static FoodComponent toastFood = new FoodComponent.Builder().nutrition(2).saturationModifier(1f).build(); + public static FoodComponent bakedToastFood = new FoodComponent.Builder().nutrition(6).saturationModifier(1f).build(); } diff --git a/src/main/java/com/learning/item/CustomItem.java b/src/main/java/com/learning/item/CustomItems.java similarity index 98% rename from src/main/java/com/learning/item/CustomItem.java rename to src/main/java/com/learning/item/CustomItems.java index 900b61d..f26fb59 100644 --- a/src/main/java/com/learning/item/CustomItem.java +++ b/src/main/java/com/learning/item/CustomItems.java @@ -17,7 +17,7 @@ import net.minecraft.util.Identifier; import net.minecraft.block.Block; import net.minecraft.component.type.ConsumableComponents; -public class CustomItem { +public class CustomItems { public static void registerItems() { Learning.LOGGER.info("Registering Items..."); } diff --git a/src/main/java/com/learning/itemgroup/CustomItemGroup.java b/src/main/java/com/learning/itemgroup/CustomItemGroup.java index a4a78cc..ea7897c 100644 --- a/src/main/java/com/learning/itemgroup/CustomItemGroup.java +++ b/src/main/java/com/learning/itemgroup/CustomItemGroup.java @@ -2,7 +2,7 @@ package com.learning.itemgroup; import com.learning.Learning; -import com.learning.item.CustomItem; +import com.learning.item.CustomItems; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.minecraft.item.ItemGroup; @@ -18,17 +18,17 @@ public class CustomItemGroup { Learning.LOGGER.info("Registering ItemGroup..."); Learning.LOGGER.info("Registering item into ItemGroups..."); ItemGroupEvents.modifyEntriesEvent(ItemGroups.FOOD_AND_DRINK).register( - register -> register.add(CustomItem.toast) + register -> register.add(CustomItems.toast) ); } public static ItemGroup customItemGroup = register("custom_itemgroup", ItemGroup.create(null, -1) - .icon(() -> new ItemStack(CustomItem.toast)) + .icon(() -> new ItemStack(CustomItems.toast)) .displayName(Text.translatable("itemGroup.learning.custom_itemgroup")) .entries((displayContext, entries) -> { - entries.add(CustomItem.toast); - entries.add(CustomItem.bakedToast); - entries.add(CustomItem.damageBlock); + entries.add(CustomItems.toast); + entries.add(CustomItems.bakedToast); + entries.add(CustomItems.damageBlock); }) .build()); diff --git a/src/main/resources/data/learning/loot_table/blocks/damage_block.json b/src/main/resources/data/learning/loot_table/blocks/damage_block.json new file mode 100644 index 0000000..41d0f4f --- /dev/null +++ b/src/main/resources/data/learning/loot_table/blocks/damage_block.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "learning:damage_block" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "learning:blocks/damage_block" +} \ No newline at end of file diff --git a/src/main/resources/data/learning/recipe/baked_toast_smoking.json b/src/main/resources/data/learning/recipe/baked_toast_smoking.json new file mode 100644 index 0000000..a7629e6 --- /dev/null +++ b/src/main/resources/data/learning/recipe/baked_toast_smoking.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smoking", + "category": "food", + "cookingtime": 100, + "experience": 0.35, + "ingredient": "learning:toast", + "result": { + "id": "learning:baked_toast" + } +}