Add Obsidian blocks (Stairs, Smooth, Chiseled, Pillar) & items (Fragment, Rod) w/ recipes

src/main/java/chylex/hee/init/ModBlocks.kt

@@ -4,6 +4,7 @@ import chylex.hee.game.block.BlockAncientCobweb
 import chylex.hee.game.block.BlockEndPowderOre
 import chylex.hee.game.block.BlockEndium
 import chylex.hee.game.block.BlockEnergyCluster
+import chylex.hee.game.block.BlockPillarCustom
 import chylex.hee.game.block.BlockSimple
 import chylex.hee.game.block.BlockSlabCustom
 import chylex.hee.game.block.BlockStairsCustom
@@ -11,6 +12,7 @@ import chylex.hee.game.block.BlockWallCustom
 import chylex.hee.game.block.entity.TileEntityEnergyCluster
 import chylex.hee.game.block.material.Materials
 import chylex.hee.game.item.ItemAncientCobweb
+import chylex.hee.game.item.util.Tool.Level.DIAMOND
 import chylex.hee.game.item.util.Tool.Level.IRON
 import chylex.hee.game.item.util.Tool.Level.STONE
 import chylex.hee.game.item.util.Tool.Level.WOOD
@@ -46,11 +48,7 @@ object ModBlocks{
 	@JvmField val STONE_BRICK_WALL = BlockWallCustom(Blocks.STONEBRICK).apply { setup("stone_brick_wall") }
 	@JvmField val ENDIUM_BLOCK     = BlockEndium(buildEndiumBlock).apply { setup("endium_block") }
 	
-	// Blocks: Decorative (Uncategorized)
-	
-	@JvmField val ANCIENT_COBWEB = BlockAncientCobweb().apply { setup("ancient_cobweb") }
-	
-	// Blocks: Gloomrock
+	// Blocks: Building (Gloomrock)
 	
 	private val buildGloomrock = BlockSimple.Builder(Materials.SOLID_WITH_TOOL).apply {
 		harvestTool = Pair(WOOD, PICKAXE)
@@ -90,6 +88,29 @@ object ModBlocks{
 	@JvmField val GLOOMROCK_SMOOTH_MAGENTA     = BlockSimple(buildGloomrockSmooth).apply { setup("gloomrock_smooth_magenta") }
 	@JvmField val GLOOMROCK_SMOOTH_WHITE       = BlockSimple(buildGloomrockSmooth).apply { setup("gloomrock_smooth_white") }
 	
+	// Blocks: Building (Obsidian)
+	
+	private val buildObsidianCustom = BlockSimple.Builder(Materials.SOLID_WITH_TOOL).apply {
+		harvestTool = Pair(DIAMOND, PICKAXE)
+		harvestHardness = 20F
+		explosionResistance = 500F
+		
+		soundType = SoundType.STONE
+		mapColor = MapColor.BLACK
+	}
+	
+	private val buildObsidianCustomLit = buildObsidianCustom.clone {
+		lightLevel = 15
+	}
+	
+	@JvmField val OBSIDIAN_STAIRS       = BlockStairsCustom(Blocks.OBSIDIAN).apply { setup("obsidian_stairs") }
+	@JvmField val OBSIDIAN_SMOOTH       = BlockSimple(buildObsidianCustom).apply { setup("obsidian_smooth") }
+	@JvmField val OBSIDIAN_CHISELED     = BlockSimple(buildObsidianCustom).apply { setup("obsidian_chiseled") }
+	@JvmField val OBSIDIAN_PILLAR       = BlockPillarCustom(buildObsidianCustom).apply { setup("obsidian_pillar") }
+	@JvmField val OBSIDIAN_SMOOTH_LIT   = BlockSimple(buildObsidianCustomLit).apply { setup("obsidian_smooth_lit") }
+	@JvmField val OBSIDIAN_CHISELED_LIT = BlockSimple(buildObsidianCustomLit).apply { setup("obsidian_chiseled_lit") }
+	@JvmField val OBSIDIAN_PILLAR_LIT   = BlockPillarCustom(buildObsidianCustomLit).apply { setup("obsidian_pillar_lit") }
+	
 	// Blocks: Ores
 	
 	private val buildEndOre = BlockSimple.Builder(Materials.SOLID_WITH_TOOL).apply {
@@ -112,6 +133,10 @@ object ModBlocks{
 	@JvmField val END_POWDER_ORE = BlockEndPowderOre(buildEndPowderOre).apply { setup("end_powder_ore") }
 	@JvmField val ENDIUM_ORE     = BlockEndium(buildEndiumOre).apply { setup("endium_ore") }
 	
+	// Blocks: Decorative (Uncategorized)
+	
+	@JvmField val ANCIENT_COBWEB = BlockAncientCobweb().apply { setup("ancient_cobweb") }
+	
 	// Blocks: Energy
 	
 	@JvmField val ENERGY_CLUSTER = BlockEnergyCluster().apply { setup("energy_cluster") }
@@ -127,8 +152,6 @@ object ModBlocks{
 			register(STONE_BRICK_WALL with basicItemBlock)
 			register(ENDIUM_BLOCK with basicItemBlock)
 			
-			register(ANCIENT_COBWEB with ItemAncientCobweb(ANCIENT_COBWEB))
-			
 			register(GLOOMROCK with basicItemBlock)
 			register(GLOOMROCK_BRICKS with basicItemBlock)
 			register(GLOOMROCK_BRICK_STAIRS with basicItemBlock)
@@ -148,9 +171,19 @@ object ModBlocks{
 			register(GLOOMROCK_SMOOTH_MAGENTA with basicItemBlock)
 			register(GLOOMROCK_SMOOTH_WHITE with basicItemBlock)
 			
+			register(OBSIDIAN_STAIRS with basicItemBlock)
+			register(OBSIDIAN_SMOOTH with basicItemBlock)
+			register(OBSIDIAN_CHISELED with basicItemBlock)
+			register(OBSIDIAN_PILLAR with basicItemBlock)
+			register(OBSIDIAN_SMOOTH_LIT with basicItemBlock)
+			register(OBSIDIAN_CHISELED_LIT with basicItemBlock)
+			register(OBSIDIAN_PILLAR_LIT with basicItemBlock)
+			
 			register(END_POWDER_ORE with basicItemBlock)
 			register(ENDIUM_ORE with basicItemBlock)
 			
+			register(ANCIENT_COBWEB with ItemAncientCobweb(ANCIENT_COBWEB))
+			
 			register(ENERGY_CLUSTER with basicItemBlock)
 		}
 		

src/main/java/chylex/hee/init/ModItems.kt

@@ -10,17 +10,19 @@ object ModItems{
 	
 	// Items: Raw resources
 	
-	@JvmField val ETHEREUM      = Item().apply { setup("ethereum") }
-	@JvmField val ANCIENT_DUST  = Item().apply { setup("ancient_dust") }
-	@JvmField val END_POWDER    = Item().apply { setup("end_powder") }
-	@JvmField val STARDUST      = Item().apply { setup("stardust") }
-	@JvmField val ENDIUM_INGOT  = Item().apply { setup("endium_ingot") }
-	@JvmField val ENDIUM_NUGGET = Item().apply { setup("endium_nugget") }
+	@JvmField val ETHEREUM          = Item().apply { setup("ethereum") }
+	@JvmField val ANCIENT_DUST      = Item().apply { setup("ancient_dust") }
+	@JvmField val END_POWDER        = Item().apply { setup("end_powder") }
+	@JvmField val STARDUST          = Item().apply { setup("stardust") }
+	@JvmField val ENDIUM_INGOT      = Item().apply { setup("endium_ingot") }
+	@JvmField val ENDIUM_NUGGET     = Item().apply { setup("endium_nugget") }
+	@JvmField val OBSIDIAN_FRAGMENT = Item().apply { setup("obsidian_fragment") }
 	
 	// Items: Manufactured resources
 	
 	@JvmField val ALTERATION_NEXUS = Item().apply { setup("alteration_nexus") }
 	@JvmField val VOID_ESSENCE     = Item().apply { setup("void_essence") }
+	@JvmField val OBSIDIAN_ROD     = Item().apply { setup("obsidian_rod") }
 	
 	// Registry
 	
@@ -34,9 +36,11 @@ object ModItems{
 			register(STARDUST)
 			register(ENDIUM_INGOT)
 			register(ENDIUM_NUGGET)
+			register(OBSIDIAN_FRAGMENT)
 			
 			register(ALTERATION_NEXUS)
 			register(VOID_ESSENCE)
+			register(OBSIDIAN_ROD)
 		}
 	}
 	

src/main/resources/assets/hee/blockstates/obsidian_chiseled.json

@@ -0,0 +1,13 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "cube_all",
+    "textures": {
+      "all": "hee:block/obsidian_chiseled"
+    }
+  },
+  "variants": {
+    "normal": [{}],
+    "inventory": [{}]
+  }
+}

src/main/resources/assets/hee/blockstates/obsidian_chiseled_lit.json

@@ -0,0 +1,13 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "cube_all",
+    "textures": {
+      "all": "hee:block/obsidian_chiseled"
+    }
+  },
+  "variants": {
+    "normal": [{}],
+    "inventory": [{}]
+  }
+}

src/main/resources/assets/hee/blockstates/obsidian_pillar.json

@@ -0,0 +1,23 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "cube_column",
+    "textures": {
+      "end": "hee:block/obsidian_pillar_top",
+      "side": "hee:block/obsidian_pillar"
+    }
+  },
+  "variants": {
+    "axis": {
+      "y": {},
+      "z": {
+        "x": 90
+      },
+      "x": {
+        "x": 90,
+        "y": 90
+      }
+    },
+    "inventory": [{}]
+  }
+}

src/main/resources/assets/hee/blockstates/obsidian_pillar_lit.json

@@ -0,0 +1,23 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "cube_column",
+    "textures": {
+      "end": "hee:block/obsidian_pillar_top",
+      "side": "hee:block/obsidian_pillar"
+    }
+  },
+  "variants": {
+    "axis": {
+      "y": {},
+      "z": {
+        "x": 90
+      },
+      "x": {
+        "x": 90,
+        "y": 90
+      }
+    },
+    "inventory": [{}]
+  }
+}

src/main/resources/assets/hee/blockstates/obsidian_smooth.json

@@ -0,0 +1,13 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "cube_all",
+    "textures": {
+      "all": "hee:block/obsidian_smooth"
+    }
+  },
+  "variants": {
+    "normal": [{}],
+    "inventory": [{}]
+  }
+}

src/main/resources/assets/hee/blockstates/obsidian_smooth_lit.json

@@ -0,0 +1,13 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "cube_all",
+    "textures": {
+      "all": "hee:block/obsidian_smooth"
+    }
+  },
+  "variants": {
+    "normal": [{}],
+    "inventory": [{}]
+  }
+}

src/main/resources/assets/hee/blockstates/obsidian_stairs.json

@@ -0,0 +1,54 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "uvlock": true,
+    "textures": {
+      "bottom": "minecraft:blocks/obsidian",
+      "top": "minecraft:blocks/obsidian",
+      "side": "minecraft:blocks/obsidian"
+    }
+  },
+  "variants": {
+    "facing=east,half=bottom,shape=straight":  { "model": "stairs" },
+    "facing=west,half=bottom,shape=straight":  { "model": "stairs", "y": 180 },
+    "facing=south,half=bottom,shape=straight": { "model": "stairs", "y": 90 },
+    "facing=north,half=bottom,shape=straight": { "model": "stairs", "y": 270 },
+    "facing=east,half=bottom,shape=outer_right":  { "model": "outer_stairs" },
+    "facing=west,half=bottom,shape=outer_right":  { "model": "outer_stairs", "y": 180 },
+    "facing=south,half=bottom,shape=outer_right": { "model": "outer_stairs", "y": 90 },
+    "facing=north,half=bottom,shape=outer_right": { "model": "outer_stairs", "y": 270 },
+    "facing=east,half=bottom,shape=outer_left":  { "model": "outer_stairs", "y": 270 },
+    "facing=west,half=bottom,shape=outer_left":  { "model": "outer_stairs", "y": 90 },
+    "facing=south,half=bottom,shape=outer_left": { "model": "outer_stairs" },
+    "facing=north,half=bottom,shape=outer_left": { "model": "outer_stairs", "y": 180 },
+    "facing=east,half=bottom,shape=inner_right":  { "model": "inner_stairs" },
+    "facing=west,half=bottom,shape=inner_right":  { "model": "inner_stairs", "y": 180 },
+    "facing=south,half=bottom,shape=inner_right": { "model": "inner_stairs", "y": 90 },
+    "facing=north,half=bottom,shape=inner_right": { "model": "inner_stairs", "y": 270 },
+    "facing=east,half=bottom,shape=inner_left":  { "model": "inner_stairs", "y": 270 },
+    "facing=west,half=bottom,shape=inner_left":  { "model": "inner_stairs", "y": 90 },
+    "facing=south,half=bottom,shape=inner_left": { "model": "inner_stairs" },
+    "facing=north,half=bottom,shape=inner_left": { "model": "inner_stairs", "y": 180 },
+    "facing=east,half=top,shape=straight":  { "model": "stairs", "x": 180 },
+    "facing=west,half=top,shape=straight":  { "model": "stairs", "x": 180, "y": 180 },
+    "facing=south,half=top,shape=straight": { "model": "stairs", "x": 180, "y": 90 },
+    "facing=north,half=top,shape=straight": { "model": "stairs", "x": 180, "y": 270 },
+    "facing=east,half=top,shape=outer_right":  { "model": "outer_stairs", "x": 180, "y": 90 },
+    "facing=west,half=top,shape=outer_right":  { "model": "outer_stairs", "x": 180, "y": 270 },
+    "facing=south,half=top,shape=outer_right": { "model": "outer_stairs", "x": 180, "y": 180 },
+    "facing=north,half=top,shape=outer_right": { "model": "outer_stairs", "x": 180 },
+    "facing=east,half=top,shape=outer_left":  { "model": "outer_stairs", "x": 180 },
+    "facing=west,half=top,shape=outer_left":  { "model": "outer_stairs", "x": 180, "y": 180 },
+    "facing=south,half=top,shape=outer_left": { "model": "outer_stairs", "x": 180, "y": 90 },
+    "facing=north,half=top,shape=outer_left": { "model": "outer_stairs", "x": 180, "y": 270 },
+    "facing=east,half=top,shape=inner_right":  { "model": "inner_stairs", "x": 180, "y": 90 },
+    "facing=west,half=top,shape=inner_right":  { "model": "inner_stairs", "x": 180, "y": 270 },
+    "facing=south,half=top,shape=inner_right": { "model": "inner_stairs", "x": 180, "y": 180 },
+    "facing=north,half=top,shape=inner_right": { "model": "inner_stairs", "x": 180 },
+    "facing=east,half=top,shape=inner_left":  { "model": "inner_stairs", "x": 180 },
+    "facing=west,half=top,shape=inner_left":  { "model": "inner_stairs", "x": 180, "y": 180 },
+    "facing=south,half=top,shape=inner_left": { "model": "inner_stairs", "x": 180, "y": 90 },
+    "facing=north,half=top,shape=inner_left": { "model": "inner_stairs", "x": 180, "y": 270 },
+    "inventory": { "model": "stairs" }
+  }
+}

src/main/resources/assets/hee/lang/en_us.lang

@@ -1,8 +1,6 @@
 tile.hee.stone_brick_wall.name=Stone Brick Wall
 tile.hee.endium_block.name=Endium Block
 
-tile.hee.ancient_cobweb.name=Ancient Cobweb
-
 tile.hee.gloomrock.name=Gloomrock
 tile.hee.gloomrock_bricks.name=Gloomrock Bricks
 tile.hee.gloomrock_brick_slab.name=Gloomrock Brick Slab
@@ -20,18 +18,30 @@ tile.hee.gloomrock_smooth_purple.name=Purple Gloomrock
 tile.hee.gloomrock_smooth_magenta.name=Magenta Gloomrock
 tile.hee.gloomrock_smooth_white.name=White Gloomrock
 
+tile.hee.obsidian_stairs.name=Obsidian Stairs
+tile.hee.obsidian_smooth.name=Smooth Obsidian
+tile.hee.obsidian_chiseled.name=Chiseled Obsidian
+tile.hee.obsidian_pillar.name=Obsidian Pillar
+tile.hee.obsidian_smooth_lit.name=Smooth Obsidian (Lit)
+tile.hee.obsidian_chiseled_lit.name=Chiseled Obsidian (Lit)
+tile.hee.obsidian_pillar_lit.name=Obsidian Pillar (Lit)
+
 tile.hee.end_powder_ore.name=End Powder Ore
 tile.hee.endium_ore.name=Endium Ore
 
+tile.hee.ancient_cobweb.name=Ancient Cobweb
+
 item.hee.ancient_dust.name=Ancient Dust
 item.hee.ethereum.name=Ethereum
 item.hee.end_powder.name=End Powder
 item.hee.stardust.name=Stardust
 item.hee.endium_ingot.name=Endium Ingot
 item.hee.endium_nugget.name=Endium Nugget
+item.hee.obsidian_fragment.name=Obsidian Fragment
 
 item.hee.alteration_nexus.name=Alteration Nexus
 item.hee.void_essence.name=Void Essence
+item.hee.obsidian_rod.name=Obsidian Rod
 
 item.tooltip.hee.energy.level=Energy: %s / %s
 item.tooltip.hee.energy.uses=Uses left: %s

src/main/resources/assets/hee/models/item/obsidian_fragment.json

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

src/main/resources/assets/hee/models/item/obsidian_rod.json

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

src/main/resources/assets/hee/recipes/obsidian.json

@@ -0,0 +1,14 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "###",
+    "###",
+    "###"
+  ],
+  "key": {
+    "#": { "item": "hee:obsidian_fragment" }
+  },
+  "result": {
+    "item": "minecraft:obsidian"
+  }
+}

src/main/resources/assets/hee/recipes/obsidian_chiseled.json

@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "###",
+    "#X#",
+    "###"
+  ],
+  "key": {
+    "#": { "item": "hee:obsidian_fragment" },
+    "X": { "item": "minecraft:quartz_block", "data": 1 }
+  },
+  "result": {
+    "item": "hee:obsidian_chiseled"
+  }
+}

src/main/resources/assets/hee/recipes/obsidian_pillar.json

@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "###",
+    "#X#",
+    "###"
+  ],
+  "key": {
+    "#": { "item": "hee:obsidian_fragment" },
+    "X": { "item": "minecraft:quartz_block", "data": 2 }
+  },
+  "result": {
+    "item": "hee:obsidian_pillar"
+  }
+}

src/main/resources/assets/hee/recipes/obsidian_rod_d.json

@@ -0,0 +1,14 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "group": "hee:obsidian_rod",
+  "pattern": [
+    " #",
+    "# "
+  ],
+  "key": {
+    "#": { "item": "hee:obsidian_fragment" }
+  },
+  "result": {
+    "item": "hee:obsidian_rod"
+  }
+}

src/main/resources/assets/hee/recipes/obsidian_rod_h.json

@@ -0,0 +1,13 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "group": "hee:obsidian_rod",
+  "pattern": [
+    "##"
+  ],
+  "key": {
+    "#": { "item": "hee:obsidian_fragment" }
+  },
+  "result": {
+    "item": "hee:obsidian_rod"
+  }
+}

src/main/resources/assets/hee/recipes/obsidian_rod_v.json

@@ -0,0 +1,14 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "group": "hee:obsidian_rod",
+  "pattern": [
+    "#",
+    "#"
+  ],
+  "key": {
+    "#": { "item": "hee:obsidian_fragment" }
+  },
+  "result": {
+    "item": "hee:obsidian_rod"
+  }
+}

src/main/resources/assets/hee/recipes/obsidian_smooth.json

@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "###",
+    "#X#",
+    "###"
+  ],
+  "key": {
+    "#": { "item": "hee:obsidian_fragment" },
+    "X": { "item": "minecraft:quartz_block", "data": 0 }
+  },
+  "result": {
+    "item": "hee:obsidian_smooth"
+  }
+}

src/main/resources/assets/hee/recipes/obsidian_stairs.json

@@ -0,0 +1,14 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "#  ",
+    "## ",
+    "###"
+  ],
+  "key": {
+    "#": { "item": "hee:obsidian_fragment" }
+  },
+  "result": {
+    "item": "hee:obsidian_stairs"
+  }
+}