修护:稻米作物创造模式选取错误

MCZME · Aug 6, 2024 · 4105e58 · 4105e58
1 parent f5d08e8
commit 4105e58
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 31 deletions.
diff --git a/src/generated/resources/.cache/85f12f813aff948f91f5cd129c0ffa86bcb17361 b/src/generated/resources/.cache/85f12f813aff948f91f5cd129c0ffa86bcb17361
@@ -1,2 +1,2 @@
-// 1.21	2024-08-06T21:56:13.987637	Languages: zh_cn for mod: lingshi
-e555acbe8820b73ef1de654d149cfca34bba5963 assets/lingshi/lang/zh_cn.json
+// 1.21	2024-08-06T22:30:49.6383033	Languages: zh_cn for mod: lingshi
+99918422a5d56dab647af19828bb12044cdf0336 assets/lingshi/lang/zh_cn.json
diff --git a/src/generated/resources/assets/lingshi/lang/zh_cn.json b/src/generated/resources/assets/lingshi/lang/zh_cn.json
@@ -1,8 +1,8 @@
 {
   "block.lingshi.rice": "稻米",
+  "block.lingshi.rice_seedling": "稻苗",
   "block.lingshi.tea_tree": "茶树",
   "item.lingshi.rice_of_ear": "稻穗",
-  "item.lingshi.rice_seedling": "稻苗",
   "item.lingshi.tea_leaf": "茶叶",
   "lingshi.lingshi_tab": "灵食"
 }
diff --git a/src/main/java/mczme/lingshi/common/block/RiceBlock.java b/src/main/java/mczme/lingshi/common/block/RiceBlock.java
@@ -0,0 +1,17 @@
+package mczme.lingshi.common.block;
+
+import mczme.lingshi.common.registry.ModItems;
+import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.level.block.CropBlock;
+import org.jetbrains.annotations.NotNull;
+
+public class RiceBlock extends CropBlock {
+    public RiceBlock(Properties properties) {
+        super(properties);
+    }
+
+    @Override
+    protected @NotNull ItemLike getBaseSeedId() {
+        return ModItems.RICE.get();
+    }
+}
diff --git a/src/main/java/mczme/lingshi/common/item/RiceSeedlingItem.java b/src/main/java/mczme/lingshi/common/item/RiceSeedlingItem.java
diff --git a/src/main/java/mczme/lingshi/common/registry/ModBlocks.java b/src/main/java/mczme/lingshi/common/registry/ModBlocks.java
@@ -1,10 +1,6 @@
 package mczme.lingshi.common.registry;
 
-import mczme.lingshi.common.block.RiceSeedlingBlock;
-import mczme.lingshi.common.block.RiceSeedlingTopBlock;
-import mczme.lingshi.common.block.TeaBlock;
-import mczme.lingshi.common.block.TeaTreeBlock;
-import mczme.lingshi.common.item.Tea;
+import mczme.lingshi.common.block.*;
 import mczme.lingshi.lingshi;
 import net.minecraft.world.level.block.CropBlock;
 import net.minecraft.world.level.block.SoundType;
@@ -19,7 +15,7 @@
 public class ModBlocks {
     public static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(lingshi.MODID);
 
-    public static final Supplier<CropBlock> RICE = BLOCKS.registerBlock("rice", CropBlock::new,
+    public static final Supplier<CropBlock> RICE = BLOCKS.registerBlock("rice", RiceBlock::new,
             BlockBehaviour.Properties.of().mapColor(MapColor.PLANT)
             .noCollission()
             .randomTicks()

diff --git a/src/main/java/mczme/lingshi/common/registry/ModItems.java b/src/main/java/mczme/lingshi/common/registry/ModItems.java
@@ -1,6 +1,5 @@
 package mczme.lingshi.common.registry;
 
-import mczme.lingshi.common.item.RiceSeedlingItem;
 import mczme.lingshi.lingshi;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.Item;
@@ -16,7 +15,7 @@ public class ModItems {
     public static final List<Supplier<Item>> ITEMS_LIST = new ArrayList<>();
 
     public static final Supplier<Item> RICE = registerWithCreateTab("rice", ()->new BlockItem(ModBlocks.RICE.get(), new Item.Properties()));
-    public static final Supplier<Item> RICE_SEEDLING =registerWithCreateTab("rice_seedling", ()->new RiceSeedlingItem(ModBlocks.RICE_SEEDLING.get(),new Item.Properties()));
+    public static final Supplier<Item> RICE_SEEDLING =registerWithCreateTab("rice_seedling", ()->new BlockItem(ModBlocks.RICE_SEEDLING.get(), new Item.Properties()));
     public static final Supplier<Item> RICE_OF_EAR = registerWithCreateTab("rice_of_ear", () -> new Item(new Item.Properties()));
 
     public static final Supplier<Item> TEA_TREE = registerWithCreateTab("tea_tree", () -> new BlockItem(ModBlocks.TEA_TREE.get(), new Item.Properties()));