diff --git a/src/main/generated/assets/galacticraft/blockstates/parachest.json b/src/main/generated/assets/galacticraft/blockstates/parachest.json index 3abab7255..82938ab7c 100644 --- a/src/main/generated/assets/galacticraft/blockstates/parachest.json +++ b/src/main/generated/assets/galacticraft/blockstates/parachest.json @@ -11,11 +11,11 @@ }, { "apply": { - "model": "galacticraft:block/parachest/white_chute", - "y": 0 + "model": "galacticraft:block/parachest/parachest", + "y": 90 }, "when": { - "color": "white" + "facing": "east" } }, { @@ -29,38 +29,41 @@ }, { "apply": { - "model": "galacticraft:block/parachest/white_chute", - "y": 180 + "model": "galacticraft:block/parachest/parachest", + "y": 270 }, "when": { - "color": "white" + "facing": "west" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 270 + "model": "galacticraft:block/parachest/white_chute", + "y": 0 }, "when": { - "facing": "west" + "color": "white", + "facing": "north" } }, { "apply": { "model": "galacticraft:block/parachest/white_chute", - "y": 270 + "y": 180 }, "when": { - "color": "white" + "color": "white", + "facing": "south" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 90 + "model": "galacticraft:block/parachest/white_chute", + "y": 270 }, "when": { - "facing": "east" + "color": "white", + "facing": "west" } }, { @@ -69,1088 +72,609 @@ "y": 90 }, "when": { - "color": "white" + "color": "white", + "facing": "east" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", + "model": "galacticraft:block/parachest/orange_chute", "y": 0 }, "when": { + "color": "orange", "facing": "north" } }, { "apply": { "model": "galacticraft:block/parachest/orange_chute", - "y": 0 + "y": 180 }, "when": { - "color": "orange" + "color": "orange", + "facing": "south" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 180 + "model": "galacticraft:block/parachest/orange_chute", + "y": 270 }, "when": { - "facing": "south" + "color": "orange", + "facing": "west" } }, { "apply": { "model": "galacticraft:block/parachest/orange_chute", - "y": 180 + "y": 90 }, "when": { - "color": "orange" + "color": "orange", + "facing": "east" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 270 + "model": "galacticraft:block/parachest/magenta_chute", + "y": 0 }, "when": { - "facing": "west" + "color": "magenta", + "facing": "north" } }, { "apply": { - "model": "galacticraft:block/parachest/orange_chute", - "y": 270 + "model": "galacticraft:block/parachest/magenta_chute", + "y": 180 }, "when": { - "color": "orange" + "color": "magenta", + "facing": "south" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 90 + "model": "galacticraft:block/parachest/magenta_chute", + "y": 270 }, "when": { - "facing": "east" + "color": "magenta", + "facing": "west" } }, { "apply": { - "model": "galacticraft:block/parachest/orange_chute", + "model": "galacticraft:block/parachest/magenta_chute", "y": 90 }, "when": { - "color": "orange" + "color": "magenta", + "facing": "east" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", + "model": "galacticraft:block/parachest/light_blue_chute", "y": 0 }, "when": { + "color": "light_blue", "facing": "north" } }, { "apply": { - "model": "galacticraft:block/parachest/magenta_chute", - "y": 0 + "model": "galacticraft:block/parachest/light_blue_chute", + "y": 180 }, "when": { - "color": "magenta" + "color": "light_blue", + "facing": "south" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 180 + "model": "galacticraft:block/parachest/light_blue_chute", + "y": 270 }, "when": { - "facing": "south" + "color": "light_blue", + "facing": "west" } }, { "apply": { - "model": "galacticraft:block/parachest/magenta_chute", - "y": 180 + "model": "galacticraft:block/parachest/light_blue_chute", + "y": 90 }, "when": { - "color": "magenta" + "color": "light_blue", + "facing": "east" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 270 + "model": "galacticraft:block/parachest/yellow_chute", + "y": 0 }, "when": { - "facing": "west" + "color": "yellow", + "facing": "north" } }, { "apply": { - "model": "galacticraft:block/parachest/magenta_chute", - "y": 270 + "model": "galacticraft:block/parachest/yellow_chute", + "y": 180 }, "when": { - "color": "magenta" + "color": "yellow", + "facing": "south" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 90 + "model": "galacticraft:block/parachest/yellow_chute", + "y": 270 }, "when": { - "facing": "east" + "color": "yellow", + "facing": "west" } }, { "apply": { - "model": "galacticraft:block/parachest/magenta_chute", + "model": "galacticraft:block/parachest/yellow_chute", "y": 90 }, "when": { - "color": "magenta" + "color": "yellow", + "facing": "east" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", + "model": "galacticraft:block/parachest/lime_chute", "y": 0 }, "when": { + "color": "lime", "facing": "north" } }, { "apply": { - "model": "galacticraft:block/parachest/light_blue_chute", - "y": 0 + "model": "galacticraft:block/parachest/lime_chute", + "y": 180 }, "when": { - "color": "light_blue" + "color": "lime", + "facing": "south" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 180 + "model": "galacticraft:block/parachest/lime_chute", + "y": 270 }, "when": { - "facing": "south" + "color": "lime", + "facing": "west" } }, { "apply": { - "model": "galacticraft:block/parachest/light_blue_chute", - "y": 180 + "model": "galacticraft:block/parachest/lime_chute", + "y": 90 }, "when": { - "color": "light_blue" + "color": "lime", + "facing": "east" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 270 + "model": "galacticraft:block/parachest/pink_chute", + "y": 0 }, "when": { - "facing": "west" + "color": "pink", + "facing": "north" } }, { "apply": { - "model": "galacticraft:block/parachest/light_blue_chute", - "y": 270 + "model": "galacticraft:block/parachest/pink_chute", + "y": 180 }, "when": { - "color": "light_blue" + "color": "pink", + "facing": "south" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 90 + "model": "galacticraft:block/parachest/pink_chute", + "y": 270 }, "when": { - "facing": "east" + "color": "pink", + "facing": "west" } }, { "apply": { - "model": "galacticraft:block/parachest/light_blue_chute", + "model": "galacticraft:block/parachest/pink_chute", "y": 90 }, "when": { - "color": "light_blue" + "color": "pink", + "facing": "east" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", + "model": "galacticraft:block/parachest/gray_chute", "y": 0 }, "when": { + "color": "gray", "facing": "north" } }, { "apply": { - "model": "galacticraft:block/parachest/yellow_chute", - "y": 0 + "model": "galacticraft:block/parachest/gray_chute", + "y": 180 }, "when": { - "color": "yellow" + "color": "gray", + "facing": "south" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 180 + "model": "galacticraft:block/parachest/gray_chute", + "y": 270 }, "when": { - "facing": "south" + "color": "gray", + "facing": "west" } }, { "apply": { - "model": "galacticraft:block/parachest/yellow_chute", - "y": 180 + "model": "galacticraft:block/parachest/gray_chute", + "y": 90 }, "when": { - "color": "yellow" + "color": "gray", + "facing": "east" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 270 + "model": "galacticraft:block/parachest/light_gray_chute", + "y": 0 }, "when": { - "facing": "west" + "color": "light_gray", + "facing": "north" } }, { "apply": { - "model": "galacticraft:block/parachest/yellow_chute", - "y": 270 + "model": "galacticraft:block/parachest/light_gray_chute", + "y": 180 }, "when": { - "color": "yellow" + "color": "light_gray", + "facing": "south" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 90 + "model": "galacticraft:block/parachest/light_gray_chute", + "y": 270 }, "when": { - "facing": "east" + "color": "light_gray", + "facing": "west" } }, { "apply": { - "model": "galacticraft:block/parachest/yellow_chute", + "model": "galacticraft:block/parachest/light_gray_chute", "y": 90 }, "when": { - "color": "yellow" + "color": "light_gray", + "facing": "east" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", + "model": "galacticraft:block/parachest/cyan_chute", "y": 0 }, "when": { + "color": "cyan", "facing": "north" } }, { "apply": { - "model": "galacticraft:block/parachest/lime_chute", - "y": 0 + "model": "galacticraft:block/parachest/cyan_chute", + "y": 180 }, "when": { - "color": "lime" + "color": "cyan", + "facing": "south" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 180 + "model": "galacticraft:block/parachest/cyan_chute", + "y": 270 }, "when": { - "facing": "south" + "color": "cyan", + "facing": "west" } }, { "apply": { - "model": "galacticraft:block/parachest/lime_chute", - "y": 180 + "model": "galacticraft:block/parachest/cyan_chute", + "y": 90 }, "when": { - "color": "lime" + "color": "cyan", + "facing": "east" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 270 + "model": "galacticraft:block/parachest/purple_chute", + "y": 0 }, "when": { - "facing": "west" + "color": "purple", + "facing": "north" } }, { "apply": { - "model": "galacticraft:block/parachest/lime_chute", - "y": 270 + "model": "galacticraft:block/parachest/purple_chute", + "y": 180 }, "when": { - "color": "lime" + "color": "purple", + "facing": "south" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 90 + "model": "galacticraft:block/parachest/purple_chute", + "y": 270 }, "when": { - "facing": "east" + "color": "purple", + "facing": "west" } }, { "apply": { - "model": "galacticraft:block/parachest/lime_chute", + "model": "galacticraft:block/parachest/purple_chute", "y": 90 }, "when": { - "color": "lime" + "color": "purple", + "facing": "east" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", + "model": "galacticraft:block/parachest/blue_chute", "y": 0 }, "when": { + "color": "blue", "facing": "north" } }, { "apply": { - "model": "galacticraft:block/parachest/pink_chute", - "y": 0 + "model": "galacticraft:block/parachest/blue_chute", + "y": 180 }, "when": { - "color": "pink" + "color": "blue", + "facing": "south" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 180 + "model": "galacticraft:block/parachest/blue_chute", + "y": 270 }, "when": { - "facing": "south" + "color": "blue", + "facing": "west" } }, { "apply": { - "model": "galacticraft:block/parachest/pink_chute", - "y": 180 + "model": "galacticraft:block/parachest/blue_chute", + "y": 90 }, "when": { - "color": "pink" + "color": "blue", + "facing": "east" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 270 + "model": "galacticraft:block/parachest/brown_chute", + "y": 0 }, "when": { - "facing": "west" + "color": "brown", + "facing": "north" } }, { "apply": { - "model": "galacticraft:block/parachest/pink_chute", - "y": 270 + "model": "galacticraft:block/parachest/brown_chute", + "y": 180 }, "when": { - "color": "pink" + "color": "brown", + "facing": "south" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 90 + "model": "galacticraft:block/parachest/brown_chute", + "y": 270 }, "when": { - "facing": "east" + "color": "brown", + "facing": "west" } }, { "apply": { - "model": "galacticraft:block/parachest/pink_chute", + "model": "galacticraft:block/parachest/brown_chute", "y": 90 }, "when": { - "color": "pink" + "color": "brown", + "facing": "east" } }, { "apply": { - "model": "galacticraft:block/parachest/parachest", + "model": "galacticraft:block/parachest/green_chute", "y": 0 }, "when": { + "color": "green", "facing": "north" } }, { "apply": { - "model": "galacticraft:block/parachest/gray_chute", - "y": 0 - }, - "when": { - "color": "gray" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 180 - }, - "when": { - "facing": "south" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/gray_chute", - "y": 180 - }, - "when": { - "color": "gray" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 270 - }, - "when": { - "facing": "west" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/gray_chute", - "y": 270 - }, - "when": { - "color": "gray" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 90 - }, - "when": { - "facing": "east" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/gray_chute", - "y": 90 - }, - "when": { - "color": "gray" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 0 - }, - "when": { - "facing": "north" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/light_gray_chute", - "y": 0 - }, - "when": { - "color": "light_gray" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 180 - }, - "when": { - "facing": "south" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/light_gray_chute", - "y": 180 - }, - "when": { - "color": "light_gray" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 270 - }, - "when": { - "facing": "west" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/light_gray_chute", - "y": 270 - }, - "when": { - "color": "light_gray" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 90 - }, - "when": { - "facing": "east" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/light_gray_chute", - "y": 90 - }, - "when": { - "color": "light_gray" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 0 - }, - "when": { - "facing": "north" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/cyan_chute", - "y": 0 - }, - "when": { - "color": "cyan" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 180 - }, - "when": { - "facing": "south" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/cyan_chute", - "y": 180 - }, - "when": { - "color": "cyan" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 270 - }, - "when": { - "facing": "west" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/cyan_chute", - "y": 270 - }, - "when": { - "color": "cyan" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 90 - }, - "when": { - "facing": "east" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/cyan_chute", - "y": 90 - }, - "when": { - "color": "cyan" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 0 - }, - "when": { - "facing": "north" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/purple_chute", - "y": 0 - }, - "when": { - "color": "purple" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 180 - }, - "when": { - "facing": "south" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/purple_chute", - "y": 180 - }, - "when": { - "color": "purple" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 270 - }, - "when": { - "facing": "west" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/purple_chute", - "y": 270 - }, - "when": { - "color": "purple" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 90 - }, - "when": { - "facing": "east" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/purple_chute", - "y": 90 - }, - "when": { - "color": "purple" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 0 - }, - "when": { - "facing": "north" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/blue_chute", - "y": 0 - }, - "when": { - "color": "blue" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 180 - }, - "when": { - "facing": "south" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/blue_chute", - "y": 180 - }, - "when": { - "color": "blue" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 270 - }, - "when": { - "facing": "west" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/blue_chute", - "y": 270 - }, - "when": { - "color": "blue" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 90 - }, - "when": { - "facing": "east" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/blue_chute", - "y": 90 - }, - "when": { - "color": "blue" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 0 - }, - "when": { - "facing": "north" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/brown_chute", - "y": 0 - }, - "when": { - "color": "brown" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 180 - }, - "when": { - "facing": "south" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/brown_chute", - "y": 180 - }, - "when": { - "color": "brown" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 270 - }, - "when": { - "facing": "west" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/brown_chute", - "y": 270 - }, - "when": { - "color": "brown" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 90 - }, - "when": { - "facing": "east" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/brown_chute", - "y": 90 - }, - "when": { - "color": "brown" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 0 - }, - "when": { - "facing": "north" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/green_chute", - "y": 0 - }, - "when": { - "color": "green" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", - "y": 180 + "model": "galacticraft:block/parachest/green_chute", + "y": 180 }, "when": { + "color": "green", "facing": "south" } }, { "apply": { "model": "galacticraft:block/parachest/green_chute", - "y": 180 - }, - "when": { - "color": "green" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", "y": 270 }, "when": { + "color": "green", "facing": "west" } }, { "apply": { "model": "galacticraft:block/parachest/green_chute", - "y": 270 - }, - "when": { - "color": "green" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", "y": 90 }, "when": { + "color": "green", "facing": "east" } }, { "apply": { - "model": "galacticraft:block/parachest/green_chute", - "y": 90 - }, - "when": { - "color": "green" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", + "model": "galacticraft:block/parachest/red_chute", "y": 0 }, "when": { + "color": "red", "facing": "north" } }, { "apply": { "model": "galacticraft:block/parachest/red_chute", - "y": 0 - }, - "when": { - "color": "red" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", "y": 180 }, "when": { + "color": "red", "facing": "south" } }, { "apply": { "model": "galacticraft:block/parachest/red_chute", - "y": 180 - }, - "when": { - "color": "red" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", "y": 270 }, "when": { + "color": "red", "facing": "west" } }, { "apply": { "model": "galacticraft:block/parachest/red_chute", - "y": 270 - }, - "when": { - "color": "red" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", "y": 90 }, "when": { + "color": "red", "facing": "east" } }, { "apply": { - "model": "galacticraft:block/parachest/red_chute", - "y": 90 - }, - "when": { - "color": "red" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", + "model": "galacticraft:block/parachest/black_chute", "y": 0 }, "when": { + "color": "black", "facing": "north" } }, { "apply": { "model": "galacticraft:block/parachest/black_chute", - "y": 0 - }, - "when": { - "color": "black" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", "y": 180 }, "when": { + "color": "black", "facing": "south" } }, { "apply": { "model": "galacticraft:block/parachest/black_chute", - "y": 180 - }, - "when": { - "color": "black" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", "y": 270 }, "when": { + "color": "black", "facing": "west" } }, { "apply": { "model": "galacticraft:block/parachest/black_chute", - "y": 270 - }, - "when": { - "color": "black" - } - }, - { - "apply": { - "model": "galacticraft:block/parachest/parachest", "y": 90 }, "when": { + "color": "black", "facing": "east" } - }, - { - "apply": { - "model": "galacticraft:block/parachest/black_chute", - "y": 90 - }, - "when": { - "color": "black" - } } ] } \ No newline at end of file diff --git a/src/main/java/dev/galacticraft/mod/content/block/special/ParaChestBlock.java b/src/main/java/dev/galacticraft/mod/content/block/special/ParaChestBlock.java index f3e5fd4bf..65c3c463e 100644 --- a/src/main/java/dev/galacticraft/mod/content/block/special/ParaChestBlock.java +++ b/src/main/java/dev/galacticraft/mod/content/block/special/ParaChestBlock.java @@ -50,6 +50,7 @@ import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.DirectionProperty; import net.minecraft.world.level.block.state.properties.EnumProperty; +import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; @@ -64,7 +65,8 @@ public class ParaChestBlock extends GCBlock implements EntityBlock { public ParaChestBlock(Properties properties) { super(properties); - registerDefaultState(getStateDefinition().any().setValue(FACING, Direction.NORTH)); + registerDefaultState(getStateDefinition().any().setValue(FACING, Direction.NORTH) + .setValue(COLOR, DyeColor.WHITE)); } @Override @@ -80,19 +82,27 @@ public VoxelShape getShape(BlockState blockState, BlockGetter blockGetter, Block @Override public BlockState getStateForPlacement(BlockPlaceContext blockPlaceContext) { - return this.defaultBlockState().setValue(FACING, blockPlaceContext.getHorizontalDirection()); + BlockState blockState = this.defaultBlockState() + .setValue(FACING, blockPlaceContext.getHorizontalDirection()); + + ItemStack itemStack = blockPlaceContext.getItemInHand(); + if (!itemStack.isEmpty()) { + blockState = blockState.setValue(COLOR, itemStack.getComponents().getOrDefault(DataComponents.BASE_COLOR, DyeColor.WHITE)); + } + return blockState; } @Override public BlockState playerWillDestroy(Level level, BlockPos blockPos, BlockState blockState, Player player) { - if (!level.isClientSide) { + if (!level.isClientSide && !player.isCreative()) { ItemStack parachest = new ItemStack(this); - parachest.set(DataComponents.BLOCK_STATE, BlockItemStateProperties.EMPTY.with(COLOR, blockState.getValue(COLOR))); - ItemEntity itemEntity = new ItemEntity(level, blockPos.getX(), blockPos.getY(), blockPos.getZ(), parachest); + parachest.set(DataComponents.BASE_COLOR, blockState.getValue(COLOR)); + Vec3 pos = blockPos.getCenter(); + ItemEntity itemEntity = new ItemEntity(level, pos.x, pos.y, pos.z, parachest); itemEntity.setDefaultPickUpDelay(); level.addFreshEntity(itemEntity); } - return super.playerWillDestroy(level, blockPos, blockState, player); + return null; } @Override diff --git a/src/main/java/dev/galacticraft/mod/data/model/GCModelProvider.java b/src/main/java/dev/galacticraft/mod/data/model/GCModelProvider.java index 79927b441..03fadc38d 100644 --- a/src/main/java/dev/galacticraft/mod/data/model/GCModelProvider.java +++ b/src/main/java/dev/galacticraft/mod/data/model/GCModelProvider.java @@ -251,11 +251,13 @@ public void generateBlockStateModels(BlockModelGenerators generator) { generator.createNonTemplateModelBlock(GCBlocks.AIR_LOCK_SEAL); var para = MultiPartGenerator.multiPart(GCBlocks.PARACHEST); - GCBlocks.PARACHEST.getStateDefinition().getPossibleStates().forEach(state -> { - para.with(Condition.condition().term(ParaChestBlock.FACING, state.getValue(ParaChestBlock.FACING))/*.term(ParaChestBlock.COLOR, state.getValue(ParaChestBlock.COLOR))*/, Variant.variant() - .with(VariantProperties.Y_ROT, getRotationFromDirection(state.getValue(ParaChestBlock.FACING))) + Direction.Plane.HORIZONTAL.forEach(state -> { + para.with(Condition.condition().term(ParaChestBlock.FACING, state), Variant.variant() + .with(VariantProperties.Y_ROT, getRotationFromDirection(state)) .with(VariantProperties.MODEL, ResourceLocation.parse("galacticraft:block/parachest/parachest"))); - para.with(Condition.condition().term(ParaChestBlock.COLOR, state.getValue(ParaChestBlock.COLOR)), Variant.variant() + }); + GCBlocks.PARACHEST.getStateDefinition().getPossibleStates().forEach(state -> { + para.with(Condition.condition().term(ParaChestBlock.FACING, state.getValue(ParaChestBlock.FACING)).term(ParaChestBlock.COLOR, state.getValue(ParaChestBlock.COLOR)), Variant.variant() .with(VariantProperties.Y_ROT, getRotationFromDirection(state.getValue(ParaChestBlock.FACING))) .with(VariantProperties.MODEL, ResourceLocation.parse("galacticraft:block/parachest/" + state.getValue(ParaChestBlock.COLOR) + "_chute"))); }); diff --git a/src/main/resources/assets/galacticraft/blockstates/parachestd.json b/src/main/resources/assets/galacticraft/blockstates/parachestd.json deleted file mode 100644 index ecfb291b9..000000000 --- a/src/main/resources/assets/galacticraft/blockstates/parachestd.json +++ /dev/null @@ -1,450 +0,0 @@ -{ - "color=white,facing=north": { - "model": "galacticraft:block/parachest/parachest", - "textures": { - "chute": "galacticraft:model/parachute/white" - } - }, - "color=white,facing=east": { - "model": "galacticraft:block/parachest/parachest", - "y": 90, - "textures": { - "chute": "galacticraft:model/parachute/white" - } - }, - "color=white,facing=south": { - "model": "galacticraft:block/parachest/parachest", - "y": 180, - "textures": { - "chute": "galacticraft:model/parachute/white" - } - }, - "color=white,facing=west": { - "model": "galacticraft:block/parachest/parachest", - "y": 270, - "textures": { - "chute": "galacticraft:model/parachute/white" - } - }, - - "color=black,facing=north": { - "model": "galacticraft:block/parachest/parachest", - "textures": { - "chute": "galacticraft:model/parachute/black" - } - }, - "color=black,facing=east": { - "model": "galacticraft:block/parachest/parachest", - "y": 90, - "textures": { - "chute": "galacticraft:model/parachute/black" - } - }, - "color=black,facing=south": { - "model": "galacticraft:block/parachest/parachest", - "y": 180, - "textures": { - "chute": "galacticraft:model/parachute/black" - } - }, - "color=black,facing=west": { - "model": "galacticraft:block/parachest/parachest", - "y": 270, - "textures": { - "chute": "galacticraft:model/parachute/black" - } - }, - - "color=light_blue,facing=north": { - "model": "galacticraft:block/parachest/parachest", - "textures": { - "chute": "galacticraft:model/parachute/blue" - } - }, - "color=light_blue,facing=east": { - "model": "galacticraft:block/parachest/parachest", - "y": 90, - "textures": { - "chute": "galacticraft:model/parachute/blue" - } - }, - "color=light_blue,facing=south": { - "model": "galacticraft:block/parachest/parachest", - "y": 180, - "textures": { - "chute": "galacticraft:model/parachute/blue" - } - }, - "color=light_blue,facing=west": { - "model": "galacticraft:block/parachest/parachest", - "y": 270, - "textures": { - "chute": "galacticraft:model/parachute/blue" - } - }, - - "color=brown,facing=north": { - "model": "galacticraft:block/parachest/parachest", - "textures": { - "chute": "galacticraft:model/parachute/brown" - } - }, - "color=brown,facing=east": { - "model": "galacticraft:block/parachest/parachest", - "y": 90, - "textures": { - "chute": "galacticraft:model/parachute/brown" - } - }, - "color=brown,facing=south": { - "model": "galacticraft:block/parachest/parachest", - "y": 180, - "textures": { - "chute": "galacticraft:model/parachute/brown" - } - }, - "color=brown,facing=west": { - "model": "galacticraft:block/parachest/parachest", - "y": 270, - "textures": { - "chute": "galacticraft:model/parachute/brown" - } - }, - - "color=blue,facing=north": { - "model": "galacticraft:block/parachest/parachest", - "textures": { - "chute": "galacticraft:model/parachute/darkblue" - } - }, - "color=blue,facing=east": { - "model": "galacticraft:block/parachest/parachest", - "y": 90, - "textures": { - "chute": "galacticraft:model/parachute/darkblue" - } - }, - "color=blue,facing=south": { - "model": "galacticraft:block/parachest/parachest", - "y": 180, - "textures": { - "chute": "galacticraft:model/parachute/darkblue" - } - }, - "color=blue,facing=west": { - "model": "galacticraft:block/parachest/parachest", - "y": 270, - "textures": { - "chute": "galacticraft:model/parachute/darkblue" - } - }, - - "color=gray,facing=north": { - "model": "galacticraft:block/parachest/parachest", - "textures": { - "chute": "galacticraft:model/parachute/darkgray" - } - }, - "color=gray,facing=east": { - "model": "galacticraft:block/parachest/parachest", - "y": 90, - "textures": { - "chute": "galacticraft:model/parachute/darkgray" - } - }, - "color=gray,facing=south": { - "model": "galacticraft:block/parachest/parachest", - "y": 180, - "textures": { - "chute": "galacticraft:model/parachute/darkgray" - } - }, - "color=gray,facing=west": { - "model": "galacticraft:block/parachest/parachest", - "y": 270, - "textures": { - "chute": "galacticraft:model/parachute/darkgray" - } - }, - - "color=green,facing=north": { - "model": "galacticraft:block/parachest/parachest", - "textures": { - "chute": "galacticraft:model/parachute/green" - } - }, - "color=green,facing=east": { - "model": "galacticraft:block/parachest/parachest", - "y": 90, - "textures": { - "chute": "galacticraft:model/parachute/green" - } - }, - "color=green,facing=south": { - "model": "galacticraft:block/parachest/parachest", - "y": 180, - "textures": { - "chute": "galacticraft:model/parachute/green" - } - }, - "color=green,facing=west": { - "model": "galacticraft:block/parachest/parachest", - "y": 270, - "textures": { - "chute": "galacticraft:model/parachute/green" - } - }, - - "color=light_gray,facing=north": { - "model": "galacticraft:block/parachest/parachest", - "textures": { - "chute": "galacticraft:model/parachute/gray" - } - }, - "color=light_gray,facing=east": { - "model": "galacticraft:block/parachest/parachest", - "y": 90, - "textures": { - "chute": "galacticraft:model/parachute/gray" - } - }, - "color=light_gray,facing=south": { - "model": "galacticraft:block/parachest/parachest", - "y": 180, - "textures": { - "chute": "galacticraft:model/parachute/gray" - } - }, - "color=light_gray,facing=west": { - "model": "galacticraft:block/parachest/parachest", - "y": 270, - "textures": { - "chute": "galacticraft:model/parachute/gray" - } - }, - - "color=lime,facing=north": { - "model": "galacticraft:block/parachest/parachest", - "textures": { - "chute": "galacticraft:model/parachute/lime" - } - }, - "color=lime,facing=east": { - "model": "galacticraft:block/parachest/parachest", - "y": 90, - "textures": { - "chute": "galacticraft:model/parachute/lime" - } - }, - "color=lime,facing=south": { - "model": "galacticraft:block/parachest/parachest", - "y": 180, - "textures": { - "chute": "galacticraft:model/parachute/lime" - } - }, - "color=lime,facing=west": { - "model": "galacticraft:block/parachest/parachest", - "y": 270, - "textures": { - "chute": "galacticraft:model/parachute/lime" - } - }, - - "color=magenta,facing=north": { - "model": "galacticraft:block/parachest/parachest", - "textures": { - "chute": "galacticraft:model/parachute/magenta" - } - }, - "color=magenta,facing=east": { - "model": "galacticraft:block/parachest/parachest", - "y": 90, - "textures": { - "chute": "galacticraft:model/parachute/magenta" - } - }, - "color=magenta,facing=south": { - "model": "galacticraft:block/parachest/parachest", - "y": 180, - "textures": { - "chute": "galacticraft:model/parachute/magenta" - } - }, - "color=magenta,facing=west": { - "model": "galacticraft:block/parachest/parachest", - "y": 270, - "textures": { - "chute": "galacticraft:model/parachute/magenta" - } - }, - - "color=orange,facing=north": { - "model": "galacticraft:block/parachest/parachest", - "textures": { - "chute": "galacticraft:model/parachute/orange" - } - }, - "color=orange,facing=east": { - "model": "galacticraft:block/parachest/parachest", - "y": 90, - "textures": { - "chute": "galacticraft:model/parachute/orange" - } - }, - "color=orange,facing=south": { - "model": "galacticraft:block/parachest/parachest", - "y": 180, - "textures": { - "chute": "galacticraft:model/parachute/orange" - } - }, - "color=orange,facing=west": { - "model": "galacticraft:block/parachest/parachest", - "y": 270, - "textures": { - "chute": "galacticraft:model/parachute/orange" - } - }, - - "color=pink,facing=north": { - "model": "galacticraft:block/parachest/parachest", - "textures": { - "chute": "galacticraft:model/parachute/pink" - } - }, - "color=pink,facing=east": { - "model": "galacticraft:block/parachest/parachest", - "y": 90, - "textures": { - "chute": "galacticraft:model/parachute/pink" - } - }, - "color=pink,facing=south": { - "model": "galacticraft:block/parachest/parachest", - "y": 180, - "textures": { - "chute": "galacticraft:model/parachute/pink" - } - }, - "color=pink,facing=west": { - "model": "galacticraft:block/parachest/parachest", - "y": 270, - "textures": { - "chute": "galacticraft:model/parachute/pink" - } - }, - - "color=purple,facing=north": { - "model": "galacticraft:block/parachest/parachest", - "textures": { - "chute": "galacticraft:model/parachute/purple" - } - }, - "color=purple,facing=east": { - "model": "galacticraft:block/parachest/parachest", - "y": 90, - "textures": { - "chute": "galacticraft:model/parachute/purple" - } - }, - "color=purple,facing=south": { - "model": "galacticraft:block/parachest/parachest", - "y": 180, - "textures": { - "chute": "galacticraft:model/parachute/purple" - } - }, - "color=purple,facing=west": { - "model": "galacticraft:block/parachest/parachest", - "y": 270, - "textures": { - "chute": "galacticraft:model/parachute/purple" - } - }, - - "color=red,facing=north": { - "model": "galacticraft:block/parachest/parachest", - "textures": { - "chute": "galacticraft:model/parachute/red" - } - }, - "color=red,facing=east": { - "model": "galacticraft:block/parachest/parachest", - "y": 90, - "textures": { - "chute": "galacticraft:model/parachute/red" - } - }, - "color=red,facing=south": { - "model": "galacticraft:block/parachest/parachest", - "y": 180, - "textures": { - "chute": "galacticraft:model/parachute/red" - } - }, - "color=red,facing=west": { - "model": "galacticraft:block/parachest/parachest", - "y": 270, - "textures": { - "chute": "galacticraft:model/parachute/red" - } - }, - - "color=cyan,facing=north": { - "model": "galacticraft:block/parachest/parachest", - "textures": { - "chute": "galacticraft:model/parachute/cyan" - } - }, - "color=cyan,facing=east": { - "model": "galacticraft:block/parachest/parachest", - "y": 90, - "textures": { - "chute": "galacticraft:model/parachute/cyan" - } - }, - "color=cyan,facing=south": { - "model": "galacticraft:block/parachest/parachest", - "y": 180, - "textures": { - "chute": "galacticraft:model/parachute/cyan" - } - }, - "color=cyan,facing=west": { - "model": "galacticraft:block/parachest/parachest", - "y": 270, - "textures": { - "chute": "galacticraft:model/parachute/cyan" - } - }, - - "color=yellow,facing=north": { - "model": "galacticraft:block/parachest/parachest", - "textures": { - "chute": "galacticraft:model/parachute/yellow" - } - }, - "color=yellow,facing=east": { - "model": "galacticraft:block/parachest/parachest", - "y": 90, - "textures": { - "chute": "galacticraft:model/parachute/yellow" - } - }, - "color=yellow,facing=south": { - "model": "galacticraft:block/parachest/parachest", - "y": 180, - "textures": { - "chute": "galacticraft:model/parachute/yellow" - } - }, - "color=yellow,facing=west": { - "model": "galacticraft:block/parachest/parachest", - "y": 270, - "textures": { - "chute": "galacticraft:model/parachute/yellow" - } - } - } -} \ No newline at end of file