stone indent and pillar + path assets

src/main/java/net/cr24/primeval/block/PrimevalBlocks.java

@@ -136,6 +136,8 @@ public class PrimevalBlocks {
     public static final BlockSet CRUDE_BRICKS = registerBlockSet("crude_bricks", SETTINGS_STONE(), Weight.HEAVY, Size.MEDIUM, PRIMEVAL_BLOCKS);
     public static final BlockSet STONE_BRICKS = registerBlockSet("stone_bricks", SETTINGS_STONE(), Weight.HEAVY, Size.MEDIUM, PRIMEVAL_BLOCKS);
     public static final BlockSet SMOOTH_STONE = registerBlockSet("smooth_stone", SETTINGS_STONE(), Weight.HEAVY, Size.MEDIUM, PRIMEVAL_BLOCKS);
+    public static final Block STONE_INDENT = registerBlock("stone_indent", new Block(SETTINGS_STONE()), Weight.HEAVY, Size.MEDIUM, PRIMEVAL_BLOCKS);
+    public static final Block STONE_PILLAR = registerBlock("stone_pillar", new PillarBlock(SETTINGS_STONE()), Weight.HEAVY, Size.MEDIUM, PRIMEVAL_BLOCKS);
     public static final BlockSet STONE_PAVER = registerBlockSet("stone_paver", SETTINGS_STONE(), Weight.HEAVY, Size.MEDIUM, PRIMEVAL_BLOCKS);
     public static final Block DAUB = registerBlock("daub", new Block(SETTINGS_REFINED_WOOD()), Weight.NORMAL, Size.MEDIUM, PRIMEVAL_BLOCKS);
     public static final Block FRAMED_DAUB = registerBlock("framed_daub", new Block(SETTINGS_REFINED_WOOD()), Weight.NORMAL, Size.MEDIUM, PRIMEVAL_BLOCKS);

src/main/resources/asset_helper.py

@@ -91,48 +91,8 @@ def create_ore_set(ore_type):
 #generate_stairs_block("stone_paver_stairs", "stone_paver")
 #generate_slab_block("stone_paver_slab", "stone_paver", "stone_paver")
 
-generate_standard_block("fired_clay_shingles_magenta")
-generate_stairs_block("fired_clay_shingles_magenta_stairs", "fired_clay_shingles_magenta")
-generate_slab_block("fired_clay_shingles_magenta_slab", "fired_clay_shingles_magenta", "fired_clay_shingles_magenta")
-generate_standard_block("fired_clay_shingles_light_blue")
-generate_stairs_block("fired_clay_shingles_light_blue_stairs", "fired_clay_shingles_light_blue")
-generate_slab_block("fired_clay_shingles_light_blue_slab", "fired_clay_shingles_light_blue", "fired_clay_shingles_light_blue")
-generate_standard_block("fired_clay_shingles_yellow")
-generate_stairs_block("fired_clay_shingles_yellow_stairs", "fired_clay_shingles_yellow")
-generate_slab_block("fired_clay_shingles_yellow_slab", "fired_clay_shingles_yellow", "fired_clay_shingles_yellow")
-generate_standard_block("fired_clay_shingles_lime")
-generate_stairs_block("fired_clay_shingles_lime_stairs", "fired_clay_shingles_lime")
-generate_slab_block("fired_clay_shingles_lime_slab", "fired_clay_shingles_lime", "fired_clay_shingles_lime")
-generate_standard_block("fired_clay_shingles_pink")
-generate_stairs_block("fired_clay_shingles_pink_stairs", "fired_clay_shingles_pink")
-generate_slab_block("fired_clay_shingles_pink_slab", "fired_clay_shingles_pink", "fired_clay_shingles_pink")
-generate_standard_block("fired_clay_shingles_dark_gray")
-generate_stairs_block("fired_clay_shingles_dark_gray_stairs", "fired_clay_shingles_dark_gray")
-generate_slab_block("fired_clay_shingles_dark_gray_slab", "fired_clay_shingles_dark_gray", "fired_clay_shingles_dark_gray")
-generate_standard_block("fired_clay_shingles_light_gray")
-generate_stairs_block("fired_clay_shingles_light_gray_stairs", "fired_clay_shingles_light_gray")
-generate_slab_block("fired_clay_shingles_light_gray_slab", "fired_clay_shingles_light_gray", "fired_clay_shingles_light_gray")
-generate_standard_block("fired_clay_shingles_cyan")
-generate_stairs_block("fired_clay_shingles_cyan_stairs", "fired_clay_shingles_cyan")
-generate_slab_block("fired_clay_shingles_cyan_slab", "fired_clay_shingles_cyan", "fired_clay_shingles_cyan")
-generate_standard_block("fired_clay_shingles_purple")
-generate_stairs_block("fired_clay_shingles_purple_stairs", "fired_clay_shingles_purple")
-generate_slab_block("fired_clay_shingles_purple_slab", "fired_clay_shingles_purple", "fired_clay_shingles_purple")
-generate_standard_block("fired_clay_shingles_blue")
-generate_stairs_block("fired_clay_shingles_blue_stairs", "fired_clay_shingles_blue")
-generate_slab_block("fired_clay_shingles_blue_slab", "fired_clay_shingles_blue", "fired_clay_shingles_blue")
-generate_standard_block("fired_clay_shingles_brown")
-generate_stairs_block("fired_clay_shingles_brown_stairs", "fired_clay_shingles_brown")
-generate_slab_block("fired_clay_shingles_brown_slab", "fired_clay_shingles_brown", "fired_clay_shingles_brown")
-generate_standard_block("fired_clay_shingles_green")
-generate_stairs_block("fired_clay_shingles_green_stairs", "fired_clay_shingles_green")
-generate_slab_block("fired_clay_shingles_green_slab", "fired_clay_shingles_green", "fired_clay_shingles_green")
-generate_standard_block("fired_clay_shingles_red")
-generate_stairs_block("fired_clay_shingles_red_stairs", "fired_clay_shingles_red")
-generate_slab_block("fired_clay_shingles_red_slab", "fired_clay_shingles_red", "fired_clay_shingles_red")
-generate_standard_block("fired_clay_shingles_black")
-generate_stairs_block("fired_clay_shingles_black_stairs", "fired_clay_shingles_black")
-generate_slab_block("fired_clay_shingles_black_slab", "fired_clay_shingles_black", "fired_clay_shingles_black")
+generate_standard_block("stone_indent")
+
 #create_ore_set("zinc_sphalerite")
 
 #generate_handheld_item("copper_hoe")

src/main/resources/assets/primeval/blockstates/grass_path.json

@@ -0,0 +1,21 @@
+{
+  "variants": {
+    "snowy=false": [
+      {
+        "model": "primeval:block/grass_path"
+      },
+      {
+        "model": "primeval:block/grass_path_dark",
+        "y": 90
+      },
+      {
+        "model": "primeval:block/grass_path",
+        "y": 180
+      },
+      {
+        "model": "primeval:block/grass_path_darkest",
+        "y": 270
+      }
+    ]
+  }
+}

src/main/resources/assets/primeval/blockstates/stone_indent.json

@@ -0,0 +1,7 @@
+{
+	"variants": {
+		"": {
+			"model": "primeval:block/stone_indent"
+		}
+	}
+}

src/main/resources/assets/primeval/blockstates/stone_pillar.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "axis=x": {
+      "model": "primeval:block/stone_pillar",
+      "x": 90,
+      "y": 90
+    },
+    "axis=y": {
+      "model": "primeval:block/stone_pillar"
+    },
+    "axis=z": {
+      "model": "primeval:block/stone_pillar",
+      "x": 90
+    }
+  }
+}

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

@@ -149,6 +149,8 @@
     "block.primeval.stone_bricks": "Stone Bricks",
     "block.primeval.stone_bricks_stairs": "Stone Brick Stairs",
     "block.primeval.stone_bricks_slab": "Stone Brick Slab",
+    "block.primeval.stone_indent": "Stone Indent",
+    "block.primeval.stone_pillar": "Stone Pillar",
     "block.primeval.stone_paver": "Stone Paver",
     "block.primeval.stone_paver_stairs": "Stone Paver Stairs",
     "block.primeval.stone_paver_slab": "Stone Paver Slab",

src/main/resources/assets/primeval/models/block/grass_path.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/template_farmland",
+  "textures": {
+    "dirt": "primeval:block/grass_path_side",
+    "top": "primeval:block/grass_path_top"
+  }
+}

src/main/resources/assets/primeval/models/block/grass_path_dark.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/template_farmland",
+  "textures": {
+    "dirt": "primeval:block/grass_path_side",
+    "top": "primeval:block/grass_path_top_dark"
+  }
+}

src/main/resources/assets/primeval/models/block/grass_path_darkest.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/template_farmland",
+  "textures": {
+    "dirt": "primeval:block/grass_path_side",
+    "top": "primeval:block/grass_path_top_darkest"
+  }
+}

src/main/resources/assets/primeval/models/block/stone_indent.json

@@ -0,0 +1,6 @@
+{
+	"parent": "minecraft:block/cube_all",
+	"textures": {
+		"all": "primeval:block/stone_indent"
+	}
+}

src/main/resources/assets/primeval/models/block/stone_pillar.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column",
+  "textures": {
+    "end": "primeval:block/stone_pillar_cap",
+    "side": "primeval:block/stone_pillar_mid"
+  }
+}

src/main/resources/assets/primeval/models/item/stone_indent.json

@@ -0,0 +1,3 @@
+{
+	"parent": "primeval:block/stone_indent"
+}

src/main/resources/assets/primeval/models/item/stone_pillar.json

@@ -0,0 +1,3 @@
+{
+	"parent": "primeval:block/stone_pillar"
+}

src/main/resources/data/primeval/loot_tables/blocks/stone_indent.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "primeval:stone_indent"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/main/resources/data/primeval/loot_tables/blocks/stone_pillar.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "primeval:stone_pillar"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/main/resources/data/primeval/recipes/stone_indent.json

@@ -0,0 +1,15 @@
+{
+    "type": "primeval:item_damaging",
+    "ingredients": [
+        {
+            "tag": "primeval:chisels"
+        },
+        {
+            "item": "primeval:smooth_stone"
+        }
+    ],
+    "result": {
+        "item": "primeval:stone_indent",
+        "count": 1
+    }
+}

src/main/resources/data/primeval/recipes/stone_pillar.json

@@ -0,0 +1,15 @@
+{
+    "type": "primeval:item_damaging",
+    "ingredients": [
+        {
+            "tag": "primeval:chisels"
+        },
+        {
+            "item": "primeval:stone_indent"
+        }
+    ],
+    "result": {
+        "item": "primeval:stone_pillar",
+        "count": 1
+    }
+}

src/main/resources/data/primeval/tags/blocks/mineable/pickaxe.json

@@ -20,6 +20,8 @@
     "primeval:stone_bricks",
     "primeval:stone_bricks_stairs",
     "primeval:stone_bricks_slab",
+    "primeval:stone_indent",
+    "primeval:stone_pillar",
     "primeval:stone_paver",
     "primeval:stone_paver_stairs",
     "primeval:stone_paver_slab",