Skip to content

Commit

Permalink
Aspect block item pairs (#640)
Browse files Browse the repository at this point in the history
- Migrated Aspect tree blocks to ItemBlockPairs and updated related
references (Signs were not migrated, since they are not one block to one item)
- Added signs to MINEABLE_WITH_AXE tag
- Changed render type for aspect wood door models from translucent to cutout
- Fix life entry in flower_pots/aspect block tag
  • Loading branch information
glubtier authored Dec 3, 2024
1 parent 4f6db98 commit a8d4c0c
Show file tree
Hide file tree
Showing 26 changed files with 1,912 additions and 2,035 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).

- Knitting needle crafting recipe now produces one item instead of two

### Fixed

- Signs now mineable with axe

### Contributors for this release

- Cibernet, Dweblenod, kirderf1
- Cibernet, Dweblenod, kirderf1, glubtier

## [1.20.4-1.12.2.0] - 2024-10-06

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:block/door_bottom_left",
"render_type": "minecraft:translucent",
"render_type": "minecraft:cutout",
"textures": {
"bottom": "minestuck:block/breath_aspect_door_bottom",
"top": "minestuck:block/breath_aspect_door_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:block/door_bottom_left_open",
"render_type": "minecraft:translucent",
"render_type": "minecraft:cutout",
"textures": {
"bottom": "minestuck:block/breath_aspect_door_bottom",
"top": "minestuck:block/breath_aspect_door_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:block/door_bottom_right",
"render_type": "minecraft:translucent",
"render_type": "minecraft:cutout",
"textures": {
"bottom": "minestuck:block/breath_aspect_door_bottom",
"top": "minestuck:block/breath_aspect_door_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:block/door_bottom_right_open",
"render_type": "minecraft:translucent",
"render_type": "minecraft:cutout",
"textures": {
"bottom": "minestuck:block/breath_aspect_door_bottom",
"top": "minestuck:block/breath_aspect_door_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:block/door_top_left",
"render_type": "minecraft:translucent",
"render_type": "minecraft:cutout",
"textures": {
"bottom": "minestuck:block/breath_aspect_door_bottom",
"top": "minestuck:block/breath_aspect_door_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:block/door_top_left_open",
"render_type": "minecraft:translucent",
"render_type": "minecraft:cutout",
"textures": {
"bottom": "minestuck:block/breath_aspect_door_bottom",
"top": "minestuck:block/breath_aspect_door_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:block/door_top_right",
"render_type": "minecraft:translucent",
"render_type": "minecraft:cutout",
"textures": {
"bottom": "minestuck:block/breath_aspect_door_bottom",
"top": "minestuck:block/breath_aspect_door_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:block/door_top_right_open",
"render_type": "minecraft:translucent",
"render_type": "minecraft:cutout",
"textures": {
"bottom": "minestuck:block/breath_aspect_door_bottom",
"top": "minestuck:block/breath_aspect_door_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:block/door_bottom_left",
"render_type": "minecraft:translucent",
"render_type": "minecraft:cutout",
"textures": {
"bottom": "minestuck:block/mind_aspect_door_bottom",
"top": "minestuck:block/mind_aspect_door_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:block/door_bottom_left_open",
"render_type": "minecraft:translucent",
"render_type": "minecraft:cutout",
"textures": {
"bottom": "minestuck:block/mind_aspect_door_bottom",
"top": "minestuck:block/mind_aspect_door_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:block/door_bottom_right",
"render_type": "minecraft:translucent",
"render_type": "minecraft:cutout",
"textures": {
"bottom": "minestuck:block/mind_aspect_door_bottom",
"top": "minestuck:block/mind_aspect_door_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:block/door_bottom_right_open",
"render_type": "minecraft:translucent",
"render_type": "minecraft:cutout",
"textures": {
"bottom": "minestuck:block/mind_aspect_door_bottom",
"top": "minestuck:block/mind_aspect_door_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:block/door_top_left",
"render_type": "minecraft:translucent",
"render_type": "minecraft:cutout",
"textures": {
"bottom": "minestuck:block/mind_aspect_door_bottom",
"top": "minestuck:block/mind_aspect_door_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:block/door_top_left_open",
"render_type": "minecraft:translucent",
"render_type": "minecraft:cutout",
"textures": {
"bottom": "minestuck:block/mind_aspect_door_bottom",
"top": "minestuck:block/mind_aspect_door_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:block/door_top_right",
"render_type": "minecraft:translucent",
"render_type": "minecraft:cutout",
"textures": {
"bottom": "minestuck:block/mind_aspect_door_bottom",
"top": "minestuck:block/mind_aspect_door_top"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:block/door_top_right_open",
"render_type": "minecraft:translucent",
"render_type": "minecraft:cutout",
"textures": {
"bottom": "minestuck:block/mind_aspect_door_bottom",
"top": "minestuck:block/mind_aspect_door_top"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
"minestuck:blood_aspect_ladder",
"minestuck:blood_aspect_door",
"minestuck:blood_aspect_trapdoor",
"minestuck:blood_aspect_sign",
"minestuck:blood_aspect_hanging_sign",
"minestuck:blood_aspect_wall_sign",
"minestuck:blood_aspect_wall_hanging_sign",
"minestuck:breath_aspect_log",
"minestuck:breath_aspect_wood",
"minestuck:breath_aspect_stripped_log",
Expand All @@ -32,6 +36,10 @@
"minestuck:breath_aspect_ladder",
"minestuck:breath_aspect_door",
"minestuck:breath_aspect_trapdoor",
"minestuck:breath_aspect_sign",
"minestuck:breath_aspect_hanging_sign",
"minestuck:breath_aspect_wall_sign",
"minestuck:breath_aspect_wall_hanging_sign",
"minestuck:doom_aspect_log",
"minestuck:doom_aspect_wood",
"minestuck:doom_aspect_stripped_log",
Expand All @@ -48,6 +56,10 @@
"minestuck:doom_aspect_ladder",
"minestuck:doom_aspect_door",
"minestuck:doom_aspect_trapdoor",
"minestuck:doom_aspect_sign",
"minestuck:doom_aspect_hanging_sign",
"minestuck:doom_aspect_wall_sign",
"minestuck:doom_aspect_wall_hanging_sign",
"minestuck:heart_aspect_log",
"minestuck:heart_aspect_wood",
"minestuck:heart_aspect_stripped_log",
Expand All @@ -64,6 +76,10 @@
"minestuck:heart_aspect_ladder",
"minestuck:heart_aspect_door",
"minestuck:heart_aspect_trapdoor",
"minestuck:heart_aspect_sign",
"minestuck:heart_aspect_hanging_sign",
"minestuck:heart_aspect_wall_sign",
"minestuck:heart_aspect_wall_hanging_sign",
"minestuck:hope_aspect_log",
"minestuck:hope_aspect_wood",
"minestuck:hope_aspect_stripped_log",
Expand All @@ -80,6 +96,10 @@
"minestuck:hope_aspect_ladder",
"minestuck:hope_aspect_door",
"minestuck:hope_aspect_trapdoor",
"minestuck:hope_aspect_sign",
"minestuck:hope_aspect_hanging_sign",
"minestuck:hope_aspect_wall_sign",
"minestuck:hope_aspect_wall_hanging_sign",
"minestuck:life_aspect_log",
"minestuck:life_aspect_wood",
"minestuck:life_aspect_stripped_log",
Expand All @@ -96,6 +116,10 @@
"minestuck:life_aspect_ladder",
"minestuck:life_aspect_door",
"minestuck:life_aspect_trapdoor",
"minestuck:life_aspect_sign",
"minestuck:life_aspect_hanging_sign",
"minestuck:life_aspect_wall_sign",
"minestuck:life_aspect_wall_hanging_sign",
"minestuck:light_aspect_log",
"minestuck:light_aspect_wood",
"minestuck:light_aspect_stripped_log",
Expand All @@ -112,6 +136,10 @@
"minestuck:light_aspect_ladder",
"minestuck:light_aspect_door",
"minestuck:light_aspect_trapdoor",
"minestuck:light_aspect_sign",
"minestuck:light_aspect_hanging_sign",
"minestuck:light_aspect_wall_sign",
"minestuck:light_aspect_wall_hanging_sign",
"minestuck:mind_aspect_log",
"minestuck:mind_aspect_wood",
"minestuck:mind_aspect_stripped_log",
Expand All @@ -128,6 +156,10 @@
"minestuck:mind_aspect_ladder",
"minestuck:mind_aspect_door",
"minestuck:mind_aspect_trapdoor",
"minestuck:mind_aspect_sign",
"minestuck:mind_aspect_hanging_sign",
"minestuck:mind_aspect_wall_sign",
"minestuck:mind_aspect_wall_hanging_sign",
"minestuck:rage_aspect_log",
"minestuck:rage_aspect_wood",
"minestuck:rage_aspect_stripped_log",
Expand Down Expand Up @@ -160,6 +192,10 @@
"minestuck:space_aspect_ladder",
"minestuck:space_aspect_door",
"minestuck:space_aspect_trapdoor",
"minestuck:space_aspect_sign",
"minestuck:space_aspect_hanging_sign",
"minestuck:space_aspect_wall_sign",
"minestuck:space_aspect_wall_hanging_sign",
"minestuck:time_aspect_log",
"minestuck:time_aspect_wood",
"minestuck:time_aspect_stripped_log",
Expand All @@ -176,6 +212,10 @@
"minestuck:time_aspect_ladder",
"minestuck:time_aspect_door",
"minestuck:time_aspect_trapdoor",
"minestuck:time_aspect_sign",
"minestuck:time_aspect_hanging_sign",
"minestuck:time_aspect_wall_sign",
"minestuck:time_aspect_wall_hanging_sign",
"minestuck:void_aspect_log",
"minestuck:void_aspect_wood",
"minestuck:void_aspect_stripped_log",
Expand All @@ -192,6 +232,10 @@
"minestuck:void_aspect_ladder",
"minestuck:void_aspect_door",
"minestuck:void_aspect_trapdoor",
"minestuck:void_aspect_sign",
"minestuck:void_aspect_hanging_sign",
"minestuck:void_aspect_wall_sign",
"minestuck:void_aspect_wall_hanging_sign",
"minestuck:uncarved_wood_iron_ore",
"minestuck:uncarved_wood_redstone_ore",
"minestuck:uncarved_wood_emerald_ore",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"minestuck:potted_doom_aspect_sapling",
"minestuck:potted_heart_aspect_sapling",
"minestuck:potted_hope_aspect_sapling",
"minestuck:life_aspect_sapling",
"minestuck:potted_life_aspect_sapling",
"minestuck:potted_light_aspect_sapling",
"minestuck:potted_mind_aspect_sapling",
"minestuck:potted_rage_aspect_sapling",
Expand Down
Loading

0 comments on commit a8d4c0c

Please sign in to comment.