Merge pull request #35 from Mxpea/dev

写了一些战利品列表，但似乎并没有起作用……

Author: YanJaChi

src/main/java/io/github/mxpea/fadingshadow/block/AnimatedBlock.java

@@ -4,6 +4,8 @@
 import io.github.mxpea.fadingshadow.block.entity.AnimatedBlockEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.tags.BlockTags;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.BaseEntityBlock;

src/main/java/io/github/mxpea/fadingshadow/block/ModBlock.java

@@ -3,6 +3,8 @@
 import io.github.mxpea.fadingshadow.FadingShadow;
 import io.github.mxpea.fadingshadow.item.ModItem;
 import io.github.mxpea.fadingshadow.item.ScrantonRealityAnchorsItem;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.tags.BlockTags;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
@@ -27,8 +29,8 @@ public class ModBlock {
                     () -> new AnimatedBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE)));
 
     public static final DeferredBlock<Block> netherreactor =
-            registerBlocks("netherreactor",
-                    () -> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.STONE)));
+            registerBlocks("netherreactor",         //添加代码需要正确的工具才能挖掘“.requiresCorrectToolForDrops()”
+                    () -> new Block(BlockBehaviour.Properties.of().strength(2.0F,6.0F)));
 
     // 默认情况下注册普通方块物品
     private static <T extends Block> void registerBlockItems(String name, DeferredBlock<T> block) {

src/main/java/io/github/mxpea/fadingshadow/item/ModCreativeTab.java

@@ -28,6 +28,7 @@ public class ModCreativeTab {
                         output.accept(ModItem.advanced_geiger_counter);
                         output.accept(ModItem.geiger_counter);
                         output.accept(ModItem.firesalt);
+                        output.accept(ModItem.firesalt_ingot);
                         output.accept(ModItem.lightning_in_a_bottle);
 
                         output.accept(ModBlock.scranton_reality_anchors);

src/main/java/io/github/mxpea/fadingshadow/item/ModItem.java

@@ -31,11 +31,13 @@ public class ModItem {
 
     public static final DeferredItem<Item> advanced_geiger_counter =
             ITEMS.register("advanced_geiger_counter", () -> new Item(new Item.Properties()));
-
     public static final DeferredItem<Item> geiger_counter =
             ITEMS.register("geiger_counter", () -> new Item(new Item.Properties()));
+
     public static final DeferredItem<Item> firesalt =
             ITEMS.register("firesalt", () -> new Item(new Item.Properties()));
+    public static final DeferredItem<Item> firesalt_ingot =
+            ITEMS.register("firesalt_ingot", () -> new Item(new Item.Properties()));
 
 
 

src/main/resources/assets/fadingshadow/lang/en_us.json

@@ -7,6 +7,7 @@
   "item.fadingshadow.advanced_geiger_counter": "advanced geiger counter",
   "item.fadingshadow.geiger_counter": "geiger counter",
   "item.fadingshadow.firesalt": "fire salt",
+  "item.fadingshadow.firesalt_ingot": "fire salt ingot",
 
   "item.minecraft.potion.effect.red_chili_juice":"chili water",
   "item.minecraft.splash_potion.effect.red_chili_juice":"splash chili water",

src/main/resources/assets/fadingshadow/lang/zh_cn.json

@@ -7,6 +7,7 @@
   "item.fadingshadow.geiger_counter": "盖革计数器",
   "item.fadingshadow.lightning_in_a_bottle": "瓶中闪电",
   "item.fadingshadow.firesalt": "火盐",
+  "item.fadingshadow.firesalt_ingot": "火盐锭",
 
   "item.minecraft.potion.effect.red_chili_juice":"辣椒水",
   "item.minecraft.splash_potion.effect.red_chili_juice":"喷溅辣椒水",

src/main/resources/assets/fadingshadow/models/item/firesalt_ingot.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "fadingshadow:item/firesalt_ingot"
+  }
+}

src/main/resources/assets/fadingshadow/textures/item/firesalt.png

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "fadingshadow:netherreactor"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "fadingshadow:netherreactor"
+}