Various bits of cleanup (MINOR) (#586)

* Tiny codebase cleanup * Xefyr0 contributor cape * tiny qb touchup * Update data.snbt
ThePansmith · Aug 25, 2024 · 2c64c96 · 2c64c96
1 parent bd29226
commit 2c64c96
Show file tree

Hide file tree

Showing 13 changed files with 86 additions and 199 deletions.
diff --git a/config-overrides/harder/ftbquests/quests/chapters/genesis.snbt b/config-overrides/harder/ftbquests/quests/chapters/genesis.snbt
@@ -1185,7 +1185,7 @@
 			description: [
 				"A &aSoft Mallet&f can be used to temporarily stop a machine from functioning. This is useful when you have two machines running and both are unable to keep going because of a lack of power... let one finish then turn the other one back on with a second hit from the mallet."
 				""
-				"Although you can make it out of &6Wood&r, it is probably better to make it out of &6Rubber&r."
+				"Although you can make it out of &6Wood&r, it is probably better to make it out of &6Rubber&r once you can."
 				""
 				"This quest accepts a &aSoft Mallet&r made from any material."
 			]

diff --git a/config-overrides/hardmode/ftbquests/quests/chapters/genesis.snbt b/config-overrides/hardmode/ftbquests/quests/chapters/genesis.snbt
@@ -1194,7 +1194,7 @@
 			description: [
 				"A &aSoft Mallet&f can be used to temporarily stop a machine from functioning. This is useful when you have two machines running and both are unable to keep going because of a lack of power... let one finish then turn the other one back on with a second hit from the mallet."
 				""
-				"Although you can make it out of &6Wood&r, it is probably better to make it out of &6Rubber&r."
+				"Although you can make it out of &6Wood&r, it is probably better to make it out of &6Rubber&r once you can."
 				""
 				"This quest accepts a &aSoft Mallet&r made from any material."
 			]

diff --git a/config-overrides/normal/ftbquests/quests/chapters/genesis.snbt b/config-overrides/normal/ftbquests/quests/chapters/genesis.snbt
@@ -1021,7 +1021,7 @@
 			y: 7.25d
 		}
 		{
-			dependencies: ["1229234A71CE0A99"]
+			dependencies: ["4FE53F31E68F4C1C"]
 			description: [
 				"Although most &ealloys&f require an &3Alloy Smelter&f, some alloys can be made simply by mixing the correct metal dusts together. "
 				""
@@ -1133,7 +1133,7 @@
 			description: [
 				"A &aSoft Mallet&f can be used to temporarily stop a machine from functioning. This is useful when you have two machines running and both are unable to keep going because of a lack of power... let one finish then turn the other one back on with a second hit from the mallet."
 				""
-				"Although you can make it out of &6Wood&r, it is probably better to make it out of &6Rubber&r."
+				"Although you can make it out of &6Wood&r, it is probably better to make it out of &6Rubber&r once you can."
 				""
 				"This quest accepts a &aSoft Mallet&r made from any material."
 			]

diff --git a/config/ftbquests/quests/chapters/genesis.snbt b/config/ftbquests/quests/chapters/genesis.snbt
@@ -1021,7 +1021,7 @@
 			y: 7.25d
 		}
 		{
-			dependencies: ["1229234A71CE0A99"]
+			dependencies: ["4FE53F31E68F4C1C"]
 			description: [
 				"Although most &ealloys&f require an &3Alloy Smelter&f, some alloys can be made simply by mixing the correct metal dusts together. "
 				""
@@ -1133,7 +1133,7 @@
 			description: [
 				"A &aSoft Mallet&f can be used to temporarily stop a machine from functioning. This is useful when you have two machines running and both are unable to keep going because of a lack of power... let one finish then turn the other one back on with a second hit from the mallet."
 				""
-				"Although you can make it out of &6Wood&r, it is probably better to make it out of &6Rubber&r."
+				"Although you can make it out of &6Wood&r, it is probably better to make it out of &6Rubber&r once you can."
 				""
 				"This quest accepts a &aSoft Mallet&r made from any material."
 			]

diff --git a/config/ftbquests/quests/data.snbt b/config/ftbquests/quests/data.snbt
@@ -13,7 +13,7 @@
 	]
 	emergency_items_cooldown: 300
 	grid_scale: 0.25d
-	icon: "gtceu:kanthal_coil_block"
+	icon: "gtceu:hssg_coil_block"
 	lock_message: ""
 	loot_crate_no_drop: {
 		boss: 0

diff --git a/kubejs/client_scripts/Dev_Capes.js b/kubejs/client_scripts/Dev_Capes.js
@@ -25,4 +25,6 @@ CapeJS.addCapes(event => {
     event.register("13d0aeda-c1e9-4d91-a9b7-4d4e6a19128e", "moni")
         //JuiceyBeans
     event.register("d7dfa467-51b9-4beb-9a40-24ec2c2b8759", "moni")
+        //Xefyr0
+    event.register("a3b08192-f19b-4037-abcd-15093454d905", "moni")
 })
diff --git a/kubejs/server_scripts/Infinity_Toolset.js b/kubejs/server_scripts/Infinity_Toolset.js
@@ -231,7 +231,6 @@ ServerEvents.recipes(event => {
 		}
 	)
 
-
     // Infinity Power Unit
     event.recipes.gtceu.assembly_line('infinity_toolset/infinity_power_unit')
         .itemInputs('kubejs:infinity_catalyst', '32x gtceu:polybenzimidazole_plate', '16x gtceu:darmstadtium_plate', '16x gtceu:enriched_naquadah_trinium_europium_duranide_plate', '16x #gtceu:circuits/uhv', '8x #gtceu:circuits/uev', '16x kubejs:hadal_energy_core', '4x gtceu:max_battery', '8x gtceu:ruthenium_trinium_americium_neutronate_quadruple_wire', '32x gtceu:uev_electric_motor')

diff --git a/kubejs/startup_scripts/Block_Registry.js b/kubejs/startup_scripts/Block_Registry.js
@@ -282,24 +282,4 @@ StartupEvents.registry("block", event => {
         .requiresTool(true)
         .tagBlock("mineable/pickaxe")
         .soundType('metal')
-
-
-    // event.create('debug_ctm_block', 'gtceu:renderer')
-    //     .hardness(5)
-    //     .requiresTool(true)
-    //     .soundType('metal')
-    //     .tagBlock("mineable/pickaxe")
-    //     .textureOverrideRenderer('minecraft:block/cube_all', { 'all': new ResourceLocation('kubejs', 'block/debug/ctm_block') })
-
-});
-
-// StartupEvents.registry('block', event => {
-//     event.create('small_storage_crate')
-//         .property(BlockProperties.CHEST_TYPE)
-//         .resistance(2)
-//         .soundType('oak_plank')
-//         .blockEntity(entityInfo => {
-//             entityInfo.inventory(13, 9)
-//             entityInfo.rightClickOpensInventory()
-//         })
-// })
+});
diff --git a/kubejs/startup_scripts/Item_Registry.js b/kubejs/startup_scripts/Item_Registry.js
@@ -6,14 +6,14 @@ StartupEvents.registry('item', event => {
     event.create('microminer_t2').maxStackSize(16).texture("kubejs:item/microverse/microminer_t2")
     event.create('microminer_t3').maxStackSize(16).texture("kubejs:item/microverse/microminer_t3")
     event.create('microminer_t4').maxStackSize(16).texture("kubejs:item/microverse/microminer_t4")
-    if (!isNormalMode) { 
+    if (!isNormalMode) {
         event.create('microminer_t4half').maxStackSize(16).texture("kubejs:item/microverse/microminer_t4half")
     }
     event.create('microminer_t5').maxStackSize(16).texture("kubejs:item/microverse/microminer_t5")
     event.create('microminer_t6').maxStackSize(16).texture("kubejs:item/microverse/microminer_t6")
     event.create('microminer_t7').maxStackSize(16).texture("kubejs:item/microverse/microminer_t7")
     event.create('microminer_t8').maxStackSize(16).texture("kubejs:item/microverse/microminer_t8")
-    if (!isNormalMode) { 
+    if (!isNormalMode) {
         event.create('microminer_t8half').maxStackSize(16).texture("kubejs:item/microverse/microminer_t8half")
     }
     event.create('microminer_t9').maxStackSize(16).texture("kubejs:item/microverse/microminer_t9")
@@ -46,7 +46,7 @@ StartupEvents.registry('item', event => {
         event.create('stabilized_microminer_t7').maxStackSize(16).texture("kubejs:item/microverse/microminer_t7").glow(true)
         event.create('stabilized_microminer_t8').maxStackSize(16).texture("kubejs:item/microverse/microminer_t8").glow(true)
         event.create('stabilized_microminer_t8half').maxStackSize(16).texture("kubejs:item/microverse/microminer_t8half").glow(true)
-    
+
         for (const [tier, color] of pristine_matter) {
             event.create(`pristine_matter_t${tier}`)
                 .textureJson({ layer0: 'kubejs:item/prediction' })
@@ -92,7 +92,7 @@ StartupEvents.registry('item', event => {
     event.create('moni_quarter')
     event.create('moni_dollar').glow(true)
 
-    //widgets
+    //Widgets
     event.create('wooden_widget').displayName("Wooden Widget")
     event.create('wooden_widget_left').displayName("Wooden Widget Left Part")
     event.create('wooden_widget_right').displayName("Wooden Widget Right Part")
@@ -125,7 +125,6 @@ StartupEvents.registry('item', event => {
     event.create('shattered_star_data').displayName("§dShattered Star Data")
     event.create('shattered_universe_data').displayName("§dShattered Universe Data")
     event.create('corrupted_universe_data').displayName("§dCorrupted Universe Data")
-
 
     // End Game Data
     if (!isNormalMode) {
@@ -204,7 +203,6 @@ StartupEvents.registry('item', event => {
     event.create('dense_hydrogen').displayName("Dense Hydrogen").rarity('Uncommon')
     event.create('ultra_dense_hydrogen').displayName("Ultra Dense Hydrogen").rarity('Rare')
 
-
     //Stabilized Items
     const stabilized_elements = [
         ['einsteinium', '#ffea00'],
@@ -232,7 +230,7 @@ StartupEvents.registry('item', event => {
     event.create('grains_of_innocence').displayName("Grains of Innocence")
     event.create('radium_salt').displayName("Radium Salt").rarity('Epic')
     event.create('moon_dust').displayName("Moon Dust")
-    
+
     //Add Thermal Series items that were missing
     event.create('aerotheum_dust').texture('kubejs:item/aerotheum_blend').displayName('§7Aerotheum Dust')
     event.create('cryotheum_dust').texture('kubejs:item/cryotheum_blend').displayName('§bCryotheum Dust')
@@ -245,28 +243,28 @@ StartupEvents.registry('item', event => {
     event.create('resonant_clathrate').rarity('rare')
 
     if (!isNormalMode) {
-    	event.create('ender_spore')
+        event.create('ender_spore')
     }
-    
+
     //Thermal Augments
     //Very Hacky but whatever
     event.create('kubejs:redstone_transmission_coil')
     event.create('thermal:upgrade_augment_1');
     event.create('thermal:upgrade_augment_2');
     event.create('thermal:upgrade_augment_4');
     event.create('thermal:upgrade_augment_3');
-    
+
     //Jetpack Units
     event.create('empty_fluxed_jetpack_unit').displayName('Empty Fluxed Jetpack Unit')
     event.create('empty_soularium_jetpack_unit').displayName('Empty Soularium Jetpack Unit')
     event.create('flight_control_unit').displayName('Ensouled Flight Control Unit')
     event.create('glowstone_elevation_unit').displayName('Glowstone Elevation Unit')
     event.create('cryotheum_coolant_unit').displayName('Cryotheum Coolant Unit')
-    
+
     //TODO: GIVE CAPACITORS LORE AND NBT FOR THEM TO WORK
     event.create('compressed_octadic_capacitor').displayName("Compressed Octadic Capacitor")
     event.create('double_compressed_octadic_capacitor').displayName("Double Compressed Octadic Capacitor")
-    
+
     //Extra Utilities 2
     event.create('resonating_crystal').displayName("Resonating Redstone Crystal")
     event.create('ender_shard')
@@ -278,8 +276,7 @@ StartupEvents.registry('item', event => {
     event.create('nether_star_west').displayName("Nether Star West Tip")
     event.create('nether_star_center').displayName("Nether Star Center")
 
-    //I hate ArmorPlus
-    //Me too - WithersChat
+    //ArmorPlus
     event.create('guardian_scale').rarity('rare').displayName("Guardian Scale")
     event.create('ender_dragon_scale').rarity('epic').displayName("Ender Dragon Scale")
     event.create('ender_dragon_scale_dust')
@@ -301,7 +298,7 @@ StartupEvents.registry('item', event => {
     event.create('warden_heart')
     event.create('hadal_shard')
 
-    // Netherite processing midproducts
+    // Netherite Processing Midproducts
     event.create('crushed_ancient_debris').texture('kubejs:item/netherite/crushed_ancient_debris')
     event.create('purified_ancient_debris').texture('kubejs:item/netherite/purified_ancient_debris')
     event.create('refined_ancient_debris').texture('kubejs:item/netherite/refined_ancient_debris')
@@ -311,7 +308,7 @@ StartupEvents.registry('item', event => {
     event.create('inert_netherite_scrap').texture('kubejs:item/netherite/inert_netherite_scrap')
     event.create('inert_nether_compound_ingot').texture('kubejs:item/netherite/inert_nether_compound_ingot')
 
-    // Alien scrap
+    // Alien Scrap
     event.create('alien_scrap')
     event.create('ruined_hull')
     event.create('ruined_machine_parts')
@@ -370,22 +367,22 @@ StartupEvents.registry('item', event => {
             .displayName(`${theme.split('_').map(v => capitalize(v)).join(" ")} Circuit Board`)
             .textureJson({ layer0: `kubejs:item/circuits/${theme}_circuit_board` })
     }
-    
+
     Unit('matter'),
-    Circuit('matter', 'processor', "ZPM"),
-    Circuit('matter', 'processor_assembly', "UV"),
-    Circuit('matter', 'processor_computer', "UHV"),
-    Mainframe('matter', "UEV"),
-    Unit('dimensional'),
-    Circuit('dimensional', 'processor', "UV"),
-    Circuit('dimensional', 'processor_assembly', "UHV"),
-    Circuit('dimensional', 'processor_computer', "UEV"),
-    Mainframe('dimensional', "UIV"),
-    Unit('monic'),
-    Circuit('monic', 'processor', "UHV"),
-    Circuit('monic', 'processor_assembly', "UEV"),
-    Circuit('monic', 'processor_computer', "UIV"),
-    Mainframe('monic', "§9MAX")
+        Circuit('matter', 'processor', "ZPM"),
+        Circuit('matter', 'processor_assembly', "UV"),
+        Circuit('matter', 'processor_computer', "UHV"),
+        Mainframe('matter', "UEV"),
+        Unit('dimensional'),
+        Circuit('dimensional', 'processor', "UV"),
+        Circuit('dimensional', 'processor_assembly', "UHV"),
+        Circuit('dimensional', 'processor_computer', "UEV"),
+        Mainframe('dimensional', "UIV"),
+        Unit('monic'),
+        Circuit('monic', 'processor', "UHV"),
+        Circuit('monic', 'processor_assembly', "UEV"),
+        Circuit('monic', 'processor_computer', "UIV"),
+        Mainframe('monic', "§9MAX")
 
     //Smores
     const smoreHunger = [
@@ -397,9 +394,9 @@ StartupEvents.registry('item', event => {
     let effDuration = 300;
 
     for (let i = 0; i <= 6; i++) {
-        event.create(`smore_${2**i}`).food(food => {
-            food.hunger(smoreHunger[i]*2);
-            food.saturation(smoreSaturation[i]/(1+4*smoreHunger[i]) * 2);
+        event.create(`smore_${2 ** i}`).food(food => {
+            food.hunger(smoreHunger[i] * 2);
+            food.saturation(smoreSaturation[i] / (1 + 4 * smoreHunger[i]) * 2);
             food.effect("absorption", effDuration, 1, 1);
             food.effect("speed", effDuration, 1, 1);
             food.effect("haste", effDuration, 1, 1);

diff --git a/kubejs/startup_scripts/Missing_Materials.js b/kubejs/startup_scripts/Missing_Materials.js
@@ -29,45 +29,24 @@ GTCEuStartupEvents.registry('gtceu:material', event => {
     GTMaterials.Iridium.addFlags(GTMaterialFlags.GENERATE_ROTOR)
     GTMaterials.NaquadahEnriched.addFlags(GTMaterialFlags.GENERATE_BOLT_SCREW)
 
-
     addFluid(GTMaterials.Einsteinium, $FluidStorageKeys.LIQUID);
-    // GTMaterials.Einsteinium.getProperty($PropertyKey.FLUID).storage.enqueueRegistration($FluidStorageKeys.LIQUID, new GTFluidBuilder())
-
     GTMaterials.Americium.getProperty($PropertyKey.FLUID).storage.enqueueRegistration($FluidStorageKeys.PLASMA, new GTFluidBuilder())
-
     addFluid(GTMaterials.Berkelium, $FluidStorageKeys.LIQUID);
-    // GTMaterials.Berkelium.getProperty($PropertyKey.FLUID).storage.enqueueRegistration($FluidStorageKeys.LIQUID, new GTFluidBuilder())
-
     addFluid(GTMaterials.Californium, $FluidStorageKeys.LIQUID);
-    // GTMaterials.Californium.getProperty($PropertyKey.FLUID).storage.enqueueRegistration($FluidStorageKeys.LIQUID, new GTFluidBuilder())
-
     addFluid(GTMaterials.Neptunium, $FluidStorageKeys.LIQUID);
-    // GTMaterials.Neptunium.getProperty($PropertyKey.FLUID).storage.enqueueRegistration($FluidStorageKeys.LIQUID, new GTFluidBuilder())
-
     addFluid(GTMaterials.Curium, $FluidStorageKeys.LIQUID);
-    // GTMaterials.Curium.getProperty($PropertyKey.FLUID).storage.enqueueRegistration($FluidStorageKeys.LIQUID, new GTFluidBuilder())
-
     addFluid(GTMaterials.Ruridit, $FluidStorageKeys.LIQUID);
-    // GTMaterials.Ruridit.getProperty($PropertyKey.FLUID).storage.enqueueRegistration($FluidStorageKeys.LIQUID, new GTFluidBuilder())
-
     addFluid(GTMaterials.NetherStar, $FluidStorageKeys.LIQUID);
-    // GTMaterials.NetherStar.getProperty($PropertyKey.FLUID).storage.enqueueRegistration($FluidStorageKeys.LIQUID, new GTFluidBuilder())
-
-	GTMaterials.Graphite.addFlags(GTMaterialFlags.GENERATE_PLATE)
-
-	GTMaterials.MagnesiumDiboride.addFlags(GTMaterialFlags.GENERATE_FINE_WIRE)
 
+    GTMaterials.Graphite.addFlags(GTMaterialFlags.GENERATE_PLATE)
+    GTMaterials.MagnesiumDiboride.addFlags(GTMaterialFlags.GENERATE_FINE_WIRE)
 
     // GTMaterials.Aluminium.getProperty($PropertyKey.BLAST).setProperty($BlastProperty(1700, 'low', 128, 400));
     GTMaterials.Holmium.setProperty($PropertyKey.BLAST, new $BlastProperty(12500, 'highest', 1000000, 1000));
-
-
     //GTMaterials.NetherQuartz.setProperty($PropertyKey.GEM, new $GemProperty())
 
     const missingGears = ['Electrum', 'Lead', 'Silver', 'Nickel', 'Ruby', 'Sapphire', 'Gold', 'Copper', 'Lapis', 'Emerald', 'NetherQuartz']
     missingGears.forEach(missingGears => {
         GTMaterials[missingGears].addFlags(GTMaterialFlags.GENERATE_GEAR)
     })
-
-
 })