Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Aspect block item pairs #640

Merged
merged 10 commits into from
Dec 3, 2024
Merged

Aspect block item pairs #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2cde29c
Migrate aspect tree blocks to ItemBlockPairs
glubtier Oct 7, 2024
b1c546c
Merge remote-tracking branch 'origin/AspectBlockItemPairs' into Aspec…
glubtier Oct 8, 2024
596145b
Migrate aspect tree blocks to ItemBlockPairs
glubtier Oct 8, 2024
d2f31cc
Update Aspect signs to be mineable with axes
glubtier Oct 8, 2024
4d290c2
Merge branch 'main' into AspectBlockItemPairs
glubtier Nov 25, 2024
f3b18ae
Update for 1.21 changes
glubtier Nov 25, 2024
a1ac3d1
Merge branch 'lunar-sway:main' into AspectBlockItemPairs
glubtier Dec 2, 2024
4ccc387
Merge branch 'lunar-sway:main' into AspectBlockItemPairs
glubtier Dec 3, 2024
7dff849
Update rarity for aspect saplings
glubtier Dec 3, 2024
6fbdfd0
update changelog
glubtier Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...ain/generated/resources/assets/minestuck/models/block/breath_aspect_door_bottom_left.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...enerated/resources/assets/minestuck/models/block/breath_aspect_door_bottom_left_open.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...in/generated/resources/assets/minestuck/models/block/breath_aspect_door_bottom_right.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...nerated/resources/assets/minestuck/models/block/breath_aspect_door_bottom_right_open.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/main/generated/resources/assets/minestuck/models/block/breath_aspect_door_top_left.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...n/generated/resources/assets/minestuck/models/block/breath_aspect_door_top_left_open.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/main/generated/resources/assets/minestuck/models/block/breath_aspect_door_top_right.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion .../generated/resources/assets/minestuck/models/block/breath_aspect_door_top_right_open.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/main/generated/resources/assets/minestuck/models/block/mind_aspect_door_bottom_left.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion .../generated/resources/assets/minestuck/models/block/mind_aspect_door_bottom_left_open.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...main/generated/resources/assets/minestuck/models/block/mind_aspect_door_bottom_right.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...generated/resources/assets/minestuck/models/block/mind_aspect_door_bottom_right_open.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/main/generated/resources/assets/minestuck/models/block/mind_aspect_door_top_left.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...ain/generated/resources/assets/minestuck/models/block/mind_aspect_door_top_left_open.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/main/generated/resources/assets/minestuck/models/block/mind_aspect_door_top_right.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...in/generated/resources/assets/minestuck/models/block/mind_aspect_door_top_right_open.json
View file
Open in desktop
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
44 changes: 44 additions & 0 deletions src/main/generated/resources/data/minecraft/tags/block/mineable/axe.json
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/main/generated/resources/data/minestuck/tags/block/flower_pots/aspect.json
View file
Open in desktop
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
Loading