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
2021-12-04 06:23:01 +01:00 · 2021-12-04 06:23:01 +01:00 · 79e2ceb23c
commit 79e2ceb23c
parent 210af91396
15 changed files with 196 additions and 95 deletions
--- 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
--- 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"
        ]
      }
    },
--- 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
@ -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"
-    ]
-  ]
-}
--- 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
@ -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"
-  }
-}
--- a/src/generated/resources/data/create/recipes/crushing/raw_copper_block.json
+++ 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
+}
--- a/src/generated/resources/data/create/recipes/crushing/raw_gold_block.json
+++ 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
+}
--- a/src/generated/resources/data/create/recipes/crushing/raw_iron_block.json
+++ 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
+}
--- a/src/generated/resources/data/create/recipes/crushing/raw_zinc_block.json
+++ 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
+}
--- 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
@ -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
+}
--- 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<ItemLike> input, Supplier<ItemLike> result) {
+	protected GeneratedRecipe rawOre(Supplier<ItemLike> input, Supplier<ItemLike> 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_) {
--- 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())
--- 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"),

--- 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<LayerPattern> 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<LayerPattern> 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<LayerPattern> SCORIA = () -> LayerPattern.builder()
+	public static NonNullSupplier<LayerPattern> 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<LayerPattern> 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();

--- 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);

 	//

--- 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