scrapline

ThePansmith · May 12, 2024 · 88cad28 · 88cad28
1 parent eb0715a
commit 88cad28
Show file tree

Hide file tree

Showing 10 changed files with 258 additions and 149 deletions.
diff --git a/config/ftbquests/quests/chapters/end_game.snbt b/config/ftbquests/quests/chapters/end_game.snbt
diff --git a/config/ftbquests/quests/chapters/genesis.snbt b/config/ftbquests/quests/chapters/genesis.snbt
@@ -328,70 +328,6 @@
 			x: 0.5d
 			y: 2.5d
 		}
-		{
-			dependencies: ["2E8BFA2E719B1C47"]
-			description: [
-				"There are lots of ways to upgrade and improve your Grappling Hook, so play around with it."
-				""
-				"&9Since there is no Curios slot for the Hook, you'll have to keep it in your hotbar to use it.&r"
-			]
-			id: "5B31AB11CC640279"
-			rewards: [{
-				id: "5C2F124669C65506"
-				item: "kubejs:moni_nickel"
-				type: "item"
-			}]
-			subtitle: "A &aGrappling Hook&f is very useful in an urban environment."
-			tasks: [{
-				id: "3C1E57C56F5B5B92"
-				item: {
-					Count: 1b
-					id: "grapplemod:grapplinghook"
-					tag: {
-						Damage: 0
-						custom: {
-							angle: 20.0d
-							attract: 0b
-							attractradius: 3.0d
-							crc32: 2252267022L
-							detachonkeyrelease: 0b
-							doublehook: 0b
-							enderstaff: 0b
-							hookgravity: 1.0d
-							maxlen: 30.0d
-							motor: 0b
-							motoracceleration: 0.2d
-							motordampener: 0b
-							motormaxspeed: 4.0d
-							motorwhencrouching: 0b
-							motorwhennotcrouching: 1b
-							oneropepull: 0b
-							phaserope: 0b
-							playermovementmult: 1.0d
-							pullbackwards: 1b
-							reelin: 1b
-							repel: 0b
-							repelforce: 1.0d
-							rocket: 0b
-							rocket_active_time: 0.5d
-							rocket_force: 1.0d
-							rocket_refuel_ratio: 15.0d
-							rocket_vertical_angle: 0.0d
-							smartdoublemotor: 1b
-							smartmotor: 0b
-							sneakingangle: 10.0d
-							sneakingverticalthrowangle: 0.0d
-							sticky: 0b
-							throwspeed: 2.0d
-							verticalthrowangle: 0.0d
-						}
-					}
-				}
-				type: "item"
-			}]
-			x: -2.5d
-			y: 2.5d
-		}
 		{
 			dependencies: ["58566C7BF4C22D86"]
 			description: [

diff --git a/kubejs/server_scripts/gregtech/greenhouse.js b/kubejs/server_scripts/gregtech/greenhouse.js
@@ -77,9 +77,17 @@ ServerEvents.recipes(event => {
     Greenhouse('flowering_azalea', 'minecraft:flowering_azalea', 1000, ['64x minecraft:oak_log', '4x minecraft:flowering_azalea'], false)
     Greenhouse('flowering_azalea_boosted', 'minecraft:flowering_azalea', 1000, ['64x minecraft:oak_log', '64x minecraft:oak_log', '4x minecraft:flowering_azalea'], true)
 
+    // Cherry
+    Greenhouse('cherry_sapling', 'minecraft:cherry_sapling', 1000, ['64x minecraft:cherry_log', '4x minecraft:cherry_sapling'], false)
+    Greenhouse('cherry_sapling_boosted', 'minecraft:cherry_sapling', 1000, ['64x minecraft:cherry_log', '64x minecraft:cherry_log', '4x minecraft:cherry_sapling'], true)
+
     // Mangrove
     Greenhouse('mangrove_propagule', 'minecraft:mangrove_propagule', 1000, ['64x minecraft:mangrove_log', '4x minecraft:mangrove_propagule'], false)
     Greenhouse('mangrove_propagule_boosted', 'minecraft:mangrove_propagule', 1000, ['64x minecraft:mangrove_log', '64x minecraft:mangrove_log', '4x minecraft:mangrove_propagule'], true)
+
+    // Chorus
+    Greenhouse('chorus', 'minecraft:chorus_flower', 1000, ['32x minecraft:chorus_fruit', '4x minecraft:chorus_flower'], false)
+    Greenhouse('chorus_boosted', 'minecraft:chorus_flower', 1000, ['64x minecraft:chorus_fruit', '4x minecraft:chorus_flower'], true)
 
     ////// Crops //////
 
@@ -134,6 +142,9 @@ ServerEvents.recipes(event => {
     // Brown Mushroom
     Greenhouse('brown_mushroom', 'minecraft:brown_mushroom', 1000, '12x minecraft:brown_mushroom', false)
     Greenhouse('brown_mushroom_boosted', 'minecraft:brown_mushroom', 1000, '24x minecraft:brown_mushroom', true)
+
+
+    // Flowers
 })
 
 ServerEvents.recipes(event => {
@@ -176,4 +187,19 @@ ServerEvents.recipes(event => {
         "energy_mod": 3.0,
         "water_mod": 3.0
     }).id('kubejs:thermal/insolator/rubber_sapling')
+
+    event.custom({
+        type: 'thermal:insolator',
+        "ingredient": {
+            "item": "minecraft:pink_petals",
+        },
+        "result": [
+            {
+                "item": "minecraft:pink_petals",
+                "chance": 2.0
+            }
+        ],
+        "energy_mod": 1.0,
+        "water_mod": 1.0
+    }).id('kubejs:thermal/insolator/pink_petals')
 })
diff --git a/kubejs/server_scripts/gregtech/microverse_recipes.js b/kubejs/server_scripts/gregtech/microverse_recipes.js
@@ -165,11 +165,11 @@ ServerEvents.recipes(event => {
 
 // Advanced Microverse iii
 ServerEvents.recipes(event => {
-    event.recipes.gtceu.advanced_microverse_iii('kubejs:t_test')
-        .itemInputs('minecraft:bedrock')
-        .itemOutputs('minecraft:bedrock')
-        .duration(1500)
-        .EUt(31250)
+    event.recipes.gtceu.advanced_microverse_iii('kubejs:t_eleven_first')
+        .itemInputs('kubejs:microminer_t11', 'kubejs:corrupted_universe_data', 'kubejs:infinity_catalyst') // could be increased 
+        .itemOutputs('64x kubejs:alien_scrap', '64x kubejs:alien_scrap', '64x kubejs:alien_scrap', '64x kubejs:alien_scrap')
+        .duration(400)
+        .EUt(2000000)
 })
 
 // Microversium
@@ -203,6 +203,7 @@ ServerEvents.recipes(event => {
         ['basic_microverse_projector', '#gtceu:circuits/hv'],
         ['advanced_microverse_projector', '#gtceu:circuits/ev'],
         ['advanced_microverse_projector_ii', '#gtceu:circuits/iv'],
+        ['advanced_microverse_projector_iii', '#gtceu:circuits/uev']
     ]
 
     projector.forEach(projector => {

diff --git a/kubejs/server_scripts/gregtech/tank_fabricator.js b/kubejs/server_scripts/gregtech/tank_fabricator.js
@@ -24,4 +24,11 @@ ServerEvents.recipes(event => {
         .CWUt(64)
         .duration(500)
         .EUt(100000)
+
+        event.recipes.gtceu.subatomic_digital_assembly('kubejs:corrupted_data')
+        .itemInputs('kubejs:universe_creation_data')
+        .itemOutputs('kubejs:corrupted_universe_data')
+        .CWUt(64)
+        .duration(200)
+        .EUt(16000)
 })
diff --git a/kubejs/server_scripts/microverse.js b/kubejs/server_scripts/microverse.js
@@ -234,6 +234,29 @@ ServerEvents.recipes(event => {
         }
     )
 
+    // T11 Microminer
+    event.recipes.extendedcrafting.shaped_table(
+        'kubejs:microminer_t11', [
+            '   O M O   ',
+            '   O M O   ',
+            '  OO M OO  ',
+            ' POOMMMOOP ',
+            ' OOOMMMOOO ',
+            'POOMMMMMOOP',
+            'OODMMMMMDOO',
+            'ODSMOOOMSDO',
+            'OSOOW WOOSO',
+            ' OOW   WOO ',
+            ' W       W '
+        ], {
+            O: 'gtceu:double_omnium_plate',
+            M: 'gtceu:double_crystal_matrix_plate',
+            P: 'solarflux:sp_custom_neutronium',
+            W: 'kubejs:warp_engine',
+            D: 'draconicevolution:reactor_core',
+            S: 'draconicevolution:reactor_stabilizer'
+        }
+    )
     //
     // Miner Components
     //

diff --git a/kubejs/server_scripts/scrap.js b/kubejs/server_scripts/scrap.js
@@ -0,0 +1,80 @@
+ServerEvents.recipes(event => {
+
+
+
+
+    // Scrap
+    event.recipes.gtceu.sifter('scrap_sifting')
+        .itemInputs('kubejs:alien_scrap')
+        .chancedOutput('gtceu:stone_dust', 3300, 0)
+        .chancedOutput('gtceu:concrete_dust', 3300, 0)
+        .chancedOutput('gtceu:carbon_dust', 3300, 0)
+        .chancedOutput('kubejs:alien_scrap_emitter', 1000, 0)
+        .chancedOutput('kubejs:alien_scrap_supercap', 1000, 0)
+        .chancedOutput('kubejs:alien_scrap_sensor', 1000, 0)
+        .chancedOutput('kubejs:alien_scrap_emitter', 1000, 0)
+        .duration(400)
+        .EUt(16380)
+
+// Supercap
+// A simple "crush the thing and get the good stuff"
+event.recipes.gtceu.macerator('alien_scrap_supercap_crushing')
+.itemInputs('kubejs:alien_scrap_supercap')
+.itemOutputs('kubejs:crushed_supercap')
+.chancedOutput('gtceu:enriched_naquadah_trinium_europium_duranide_dust', 3300, 0)
+.duration(100)
+.EUt(16380)
+
+event.recipes.gtceu.electromagnetic_separator('alien_scrap_supercap_electro')
+.itemInputs('kubejs:crushed_supercap')
+.itemOutputs('kubejs:magnetic_supercap_dust')
+.chancedOutput('gtceu:carbon_dust', 3300, 850) // Finally, an easy way to get carbon!
+.duration(100)
+.EUt(16380)
+
+event.recipes.gtceu.centrifuge('alien_scrap_supercap_dust_centrifuge')
+.itemInputs('5x kubejs:magnetic_supercap_dust')
+.itemOutputs('gtceu:holmium_dust')
+.chancedOutput('gtceu:iron_dust', 3300, 850)
+.duration(100)
+.EUt(16380)
+
+// Sensor
+// Ion exchange
+event.recipes.gtceu.macerator('alien_scrap_sensor_crushing')
+.itemInputs('kubejs:alien_scrap_sensor')
+.itemOutputs('kubejs:crushed_alien_sensor')
+.chancedOutput('gtceu:neutronium_dust', 3300, 850)
+.duration(600)
+.EUt(16380)
+
+event.recipes.gtceu.thermal_centrifuge('alien_scrap_sensor_centrifuge')
+.itemInputs('kubejs:crushed_alien_sensor')
+.itemOutputs('kubejs:holmium_compound')
+.chancedOutput('gtceu:silver_dust', 3300, 850)
+.duration(600)
+.EUt(16380)
+
+event.recipes.gtceu.autoclave('holmium_compound_autoclave')
+.itemInputs('3x kubejs:holmium_compound')
+.inputFluids('gtceu:polytetrafluoroethylene 100') // Maybe Polystyrene instead?
+.itemOutputs('gtceu:holmium_dust')
+.duration(600)
+.EUt(16380)
+
+
+// Emitter
+// Has Glass containing holmium oxide
+event.recipes.gtceu.macerator('alien_scrap_emitter_crushing')
+.itemInputs('kubejs:alien_scrap_emitter')
+.itemOutputs('kubejs:holmium_oxide_glass_dust')
+.chancedOutput('gtceu:trinium_dust', 3300, 850)
+.duration(400)
+.EUt(16380)
+
+event.recipes.gtceu.centrifuge('holmium_oxide_glass_centro')
+.itemInputs('kubejs:holmium_oxide_glass_dust')
+.itemOutputs('gtceu:holmium_oxide_dust', 'gtceu:glass_dust')
+.duration(400)
+.EUt(16380)
+})
diff --git a/kubejs/startup_scripts/Item_Registry.js b/kubejs/startup_scripts/Item_Registry.js
@@ -295,6 +295,18 @@ StartupEvents.registry('item', event => {
             .textureJson({ layer0: `gtceu:item/computer_monitor_cover` })
             .color(0, color)
     }
+
+    // Alien scrap
+    event.create('corrupted_universe_data')
+    event.create('alien_scrap')
+    event.create('alien_scrap_supercap')
+    event.create('alien_scrap_sensor')
+    event.create('alien_scrap_emitter')
+    event.create('crushed_supercap')
+    event.create('magnetic_supercap_dust')
+    event.create('crushed_alien_sensor')
+    event.create('holmium_compound')
+    event.create('kubejs:holmium_oxide_glass_dust')
 })
 
 ItemEvents.modification(event => {

diff --git a/kubejs/startup_scripts/Missing_Materials.js b/kubejs/startup_scripts/Missing_Materials.js
@@ -9,6 +9,7 @@ const $FluidStorageKeys = Java.loadClass('com.gregtechceu.gtceu.api.fluids.store
 
 GTCEuStartupEvents.registry('gtceu:material', event => {
     GTMaterials.Lutetium.setProperty($PropertyKey.INGOT, new $IngotProperty())
+    GTMaterials.Holmium.setProperty($PropertyKey.INGOT, new $IngotProperty())
 
     GTMaterials.Einsteinium.setProperty($PropertyKey.FLUID, new $FluidProperty())
     GTMaterials.Einsteinium.getProperty($PropertyKey.FLUID).storage.enqueueRegistration($FluidStorageKeys.LIQUID, new GTFluidBuilder())

diff --git a/kubejs/startup_scripts/material_registry/misc.js b/kubejs/startup_scripts/material_registry/misc.js
@@ -144,4 +144,9 @@ GTCEuStartupEvents.registry('gtceu:material', event => {
         .fluid()
         .color(0xbbddbd)
         .iconSet('elemental_reduction_fluid')
+
+        event.create('holmium_oxide')
+        .dust()
+        .color(0xD29092)
+        .components('2x holmium', '3x oxygen')
 })