Remove the need for NBTs on Thermal Augments

kubejs/assets/kubejs/lang/de_de.json

@@ -358,7 +358,6 @@
     "enderio.sculk_superconductor_conduit.tooltip": "§7Max Output 134,217,728 RF/t",
     "thermal.device_rock_gen.tooltip": "§7Must be placed next to lava and water to produce cobblestone.",
     "thermal.device_water_gen.tooltip": "§7Must be placed next to two water source blocks to work.",
-    "thermal.emi.tooltip": "§aDo not take the items from EMI! Use the crafting recipe to get the correct NBT data.",
     "gtceu.basic_tape.tooltip": "§7Used to wrap up Crates for transport.",
     "gtceu.nightvision_goggles.tooltip": "§7Toggle with the [Armor Mode Switch] key.",
     "gtceu.robot_arm.tooltip": "§4Advanced control over item transfer not possible with pipes.",

kubejs/assets/kubejs/lang/en_us.json

@@ -458,8 +458,6 @@
   "thermal.device_rock_gen.tooltip": "§7Must be placed next to lava and water to produce cobblestone.",
   "thermal.device_water_gen.tooltip": "§7Must be placed next to two water source blocks to work.",
 
-  "thermal.emi.tooltip": "§aDo not take the items from EMI! Use the crafting recipe to get the correct NBT data.",
-
   "gtceu.basic_tape.tooltip": "§7Used to wrap up Crates for transport.",
   "gtceu.nightvision_goggles.tooltip": "§7Toggle with the [Armor Mode Switch] key.",
   "gtceu.robot_arm.tooltip": "§4Advanced control over item transfer not possible with pipes.",

kubejs/assets/kubejs/lang/es_es.json

@@ -357,7 +357,6 @@
     "enderio.sculk_superconductor_conduit.tooltip": "§7Max Output 134,217,728 RF/t",
     "thermal.device_rock_gen.tooltip": "§7Must be placed next to lava and water to produce cobblestone.",
     "thermal.device_water_gen.tooltip": "§7Must be placed next to two water source blocks to work.",
-    "thermal.emi.tooltip": "§aDo not take the items from EMI! Use the crafting recipe to get the correct NBT data.",
     "gtceu.basic_tape.tooltip": "§7Used to wrap up Crates for transport.",
     "gtceu.nightvision_goggles.tooltip": "§7Toggle with the [Armor Mode Switch] key.",
     "functionalstorage.storage_controller.tooltip": "§7Previously known as a Storage Controller",

kubejs/assets/kubejs/lang/fr_fr.json

@@ -358,7 +358,6 @@
     "enderio.sculk_superconductor_conduit.tooltip": "§7Max Output 134,217,728 RF/t",
     "thermal.device_rock_gen.tooltip": "§7Must be placed next to lava and water to produce cobblestone.",
     "thermal.device_water_gen.tooltip": "§7Must be placed next to two water source blocks to work.",
-    "thermal.emi.tooltip": "§aDo not take the items from EMI! Use the crafting recipe to get the correct NBT data.",
     "gtceu.basic_tape.tooltip": "§7Used to wrap up Crates for transport.",
     "gtceu.nightvision_goggles.tooltip": "§7Toggle with the [Armor Mode Switch] key.",
     "gtceu.robot_arm.tooltip": "§4Advanced control over item transfer not possible with pipes.",

kubejs/assets/kubejs/lang/ja_jp.json

@@ -356,7 +356,6 @@
     "enderio.sculk_superconductor_conduit.tooltip": "§7最大出力 134,217,728 RF/t",
     "thermal.device_rock_gen.tooltip": "§7丸石を生成するには、溶岩と水の隣に配置する必要があります。",
     "thermal.device_water_gen.tooltip": "§7動作するには二つの水源を隣り合わせる必要があります。",
-    "thermal.emi.tooltip": "§aEMIからアイテムを取らないでください!クラフトレシピを使用して、正しいNBTデータを取得します。",
     "gtceu.basic_tape.tooltip": "§7輸送用のクレートを包むために使用される。",
     "gtceu.nightvision_goggles.tooltip": "§7[アーマーモードスイッチ]キーで切り替え。",
     "functionalstorage.storage_controller.tooltip": "§7以前はストレージコントローラーと呼ばれていました",

kubejs/assets/kubejs/lang/ko_kr.json

@@ -404,7 +404,6 @@
     "kubejs.meowni_plush.tooltip.normal.1": "§9How did you get your hands on this?",
     "item.kubejs.ultimate_wire_cutter": "Ultimate Wire Cutter",
     "item.kubejs.coated_sapphire_wafer": "Coated Sapphire Wafer",
-    "thermal.emi.tooltip": "§aDo not take the items from EMI! Use the crafting recipe to get the correct NBT data.",
     "item.kubejs.solidified_oxygen": "Solidified Oxygen",
     "hostilenetworks.overworld_prediction.tooltip": "§7Experience per item: 10",
     "enderio.vibrant_conduit.tooltip": "§7Max Output 8,192 RF/t",

kubejs/assets/kubejs/lang/nl_nl.json

@@ -403,7 +403,6 @@
     "kubejs.meowni_plush.tooltip.normal.1": "§9How did you get your hands on this?",
     "item.kubejs.ultimate_wire_cutter": "Ultimate Wire Cutter",
     "item.kubejs.coated_sapphire_wafer": "Coated Sapphire Wafer",
-    "thermal.emi.tooltip": "§aDo not take the items from EMI! Use the crafting recipe to get the correct NBT data.",
     "item.kubejs.solidified_oxygen": "Solidified Oxygen",
     "hostilenetworks.overworld_prediction.tooltip": "§7Experience per item: 10",
     "enderio.vibrant_conduit.tooltip": "§7Max Output 8,192 RF/t",

kubejs/assets/kubejs/lang/pl_pl.json

@@ -373,7 +373,6 @@
     "enderio.sculk_superconductor_conduit.tooltip": "§7Max Output 134,217,728 RF/t",
     "thermal.device_rock_gen.tooltip": "§7Must be placed next to lava and water to produce cobblestone.",
     "thermal.device_water_gen.tooltip": "§7Must be placed next to two water source blocks to work.",
-    "thermal.emi.tooltip": "§aDo not take the items from EMI! Use the crafting recipe to get the correct NBT data.",
     "gtceu.basic_tape.tooltip": "§7Used to wrap up Crates for transport.",
     "gtceu.nightvision_goggles.tooltip": "§7Toggle with the [Armor Mode Switch] key.",
     "gtceu.robot_arm.tooltip": "§4Advanced control over item transfer not possible with pipes.",

kubejs/assets/kubejs/lang/pt_br.json

@@ -356,7 +356,6 @@
     "enderio.sculk_superconductor_conduit.tooltip": "§7Saída máxima 134,217,728 RF/t",
     "thermal.device_rock_gen.tooltip": "§7Deve ser colocado perto de lava e água para produzir pedregulho.",
     "thermal.device_water_gen.tooltip": "§7Deve ser colocado ao lado de duas fontes de água para funcionar.",
-    "thermal.emi.tooltip": "§aNão puxe os itens do EMI! Use a bancada de trabalho para pegar os dados NBT corretos.",
     "gtceu.basic_tape.tooltip": "§7Usado para empacotar caixas para transporte.",
     "gtceu.nightvision_goggles.tooltip": "§7Alterne com a tecla de [Armor Mode Switch].",
     "functionalstorage.storage_controller.tooltip": "§7Previamente conhecido como Controlador de armazenamento",

kubejs/assets/kubejs/lang/pt_pt.json

@@ -404,7 +404,6 @@
     "kubejs.meowni_plush.tooltip.normal.1": "§9How did you get your hands on this?",
     "item.kubejs.ultimate_wire_cutter": "Ultimate Wire Cutter",
     "item.kubejs.coated_sapphire_wafer": "Coated Sapphire Wafer",
-    "thermal.emi.tooltip": "§aDo not take the items from EMI! Use the crafting recipe to get the correct NBT data.",
     "item.kubejs.solidified_oxygen": "Solidified Oxygen",
     "hostilenetworks.overworld_prediction.tooltip": "§7Experience per item: 10",
     "enderio.vibrant_conduit.tooltip": "§7Max Output 8,192 RF/t",

kubejs/assets/kubejs/lang/ru_ru.json

@@ -382,7 +382,6 @@
     "thermal.device_water_gen.tooltip": "§7Для работы нужны два источника воды рядом.",
     "gtceu.basic_tape.tooltip": "§7Используется для обёртки ящиков для переноса.",
     "__MISC_TOOLTIPS__.flufff": "> Всякие Подсказки<",
-    "thermal.emi.tooltip": "§aНе используй предметы из EMI! Используй верстак чтобы получить верные NBT данные.",
     "redstoneclock.redstone_clock.tooltip": "§7Требует редстоун сигнал на помеченной точкой стороне для работы.",
     "functionalstorage.framed_storage_controller.tooltip": "§7Известен ранее как Обрамлённый Контроллер ящика",
     "extendedcrafting.auto_table.tooltip.1": "§7Не может принимать предметы!",

kubejs/assets/kubejs/lang/zh_cn.json

@@ -289,7 +289,6 @@
     "kubejs.meowni_plush.tooltip.normal.1": "§9你是怎么的着手搞这个的？",
     "kubejs.meowni_plush.tooltip.hardmode.2": "§9困难模式和专家模式玩家独享。",
     "enderio.energetic_conduit.tooltip": "§7最大输出 2,048 RF/t",
-    "thermal.emi.tooltip": "§a不要从EMI中拿这个物品！用合成的方式才能获取到正确的NBT数据。",
     "gtceu.nightvision_goggles.tooltip": "§7通过 [切换盔甲模式] 的按键开关。",
     "extendedcrafting.the_ultimate_catalyst.tooltip": "我是真正的终极催化剂...",
     "extendedcrafting.auto_table.tooltip.1": "§7无法自动化！",

kubejs/assets/thermal/models/item/fluid_tank_augment_advanced.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "thermal:item/fluid_tank_augment_advanced"
+  }
+}

kubejs/assets/thermal/models/item/rf_coil_augment_advanced.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "thermal:item/rf_coil_augment_advanced"
+  }
+}

kubejs/assets/thermal/models/item/rf_coil_storage_augment_advanced.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "thermal:item/rf_coil_storage_augment_advanced"
+  }
+}

kubejs/assets/thermal/models/item/rf_coil_xfer_augment_advanced.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "thermal:item/rf_coil_xfer_augment_advanced"
+  }
+}

kubejs/client_scripts/tooltips.js

@@ -74,19 +74,6 @@ ItemEvents.tooltip(tooltip => {
     tooltip.add("thermal:device_rock_gen", Text.translatable("thermal.device_rock_gen.tooltip"))
     tooltip.add("thermal:device_water_gen", Text.translatable("thermal.device_water_gen.tooltip"))
 
-    tooltip.add(
-        [
-            "thermal:upgrade_augment_1",
-            "thermal:upgrade_augment_2",
-            "thermal:upgrade_augment_4",
-            "thermal:upgrade_augment_3",
-            "thermal:rf_coil_augment_advanced",
-            "thermal:rf_coil_storage_augment_advanced",
-            "thermal:rf_coil_xfer_augment_advanced",
-            "thermal:fluid_tank_augment_advanced"
-        ], Text.translatable("thermal.emi.tooltip")
-    )
-
     // Circuits
     tooltip.addAdvanced("kubejs:optical_processor_mainframe", (item, adv, text) => { text.add(1, Text.gold(Text.translatable("item.kubejs.uev_tier_circuit"))) })
     tooltip.addAdvanced("kubejs:optical_processor_computer", (item, adv, text) => { text.add(1, Text.gold(Text.translatable("item.kubejs.uhv_tier_circuit"))) })

kubejs/server_scripts/mods/Thermal_Series.js

@@ -137,7 +137,7 @@ ServerEvents.recipes(event => {
         .addMaterialInfo(true)
 
     /* === AUGMENTS/UPGRADES ===*/
-    event.recipes.gtceu.shaped(Item.of("thermal:upgrade_augment_1", '{AugmentData:{BaseMod:1.5f,Type:"Upgrade"}}'), [
+    event.recipes.gtceu.shaped("thermal:upgrade_augment_1", [
         "ABA",
         "RGR",
         "ABA"
@@ -148,7 +148,7 @@ ServerEvents.recipes(event => {
         R: "gtceu:fine_red_alloy_wire"
     })
 
-    event.recipes.gtceu.shaped(Item.of("thermal:upgrade_augment_2", '{AugmentData:{BaseMod:2.5f,Type:"Upgrade"}}'), [
+    event.recipes.gtceu.shaped("thermal:upgrade_augment_2", [
         "PGP",
         "BCB",
         "PGP"
@@ -159,7 +159,7 @@ ServerEvents.recipes(event => {
         C: "thermal:upgrade_augment_1"
     })
 
-    event.recipes.gtceu.shaped(Item.of("thermal:upgrade_augment_4", '{AugmentData:{BaseMod:5.0f,Type:"Upgrade"}}'), [
+    event.recipes.gtceu.shaped("thermal:upgrade_augment_4", [
         "SSS",
         "SCE",
         "RRS"
@@ -170,7 +170,7 @@ ServerEvents.recipes(event => {
         C: "thermal:upgrade_augment_2"
     })
 
-    event.recipes.gtceu.shaped(Item.of("thermal:upgrade_augment_3", '{AugmentData:{BaseMod:12.0f,Type:"Upgrade"}}'), [
+    event.recipes.gtceu.shaped("thermal:upgrade_augment_3", [
         "ABG",
         "BCB",
         "GBA"
@@ -182,7 +182,7 @@ ServerEvents.recipes(event => {
     })
 
     // Advanced Thermal Storage augments
-    event.recipes.gtceu.shaped(Item.of("thermal:rf_coil_augment_advanced", '{AugmentData:{RFMax:8.0f,RFXfer:8.0f,Type:"RF"}}'), [
+    event.recipes.gtceu.shaped("thermal:rf_coil_augment_advanced", [
         " G ",
         "SCS",
         " G "
@@ -192,7 +192,7 @@ ServerEvents.recipes(event => {
         G: "gtceu:rose_gold_plate"
     }).addMaterialInfo()
 
-    event.recipes.gtceu.shaped(Item.of("thermal:rf_coil_storage_augment_advanced", '{AugmentData:{RFMax:10.0f,RFXfer:4.0f,Type:"RF"}}'), [
+    event.recipes.gtceu.shaped("thermal:rf_coil_storage_augment_advanced", [
         " S ",
         "GCG",
         " G "
@@ -202,7 +202,7 @@ ServerEvents.recipes(event => {
         G: "gtceu:rose_gold_plate"
     }).addMaterialInfo()
 
-    event.recipes.gtceu.shaped(Item.of("thermal:rf_coil_xfer_augment_advanced", '{AugmentData:{RFMax:4.0f,RFXfer:10.0f,Type:"RF"}}'), [
+    event.recipes.gtceu.shaped("thermal:rf_coil_xfer_augment_advanced", [
         " S ",
         "SCS",
         " G "
@@ -212,7 +212,7 @@ ServerEvents.recipes(event => {
         G: "gtceu:rose_gold_plate"
     }).addMaterialInfo()
 
-    event.recipes.gtceu.shaped(Item.of("thermal:fluid_tank_augment_advanced", '{AugmentData:{FluidMax:10.0f,Type:"Fluid"}}'), [
+    event.recipes.gtceu.shaped("thermal:fluid_tank_augment_advanced", [
         " P ",
         "RSR",
         " G "
@@ -223,6 +223,13 @@ ServerEvents.recipes(event => {
         S: "gtceu:stainless_steel_normal_fluid_pipe"
     }).addMaterialInfo()
 
+    // Temporary Reset NBT recipes
+    const oldNBTAugment = ["thermal:upgrade_augment_1", "thermal:upgrade_augment_2" , "thermal:upgrade_augment_3", "thermal:upgrade_augment_4", "thermal:rf_coil_augment_advanced", "thermal:rf_coil_storage_augment_advanced", "thermal:rf_coil_xfer_augment_advanced", "thermal:fluid_tank_augment_advanced"]
+
+    oldNBTAugment.forEach((augment) => {
+        event.shapeless(augment, augment)
+    })
+
     // Machine and Dynamo augments
     event.recipes.gtceu.shaped("thermal:dynamo_fuel_augment", [
         "PIP",

kubejs/startup_scripts/registry/item_registry.js

@@ -458,19 +458,23 @@ StartupEvents.registry("item", event => {
             .texture("kubejs:item/ender_spore")
     }
 
+    // Thermal Custom Augments Classes
+    const $AugmentItem = Java.loadClass("cofh.thermal.lib.common.item.AugmentItem");
+    const $Item$Properties = Java.loadClass("net.minecraft.world.item.Item$Properties");
+
     // Thermal Augments
     event.create("redstone_transmission_coil")
         .texture("kubejs:item/mod/thermal/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");
+    event.createCustom("thermal:upgrade_augment_1",() =>new $AugmentItem(new $Item$Properties(), {Type: "Upgrade", BaseMod: 1.5}))
+    event.createCustom("thermal:upgrade_augment_2",() =>new $AugmentItem(new $Item$Properties(), {Type: "Upgrade", BaseMod: 2.5}))
+    event.createCustom("thermal:upgrade_augment_4",() =>new $AugmentItem(new $Item$Properties(), {Type: "Upgrade", BaseMod: 5}))
+    event.createCustom("thermal:upgrade_augment_3",() =>new $AugmentItem(new $Item$Properties(), {Type: "Upgrade", BaseMod: 12}))
 
     // Advanced Thermal Storage augments
-    event.create("thermal:rf_coil_augment_advanced")
-    event.create("thermal:rf_coil_storage_augment_advanced")
-    event.create("thermal:rf_coil_xfer_augment_advanced")
-    event.create("thermal:fluid_tank_augment_advanced")
+    event.createCustom("thermal:rf_coil_augment_advanced",() =>new $AugmentItem(new $Item$Properties(), {Type: "RF", RFMax: 8, RFXfer: 8}))
+    event.createCustom("thermal:rf_coil_storage_augment_advanced",() =>new $AugmentItem(new $Item$Properties(), {Type: "RF", RFMax: 10, RFXfer: 4}))
+    event.createCustom("thermal:rf_coil_xfer_augment_advanced",() =>new $AugmentItem(new $Item$Properties(), {Type: "RF", RFMax: 4, RFXfer: 10}))
+    event.createCustom("thermal:fluid_tank_augment_advanced",() =>new $AugmentItem(new $Item$Properties(), {Type: "Fluid", FluidMax: 10}))
 
     // EnderIO Capacitors
     // TODO: GIVE CAPACITORS LORE AND NBT FOR THEM TO WORK