kubeJS changes

Frontiers-PackForge · Dec 11, 2024 · 16c2029 · 16c2029
1 parent de22d98
commit 16c2029
Show file tree

Hide file tree

Showing 9 changed files with 82 additions and 67 deletions.
diff --git a/overrides/kubejs/assets/gtceu/lang/en_us.json b/overrides/kubejs/assets/gtceu/lang/en_us.json
@@ -395,7 +395,7 @@
   "material.gtceu.diluted_nitric_acid": "Diluted Nitric Acid",
   "material.gtceu.potassium_fluoride": "Potassium Fluoride",
 
-  "material.gtceu.fused_naquadah_emulsion": "Fused Naquadah Emulsion",
+  "material.gtceu.fused_naquadah_emulsion": "Luminal Fused Naquadah",
   "material.gtceu.raw_naquahine": "Raw Naquahine",
   "material.gtceu.prisma_doped_raw_naquahine": "Prisma Doped Raw naquahine",
   "material.gtceu.inert_naquahine": "Inert Naquahine",
@@ -433,6 +433,7 @@
   "gtceu.fake_meteor_ritual": "Meteor Rituals",
   "block.gtceu.max_meteor_recipe_dummy": "§3Meteor Rituals",
   "block.gtceu.large_lithographic_processor": "§3Large Lithographic Processor",
+  "gtceu.industrial_primitive_blast_furnace": "Industrial Primitive Blast Furnace",
 
   "gtceu:cyanex_272": "Cyanex-272",
   "gtceu:tert_butanol": "Tert-butanol",

diff --git a/overrides/kubejs/server_scripts/ItemEvents/Ultimine.js b/overrides/kubejs/server_scripts/ItemEvents/Ultimine.js
diff --git a/overrides/kubejs/server_scripts/Ores/End_veins.js b/overrides/kubejs/server_scripts/Ores/End_veins.js
@@ -22,49 +22,6 @@ GTCEuServerEvents.oreVeins(event => {
     // )
 
 
-
-
-    event.add('kubejs:end_tungsten', vein => vein
-        .weight(30).clusterSize(35).density(0.2)
-        .layer('endstone')
-        .heightRangeUniform(15, 80)
-        .layeredVeinGenerator(generator => generator
-            .buildLayerPattern(pattern => pattern
-                .layer(l => l.weight(3).mat(GTMaterials.get('wolframite')).size(3, 4))
-                .layer(l => l.weight(2).mat(GTMaterials.get('scheelite')).size(2, 3))
-                .layer(l => l.weight(1).mat(GTMaterials.get('tungstate')).size(3, 3))
-                .layer(l => l.weight(1).mat(GTMaterials.get('lithium')).size(2, 3))
-            )
-        )
-        .surfaceIndicatorGenerator(indicator => indicator
-            .surfaceRock(GTMaterials.Lithium)
-            .density(0.2)
-            .radius(4)
-        )
-    )
-    event.add('kubejs:end_pitchblend', vein => vein
-        .weight(50).clusterSize(60).density(0.5)
-        .layer('endstone')
-        .heightRangeUniform(15, 80)
-        .veinedVeinGenerator(generator => generator
-            .oreBlock(GTMaterials.Pitchblende, 4) 
-            .oreBlock(GTMaterials.Pitchblende, 4) 
-            .oreBlock(GTMaterials.Cobaltite, 2) 
-            .rareBlock(GTMaterials.Uraninite, 2)
-            .rareBlockChance(0.45)
-            .veininessThreshold(0.1)
-            .maxRichnessThreshold(0.7)
-            .minRichness(0.7)
-            .maxRichness(0.85)
-            .edgeRoundoffBegin(5) 
-            .maxEdgeRoundoff(0.2)
-        )
-        .surfaceIndicatorGenerator(indicator => indicator
-            .surfaceRock(GTMaterials.Lithium)
-            .density(0.2)
-            .radius(4)
-        )
-    )
 })
 
 

diff --git a/overrides/kubejs/server_scripts/Ores/Moon_veins.js b/overrides/kubejs/server_scripts/Ores/Moon_veins.js
@@ -70,6 +70,47 @@ GTCEuServerEvents.oreVeins(event => {
             .radius(4)
         )
     )
+    event.add('kubejs:end_tungsten', vein => vein
+        .weight(30).clusterSize(35).density(0.2)
+        .layer('moon_stone')
+        .heightRangeUniform(15, 80)
+        .layeredVeinGenerator(generator => generator
+            .buildLayerPattern(pattern => pattern
+                .layer(l => l.weight(3).mat(GTMaterials.get('wolframite')).size(3, 4))
+                .layer(l => l.weight(2).mat(GTMaterials.get('scheelite')).size(2, 3))
+                .layer(l => l.weight(1).mat(GTMaterials.get('tungstate')).size(3, 3))
+                .layer(l => l.weight(1).mat(GTMaterials.get('lithium')).size(2, 3))
+            )
+        )
+        .surfaceIndicatorGenerator(indicator => indicator
+            .surfaceRock(GTMaterials.Lithium)
+            .density(0.2)
+            .radius(4)
+        )
+    )
+    event.add('kubejs:end_pitchblend', vein => vein
+        .weight(50).clusterSize(60).density(0.5)
+        .layer('moon_stone')
+        .heightRangeUniform(15, 80)
+        .veinedVeinGenerator(generator => generator
+            .oreBlock(GTMaterials.Pitchblende, 4) 
+            .oreBlock(GTMaterials.Pitchblende, 4) 
+            .oreBlock(GTMaterials.Cobaltite, 2) 
+            .rareBlock(GTMaterials.Uraninite, 2)
+            .rareBlockChance(0.45)
+            .veininessThreshold(0.1)
+            .maxRichnessThreshold(0.7)
+            .minRichness(0.7)
+            .maxRichness(0.85)
+            .edgeRoundoffBegin(5) 
+            .maxEdgeRoundoff(0.2)
+        )
+        .surfaceIndicatorGenerator(indicator => indicator
+            .surfaceRock(GTMaterials.Lithium)
+            .density(0.2)
+            .radius(4)
+        )
+    )
 })
 GTCEuServerEvents.bedrockOreVeins(event => {
     event.add("kubejs:deep_luminite",  vein => {

diff --git a/overrides/kubejs/server_scripts/Ores/Ore_Removals.js b/overrides/kubejs/server_scripts/Ores/Ore_Removals.js
@@ -2,7 +2,7 @@ GTCEuServerEvents.oreVeins(event => {
 
     event.remove("gtceu:naquadah_vein")
     event.remove("gtceu:magnetite_vein_end")
-    // event.remove("gtceu:scheelite_vein")
+    event.remove("gtceu:scheelite_vein")
     event.remove("gtceu:bauxite_vein_end")
     event.remove("gtceu:sheldonite_vein")
     event.remove("gtceu:monazite_vein")

diff --git a/overrides/kubejs/server_scripts/Recipes/Gregtech/Gregtech.js b/overrides/kubejs/server_scripts/Recipes/Gregtech/Gregtech.js
@@ -13,6 +13,8 @@ let yeet = (itemName) => {
 ServerEvents.tags('item', event => {
   event.add('forge:lenses/ruby', 'gtceu:redstone_lens')
   event.add('forge:lenses/red', 'gtceu:redstone_lens')
+  event.add('c:hidden_from_recipe_viewers', 'gtceu:lp_steam_bender')
+  event.add('c:hidden_from_recipe_viewers', 'gtceu:lp_steam_wiremill')
   event.remove('minecraft:planks', 'gtceu:treated_wood_planks')
 })
 

diff --git a/overrides/kubejs/server_scripts/Recipes/Gregtech/GregtechWoodOverhaul.js b/overrides/kubejs/server_scripts/Recipes/Gregtech/GregtechWoodOverhaul.js
@@ -78,8 +78,8 @@ ServerEvents.recipes(event => {
         //GTCEU
         'rubber', //index 23
         //architect pallets
-        'twisted', //index 25
-        //BiomesWeve Gone Index 26-49
+        'twisted', //index 24
+        //BiomesWeve Gone Index 25-49
         'aspen',
         'baobab',
         'blue_enchanted',
@@ -103,7 +103,9 @@ ServerEvents.recipes(event => {
         'white_mangrove',
         'willow',
         'witch_hazel',
-        'zelkova'
+        'zelkova',
+        //Index 49 Botania
+        'livingwood'
 
     ]
     let mcWood = [
@@ -316,8 +318,10 @@ ServerEvents.recipes(event => {
             modID = 'gtceu'
         } else if (index === 24) {
             modID = 'architects_palette'
-        } else if (index >= 25) {
+        } else if (index >= 25 && index <= 48 ) {
             modID = 'biomeswevegone'
+        } else if ( index === 49 ) {
+            modID = 'botania'
         }
 
         if (Item.exists(`${modID}:${woodType}_log`)) {
@@ -614,6 +618,7 @@ ServerEvents.recipes(event => {
         if (Item.exists(`${modID}:${woodType}_boat`)) {
             event.recipes.gtceu.assembler(`${modID}:${woodType}_planks`)
                 .itemInputs(`5x ${modID}:${woodType}_planks`)
+                .circuit(15)
                 .itemOutputs(`4x ${modID}:${woodType}_boat`)
                 .duration(100)
                 .EUt(4);

diff --git a/overrides/kubejs/server_scripts/Recipes/Occultism.js b/overrides/kubejs/server_scripts/Recipes/Occultism.js
@@ -50,15 +50,14 @@ ServerEvents.tags('item', event => {
   event.remove('forge:dusts/silver', 'occultism:silver_dust')
   event.remove('forge:dusts/obsidian', 'occultism:obsidian_dust')
   event.remove('forge:dusts/end_stone', 'occultism:crushed_end_stone')
-  event.remove('forge:raw_materials/iesnium', 'gtceu:raw_iesnium')
-  event.add('c:hidden_from_recipe_viewers', 'gtceu:raw_iesnium')
 })
 
 ServerEvents.recipes(event => {
   event.remove({ type: 'occultism:crushing' })
   event.remove({ type: 'occultism:miner' })
   event.remove({ id: 'occultism:spirit_fire/spirit_attuned_gem' })
   event.remove({ id: 'occultism:crafting/chalk_red_impure' })
+  event.remove({ id: 'occultism:crafting/chalk_purple_impure' })
   // event.recipes.occultism.spirit_trade('minecraft:rotten_flesh', 'minecraft:bone')
   event.recipes.occultism.spirit_fire('occultism:spirit_attuned_gem', 'gtceu:certus_quartz_gem')
   // event.recipes.occultism.crushing(
@@ -100,7 +99,7 @@ ServerEvents.recipes(event => {
     ' S '
   ], {
     P: 'gtceu:iesnium_plate',
-    I: 'gtceu:iesnium_ingot',
+    I: 'occultism:iesnium_ingot',
     S: '#forge:rods/wooden',
     F: '#forge:tools/files',
     H: '#forge:tools/hammers'
@@ -148,20 +147,20 @@ ServerEvents.recipes(event => {
   // event.remove({ id: '' })
 
 
-  event.recipes.gtceu.primitive_blast_furnace('chalk_purify')
-    .itemInputs('occultism:chalk_white_impure')
-    .itemOutputs('occultism:chalk_white')
-    .duration(3000)
-  event.recipes.gtceu.primitive_blast_furnace('chalk_bake_red')
-    .itemInputs(['occultism:chalk_white_impure', '3x gtceu:raw_pyrope', '3x occultism:afrit_essence'])
-    .itemOutputs('occultism:chalk_red_impure')
-    .duration(1500)
+  // event.recipes.gtceu.primitive_blast_furnace('chalk_purify')
+  //   .itemInputs('occultism:chalk_white_impure', '#minecraft:coals')
+  //   .itemOutputs('occultism:chalk_white')
+  //   .duration(3000)
+  // event.recipes.gtceu.primitive_blast_furnace('chalk_bake_red')
+  //   .itemInputs(['occultism:chalk_white_impure', '3x gtceu:raw_pyrope', '3x occultism:afrit_essence'])
+  //   .itemOutputs('occultism:chalk_red_impure')
+  //   .duration(1500)
   event.remove({ id: 'occultism:crafting/chalk_gold_impure' })
-  event.recipes.gtceu.primitive_blast_furnace('yellow_chalk_melding')
-    .itemInputs(['occultism:chalk_white_impure', 'gtceu:ancient_debris_dust', '2x gtceu:gold_sulfide_amalgam_dust'])
-    .itemOutputs('occultism:chalk_gold_impure')
-    .duration(800)
-    //IPBF VERSIONS
+  // event.recipes.gtceu.primitive_blast_furnace('yellow_chalk_melding')
+  //   .itemInputs(['occultism:chalk_white_impure', 'gtceu:ancient_debris_dust', '2x gtceu:gold_sulfide_amalgam_dust'])
+  //   .itemOutputs('occultism:chalk_gold_impure')
+  //   .duration(800)
+  //IPBF VERSIONS
   event.recipes.gtceu.industrial_primitive_blast_furnace('chalk_purify_ipbf')
     .itemInputs('occultism:chalk_white_impure')
     .inputFluids('gtceu:creosote 1000')
@@ -177,6 +176,11 @@ ServerEvents.recipes(event => {
     .inputFluids('gtceu:creosote 1000')
     .itemOutputs('occultism:chalk_gold_impure')
     .duration(800)
+  event.recipes.gtceu.industrial_primitive_blast_furnace('purple_chalk_melding_ipbf')
+    .itemInputs(['occultism:chalk_white_impure', '8x gtceu:soulresin_ingot', '4x gtceu:cinderwax_ingot'])
+    .inputFluids('gtceu:creosote 1000')
+    .itemOutputs('occultism:chalk_purple_impure')
+    .duration(800)
   event.recipes.occultism.miner(
     Item.of('cosmiccore:rune_slate_arklys').withChance(50),
     'occultism:miner_foliot_unspecialized'

diff --git a/overrides/kubejs/startup_scripts/Materials/OccultismMaterials.js b/overrides/kubejs/startup_scripts/Materials/OccultismMaterials.js
@@ -13,7 +13,6 @@ GTCEuStartupEvents.registry('gtceu:material', event => {
             GTMaterialFlags.GENERATE_SPRING,
             GTMaterialFlags.GENERATE_SPRING_SMALL,
             GTMaterialFlags.GENERATE_FOIL,
-            GTMaterialFlags.NO_SMELTING,
             GTMaterialFlags.GENERATE_FRAME,
             GTMaterialFlags.GENERATE_FINE_WIRE
         )