Merge branch 'dev' into dev

Signed-off-by: Pyritie <pyritie@gmail.com>

.github/README.md

@@ -59,6 +59,10 @@ Interested in contributing? For detailed setup instructions, coding standards, a
 
 ![Image Readme](https://github.com/TerraFirmaGreg-Team/.github/blob/main/branding/image_readme.png?raw=true)
 
+### External Credits
+- WithersChat from the Monifactory team for the universal circuit textures
+- GregTech Community Pack Modern for most of their quest text
+
 <!-- Links: -->
 [TerraFirmaCraft]: https://www.curseforge.com/minecraft/mc-mods/terrafirmacraft
 [GregTech Modern]: https://www.curseforge.com/minecraft/mc-mods/gregtechceu-modern

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

kubejs/assets/tfg/textures/item/universal/ev_universal_circuit.png.mcmeta

@@ -0,0 +1,6 @@
+{
+  "animation": {
+	"interpolate": true,
+  "frametime": 2
+  }
+}

kubejs/assets/tfg/textures/item/universal/hv_universal_circuit.png.mcmeta

@@ -0,0 +1,6 @@
+{
+  "animation": {
+	"interpolate": true,
+  "frametime": 2
+  }
+}

kubejs/assets/tfg/textures/item/universal/iv_universal_circuit.png.mcmeta

@@ -0,0 +1,6 @@
+{
+  "animation": {
+	"interpolate": true,
+  "frametime": 2
+  }
+}

kubejs/assets/tfg/textures/item/universal/luv_universal_circuit.png.mcmeta

@@ -0,0 +1,16 @@
+{
+  "animation": {
+	"interpolate": true,
+  "frametime": 2,
+	"frames": [
+    0,
+    1,
+    2,
+    3,
+    4,
+    5,
+    6,
+    6
+    ]
+  }
+}

kubejs/assets/tfg/textures/item/universal/lv_universal_circuit.png.mcmeta

@@ -0,0 +1,6 @@
+{
+  "animation": {
+	"interpolate": true,
+  "frametime": 2
+  }
+}

kubejs/assets/tfg/textures/item/universal/mv_universal_circuit.png.mcmeta

@@ -0,0 +1,6 @@
+{
+  "animation": {
+	"interpolate": true,
+  "frametime": 2
+  }
+}

kubejs/assets/tfg/textures/item/universal/uev_universal_circuit.png.mcmeta

@@ -0,0 +1,6 @@
+{
+  "animation": {
+	"interpolate": true,
+  "frametime": 2
+  }
+}

kubejs/assets/tfg/textures/item/universal/uhv_universal_circuit.png.mcmeta

@@ -0,0 +1,16 @@
+{
+  "animation": {
+	"interpolate": true,
+  "frametime": 2,
+	"frames": [
+    0,
+    1,
+    2,
+    3,
+    4,
+    5,
+    6,
+    6
+    ]
+  }
+}

kubejs/assets/tfg/textures/item/universal/uiv_universal_circuit.png.mcmeta

@@ -0,0 +1,16 @@
+{
+  "animation": {
+	"interpolate": true,
+  "frametime": 2,
+	"frames": [
+    0,
+    1,
+    2,
+    3,
+    4,
+    5,
+    6,
+    6
+    ]
+  }
+}

kubejs/assets/tfg/textures/item/universal/ulv_universal_circuit.png.mcmeta

@@ -0,0 +1,16 @@
+{
+  "animation": {
+	"interpolate": true,
+  "frametime": 2,
+	"frames": [
+    0,
+    1,
+    2,
+    3,
+    4,
+    5,
+    6,
+    6
+    ]
+  }
+}

kubejs/assets/tfg/textures/item/universal/uv_universal_circuit.png.mcmeta

@@ -0,0 +1,6 @@
+{
+  "animation": {
+	"interpolate": true,
+  "frametime": 2
+  }
+}

kubejs/assets/tfg/textures/item/universal/zpm_universal_circuit.png.mcmeta

@@ -0,0 +1,6 @@
+{
+  "animation": {
+	"interpolate": true,
+  "frametime": 2
+  }
+}

kubejs/server_scripts/tfg/recipes.miscellaneous.js

@@ -372,4 +372,10 @@ function registerTFGMiscellaneousRecipes(event) {
             'minecraft:phantom_membrane',
             'tfc:spindle'
         ]).id('tfg:shapeless/phantom_thread'))
+  
+	// Universal Circuit
+	global.UNIVERSAL_CIRCUIT_TIERS.forEach(tier => {
+		event.shapeless(Item.of(`tfg:${tier}_universal_circuit`, 1),  [Ingredient.of([`#gtceu:circuits/${tier}`]).subtract([`tfg:${tier}_universal_circuit`])]
+			).id(`universal_circuits_${tier}`);
+	});
 }

kubejs/server_scripts/tfg/tags.js

@@ -119,6 +119,16 @@ const registerTFGItemTags = (event) => {
 		event.add('immersive_aircraft:upgrades', `tfg:${value}`);
 	})
 
+	// #endregion
+
+	// Universal Circuits
+
+		global.UNIVERSAL_CIRCUIT_TIERS.forEach(tier => {
+			event.add(`gtceu:circuits/${tier}`, `tfg:${tier}_universal_circuit`);
+			})
+
+	// #endregion
+
 	// #region 0.7.19 -> 0.9 conversion
 
 	event.add('c:hidden_from_recipe_viewers', 'treetap:tap')

kubejs/startup_scripts/gtceu/items.js

@@ -1,4 +1,35 @@
 // priority: 0
 
 const registerGTCEuItems = (event) => {
+
+    event.create('tfg:ulv_universal_circuit')
+    .translationKey('item.ulv_universal_circuit')
+
+    event.create('tfg:lv_universal_circuit')
+    .translationKey('item.lv_universal_circuit')
+
+    event.create('tfg:mv_universal_circuit')
+    .translationKey('item.mv_universal_circuit')
+
+    event.create('tfg:hv_universal_circuit')
+    .translationKey('item.hv_universal_circuit')
+
+    event.create('tfg:ev_universal_circuit')
+    .translationKey('item.ev_universal_circuit')
+
+    event.create('tfg:iv_universal_circuit')
+    .translationKey('item.iv_universal_circuit')
+
+    event.create('tfg:luv_universal_circuit')
+    .translationKey('item.luv_universal_circuit')
+
+    event.create('tfg:zpm_universal_circuit')
+    .translationKey('item.zpm_universal_circuit')
+
+    event.create('tfg:uv_universal_circuit')
+    .translationKey('item.uv_universal_circuit')
+
+    event.create('tfg:uhv_universal_circuit')
+    .translationKey('item.uhv_universal_circuit')
+
 }

kubejs/startup_scripts/tfg/constants.js

@@ -17,4 +17,6 @@ global.AIRCRAFT_UPGRADES = [
     "aluminium_hull_reinforcement",
     "stainless_steel_hull_reinforcement",
     "titanium_hull_reinforcement"
-]
+]
+
+global.UNIVERSAL_CIRCUIT_TIERS = ["ulv", "lv", "mv", "hv", "ev", "iv", "luv", "zpm", "uv", "uhv"];