Sculk Charger Textures, various tweaks (#435)

* Sculk doesnt really fit in wetware

* Added catalysts to mesol core to offset above

* updated lang

* textures for sculk charger

* discharger shape

config/ftbquests/quests/chapters/end_game.snbt

@@ -878,6 +878,7 @@
 			y: -18.0d
 		}
 		{
+			dependencies: ["49C8716030809478"]
 			description: ["An amalgamation of gems, all of them combined will be needed for the final circuit tier."]
 			hide_dependency_lines: true
 			id: "2343B68110805282"
@@ -1013,7 +1014,7 @@
 			subtitle: "Gee that's a lot of Infinity Ingots"
 			tasks: [{
 				id: "0BB7A824F7B03BDC"
-				item: "kubejs:fury_enhanced_infinity_catalyst"
+				item: "kubejs:furious_infinity_catalyst"
 				type: "item"
 			}]
 			x: 35.0d
@@ -1026,9 +1027,10 @@
 			subtitle: "Spend Monium to make Monium"
 			tasks: [{
 				id: "2A554D0488C990D6"
-				item: "kubejs:serenity_enhanced_infinity_catalyst"
+				item: "kubejs:serene_infinity_catalyst"
 				type: "item"
 			}]
+			title: "&9Serene Infinity Catalyst"
 			x: 55.0d
 			y: -26.5d
 		}

config/ftbquests/quests/chapters/genesis.snbt

@@ -259,7 +259,7 @@
 		}
 		{
 			dependencies: ["66FCC26399376B55"]
-			description: ["&9Still very barebone at the moment. Currently shows which multiblocks can be made at what tier. How machines function, ore generation, tools, multiblocks, filters and finally covers.&r"]
+			description: ["&9Can be used to autobuild multiblocks&r."]
 			disable_toast: true
 			icon: "gtceu:terminal"
 			id: "07DC7FC23332B847"
@@ -274,6 +274,7 @@
 				title: "Terminal"
 				type: "checkmark"
 			}]
+			title: "&9Terminal"
 			x: 1.75d
 			y: 0.5d
 		}
@@ -396,26 +397,33 @@
 				""
 				"Later on, you also gain access to &9LaserIO&r, which trades some speed in exchange for allowing rather complex and compact filtering."
 			]
-			icon: "enderio:pressurized_fluid_conduit"
 			id: "64AAF0CD958D836A"
 			rewards: [{
 				count: 2
 				id: "56EDDA9AEA7F1EBA"
 				item: "ulvcovm:ulv_electric_pump"
 				type: "item"
 			}]
-			tasks: [
-				{
-					id: "150F57D9BEE7CCEE"
-					item: "enderio:pressurized_fluid_conduit"
-					type: "item"
-				}
-				{
-					id: "277C38246AE179F6"
-					item: "gtceu:potin_normal_fluid_pipe"
-					type: "item"
+			tasks: [{
+				id: "150F57D9BEE7CCEE"
+				item: {
+					Count: 1b
+					id: "itemfilters:or"
+					tag: {
+						items: [
+							{
+								Count: 1b
+								id: "enderio:pressurized_fluid_conduit"
+							}
+							{
+								Count: 1b
+								id: "gtceu:steel_normal_fluid_pipe"
+							}
+						]
+					}
 				}
-			]
+				type: "item"
+			}]
 			title: "&9Fluid Transport"
 			x: -4.0d
 			y: 3.5d

config/ftbquests/quests/chapters/late_game.snbt

@@ -839,7 +839,7 @@
 			description: [
 				"The most advanced substrate available, prepared for bleeding-edge bioengineering technology."
 				""
-				"&6Wetware Circuit Boards&r are the basis of &6Wetware&r circuits, the final theme that spans tiers six through nine."
+				"&6Wetware Circuit Boards&r are the basis of &6Wetware&r circuits."
 			]
 			icon: "gtceu:wetware_printed_circuit_board"
 			id: "4AC51394FB5152E5"
@@ -1002,6 +1002,8 @@
 				""
 				"&6Enderium&r doesn't require much power (running on as little as MV) but it does need a lot of heat and is incredibly slow without overclocking. &2You can use small amounts of Krypton from Liquid Ender Air distillation to significantly decrease the smelting time.&r"
 				""
+				"&9Enderium also requires Tantalum, which can be renewably created by macerating and processing dragon scales."
+				""
 				"As with all later blast furnace materials, dedicate a furnace to keeping these in stock and have it running constantly to ensure a stable supply (turning it off when you have an acceptably vast stockpile)."
 				""
 				"In addition to its other uses, Enderium gets you access to &aResonant Integral Components&r for machines. These quests can be found on the &eProgression&r tab."
@@ -1806,7 +1808,11 @@
 		}
 		{
 			dependencies: ["22144A6785524FDF"]
-			description: ["The multiblock uses energy cores to release extremely large amounts of energy at once to craft things. While the batteries themselves are lost, you are able to recover some of the spent energy."]
+			description: [
+				"The multiblock uses energy cores to &erelease extremely large amounts of energy at once&r to craft things. While the batteries themselves are lost, you are able to recover some of the spent energy. "
+				""
+				"&5...once energy voiding is implmented in gtm."
+			]
 			icon: "gtceu:discharger"
 			id: "713FAECEE5046121"
 			rewards: [{

kubejs/assets/extendedcrafting/textures/block/auto_flux_crafter_side.png.mcmeta

@@ -0,0 +1,6 @@
+{
+	"animation": { 
+		"frametime": 20,
+		"interpolate": true
+	}
+}

kubejs/assets/extendedcrafting/textures/block/flux_crafter_side.png.mcmeta

@@ -0,0 +1,6 @@
+{
+	"animation": { 
+		"frametime": 20,
+		"interpolate": true
+	}
+}

kubejs/assets/gtceu/lang/en_us.json

@@ -42,7 +42,7 @@
   "gtceu.basic_microverse": "Basic Microverse Projector",
   "gtceu.advanced_microverse": "Advanced Microverse Projector",
   "gtceu.advanced_microverse_ii": "Advanced Microverse Projector II",
-  "gtceu.advanced_microverse_iii": "Advanced Microverse Projector III",
+  "gtceu.advanced_microverse_iii": "Hyperbolic Microverse Projector",
   "gtceu.naquadah_reactor_i": "Naquadah Reactor I",
   "gtceu.naquadah_reactor_ii": "Naquadah Reactor II",
   "block.gtceu.lv_atomic_reconstructor": "§7Basic Atomic Reconstructor",

kubejs/server_scripts/End_Game.js

@@ -143,7 +143,7 @@ ServerEvents.recipes(event => {
     event.remove({ id: 'gtceu:chemical_reactor/stem_cells' })
     event.remove({ id: 'gtceu:large_chemical_reactor/stem_cells' })
     event.recipes.gtceu.chemical_reactor("kubejs_stem_cells")
-        .itemInputs('minecraft:dragon_egg', '4x minecraft:sculk_catalyst')
+        .itemInputs('minecraft:dragon_egg')
         .inputFluids('gtceu:sterilized_growth_medium 500', 'gtceu:bacteria 500')
         .itemOutputs('64x gtceu:stem_cells', '64x gtceu:stem_cells')
         .outputFluids('gtceu:bacterial_sludge 500')
@@ -409,30 +409,6 @@ ServerEvents.recipes(event => {
         }
     )
 
-    // Creative Efficiency Upgrade
-    event.recipes.extendedcrafting.shaped_table(
-        'thermal:machine_efficiency_creative_augment', [
-            "UPPCGCPPU",
-            'PPCGSGCPP',
-            'PCGSRSGCP',
-            'CGSRORSGC',
-            'GSROIORSG',
-            'CGSRORSGC',
-            'PCGSRSGCP',
-            'PPCGSGCPP',
-            "UPPCGCPPU",
-        ], {
-            U: 'gtceu:max_battery',
-            P: 'thermal:upgrade_augment_3',
-            C: 'thermal:upgrade_augment_4',
-            G: 'thermal:upgrade_augment_2',
-            S: 'thermal:machine_speed_augment',
-            R: 'thermal:machine_speed_augment',
-            O: 'thermal:machine_efficiency_augment',
-            I: 'kubejs:infinity_catalyst'
-        }
-    )
-
     // Creative Chest
 	event.recipes.extendedcrafting.shaped_table(
 		'gtceu:max_machine_casing', [
@@ -546,27 +522,4 @@ ServerEvents.recipes(event => {
                 Z: 'kubejs:infinity_wire_cutter'          
             }
     )}
-
-
-
-    // Creative Catalyst augment
-    event.recipes.extendedcrafting.shaped_table(
-        'thermal:machine_catalyst_creative_augment', [
-            'TTTTTTTTT',
-            'TNNIIINNT',
-            'TNINNNINT',
-            'TNINCIIIT',
-            'TNICRCINT',
-            'TIIICNINT',
-            'TNINNNINT',
-            'TNNIIINNT',
-            'TTTTTTTTT'
-        ], {
-            I: 'gtceu:infinity_plate',
-            R: 'kubejs:infinity_catalyst',
-            N: 'gtceu:neutronium_plate',
-            T: 'gtceu:titanium_plate',
-            C: 'thermal:machine_catalyst_augment'
-        }
-    )
 })

kubejs/server_scripts/energy_cores.js

@@ -32,7 +32,7 @@ ServerEvents.recipes(event => {
     ], {
         A: "gtceu:cryolobus_ingot",
         B: "gtceu:tungsten_carbide_ingot",
-        C: "gtceu:palis_empowered_gem"
+        C: "minecraft:sculk_catalyst"
         }, 200000000).powerRate(200000000);
 
         event.recipes.gtceu.assembler("kubejs:mesol_energy_core")
@@ -50,14 +50,14 @@ ServerEvents.recipes(event => {
         .EUt(32)
 
         event.recipes.gtceu.assembler("kubejs:abyssal_energy_core")
-        .itemInputs("4x kubejs:bathyal_energy_core", "4x gtceu:restonia_empowered_gem", 'gtceu:cryococcus_ingot', 'kubejs:stabilized_einsteinium')
+        .itemInputs("4x kubejs:bathyal_energy_core", "4x gtceu:restonia_empowered_gem", 'gtceu:cryococcus_plate', 'kubejs:stabilized_einsteinium')
         .inputFluids('enderio:xp_juice 1000')
         .itemOutputs("kubejs:abyssal_energy_core")
         .duration(100)
         .EUt(32)
 
         event.recipes.gtceu.assembler("kubejs:hadal_energy_core")
-        .itemInputs("5x kubejs:abyssal_energy_core", "gtceu:void_empowered_block", 'kubejs:hadal_shard', '2x gtceu:omnium_plate', '2x gtceu:neutronium_ingot')
+        .itemInputs("5x kubejs:abyssal_energy_core", 'kubejs:hadal_shard', "gtceu:void_empowered_block", '2x gtceu:omnium_plate', '2x gtceu:neutronium_plate')
         .inputFluids('enderio:xp_juice 1000')
         .itemOutputs("kubejs:hadal_energy_core")
         .duration(100)

kubejs/server_scripts/gregtech/circuits.js

@@ -128,27 +128,9 @@ ServerEvents.recipes(event => {
         .EUt(9600)
 
     // Wetware tweaks
-
-    event.remove({output: 'gtceu:wetware_printed_circuit_board'})
-    event.recipes.gtceu.large_chemical_reactor('wetware_printed_board_iron3')
-        .itemInputs('gtceu:wetware_circuit_board', '32x minecraft:sculk_vein', '4x gtceu:stem_cells')
-        .inputFluids('gtceu:iron_iii_chloride 5000', 'enderio:xp_juice 4000', 'gtceu:sterilized_growth_medium 100')
-        .itemOutputs('gtceu:wetware_printed_circuit_board')
-        .cleanroom(CleanroomType.CLEANROOM)
-        .duration(1800)
-        .EUt(480)
-
-    event.recipes.gtceu.large_chemical_reactor('wetware_printed_board_persulfate')
-        .itemInputs('gtceu:wetware_circuit_board', '32x minecraft:sculk_vein', '4x gtceu:stem_cells')
-        .inputFluids('gtceu:sodium_persulfate 10000', 'enderio:xp_juice 8000', 'gtceu:sterilized_growth_medium 100')
-        .itemOutputs('gtceu:wetware_printed_circuit_board')
-        .cleanroom(CleanroomType.CLEANROOM)
-        .duration(1800)
-        .EUt(480)
-
     event.remove({output: 'gtceu:neuro_processing_unit'})
     event.recipes.gtceu.circuit_assembler('neuro_processing_unit')
-        .itemInputs('gtceu:wetware_printed_circuit_board', '4x gtceu:stem_cells', '8x gtceu:polybenzimidazole_small_fluid_pipe', '4x gtceu:cryolobus_plate', '16x gtceu:silicone_rubber_foil', '8x gtceu:hsse_bolt')
+        .itemInputs('gtceu:wetware_printed_circuit_board', '4x gtceu:stem_cells', '8x gtceu:polybenzimidazole_small_fluid_pipe', '4x gtceu:enderium_plate', '16x gtceu:silicone_rubber_foil', '8x gtceu:hsse_bolt')
         .inputFluids('gtceu:sterilized_growth_medium 100')
         .itemOutputs('gtceu:neuro_processing_unit')
         .duration(600)

kubejs/server_scripts/gregtech/discharger.js

@@ -35,7 +35,7 @@ ServerEvents.recipes(event => {
             .itemInputs(input)
             .itemOutputs(output)
             .duration(10) //wip
-            .EUt(-(refund / 4))
+            // .EUt(-(refund / 4)) Enable once that gets fixed.
     }
 
     Discharge('hadal_solar', '2x solarflux:sp_custom_hadal', ['kubejs:hadal_energy_core', '2x solarflux:sp_custom_abyssal', '2x kubejs:abyssal_energy_core'], 1000000)

kubejs/startup_scripts/Multiblock_Registry.js

@@ -748,19 +748,19 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
         .recipeTypes('discharger')
         .appearanceBlock(() => Block.getBlock('kubejs:cryolobus_casing'))
         .pattern(definition => FactoryBlockPattern.start()
-        .aisle("CCCCC", "     ", "     ", "     ", "CCCCC")
-        .aisle("CCCCC", " HHH ", " HHH ", " HHH ", "CCCCC")
-        .aisle("CCCCC", " HAH ", " HAH ", " HAH ", "CCCCC")
-        .aisle("CCCCC", " HHH ", " HHH ", " HHH ", "CCCCC")
-        .aisle("CCYCC", "     ", "     ", "     ", "CCCCC")
+        .aisle(" CCC ", " CCC ", " CCC ", " CCC ", " CCC ")
+        .aisle("CCCCC", "C   C", "C   C", "C   C", "CCCCC")
+        .aisle("CCCCC", "C   C", "C   C", "C   C", "CCCCC")
+        .aisle("CCCCC", "C   C", "C   C", "C   C", "CCCCC")
+        .aisle("CCCCC", "C   C", "C   C", "C   C", "CCCCC")
+        .aisle("CCCCC", "C   C", "C   C", "C   C", "CCCCC")
+        .aisle("CCCCC", "C   C", "C   C", "CCCCC", "     ")
+        .aisle(" CCC ", " CYC ", " CCC ", "     ", "     ")
             .where('Y', Predicates.controller(Predicates.blocks(definition.get())))
-            .where('H', Predicates.blocks("kubejs:cryolobus_casing"))
-            .where('C', Predicates.blocks("kubejs:cryolobus_casing")
+            .where('C', Predicates.blocks("kubejs:cryolobus_casing").setMinGlobalLimited(109)
             .or(Predicates.autoAbilities(definition.getRecipeTypes()))
-            .or(Predicates.abilities(PartAbility.MAINTENANCE)))
-            .where('A', Predicates.any())
+            .or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1)))
             .where(' ', Predicates.any())
-            .where('#', Predicates.any())
             .build())
         .workableCasingRenderer("kubejs:block/cryolobus/cryolobus_casing",
             "gtceu:block/multiblock/implosion_compressor", false)