assets and recipes for new wireless card!

kubejs/assets/tfg/lang/en_us.json

@@ -928,6 +928,7 @@
   "item.tfg.vial.filled": "Vial of %s",
   "item.tfg.lab_equipment": "Lab Equipment",
   "item.tfg.dirty_lab_equipment": "Dirty Lab Equipment",
+  "item.tfg.wireless_card": "Interplanetary Wireless Card",
   "material.tfg.latex": "Latex",
   "material.tfg.vulcanized_latex": "Vulcanized Latex",
   "material.tfg.fluix": "Fluix",
@@ -1302,6 +1303,8 @@
   "tfg.tooltip.single_itemstack_bus.0": "§6Item Slots: §f1",
   "tfg.tooltip.single_itemstack_bus.1": "§6Stack Size: §f1",
   "tfg.tooltip.growth_chamber": "This machine can run more recipes at once by increasing the number of layers.",
+  "tfg.tooltip.wireless_card_1": "Enables wireless connections from any range, even from different planets!",
+  "tfg.tooltip.wireless_card_2": "Items can still be transferred through the terminal but at a very high power cost.",
   "tfc.jei.flint_knapping": "Flint Knapping",
   "tfc.jei.straw_knapping": "Straw Knapping",
   "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.black": "Dyeing",

kubejs/assets/tfg/models/item/wireless_card.json

@@ -0,0 +1,6 @@
+{
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "tfg:item/wireless_card"
+	}
+}

kubejs/client_scripts/tooltips.js

@@ -167,7 +167,7 @@ const registerTooltips = (event) => {
 		})
 	})
 
-	//#region Nuclear Fission Tooltips
+	//Nuclear Fission Tooltips
 
 	event.addAdvanced(['minecraft:blue_ice'], (item, advanced, text) => {
 		text.add(1, Text.translate("tfg.tooltip.component.blue_ice"))
@@ -176,9 +176,15 @@ const registerTooltips = (event) => {
 		text.add(1, Text.translate("tfg.tooltip.component.glacian_fur"))
 	})
 
-	//#region Deprecated Items
+	// AE2
+	event.addAdvanced(['tfg:wireless_card'], (item, advanced, text) => {
+		text.add(1, Text.translate('tfg.tooltip.wireless_card_1'))
+		text.add(2, Text.translate('tfg.tooltip.wireless_card_2'))
+		text.add(3, Text.translate('tfg.tooltip.wireless_card_3'))
+	})
+
+	// Deprecated Items
 	event.addAdvanced(['vintageimprovements:lathe'], (item, advanced, text) => {
 		text.add(1, Text.translate('tfg.tooltip.obsolete.depreciated'))
 	})
-	//#endregion
 }

kubejs/server_scripts/ae2/recipes.js

@@ -169,7 +169,7 @@ const registerAE2Recipes = (event) => {
 		.id('tfg:crafting/equal_distribution_card')
 
 	// Energy Card
-	event.shapeless('ae2:energy_card', ['ae2:advanced_card', '2x gtceu:hv_lithium_battery'])
+	event.shapeless('ae2:energy_card', ['ae2:advanced_card', '2x #gtceu:batteries/hv'])
 		.id('tfg:crafting/energy_card')
 
 	// Quartz Fixture
@@ -194,8 +194,8 @@ const registerAE2Recipes = (event) => {
 		B: 'ae2:terminal',
 		C: 'ae2:engineering_processor',
 		D: '#gtceu:circuits/hv',
-		E: 'gtceu:hv_lithium_battery',
+		E: '#gtceu:batteries/hv',
-		F: '#forge:plates/nether_quartz'
+		F: '#forge:plates/certus_quartz'
 	}).id('tfg:crafting/wireless_terminal')
 
 	// Basic Card
@@ -932,7 +932,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => {
 	event.recipes.gtceu.assembler('ae2:cell_component_16k_4k')
 		.itemInputs(
  			'2x #gtceu:circuits/iv',
-			'4x gtceu:nano_cpu_chip',
+			'16x gtceu:ram_chip',
 			'16x #forge:foils/polyvinyl_chloride',
 			'16x ae2:logic_processor',
             '3x ae2:cell_component_4k')
@@ -946,7 +946,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => {
 	event.recipes.gtceu.assembler('ae2:cell_component_16k')
 		.itemInputs(
  			'2x #gtceu:circuits/ev',
-			'4x gtceu:nano_cpu_chip',
+			'16x gtceu:ram_chip',
 			'16x #forge:foils/polyvinyl_chloride',
 			'16x ae2:logic_processor',
             '2x ae2:cell_component_4k')

kubejs/server_scripts/ae2wtlib/recipes.js

@@ -68,25 +68,18 @@ const registerAE2WTLibRecipes = (event) => {
         .EUt(64000)
         
 
-    event.remove({ output: 'ae2wtlib:wireless_universal_terminal' })
+    event.remove({ id: 'ae2wtlib:wireless_universal_terminal/ae' })
+    event.remove({ id: 'ae2wtlib:wireless_universal_terminal/ce' })
+    event.remove({ id: 'ae2wtlib:wireless_universal_terminal/ca' })
 
     event.recipes.gtceu.assembler('ae2wtlib:wireless_universal_terminal')
         .itemInputs(
-            'ae2:wireless_crafting_terminal',
+            'ae2:cell_component_16k',
-            'ae2wtlib:wireless_pattern_encoding_terminal',
+            '1x gtceu:ev_sensor',
-            'ae2wtlib:wireless_pattern_access_terminal',
+            '1x gtceu:ev_emitter',
-            '1x gtceu:iv_sensor',
-            '1x gtceu:iv_emitter',
             '2x #forge:plates/rhodium')
+        .inputFluids(Fluid.of('gtceu:epoxy', 144))
         .itemOutputs(Item.of('ae2wtlib:wireless_universal_terminal', '{crafting:1b, pattern_access:1b, pattern_encoding:1b}'))
         .duration(300)
-        .EUt(GTValues.VA[GTValues.IV])
+        .EUt(GTValues.VA[GTValues.EV])
-
-    event.recipes.gtceu.assembler('ae2wtlib:wireless_universal_terminal_ex')
-        .itemInputs(
-            'ae2wtlib:wireless_universal_terminal',
-            'ae2wtlib:wireless_pattern_encoding_terminal')
-        .itemOutputs(Item.of('ae2wtlib:wireless_universal_terminal', '{crafting:1b, ex_pattern_access:1b, pattern_encoding:1b}'))
-        .duration(300)
-        .EUt(GTValues.VA[GTValues.IV])
 }

kubejs/server_scripts/extended_ae2/recipes.js

@@ -574,6 +574,21 @@ const registerExtendedAE2Recipes = (event) => {
         .duration(30)
         .EUt(GTValues.VA[GTValues.IV])
 
+    event.shapeless('ae2wtlib:wireless_universal_terminal', ['expatternprovider:wireless_ex_pat', 'ae2wtlib:wireless_universal_terminal'])
+        .modifyResult((grid, result) => {
+            let orig = grid.find(Item.of('ae2wtlib:wireless_universal_terminal').ignoreNBT())
+            result = result.withNBT(orig.nbt);
+
+            if (orig.nbt == null) {
+                result.nbt = { ex_pattern_access: true };
+            }
+            else {
+                result.nbt.put('ex_pattern_access', true);
+            }
+
+            return result;
+        })
+    
     //#region ex molecular assembler
 
     // IV

kubejs/server_scripts/tfg/recipes.miscellaneous.js

@@ -48,7 +48,7 @@ function registerTFGMiscellaneousRecipes(event) {
 		.inputFluids(Fluid.of('tfg:conifer_pitch', 1000))
 		.itemInputs('tfc:powder/charcoal')
 		.itemOutputs('tfg:conifer_rosin')
-		.duration(20*12)
+		.duration(20 * 12)
 		.EUt(GTValues.VA[GTValues.LV])
 
 	// Decorative Vases
@@ -772,7 +772,7 @@ function registerTFGMiscellaneousRecipes(event) {
 			ChemicalHelper.get(TagPrefix.foil, GTMaterials.Aluminium, 2),
 			ChemicalHelper.get(TagPrefix.bolt, GTMaterials.Steel, 2),
 			ChemicalHelper.get(TagPrefix.rodLong,
-			GTMaterials.Aluminium, 1)
+				GTMaterials.Aluminium, 1)
 		)
 		.inputFluids(Fluid.of('gtceu:cobalt_brass', 144))
 		.itemOutputs('tfg:aluminium_harvest_basket')
@@ -1102,7 +1102,7 @@ function registerTFGMiscellaneousRecipes(event) {
 		.EUt(GTValues.VA[GTValues.MV])
 	event.recipes.gtceu.large_chemical_reactor('tfg:silica_gel_synthesis')
 		.inputFluids(Fluid.of('tfg:tmos', 1000), Fluid.of('gtceu:ethanol', 2000), Fluid.of('gtceu:distilled_water', 500),
-					 Fluid.of('gtceu:hydrochloric_acid', 100))
+			Fluid.of('gtceu:hydrochloric_acid', 100))
 		.outputFluids(Fluid.of('tfg:silica_gel', 1000))
 		.duration(300)
 		.EUt(GTValues.VA[GTValues.IV])
@@ -1130,148 +1130,148 @@ function registerTFGMiscellaneousRecipes(event) {
 	//#region Universal compost
 
 	//Greens
-		// Lows via crafting with mortar
+	// Lows via crafting with mortar
-		event.shaped(Item.of('tfg:universal_compost_greens', 1), [
+	event.shaped(Item.of('tfg:universal_compost_greens', 1), [
-			'AB'
+		'AB'
-		], {
+	], {
-			A: Ingredient.of(['#tfc:compost_greens_low']).subtract(['tfg:universal_compost_greens']),
+		A: Ingredient.of(['#tfc:compost_greens_low']).subtract(['tfg:universal_compost_greens']),
-			B: '#forge:tools/mortars'
+		B: '#forge:tools/mortars'
-		}).id('tfg:shaped/universal_compost_greens_from_low')
+	}).id('tfg:shaped/universal_compost_greens_from_low')
 
-		// Mediums via crafting with mortar
+	// Mediums via crafting with mortar
-		event.shaped(Item.of('tfg:universal_compost_greens', 2), [
+	event.shaped(Item.of('tfg:universal_compost_greens', 2), [
-			'AB'
+		'AB'
-		], {
+	], {
-			A: '#tfc:compost_greens',
+		A: '#tfc:compost_greens',
-			B: '#forge:tools/mortars'
+		B: '#forge:tools/mortars'
-		}).id('tfg:shaped/universal_compost_greens_from_medium')
+	}).id('tfg:shaped/universal_compost_greens_from_medium')
 
-		// Highs via crafting with mortar
+	// Highs via crafting with mortar
-		event.shaped(Item.of('tfg:universal_compost_greens', 4), [
+	event.shaped(Item.of('tfg:universal_compost_greens', 4), [
-			'AB'
+		'AB'
-		], {
+	], {
-			A: '#tfc:compost_greens_high',
+		A: '#tfc:compost_greens_high',
-			B: '#forge:tools/mortars'
+		B: '#forge:tools/mortars'
-		}).id('tfg:shaped/universal_compost_greens_from_high')
+	}).id('tfg:shaped/universal_compost_greens_from_high')
 
-		// Filters
+	// Filters
-		const greens_low = Ingredient.of('#tfc:compost_greens_low')
+	const greens_low = Ingredient.of('#tfc:compost_greens_low')
-		const browns_low = Ingredient.of('#tfc:compost_browns_low').itemIds
+	const browns_low = Ingredient.of('#tfc:compost_browns_low').itemIds
-		const greens_medium = Ingredient.of('#tfc:compost_greens')
+	const greens_medium = Ingredient.of('#tfc:compost_greens')
-		const browns_medium = Ingredient.of('#tfc:compost_browns').itemIds
+	const browns_medium = Ingredient.of('#tfc:compost_browns').itemIds
-		const greens_high = Ingredient.of('#tfc:compost_greens_high')
+	const greens_high = Ingredient.of('#tfc:compost_greens_high')
-		const browns_high = Ingredient.of('#tfc:compost_browns_high').itemIds
+	const browns_high = Ingredient.of('#tfc:compost_browns_high').itemIds
 
-		let low_filtered = greens_low
+	let low_filtered = greens_low
-		let medium_filtered = greens_medium
+	let medium_filtered = greens_medium
-		let high_filtered = greens_high
+	let high_filtered = greens_high
 
-		browns_low.forEach(item => {
+	browns_low.forEach(item => {
-			low_filtered = low_filtered.subtract(item)
+		low_filtered = low_filtered.subtract(item)
-			low_filtered = low_filtered.subtract('tfg:universal_compost_greens')
+		low_filtered = low_filtered.subtract('tfg:universal_compost_greens')
-		})
+	})
-		browns_medium.forEach(item => {
+	browns_medium.forEach(item => {
-			medium_filtered = medium_filtered.subtract(item)
+		medium_filtered = medium_filtered.subtract(item)
-		})
+	})
-		browns_high.forEach(item => {
+	browns_high.forEach(item => {
-			high_filtered = high_filtered.subtract(item)
+		high_filtered = high_filtered.subtract(item)
-		})
+	})
 
-		// Lows via forge hammer
+	// Lows via forge hammer
-		event.recipes.gtceu.forge_hammer('tfg:universal_compost_greens_low')
+	event.recipes.gtceu.forge_hammer('tfg:universal_compost_greens_low')
-			.itemInputs(low_filtered)
+		.itemInputs(low_filtered)
-			.itemOutputs('tfg:universal_compost_greens')
+		.itemOutputs('tfg:universal_compost_greens')
-			.duration(20)
+		.duration(20)
-			.EUt(8)
+		.EUt(8)
 
-		// Mediums via forge hammer
+	// Mediums via forge hammer
-		event.recipes.gtceu.forge_hammer('tfg:universal_compost_greens_medium')
+	event.recipes.gtceu.forge_hammer('tfg:universal_compost_greens_medium')
-			.itemInputs(medium_filtered)
+		.itemInputs(medium_filtered)
-			.itemOutputs(Item.of('tfg:universal_compost_greens', 2))
+		.itemOutputs(Item.of('tfg:universal_compost_greens', 2))
-			.duration(20)
+		.duration(20)
-			.EUt(8)
+		.EUt(8)
 
-		// Highs via forge hammer
+	// Highs via forge hammer
-		event.recipes.gtceu.forge_hammer('tfg:universal_compost_greens_high')
+	event.recipes.gtceu.forge_hammer('tfg:universal_compost_greens_high')
-			.itemInputs(high_filtered)
+		.itemInputs(high_filtered)
-			.itemOutputs(Item.of('tfg:universal_compost_greens', 4))
+		.itemOutputs(Item.of('tfg:universal_compost_greens', 4))
-			.duration(20)
+		.duration(20)
-			.EUt(8)
+		.EUt(8)
 
 	//Browns
-		// Lows via crafting with mortar
+	// Lows via crafting with mortar
-		event.shaped(Item.of('tfg:universal_compost_browns', 1), [
+	event.shaped(Item.of('tfg:universal_compost_browns', 1), [
-			'BA'
+		'BA'
-		], {
+	], {
-			A: Ingredient.of(['#tfc:compost_browns_low']).subtract(['tfg:universal_compost_browns']),
+		A: Ingredient.of(['#tfc:compost_browns_low']).subtract(['tfg:universal_compost_browns']),
-			B: '#forge:tools/mortars'
+		B: '#forge:tools/mortars'
-		}).id('tfg:shaped/universal_compost_browns_from_low')
+	}).id('tfg:shaped/universal_compost_browns_from_low')
 
-		// Mediums via crafting with mortar
+	// Mediums via crafting with mortar
-		event.shaped(Item.of('tfg:universal_compost_browns', 2), [
+	event.shaped(Item.of('tfg:universal_compost_browns', 2), [
-			'BA'
+		'BA'
-		], {
+	], {
-			A: '#tfc:compost_browns',
+		A: '#tfc:compost_browns',
-			B: '#forge:tools/mortars'
+		B: '#forge:tools/mortars'
-		}).id('tfg:shaped/universal_compost_browns_from_medium')
+	}).id('tfg:shaped/universal_compost_browns_from_medium')
 
-		// Highs via crafting with mortar
+	// Highs via crafting with mortar
-		event.shaped(Item.of('tfg:universal_compost_browns', 4), [
+	event.shaped(Item.of('tfg:universal_compost_browns', 4), [
-			'BA'
+		'BA'
-		], {
+	], {
-			A: '#tfc:compost_browns_high',
+		A: '#tfc:compost_browns_high',
-			B: '#forge:tools/mortars'
+		B: '#forge:tools/mortars'
-		}).id('tfg:shaped/universal_compost_browns_from_high')
+	}).id('tfg:shaped/universal_compost_browns_from_high')
 
-		// Lows via forge hammer
+	// Lows via forge hammer
-		event.recipes.gtceu.forge_hammer('tfg:universal_compost_browns_low')
+	event.recipes.gtceu.forge_hammer('tfg:universal_compost_browns_low')
-			.itemInputs('#tfc:compost_browns_low')
+		.itemInputs('#tfc:compost_browns_low')
-			.itemOutputs('tfg:universal_compost_browns')
+		.itemOutputs('tfg:universal_compost_browns')
-			.duration(20)
+		.duration(20)
-			.EUt(8)
+		.EUt(8)
 
-		// Mediums via forge hammer
+	// Mediums via forge hammer
-		event.recipes.gtceu.forge_hammer('tfg:universal_compost_browns_medium')
+	event.recipes.gtceu.forge_hammer('tfg:universal_compost_browns_medium')
-			.itemInputs('#tfc:compost_browns')
+		.itemInputs('#tfc:compost_browns')
-			.itemOutputs(Item.of('tfg:universal_compost_browns', 2))
+		.itemOutputs(Item.of('tfg:universal_compost_browns', 2))
-			.duration(20)
+		.duration(20)
-			.EUt(8)
+		.EUt(8)
 
-		// Highs via forge hammer
+	// Highs via forge hammer
-		event.recipes.gtceu.forge_hammer('tfg:universal_compost_browns_high')
+	event.recipes.gtceu.forge_hammer('tfg:universal_compost_browns_high')
-			.itemInputs('#tfc:compost_browns_high')
+		.itemInputs('#tfc:compost_browns_high')
-			.itemOutputs(Item.of('tfg:universal_compost_browns', 4))
+		.itemOutputs(Item.of('tfg:universal_compost_browns', 4))
-			.duration(20)
+		.duration(20)
-			.EUt(8)
+		.EUt(8)
 
 	//#endregion
 
 	// Etching Tip
-	event.recipes.tfc.damage_inputs_shapeless_crafting(event.recipes.minecraft.crafting_shapeless('tfg:etching_diamond_tip',[
+	event.recipes.tfc.damage_inputs_shapeless_crafting(event.recipes.minecraft.crafting_shapeless('tfg:etching_diamond_tip', [
 		'#forge:tools/hammers',
 		'#tfc:chisels',
 		'minecraft:diamond'
 	]));
 
-	event.replaceInput({ id: "minecraft:jukebox"}, 'minecraft:diamond', 'tfg:etching_diamond_tip');
+	event.replaceInput({ id: "minecraft:jukebox" }, 'minecraft:diamond', 'tfg:etching_diamond_tip');
 
 	//Large Nest
 	event.shaped('tfg:large_nest_box',
-	[
+		[
-		'B B',
+			'B B',
-		'ABA',
+			'ABA',
-		'AAA'
+			'AAA'
-	], {
+		], {
 		A: 'beneath:crimson_thatch',
 		B: 'beneath:crimson_straw'
 	}).id('tfg:shaped_large_nest_crimson')
 
 	event.shaped('tfg:large_nest_box_warped',
-	[
+		[
-		'B B',
+			'B B',
-		'ABA',
+			'ABA',
-		'AAA'
+			'AAA'
-	], {
+		], {
 		A: 'beneath:warped_thatch',
 		B: 'beneath:warped_straw'
 	}).id('tfg:shaped_large_nest_warped')
@@ -1304,7 +1304,7 @@ function registerTFGMiscellaneousRecipes(event) {
 	event.custom({
 		type: 'vintageimprovements:centrifugation',
 		ingredients: [{ item: 'tfg:flax_product' }],
-		results: [{ item: 'tfg:flax_line', count: 2 }, { item: 'tfg:flax_tow' }, { item: 'tfc:groundcover/humus' } ],
+		results: [{ item: 'tfg:flax_line', count: 2 }, { item: 'tfg:flax_tow' }, { item: 'tfc:groundcover/humus' }],
 		processingTime: 40 * 10 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER
 	}).id('tfg:vi_seperate_flax')
 
@@ -1367,7 +1367,7 @@ function registerTFGMiscellaneousRecipes(event) {
 
 	event.recipes.gtceu.assembler('tfg:titanium_concrete')
 		.itemInputs('2x #forge:rods/titanium', '4x #forge:dusts/kaolinite')
-		.inputFluids(Fluid.of('gtceu:concrete', 144*1.5))
+		.inputFluids(Fluid.of('gtceu:concrete', 144 * 1.5))
 		.itemOutputs('tfg:titanium_concrete')
 		.circuit(2)
 		.duration(20)
@@ -1404,4 +1404,19 @@ function registerTFGMiscellaneousRecipes(event) {
 		.duration(20 * (2.5))
 		.EUt(GTValues.VA[GTValues.LV])
 
+	// Interplanetary ae2 card
+
+	event.recipes.gtceu.assembler('tfg:wireless_card')
+		.itemInputs(
+			'ae2:advanced_card',
+			'4x ae2:wireless_booster',
+			'ae2:cell_component_16k',
+			'2x ae2:wireless_receiver',
+			'2x gtceu:ev_emitter',
+			'#forge:exquisite_gems/fluix',
+			'2x #forge:plates/ruthenium')
+		.inputFluids(Fluid.of('gtceu:epoxy', 144))
+		.itemOutputs('tfg:wireless_card')
+		.duration(300)
+		.EUt(GTValues.VA[GTValues.EV])
 }