v2.0 - amber remnant blocks

DakotaPride · Oct 6, 2024 · 7367b6f · 7367b6f
1 parent 3f61d33
commit 7367b6f
Show file tree

Hide file tree

Showing 36 changed files with 536 additions and 6 deletions.
diff --git a/src/main/java/net/dakotapride/garnished/block/AmberRemnantStairsBlock.java b/src/main/java/net/dakotapride/garnished/block/AmberRemnantStairsBlock.java
@@ -0,0 +1,10 @@
+package net.dakotapride.garnished.block;
+
+import net.dakotapride.garnished.registry.GarnishedBlocks;
+import net.minecraft.world.level.block.StairBlock;
+
+public class AmberRemnantStairsBlock extends StairBlock {
+    public AmberRemnantStairsBlock(Properties properties) {
+        super(GarnishedBlocks.AMBER_REMNANT_BLOCK.get().defaultBlockState(), properties);
+    }
+}
diff --git a/src/main/java/net/dakotapride/garnished/registry/GarnishedBlocks.java b/src/main/java/net/dakotapride/garnished/registry/GarnishedBlocks.java
@@ -12,6 +12,7 @@
 import net.dakotapride.garnished.block.AbyssalStoneSlabBlock;
 import net.dakotapride.garnished.block.AbyssalStoneStairsBlock;
 import net.dakotapride.garnished.block.AbyssalStoneWallBlock;
+import net.dakotapride.garnished.block.AmberRemnantStairsBlock;
 import net.dakotapride.garnished.block.BokChoyPlantBlock;
 import net.dakotapride.garnished.block.CarnotiteStairsBlock;
 import net.dakotapride.garnished.block.DragonStoneStairsBlock;
@@ -1626,6 +1627,31 @@ public static BlockEntry<WallBlock> masticsmoothwall(String colour0) {
 					.initialProperties(() -> Blocks.STONE)
 					.properties(p -> p.explosionResistance(12.0F)).register();
 
+	public static final BlockEntry<Block> AMBER_REMNANT_BLOCK =
+			REGISTRATE.block("amber_remnant_block", Block::new)
+					.blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov)))
+					.simpleItem()
+					.initialProperties(() -> Blocks.STONE)
+					.properties(p -> p.explosionResistance(12.0F)).register();
+	public static final BlockEntry<SlabBlock> AMBER_REMNANT_SLAB =
+			REGISTRATE.block("amber_remnant_slab", SlabBlock::new)
+					.blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov)))
+					.simpleItem()
+					.initialProperties(() -> Blocks.STONE)
+					.properties(p -> p.explosionResistance(12.0F)).register();
+	public static final BlockEntry<AmberRemnantStairsBlock> AMBER_REMNANT_STAIRS =
+			REGISTRATE.block("amber_remnant_stairs", AmberRemnantStairsBlock::new)
+					.blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov)))
+					.simpleItem()
+					.initialProperties(() -> Blocks.STONE)
+					.properties(p -> p.explosionResistance(12.0F)).register();
+	public static final BlockEntry<WallBlock> AMBER_REMNANT_WALL =
+			REGISTRATE.block("amber_remnant_wall", WallBlock::new)
+					.blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov)))
+					.simpleItem()
+					.initialProperties(() -> Blocks.STONE)
+					.properties(p -> p.explosionResistance(12.0F)).register();
+
 	public static final BlockEntry<AnniversaryCakeBlock> ANNIVERSARY_CAKE =
 			REGISTRATE.block("anniversary_cake", AnniversaryCakeBlock::new)
 					.blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov)))

diff --git a/src/main/resources/assets/garnished/blockstates/amber_remnant_block.json b/src/main/resources/assets/garnished/blockstates/amber_remnant_block.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "garnished:block/amber_remnant_block"
+    }
+  }
+}
diff --git a/src/main/resources/assets/garnished/blockstates/amber_remnant_slab.json b/src/main/resources/assets/garnished/blockstates/amber_remnant_slab.json
@@ -0,0 +1,13 @@
+{
+  "variants": {
+    "type=bottom": {
+      "model": "garnished:block/amber_remnant_slab"
+    },
+    "type=double": {
+      "model": "garnished:block/amber_remnant_block"
+    },
+    "type=top": {
+      "model": "garnished:block/amber_remnant_slab_top"
+    }
+  }
+}
diff --git a/src/main/resources/assets/garnished/blockstates/amber_remnant_stairs.json b/src/main/resources/assets/garnished/blockstates/amber_remnant_stairs.json
@@ -0,0 +1,209 @@
+{
+  "variants": {
+    "facing=east,half=bottom,shape=inner_left": {
+      "model": "garnished:block/amber_remnant_stairs_inner",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,half=bottom,shape=inner_right": {
+      "model": "garnished:block/amber_remnant_stairs_inner"
+    },
+    "facing=east,half=bottom,shape=outer_left": {
+      "model": "garnished:block/amber_remnant_stairs_outer",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,half=bottom,shape=outer_right": {
+      "model": "garnished:block/amber_remnant_stairs_outer"
+    },
+    "facing=east,half=bottom,shape=straight": {
+      "model": "garnished:block/amber_remnant_stairs"
+    },
+    "facing=east,half=top,shape=inner_left": {
+      "model": "garnished:block/amber_remnant_stairs_inner",
+      "uvlock": true,
+      "x": 180
+    },
+    "facing=east,half=top,shape=inner_right": {
+      "model": "garnished:block/amber_remnant_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 90
+    },
+    "facing=east,half=top,shape=outer_left": {
+      "model": "garnished:block/amber_remnant_stairs_outer",
+      "uvlock": true,
+      "x": 180
+    },
+    "facing=east,half=top,shape=outer_right": {
+      "model": "garnished:block/amber_remnant_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 90
+    },
+    "facing=east,half=top,shape=straight": {
+      "model": "garnished:block/amber_remnant_stairs",
+      "uvlock": true,
+      "x": 180
+    },
+    "facing=north,half=bottom,shape=inner_left": {
+      "model": "garnished:block/amber_remnant_stairs_inner",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,half=bottom,shape=inner_right": {
+      "model": "garnished:block/amber_remnant_stairs_inner",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=north,half=bottom,shape=outer_left": {
+      "model": "garnished:block/amber_remnant_stairs_outer",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,half=bottom,shape=outer_right": {
+      "model": "garnished:block/amber_remnant_stairs_outer",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=north,half=bottom,shape=straight": {
+      "model": "garnished:block/amber_remnant_stairs",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=north,half=top,shape=inner_left": {
+      "model": "garnished:block/amber_remnant_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 270
+    },
+    "facing=north,half=top,shape=inner_right": {
+      "model": "garnished:block/amber_remnant_stairs_inner",
+      "uvlock": true,
+      "x": 180
+    },
+    "facing=north,half=top,shape=outer_left": {
+      "model": "garnished:block/amber_remnant_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 270
+    },
+    "facing=north,half=top,shape=outer_right": {
+      "model": "garnished:block/amber_remnant_stairs_outer",
+      "uvlock": true,
+      "x": 180
+    },
+    "facing=north,half=top,shape=straight": {
+      "model": "garnished:block/amber_remnant_stairs",
+      "uvlock": true,
+      "x": 180,
+      "y": 270
+    },
+    "facing=south,half=bottom,shape=inner_left": {
+      "model": "garnished:block/amber_remnant_stairs_inner"
+    },
+    "facing=south,half=bottom,shape=inner_right": {
+      "model": "garnished:block/amber_remnant_stairs_inner",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=south,half=bottom,shape=outer_left": {
+      "model": "garnished:block/amber_remnant_stairs_outer"
+    },
+    "facing=south,half=bottom,shape=outer_right": {
+      "model": "garnished:block/amber_remnant_stairs_outer",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=south,half=bottom,shape=straight": {
+      "model": "garnished:block/amber_remnant_stairs",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=south,half=top,shape=inner_left": {
+      "model": "garnished:block/amber_remnant_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 90
+    },
+    "facing=south,half=top,shape=inner_right": {
+      "model": "garnished:block/amber_remnant_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 180
+    },
+    "facing=south,half=top,shape=outer_left": {
+      "model": "garnished:block/amber_remnant_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 90
+    },
+    "facing=south,half=top,shape=outer_right": {
+      "model": "garnished:block/amber_remnant_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 180
+    },
+    "facing=south,half=top,shape=straight": {
+      "model": "garnished:block/amber_remnant_stairs",
+      "uvlock": true,
+      "x": 180,
+      "y": 90
+    },
+    "facing=west,half=bottom,shape=inner_left": {
+      "model": "garnished:block/amber_remnant_stairs_inner",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,half=bottom,shape=inner_right": {
+      "model": "garnished:block/amber_remnant_stairs_inner",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=west,half=bottom,shape=outer_left": {
+      "model": "garnished:block/amber_remnant_stairs_outer",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,half=bottom,shape=outer_right": {
+      "model": "garnished:block/amber_remnant_stairs_outer",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=west,half=bottom,shape=straight": {
+      "model": "garnished:block/amber_remnant_stairs",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=west,half=top,shape=inner_left": {
+      "model": "garnished:block/amber_remnant_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 180
+    },
+    "facing=west,half=top,shape=inner_right": {
+      "model": "garnished:block/amber_remnant_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 270
+    },
+    "facing=west,half=top,shape=outer_left": {
+      "model": "garnished:block/amber_remnant_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 180
+    },
+    "facing=west,half=top,shape=outer_right": {
+      "model": "garnished:block/amber_remnant_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 270
+    },
+    "facing=west,half=top,shape=straight": {
+      "model": "garnished:block/amber_remnant_stairs",
+      "uvlock": true,
+      "x": 180,
+      "y": 180
+    }
+  }
+}
diff --git a/src/main/resources/assets/garnished/blockstates/amber_remnant_wall.json b/src/main/resources/assets/garnished/blockstates/amber_remnant_wall.json
@@ -0,0 +1,90 @@
+{
+  "multipart": [
+    {
+      "apply": {
+        "model": "garnished:block/amber_remnant_wall_post"
+      },
+      "when": {
+        "up": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "garnished:block/amber_remnant_wall_side",
+        "uvlock": true
+      },
+      "when": {
+        "north": "low"
+      }
+    },
+    {
+      "apply": {
+        "model": "garnished:block/amber_remnant_wall_side",
+        "uvlock": true,
+        "y": 90
+      },
+      "when": {
+        "east": "low"
+      }
+    },
+    {
+      "apply": {
+        "model": "garnished:block/amber_remnant_wall_side",
+        "uvlock": true,
+        "y": 180
+      },
+      "when": {
+        "south": "low"
+      }
+    },
+    {
+      "apply": {
+        "model": "garnished:block/amber_remnant_wall_side",
+        "uvlock": true,
+        "y": 270
+      },
+      "when": {
+        "west": "low"
+      }
+    },
+    {
+      "apply": {
+        "model": "garnished:block/amber_remnant_wall_side_tall",
+        "uvlock": true
+      },
+      "when": {
+        "north": "tall"
+      }
+    },
+    {
+      "apply": {
+        "model": "garnished:block/amber_remnant_wall_side_tall",
+        "uvlock": true,
+        "y": 90
+      },
+      "when": {
+        "east": "tall"
+      }
+    },
+    {
+      "apply": {
+        "model": "garnished:block/amber_remnant_wall_side_tall",
+        "uvlock": true,
+        "y": 180
+      },
+      "when": {
+        "south": "tall"
+      }
+    },
+    {
+      "apply": {
+        "model": "garnished:block/amber_remnant_wall_side_tall",
+        "uvlock": true,
+        "y": 270
+      },
+      "when": {
+        "west": "tall"
+      }
+    }
+  ]
+}
diff --git a/src/main/resources/assets/garnished/lang/en_ca.json b/src/main/resources/assets/garnished/lang/en_ca.json
@@ -351,6 +351,13 @@
   "block.garnished.sepia_sign": "Sepia Sign",
   "block.garnished.sepia_hanging_sign": "Sepia Hanging Sign",
 
+  "block.garnished.numbing_parchment_block": "Block of Numbing Parchment",
+  "block.garnished.numbing_parchment_carpet": "Numbing Clothe",
+  "block.garnished.amber_remnant_block": "Block of Amber Remnant",
+  "block.garnished.amber_remnant_slab": "Amber Remnant Slab",
+  "block.garnished.amber_remnant_stairs": "Amber Remnant Stairs",
+  "block.garnished.amber_remnant_wall": "Amber Remnant Wall",
+
   "item.garnished.baklava": "Baklava",
   "item.garnished.slime_drop": "Slime Drop",
   "item.garnished.slime_drop_red": "Red Mastic Covered Slime Drop",