Merge branch 'main' into dependabot/github_actions/actions/download-artifact-6

lonelyicer · web-flow · commit d0f0581d5cc4 · 2025-12-03T23:02:58.000+08:00
diff --git a/src/generated/resources/assets/mia/blockstates/sun_stone.json b/src/generated/resources/assets/mia/blockstates/sun_stone.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "mia:block/sun_stone"
+    }
+  }
+}
diff --git a/src/generated/resources/assets/mia/models/block/sun_stone.json b/src/generated/resources/assets/mia/models/block/sun_stone.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "mia:block/sun_stone"
+  }
+}
diff --git a/src/generated/resources/assets/mia/models/item/sun_stone.json b/src/generated/resources/assets/mia/models/item/sun_stone.json
@@ -0,0 +1,3 @@
+{
+  "parent": "mia:block/sun_stone"
+}
diff --git a/src/generated/resources/data/mia/advancement/recipes/building_blocks/polished_abyss_andesite_slab.json b/src/generated/resources/data/mia/advancement/recipes/building_blocks/polished_abyss_andesite_slab.json
@@ -1,11 +1,11 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_abyss_andesite": {
+    "has_polished_abyss_andesite": {
       "conditions": {
         "items": [
           {
-            "items": "mia:abyss_andesite"
+            "items": "mia:polished_abyss_andesite"
           }
         ]
       },
@@ -21,7 +21,7 @@
   "requirements": [
     [
       "has_the_recipe",
-      "has_abyss_andesite"
+      "has_polished_abyss_andesite"
     ]
   ],
   "rewards": {
diff --git a/src/generated/resources/data/mia/advancement/recipes/building_blocks/polished_abyss_andesite_wall.json b/src/generated/resources/data/mia/advancement/recipes/building_blocks/polished_abyss_andesite_wall.json
@@ -1,11 +1,11 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_abyss_andesite": {
+    "has_polished_abyss_andesite": {
       "conditions": {
         "items": [
           {
-            "items": "mia:abyss_andesite"
+            "items": "mia:polished_abyss_andesite"
           }
         ]
       },
@@ -21,7 +21,7 @@
   "requirements": [
     [
       "has_the_recipe",
-      "has_abyss_andesite"
+      "has_polished_abyss_andesite"
     ]
   ],
   "rewards": {
diff --git a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json
@@ -58,6 +58,7 @@
     "mia:prasiolite_lamptube",
     "mia:pedestal",
     "mia:artifact_smithing_table",
-    "mia:endless_cup"
+    "mia:endless_cup",
+    "mia:sun_stone"
   ]
 }
diff --git a/src/main/java/com/altnoir/mia/datagen/MiaBlockStateProvider.java b/src/main/java/com/altnoir/mia/datagen/MiaBlockStateProvider.java
@@ -44,6 +44,7 @@ protected void registerStatesAndModels() {
         coverGrassBlock(MiaBlocks.COVERGRASS_ABYSS_ANDESITE, MiaBlocks.ABYSS_ANDESITE);
         coverGrassBlock(MiaBlocks.COVERGRASS_TUFF, Blocks.TUFF);
         mirroredBlock(MiaBlocks.ABYSS_ANDESITE);
+        blockWithItem(MiaBlocks.SUN_STONE);
         // 深界安山岩
         stairsBlockWithItem(MiaBlocks.ABYSS_ANDESITE_STAIRS, MiaBlocks.ABYSS_ANDESITE);
         slabBlockWithItem(MiaBlocks.ABYSS_ANDESITE_SLAB, MiaBlocks.ABYSS_ANDESITE);
diff --git a/src/main/java/com/altnoir/mia/datagen/MiaBlockTagProvider.java b/src/main/java/com/altnoir/mia/datagen/MiaBlockTagProvider.java
@@ -174,7 +174,8 @@ protected void addTags(HolderLookup.Provider provider) {
                 .add(MiaBlocks.PRASIOLITE_LAMPTUBE.get())
                 .add(MiaBlocks.PEDESTAL.get())
                 .add(MiaBlocks.ARTIFACT_SMITHING_TABLE.get())
-                .add(MiaBlocks.ENDLESS_CUP.get());
+                .add(MiaBlocks.ENDLESS_CUP.get())
+                .add(MiaBlocks.SUN_STONE.get());
 
 //        tag(BlockTags.MINEABLE_WITH_SHOVEL)
 //                .add(MiaBlocks.HOPPER_FARMLAND.get());
diff --git a/src/main/resources/assets/mia/lang/zh_cn.json b/src/main/resources/assets/mia/lang/zh_cn.json
@@ -105,6 +105,7 @@
     "block.mia.abyss_spawner": "深渊刷怪笼",
     "block.mia.endless_cup": "无尽水杯",
     "block.mia.artifact_smithing_table": "遗物锻造台",
+    "block.mia.sun_stone": "太阳石",
 
     "container.mia.artifact.smithing.title": "遗物锻造台",
 
diff --git a/src/main/resources/assets/mia/textures/block/sun_stone.png b/src/main/resources/assets/mia/textures/block/sun_stone.png

-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +{
 +  "variants": {
 +    "": {
 +      "model": "mia:block/sun_stone"
 +    }
 +  }
 +}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "parent": "mia:block/sun_stone"`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`{`
`2`	`2`	`"parent": "minecraft:recipes/root",`
`3`	`3`	`"criteria": {`
`4`		`- "has_abyss_andesite": {`
	`4`	`+ "has_polished_abyss_andesite": {`
`5`	`5`	`"conditions": {`
`6`	`6`	`"items": [`
`7`	`7`	`{`
`8`		`- "items": "mia:abyss_andesite"`
	`8`	`+ "items": "mia:polished_abyss_andesite"`
`9`	`9`	`}`
`10`	`10`	`]`
`11`	`11`	`},`
`@@ -21,7 +21,7 @@`
`21`	`21`	`"requirements": [`
`22`	`22`	`[`
`23`	`23`	`"has_the_recipe",`
`24`		`- "has_abyss_andesite"`
	`24`	`+ "has_polished_abyss_andesite"`
`25`	`25`	`]`
`26`	`26`	`],`
`27`	`27`	`"rewards": {`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@`
`58`	`58`	`"mia:prasiolite_lamptube",`
`59`	`59`	`"mia:pedestal",`
`60`	`60`	`"mia:artifact_smithing_table",`
`61`		`- "mia:endless_cup"`
	`61`	`+ "mia:endless_cup",`
	`62`	`+ "mia:sun_stone"`
`62`	`63`	`]`
`63`	`64`	`}`