Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
4de2081
Proof of concept: Add block state to catwalk railings to represent pr…
snailcase Mar 13, 2025
7744207
Instantiate the catwalk railing block with a metal String, similar to…
snailcase Mar 13, 2025
eecd73c
Implement interaction between catwalk item and catwalk railing block
snailcase Mar 13, 2025
7605358
POC: Add block states to catwalk block to track position of catwalk a…
snailcase Mar 13, 2025
c3d3ece
Instantiate catwalk blocks with a string identifying the metal that t…
snailcase Mar 13, 2025
ace51a3
Interact with a shape to return the corresponding block
snailcase Mar 13, 2025
510b8d3
Clear the block when the last element is sneak-wrenched
snailcase Mar 13, 2025
3c09ed3
Override how block is rotated with wrench
snailcase Mar 13, 2025
2a3da94
Implement wrenching to toggle between top and bottom catwalk model
snailcase Mar 13, 2025
53df6c0
Revert "Implement interaction between catwalk item and catwalk railin…
snailcase Mar 13, 2025
4d7627c
Revert "Proof of concept: Add block state to catwalk railings to repr…
snailcase Mar 13, 2025
cef411a
Rename the CatwalkHelper to hint that it's used for extending catwalks
snailcase Mar 13, 2025
27e5ec2
Add function to check if catwalk block has any catwalks in its state
snailcase Mar 13, 2025
c6494e2
Using a catwalk item on a catwalk block will place a catwalk on the b…
snailcase Mar 13, 2025
65bebd4
When extending a catwalk block, clear railings and copy the catwalk s…
snailcase Mar 13, 2025
2cd9004
Limit interaction between catwalks and railing item to the same mater…
snailcase Mar 13, 2025
322d32f
Only check for CatwalkBlock when checking if something isCatwalk
snailcase Mar 13, 2025
da22d58
Update loot table for catwalks to drop railings
snailcase Mar 13, 2025
e9573e2
Add config to generate block states for catwalks
snailcase Mar 13, 2025
8e2edb5
Add generated blockstates and models
snailcase Mar 13, 2025
59fa5ab
Fix initial state of block properties
snailcase Mar 13, 2025
90b6d1e
Prevent placing rails in catwalk blocks with top-side catwalks
snailcase Mar 13, 2025
89aebf2
Remove debug output
snailcase Mar 13, 2025
4c47463
Replace railing block with catwalk block seamlessly
snailcase Mar 13, 2025
e7c5df7
Check for same metal in interactions between rail and catwalk blocks …
snailcase Mar 14, 2025
c257d92
Implement ISpecialBlockItemRequirement to fix item costs in schematics
snailcase Mar 14, 2025
ae5ae41
Change default initial catwalk position to top
snailcase Mar 14, 2025
186211c
Implement mirroring and rotation for catwalk block
snailcase Mar 14, 2025
e320b49
When extending catwalks, also check for the same metal type
snailcase Mar 14, 2025
ea00b30
When checking if block is supported, also check if the catwalk is at …
snailcase Mar 14, 2025
3cf9ea8
Merge branch '1.20-main' into catwalks-overhaul
snailcase Mar 15, 2025
3216860
Update architectury loom to 1.9-SNAPSHOT
snailcase Mar 15, 2025
73ff5f3
Fix incompatibilities with Create v6
snailcase Mar 15, 2025
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
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "architectury-plugin" version "3.4-SNAPSHOT"
id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
id "dev.architectury.loom" version "1.9-SNAPSHOT" apply false
id "io.github.juuxel.loom-quiltflower" version "1.+" apply false // Quiltflower, a better decompiler
id "io.github.p03w.machete" version "1.+" // automatic jar compressing on build
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,52 @@
{
"apply": {
"model": "createdeco:block/andesite_catwalk"
},
"when": {
"catwalk_top": "true"
}
},
{
"apply": {
"model": "createdeco:block/andesite_catwalk_down"
},
"when": {
"catwalk_bottom": "true"
}
},
{
"apply": {
"model": "createdeco:block/andesite_catwalk_railing",
"y": 90
},
"when": {
"railing_north": "true"
}
},
{
"apply": {
"model": "createdeco:block/andesite_catwalk_railing",
"y": 180
},
"when": {
"railing_east": "true"
}
},
{
"apply": {
"model": "createdeco:block/andesite_catwalk_railing",
"y": 270
},
"when": {
"railing_south": "true"
}
},
{
"apply": {
"model": "createdeco:block/andesite_catwalk_railing"
},
"when": {
"railing_west": "true"
}
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,52 @@
{
"apply": {
"model": "createdeco:block/brass_catwalk"
},
"when": {
"catwalk_top": "true"
}
},
{
"apply": {
"model": "createdeco:block/brass_catwalk_down"
},
"when": {
"catwalk_bottom": "true"
}
},
{
"apply": {
"model": "createdeco:block/brass_catwalk_railing",
"y": 90
},
"when": {
"railing_north": "true"
}
},
{
"apply": {
"model": "createdeco:block/brass_catwalk_railing",
"y": 180
},
"when": {
"railing_east": "true"
}
},
{
"apply": {
"model": "createdeco:block/brass_catwalk_railing",
"y": 270
},
"when": {
"railing_south": "true"
}
},
{
"apply": {
"model": "createdeco:block/brass_catwalk_railing"
},
"when": {
"railing_west": "true"
}
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,52 @@
{
"apply": {
"model": "createdeco:block/copper_catwalk"
},
"when": {
"catwalk_top": "true"
}
},
{
"apply": {
"model": "createdeco:block/copper_catwalk_down"
},
"when": {
"catwalk_bottom": "true"
}
},
{
"apply": {
"model": "createdeco:block/copper_catwalk_railing",
"y": 90
},
"when": {
"railing_north": "true"
}
},
{
"apply": {
"model": "createdeco:block/copper_catwalk_railing",
"y": 180
},
"when": {
"railing_east": "true"
}
},
{
"apply": {
"model": "createdeco:block/copper_catwalk_railing",
"y": 270
},
"when": {
"railing_south": "true"
}
},
{
"apply": {
"model": "createdeco:block/copper_catwalk_railing"
},
"when": {
"railing_west": "true"
}
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,52 @@
{
"apply": {
"model": "createdeco:block/industrial_iron_catwalk"
},
"when": {
"catwalk_top": "true"
}
},
{
"apply": {
"model": "createdeco:block/industrial_iron_catwalk_down"
},
"when": {
"catwalk_bottom": "true"
}
},
{
"apply": {
"model": "createdeco:block/industrial_iron_catwalk_railing",
"y": 90
},
"when": {
"railing_north": "true"
}
},
{
"apply": {
"model": "createdeco:block/industrial_iron_catwalk_railing",
"y": 180
},
"when": {
"railing_east": "true"
}
},
{
"apply": {
"model": "createdeco:block/industrial_iron_catwalk_railing",
"y": 270
},
"when": {
"railing_south": "true"
}
},
{
"apply": {
"model": "createdeco:block/industrial_iron_catwalk_railing"
},
"when": {
"railing_west": "true"
}
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,52 @@
{
"apply": {
"model": "createdeco:block/iron_catwalk"
},
"when": {
"catwalk_top": "true"
}
},
{
"apply": {
"model": "createdeco:block/iron_catwalk_down"
},
"when": {
"catwalk_bottom": "true"
}
},
{
"apply": {
"model": "createdeco:block/iron_catwalk_railing",
"y": 90
},
"when": {
"railing_north": "true"
}
},
{
"apply": {
"model": "createdeco:block/iron_catwalk_railing",
"y": 180
},
"when": {
"railing_east": "true"
}
},
{
"apply": {
"model": "createdeco:block/iron_catwalk_railing",
"y": 270
},
"when": {
"railing_south": "true"
}
},
{
"apply": {
"model": "createdeco:block/iron_catwalk_railing"
},
"when": {
"railing_west": "true"
}
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,52 @@
{
"apply": {
"model": "createdeco:block/zinc_catwalk"
},
"when": {
"catwalk_top": "true"
}
},
{
"apply": {
"model": "createdeco:block/zinc_catwalk_down"
},
"when": {
"catwalk_bottom": "true"
}
},
{
"apply": {
"model": "createdeco:block/zinc_catwalk_railing",
"y": 90
},
"when": {
"railing_north": "true"
}
},
{
"apply": {
"model": "createdeco:block/zinc_catwalk_railing",
"y": 180
},
"when": {
"railing_east": "true"
}
},
{
"apply": {
"model": "createdeco:block/zinc_catwalk_railing",
"y": 270
},
"when": {
"railing_south": "true"
}
},
{
"apply": {
"model": "createdeco:block/zinc_catwalk_railing"
},
"when": {
"railing_west": "true"
}
},
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "createdeco:block/catwalk_bottom",
"textures": {
"2": "createdeco:block/palettes/catwalks/andesite_catwalk",
"particle": "createdeco:block/palettes/catwalks/andesite_catwalk"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "createdeco:block/catwalk_bottom",
"textures": {
"2": "createdeco:block/palettes/catwalks/brass_catwalk",
"particle": "createdeco:block/palettes/catwalks/brass_catwalk"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "createdeco:block/catwalk_bottom",
"textures": {
"2": "createdeco:block/palettes/catwalks/copper_catwalk",
"particle": "createdeco:block/palettes/catwalks/copper_catwalk"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "createdeco:block/catwalk_bottom",
"textures": {
"2": "createdeco:block/palettes/catwalks/industrial_iron_catwalk",
"particle": "createdeco:block/palettes/catwalks/industrial_iron_catwalk"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "createdeco:block/catwalk_bottom",
"textures": {
"2": "createdeco:block/palettes/catwalks/iron_catwalk",
"particle": "createdeco:block/palettes/catwalks/iron_catwalk"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "createdeco:block/catwalk_bottom",
"textures": {
"2": "createdeco:block/palettes/catwalks/zinc_catwalk",
"particle": "createdeco:block/palettes/catwalks/zinc_catwalk"
}
}
Loading