From 98e57ff4a5e09b2f1410f6400e814ea8a82a8141 Mon Sep 17 00:00:00 2001
From: David-123 <1826013250@qq.com>
Date: Sat, 8 Mar 2025 13:30:45 +0800
Subject: [PATCH] Fixes

Fix texture missing, adding translate.
---
 src/main/java/com/learning/block/DamageBlock.java    | 12 +++++++++++-
 src/main/java/com/learning/item/CustomItem.java      | 10 +++++++---
 src/main/resources/assets/learning/lang/en_us.json   |  6 ++++++
 .../resources/data/learning/recipe/baked_toast.json  | 10 ++++++++++
 4 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 src/main/resources/data/learning/recipe/baked_toast.json

diff --git a/src/main/java/com/learning/block/DamageBlock.java b/src/main/java/com/learning/block/DamageBlock.java
index bd380f9..083e15b 100644
--- a/src/main/java/com/learning/block/DamageBlock.java
+++ b/src/main/java/com/learning/block/DamageBlock.java
@@ -1,5 +1,6 @@
 package com.learning.block;
 
+import java.util.List;
 
 import net.minecraft.block.AbstractBlock;
 import net.minecraft.block.Block;
@@ -8,14 +9,23 @@ import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.entity.Entity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Item.TooltipContext;
+import net.minecraft.item.tooltip.TooltipType;
+import net.minecraft.text.Text;
 
 public class DamageBlock extends Block {
     public DamageBlock(AbstractBlock.Settings settings) {
         super(settings);
     }
     public void onSteppedOn(World world, BlockPos pos, BlockState state, Entity entity) {
-        if (!world.isClient()) {
+        if (!world.isClient() && entity.canHit()) {
             entity.damage((ServerWorld)world, world.getDamageSources().generic(), 6f);
         }
     }
+
+    public void appendTooltip(ItemStack stack, TooltipContext context, List<Text> tooltip, TooltipType type) {
+        super.appendTooltip(stack, context, tooltip, type);
+        tooltip.add(Text.translatable("toolTip.learning.damage_block"));
+    }
 }
diff --git a/src/main/java/com/learning/item/CustomItem.java b/src/main/java/com/learning/item/CustomItem.java
index c4abfbd..900b61d 100644
--- a/src/main/java/com/learning/item/CustomItem.java
+++ b/src/main/java/com/learning/item/CustomItem.java
@@ -24,11 +24,15 @@ public class CustomItem {
 
     public static Item toast = register("toast", Toast::new, new Item.Settings().food(Foods.toastFood));
     public static Item bakedToast = register("baked_toast", BakedToast::new, new Item.Settings().food(Foods.bakedToastFood, ConsumableComponents.food().consumeSeconds(0.8f).build()));
-    public static Item damageBlock = register(CustomBlocks.damageBlock);
+    public static Item damageBlock = register(CustomBlocks.damageBlock, false);
 
-    private static Item register(Block block) {
+    private static Item register(Block block, Boolean useItemTranslateKey) {
         RegistryKey<Item> key = keyOf(Registries.BLOCK.getKey(block).get());
-        return Registry.register(Registries.ITEM, key, new BlockItem(block, new Item.Settings().useItemPrefixedTranslationKey().registryKey(key)));
+        Item.Settings settings = new Item.Settings().registryKey(key);
+        if (!useItemTranslateKey) {
+            settings.useBlockPrefixedTranslationKey();
+        }
+        return register(key, (Item)new BlockItem(block, settings));
         
     }
 
diff --git a/src/main/resources/assets/learning/lang/en_us.json b/src/main/resources/assets/learning/lang/en_us.json
index 88a3e3f..4de9584 100644
--- a/src/main/resources/assets/learning/lang/en_us.json
+++ b/src/main/resources/assets/learning/lang/en_us.json
@@ -1,10 +1,16 @@
 {
     "item.learning.toast": "Toast",
+    "item.learning.baked_toast": "Baked Toast",
+
+    "block.learning.damage_block": "Damage Block",
 
     "itemGroup.learning.custom_itemgroup": "My Dear...",
 
     "toolTip.learning.toast0": "A simple fastfood.",
     "toolTip.learning.toast1": "Will be tastier after baking in the furnace!",
+    "toolTip.learning.baked_toast": "Yummy!",
+    "toolTip.learning.damage_block": "Will hurt entities which stands on this block.",
+
     "toolTip.learning.hold_control": "Hold §6Control §rto show more information.",
     "toolTip.learning.hold_shift": "Hold §6Shift §rto show more information."
 }
diff --git a/src/main/resources/data/learning/recipe/baked_toast.json b/src/main/resources/data/learning/recipe/baked_toast.json
new file mode 100644
index 0000000..cabf17d
--- /dev/null
+++ b/src/main/resources/data/learning/recipe/baked_toast.json
@@ -0,0 +1,10 @@
+{
+  "type": "minecraft:smelting",
+  "category": "food",
+  "cookingtime": 200,
+  "experience": 0.35,
+  "ingredient": "learning:toast",
+  "result": {
+    "id": "learning:baked_toast"
+  }
+}