From 79e2ceb23c381ea8081cf4fa842415301f94b878 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Sat, 4 Dec 2021 06:23:01 +0100 Subject: [PATCH] Packed and Voided - Added crushing recipes for raw ore blocks - Layered mineral deposits are slightly more likely to spawn - Zinc ore is slightly less likely to spawn - Added layered deposits with Scorchia - Fixed tuff pillars texture size - Modified recipe for the Wand of Symmetry --- src/generated/resources/.cache/cache | 9 ++-- .../data/create/advancements/aesthetics.json | 4 +- .../curiosities/wand_of_symmetry.json | 34 --------------- .../curiosities/wand_of_symmetry.json | 25 ----------- .../recipes/crushing/raw_copper_block.json | 20 +++++++++ .../recipes/crushing/raw_gold_block.json | 20 +++++++++ .../recipes/crushing/raw_iron_block.json | 20 +++++++++ .../recipes/crushing/raw_zinc_block.json | 20 +++++++++ .../mechanical_crafting/wand_of_symmetry.json | 31 ++++++++++++++ .../data/recipe/CrushingRecipeGen.java | 19 +++++---- .../recipe/MechanicalCraftingRecipeGen.java | 12 ++++++ .../data/recipe/StandardRecipeGen.java | 25 ++++------- .../foundation/worldgen/AllLayerPatterns.java | 39 +++++++++++++++++- .../foundation/worldgen/AllWorldFeatures.java | 13 +++--- .../stone_types/pillar/tuff_cut_pillar.png | Bin 10882 -> 2909 bytes 15 files changed, 196 insertions(+), 95 deletions(-) delete mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/crafting/curiosities/wand_of_symmetry.json delete mode 100644 src/generated/resources/data/create/recipes/crafting/curiosities/wand_of_symmetry.json create mode 100644 src/generated/resources/data/create/recipes/crushing/raw_copper_block.json create mode 100644 src/generated/resources/data/create/recipes/crushing/raw_gold_block.json create mode 100644 src/generated/resources/data/create/recipes/crushing/raw_iron_block.json create mode 100644 src/generated/resources/data/create/recipes/crushing/raw_zinc_block.json create mode 100644 src/generated/resources/data/create/recipes/mechanical_crafting/wand_of_symmetry.json diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 7368665c0..eaa03798f 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1963,7 +1963,7 @@ d080b1b25e5bc8baf5aee68691b08c7f12ece3b0 assets/create/models/item/windmill_bear a80fb25a0b655e76be986b5b49fcb0f03461a1ab assets/create/models/item/zinc_nugget.json b1689617190c05ef34bd18456b0c7ae09bb3210f assets/create/models/item/zinc_ore.json 5049f72c327a88f175f6f9425909e098fc711100 assets/create/sounds.json -5d0cc4c0255dc241e61c173b31ddca70c88d08e4 data/create/advancements/aesthetics.json +0f1b4b980afba9bf2caf583b88e261bba8b10313 data/create/advancements/aesthetics.json 613e64b44bed959da899fdd54c1cacb227fb33f2 data/create/advancements/andesite_alloy.json 81885c6bfb85792c88aaa7c9b70f58832945d31f data/create/advancements/andesite_casing.json 83c046bd200623933545c9e4326f782fb02c87fa data/create/advancements/arm_blaze_burner.json @@ -2094,7 +2094,6 @@ c4769d7ac9c537eb4409b02883e89d0930514a8b data/create/advancements/recipes/create bb138bedd2aec741fa54b6b52be384fdbd741249 data/create/advancements/recipes/create.base/crafting/curiosities/brown_toolbox.json 773faf96b003868e35ceeb0bf738281d066e343b data/create/advancements/recipes/create.base/crafting/curiosities/minecart_coupling.json a8c72e7e02fd0843d33fa4c5d43de81f29bc3aa4 data/create/advancements/recipes/create.base/crafting/curiosities/peculiar_bell.json -21c70f657205de3e4be793aaf7eac5de3719d5e6 data/create/advancements/recipes/create.base/crafting/curiosities/wand_of_symmetry.json 468e48708a0dd00248cd43474eef10adc2f660c7 data/create/advancements/recipes/create.base/crafting/kinetics/adjustable_chain_gearshift.json 1eed818673d57a9e9c28e90a2d87b97c28f85784 data/create/advancements/recipes/create.base/crafting/kinetics/analog_lever.json 3e9753006da898d4569bbeabf95997e8c90847c8 data/create/advancements/recipes/create.base/crafting/kinetics/attribute_filter.json @@ -3386,7 +3385,6 @@ b159ba84428eee6ef6e23df1766f2a18f2c8a63e data/create/recipes/crafting/appliances 660e92da2b1b6698b1c0df74bd74a56a25fb3eca data/create/recipes/crafting/curiosities/minecart_coupling.json 1f8f96ab57363166b7e132a1dd082001a5a0d5f0 data/create/recipes/crafting/curiosities/peculiar_bell.json 07b3ca3a3e44ee1f76c69132ffa6556e027e5b0e data/create/recipes/crafting/curiosities/toolbox_dyeing.json -fcbc04d0a7eaf820a74bc7e4736a4a581e0a9dff data/create/recipes/crafting/curiosities/wand_of_symmetry.json cc56d21a25286a9024e506dde9fa161230eaf46d data/create/recipes/crafting/kinetics/adjustable_chain_gearshift.json 88de51b451469698665b7319e5b9cfb9a87ae3e0 data/create/recipes/crafting/kinetics/analog_lever.json cf1f3a6306d47025cebe153cf05949ef69ccbe5a data/create/recipes/crafting/kinetics/attribute_filter.json @@ -3608,9 +3606,13 @@ dd4b9e88a723f6c3f2456f36ef2354cd86d85433 data/create/recipes/crushing/obsidian.j 93767cfd10019f11de935021a729771430bc114b data/create/recipes/crushing/ochrum.json 67197bbbb9667ab481410d21cb014bf9ca71ea60 data/create/recipes/crushing/prismarine_crystals.json 3602170b10ed1e0bb5e7aa806dcc73170b999517 data/create/recipes/crushing/raw_copper.json +ad62bd9e067efbc026ed7ed0a0e47232d14f2fe5 data/create/recipes/crushing/raw_copper_block.json f2c64ade6ef62e73d7f5aa0a0706de55cf12e464 data/create/recipes/crushing/raw_gold.json +c9fc914e0762f8d9b4fef7d1c69dea6e7bae5a87 data/create/recipes/crushing/raw_gold_block.json 2ee02db1746e2297aa0860b5bb8554625724c964 data/create/recipes/crushing/raw_iron.json +cbdbad0020b8a48dd2f5a658e3f93ff9ab648406 data/create/recipes/crushing/raw_iron_block.json 68cc75b755626aecea2e3cf6db98b986dbd905f4 data/create/recipes/crushing/raw_zinc.json +62eff7a33870aae32552672eeec3c128ddcef9f7 data/create/recipes/crushing/raw_zinc_block.json a2d3e1feb660a89c09038853859302726fa863c1 data/create/recipes/crushing/redstone_ore.json 7f6c7b88464ecb023165d379bfe8d0117b2f37d6 data/create/recipes/crushing/tuff.json 2517df626a19d7fc489ca7573a573c59513c6b83 data/create/recipes/crushing/veridium.json @@ -3854,6 +3856,7 @@ cd5faabca5e37a2394bde992a4247d925256eff9 data/create/recipes/limestone_bricks_wa f26ed47c10cc63613759b0f8ae4ef349000de60d data/create/recipes/mechanical_crafting/flywheel.json 2dc00d6e4c159e06ab2a705e666e83e4238a7814 data/create/recipes/mechanical_crafting/furnace_engine.json fa356eb82c08339bb0064017d88b1e5b053fd4ff data/create/recipes/mechanical_crafting/potato_cannon.json +7e695ab2b684c23968a23765072603be5da13d75 data/create/recipes/mechanical_crafting/wand_of_symmetry.json 98f877bf8f3f8a686fc6cf7479a0fba5744248ce data/create/recipes/milling/allium.json bcff4d30ae09a0729bce8b2dbde4ddd6719a998b data/create/recipes/milling/andesite.json ac3f1c92115a113a1ea7e5543c1e061e3d2a0b36 data/create/recipes/milling/azure_bluet.json diff --git a/src/generated/resources/data/create/advancements/aesthetics.json b/src/generated/resources/data/create/advancements/aesthetics.json index 59a86f429..d723cbe38 100644 --- a/src/generated/resources/data/create/advancements/aesthetics.json +++ b/src/generated/resources/data/create/advancements/aesthetics.json @@ -28,8 +28,8 @@ "trigger": "create:bracket_apply", "conditions": { "accepted_entries": [ - "create:large_cogwheel", - "create:cogwheel" + "create:cogwheel", + "create:large_cogwheel" ] } }, diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/curiosities/wand_of_symmetry.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/curiosities/wand_of_symmetry.json deleted file mode 100644 index 2d6e52795..000000000 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/curiosities/wand_of_symmetry.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:crafting/curiosities/wand_of_symmetry" - ] - }, - "criteria": { - "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "create:refined_radiance" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "create:crafting/curiosities/wand_of_symmetry" - } - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/curiosities/wand_of_symmetry.json b/src/generated/resources/data/create/recipes/crafting/curiosities/wand_of_symmetry.json deleted file mode 100644 index a0e140621..000000000 --- a/src/generated/resources/data/create/recipes/crafting/curiosities/wand_of_symmetry.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " GE", - "LEG", - "OL " - ], - "key": { - "E": { - "item": "create:refined_radiance" - }, - "G": { - "tag": "forge:glass_panes/white" - }, - "O": { - "tag": "forge:obsidian" - }, - "L": { - "tag": "forge:ingots/brass" - } - }, - "result": { - "item": "create:wand_of_symmetry" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/raw_copper_block.json b/src/generated/resources/data/create/recipes/crushing/raw_copper_block.json new file mode 100644 index 000000000..00f83d329 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/raw_copper_block.json @@ -0,0 +1,20 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:raw_copper_block" + } + ], + "results": [ + { + "item": "create:crushed_copper_ore", + "count": 9 + }, + { + "item": "create:experience_nugget", + "count": 9, + "chance": 0.75 + } + ], + "processingTime": 400 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/raw_gold_block.json b/src/generated/resources/data/create/recipes/crushing/raw_gold_block.json new file mode 100644 index 000000000..90942d3c6 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/raw_gold_block.json @@ -0,0 +1,20 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:raw_gold_block" + } + ], + "results": [ + { + "item": "create:crushed_gold_ore", + "count": 9 + }, + { + "item": "create:experience_nugget", + "count": 9, + "chance": 0.75 + } + ], + "processingTime": 400 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/raw_iron_block.json b/src/generated/resources/data/create/recipes/crushing/raw_iron_block.json new file mode 100644 index 000000000..3e45d75c6 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/raw_iron_block.json @@ -0,0 +1,20 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:raw_iron_block" + } + ], + "results": [ + { + "item": "create:crushed_iron_ore", + "count": 9 + }, + { + "item": "create:experience_nugget", + "count": 9, + "chance": 0.75 + } + ], + "processingTime": 400 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/raw_zinc_block.json b/src/generated/resources/data/create/recipes/crushing/raw_zinc_block.json new file mode 100644 index 000000000..997e066d0 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/raw_zinc_block.json @@ -0,0 +1,20 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "create:raw_zinc_block" + } + ], + "results": [ + { + "item": "create:crushed_zinc_ore", + "count": 9 + }, + { + "item": "create:experience_nugget", + "count": 9, + "chance": 0.75 + } + ], + "processingTime": 400 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/mechanical_crafting/wand_of_symmetry.json b/src/generated/resources/data/create/recipes/mechanical_crafting/wand_of_symmetry.json new file mode 100644 index 000000000..d612dd634 --- /dev/null +++ b/src/generated/resources/data/create/recipes/mechanical_crafting/wand_of_symmetry.json @@ -0,0 +1,31 @@ +{ + "type": "create:mechanical_crafting", + "pattern": [ + " G ", + "GEG", + " P ", + " B ", + " O " + ], + "key": { + "E": { + "tag": "forge:ender_pearls" + }, + "G": { + "tag": "forge:glass" + }, + "P": { + "item": "create:precision_mechanism" + }, + "O": { + "tag": "forge:obsidian" + }, + "B": { + "tag": "forge:ingots/brass" + } + }, + "result": { + "item": "create:wand_of_symmetry" + }, + "acceptMirrored": true +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java index 431f49fb9..e280f71e3 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java @@ -87,10 +87,15 @@ public class CrushingRecipeGen extends ProcessingRecipeGen { NETHER_GOLD_ORE = netherOre(() -> Items.NETHER_GOLD_ORE, () -> Items.GOLD_NUGGET, 7.5f, 350), NETHER_QUARTZ_ORE = netherOre(() -> Items.NETHER_QUARTZ_ORE, () -> Items.QUARTZ, 2.25f, 350), - RAW_COPPER_ORE = rawOre(() -> Items.RAW_COPPER, AllItems.CRUSHED_COPPER::get), - RAW_ZINC_ORE = rawOre(AllItems.RAW_ZINC::get, AllItems.CRUSHED_ZINC::get), - RAW_IRON_ORE = rawOre(() -> Items.RAW_IRON, AllItems.CRUSHED_IRON::get), - RAW_GOLD_ORE = rawOre(() -> Items.RAW_GOLD, AllItems.CRUSHED_GOLD::get), + RAW_COPPER_ORE = rawOre(() -> Items.RAW_COPPER, AllItems.CRUSHED_COPPER::get, 1), + RAW_ZINC_ORE = rawOre(AllItems.RAW_ZINC::get, AllItems.CRUSHED_ZINC::get, 1), + RAW_IRON_ORE = rawOre(() -> Items.RAW_IRON, AllItems.CRUSHED_IRON::get, 1), + RAW_GOLD_ORE = rawOre(() -> Items.RAW_GOLD, AllItems.CRUSHED_GOLD::get, 1), + + RAW_COPPER_BLOCK = rawOre(() -> Items.RAW_COPPER_BLOCK, AllItems.CRUSHED_COPPER::get, 9), + RAW_ZINC_BLOCK = rawOre(AllBlocks.RAW_ZINC_BLOCK::get, AllItems.CRUSHED_ZINC::get, 9), + RAW_IRON_BLOCK = rawOre(() -> Items.RAW_IRON_BLOCK, AllItems.CRUSHED_IRON::get, 9), + RAW_GOLD_BLOCK = rawOre(() -> Items.RAW_GOLD_BLOCK, AllItems.CRUSHED_GOLD::get, 9), NETHER_WART = create("nether_wart_block", b -> b.duration(150) .require(Blocks.NETHER_WART_BLOCK) @@ -167,10 +172,10 @@ public class CrushingRecipeGen extends ProcessingRecipeGen { }); } - protected GeneratedRecipe rawOre(Supplier input, Supplier result) { + protected GeneratedRecipe rawOre(Supplier input, Supplier result, int amount) { return create(input, b -> b.duration(400) - .output(result.get(), 1) - .output(.75f, AllItems.EXP_NUGGET.get(), 1)); + .output(result.get(), amount) + .output(.75f, AllItems.EXP_NUGGET.get(), amount)); } public CrushingRecipeGen(DataGenerator p_i48262_1_) { diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeGen.java index 87007fc27..e83a40bdb 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeGen.java @@ -30,6 +30,18 @@ public class MechanicalCraftingRecipeGen extends CreateRecipeProvider { .patternLine(" AAA ") .disallowMirrored()), + WAND_OF_SYMMETRY = + create(AllItems.WAND_OF_SYMMETRY::get).recipe(b -> b.key('E', Ingredient.of(Tags.Items.ENDER_PEARLS)) + .key('G', Ingredient.of(Tags.Items.GLASS)) + .key('P', I.precisionMechanism()) + .key('O', Ingredient.of(Tags.Items.OBSIDIAN)) + .key('B', Ingredient.of(I.brass())) + .patternLine(" G ") + .patternLine("GEG") + .patternLine(" P ") + .patternLine(" B ") + .patternLine(" O ")), + EXTENDO_GRIP = create(AllItems.EXTENDO_GRIP::get).returns(1) .recipe(b -> b.key('L', Ingredient.of(I.brass())) .key('R', I.precisionMechanism()) diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java index a97543259..6879e2c74 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java @@ -179,23 +179,16 @@ public class StandardRecipeGen extends CreateRecipeProvider { private Marker CURIOSITIES = enterSection(AllSections.CURIOSITIES); - GeneratedRecipe WAND_OF_SYMMETRY = create(AllItems.WAND_OF_SYMMETRY).unlockedBy(I::refinedRadiance) - .viaShaped(b -> b.define('E', I.refinedRadiance()) - .define('G', Tags.Items.GLASS_PANES_WHITE) - .define('O', Tags.Items.OBSIDIAN) - .define('L', I.brass()) - .pattern(" GE") - .pattern("LEG") - .pattern("OL ")), + GeneratedRecipe - TOOLBOX = create(AllBlocks.TOOLBOXES.get(DyeColor.BROWN)).unlockedByTag(I::goldSheet) - .viaShaped(b -> b.define('S', I.goldSheet()) - .define('C', I.cog()) - .define('W', Tags.Items.CHESTS_WOODEN) - .define('L', Tags.Items.LEATHER) - .pattern(" C ") - .pattern("SWS") - .pattern(" L ")), + TOOLBOX = create(AllBlocks.TOOLBOXES.get(DyeColor.BROWN)).unlockedByTag(I::goldSheet) + .viaShaped(b -> b.define('S', I.goldSheet()) + .define('C', I.cog()) + .define('W', Tags.Items.CHESTS_WOODEN) + .define('L', Tags.Items.LEATHER) + .pattern(" C ") + .pattern("SWS") + .pattern(" L ")), TOOLBOX_DYEING = createSpecial(AllRecipeTypes.TOOLBOX_DYEING::getSerializer, "crafting", "toolbox_dyeing"), diff --git a/src/main/java/com/simibubi/create/foundation/worldgen/AllLayerPatterns.java b/src/main/java/com/simibubi/create/foundation/worldgen/AllLayerPatterns.java index bea313eef..b97432db5 100644 --- a/src/main/java/com/simibubi/create/foundation/worldgen/AllLayerPatterns.java +++ b/src/main/java/com/simibubi/create/foundation/worldgen/AllLayerPatterns.java @@ -68,16 +68,32 @@ public class AllLayerPatterns { .layer(l -> l.weight(1) .block(Blocks.SMOOTH_BASALT)) .build(); + + public static NonNullSupplier SCORIA = () -> LayerPattern.builder() + .layer(l -> l.weight(1) + .passiveBlock()) + .layer(l -> l.weight(2) + .block(AllPaletteStoneTypes.SCORIA.getBaseBlock()) + .size(1, 3)) + .layer(l -> l.weight(2) + .block(Blocks.TUFF) + .block(Blocks.ANDESITE) + .size(1, 2)) + .layer(l -> l.weight(1) + .block(Blocks.DIORITE)) + .build(); public static NonNullSupplier LIMESTONE = () -> LayerPattern.builder() .layer(l -> l.weight(1) .passiveBlock()) + .layer(l -> l.weight(2) + .block(Blocks.CALCITE)) .layer(l -> l.weight(2) .block(AllPaletteStoneTypes.LIMESTONE.getBaseBlock()) - .size(1, 4)) + .size(1, 5)) .build(); - public static NonNullSupplier SCORIA = () -> LayerPattern.builder() + public static NonNullSupplier SCORIA_NETHER = () -> LayerPattern.builder() .inNether() .layer(l -> l.weight(1) .passiveBlock()) @@ -88,6 +104,25 @@ public class AllLayerPatterns { .block(Blocks.BLACKSTONE) .size(1, 3)) .layer(l -> l.weight(1) + .block(Blocks.BASALT) + .block(Blocks.SMOOTH_BASALT)) + .build(); + + public static NonNullSupplier SCORCHIA_NETHER = () -> LayerPattern.builder() + .inNether() + .layer(l -> l.weight(2) + .passiveBlock()) + .layer(l -> l.weight(4) + .block(AllPaletteStoneTypes.SCORCHIA.getBaseBlock()) + .size(1, 4)) + .layer(l -> l.weight(2) + .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) + .block(Blocks.BASALT) .block(Blocks.SMOOTH_BASALT)) .build(); diff --git a/src/main/java/com/simibubi/create/foundation/worldgen/AllWorldFeatures.java b/src/main/java/com/simibubi/create/foundation/worldgen/AllWorldFeatures.java index 35523c253..60434ba6a 100644 --- a/src/main/java/com/simibubi/create/foundation/worldgen/AllWorldFeatures.java +++ b/src/main/java/com/simibubi/create/foundation/worldgen/AllWorldFeatures.java @@ -29,12 +29,12 @@ public class AllWorldFeatures { // - public static final ConfigDrivenFeatureEntry ZINC_ORE = - register("zinc_ore", 14, 4, OVERWORLD_BIOMES).between(1, 70) - .withBlocks(Couple.create(AllBlocks.ZINC_ORE, AllBlocks.DEEPSLATE_ZINC_ORE)); + public static final ConfigDrivenFeatureEntry ZINC_ORE = register("zinc_ore", 12, 3, OVERWORLD_BIOMES).between(1, 70) + .withBlocks(Couple.create(AllBlocks.ZINC_ORE, AllBlocks.DEEPSLATE_ZINC_ORE)); public static final ConfigDrivenFeatureEntry STRIATED_ORES_OVERWORLD = - register("striated_ores_overworld", 32, 1 / 32f, OVERWORLD_BIOMES).between(1, 70) + register("striated_ores_overworld", 32, 1 / 18f, OVERWORLD_BIOMES).between(1, 70) + .withLayerPattern(AllLayerPatterns.SCORIA) .withLayerPattern(AllLayerPatterns.CINNABAR) .withLayerPattern(AllLayerPatterns.MAGNETITE) .withLayerPattern(AllLayerPatterns.MALACHITE) @@ -42,8 +42,9 @@ public class AllWorldFeatures { .withLayerPattern(AllLayerPatterns.OCHRESTONE); public static final ConfigDrivenFeatureEntry STRIATED_ORES_NETHER = - register("striated_ores_nether", 32, 1 / 16f, NETHER_BIOMES).between(40, 100) - .withLayerPattern(AllLayerPatterns.SCORIA); + register("striated_ores_nether", 32, 1 / 12f, NETHER_BIOMES).between(40, 90) + .withLayerPattern(AllLayerPatterns.SCORIA_NETHER) + .withLayerPattern(AllLayerPatterns.SCORCHIA_NETHER); // diff --git a/src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/tuff_cut_pillar.png b/src/main/resources/assets/create/textures/block/palettes/stone_types/pillar/tuff_cut_pillar.png index 867ddc979119ce2ec162c2afa147a1b05a776c9d..528baf03b56a22c06514b656a65bfe2af23f58d3 100644 GIT binary patch delta 1712 zcmZn)y(?DV8Q|y6%O%Cdz`(%k>ERLtqy<2jg&9b`z556#z}S@O>>S|f?5q$_l%JNF zlghxLaenGVOAls8iB@}IeH-rJ4vn0JVO)!prU@NY(D3Ma5V~WxVc?0pLwQGz1#RGs zs4$6Z?cKUfY+I8;MZ=Aok(#$U*8IEt zZM?ZS>ZSipZ+YecvvjcWG|jiln68(V(2-hMny z_h;iwo8$GO>$SH9t$udi_A2-5X>VR?E5A(_eF}Rf9CP~qcZL0ryK85^czss=YU{#BCqLh_T9C!PuV~))$`_UK?gBL} z+`Aw6%O7~K`^C)QNnu@G^>gP<_78GjuxNTldUSt(vu}XgnQ-+_KrNgF9+AZi4BUbs z%vhfiKaqifV^8MfHR67Zypw;4yD;-|DNMGPa8d@+Kwwjpl4j+STAW;zSx}OhpQixg zCnn{Wme?vOOwHHWaJ@%1`jx=#B>FHJD8x2{^Ywd5|(f-FhrAGD@v?<@{_?1 z2+qha&x5OmhCPxIlYM2Sp>}1;61FQ>R-zumuAtQP%;J)wO3xHL7J=ejALcqNI&6Ru z>g#Le0W>MUs1n_v;M78xkTEDEAZaKkQ=z!TwXDP{F&Pr1#ffF9DN0bm@Kk>$SEy`B!l46f`XjP)FPOZVD14L z12cTGt-M4iJfsj>or_WvfgZ%86J(e^ZVfh*56X*3!Ayn*1hU0@w>ZCTDK1)id|Nr?;$o=o~*%#C-o0G-6( M>FVdQ&MBb@0E-<;H2?qr literal 10882 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 X{0g1+Rf=MTqs;-;Gt;foJ|FpC^Mf)9