mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-26 23:19:02 +01:00
Code Issues Projects Releases Packages Wiki Activity

Me and the Noise

Browse source 
- New randomised textures for natural palette stone types
- Readjusted palette stone generation to use taller layers
- World generation now places fewer stone type veins by default
This commit is contained in:
simibubi 2023-04-16 14:02:35 +02:00
parent bcc38b4559
commit 641e0f000a
57 changed files with 279 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/generated/resources/.cache/cache
View file

@ -14,7 +14,7 @@ a891d5abbc133288a9ad377b3ea9adad8ee92972 assets/create/blockstates/andesite_allo
3adca59d03198c273f13c21c6058348c9fa71735 assets/create/blockstates/andesite_pillar.json
a07a73251d26e8b38bce295838c2fef246f9885d assets/create/blockstates/andesite_scaffolding.json
98e95355fc7d45fc9d3706ed3912cd0bfb4a41c3 assets/create/blockstates/andesite_tunnel.json
70a2eff30918c6369fc90aaa6a56ffa5c959065a assets/create/blockstates/asurine.json
aefe4cd5fdb50b2ffe89f43acac4206c5adfad3f assets/create/blockstates/asurine.json
bb61f3f336ebe0ff08d84cb6a83e86a823dac7aa assets/create/blockstates/asurine_pillar.json
e555e3c2b2d3f01440e48db4ba88f7e00fd99b6f assets/create/blockstates/basin.json
f25693a9429f6337149ff24f27900dc4eb82a7c2 assets/create/blockstates/belt.json
@ -77,7 +77,7 @@ f4d185b9eb086e5024a9818bad57d524267d6e13 assets/create/blockstates/copycat_step.
b759be6f47fb960a7757b70d194921a38261c90a assets/create/blockstates/creative_crate.json
da3f1203dd0b0096ce19e09705060a0ed0478bee assets/create/blockstates/creative_fluid_tank.json
f0031f5e970b3d5695472ed384950b8631b015ed assets/create/blockstates/creative_motor.json
23ef8777fb1eb48d1d719bd5a2f5ff7ed40a62c1 assets/create/blockstates/crimsite.json
4b41fbb6993030b69d0789738e93d9898757d27c assets/create/blockstates/crimsite.json
f7c283460879e70ed0fa112a24caa06a7122358f assets/create/blockstates/crimsite_pillar.json
24ee16e3dadb3e0221afce7af37643494f471fb0 assets/create/blockstates/crimson_window.json
3e6cd0945390b390b963474f7cf708e2dcba631c assets/create/blockstates/crimson_window_pane.json
@ -324,7 +324,7 @@ b1126c191877cff86b4e2de83e1fcbd151451cb7 assets/create/blockstates/mysterious_cu
36e46e65003a8d0b8555fe5e8f8dc980d6559bc5 assets/create/blockstates/nozzle.json
cf60989f63f02067fc4e4ad25033ac83167cdeb0 assets/create/blockstates/oak_window.json
4a796509c3953171f04f957351282205840b3760 assets/create/blockstates/oak_window_pane.json
285034384826e8d63ca6c63ba421360c0af6cd74 assets/create/blockstates/ochrum.json
2e97b2645eca20dfb4473db675612d9a55bdd0eb assets/create/blockstates/ochrum.json
619df622d542a298361279126bf69bf63e8c0fd5 assets/create/blockstates/ochrum_pillar.json
b0be3d4ff92cb123ec21ec2788db35d0f392ba8a assets/create/blockstates/orange_sail.json
5764a24f6c4fa552b61d2a02135adfc7d93c2e10 assets/create/blockstates/orange_seat.json
@ -524,7 +524,7 @@ b000a6cde143f8a12fc8996d1ac8b5164f75253b assets/create/blockstates/train_door.js
836c443ab8778f0ff2b16bdf5f3339a0871c273e assets/create/blockstates/train_trapdoor.json
29af21c8d82891139d48d69f0393f612f2b6f8f1 assets/create/blockstates/tuff_pillar.json
a8094531617e27a545c4815ab2062bf0ffca3633 assets/create/blockstates/turntable.json
c9bf881ea71aa274b2803142456f1bbed9539076 assets/create/blockstates/veridium.json
c34a7ab55f6ff53720825ef37a563b3a4d1ee435 assets/create/blockstates/veridium.json
1eb9e8f352d4315f70d772fe41102c57b2559cfe assets/create/blockstates/veridium_pillar.json
69dfe8afaa8eb6105dae9f76ab8b7847bf90b8c6 assets/create/blockstates/vertical_framed_glass.json
c4db76b9d36cfb098df0d158cb6f8b82768ebe14 assets/create/blockstates/vertical_framed_glass_pane.json
@ -632,7 +632,10 @@ ee665cf464ead6135de3f60c7e2ac475af6496d7 assets/create/models/block/andesite_lad
9634056c616296a8106350dc40222e904688585d assets/create/models/block/andesite_scaffolding_horizontal.json
677d75755bc1fba56823292b2abe03a495ba2910 assets/create/models/block/andesite_side.json
419288e05242def13d58c1a8174673c33732b4a5 assets/create/models/block/andesite_side_alt.json
7b2e3b7e9d72286b202bb38ab6e4d69465365d47 assets/create/models/block/asurine.json
2724d5be033d7bdcba48c86eb09e58df8bceb97c assets/create/models/block/asurine_natural_0.json
bbe56a2eb84835f26ed3beb0313ddd8be7a53ead assets/create/models/block/asurine_natural_1.json
075af0b6658cfc8d241770033c01272d64f9e441 assets/create/models/block/asurine_natural_2.json
448b82a189f70ff83c2721d70ae3d87af7c6bce6 assets/create/models/block/asurine_natural_3.json
a9167990e3f894f92a9de24c8b77d040b1c1ff0a assets/create/models/block/asurine_pillar.json
e40c3a7e6f7b895770f544d79536c744d18c462f assets/create/models/block/asurine_pillar_horizontal.json
0ce09f6fdfb07dead5936c118efb4064f2f6f50f assets/create/models/block/birch_window.json
@ -759,7 +762,10 @@ b4768e862b301187108afb3b7aae46225501afcf assets/create/models/block/creative_top
bb8a304b450bce6bc2371dbad2a9424157ed265f assets/create/models/block/creative_top_window_nw.json
8f25499c6dac9a144a2640714ed3774f268cfb0c assets/create/models/block/creative_top_window_se.json
3370f17d6f1773d1d81849ef3fc30330d801d2be assets/create/models/block/creative_top_window_sw.json
049054773bda458837111308ec2a8d8d08809b8f assets/create/models/block/crimsite.json
2496bdceaeab11fa750a8765692c7e98d15ba983 assets/create/models/block/crimsite_natural_0.json
ebdad21ce0f464e1e5eab3aa7c08db15c436875e assets/create/models/block/crimsite_natural_1.json
7a06149c24fa1812117bcc82fab243fa1b467d72 assets/create/models/block/crimsite_natural_2.json
9582ecc02f95ac616f010b5a071ef7b7b358e432 assets/create/models/block/crimsite_natural_3.json
3ad2613e9d29b1174b6829d28abb2dc0e7477e6b assets/create/models/block/crimsite_pillar.json
e93336aeb8513d85d6bffd9ea520b0747731d55b assets/create/models/block/crimsite_pillar_horizontal.json
8390ebba3a149135c21a3e48fcc84660eea5f766 assets/create/models/block/crimson_window.json
@ -1178,7 +1184,10 @@ b9c27f90d4d258e3fdcd713aaa42142f5d46a79e assets/create/models/block/oak_window_p
8c3fdc51742897d110641ba9127f857297300edb assets/create/models/block/oak_window_pane_post.json
8f77db5a66b165d2ca85f9119666907dcf65105f assets/create/models/block/oak_window_pane_side.json
b3e056a176e86660fc2d3a51f9ba8b01eebb56c5 assets/create/models/block/oak_window_pane_side_alt.json
09a39af799262f80ff009be4feab03e65d32befe assets/create/models/block/ochrum.json
87dc0844f2ec9a98df43fa0180092de786d6f87e assets/create/models/block/ochrum_natural_0.json
bb9797b95f46338cef353af5fff9ba0167943430 assets/create/models/block/ochrum_natural_1.json
121ced1684aac0b0348d4e8ee137074733f174f1 assets/create/models/block/ochrum_natural_2.json
7c047a0c5caa6ea6f23314c10176d4de93a4894d assets/create/models/block/ochrum_natural_3.json
37758cc8bd6c7cfe452aab5dd3b91fd1ada2d906 assets/create/models/block/ochrum_pillar.json
889872c17f117008606b3bdad6fc80252fd25121 assets/create/models/block/ochrum_pillar_horizontal.json
ff9b51fcaffe54e321b9479f035f4ea7b278bfec assets/create/models/block/orange_sail.json
@ -1561,7 +1570,10 @@ ec2bf287791e891f85b71f97ee196002f9b03bf2 assets/create/models/block/tunnel/brass
37d15648b9358cb8bd4a3f20df40c36ddc07efd7 assets/create/models/block/tunnel/brass_tunnel/t_left.json
2f75336b25f5f0a008878488599e59b3e3504174 assets/create/models/block/tunnel/brass_tunnel/t_right.json
8ac0130f727696786141d7d61261072739c7f72e assets/create/models/block/tunnel/brass_tunnel/window.json
dee64127644e7b09168be26b6665389885476e05 assets/create/models/block/veridium.json
e07a448885af0ea79ac97f3a08fb3d721b672248 assets/create/models/block/veridium_natural_0.json
f0ba4c167f16cd46924b6da212d9a24a39f90202 assets/create/models/block/veridium_natural_1.json
4af92a6f9d37fef6c011f39880904b8970eb800b assets/create/models/block/veridium_natural_2.json
f967165e134123dd0f852f12dc8aeee8679768db assets/create/models/block/veridium_natural_3.json
ebfad96e85ac6107642eaaf48b57315b268355ff assets/create/models/block/veridium_pillar.json
c49bb21ef60ff10540952271c863415b4ad07aa0 assets/create/models/block/veridium_pillar_horizontal.json
b1e94d2858c3a8807def6c5131b6f63fe586fb91 assets/create/models/block/vertical_framed_glass.json
@ -1664,7 +1676,7 @@ bc6e7469744604e578200ea87690e4dd3b25e447 assets/create/models/item/andesite_enca
75b8b00c2418b9660d35a7fabd0774925cf1c02f assets/create/models/item/andesite_pillar.json
5d4616aa0ad5192f8c4029f327f1f79dd04e1e81 assets/create/models/item/andesite_scaffolding.json
473be56fe1f44809ffecbb3eb86107af3ca7a569 assets/create/models/item/andesite_tunnel.json
cc6471e712a6db7856e62a99b8ef7e378480fa27 assets/create/models/item/asurine.json
bbe56a2eb84835f26ed3beb0313ddd8be7a53ead assets/create/models/item/asurine.json
840a34731a823e185a180bef029dd16ee3f78541 assets/create/models/item/asurine_pillar.json
cf9e35bfea0b0a324e1c6384990425b3d359792c assets/create/models/item/bar_of_chocolate.json
421e481b7fbca4c4a1080ed703401eb25375e087 assets/create/models/item/basin.json
@ -1741,7 +1753,7 @@ db68f1fcc5b91f3ee0cc023538d965d76dd13506 assets/create/models/item/creative_blaz
7b333dea353afaa27b182aedc647c9e9e34e92ef assets/create/models/item/creative_crate.json
146d28b21fa97c427ba39c48191f36218be96f49 assets/create/models/item/creative_fluid_tank.json
5b39403f6c81f05e566b621b62e267267de47c41 assets/create/models/item/creative_motor.json
aed654ee2b4ec44a9f7a67f39d03e03beb18ba69 assets/create/models/item/crimsite.json
ebdad21ce0f464e1e5eab3aa7c08db15c436875e assets/create/models/item/crimsite.json
5522f0b31ee0c7b31cd6fd5f40316545eb6478f8 assets/create/models/item/crimsite_pillar.json
5680d7cee347c46bb29db8c77dc33f234a7eba41 assets/create/models/item/crimson_window.json
cdcc4c773bdda431e2aef26e83c061db36e66bae assets/create/models/item/crimson_window_pane.json
@ -1964,7 +1976,7 @@ a89d397ac14482a973f7937f046dbf8e42d017bc assets/create/models/item/light_gray_va
2127f20dca4421802812e249b3caca6230a37eee assets/create/models/item/lime_seat.json
e36a80686d7813cdc4db0d309ca7e14884c0dc7a assets/create/models/item/lime_toolbox.json
785b008d703728497f5f941e3211d6e10389f1b5 assets/create/models/item/lime_valve_handle.json
e0a1c6102acc10a36de5ae87da629dd3d676e204 assets/create/models/item/limestone.json
8161e01220df7bc95b0ea83a223dcc68b96e838c assets/create/models/item/limestone.json
8065de871ad2fbaed711735561b8ed91a2ce0004 assets/create/models/item/limestone_pillar.json
d245aa4994ff197b1ffeb7980d05f96bd20cdeb3 assets/create/models/item/linear_chassis.json
2866bff509b060cd3ee99b4eef25a4e1e4639703 assets/create/models/item/linked_controller.json
@ -1997,7 +2009,7 @@ bafe601f186e868819da3d29f7be7dc96f9ba790 assets/create/models/item/nixie_tube.js
366a60447bbbd61eb25aecf191a01e8d9417ad61 assets/create/models/item/nozzle.json
7a336a340f3e4927d7a35f9d79e8a03693b802aa assets/create/models/item/oak_window.json
d0a6219860420f910300e86cbec1b08d4b47f436 assets/create/models/item/oak_window_pane.json
a08220de44706ae42b03b2ac55762ea4c7691118 assets/create/models/item/ochrum.json
bb9797b95f46338cef353af5fff9ba0167943430 assets/create/models/item/ochrum.json
76120fa1849dea15406909aa711803e2eee59a25 assets/create/models/item/ochrum_pillar.json
25dfcc8b6f085722f6b2a0c686b77d437e61542e assets/create/models/item/orange_seat.json
a951cefc4b35f5a2d5b7c7ed689384a20b3c9115 assets/create/models/item/orange_toolbox.json
@ -2111,9 +2123,9 @@ acfbf487ee65c2c58d89cb2644e33fda75751fde assets/create/models/item/rotation_spee
3f07bc7d4587d78de463ae2ce236e4f363b923cd assets/create/models/item/schematic_and_quill.json
8dd5caa4d7a0ee45bd9b39e09c4503159933d089 assets/create/models/item/schematic_table.json
0a1c4080ca572106c19a0ba6e2df4baba5f45d35 assets/create/models/item/schematicannon.json
0ad05b25ee5f9f322c03aba1d29a6548045fffe9 assets/create/models/item/scorchia.json
81d2645d12ce902757d7f066af8522ee0e42f2fc assets/create/models/item/scorchia.json
9a6d1ad28bcee9257fc7c00dd75894f34574885f assets/create/models/item/scorchia_pillar.json
22a6dfdc3cbb1b6ac20ec123b490e15c72dfbfcf assets/create/models/item/scoria.json
81f9677034ae62ba872287bb3b5e3574694a94fb assets/create/models/item/scoria.json
1f0cfa084107c05b010556f609371285295a0d12 assets/create/models/item/scoria_pillar.json
083b9fc316cef1d24ea20f06a6aaa4cb52f1ef94 assets/create/models/item/secondary_linear_chassis.json
0df94333da5700f01dcf4ffa46e3f3bf26bb8cf7 assets/create/models/item/sequenced_gearshift.json
@ -2204,7 +2216,7 @@ f8a4fa1ccecb16a3941cc46db7481ed8e8429a5e assets/create/models/item/tree_fertiliz
3f6810da54724de551591b46cd5b47a98a4737ef assets/create/models/item/tuff_pillar.json
fb24881c4e92bbb7ffa54a71e0af6b1c66d84829 assets/create/models/item/turntable.json
0e4293d5b585bafb76eca66b88bfe43d831f9aad assets/create/models/item/unprocessed_obsidian_sheet.json
309146512095aafae89955e0eb1299ea717242ea assets/create/models/item/veridium.json
f0ba4c167f16cd46924b6da212d9a24a39f90202 assets/create/models/item/veridium.json
3d1459a79ec7d4b9486aad5e04c6be277c5cabeb assets/create/models/item/veridium_pillar.json
2a6be52ddedd614dc3b8a6b659bfbd7a4be54252 assets/create/models/item/vertical_framed_glass.json
5e331da9d4086412f5722923e3008246ed286a00 assets/create/models/item/vertical_framed_glass_pane.json

17
src/generated/resources/assets/create/blockstates/asurine.json
View file

@ -1,7 +1,18 @@
{
"variants": {
"": {
"model": "create:block/asurine"
}
"": [
{
"model": "create:block/asurine_natural_0"
},
{
"model": "create:block/asurine_natural_1"
},
{
"model": "create:block/asurine_natural_2"
},
{
"model": "create:block/asurine_natural_3"
}
]
}
}

17
src/generated/resources/assets/create/blockstates/crimsite.json
View file

@ -1,7 +1,18 @@
{
"variants": {
"": {
"model": "create:block/crimsite"
}
"": [
{
"model": "create:block/crimsite_natural_0"
},
{
"model": "create:block/crimsite_natural_1"
},
{
"model": "create:block/crimsite_natural_2"
},
{
"model": "create:block/crimsite_natural_3"
}
]
}
}

17
src/generated/resources/assets/create/blockstates/ochrum.json
View file

@ -1,7 +1,18 @@
{
"variants": {
"": {
"model": "create:block/ochrum"
}
"": [
{
"model": "create:block/ochrum_natural_0"
},
{
"model": "create:block/ochrum_natural_1"
},
{
"model": "create:block/ochrum_natural_2"
},
{
"model": "create:block/ochrum_natural_3"
}
]
}
}

17
src/generated/resources/assets/create/blockstates/veridium.json
View file

@ -1,7 +1,18 @@
{
"variants": {
"": {
"model": "create:block/veridium"
}
"": [
{
"model": "create:block/veridium_natural_0"
},
{
"model": "create:block/veridium_natural_1"
},
{
"model": "create:block/veridium_natural_2"
},
{
"model": "create:block/veridium_natural_3"
}
]
}
}

6
src/generated/resources/assets/create/models/block/asurine.json
View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/asurine"
}
}

6
src/generated/resources/assets/create/models/block/asurine_natural_0.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/natural/asurine_0"
}
}

6
src/generated/resources/assets/create/models/block/asurine_natural_1.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/natural/asurine_1"
}
}

6
src/generated/resources/assets/create/models/block/asurine_natural_2.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/natural/asurine_2"
}
}

6
src/generated/resources/assets/create/models/block/asurine_natural_3.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/natural/asurine_3"
}
}

6
src/generated/resources/assets/create/models/block/crimsite.json
View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/crimsite"
}
}

6
src/generated/resources/assets/create/models/block/crimsite_natural_0.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/natural/crimsite_0"
}
}

6
src/generated/resources/assets/create/models/block/crimsite_natural_1.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/natural/crimsite_1"
}
}

6
src/generated/resources/assets/create/models/block/crimsite_natural_2.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/natural/crimsite_2"
}
}

6
src/generated/resources/assets/create/models/block/crimsite_natural_3.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/natural/crimsite_3"
}
}

6
src/generated/resources/assets/create/models/block/ochrum.json
View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/ochrum"
}
}

6
src/generated/resources/assets/create/models/block/ochrum_natural_0.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/natural/ochrum_0"
}
}

6
src/generated/resources/assets/create/models/block/ochrum_natural_1.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/natural/ochrum_1"
}
}

6
src/generated/resources/assets/create/models/block/ochrum_natural_2.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/natural/ochrum_2"
}
}

6
src/generated/resources/assets/create/models/block/ochrum_natural_3.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/natural/ochrum_3"
}
}

6
src/generated/resources/assets/create/models/block/veridium.json
View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/veridium"
}
}

6
src/generated/resources/assets/create/models/block/veridium_natural_0.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/natural/veridium_0"
}
}

6
src/generated/resources/assets/create/models/block/veridium_natural_1.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/natural/veridium_1"
}
}

6
src/generated/resources/assets/create/models/block/veridium_natural_2.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/natural/veridium_2"
}
}

6
src/generated/resources/assets/create/models/block/veridium_natural_3.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/natural/veridium_3"
}
}

5
src/generated/resources/assets/create/models/item/asurine.json
View file

@ -1,3 +1,6 @@
{
"parent": "create:block/asurine"
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/natural/asurine_1"
}
}

5
src/generated/resources/assets/create/models/item/crimsite.json
View file

@ -1,3 +1,6 @@
{
"parent": "create:block/crimsite"
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/natural/crimsite_1"
}
}

5
src/generated/resources/assets/create/models/item/limestone.json
View file

@ -1,3 +1,6 @@
{
"parent": "create:block/limestone"
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/limestone"
}
}

5
src/generated/resources/assets/create/models/item/ochrum.json
View file

@ -1,3 +1,6 @@
{
"parent": "create:block/ochrum"
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/natural/ochrum_1"
}
}

5
src/generated/resources/assets/create/models/item/scorchia.json
View file

@ -1,3 +1,6 @@
{
"parent": "create:block/scorchia"
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/scorchia"
}
}

5
src/generated/resources/assets/create/models/item/scoria.json
View file

@ -1,3 +1,6 @@
{
"parent": "create:block/scoria"
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/scoria"
}
}

5
src/generated/resources/assets/create/models/item/veridium.json
View file

@ -1,3 +1,6 @@
{
"parent": "create:block/veridium"
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/palettes/stone_types/natural/veridium_1"
}
}

14
src/main/java/com/simibubi/create/content/palettes/AllPaletteStoneTypes.java
View file

@ -28,35 +28,35 @@ public enum AllPaletteStoneTypes {
DEEPSLATE(VANILLA_RANGE, r -> () -> Blocks.DEEPSLATE),
TUFF(VANILLA_RANGE, r -> () -> Blocks.TUFF),
ASURINE(STANDARD_RANGE, r -> r.paletteStoneBlock("asurine", () -> Blocks.DEEPSLATE, true)
ASURINE(STANDARD_RANGE, r -> r.paletteStoneBlock("asurine", () -> Blocks.DEEPSLATE, true, true)
.properties(p -> p.destroyTime(1.25f)
.color(MaterialColor.COLOR_BLUE))
.register()),
CRIMSITE(STANDARD_RANGE, r -> r.paletteStoneBlock("crimsite", () -> Blocks.DEEPSLATE, true)
CRIMSITE(STANDARD_RANGE, r -> r.paletteStoneBlock("crimsite", () -> Blocks.DEEPSLATE, true, true)
.properties(p -> p.destroyTime(1.25f)
.color(MaterialColor.COLOR_RED))
.register()),
LIMESTONE(STANDARD_RANGE, r -> r.paletteStoneBlock("limestone", () -> Blocks.SANDSTONE, true)
LIMESTONE(STANDARD_RANGE, r -> r.paletteStoneBlock("limestone", () -> Blocks.SANDSTONE, true, false)
.properties(p -> p.destroyTime(1.25f)
.color(MaterialColor.SAND))
.register()),
OCHRUM(STANDARD_RANGE, r -> r.paletteStoneBlock("ochrum", () -> Blocks.CALCITE, true)
OCHRUM(STANDARD_RANGE, r -> r.paletteStoneBlock("ochrum", () -> Blocks.CALCITE, true, true)
.properties(p -> p.destroyTime(1.25f)
.color(MaterialColor.TERRACOTTA_YELLOW))
.register()),
SCORIA(STANDARD_RANGE, r -> r.paletteStoneBlock("scoria", () -> Blocks.BLACKSTONE, true)
SCORIA(STANDARD_RANGE, r -> r.paletteStoneBlock("scoria", () -> Blocks.BLACKSTONE, true, false)
.properties(p -> p.color(MaterialColor.COLOR_BROWN))
.register()),
SCORCHIA(STANDARD_RANGE, r -> r.paletteStoneBlock("scorchia", () -> Blocks.BLACKSTONE, true)
SCORCHIA(STANDARD_RANGE, r -> r.paletteStoneBlock("scorchia", () -> Blocks.BLACKSTONE, true, false)
.properties(p -> p.color(MaterialColor.TERRACOTTA_GRAY))
.register()),
VERIDIUM(STANDARD_RANGE, r -> r.paletteStoneBlock("veridium", () -> Blocks.TUFF, true)
VERIDIUM(STANDARD_RANGE, r -> r.paletteStoneBlock("veridium", () -> Blocks.TUFF, true, true)
.properties(p -> p.destroyTime(1.25f)
.color(MaterialColor.WARPED_NYLIUM))
.register())

15
src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java
View file

@ -334,6 +334,21 @@ public class BlockStateGen {
};
}
public static <P extends Block> NonNullBiConsumer<DataGenContext<Block, P>, RegistrateBlockstateProvider> naturalStoneTypeBlock(
String type) {
return (c, p) -> {
ConfiguredModel[] variants = new ConfiguredModel[4];
for (int i = 0; i < variants.length; i++)
variants[i] = ConfiguredModel.builder()
.modelFile(p.models()
.cubeAll(type + "_natural_" + i, p.modLoc("block/palettes/stone_types/natural/" + type + "_" + i)))
.buildLast();
p.getVariantBuilder(c.get())
.partialState()
.setModels(variants);
};
}
public static <P extends EncasedPipeBlock> NonNullBiConsumer<DataGenContext<Block, P>, RegistrateBlockstateProvider> encasedPipe() {
return (c, p) -> {
ModelFile open = AssetLookup.partialBaseModel(c, p, "open");

12
src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java
View file

@ -118,10 +118,11 @@ public class CreateRegistrate extends AbstractRegistrate<CreateRegistrate> {
/* Palettes */
public <T extends Block> BlockBuilder<T, CreateRegistrate> paletteStoneBlock(String name,
NonNullFunction<Properties, T> factory, NonNullSupplier<Block> propertiesFrom, boolean worldGenStone) {
NonNullFunction<Properties, T> factory, NonNullSupplier<Block> propertiesFrom, boolean worldGenStone,
boolean hasNaturalVariants) {
BlockBuilder<T, CreateRegistrate> builder = super.block(name, factory).initialProperties(propertiesFrom)
.transform(pickaxeOnly())
.blockstate((c, p) -> {
.blockstate(hasNaturalVariants ? BlockStateGen.naturalStoneTypeBlock(name) : (c, p) -> {
final String location = "block/palettes/stone_types/" + c.getName();
p.simpleBlock(c.get(), p.models()
.cubeAll(c.getName(), p.modLoc(location)));
@ -131,13 +132,16 @@ public class CreateRegistrate extends AbstractRegistrate<CreateRegistrate> {
.tag(BlockTags.MOSS_REPLACEABLE)
.tag(BlockTags.LUSH_GROUND_REPLACEABLE)
.item()
.model((c, p) -> p.cubeAll(c.getName(),
p.modLoc(hasNaturalVariants ? "block/palettes/stone_types/natural/" + name + "_1"
: "block/palettes/stone_types/" + c.getName())))
.build();
return builder;
}
public BlockBuilder<Block, CreateRegistrate> paletteStoneBlock(String name, NonNullSupplier<Block> propertiesFrom,
boolean worldGenStone) {
return paletteStoneBlock(name, Block::new, propertiesFrom, worldGenStone);
boolean worldGenStone, boolean hasNaturalVariants) {
return paletteStoneBlock(name, Block::new, propertiesFrom, worldGenStone, hasNaturalVariants);
}
/* Fluids */

80
src/main/java/com/simibubi/create/foundation/worldgen/AllLayerPatterns.java
View file

@ -10,82 +10,80 @@ public class AllLayerPatterns {
public static final NonNullSupplier<LayerPattern>
CINNABAR = () -> LayerPattern.builder()
.layer(l -> l.weight(1)
.passiveBlock())
.layer(l -> l.weight(2)
.block(AllPaletteStoneTypes.CRIMSITE.getBaseBlock())
.size(1, 3))
.size(2, 5))
.layer(l -> l.weight(1)
.block(Blocks.TUFF)
.block(Blocks.DEEPSLATE)
.size(2, 3))
.layer(l -> l.weight(1)
.blocks(Blocks.DEEPSLATE, Blocks.TUFF)
.size(2, 2))
.layer(l -> l.weight(1)
.blocks(Blocks.DEEPSLATE, Blocks.TUFF))
.layer(l -> l.weight(1)
.block(AllPaletteStoneTypes.LIMESTONE.getBaseBlock()))
.block(AllPaletteStoneTypes.LIMESTONE.getBaseBlock())
.size(1, 2))
.build();
public static final NonNullSupplier<LayerPattern> MAGNETITE = () -> LayerPattern.builder()
.layer(l -> l.weight(1)
.passiveBlock())
.layer(l -> l.weight(2)
.block(AllPaletteStoneTypes.ASURINE.getBaseBlock())
.size(1, 3))
.size(2, 5))
.layer(l -> l.weight(1)
.block(Blocks.TUFF)
.block(Blocks.DEEPSLATE)
.size(2, 3))
.layer(l -> l.weight(1)
.blocks(Blocks.DEEPSLATE, Blocks.TUFF)
.size(2, 2))
.layer(l -> l.weight(1)
.block(Blocks.CALCITE)
.size(1, 2))
.layer(l -> l.weight(1)
.blocks(Blocks.DEEPSLATE, Blocks.TUFF))
.layer(l -> l.weight(1)
.block(Blocks.CALCITE))
.build();
public static final NonNullSupplier<LayerPattern> OCHRESTONE = () -> LayerPattern.builder()
.layer(l -> l.weight(1)
.passiveBlock())
.layer(l -> l.weight(2)
.block(AllPaletteStoneTypes.OCHRUM.getBaseBlock())
.size(1, 3))
.size(2, 5))
.layer(l -> l.weight(2)
.block(Blocks.TUFF)
.block(Blocks.DEEPSLATE)
.size(1, 2))
.size(2, 3))
.layer(l -> l.weight(2)
.block(Blocks.DRIPSTONE_BLOCK)
.size(1, 2))
.build();
public static final NonNullSupplier<LayerPattern> MALACHITE = () -> LayerPattern.builder()
.layer(l -> l.weight(2)
.passiveBlock())
.layer(l -> l.weight(4)
.block(AllPaletteStoneTypes.VERIDIUM.getBaseBlock())
.size(1, 3))
.size(2, 5))
.layer(l -> l.weight(2)
.block(Blocks.TUFF)
.block(Blocks.ANDESITE)
.size(1, 2))
.size(2, 3))
.layer(l -> l.weight(2)
.blocks(Blocks.TUFF, Blocks.ANDESITE))
.blocks(Blocks.TUFF, Blocks.ANDESITE)
.size(2, 2))
.layer(l -> l.weight(3)
.block(Blocks.SMOOTH_BASALT))
.block(Blocks.SMOOTH_BASALT)
.size(1, 2))
.build();
public static final NonNullSupplier<LayerPattern> SCORIA = () -> LayerPattern.builder()
.layer(l -> l.weight(1)
.passiveBlock())
.layer(l -> l.weight(2)
.block(AllPaletteStoneTypes.SCORIA.getBaseBlock())
.size(1, 3))
.size(2, 5))
.layer(l -> l.weight(2)
.block(Blocks.TUFF)
.block(Blocks.ANDESITE)
.size(2, 3))
.layer(l -> l.weight(1)
.blocks(Blocks.TUFF, Blocks.ANDESITE)
.size(2, 2))
.layer(l -> l.weight(1)
.block(Blocks.DIORITE)
.size(1, 2))
.layer(l -> l.weight(1)
.blocks(Blocks.TUFF, Blocks.ANDESITE))
.layer(l -> l.weight(1)
.block(Blocks.DIORITE))
.build();
public static final NonNullSupplier<LayerPattern> LIMESTONE = () -> LayerPattern.builder()
@ -97,7 +95,7 @@ public class AllLayerPatterns {
.block(Blocks.DIORITE))
.layer(l -> l.weight(2)
.block(AllPaletteStoneTypes.LIMESTONE.getBaseBlock())
.size(1, 4))
.size(2, 4))
.build();
public static final NonNullSupplier<LayerPattern> SCORIA_NETHER = () -> LayerPattern.builder()
@ -106,31 +104,33 @@ public class AllLayerPatterns {
.passiveBlock())
.layer(l -> l.weight(2)
.block(AllPaletteStoneTypes.SCORIA.getBaseBlock())
.size(1, 4))
.size(2, 5))
.layer(l -> l.weight(1)
.block(Blocks.BLACKSTONE)
.size(1, 3))
.size(1, 2))
.layer(l -> l.weight(1)
.block(Blocks.BASALT)
.block(Blocks.SMOOTH_BASALT))
.block(Blocks.SMOOTH_BASALT)
.size(2, 3))
.build();
public static final NonNullSupplier<LayerPattern> SCORCHIA_NETHER = () -> LayerPattern.builder()
.inNether()
.layer(l -> l.weight(2)
.passiveBlock())
.layer(l -> l.weight(4)
.passiveBlock())
.layer(l -> l.weight(8)
.block(AllPaletteStoneTypes.SCORCHIA.getBaseBlock())
.size(1, 4))
.layer(l -> l.weight(2)
.size(2, 5))
.layer(l -> l.weight(4)
.block(Blocks.SOUL_SOIL)
.block(Blocks.SOUL_SAND)
.size(1, 3))
.layer(l -> l.weight(1)
.block(Blocks.MAGMA_BLOCK))
.layer(l -> l.weight(2)
.layer(l -> l.weight(4)
.block(Blocks.BASALT)
.block(Blocks.SMOOTH_BASALT))
.block(Blocks.SMOOTH_BASALT)
.size(2, 3))
.build();
}

4
src/main/java/com/simibubi/create/foundation/worldgen/AllOreFeatureConfigEntries.java
View file

@ -46,7 +46,7 @@ public class AllOreFeatureConfigEntries {
.parent();
public static final OreFeatureConfigEntry STRIATED_ORES_OVERWORLD =
create("striated_ores_overworld", 32, 1 / 12f, -30, 70)
create("striated_ores_overworld", 32, 1 / 18f, -30, 70)
.biomeExt()
.predicate(OVERWORLD_BIOMES)
.parent()
@ -60,7 +60,7 @@ public class AllOreFeatureConfigEntries {
.parent();
public static final OreFeatureConfigEntry STRIATED_ORES_NETHER =
create("striated_ores_nether", 32, 1 / 12f, 40, 90)
create("striated_ores_nether", 32, 1 / 18f, 40, 90)
.biomeExt()
.predicate(NETHER_BIOMES)
.parent()

BIN
src/main/resources/assets/create/textures/block/palettes/stone_types/asurine.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 207 B

BIN
src/main/resources/assets/create/textures/block/palettes/stone_types/crimsite.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 276 B

BIN
src/main/resources/assets/create/textures/block/palettes/stone_types/natural/asurine_0.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 594 B

BIN
src/main/resources/assets/create/textures/block/palettes/stone_types/natural/asurine_1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 497 B

BIN
src/main/resources/assets/create/textures/block/palettes/stone_types/natural/asurine_2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 439 B

BIN
src/main/resources/assets/create/textures/block/palettes/stone_types/natural/asurine_3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 510 B

BIN
src/main/resources/assets/create/textures/block/palettes/stone_types/natural/crimsite_0.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 734 B

BIN
src/main/resources/assets/create/textures/block/palettes/stone_types/natural/crimsite_1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 699 B

BIN
src/main/resources/assets/create/textures/block/palettes/stone_types/natural/crimsite_2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 660 B

BIN
src/main/resources/assets/create/textures/block/palettes/stone_types/natural/crimsite_3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 569 B

BIN
src/main/resources/assets/create/textures/block/palettes/stone_types/natural/ochrum_0.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 553 B

BIN
src/main/resources/assets/create/textures/block/palettes/stone_types/natural/ochrum_1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 493 B

BIN
src/main/resources/assets/create/textures/block/palettes/stone_types/natural/ochrum_2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 498 B

BIN
src/main/resources/assets/create/textures/block/palettes/stone_types/natural/ochrum_3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 486 B

BIN
src/main/resources/assets/create/textures/block/palettes/stone_types/natural/veridium_0.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 740 B

BIN
src/main/resources/assets/create/textures/block/palettes/stone_types/natural/veridium_1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 613 B

BIN
src/main/resources/assets/create/textures/block/palettes/stone_types/natural/veridium_2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 642 B

BIN
src/main/resources/assets/create/textures/block/palettes/stone_types/natural/veridium_3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 570 B

BIN
src/main/resources/assets/create/textures/block/palettes/stone_types/ochrum.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 221 B

BIN
src/main/resources/assets/create/textures/block/palettes/stone_types/veridium.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 215 B