From 38dbed251824897c49fefe139b9b3e1c257a85a2 Mon Sep 17 00:00:00 2001 From: LordGrimmauld Date: Fri, 19 Jun 2020 18:37:11 +0200 Subject: [PATCH] Tagging Changes - Copper, Brass and Zinc blocks can now be used as beacon base block - Copper, Brass and Zinc can now be used to activate a beacon - Create ingots are now listed under the forge:ingots tag (not only forge:ingots/type) - Create nuggets are now listed under the forge:nuggets tag (not only forge:nuggets/type) - Create plates are now listed under the forge:plates tag (not only forge:plates/type) - Updated registrate to support multiple tags --- gradle.properties | 2 +- src/generated/resources/.cache/cache | 18 +++-- .../assets/create/blockstates/cogwheel.json | 19 ++++- .../create/blockstates/large_cogwheel.json | 19 ++++- .../blockstates/mechanical_piston_head.json | 76 ++++++++++++++++--- .../create/blockstates/mechanical_pump.json | 38 ++++++++-- .../blockstates/piston_extension_pole.json | 38 ++++++++-- .../create/blockstates/radial_chassis.json | 48 ++++++------ .../assets/create/blockstates/shaft.json | 19 ++++- .../data/forge/tags/items/beacon_payment.json | 8 ++ .../data/forge/tags/items/ingots.json | 8 ++ .../data/forge/tags/items/nuggets.json | 8 ++ .../data/forge/tags/items/plates.json | 9 +++ .../java/com/simibubi/create/AllBlocks.java | 18 +++-- .../java/com/simibubi/create/AllItems.java | 28 ++++--- .../java/com/simibubi/create/AllTags.java | 16 ++-- .../create/content/palettes/MetalBlock.java | 25 ++++++ .../foundation/worldgen/OxidizingBlock.java | 9 ++- 18 files changed, 314 insertions(+), 92 deletions(-) create mode 100644 src/generated/resources/data/forge/tags/items/beacon_payment.json create mode 100644 src/generated/resources/data/forge/tags/items/ingots.json create mode 100644 src/generated/resources/data/forge/tags/items/nuggets.json create mode 100644 src/generated/resources/data/forge/tags/items/plates.json create mode 100644 src/main/java/com/simibubi/create/content/palettes/MetalBlock.java diff --git a/gradle.properties b/gradle.properties index 5d6ed258b..7555aef4c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ minecraft_version=1.15.2 forge_version=31.2.3 # dependency versions -registrate_version=0.0.3.17 +registrate_version=0.0.4.18 jei_version=6.0.0.2 # curseforge information diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index fda4d9596..394833615 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -32,7 +32,7 @@ cbcdab42d01f8085db9e5f8db884f8adf7f17625 assets\create\blockstates\chiseled_scor 291952556c52fba2af5bbd793c71af81abd27e71 assets\create\blockstates\chiseled_weathered_limestone.json 4947c261310445fa55b92038326ac82967d192dd assets\create\blockstates\clockwork_bearing.json 1f33834c685e3243882acfe20183fe64dfa872be assets\create\blockstates\clutch.json -e5e3757e99c139d67b2a70288466d8a74d818841 assets\create\blockstates\cogwheel.json +7854040f0570146b9823270fea7ea88c0048c316 assets\create\blockstates\cogwheel.json f8eff64c75fc599e9a44a003f54ae9931cd8ce7c assets\create\blockstates\copper_block.json cabf6b8c59eb0e3d56a0a5a856ca058bb3200882 assets\create\blockstates\copper_casing.json 3355a852cdc717e257ca19b3db836068964733e3 assets\create\blockstates\copper_ore.json @@ -147,7 +147,7 @@ be3bef7e091d8b50bfc1c6b7275946d1f636aefd assets\create\blockstates\horizontal_fr 18d9fdaa1352a7e2ec91135e46dae5c02ccd8f8f assets\create\blockstates\horizontal_framed_glass_pane.json 5d851c90d23de5087ce546d4bbe509e112b84c49 assets\create\blockstates\jungle_window.json b15bea757ef981e0ca60f740ca234ee2014eb7b7 assets\create\blockstates\jungle_window_pane.json -f651091db216b009b3379b2f48d56d03481c8675 assets\create\blockstates\large_cogwheel.json +fff1af0ff50d756efb027b6f3a6610c182138520 assets\create\blockstates\large_cogwheel.json a38184e035c2ebca7471e1714494fea213af259e assets\create\blockstates\layered_andesite.json 0fef29f4bfe8e1258427252ef0ff1a414c194969 assets\create\blockstates\layered_dark_scoria.json 924a0291410406c86ded448f95c97ac3b9d2bd2e assets\create\blockstates\layered_diorite.json @@ -178,10 +178,10 @@ ddcf4bb281e046fbb1026b8f46a2cf12448598df assets\create\blockstates\mechanical_be 0fb175e5260ec60e130e589d682a4d3301d7364e assets\create\blockstates\mechanical_harvester.json d9afcfa27c42df5fd54a7b783acb0eb45ddf5aa5 assets\create\blockstates\mechanical_mixer.json da612a05f94dc19e07e250efc35a7b2839d2ee76 assets\create\blockstates\mechanical_piston.json -94ec340a50b2406f833735f7501a1840c692e32a assets\create\blockstates\mechanical_piston_head.json +f656c6bf544015299e129367c9528c7c4322d9d0 assets\create\blockstates\mechanical_piston_head.json debef0f5dde74103aaf4422de4bc90e4099b0c47 assets\create\blockstates\mechanical_plough.json 92269fe66d7b83095a2e04e121af0be792f55dd6 assets\create\blockstates\mechanical_press.json -b7c4a0ff0c6f16e14d71fc0fb7fc66d032b65cf3 assets\create\blockstates\mechanical_pump.json +3868d093b03a50adb239cff78597f94f004cd425 assets\create\blockstates\mechanical_pump.json 1478fc76afb9b186fd3fddc20c29525d60d692bc assets\create\blockstates\mechanical_saw.json 4e48ad0936647065c2322390e7c0fe115c853a98 assets\create\blockstates\millstone.json 468202df0802e17c75fcad0993daf1bc5300ca91 assets\create\blockstates\minecart_anchor.json @@ -247,7 +247,7 @@ c17d334e938dcb742550ba8307ca8266a1fc9b49 assets\create\blockstates\paved_weather cb23aef25f3106b06c8fa8f152c638bb0d2185d8 assets\create\blockstates\paved_weathered_limestone_slab.json d62b0992cec1de45dad1f2c273132225f4ef33a0 assets\create\blockstates\paved_weathered_limestone_stairs.json dba4cf86e82ed4502fffed363fbce226a445e774 assets\create\blockstates\paved_weathered_limestone_wall.json -975c97018e9e2419943eaab43aed0970e96feaf7 assets\create\blockstates\piston_extension_pole.json +6266a03c4468e15119e70ce004c572a118000057 assets\create\blockstates\piston_extension_pole.json 2f764f460aa1d75ba995da180bc6f8d2bd9db385 assets\create\blockstates\polished_dark_scoria.json 262b22dcf3e151e63f58710f6b6fe4fc4fc2a70c assets\create\blockstates\polished_dark_scoria_slab.json a0dbcb7651b02a4f5c747ad2c6d35da60f768d9b assets\create\blockstates\polished_dark_scoria_stairs.json @@ -277,7 +277,7 @@ b7829c2ef2c47188713f8cab21b2c9bc7f9c5b79 assets\create\blockstates\portable_stor e8b0a401c10d1ba67ed71ba31bd5f9bc28571b65 assets\create\blockstates\powered_toggle_latch.json 3a739f9d4276828d83f2d2750bf3227c87bcd438 assets\create\blockstates\pulley_magnet.json 469e430d96cb0a5e1aaf6b7cc5d401d488c9e600 assets\create\blockstates\pulse_repeater.json -5d1b30c2bab556f57c78e7780fd445b08f541a50 assets\create\blockstates\radial_chassis.json +89b63c6e5875da07226854651079bcea85439f5b assets\create\blockstates\radial_chassis.json 8929677f2cc5354aa19ef182af69f9f0b41eb242 assets\create\blockstates\redstone_contact.json c29213b77ac0c78d8979c5f6188d2b265696f9b9 assets\create\blockstates\redstone_link.json 1eac804cba08aebb5f4646758ae1ef9b32e01365 assets\create\blockstates\reinforced_rail.json @@ -298,7 +298,7 @@ b6e50f46a02f833f2f2bafa8585a909b6da5e229 assets\create\blockstates\scoria_cobble 46641fdbc6bdc05829153bc28efb90cae26a51f8 assets\create\blockstates\scoria_pillar.json 89e10f35b93b5c72dd235eb79e5fc6f3655027a1 assets\create\blockstates\secondary_linear_chassis.json 81931eb1027dfb42ba4b2186185a4c0a36e0dbe4 assets\create\blockstates\sequenced_gearshift.json -79ae6d86a829b9ce82fce68a6377d3810fcfcb10 assets\create\blockstates\shaft.json +c47db604f854d2ff7132da88c25780a5501e2161 assets\create\blockstates\shaft.json e815bfd854c2653f10828bb11950f7fb991d7efc assets\create\blockstates\speedometer.json d62b7908119fa4f51715a186d0882b388bb25cab assets\create\blockstates\spruce_window.json 8d7dfa60630a8b4bae4e8eca5c66e1cfa34dda1f assets\create\blockstates\spruce_window_pane.json @@ -2418,16 +2418,20 @@ d5ea262a0f5fb210612d22521818e26cf08e591a data\forge\tags\blocks\ores\zinc.json ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data\forge\tags\blocks\storage_blocks\brass.json f6c8f34ceb475546dba5cc6ff288863ea795d20b data\forge\tags\blocks\storage_blocks\copper.json 7f71a774800111e50b42de0e6159ed2d2a807d32 data\forge\tags\blocks\storage_blocks\zinc.json +081f5aa35602fc27af2ca01ea9f2fd5e7eb284dc data\forge\tags\items\beacon_payment.json 16bcb8fcbe9170c2c11f1ca8d99d8b36cd812bbd data\forge\tags\items\glass\colorless.json 81ced867d24ec814942909965dd4576eff1db685 data\forge\tags\items\glass_panes.json +081f5aa35602fc27af2ca01ea9f2fd5e7eb284dc data\forge\tags\items\ingots.json 2dfd21017cb51d4bdc18d977a7d16f103cc3a985 data\forge\tags\items\ingots\brass.json 8e0ca32df10a50544f54fbe3dbfe485971b23315 data\forge\tags\items\ingots\copper.json 2f9ac80569a5cc168061742f9e3c36277d4d056e data\forge\tags\items\ingots\zinc.json +bcf15289cbadd429a48bd9accb4d2d5f75353a61 data\forge\tags\items\nuggets.json cc82188fe8d986f4457301ed4f75ae833d263601 data\forge\tags\items\nuggets\brass.json 7affb30e30a252566a77467994b0c99331f1076c data\forge\tags\items\nuggets\copper.json 0d8cb5092ee6ec01ea09324c80d649ba05549799 data\forge\tags\items\nuggets\zinc.json 4a0b13a9835106de9a1dd0a71a02372abb48e7b6 data\forge\tags\items\ores\copper.json d5ea262a0f5fb210612d22521818e26cf08e591a data\forge\tags\items\ores\zinc.json +5d5ec04a61ff2b1ad19210e2859a9c96cc246ef8 data\forge\tags\items\plates.json 39f0d70ec10597e85df7c4783bbc5e0e4a5ffb80 data\forge\tags\items\plates\brass.json c3dab5fe379bc1b7b10d4a0ba7009eee1b75a27c data\forge\tags\items\plates\copper.json fb9bfb4c84ed9cf2da8c4b2fbc4cd4d9f37d3016 data\forge\tags\items\plates\gold.json diff --git a/src/generated/resources/assets/create/blockstates/cogwheel.json b/src/generated/resources/assets/create/blockstates/cogwheel.json index 213f20515..ecc0a2f17 100644 --- a/src/generated/resources/assets/create/blockstates/cogwheel.json +++ b/src/generated/resources/assets/create/blockstates/cogwheel.json @@ -1,14 +1,27 @@ { "variants": { - "axis=x": { + "axis=x,waterlogged=false": { "model": "create:block/cogwheel", "x": 90, "y": 90 }, - "axis=y": { + "axis=y,waterlogged=false": { "model": "create:block/cogwheel" }, - "axis=z": { + "axis=z,waterlogged=false": { + "model": "create:block/cogwheel", + "x": 90, + "y": 180 + }, + "axis=x,waterlogged=true": { + "model": "create:block/cogwheel", + "x": 90, + "y": 90 + }, + "axis=y,waterlogged=true": { + "model": "create:block/cogwheel" + }, + "axis=z,waterlogged=true": { "model": "create:block/cogwheel", "x": 90, "y": 180 diff --git a/src/generated/resources/assets/create/blockstates/large_cogwheel.json b/src/generated/resources/assets/create/blockstates/large_cogwheel.json index 620157584..b9d2ff3d2 100644 --- a/src/generated/resources/assets/create/blockstates/large_cogwheel.json +++ b/src/generated/resources/assets/create/blockstates/large_cogwheel.json @@ -1,14 +1,27 @@ { "variants": { - "axis=x": { + "axis=x,waterlogged=false": { "model": "create:block/large_cogwheel", "x": 90, "y": 90 }, - "axis=y": { + "axis=y,waterlogged=false": { "model": "create:block/large_cogwheel" }, - "axis=z": { + "axis=z,waterlogged=false": { + "model": "create:block/large_cogwheel", + "x": 90, + "y": 180 + }, + "axis=x,waterlogged=true": { + "model": "create:block/large_cogwheel", + "x": 90, + "y": 90 + }, + "axis=y,waterlogged=true": { + "model": "create:block/large_cogwheel" + }, + "axis=z,waterlogged=true": { "model": "create:block/large_cogwheel", "x": 90, "y": 180 diff --git a/src/generated/resources/assets/create/blockstates/mechanical_piston_head.json b/src/generated/resources/assets/create/blockstates/mechanical_piston_head.json index a97257b0a..6a76d8d7b 100644 --- a/src/generated/resources/assets/create/blockstates/mechanical_piston_head.json +++ b/src/generated/resources/assets/create/blockstates/mechanical_piston_head.json @@ -1,53 +1,105 @@ { "variants": { - "facing=down,type=normal": { + "facing=down,type=normal,waterlogged=false": { "model": "create:block/mechanical_piston/normal/head", "x": 180 }, - "facing=up,type=normal": { + "facing=up,type=normal,waterlogged=false": { "model": "create:block/mechanical_piston/normal/head" }, - "facing=north,type=normal": { + "facing=north,type=normal,waterlogged=false": { "model": "create:block/mechanical_piston/normal/head", "x": 90 }, - "facing=south,type=normal": { + "facing=south,type=normal,waterlogged=false": { "model": "create:block/mechanical_piston/normal/head", "x": 90, "y": 180 }, - "facing=west,type=normal": { + "facing=west,type=normal,waterlogged=false": { "model": "create:block/mechanical_piston/normal/head", "x": 90, "y": 270 }, - "facing=east,type=normal": { + "facing=east,type=normal,waterlogged=false": { "model": "create:block/mechanical_piston/normal/head", "x": 90, "y": 90 }, - "facing=down,type=sticky": { + "facing=down,type=sticky,waterlogged=false": { "model": "create:block/mechanical_piston/sticky/head", "x": 180 }, - "facing=up,type=sticky": { + "facing=up,type=sticky,waterlogged=false": { "model": "create:block/mechanical_piston/sticky/head" }, - "facing=north,type=sticky": { + "facing=north,type=sticky,waterlogged=false": { "model": "create:block/mechanical_piston/sticky/head", "x": 90 }, - "facing=south,type=sticky": { + "facing=south,type=sticky,waterlogged=false": { "model": "create:block/mechanical_piston/sticky/head", "x": 90, "y": 180 }, - "facing=west,type=sticky": { + "facing=west,type=sticky,waterlogged=false": { "model": "create:block/mechanical_piston/sticky/head", "x": 90, "y": 270 }, - "facing=east,type=sticky": { + "facing=east,type=sticky,waterlogged=false": { + "model": "create:block/mechanical_piston/sticky/head", + "x": 90, + "y": 90 + }, + "facing=down,type=normal,waterlogged=true": { + "model": "create:block/mechanical_piston/normal/head", + "x": 180 + }, + "facing=up,type=normal,waterlogged=true": { + "model": "create:block/mechanical_piston/normal/head" + }, + "facing=north,type=normal,waterlogged=true": { + "model": "create:block/mechanical_piston/normal/head", + "x": 90 + }, + "facing=south,type=normal,waterlogged=true": { + "model": "create:block/mechanical_piston/normal/head", + "x": 90, + "y": 180 + }, + "facing=west,type=normal,waterlogged=true": { + "model": "create:block/mechanical_piston/normal/head", + "x": 90, + "y": 270 + }, + "facing=east,type=normal,waterlogged=true": { + "model": "create:block/mechanical_piston/normal/head", + "x": 90, + "y": 90 + }, + "facing=down,type=sticky,waterlogged=true": { + "model": "create:block/mechanical_piston/sticky/head", + "x": 180 + }, + "facing=up,type=sticky,waterlogged=true": { + "model": "create:block/mechanical_piston/sticky/head" + }, + "facing=north,type=sticky,waterlogged=true": { + "model": "create:block/mechanical_piston/sticky/head", + "x": 90 + }, + "facing=south,type=sticky,waterlogged=true": { + "model": "create:block/mechanical_piston/sticky/head", + "x": 90, + "y": 180 + }, + "facing=west,type=sticky,waterlogged=true": { + "model": "create:block/mechanical_piston/sticky/head", + "x": 90, + "y": 270 + }, + "facing=east,type=sticky,waterlogged=true": { "model": "create:block/mechanical_piston/sticky/head", "x": 90, "y": 90 diff --git a/src/generated/resources/assets/create/blockstates/mechanical_pump.json b/src/generated/resources/assets/create/blockstates/mechanical_pump.json index 3b8c68f80..932c1e83d 100644 --- a/src/generated/resources/assets/create/blockstates/mechanical_pump.json +++ b/src/generated/resources/assets/create/blockstates/mechanical_pump.json @@ -1,27 +1,53 @@ { "variants": { - "facing=down": { + "facing=down,waterlogged=false": { "model": "create:block/mechanical_pump/block", "x": 180 }, - "facing=up": { + "facing=up,waterlogged=false": { "model": "create:block/mechanical_pump/block" }, - "facing=north": { + "facing=north,waterlogged=false": { "model": "create:block/mechanical_pump/block", "x": 90 }, - "facing=south": { + "facing=south,waterlogged=false": { "model": "create:block/mechanical_pump/block", "x": 90, "y": 180 }, - "facing=west": { + "facing=west,waterlogged=false": { "model": "create:block/mechanical_pump/block", "x": 90, "y": 270 }, - "facing=east": { + "facing=east,waterlogged=false": { + "model": "create:block/mechanical_pump/block", + "x": 90, + "y": 90 + }, + "facing=down,waterlogged=true": { + "model": "create:block/mechanical_pump/block", + "x": 180 + }, + "facing=up,waterlogged=true": { + "model": "create:block/mechanical_pump/block" + }, + "facing=north,waterlogged=true": { + "model": "create:block/mechanical_pump/block", + "x": 90 + }, + "facing=south,waterlogged=true": { + "model": "create:block/mechanical_pump/block", + "x": 90, + "y": 180 + }, + "facing=west,waterlogged=true": { + "model": "create:block/mechanical_pump/block", + "x": 90, + "y": 270 + }, + "facing=east,waterlogged=true": { "model": "create:block/mechanical_pump/block", "x": 90, "y": 90 diff --git a/src/generated/resources/assets/create/blockstates/piston_extension_pole.json b/src/generated/resources/assets/create/blockstates/piston_extension_pole.json index 987043b22..6aad86e8b 100644 --- a/src/generated/resources/assets/create/blockstates/piston_extension_pole.json +++ b/src/generated/resources/assets/create/blockstates/piston_extension_pole.json @@ -1,27 +1,53 @@ { "variants": { - "facing=down": { + "facing=down,waterlogged=false": { "model": "create:block/piston_extension_pole", "x": 180 }, - "facing=up": { + "facing=up,waterlogged=false": { "model": "create:block/piston_extension_pole" }, - "facing=north": { + "facing=north,waterlogged=false": { "model": "create:block/piston_extension_pole", "x": 90 }, - "facing=south": { + "facing=south,waterlogged=false": { "model": "create:block/piston_extension_pole", "x": 90, "y": 180 }, - "facing=west": { + "facing=west,waterlogged=false": { "model": "create:block/piston_extension_pole", "x": 90, "y": 270 }, - "facing=east": { + "facing=east,waterlogged=false": { + "model": "create:block/piston_extension_pole", + "x": 90, + "y": 90 + }, + "facing=down,waterlogged=true": { + "model": "create:block/piston_extension_pole", + "x": 180 + }, + "facing=up,waterlogged=true": { + "model": "create:block/piston_extension_pole" + }, + "facing=north,waterlogged=true": { + "model": "create:block/piston_extension_pole", + "x": 90 + }, + "facing=south,waterlogged=true": { + "model": "create:block/piston_extension_pole", + "x": 90, + "y": 180 + }, + "facing=west,waterlogged=true": { + "model": "create:block/piston_extension_pole", + "x": 90, + "y": 270 + }, + "facing=east,waterlogged=true": { "model": "create:block/piston_extension_pole", "x": 90, "y": 90 diff --git a/src/generated/resources/assets/create/blockstates/radial_chassis.json b/src/generated/resources/assets/create/blockstates/radial_chassis.json index 04e5c08ae..d60327a8a 100644 --- a/src/generated/resources/assets/create/blockstates/radial_chassis.json +++ b/src/generated/resources/assets/create/blockstates/radial_chassis.json @@ -29,8 +29,8 @@ }, { "when": { - "axis": "x", - "sticky_south": "true" + "sticky_south": "true", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky", @@ -39,8 +39,8 @@ }, { "when": { - "axis": "y", - "sticky_south": "true" + "sticky_south": "true", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y_sticky" @@ -48,8 +48,8 @@ }, { "when": { - "axis": "z", - "sticky_south": "true" + "sticky_south": "true", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky", @@ -59,8 +59,8 @@ }, { "when": { - "axis": "x", - "sticky_south": "false" + "sticky_south": "false", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x", @@ -69,8 +69,8 @@ }, { "when": { - "axis": "y", - "sticky_south": "false" + "sticky_south": "false", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y" @@ -78,8 +78,8 @@ }, { "when": { - "axis": "z", - "sticky_south": "false" + "sticky_south": "false", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_x", @@ -89,8 +89,8 @@ }, { "when": { - "axis": "x", - "sticky_west": "true" + "sticky_west": "true", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky", @@ -99,8 +99,8 @@ }, { "when": { - "axis": "y", - "sticky_west": "true" + "sticky_west": "true", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y_sticky", @@ -109,8 +109,8 @@ }, { "when": { - "axis": "z", - "sticky_west": "true" + "sticky_west": "true", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_z_sticky", @@ -119,8 +119,8 @@ }, { "when": { - "axis": "x", - "sticky_west": "false" + "sticky_west": "false", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x", @@ -129,8 +129,8 @@ }, { "when": { - "axis": "y", - "sticky_west": "false" + "sticky_west": "false", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y", @@ -139,8 +139,8 @@ }, { "when": { - "axis": "z", - "sticky_west": "false" + "sticky_west": "false", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_z", diff --git a/src/generated/resources/assets/create/blockstates/shaft.json b/src/generated/resources/assets/create/blockstates/shaft.json index c4cc5b98b..925d83d62 100644 --- a/src/generated/resources/assets/create/blockstates/shaft.json +++ b/src/generated/resources/assets/create/blockstates/shaft.json @@ -1,14 +1,27 @@ { "variants": { - "axis=x": { + "axis=x,waterlogged=false": { "model": "create:block/shaft", "x": 90, "y": 90 }, - "axis=y": { + "axis=y,waterlogged=false": { "model": "create:block/shaft" }, - "axis=z": { + "axis=z,waterlogged=false": { + "model": "create:block/shaft", + "x": 90, + "y": 180 + }, + "axis=x,waterlogged=true": { + "model": "create:block/shaft", + "x": 90, + "y": 90 + }, + "axis=y,waterlogged=true": { + "model": "create:block/shaft" + }, + "axis=z,waterlogged=true": { "model": "create:block/shaft", "x": 90, "y": 180 diff --git a/src/generated/resources/data/forge/tags/items/beacon_payment.json b/src/generated/resources/data/forge/tags/items/beacon_payment.json new file mode 100644 index 000000000..c407a2e9a --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/beacon_payment.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "create:copper_ingot", + "create:zinc_ingot", + "create:brass_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ingots.json b/src/generated/resources/data/forge/tags/items/ingots.json new file mode 100644 index 000000000..c407a2e9a --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "create:copper_ingot", + "create:zinc_ingot", + "create:brass_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/nuggets.json b/src/generated/resources/data/forge/tags/items/nuggets.json new file mode 100644 index 000000000..6eb0a5036 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/nuggets.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "create:copper_nugget", + "create:zinc_nugget", + "create:brass_nugget" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/plates.json b/src/generated/resources/data/forge/tags/items/plates.json new file mode 100644 index 000000000..c294488df --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/plates.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "create:copper_sheet", + "create:brass_sheet", + "create:iron_sheet", + "create:golden_sheet" + ] +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 885c35b6d..5843ea93b 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -102,6 +102,7 @@ import com.simibubi.create.content.logistics.block.redstone.StockpileSwitchBlock import com.simibubi.create.content.logistics.block.transposer.LinkedTransposerBlock; import com.simibubi.create.content.logistics.block.transposer.TransposerBlock; import com.simibubi.create.content.logistics.block.transposer.VerticalTransposerGenerator; +import com.simibubi.create.content.palettes.MetalBlock; import com.simibubi.create.content.schematics.block.SchematicTableBlock; import com.simibubi.create.content.schematics.block.SchematicannonBlock; import com.simibubi.create.foundation.config.StressConfigDefaults; @@ -885,7 +886,7 @@ public class AllBlocks { .register(); public static final BlockEntry COPPER_BLOCK = - REGISTRATE.block("copper_block", p -> new OxidizingBlock(p, 1 / 32f)) + REGISTRATE.block("copper_block", p -> new OxidizingBlock(p, 1 / 32f, true)) .initialProperties(() -> Blocks.IRON_BLOCK) .transform(tagBlockAndItem("storage_blocks/copper")) .transform(oxidizedItemModel()) @@ -901,19 +902,20 @@ public class AllBlocks { .transform(oxidizedBlockstate()) .register(); - public static final BlockEntry ZINC_BLOCK = REGISTRATE.block("zinc_block", Block::new) + public static final BlockEntry ZINC_BLOCK = REGISTRATE.block("zinc_block", p -> new MetalBlock(p, true)) .initialProperties(() -> Blocks.IRON_BLOCK) .transform(tagBlockAndItem("storage_blocks/zinc")) .build() .recipe((ctx, prov) -> prov.square(DataIngredient.tag(forgeItemTag("ingots/zinc")), ctx, false)) .register(); - public static final BlockEntry BRASS_BLOCK = REGISTRATE.block("brass_block", Block::new) - .initialProperties(() -> Blocks.IRON_BLOCK) - .transform(tagBlockAndItem("storage_blocks/brass")) - .build() - .recipe((ctx, prov) -> prov.square(DataIngredient.tag(forgeItemTag("ingots/brass")), ctx, false)) - .register(); + public static final BlockEntry BRASS_BLOCK = + REGISTRATE.block("brass_block", p -> new MetalBlock(p, true)) + .initialProperties(() -> Blocks.IRON_BLOCK) + .transform(tagBlockAndItem("storage_blocks/brass")) + .build() + .recipe((ctx, prov) -> prov.square(DataIngredient.tag(forgeItemTag("ingots/brass")), ctx, false)) + .register(); // Load this class diff --git a/src/main/java/com/simibubi/create/AllItems.java b/src/main/java/com/simibubi/create/AllItems.java index 4e8a5507a..f5f3dea79 100644 --- a/src/main/java/com/simibubi/create/AllItems.java +++ b/src/main/java/com/simibubi/create/AllItems.java @@ -55,14 +55,14 @@ public class AllItems { } public static final ItemEntry COPPER_NUGGET = - taggedIngredient("copper_nugget", forgeItemTag("nuggets/copper")), - ZINC_NUGGET = taggedIngredient("zinc_nugget", forgeItemTag("nuggets/zinc")), - BRASS_NUGGET = taggedIngredient("brass_nugget", forgeItemTag("nuggets/brass")), + taggedIngredient("copper_nugget", forgeItemTag("nuggets/copper"), AllItemTags.nuggets.tag), + ZINC_NUGGET = taggedIngredient("zinc_nugget", forgeItemTag("nuggets/zinc"), AllItemTags.nuggets.tag), + BRASS_NUGGET = taggedIngredient("brass_nugget", forgeItemTag("nuggets/brass"), AllItemTags.nuggets.tag), - COPPER_SHEET = taggedIngredient("copper_sheet", forgeItemTag("plates/copper")), - BRASS_SHEET = taggedIngredient("brass_sheet", forgeItemTag("plates/brass")), - IRON_SHEET = taggedIngredient("iron_sheet", forgeItemTag("plates/iron")), - GOLDEN_SHEET = taggedIngredient("golden_sheet", forgeItemTag("plates/gold")), + COPPER_SHEET = taggedIngredient("copper_sheet", forgeItemTag("plates/copper"), AllItemTags.plates.tag), + BRASS_SHEET = taggedIngredient("brass_sheet", forgeItemTag("plates/brass"), AllItemTags.plates.tag), + IRON_SHEET = taggedIngredient("iron_sheet", forgeItemTag("plates/iron"), AllItemTags.plates.tag), + GOLDEN_SHEET = taggedIngredient("golden_sheet", forgeItemTag("plates/gold"), AllItemTags.plates.tag), LAPIS_SHEET = ingredient("lapis_sheet"), CRUSHED_IRON = taggedIngredient("crushed_iron_ore", AllItemTags.CRUSHED_ORES.tag), @@ -72,9 +72,12 @@ public class AllItems { CRUSHED_BRASS = taggedIngredient("crushed_brass", AllItemTags.CRUSHED_ORES.tag), ANDESITE_ALLOY = ingredient("andesite_alloy"), - COPPER_INGOT = taggedIngredient("copper_ingot", forgeItemTag("ingots/copper")), - ZINC_INGOT = taggedIngredient("zinc_ingot", forgeItemTag("ingots/zinc")), - BRASS_INGOT = taggedIngredient("brass_ingot", forgeItemTag("ingots/brass")), + COPPER_INGOT = taggedIngredient("copper_ingot", forgeItemTag("ingots/copper"), AllItemTags.beacon_payment.tag, + AllItemTags.ingots.tag), + ZINC_INGOT = taggedIngredient("zinc_ingot", forgeItemTag("ingots/zinc"), AllItemTags.beacon_payment.tag, + AllItemTags.ingots.tag), + BRASS_INGOT = taggedIngredient("brass_ingot", forgeItemTag("ingots/brass"), AllItemTags.beacon_payment.tag, + AllItemTags.ingots.tag), WHEAT_FLOUR = ingredient("wheat_flour"), DOUGH = ingredient("dough"), POWDERED_OBSIDIAN = ingredient("powdered_obsidian"), ROSE_QUARTZ = ingredient("rose_quartz"), @@ -226,9 +229,10 @@ public class AllItems { .register(); } - private static ItemEntry taggedIngredient(String name, Tag tag) { + @SafeVarargs + private static ItemEntry taggedIngredient(String name, Tag... tags) { return REGISTRATE.item(name, Item::new) - .tag(tag) + .tag(tags) .register(); } diff --git a/src/main/java/com/simibubi/create/AllTags.java b/src/main/java/com/simibubi/create/AllTags.java index e85354df0..f52320c81 100644 --- a/src/main/java/com/simibubi/create/AllTags.java +++ b/src/main/java/com/simibubi/create/AllTags.java @@ -17,14 +17,13 @@ import net.minecraft.tags.TagCollection; import net.minecraft.util.ResourceLocation; public class AllTags { - public static NonNullFunction, ItemBuilder>> tagBlockAndItem( String tagName) { return b -> b.tag(forgeBlockTag(tagName)) .item() .tag(forgeItemTag(tagName)); } - + public static Tag forgeBlockTag(String name) { return forgeTag(BlockTags.getCollection(), name); } @@ -32,7 +31,7 @@ public class AllTags { public static Tag forgeItemTag(String name) { return forgeTag(ItemTags.getCollection(), name); } - + public static Tag forgeTag(TagCollection collection, String name) { return tag(collection, "forge", name); } @@ -42,7 +41,8 @@ public class AllTags { } public static enum AllItemTags { - CRUSHED_ORES; + CRUSHED_ORES, beacon_payment("", "forge"), ingots("", "forge"), nuggets("", "forge"), plates("", "forge"); + public Tag tag; private AllItemTags() { @@ -50,8 +50,12 @@ public class AllTags { } private AllItemTags(String path) { + this(path, Create.ID); + } + + private AllItemTags(String path, String modid) { tag = new ItemTags.Wrapper( - new ResourceLocation(Create.ID, (path.isEmpty() ? "" : path + "/") + Lang.asId(name()))); + new ResourceLocation(modid, (path.isEmpty() ? "" : path + "/") + Lang.asId(name()))); } public boolean matches(ItemStack stack) { @@ -61,6 +65,7 @@ public class AllTags { public static enum AllBlockTags { WINDMILL_SAILS, FAN_HEATERS, WINDOWABLE,; + public Tag tag; private AllBlockTags() { @@ -76,5 +81,4 @@ public class AllTags { return tag.contains(block.getBlock()); } } - } diff --git a/src/main/java/com/simibubi/create/content/palettes/MetalBlock.java b/src/main/java/com/simibubi/create/content/palettes/MetalBlock.java new file mode 100644 index 000000000..cb2fc6e10 --- /dev/null +++ b/src/main/java/com/simibubi/create/content/palettes/MetalBlock.java @@ -0,0 +1,25 @@ +package com.simibubi.create.content.palettes; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IWorldReader; + +public class MetalBlock extends Block { + private final boolean isBeaconBaseBlock; + + public MetalBlock(Properties properties) { + super(properties); + isBeaconBaseBlock = false; + } + + public MetalBlock(Properties properties, boolean isBeaconBaseBlock) { + super(properties); + this.isBeaconBaseBlock = isBeaconBaseBlock; + } + + @Override + public boolean isBeaconBase(BlockState state, IWorldReader world, BlockPos pos, BlockPos beacon) { + return isBeaconBaseBlock ? true : super.isBeaconBase(state, world, pos, beacon); + } +} diff --git a/src/main/java/com/simibubi/create/foundation/worldgen/OxidizingBlock.java b/src/main/java/com/simibubi/create/foundation/worldgen/OxidizingBlock.java index 892d93ef7..101edd2c2 100644 --- a/src/main/java/com/simibubi/create/foundation/worldgen/OxidizingBlock.java +++ b/src/main/java/com/simibubi/create/foundation/worldgen/OxidizingBlock.java @@ -5,6 +5,7 @@ import java.util.OptionalDouble; import java.util.Random; import com.simibubi.create.content.curiosities.tools.SandPaperItem; +import com.simibubi.create.content.palettes.MetalBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -20,7 +21,7 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -public class OxidizingBlock extends Block { +public class OxidizingBlock extends MetalBlock { public static final IntegerProperty OXIDIZATION = IntegerProperty.create("oxidization", 0, 7); private float chance; @@ -30,6 +31,12 @@ public class OxidizingBlock extends Block { this.chance = chance; setDefaultState(getDefaultState().with(OXIDIZATION, 0)); } + + public OxidizingBlock(Properties properties, float chance, boolean isBeaconBaseBlock) { + super(properties, isBeaconBaseBlock); + this.chance = chance; + setDefaultState(getDefaultState().with(OXIDIZATION, 0)); + } @Override protected void fillStateContainer(Builder builder) {