Merge pull request #4256 from MuteTiefling/develop

Add End Mineral Survey as replacement to previously disabled IE mineral nodes.
EnigmaticaModpacks · Feb 18, 2022 · 9b0c3f2 · 9b0c3f2
2 parents 059173b + 7cbb821
commit 9b0c3f2
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 40 deletions.
diff --git a/...erver_scripts/enigmatica/kubejs/base/loot_tables/enigmatica/amadron_survey_loot_tables.js b/...erver_scripts/enigmatica/kubejs/base/loot_tables/enigmatica/amadron_survey_loot_tables.js
@@ -74,6 +74,33 @@ onEvent('server.datapack.low_priority', (event) => {
                 { amount: [16, 24], weight: 1100, item: 'undergarden:cloggrum_ore' }
             ]
         },
+        {
+            name: 'amadron_mineral_survey_the_end',
+            rolls: [16, 32],
+            entries: [
+                { amount: [16, 24], weight: 100, item: 'emendatusenigmatica:diamond_chunk' },
+                { amount: [16, 24], weight: 500, item: 'emendatusenigmatica:emerald_chunk' },
+                { amount: [16, 24], weight: 50, item: 'emendatusenigmatica:lapis_chunk' },
+                { amount: [16, 24], weight: 50, item: 'emendatusenigmatica:apatite_chunk' },
+                { amount: [16, 24], weight: 50, item: 'emendatusenigmatica:arcane_chunk' },
+                { amount: [16, 24], weight: 500, item: 'emendatusenigmatica:dimensional_chunk' },
+
+                { amount: [16, 24], weight: 500, item: 'emendatusenigmatica:iron_chunk' },
+                { amount: [16, 24], weight: 400, item: 'emendatusenigmatica:aluminum_chunk' },
+                { amount: [16, 24], weight: 250, item: 'emendatusenigmatica:silver_chunk' },
+                { amount: [16, 24], weight: 200, item: 'emendatusenigmatica:nickel_chunk' },
+                { amount: [16, 24], weight: 200, item: 'emendatusenigmatica:tin_chunk' },
+                { amount: [16, 24], weight: 100, item: 'emendatusenigmatica:zinc_chunk' },
+
+                { amount: [16, 24], weight: 1000, item: 'betterendforge:ender_ore' },
+                { amount: [16, 24], weight: 1400, item: 'betterendforge:thallasium_ore' },
+                { amount: [16, 24], weight: 1500, item: 'betterendforge:amber_ore' },
+                { amount: [16, 24], weight: 1100, item: 'betterendforge:smaragdant_crystal' },
+                { amount: [16, 24], weight: 500, item: 'betterendforge:smaragdant_crystal_shard' },
+                { amount: [16, 24], weight: 1100, item: 'betterendforge:aurora_crystal' },
+                { amount: [16, 24], weight: 500, item: 'betterendforge:crystal_shards' }
+            ]
+        },
         {
             name: 'amadron_botanical_survey_nether',
             rolls: [16, 32],
@@ -266,6 +293,15 @@ onEvent('server.datapack.low_priority', (event) => {
                 { table: 'amadron_mineral_survey_undergarden', weight: 1 }
             ]
         },
+        {
+            name: 'amadron_mineral_survey_the_end_combo',
+            type: 'multi_pool',
+            pools: [
+                { table: 'amadron_survey_tool_return', weight: 1 },
+                { table: 'amadron_survey_air_canister_return', weight: 1 },
+                { table: 'amadron_mineral_survey_the_end', weight: 1 }
+            ]
+        },
         {
             name: 'amadron_botanical_survey_nether_combo',
             type: 'multi_pool',

diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/pneumaticcraft/amadron.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/pneumaticcraft/amadron.js
@@ -5,11 +5,7 @@ onEvent('recipes', (event) => {
     const recipes = [
         {
             static: true,
-            input: {
-                type: 'ITEM',
-                id: 'kubejs:amadron_survey_tools',
-                amount: 1
-            },
+            input: { type: 'ITEM', id: 'kubejs:amadron_survey_tools', amount: 1 },
             output: {
                 type: 'ITEM',
                 id: 'pneumaticcraft:reinforced_chest',
@@ -18,20 +14,12 @@ onEvent('recipes', (event) => {
             },
             level: 0,
             maxStock: 5,
-            whitelist: {
-                and: {
-                    dimensions: ['atum:atum']
-                }
-            },
+            whitelist: { and: { dimensions: ['atum:atum'] } },
             id: `${id_prefix}mineral_survey_atum`
         },
         {
             static: true,
-            input: {
-                type: 'ITEM',
-                id: 'kubejs:amadron_survey_tools',
-                amount: 1
-            },
+            input: { type: 'ITEM', id: 'kubejs:amadron_survey_tools', amount: 1 },
             output: {
                 type: 'ITEM',
                 id: 'pneumaticcraft:reinforced_chest',
@@ -40,20 +28,12 @@ onEvent('recipes', (event) => {
             },
             level: 0,
             maxStock: 5,
-            whitelist: {
-                and: {
-                    dimensions: ['undergarden:undergarden']
-                }
-            },
+            whitelist: { and: { dimensions: ['undergarden:undergarden'] } },
             id: `${id_prefix}mineral_survey_undergarden`
         },
         {
             static: true,
-            input: {
-                type: 'ITEM',
-                id: 'kubejs:amadron_survey_tools',
-                amount: 1
-            },
+            input: { type: 'ITEM', id: 'kubejs:amadron_survey_tools', amount: 1 },
             output: {
                 type: 'ITEM',
                 id: 'pneumaticcraft:reinforced_chest',
@@ -62,20 +42,12 @@ onEvent('recipes', (event) => {
             },
             level: 0,
             maxStock: 5,
-            whitelist: {
-                and: {
-                    dimensions: ['minecraft:the_nether']
-                }
-            },
+            whitelist: { and: { dimensions: ['minecraft:the_nether'] } },
             id: `${id_prefix}botanical_survey_nether`
         },
         {
             static: true,
-            input: {
-                type: 'ITEM',
-                id: 'kubejs:amadron_survey_tools',
-                amount: 1
-            },
+            input: { type: 'ITEM', id: 'kubejs:amadron_survey_tools', amount: 1 },
             output: {
                 type: 'ITEM',
                 id: 'pneumaticcraft:reinforced_chest',
@@ -84,12 +56,22 @@ onEvent('recipes', (event) => {
             },
             level: 0,
             maxStock: 5,
-            whitelist: {
-                and: {
-                    dimensions: ['minecraft:the_end']
-                }
-            },
+            whitelist: { and: { dimensions: ['minecraft:the_end'] } },
             id: `${id_prefix}botanical_survey_end`
+        },
+        {
+            static: true,
+            input: { type: 'ITEM', id: 'kubejs:amadron_survey_tools', amount: 1 },
+            output: {
+                type: 'ITEM',
+                id: 'pneumaticcraft:reinforced_chest',
+                amount: 1,
+                nbt: `{display:{Name:'[{"text":"The End Mineral Survey"}]',Lore:['[{"text":"A collection of minerals from the The End.","color":"gold"}]']},BlockEntityTag:{LootTable:"enigmatica:chests/amadron_mineral_survey_the_end_combo"}}`
+            },
+            level: 0,
+            maxStock: 5,
+            whitelist: { and: { dimensions: ['minecraft:the_end'] } },
+            id: `${id_prefix}mineral_survey_the_end`
         }
     ];