Merge pull request #446 from MuteTiefling/e9e-continued-feedback

recipe conflicts fixes
EnigmaticaModpacks · Jun 26, 2023 · 78d88dc · 78d88dc
2 parents 983f2a7 + dc1e0c7
commit 78d88dc
Show file tree

Hide file tree

Showing 15 changed files with 280 additions and 38 deletions.
diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md
@@ -14,6 +14,9 @@
 -   Twilight Forest decorative blocks are now craftable. [\#415](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/415) ([MuteTiefling](https://github.com/MuteTiefling))
 -   Remove Nature's Aura client configs from Config Swapper [\#416](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/416) ([MuteTiefling](https://github.com/MuteTiefling))
 -   Buff Occultism Storage [\#416](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/416) ([MuteTiefling](https://github.com/MuteTiefling))
+-   Fix many recipe conflicts [\#446](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/446) ([MuteTiefling](https://github.com/MuteTiefling))
+-   Dense Trees now drop multiple regular logs, rather than dense logs [\#446](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/446) ([MuteTiefling](https://github.com/MuteTiefling))
+-   Storage blocks for crops are now unified. Stonecutter may be used to obtain alternate block types [\#446](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/446) ([MuteTiefling](https://github.com/MuteTiefling))
 
 ### 🐛 Fixed Bugs
 

diff --git a/config/almostunified/unify.json b/config/almostunified/unify.json
@@ -4,6 +4,7 @@
         "emendatusenigmatica",
         "kubejs",
         "create",
+        "quark",
         "thermal",
         "mekanism",
         "immersiveengineering",
@@ -98,7 +99,17 @@
         "ventium",
         "wood",
         "zinc",
-        "quartz"
+        "quartz",
+        "gunpowder",
+        "rice",
+        "onion",
+        "tomato",
+        "beetroot",
+        "potato",
+        "carrot",
+        "apple",
+        "bamboo",
+        "sugar_cane"
     ],
     "priorityOverrides": {},
     "tagOwnerships": {

diff --git a/config/configswapper/expert/config/quark-common.toml b/config/configswapper/expert/config/quark-common.toml
@@ -974,21 +974,21 @@
 
 	[tweaks.utility_recipes]
 		#Can two Logs be used to craft 16 sticks?
-		"Easy Sticks" = true
+		"Easy Sticks" = false
 		#Can you craft four chests at once using logs?
-		"Logs To Chests" = true
+		"Logs To Chests" = false
 		#Can other stone-like materials be used for crafting stone tools?
 		"Better Stone Tool Crafting" = true
 		#Can a dispenser be crafted by adding a bow to a dropper?
 		"Enable Dispenser" = true
 		#Can any wool color be dyed?
 		"Dye Any Wool" = true
 		#Can Coral be crafted into dye?
-		"Coral To Dye" = true
+		"Coral To Dye" = false
 		#Can Charcoal be crafted into Black Dye?
-		"Charcoal To Black Dye" = true
+		"Charcoal To Black Dye" = false
 		#Can raw ore blocks be smelted, taking 9x the time a normal item?
-		"Smelt Raw Ore Blocks" = true
+		"Smelt Raw Ore Blocks" = false
 		#Can torches can be used as fuel in furnaces?
 		"Torches Burn" = true
 		#Can two Logs be used instead of a Chest to make a Hopper?

diff --git a/config/configswapper/normal/config/quark-common.toml b/config/configswapper/normal/config/quark-common.toml
@@ -974,21 +974,21 @@
 
 	[tweaks.utility_recipes]
 		#Can two Logs be used to craft 16 sticks?
-		"Easy Sticks" = true
+		"Easy Sticks" = false
 		#Can you craft four chests at once using logs?
-		"Logs To Chests" = true
+		"Logs To Chests" = false
 		#Can other stone-like materials be used for crafting stone tools?
 		"Better Stone Tool Crafting" = true
 		#Can a dispenser be crafted by adding a bow to a dropper?
 		"Enable Dispenser" = true
 		#Can any wool color be dyed?
 		"Dye Any Wool" = true
 		#Can Coral be crafted into dye?
-		"Coral To Dye" = true
+		"Coral To Dye" = false
 		#Can Charcoal be crafted into Black Dye?
-		"Charcoal To Black Dye" = true
+		"Charcoal To Black Dye" = false
 		#Can raw ore blocks be smelted, taking 9x the time a normal item?
-		"Smelt Raw Ore Blocks" = true
+		"Smelt Raw Ore Blocks" = false
 		#Can torches can be used as fuel in furnaces?
 		"Torches Burn" = true
 		#Can two Logs be used instead of a Chest to make a Hopper?

diff --git a/kubejs/client_scripts/constants/jei_hidden_disabled.js b/kubejs/client_scripts/constants/jei_hidden_disabled.js
@@ -85,10 +85,11 @@ jei.base.items.disabled = [
 
     /thermal:flax/,
     /thermal:hops/,
-    /thermal:onion/,
-    /thermal:rice/,
+    'thermal:rice_seeds',
+    'thermal:rice',
+    'thermal:onion_seeds',
+    'thermal:onion',
     'thermal:tomato_seeds',
-    'thermal:tomato_block',
     'thermal:tomato',
     'thermal:crude_oil_bucket',
     'thermal:heavy_oil_bucket',
@@ -121,6 +122,8 @@ jei.base.items.disabled = [
 jei.base.items.hidden = [
     'create:honey_bucket',
 
+    /densetrees/,
+
     /emendatusenigmatica:bitumen_.*_ore/,
     'emendatusenigmatica:bitumen_ore',
 

diff --git a/kubejs/server_scripts/base/loot_tables/blocks/densetrees/dense_logs.js b/kubejs/server_scripts/base/loot_tables/blocks/densetrees/dense_logs.js
@@ -0,0 +1,23 @@
+ServerEvents.blockLootTables((event) => {
+    const dense_types = [
+        'warped_stem',
+        'crimson_stem',
+        'mangrove_log',
+        'dark_oak_log',
+        'acacia_log',
+        'jungle_log',
+        'birch_log',
+        'spruce_log',
+        'oak_log'
+    ];
+    dense_types.forEach((type) => {
+        event.addBlock(`densetrees:dense_${type}`, (table) => {
+            table.addPool((pool) => {
+                pool.rolls = 16.0;
+                pool.bonusRolls = 0.0;
+                pool.addEntry({ type: 'minecraft:item', name: `minecraft:${type}` });
+                pool.addCondition({ condition: 'minecraft:survives_explosion' });
+            });
+        });
+    });
+});
diff --git a/kubejs/server_scripts/base/recipes/byg/shaped.js b/kubejs/server_scripts/base/recipes/byg/shaped.js
@@ -18,6 +18,23 @@ ServerEvents.recipes((event) => {
                 B: 'ars_nouveau:fire_essence'
             },
             id: `${id_prefix}cryptic_magma_block`
+        },
+        {
+            output: 'byg:therium_lamp',
+            pattern: ['AAA', 'ABA', 'AAA'],
+            key: {
+                A: '#forge:nuggets/iron',
+                B: '#forge:storage_blocks/therium'
+            },
+            id: 'byg:therium_lamp'
+        },
+        {
+            output: '2x byg:chiseled_therium',
+            pattern: ['A', 'A'],
+            key: {
+                A: '#forge:storage_blocks/therium'
+            },
+            id: 'byg:chiseled_therium'
         }
     ];
 

diff --git a/kubejs/server_scripts/base/recipes/enigmatica/remove.js b/kubejs/server_scripts/base/recipes/enigmatica/remove.js
@@ -10,6 +10,7 @@ ServerEvents.recipes((event) => {
 
         { mod: 'gateways' },
         { mod: 'theoneprobe' },
+        { mod: 'densetrees' },
 
         { output: /pendorite/ },
         { output: /emeraldite/ },
@@ -31,13 +32,20 @@ ServerEvents.recipes((event) => {
         { input: /mekanism.*fluorite_ore/ },
         { input: /rftoolsbase:dimensionalshard_/ },
 
+        { id: 'ae2:misc/vanilla_daylight_detector' },
+        { id: 'ae2:misc/vanilla_comparator' },
+
         { id: 'ars_elemental:blaze_crush' },
         { id: 'ars_elemental:bone_crush' },
 
         { id: /ars_nouveau:.*_dye/ },
 
         { id: 'byg:dye_from_warped_cactus' },
         { id: 'byg:dye_from_oddity_cactus' },
+        { id: 'byg:byg_chest' },
+        { id: 'byg:jacaranda_boookshelf' },
+        { id: 'byg:rainbow_eucalpytus_trapdoor' },
+        { id: 'byg:rainbow_eucalpytus_door' },
 
         { id: 'create:compat/ae2/mixing/fluix_crystal' },
         { id: 'create:compat/byg/crushing/lignite_ore' },
@@ -100,6 +108,7 @@ ServerEvents.recipes((event) => {
         { id: 'minecraft:bone_meal' },
         { id: 'minecraft:glass' },
         { id: 'minecraft:green_dye' },
+        { id: 'minecraft:cake' },
 
         { id: 'naturesaura:infused_iron' },
         { id: 'naturesaura:sky_ingot' },
@@ -132,6 +141,12 @@ ServerEvents.recipes((event) => {
 
         { id: 'rftoolsbase:dimensionalshard' },
 
+        { id: 'supplementaries:ash_bricks_vertical_slab_2' },
+        { id: 'supplementaries:blackstone_tile_vertical_slab_2' },
+        { id: 'supplementaries:checker_vertical_slab_2' },
+        { id: 'supplementaries:lapis_bricks_vertical_slab_2' },
+        { id: 'supplementaries:stone_tile_vertical_slab_2' },
+
         { id: /thermal:machines\/pulverizer\/pulverizer.*sandstone/ },
         { id: /thermal:machines\/press\/press.*ingot_to_gear/ },
         { id: 'thermal:machines/centrifuge/centrifuge_allium' },
@@ -211,6 +226,8 @@ ServerEvents.recipes((event) => {
 
         { type: 'starbunclemania:fluid_sourcelink' },
 
+        { type: 'the_bumblezone:sticky_honey_residue/from_smelting_glistering_honey_crystal' },
+
         { type: 'thermal:lapidary_fuel' },
         { type: 'thermal:sawmill' },
         { type: 'thermal:pulverizer_recycle' },

diff --git a/kubejs/server_scripts/base/recipes/enigmatica/shapeless.js b/kubejs/server_scripts/base/recipes/enigmatica/shapeless.js
@@ -19,7 +19,7 @@ ServerEvents.recipes((event) => {
         },
         {
             output: Item.of('minecraft:magenta_dye', 4),
-            inputs: ['#forge:dyes/blue', '#forge:dyes/red', '#forge:dyes/pink'],
+            inputs: ['#forge:dyes/blue', '#forge:dyes/red', '#forge:dyes/white'],
             id: `${id_prefix}magenta_dye_from_blue_red_white`
         },
         {

diff --git a/kubejs/server_scripts/base/recipes/minecraft/shapeless.js b/kubejs/server_scripts/base/recipes/minecraft/shapeless.js
@@ -2,11 +2,6 @@ ServerEvents.recipes((event) => {
     const id_prefix = 'enigmatica:base/minecraft/shapeless/';
 
     const recipes = [
-        {
-            output: 'minecraft:crafting_table',
-            inputs: ['#forge:workbench'],
-            id: `${id_prefix}crafting_table`
-        },
         {
             output: '4x minecraft:honeycomb',
             inputs: ['minecraft:honeycomb_block'],

diff --git a/kubejs/server_scripts/base/recipes/minecraft/stonecutting.js b/kubejs/server_scripts/base/recipes/minecraft/stonecutting.js
@@ -28,6 +28,33 @@ ServerEvents.recipes((event) => {
         });
     });
 
+    // Tag conversion
+    conversionTypes = [
+        `#forge:storage_blocks/gunpowder`,
+        `#forge:storage_blocks/rice`,
+        `#forge:storage_blocks/onion`,
+        `#forge:storage_blocks/tomato`,
+        `#forge:storage_blocks/beetroot`,
+        `#forge:storage_blocks/potato`,
+        `#forge:storage_blocks/carrot`,
+        `#forge:storage_blocks/apple`,
+        `#forge:storage_blocks/bamboo`,
+        `#forge:storage_blocks/sugar_cane`
+    ];
+
+    conversionTypes.forEach((tag) => {
+        let ingredient = Ingredient.of(tag);
+
+        ingredient.stacks.forEach((block) => {
+            let output = block.getId();
+            recipes.push({
+                output: output,
+                input: ingredient,
+                id: `${id_prefix}${output.replace(':', '_')}`
+            });
+        });
+    });
+
     recipes.forEach((recipe) => {
         event.stonecutting(recipe.output, recipe.input).id(recipe.id);
     });

diff --git a/kubejs/server_scripts/base/recipes/naturesaura/shaped.js b/kubejs/server_scripts/base/recipes/naturesaura/shaped.js
@@ -1,16 +1 @@
-ServerEvents.recipes((event) => {
-    const id_prefix = 'enigmatica:base/naturesaura/shaped/';
-
-    const recipes = [
-        {
-            output: '6x naturesaura:ancient_slab',
-            pattern: ['AAA'],
-            key: { A: 'naturesaura:ancient_planks' },
-            id: `${id_prefix}ancient_slab`
-        }
-    ];
-
-    recipes.forEach((recipe) => {
-        event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id);
-    });
-});
+// TODO: Remove next breaking update.
diff --git a/kubejs/server_scripts/base/recipes/supplementaries/shaped.js b/kubejs/server_scripts/base/recipes/supplementaries/shaped.js
@@ -0,0 +1,18 @@
+ServerEvents.recipes((event) => {
+    const id_prefix = 'enigmatica:base/supplementaries/shaped/';
+
+    const recipes = [
+        {
+            output: '2x supplementaries:timber_frame',
+            pattern: ['AAA', 'A A', 'AAA'],
+            key: {
+                A: '#forge:rods/wooden'
+            },
+            id: 'supplementaries:timber_frame'
+        }
+    ];
+
+    recipes.forEach((recipe) => {
+        event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id);
+    });
+});
diff --git a/kubejs/server_scripts/base/tags/blocks/forge/storage_blocks.js b/kubejs/server_scripts/base/tags/blocks/forge/storage_blocks.js
@@ -12,7 +12,45 @@ ServerEvents.tags('block', (event) => {
         `powah:spirited_crystal_block`,
         `powah:nitro_crystal_block`,
         `spirit:soul_steel_block`,
-        'ars_nouveau:source_gem_block'
+        'ars_nouveau:source_gem_block',
+
+        'thermal:strawberry_block',
+        'thermal:green_bean_block',
+        'thermal:eggplant_block',
+        'thermal:bell_pepper_block',
+        'thermal:spinach_block',
+        'thermal:sadiroot_block',
+        'thermal:radish_block',
+        'thermal:corn_block',
+        'farmersdelight:cabbage_crate',
+
+        'quark:glowberry_sack',
+        'quark:berry_sack',
+        'quark:nether_wart_sack',
+        'quark:cocoa_beans_sack',
+        'quark:golden_carrot_crate',
+        'quark:golden_apple_crate',
+        'farmersdelight:rice_bag',
+        'thermal:rice_block',
+        'farmersdelight:onion_crate',
+        'thermal:onion_block',
+        'farmersdelight:tomato_crate',
+        'thermal:tomato_block',
+        'farmersdelight:beetroot_crate',
+        'thermal:beetroot_block',
+        'quark:beetroot_crate',
+        'farmersdelight:potato_crate',
+        'thermal:potato_block',
+        'quark:potato_crate',
+        'farmersdelight:carrot_crate',
+        'thermal:carrot_block',
+        'quark:carrot_crate',
+        'quark:apple_crate',
+        'thermal:apple_block',
+        'quark:gunpowder_sack',
+        'thermal:gunpowder_block',
+        'quark:sugar_cane_block',
+        'thermal:sugar_cane_block'
     ]);
     event.add(`forge:storage_blocks/glowstone`, 'minecraft:glowstone');
 
@@ -33,4 +71,38 @@ ServerEvents.tags('block', (event) => {
     event.add(`forge:storage_blocks/subzero`, `byg:subzero_crystal_block`);
 
     event.add(`forge:storage_blocks/source`, 'ars_nouveau:source_gem_block');
+
+    event.get(`forge:storage_blocks/strawberry`).add(['thermal:strawberry_block']);
+    event.get(`forge:storage_blocks/green_bean`).add(['thermal:green_bean_block']);
+    event.get(`forge:storage_blocks/eggplant`).add(['thermal:eggplant_block']);
+    event.get(`forge:storage_blocks/bell_pepper`).add(['thermal:bell_pepper_block']);
+    event.get(`forge:storage_blocks/spinach`).add(['thermal:spinach_block']);
+    event.get(`forge:storage_blocks/sadiroot`).add(['thermal:sadiroot_block']);
+    event.get(`forge:storage_blocks/radish`).add(['thermal:radish_block']);
+    event.get(`forge:storage_blocks/corn`).add(['thermal:corn_block']);
+    event.get(`forge:storage_blocks/cabbage`).add(['farmersdelight:cabbage_crate']);
+
+    event.get(`forge:storage_blocks/glowberry`).add(['quark:glowberry_sack']);
+    event.get(`forge:storage_blocks/sweet_berry`).add(['quark:berry_sack']);
+    event.get(`forge:storage_blocks/netherwart`).add(['quark:nether_wart_sack']);
+
+    event.get(`forge:storage_blocks/cocoa_beans`).add(['quark:cocoa_beans_sack']);
+    event.get(`forge:storage_blocks/golden_carrot`).add(['quark:golden_carrot_crate']);
+    event.get(`forge:storage_blocks/golden_apple`).add(['quark:golden_apple_crate']);
+
+    event.get(`forge:storage_blocks/gunpowder`).add(['quark:gunpowder_sack', 'thermal:gunpowder_block']);
+    event.get(`forge:storage_blocks/rice`).add(['farmersdelight:rice_bag', 'thermal:rice_block']);
+    event.get(`forge:storage_blocks/onion`).add(['farmersdelight:onion_crate', 'thermal:onion_block']);
+    event.get(`forge:storage_blocks/tomato`).add(['farmersdelight:tomato_crate', 'thermal:tomato_block']);
+    event
+        .get(`forge:storage_blocks/beetroot`)
+        .add(['farmersdelight:beetroot_crate', 'thermal:beetroot_block', 'quark:beetroot_crate']);
+    event
+        .get(`forge:storage_blocks/potato`)
+        .add(['farmersdelight:potato_crate', 'thermal:potato_block', 'quark:potato_crate']);
+    event
+        .get(`forge:storage_blocks/carrot`)
+        .add(['farmersdelight:carrot_crate', 'thermal:carrot_block', 'quark:carrot_crate']);
+    event.get(`forge:storage_blocks/apple`).add(['quark:apple_crate', 'thermal:apple_block']);
+    event.get(`forge:storage_blocks/sugar_cane`).add(['quark:sugar_cane_block', 'thermal:sugar_cane_block']);
 });