DataMap gen, ladders/bookshelves, texture tweaks (#636)

- Add ladders and bookshelves for cindered and shadewood sets (textures:
glubtier)
- Add DataMap generation, which covers:
-- Compostables
-- Furnace fuels
-- Parrot imitations
- Added relevant blocks to compostables (saplings, leaves, certain
foods, etc.)
- Added relevant wood-related blocks to furnace fuel, commensurate with
vanilla
- Added parrot imitations for hostile Minestuck mobs
- Cruxite ore textures tweaked (textures: rose)
- Fixed recipes for cruxite and uranium buttons, which means cruxite and
uranium storage blocks will also function properly now

---------

Co-authored-by: kirderf1 <[email protected]>

CHANGELOG.md

@@ -10,24 +10,31 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 - Block Teleporter
 - Built in compatability for Better Combat mod
-
+- Cindered ladder and bookshelf
+- Shadewood ladder and bookshelf
+- Parrots will mimic imps, ogres, basilisks, and liches
 ### Changed
 - Gave Underlings and Carapacian Pawns the Attack Speed attribute. This influences how fast their attack animations play
 - Underlings, Carapacian Pawns, and Consorts now adjust their walk animation speed according to their Movement Speed attribute
 - Structure Block Registry Processor can now be used for data generated structures through a processor_list
 - Adjusted the hitbox size for Lotus Flowers
 - The Lotus Time Capsule now spawns a Lotus Flower when placed
 - Lotus Time Capsule blocks now remove any Lotus Flowers above them when destroyed
+- Many organic blocks are now compostable
+- Many wood-based blocks can now be used as fuel
+- Cruxite ore textures tweaked
 
 ### Fixed
 - The Umbral Infiltrator no longer jitters when thrown by a void player
 - Manually-spawned Lotus Flowers can no longer be hurt or killed by any damage source
 - Lotus Flowers no longer push entities inside of them away
 - Ogres and Basilisks no longer slide around when idling
+- Cruxite button now uses raw cruxite instead of cruxite block, which resolves a conflict with storage block breakdown
+
 
 ### Contributors for this release
 
-- Dweblenod, sipherNil, gtzc, Cibernet
+- Dweblenod, sipherNil, gtzc, Cibernet, glubtier, rose_bushes_
 
 ## [Unreleased]
 

src/main/generated/resources/assets/minestuck/blockstates/cindered_bookshelf.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "minestuck:block/cindered_bookshelf"
+    }
+  }
+}

src/main/generated/resources/assets/minestuck/blockstates/cindered_ladder.json

@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "minestuck:block/cindered_ladder",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "minestuck:block/cindered_ladder"
+    },
+    "facing=south": {
+      "model": "minestuck:block/cindered_ladder",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "minestuck:block/cindered_ladder",
+      "y": 270
+    }
+  }
+}

src/main/generated/resources/assets/minestuck/blockstates/shadewood_bookshelf.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "minestuck:block/shadewood_bookshelf"
+    }
+  }
+}

src/main/generated/resources/assets/minestuck/blockstates/shadewood_ladder.json

@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "minestuck:block/shadewood_ladder",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "minestuck:block/shadewood_ladder"
+    },
+    "facing=south": {
+      "model": "minestuck:block/shadewood_ladder",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "minestuck:block/shadewood_ladder",
+      "y": 270
+    }
+  }
+}

src/main/generated/resources/assets/minestuck/lang/en_us.json

@@ -245,11 +245,13 @@
   "block.minestuck.chiseled_sandstone_column": "Chiseled Sandstone Column",
   "block.minestuck.chiseled_shade_bricks": "Chiseled Shade Bricks",
   "block.minestuck.chocolatey_cake": "Chocolatey Cake",
+  "block.minestuck.cindered_bookshelf": "Cindered Bookshelf",
   "block.minestuck.cindered_button": "Cindered Button",
   "block.minestuck.cindered_door": "Cindered Door",
   "block.minestuck.cindered_fence": "Cindered Fence",
   "block.minestuck.cindered_fence_gate": "Cindered Fence Gate",
   "block.minestuck.cindered_hanging_sign": "Cindered Hanging Sign",
+  "block.minestuck.cindered_ladder": "Cindered Ladder",
   "block.minestuck.cindered_log": "Cindered Log",
   "block.minestuck.cindered_planks": "Cindered Planks",
   "block.minestuck.cindered_pressure_plate": "Cindered Pressure Plate",
@@ -939,11 +941,13 @@
   "block.minestuck.shade_stone_uranium_ore": "Uranium Ore",
   "block.minestuck.shade_wall": "Shade Wall",
   "block.minestuck.shadewood": "Shadewood",
+  "block.minestuck.shadewood_bookshelf": "Shadewood Bookshelf",
   "block.minestuck.shadewood_button": "Shadewood Button",
   "block.minestuck.shadewood_door": "Shadewood Door",
   "block.minestuck.shadewood_fence": "Shadewood Fence",
   "block.minestuck.shadewood_fence_gate": "Shadewood Fence Gate",
   "block.minestuck.shadewood_hanging_sign": "Shadewood Hanging Sign",
+  "block.minestuck.shadewood_ladder": "Shadewood Ladder",
   "block.minestuck.shadewood_leaves": "Shadewood Leaves",
   "block.minestuck.shadewood_log": "Shadewood Log",
   "block.minestuck.shadewood_planks": "Shadewood Planks",

src/main/generated/resources/assets/minestuck/models/block/cindered_bookshelf.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column",
+  "textures": {
+    "end": "minestuck:block/cindered_planks",
+    "side": "minestuck:block/cindered_bookshelf"
+  }
+}

src/main/generated/resources/assets/minestuck/models/block/cindered_ladder.json

@@ -0,0 +1,31 @@
+{
+  "ambientocclusion": false,
+  "elements": [
+    {
+      "faces": {
+        "north": {
+          "texture": "#texture"
+        },
+        "south": {
+          "texture": "#texture"
+        }
+      },
+      "from": [
+        0,
+        0,
+        15.2
+      ],
+      "shade": false,
+      "to": [
+        16,
+        16,
+        15.2
+      ]
+    }
+  ],
+  "render_type": "minecraft:cutout",
+  "textures": {
+    "particle": "minestuck:block/cindered_ladder",
+    "texture": "minestuck:block/cindered_ladder"
+  }
+}

src/main/generated/resources/assets/minestuck/models/block/shadewood_bookshelf.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column",
+  "textures": {
+    "end": "minestuck:block/shadewood_planks",
+    "side": "minestuck:block/shadewood_bookshelf"
+  }
+}

src/main/generated/resources/assets/minestuck/models/block/shadewood_ladder.json

@@ -0,0 +1,31 @@
+{
+  "ambientocclusion": false,
+  "elements": [
+    {
+      "faces": {
+        "north": {
+          "texture": "#texture"
+        },
+        "south": {
+          "texture": "#texture"
+        }
+      },
+      "from": [
+        0,
+        0,
+        15.2
+      ],
+      "shade": false,
+      "to": [
+        16,
+        16,
+        15.2
+      ]
+    }
+  ],
+  "render_type": "minecraft:cutout",
+  "textures": {
+    "particle": "minestuck:block/shadewood_ladder",
+    "texture": "minestuck:block/shadewood_ladder"
+  }
+}

src/main/generated/resources/assets/minestuck/models/item/cindered_bookshelf.json

@@ -0,0 +1,3 @@
+{
+  "parent": "minestuck:block/cindered_bookshelf"
+}

src/main/generated/resources/assets/minestuck/models/item/cindered_ladder.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minestuck:block/cindered_ladder"
+  }
+}

src/main/generated/resources/assets/minestuck/models/item/shadewood_bookshelf.json

@@ -0,0 +1,3 @@
+{
+  "parent": "minestuck:block/shadewood_bookshelf"
+}

src/main/generated/resources/assets/minestuck/models/item/shadewood_ladder.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minestuck:block/shadewood_ladder"
+  }
+}

src/main/generated/resources/data/forge/tags/blocks/bookshelves.json

@@ -6,6 +6,8 @@
     "minestuck:rainbow_bookshelf",
     "minestuck:end_bookshelf",
     "minestuck:dead_bookshelf",
-    "minestuck:treated_bookshelf"
+    "minestuck:treated_bookshelf",
+    "minestuck:shadewood_bookshelf",
+    "minestuck:cindered_bookshelf"
   ]
 }

src/main/generated/resources/data/minecraft/tags/blocks/climbable.json

@@ -8,6 +8,8 @@
     "minestuck:rainbow_ladder",
     "minestuck:end_ladder",
     "minestuck:dead_ladder",
-    "minestuck:treated_ladder"
+    "minestuck:treated_ladder",
+    "minestuck:shadewood_ladder",
+    "minestuck:cindered_ladder"
   ]
 }

src/main/generated/resources/data/minecraft/tags/blocks/mineable/axe.json

@@ -364,12 +364,16 @@
     "minestuck:end_bookshelf",
     "minestuck:dead_bookshelf",
     "minestuck:treated_bookshelf",
+    "minestuck:shadewood_bookshelf",
+    "minestuck:cindered_bookshelf",
     "minestuck:glowing_ladder",
     "minestuck:frost_ladder",
     "minestuck:rainbow_ladder",
     "minestuck:end_ladder",
     "minestuck:dead_ladder",
     "minestuck:treated_ladder",
+    "minestuck:shadewood_ladder",
+    "minestuck:cindered_ladder",
     "minestuck:rainbow_planks_stairs",
     "minestuck:end_planks_stairs",
     "minestuck:dead_planks_stairs",

src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cindered_bookshelf.json

@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_planks": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minestuck:cindered_planks"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "minestuck:cindered_bookshelf"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_planks"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "minestuck:cindered_bookshelf"
+    ]
+  }
+}

src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/cruxite_button.json

@@ -1,18 +1,6 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_cruxite_block": {
-      "conditions": {
-        "items": [
-          {
-            "items": [
-              "minestuck:cruxite_block"
-            ]
-          }
-        ]
-      },
-      "trigger": "minecraft:inventory_changed"
-    },
     "has_raw_cruxite": {
       "conditions": {
         "items": [
@@ -35,7 +23,6 @@
   "requirements": [
     [
       "has_the_recipe",
-      "has_cruxite_block",
       "has_raw_cruxite"
     ]
   ],

src/main/generated/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_bookshelf.json

@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_planks": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minestuck:shadewood_planks"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "minestuck:shadewood_bookshelf"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_planks"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "minestuck:shadewood_bookshelf"
+    ]
+  }
+}