From 75f83e69a3e118ccdb0f99e4fc0bf9d3866edd47 Mon Sep 17 00:00:00 2001 From: Xefyr0 Date: Sun, 2 Feb 2025 01:12:20 -0500 Subject: [PATCH 1/4] Replace first half of Nethline with standardized ore processing --- kubejs/assets/gtceu/lang/en_us.json | 1 + kubejs/assets/kubejs/lang/de.json | 4 -- kubejs/assets/kubejs/lang/en_us.json | 4 -- kubejs/assets/kubejs/lang/es.json | 4 -- kubejs/assets/kubejs/lang/fr.json | 4 -- kubejs/assets/kubejs/lang/ja_jp.json | 4 -- kubejs/assets/kubejs/lang/pt_br.json | 4 -- kubejs/assets/kubejs/lang/ru_ru.json | 4 -- kubejs/assets/kubejs/lang/zh_cn.json | 4 -- .../item/netherite/crushed_ancient_debris.png | Bin 4067 -> 0 bytes .../netherite/impure_ancient_debris_dust.png | Bin 3985 -> 0 bytes .../netherite/purified_ancient_debris.png | Bin 3936 -> 0 bytes .../item/netherite/refined_ancient_debris.png | Bin 1048 -> 0 bytes .../server_scripts/gregtech/Alloys_Recipes.js | 1 + kubejs/server_scripts/gregtech/netherite.js | 61 +++++++----------- .../gregtech_material_registry/endgame.js | 6 ++ .../gregtech_material_registry/misc.js | 14 ++++ .../startup_scripts/registry/item_registry.js | 6 +- 18 files changed, 46 insertions(+), 75 deletions(-) delete mode 100644 kubejs/assets/kubejs/textures/item/netherite/crushed_ancient_debris.png delete mode 100644 kubejs/assets/kubejs/textures/item/netherite/impure_ancient_debris_dust.png delete mode 100644 kubejs/assets/kubejs/textures/item/netherite/purified_ancient_debris.png delete mode 100644 kubejs/assets/kubejs/textures/item/netherite/refined_ancient_debris.png diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index d7a8eeb65..69f8a4a7b 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -195,6 +195,7 @@ "__POST_TANK_MATERIALS__.footer": "=======================", "material.gtceu.infinity": "Infinity", "material.gtceu.monium": "Monium", + "material.gtceu.netherite_scrap": "Ancient Debris", "material.gtceu.activated_netherite": "Activated Netherite", "material.gtceu.omnic_acid": "Omnic Acid", "material.gtceu.holmium_oxide": "Holmium Oxide", diff --git a/kubejs/assets/kubejs/lang/de.json b/kubejs/assets/kubejs/lang/de.json index 9ca7cfc5a..50ca7d891 100644 --- a/kubejs/assets/kubejs/lang/de.json +++ b/kubejs/assets/kubejs/lang/de.json @@ -130,10 +130,6 @@ "item.kubejs.quantum_soc_wafer": "", "item.kubejs.quantum_soc_chip_base": "", "item.kubejs.quantum_soc_chip": "", - "item.kubejs.crushed_ancient_debris": "", - "item.kubejs.purified_ancient_debris": "", - "item.kubejs.refined_ancient_debris": "", - "item.kubejs.impure_ancient_debris_dust": "", "item.kubejs.purified_ancient_debris_dust": "", "item.kubejs.processed_ancient_debris_dust": "", "item.kubejs.inert_netherite_scrap": "", diff --git a/kubejs/assets/kubejs/lang/en_us.json b/kubejs/assets/kubejs/lang/en_us.json index 65cecadd7..319000fc0 100644 --- a/kubejs/assets/kubejs/lang/en_us.json +++ b/kubejs/assets/kubejs/lang/en_us.json @@ -148,10 +148,6 @@ "item.kubejs.quantum_soc_chip_base": "Quantum SoC Chip Base", "item.kubejs.quantum_soc_chip": "Quantum SoC Chip", - "item.kubejs.crushed_ancient_debris": "Crushed Ancient Debris", - "item.kubejs.purified_ancient_debris": "Purified Ancient Debris", - "item.kubejs.refined_ancient_debris": "Refined Ancient Debris", - "item.kubejs.impure_ancient_debris_dust": "Impure Ancient Debris Dust", "item.kubejs.purified_ancient_debris_dust": "Purified Ancient Debris Dust", "item.kubejs.processed_ancient_debris_dust": "Processed Ancient Debris Dust", "item.kubejs.inert_netherite_scrap": "Inert Netherite Scrap", diff --git a/kubejs/assets/kubejs/lang/es.json b/kubejs/assets/kubejs/lang/es.json index cef8f7999..09b4a2839 100644 --- a/kubejs/assets/kubejs/lang/es.json +++ b/kubejs/assets/kubejs/lang/es.json @@ -130,10 +130,6 @@ "item.kubejs.quantum_soc_wafer": "", "item.kubejs.quantum_soc_chip_base": "", "item.kubejs.quantum_soc_chip": "", - "item.kubejs.crushed_ancient_debris": "", - "item.kubejs.purified_ancient_debris": "", - "item.kubejs.refined_ancient_debris": "", - "item.kubejs.impure_ancient_debris_dust": "", "item.kubejs.purified_ancient_debris_dust": "", "item.kubejs.processed_ancient_debris_dust": "", "item.kubejs.inert_netherite_scrap": "", diff --git a/kubejs/assets/kubejs/lang/fr.json b/kubejs/assets/kubejs/lang/fr.json index 9ca7cfc5a..50ca7d891 100644 --- a/kubejs/assets/kubejs/lang/fr.json +++ b/kubejs/assets/kubejs/lang/fr.json @@ -130,10 +130,6 @@ "item.kubejs.quantum_soc_wafer": "", "item.kubejs.quantum_soc_chip_base": "", "item.kubejs.quantum_soc_chip": "", - "item.kubejs.crushed_ancient_debris": "", - "item.kubejs.purified_ancient_debris": "", - "item.kubejs.refined_ancient_debris": "", - "item.kubejs.impure_ancient_debris_dust": "", "item.kubejs.purified_ancient_debris_dust": "", "item.kubejs.processed_ancient_debris_dust": "", "item.kubejs.inert_netherite_scrap": "", diff --git a/kubejs/assets/kubejs/lang/ja_jp.json b/kubejs/assets/kubejs/lang/ja_jp.json index 081e599d9..6ecbf7b26 100644 --- a/kubejs/assets/kubejs/lang/ja_jp.json +++ b/kubejs/assets/kubejs/lang/ja_jp.json @@ -129,10 +129,6 @@ "item.kubejs.quantum_soc_wafer": "量子SoCウェハー", "item.kubejs.quantum_soc_chip_base": "量子SoCチップベース", "item.kubejs.quantum_soc_chip": "量子SoCチップ", - "item.kubejs.crushed_ancient_debris": "砕いた古代の残骸", - "item.kubejs.purified_ancient_debris": "洗浄した古代の残骸", - "item.kubejs.refined_ancient_debris": "精製古代の残骸", - "item.kubejs.impure_ancient_debris_dust": "汚れた古代の残骸の粉", "item.kubejs.purified_ancient_debris_dust": "ほぼ綺麗な古代の残骸の粉", "item.kubejs.processed_ancient_debris_dust": "処理された古代の残骸の粉", "item.kubejs.inert_netherite_scrap": "不活性ネザライトスクラップ", diff --git a/kubejs/assets/kubejs/lang/pt_br.json b/kubejs/assets/kubejs/lang/pt_br.json index 983fc713a..e59781e9e 100644 --- a/kubejs/assets/kubejs/lang/pt_br.json +++ b/kubejs/assets/kubejs/lang/pt_br.json @@ -130,10 +130,6 @@ "item.kubejs.quantum_soc_wafer": "Wafer de SoC quântico", "item.kubejs.quantum_soc_chip_base": "Base de chip de SoC quântico", "item.kubejs.quantum_soc_chip": "Chip de SoC quântico", - "item.kubejs.crushed_ancient_debris": "Detritos ancestrais esmagados", - "item.kubejs.purified_ancient_debris": "Detritos ancestrais purificados", - "item.kubejs.refined_ancient_debris": "Detritos ancestrais refinados", - "item.kubejs.impure_ancient_debris_dust": "Pó de detritos ancestrais impuro", "item.kubejs.purified_ancient_debris_dust": "Pó de detritos ancestrais purificado", "item.kubejs.processed_ancient_debris_dust": "Pó de detritos ancestrais processado", "item.kubejs.inert_netherite_scrap": "Fragmentos de netherita inertes", diff --git a/kubejs/assets/kubejs/lang/ru_ru.json b/kubejs/assets/kubejs/lang/ru_ru.json index c8c08be43..6c45d54b1 100644 --- a/kubejs/assets/kubejs/lang/ru_ru.json +++ b/kubejs/assets/kubejs/lang/ru_ru.json @@ -123,9 +123,6 @@ "item.kubejs.quantum_soc_wafer": "Квантовая Пластина СНК", "item.kubejs.quantum_soc_chip_base": "Основа Квантового СнК", "item.kubejs.quantum_soc_chip": "Квантовый СнК", - "item.kubejs.crushed_ancient_debris": "Дробленные Древние обломки", - "item.kubejs.purified_ancient_debris": "Очищенные Древние обломки", - "item.kubejs.refined_ancient_debris": "Обработанные Древние обломки", "item.kubejs.processed_ancient_debris_dust": "Использованная кучка Древних обломков", "item.kubejs.inert_netherite_scrap": "Инертный Незеритовый Лом", "item.kubejs.inert_nether_compound_ingot": "Слиток Инертного Незеритового Соединения", @@ -363,7 +360,6 @@ "item.kubejs.elementally_infused_omnic_matrix_heavy_plating": "§dЭлементально обработанная Омниевая Матричная Тяжелая Обшивка", "item.kubejs.magnetic_capacitor_dust": "Намагниченная Конденсаторная Пыль", "item.kubejs.ruined_capacitor": "Поломанный Конденсатор", - "item.kubejs.impure_ancient_debris_dust": "Грязная кучка Древних обломков", "item.kubejs.furious_infinity_catalyst": "§dРазъярённый Катализатор Бесконечности", "item.kubejs.purified_ancient_debris_dust": "Очищенная кучка Древних обломков", "item.kubejs.dense_matrix_mesh": "Плотная Матричная Сетка", diff --git a/kubejs/assets/kubejs/lang/zh_cn.json b/kubejs/assets/kubejs/lang/zh_cn.json index ad1b1f598..5f629b177 100644 --- a/kubejs/assets/kubejs/lang/zh_cn.json +++ b/kubejs/assets/kubejs/lang/zh_cn.json @@ -130,10 +130,6 @@ "item.kubejs.quantum_soc_wafer": "量子SoC晶圆", "item.kubejs.quantum_soc_chip_base": "量子SoC芯片基座", "item.kubejs.quantum_soc_chip": "量子SoC芯片", - "item.kubejs.crushed_ancient_debris": "粉碎远古残骸", - "item.kubejs.purified_ancient_debris": "纯净远古残骸", - "item.kubejs.refined_ancient_debris": "精炼远古残骸", - "item.kubejs.impure_ancient_debris_dust": "含杂远古残骸粉", "item.kubejs.purified_ancient_debris_dust": "洁净远古残骸粉", "item.kubejs.processed_ancient_debris_dust": "处理过的远古残骸粉", "item.kubejs.inert_netherite_scrap": "惰性下界合金废料", diff --git a/kubejs/assets/kubejs/textures/item/netherite/crushed_ancient_debris.png b/kubejs/assets/kubejs/textures/item/netherite/crushed_ancient_debris.png deleted file mode 100644 index d78b4f7e453944fe9c454bdd3eb3f5b0bd50d386..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4067 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 diff --git a/kubejs/assets/kubejs/textures/item/netherite/impure_ancient_debris_dust.png b/kubejs/assets/kubejs/textures/item/netherite/impure_ancient_debris_dust.png deleted file mode 100644 index 248a277c69ea9cd8a9a055c18a664abfc0e258c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3985 zcmc&%3v?9K8Qwqy39nE}pp=%$K;_lho%hZRSz?k6>^848Sur3AcV}jk3A;PP>?GNw z&;x{2Nm_+e4i)5pB2ud&Nab-T5Z;Ok6blsv<)ke~iJm|?D2RpL*;j%mNRFkad(OsWJO!B;7{>-W>IRQ%wC z@loNSpAoAc9rnxFLlzFs{LPpLsCQg14yQhyIr}SPvaZdg6DPtKXP(UFp}@>(Z~Le)3H3 z-0ctET4mpUnlB!`aKL+2*ZXi>>fxqmc7OcOa|_mlZ(Mn5a<(gb@2mRZ{ZG%n4D-@Y zbIk}_Ed7U?SBhoTb0aL40kaivxlvwJD2Qs%3MADhTO&aYN?R;h*%1whb7ceZ$rVb- zfp+ZLiz15TKp$a>@FFcwu2fw0x?EOY>=ou%z zzyf?Whixbl6*1;I(DEV=lBeo2LR)Doj^#&`8WM#d2$H2sexcMkH4Xyb9B8FsXoAgF zTU%?brL3x6VIz2+x8bCXBrzy~h3i5Fh+v`cm>5VL#wmwIUC|6h4Iw5h@Tt{?1BG_P z3=C>TMM?BfI35QW5nBXkHo}VAfjsC3xKuYrr>wsb2U_SR{#tyB)H)w(F>*T^Ab zOy}}axzm*%EQjLB#gdp*tX1oQXb2?HCI{po)DecJ5=lGdh;j!#=1kP9giX`jMV=(E z8Qlscs71kHCX;|#rD~|*N>xjW-e!Gr`Zj1o@!!D;bLKWtsH=PAL=sGMVWtG9Dps5R zx}6DTNvfzwLec_(=KUPY`8dqZ^9*KZXn+Bd<1rdgex8GW6POR+6z2C!gx$w-1VKPMBvJ6IdJsTXDM3&n+q6&xikMjvJW50klsgsZZWyxH zff8)jnHk@jF%v1|c-#(@wBjfdef0!@VZy_0tAr%AHXI-KLeMe;m_aA(1kK_s%W*V8 z@iZTom@exvrKFX>trUqOoe|Dc1FBx6O0olm9+q4H6wzU?!@MbU^$Y20g^y)F(crl7p|wcC=i(hg5E0ry1R)+ix&caSx`A7 zt4j$Rs$Q2Ij+dk|d0v;H_+UUmqSZwJVl0Yc)J+ME4=deKwMP_-!G=}8Q44fArvfI* zf##Uy9`Pi$HA2!>J2F1bk_ic=wUsi==XV6z))Pn6P>rk`a?%wI=l~uDkYNtgud6{M z$$Z365uj-SMT}C(Ruhuq1v$w+6zPf1FsSL&Csu+`g$&OwSk7X>=q{Kn184~V24nre zj*({F;8|M6{50+-fnBCJf=R5u2f-u=FQhBO2?Ud1?ElCy+6QO?=Xp#dC=@ifc7aN6#hy4O-jyYHA%@AFB$0Z?5=qvTESBQgv}`9$#lPvrM-jFDuC_v1dyE^#zQ^P+_L zNSwu3cn5YyrYRAg9o^QkX|P*~7WMBaUNnX?SZ85}r*~IEX4%ZPuxm}uvUOj+<5k@m zW6e~va)k}pq6x4Cxl2>RF_fJnS%6U#U@?NCIgInc;zBY$z>2gFHqh|ojiGf{oO-&4 zO>5Nux+zJ7Cl;D69dxwX$3|g$4&Pv?5*@$!mi%gvL$KWH@SEWB*th4v55j3~XO5RE zIk)`LlKl^+H$Ozrm~(IxXMX z1)Hy3Y#4Xu^LM4a&r;aUoquY&aB0lRH6ISGb&U$J#V4vpJ@oUVnO_82QwIGsW7zAP z*Djtux%%4Wv>!K)yrxZAeMlo)*N4_Uep)*{r7v})?bOtk9quXbW^O9pHR!+_TJ#X~(wiMQt7Psb{Z1{WHg)f&} zeCPP7P~X&Dqual{e(KyuOLi}NYul>q2X@S=0z02l_sz;#Ck_5|xcgX>&a6+Zx$b4R z&-=^HgYO++>c4($$G(!wE1a&jvVUj3#C*Nt#@v)o8nPM+&aUm%+x$jz=NCIS<<43B EAD@Luj{pDw diff --git a/kubejs/assets/kubejs/textures/item/netherite/purified_ancient_debris.png b/kubejs/assets/kubejs/textures/item/netherite/purified_ancient_debris.png deleted file mode 100644 index 481a5bba8ee708c1f3982925480f9b6d879ff295..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3936 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 diff --git a/kubejs/server_scripts/gregtech/Alloys_Recipes.js b/kubejs/server_scripts/gregtech/Alloys_Recipes.js index 312e22c06..902e42ae3 100644 --- a/kubejs/server_scripts/gregtech/Alloys_Recipes.js +++ b/kubejs/server_scripts/gregtech/Alloys_Recipes.js @@ -72,6 +72,7 @@ ServerEvents.recipes(event => { .duration(50) .EUt(16) + event.remove({ output: "minecraft:netherite_ingot" }) event.recipes.gtceu.alloy_smelter('kubejs:netherite_ingot') .itemInputs('4x #forge:ingots/gold', '4x minecraft:netherite_scrap') // was flipped .itemOutputs('1x minecraft:netherite_ingot') diff --git a/kubejs/server_scripts/gregtech/netherite.js b/kubejs/server_scripts/gregtech/netherite.js index 74c617e31..130185741 100644 --- a/kubejs/server_scripts/gregtech/netherite.js +++ b/kubejs/server_scripts/gregtech/netherite.js @@ -3,7 +3,9 @@ */ ServerEvents.recipes(event => { - + //We only use GT ores for the oreproc page and autogenned intermediates, not for the in-stone ore + event.remove({ not: [{ input: "minecraft:ancient_debris" }, { input: "#forge:ores/netherite_scrap" }], output: "gtceu:crushed_netherite_scrap_ore" }) + event.remove([{ type: "minecraft:smelting", output: "minecraft:netherite_scrap", id: /gtceu:smelting\/.*netherite_scrap_ore.*/ }, { type: "minecraft:blasting", output: "minecraft:netherite_scrap", id: /gtceu:blasting\/.*netherite_scrap_ore.*/ }]) // Omnic Acid event.recipes.gtceu.large_chemical_reactor('omnic_acid') @@ -14,45 +16,25 @@ ServerEvents.recipes(event => { .duration(300) .EUt(65520) - // Scrapline - event.recipes.gtceu.macerator('ancient_debris_crushing') + // Ancient Debris crushing + event.recipes.gtceu.macerator('macerate_ancient_debris_to_crushed_ore') .itemInputs('minecraft:ancient_debris') - .itemOutputs('2x kubejs:crushed_ancient_debris') - .chancedOutput('kubejs:crushed_ancient_debris', 1000, 500) - .itemOutputs('gtceu:obsidian_dust') - .duration(300) - .EUt(32) + .itemOutputs('2x gtceu:crushed_netherite_scrap_ore') + .chancedOutput('gtceu:obsidian_dust', 1400, 850) + .chancedOutput('gtceu:netherrack_dust', 1200, 800) + .duration(400) + .EUt(2) + .category("gtceu:ore_crushing") + // Omnic Acid Purifying event.recipes.gtceu.chemical_reactor('ancient_debris_purifying') - .itemInputs('kubejs:crushed_ancient_debris', 'gtceu:omnic_acid_dust') + .itemInputs('gtceu:netherite_scrap_dust', 'gtceu:omnic_acid_dust') .inputFluids(Fluid.of('water', 2000)) - .itemOutputs('kubejs:purified_ancient_debris') + .itemOutputs('kubejs:purified_ancient_debris_dust') .chancedOutput('gtceu:platinum_dust', 3300, 0) .duration(300) .EUt(16380) - event.recipes.gtceu.thermal_centrifuge('ancient_debris_refining') - .itemInputs('kubejs:purified_ancient_debris') - .itemOutputs('kubejs:refined_ancient_debris') - .chancedOutput('gtceu:iridium_dust', 3300, 0) - .itemOutputs('gtceu:obsidian_dust') - .duration(300) - .EUt(16380) - - event.recipes.gtceu.macerator('ancient_debris_refined_crushing') - .itemInputs('kubejs:refined_ancient_debris') - .itemOutputs('kubejs:impure_ancient_debris_dust') - .chancedOutput('gtceu:osmium_dust', 3300, 0) - .itemOutputs('gtceu:obsidian_dust') - .duration(300) - .EUt(16380) - - event.recipes.gtceu.centrifuge('ancient_debris_dust_purifying') - .itemInputs('kubejs:impure_ancient_debris_dust') - .itemOutputs('kubejs:purified_ancient_debris_dust', 'gtceu:obsidian_dust') - .duration(300) - .EUt(16380) - event.recipes.gtceu.arc_furnace('ancient_debris_arc_smelting') .itemInputs('kubejs:purified_ancient_debris_dust') .inputFluids(Fluid.of('gtceu:oxygen', 1200)) @@ -65,7 +47,7 @@ ServerEvents.recipes(event => { .itemInputs('kubejs:processed_ancient_debris_dust', '16x kubejs:quantum_flux') .inputFluids(Fluid.of('gtceu:tritium', 1000)) .itemOutputs('kubejs:inert_netherite_scrap') - .duration(200) + .duration(150) .EUt(250000) .blastFurnaceTemp(12000) @@ -81,10 +63,13 @@ ServerEvents.recipes(event => { .itemOutputs('gtceu:activated_netherite_ingot') .duration(200) .EUt(250000) +}) - // Regular Netherite - // Recipe is handled in alloys_recipes.js - event.remove({ output: "minecraft:netherite_ingot" }) - event.smelting('minecraft:netherite_scrap', 'kubejs:crushed_ancient_debris') - +ServerEvents.tags("item", event => { + const oresToRemove = event.get("forge:ores/netherite_scrap").getObjectIds(); + if(!oresToRemove.add("gtceu:raw_netherite_scrap")) console.error("Could not add Raw Netherite Scrap from list of Netherite Scrap ores to nuke") + + event.removeAllTagsFrom(oresToRemove.filter((value) => { + return ResourceLocation.of("minecraft:ancient_debris", ':').compareTo(value) != 0 + })) }) diff --git a/kubejs/startup_scripts/gregtech_material_registry/endgame.js b/kubejs/startup_scripts/gregtech_material_registry/endgame.js index f98b73159..7606b7186 100644 --- a/kubejs/startup_scripts/gregtech_material_registry/endgame.js +++ b/kubejs/startup_scripts/gregtech_material_registry/endgame.js @@ -74,6 +74,12 @@ GTCEuStartupEvents.registry('gtceu:material', event => { .iconSet('shiny') .flags(GTMaterialFlags.NO_SMELTING, GTMaterialFlags.NO_SMASHING) .cableProperties(GTValues.V[GTValues.UHV], 8, 0, true) + + event.create('netherite_scrap') + .dust().ingot().ore(1, 3) + .color(0x6D473E) + .iconSet('dull') + .addOreByproducts(GTMaterials.Obsidian, GTMaterials.Obsidian, GTMaterials.RarestMetalMixture) event.create('activated_netherite') .ingot() .element(GTElements.get("activated_netherite")) diff --git a/kubejs/startup_scripts/gregtech_material_registry/misc.js b/kubejs/startup_scripts/gregtech_material_registry/misc.js index 44939cb31..0c17e625e 100644 --- a/kubejs/startup_scripts/gregtech_material_registry/misc.js +++ b/kubejs/startup_scripts/gregtech_material_registry/misc.js @@ -228,4 +228,18 @@ GTCEuStartupEvents.materialModification(event => { GTMaterials.get('microversium').setFormula('Fe2(Si(FeS2)5(CrAl2O3)Hg3)(AuCa3(PO4)2)D') GTMaterials.get('thorium_hydroxide').setFormula('Th(OH)4') + + const tagPrefixes = [ + TagPrefix.nugget, + TagPrefix.block, + TagPrefix.dustTiny, + TagPrefix.dustSmall, + TagPrefix.rawOre, + TagPrefix.rawOreBlock + ] + + TagPrefix.ingot.setIgnored(GTMaterials.get("netherite_scrap"), Ingredient.of("minecraft:netherite_scrap")) + tagPrefixes.forEach((prefix) => { + prefix["setIgnored(com.gregtechceu.gtceu.api.data.chemical.material.Material)"](GTMaterials.get("netherite_scrap")); + }) }) diff --git a/kubejs/startup_scripts/registry/item_registry.js b/kubejs/startup_scripts/registry/item_registry.js index def687042..1e026ae0a 100644 --- a/kubejs/startup_scripts/registry/item_registry.js +++ b/kubejs/startup_scripts/registry/item_registry.js @@ -344,11 +344,7 @@ StartupEvents.registry('item', event => { event.create('hadal_shard') - // Netherite Processing intermediate products - 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') - event.create('impure_ancient_debris_dust').texture('kubejs:item/netherite/impure_ancient_debris_dust') + // Nethline intermediate products event.create('purified_ancient_debris_dust').texture('kubejs:item/netherite/purified_ancient_debris_dust') event.create('processed_ancient_debris_dust').texture('kubejs:item/netherite/processed_ancient_debris_dust') event.create('inert_netherite_scrap').texture('kubejs:item/netherite/inert_netherite_scrap') From 634302c168f43585b25d00e26c2f9dffe9b08bc1 Mon Sep 17 00:00:00 2001 From: Xefyr0 Date: Sun, 2 Feb 2025 01:21:55 -0500 Subject: [PATCH 2/4] Lint --- kubejs/server_scripts/gregtech/netherite.js | 4 ++-- kubejs/startup_scripts/gregtech_material_registry/misc.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kubejs/server_scripts/gregtech/netherite.js b/kubejs/server_scripts/gregtech/netherite.js index 130185741..bdb71a38a 100644 --- a/kubejs/server_scripts/gregtech/netherite.js +++ b/kubejs/server_scripts/gregtech/netherite.js @@ -3,7 +3,7 @@ */ ServerEvents.recipes(event => { - //We only use GT ores for the oreproc page and autogenned intermediates, not for the in-stone ore + // We only use GT ores for the oreproc page and autogenned intermediates, not for the in-stone ore event.remove({ not: [{ input: "minecraft:ancient_debris" }, { input: "#forge:ores/netherite_scrap" }], output: "gtceu:crushed_netherite_scrap_ore" }) event.remove([{ type: "minecraft:smelting", output: "minecraft:netherite_scrap", id: /gtceu:smelting\/.*netherite_scrap_ore.*/ }, { type: "minecraft:blasting", output: "minecraft:netherite_scrap", id: /gtceu:blasting\/.*netherite_scrap_ore.*/ }]) @@ -68,7 +68,7 @@ ServerEvents.recipes(event => { ServerEvents.tags("item", event => { const oresToRemove = event.get("forge:ores/netherite_scrap").getObjectIds(); if(!oresToRemove.add("gtceu:raw_netherite_scrap")) console.error("Could not add Raw Netherite Scrap from list of Netherite Scrap ores to nuke") - + event.removeAllTagsFrom(oresToRemove.filter((value) => { return ResourceLocation.of("minecraft:ancient_debris", ':').compareTo(value) != 0 })) diff --git a/kubejs/startup_scripts/gregtech_material_registry/misc.js b/kubejs/startup_scripts/gregtech_material_registry/misc.js index 0c17e625e..ce0638b62 100644 --- a/kubejs/startup_scripts/gregtech_material_registry/misc.js +++ b/kubejs/startup_scripts/gregtech_material_registry/misc.js @@ -241,5 +241,5 @@ GTCEuStartupEvents.materialModification(event => { TagPrefix.ingot.setIgnored(GTMaterials.get("netherite_scrap"), Ingredient.of("minecraft:netherite_scrap")) tagPrefixes.forEach((prefix) => { prefix["setIgnored(com.gregtechceu.gtceu.api.data.chemical.material.Material)"](GTMaterials.get("netherite_scrap")); - }) + }) }) From 0b215d813435b62e25ea3424ab4e8d28cf5237ab Mon Sep 17 00:00:00 2001 From: Xefyr0 Date: Tue, 18 Feb 2025 22:20:34 -0500 Subject: [PATCH 3/4] More nethline tweaks to make things cheaper --- kubejs/server_scripts/gregtech/netherite.js | 24 ++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/kubejs/server_scripts/gregtech/netherite.js b/kubejs/server_scripts/gregtech/netherite.js index 87e807fbb..20180b4ae 100644 --- a/kubejs/server_scripts/gregtech/netherite.js +++ b/kubejs/server_scripts/gregtech/netherite.js @@ -13,8 +13,8 @@ ServerEvents.recipes(event => { .inputFluids(Fluid.of("water", 3000)) .itemOutputs("gtceu:omnic_acid_dust") .outputFluids(Fluid.of("gtceu:hydrogen", 2000)) - .duration(300) - .EUt(65520) + .duration(200) + .EUt(GTValues.VA[GTValues.ZPM]) // Ancient Debris crushing event.recipes.gtceu.macerator("macerate_ancient_debris_to_crushed_ore") @@ -33,7 +33,7 @@ ServerEvents.recipes(event => { .itemOutputs("kubejs:purified_ancient_debris_dust") .chancedOutput("gtceu:platinum_dust", 3300, 0) .duration(300) - .EUt(16380) + .EUt(GTValues.VA[GTValues.IV]) event.recipes.gtceu.arc_furnace("ancient_debris_arc_smelting") .itemInputs("kubejs:purified_ancient_debris_dust") @@ -41,28 +41,28 @@ ServerEvents.recipes(event => { .chancedOutput("gtceu:palladium_dust", 1400, 850) .itemOutputs("kubejs:processed_ancient_debris_dust") .duration(300) - .EUt(16380) + .EUt(GTValues.VA[GTValues.IV]) event.recipes.gtceu.electric_blast_furnace("netherite_scrap_blasting") - .itemInputs("kubejs:processed_ancient_debris_dust", "16x kubejs:quantum_flux") - .inputFluids(Fluid.of("gtceu:tritium", 1000)) + .itemInputs("kubejs:processed_ancient_debris_dust", "8x kubejs:quantum_flux") + .inputFluids(Fluid.of("gtceu:blaze", 1000)) .itemOutputs("kubejs:inert_netherite_scrap") - .duration(150) - .EUt(250000) + .duration(100) + .EUt(GTValues.VA[GTValues.ZPM]) .blastFurnaceTemp(12000) // Activated Nethline event.recipes.gtceu.forming_press("inert_nether_compound_ingot") - .itemInputs("gtceu:hot_europium_ingot", "16x kubejs:wither_bone", "4x gtceu:dark_soularium_dust", "4x kubejs:primal_mana") + .itemInputs("gtceu:hot_europium_ingot", "4x kubejs:wither_bone", "3x gtceu:dark_soularium_dust", "4x kubejs:primal_mana") .itemOutputs("kubejs:inert_nether_compound_ingot") .duration(300) - .EUt(16380) + .EUt(GTValues.VA[GTValues.UV]) event.recipes.gtceu.omnic_forge("netherite_ingot_final") - .itemInputs("kubejs:inert_nether_compound_ingot", "3x kubejs:diamond_lattice", "4x kubejs:inert_netherite_scrap", "4x minecraft:gold_ingot") + .itemInputs("kubejs:inert_nether_compound_ingot", "2x kubejs:diamond_lattice", "4x kubejs:inert_netherite_scrap", "4x minecraft:gold_ingot") .itemOutputs("gtceu:activated_netherite_ingot") .duration(200) - .EUt(250000) + .EUt(GTValues.VA[GTValues.UHV]) }) ServerEvents.tags("item", event => { From f300b4436d7b61d5a06ac6f3bb658bbcca5f3595 Mon Sep 17 00:00:00 2001 From: Xefyr0 Date: Tue, 18 Feb 2025 22:43:56 -0500 Subject: [PATCH 4/4] Re-add small Ancient Debris dust for surface ore indicator recipe --- kubejs/startup_scripts/gregtech_material_registry/misc.js | 1 - 1 file changed, 1 deletion(-) diff --git a/kubejs/startup_scripts/gregtech_material_registry/misc.js b/kubejs/startup_scripts/gregtech_material_registry/misc.js index f95cddb53..91bdbf214 100644 --- a/kubejs/startup_scripts/gregtech_material_registry/misc.js +++ b/kubejs/startup_scripts/gregtech_material_registry/misc.js @@ -242,7 +242,6 @@ GTCEuStartupEvents.materialModification(event => { TagPrefix.nugget, TagPrefix.block, TagPrefix.dustTiny, - TagPrefix.dustSmall, TagPrefix.rawOre, TagPrefix.rawOreBlock ]