diff --git a/.github/README.md b/.github/README.md index 6df9ecba8..78fe64d0f 100644 --- a/.github/README.md +++ b/.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 + [TerraFirmaCraft]: https://www.curseforge.com/minecraft/mc-mods/terrafirmacraft [GregTech Modern]: https://www.curseforge.com/minecraft/mc-mods/gregtechceu-modern diff --git a/kubejs/assets/tfg/models/item/ev_universal_circuit.json b/kubejs/assets/tfg/models/item/ev_universal_circuit.json new file mode 100644 index 000000000..cad7c45dd --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/hv_universal_circuit.json b/kubejs/assets/tfg/models/item/hv_universal_circuit.json new file mode 100644 index 000000000..317da660a --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/iv_universal_circuit.json b/kubejs/assets/tfg/models/item/iv_universal_circuit.json new file mode 100644 index 000000000..9f7916b18 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/luv_universal_circuit.json b/kubejs/assets/tfg/models/item/luv_universal_circuit.json new file mode 100644 index 000000000..2cfd3577f --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/lv_universal_circuit.json b/kubejs/assets/tfg/models/item/lv_universal_circuit.json new file mode 100644 index 000000000..5ecd6f2bf --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/mv_universal_circuit.json b/kubejs/assets/tfg/models/item/mv_universal_circuit.json new file mode 100644 index 000000000..1ffeeb221 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/uhv_universal_circuit.json b/kubejs/assets/tfg/models/item/uhv_universal_circuit.json new file mode 100644 index 000000000..7359500fa --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/ulv_universal_circuit.json b/kubejs/assets/tfg/models/item/ulv_universal_circuit.json new file mode 100644 index 000000000..87d49760e --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/uv_universal_circuit.json b/kubejs/assets/tfg/models/item/uv_universal_circuit.json new file mode 100644 index 000000000..5686bd295 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/zpm_universal_circuit.json b/kubejs/assets/tfg/models/item/zpm_universal_circuit.json new file mode 100644 index 000000000..42ea1a7fe --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/universal/ev_universal_circuit.png b/kubejs/assets/tfg/textures/item/universal/ev_universal_circuit.png new file mode 100644 index 000000000..12df0edd8 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/universal/ev_universal_circuit.png differ diff --git a/kubejs/assets/tfg/textures/item/universal/ev_universal_circuit.png.mcmeta b/kubejs/assets/tfg/textures/item/universal/ev_universal_circuit.png.mcmeta new file mode 100644 index 000000000..114c427b7 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/universal/ev_universal_circuit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 2 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/universal/hv_universal_circuit.png b/kubejs/assets/tfg/textures/item/universal/hv_universal_circuit.png new file mode 100644 index 000000000..f092049c9 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/universal/hv_universal_circuit.png differ diff --git a/kubejs/assets/tfg/textures/item/universal/hv_universal_circuit.png.mcmeta b/kubejs/assets/tfg/textures/item/universal/hv_universal_circuit.png.mcmeta new file mode 100644 index 000000000..114c427b7 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/universal/hv_universal_circuit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 2 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/universal/iv_universal_circuit.png b/kubejs/assets/tfg/textures/item/universal/iv_universal_circuit.png new file mode 100644 index 000000000..8ed7c7b85 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/universal/iv_universal_circuit.png differ diff --git a/kubejs/assets/tfg/textures/item/universal/iv_universal_circuit.png.mcmeta b/kubejs/assets/tfg/textures/item/universal/iv_universal_circuit.png.mcmeta new file mode 100644 index 000000000..114c427b7 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/universal/iv_universal_circuit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 2 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/universal/luv_universal_circuit.png b/kubejs/assets/tfg/textures/item/universal/luv_universal_circuit.png new file mode 100644 index 000000000..0edfc0265 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/universal/luv_universal_circuit.png differ diff --git a/kubejs/assets/tfg/textures/item/universal/luv_universal_circuit.png.mcmeta b/kubejs/assets/tfg/textures/item/universal/luv_universal_circuit.png.mcmeta new file mode 100644 index 000000000..55ab3d7c1 --- /dev/null +++ b/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 + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/universal/lv_universal_circuit.png b/kubejs/assets/tfg/textures/item/universal/lv_universal_circuit.png new file mode 100644 index 000000000..9382206eb Binary files /dev/null and b/kubejs/assets/tfg/textures/item/universal/lv_universal_circuit.png differ diff --git a/kubejs/assets/tfg/textures/item/universal/lv_universal_circuit.png.mcmeta b/kubejs/assets/tfg/textures/item/universal/lv_universal_circuit.png.mcmeta new file mode 100644 index 000000000..114c427b7 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/universal/lv_universal_circuit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 2 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/universal/mv_universal_circuit.png b/kubejs/assets/tfg/textures/item/universal/mv_universal_circuit.png new file mode 100644 index 000000000..cef90ff6c Binary files /dev/null and b/kubejs/assets/tfg/textures/item/universal/mv_universal_circuit.png differ diff --git a/kubejs/assets/tfg/textures/item/universal/mv_universal_circuit.png.mcmeta b/kubejs/assets/tfg/textures/item/universal/mv_universal_circuit.png.mcmeta new file mode 100644 index 000000000..114c427b7 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/universal/mv_universal_circuit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 2 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/universal/uev_universal_circuit.png b/kubejs/assets/tfg/textures/item/universal/uev_universal_circuit.png new file mode 100644 index 000000000..ed048ab04 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/universal/uev_universal_circuit.png differ diff --git a/kubejs/assets/tfg/textures/item/universal/uev_universal_circuit.png.mcmeta b/kubejs/assets/tfg/textures/item/universal/uev_universal_circuit.png.mcmeta new file mode 100644 index 000000000..114c427b7 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/universal/uev_universal_circuit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 2 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/universal/uhv_universal_circuit.png b/kubejs/assets/tfg/textures/item/universal/uhv_universal_circuit.png new file mode 100644 index 000000000..1a4ab2d76 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/universal/uhv_universal_circuit.png differ diff --git a/kubejs/assets/tfg/textures/item/universal/uhv_universal_circuit.png.mcmeta b/kubejs/assets/tfg/textures/item/universal/uhv_universal_circuit.png.mcmeta new file mode 100644 index 000000000..55ab3d7c1 --- /dev/null +++ b/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 + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/universal/uiv_universal_circuit.png b/kubejs/assets/tfg/textures/item/universal/uiv_universal_circuit.png new file mode 100644 index 000000000..a366c4470 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/universal/uiv_universal_circuit.png differ diff --git a/kubejs/assets/tfg/textures/item/universal/uiv_universal_circuit.png.mcmeta b/kubejs/assets/tfg/textures/item/universal/uiv_universal_circuit.png.mcmeta new file mode 100644 index 000000000..55ab3d7c1 --- /dev/null +++ b/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 + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/universal/ulv_universal_circuit.png b/kubejs/assets/tfg/textures/item/universal/ulv_universal_circuit.png new file mode 100644 index 000000000..2ae01ee89 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/universal/ulv_universal_circuit.png differ diff --git a/kubejs/assets/tfg/textures/item/universal/ulv_universal_circuit.png.mcmeta b/kubejs/assets/tfg/textures/item/universal/ulv_universal_circuit.png.mcmeta new file mode 100644 index 000000000..55ab3d7c1 --- /dev/null +++ b/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 + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/universal/uv_universal_circuit.png b/kubejs/assets/tfg/textures/item/universal/uv_universal_circuit.png new file mode 100644 index 000000000..e272cfe04 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/universal/uv_universal_circuit.png differ diff --git a/kubejs/assets/tfg/textures/item/universal/uv_universal_circuit.png.mcmeta b/kubejs/assets/tfg/textures/item/universal/uv_universal_circuit.png.mcmeta new file mode 100644 index 000000000..114c427b7 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/universal/uv_universal_circuit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 2 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/universal/zpm_universal_circuit.png b/kubejs/assets/tfg/textures/item/universal/zpm_universal_circuit.png new file mode 100644 index 000000000..8cbc00163 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/universal/zpm_universal_circuit.png differ diff --git a/kubejs/assets/tfg/textures/item/universal/zpm_universal_circuit.png.mcmeta b/kubejs/assets/tfg/textures/item/universal/zpm_universal_circuit.png.mcmeta new file mode 100644 index 000000000..114c427b7 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/universal/zpm_universal_circuit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "interpolate": true, + "frametime": 2 + } +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index 691d19987..140b6e8b2 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/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}`); + }); } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 7ec9d57f6..f19ff1179 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/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') diff --git a/kubejs/startup_scripts/gtceu/items.js b/kubejs/startup_scripts/gtceu/items.js index 840068717..97fe73a29 100644 --- a/kubejs/startup_scripts/gtceu/items.js +++ b/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') + } diff --git a/kubejs/startup_scripts/tfg/constants.js b/kubejs/startup_scripts/tfg/constants.js index baeaa7533..72ad3a186 100644 --- a/kubejs/startup_scripts/tfg/constants.js +++ b/kubejs/startup_scripts/tfg/constants.js @@ -17,4 +17,6 @@ global.AIRCRAFT_UPGRADES = [ "aluminium_hull_reinforcement", "stainless_steel_hull_reinforcement", "titanium_hull_reinforcement" -] \ No newline at end of file +] + +global.UNIVERSAL_CIRCUIT_TIERS = ["ulv", "lv", "mv", "hv", "ev", "iv", "luv", "zpm", "uv", "uhv"]; \ No newline at end of file