Merge pull request #1169 from dmzz-yyhyy/dev/1.21

添加滑轨
Anvil-Dev · Nov 10, 2024 · 4dab2e7 · 4dab2e7
2 parents 5c3411c + 0d2b733
commit 4dab2e7
Show file tree

Hide file tree

Showing 26 changed files with 630 additions and 29 deletions.
diff --git a/src/generated/resources/assets/anvilcraft/blockstates/sliding_rail.json b/src/generated/resources/assets/anvilcraft/blockstates/sliding_rail.json
@@ -0,0 +1,14 @@
+{
+  "variants": {
+    "axis=x": {
+      "model": "anvilcraft:block/sliding_rail",
+      "y": 90
+    },
+    "axis=y": {
+      "model": "anvilcraft:block/sliding_rail"
+    },
+    "axis=z": {
+      "model": "anvilcraft:block/sliding_rail"
+    }
+  }
+}
diff --git a/src/generated/resources/assets/anvilcraft/blockstates/sliding_rail_stop.json b/src/generated/resources/assets/anvilcraft/blockstates/sliding_rail_stop.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "anvilcraft:block/sliding_rail_stop"
+    }
+  }
+}
diff --git a/src/generated/resources/assets/anvilcraft/lang/en_ud.json b/src/generated/resources/assets/anvilcraft/lang/en_ud.json
@@ -228,6 +228,8 @@
   "block.anvilcraft.silver_block": "ʞɔoןᗺ ɹǝʌןıS",
   "block.anvilcraft.silver_pressure_plate": "ǝʇɐןԀ ǝɹnssǝɹԀ ɹǝʌןıS",
   "block.anvilcraft.simple_chute": "ǝʇnɥƆ ǝןdɯıS",
+  "block.anvilcraft.sliding_rail": "ןıɐᴚ buıpıןS",
+  "block.anvilcraft.sliding_rail_stop": "doʇS ןıɐᴚ buıpıןS",
   "block.anvilcraft.smooth_royal_steel_block": "ʞɔoןᗺ ןǝǝʇS ןɐʎoᴚ ɥʇooɯS",
   "block.anvilcraft.space_overcompressor": "ɹossǝɹdɯoɔɹǝʌO ǝɔɐdS",
   "block.anvilcraft.spectral_anvil": "ןıʌuⱯ ןɐɹʇɔǝdS",

diff --git a/src/generated/resources/assets/anvilcraft/lang/en_us.json b/src/generated/resources/assets/anvilcraft/lang/en_us.json
@@ -228,6 +228,8 @@
   "block.anvilcraft.silver_block": "Silver Block",
   "block.anvilcraft.silver_pressure_plate": "Silver Pressure Plate",
   "block.anvilcraft.simple_chute": "Simple Chute",
+  "block.anvilcraft.sliding_rail": "Sliding Rail",
+  "block.anvilcraft.sliding_rail_stop": "Sliding Rail Stop",
   "block.anvilcraft.smooth_royal_steel_block": "Smooth Royal Steel Block",
   "block.anvilcraft.space_overcompressor": "Space Overcompressor",
   "block.anvilcraft.spectral_anvil": "Spectral Anvil",

diff --git a/src/generated/resources/assets/anvilcraft/models/item/sliding_rail.json b/src/generated/resources/assets/anvilcraft/models/item/sliding_rail.json
@@ -0,0 +1,3 @@
+{
+  "parent": "anvilcraft:block/sliding_rail"
+}
diff --git a/src/generated/resources/assets/anvilcraft/models/item/sliding_rail_stop.json b/src/generated/resources/assets/anvilcraft/models/item/sliding_rail_stop.json
@@ -0,0 +1,3 @@
+{
+  "parent": "anvilcraft:block/sliding_rail_stop"
+}
diff --git a/src/generated/resources/data/anvilcraft/advancement/recipes/misc/sliding_rail.json b/src/generated/resources/data/anvilcraft/advancement/recipes/misc/sliding_rail.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_blue_ice": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:blue_ice"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "anvilcraft:sliding_rail"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_blue_ice"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "anvilcraft:sliding_rail"
+    ]
+  }
+}
diff --git a/src/generated/resources/data/anvilcraft/advancement/recipes/misc/sliding_rail_stop.json b/src/generated/resources/data/anvilcraft/advancement/recipes/misc/sliding_rail_stop.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_blue_ice": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:blue_ice"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "anvilcraft:sliding_rail_stop"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_blue_ice"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "anvilcraft:sliding_rail_stop"
+    ]
+  }
+}
diff --git a/src/generated/resources/data/anvilcraft/loot_table/blocks/sliding_rail.json b/src/generated/resources/data/anvilcraft/loot_table/blocks/sliding_rail.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "anvilcraft:sliding_rail"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "anvilcraft:blocks/sliding_rail"
+}
diff --git a/src/generated/resources/data/anvilcraft/loot_table/blocks/sliding_rail_stop.json b/src/generated/resources/data/anvilcraft/loot_table/blocks/sliding_rail_stop.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "anvilcraft:sliding_rail_stop"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "anvilcraft:blocks/sliding_rail_stop"
+}
diff --git a/src/generated/resources/data/anvilcraft/recipe/sliding_rail.json b/src/generated/resources/data/anvilcraft/recipe/sliding_rail.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "key": {
+    "A": {
+      "item": "minecraft:blue_ice"
+    },
+    "B": {
+      "item": "minecraft:iron_ingot"
+    }
+  },
+  "pattern": [
+    "A A",
+    "BAB",
+    "BBB"
+  ],
+  "result": {
+    "count": 1,
+    "id": "anvilcraft:sliding_rail"
+  }
+}
diff --git a/src/generated/resources/data/anvilcraft/recipe/sliding_rail_stop.json b/src/generated/resources/data/anvilcraft/recipe/sliding_rail_stop.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "key": {
+    "A": {
+      "item": "minecraft:blue_ice"
+    },
+    "B": {
+      "item": "minecraft:iron_ingot"
+    }
+  },
+  "pattern": [
+    "A A",
+    "BAB",
+    "BBB"
+  ],
+  "result": {
+    "count": 1,
+    "id": "anvilcraft:sliding_rail_stop"
+  }
+}
diff --git a/src/main/java/dev/dubhe/anvilcraft/block/HollowMagnetBlock.java b/src/main/java/dev/dubhe/anvilcraft/block/HollowMagnetBlock.java
@@ -19,8 +19,6 @@
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
-import org.jetbrains.annotations.NotNull;
-
 import javax.annotation.ParametersAreNonnullByDefault;
 
 @ParametersAreNonnullByDefault
@@ -52,7 +50,6 @@ public VoxelShape getShape(
     }
 
     @Override
-
     public boolean useShapeForLightOcclusion(BlockState blockState) {
         return true;
     }
@@ -67,13 +64,11 @@ public BlockState getStateForPlacement(BlockPlaceContext blockPlaceContext) {
     }
 
     @Override
-
     public FluidState getFluidState(BlockState blockState) {
         return blockState.getValue(WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(blockState);
     }
 
     @Override
-
     public BlockState updateShape(
         BlockState blockState,
         Direction direction,