From f844601b55b0ce7ee9a0376ebbee21c0b0e341d5 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 15 Aug 2025 21:40:02 +0100 Subject: [PATCH 01/26] adding meat tag to cruncher foods --- kubejs/server_scripts/species/tags.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kubejs/server_scripts/species/tags.js b/kubejs/server_scripts/species/tags.js index 7fa969ebb..509b6c004 100644 --- a/kubejs/server_scripts/species/tags.js +++ b/kubejs/server_scripts/species/tags.js @@ -17,4 +17,6 @@ const registerSpeciesItemTags = (event) => { event.add('forge:eggs', 'species:birt_egg') event.add('firmalife:foods/raw_eggs', 'species:birt_egg') + + event.add('species:cruncher_eats', '#tfc:foods/meat') } \ No newline at end of file From 7b559cedf1266c085ad974e8a4affe0571decb40 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 15 Aug 2025 22:04:15 +0100 Subject: [PATCH 02/26] pakku --- pakku-lock.json | 426 ++++++++++++++++-------------------------------- 1 file changed, 139 insertions(+), 287 deletions(-) diff --git a/pakku-lock.json b/pakku-lock.json index 39fd6607a..11abef3a0 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -330,88 +330,6 @@ } ] }, - { - "pakku_id": "FUkrlSRxJw3vXHSa", - "pakku_links": [ - "tnanmdYAjMuu9igL", - "KXDQAyIcviU2Sjy6", - "6GwMQIiEZI9QEBDy", - "Grz0T2HLTDSCXa81", - "7KKvgCCVN5ojt885" - ], - "type": "MOD", - "side": "SERVER", - "slug": { - "curseforge": "adaptive-performance-tweaks", - "modrinth": "adaptive-performance-tweaks" - }, - "name": { - "curseforge": "Adaptive Performance Tweaks (Bundle)", - "modrinth": "Adaptive Performance Tweaks (Bundle)" - }, - "id": { - "curseforge": "450269", - "modrinth": "kLawTYXp" - }, - "files": [ - { - "type": "curseforge", - "file_name": "adaptive_performance_tweaks_1.20.1-11.3.0.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "neoforge", - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/5815/115/adaptive_performance_tweaks_1.20.1-11.3.0.jar", - "id": "5815115", - "parent_id": "450269", - "hashes": { - "sha1": "94ab2b5d35927a7f49f084d5f6e49536595265f2", - "md5": "aa1fdeef9d4904cdbd829f383ce6d5b1" - }, - "required_dependencies": [ - "563963", - "561439", - "561137", - "573708", - "561087" - ], - "size": 51871, - "date_published": "2024-10-15T20:03:16.933Z" - }, - { - "type": "modrinth", - "file_name": "adaptive_performance_tweaks_1.20.1-11.3.0.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge", - "neoforge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/kLawTYXp/versions/ePPNLu7Z/adaptive_performance_tweaks_1.20.1-11.3.0.jar", - "id": "ePPNLu7Z", - "parent_id": "kLawTYXp", - "hashes": { - "sha512": "6e785769d0cebda631f94cc7ab3306f8d233850ddf2d62ebe8d6997c2b53267f29576b5090b7126ab585b1f3b60ed544f6a54d039209bb2f53fdb0be9733beb1", - "sha1": "f868ec75ef3266af8cfa3ae6fb0048cef35bc23f" - }, - "required_dependencies": [ - "Rd89yO7d", - "jr5nzfKv", - "217PsbJI", - "L5xaBiBb", - "z3TjJLQ0" - ], - "size": 51871, - "date_published": "2024-10-15T20:02:30.798649Z" - } - ] - }, { "pakku_id": "7KKvgCCVN5ojt885", "type": "MOD", @@ -685,76 +603,6 @@ } ] }, - { - "pakku_id": "Grz0T2HLTDSCXa81", - "pakku_links": [ - "7KKvgCCVN5ojt885" - ], - "type": "MOD", - "side": "SERVER", - "slug": { - "curseforge": "adaptive-performance-tweaks-spawn", - "modrinth": "adaptive-performance-tweaks-spawn" - }, - "name": { - "curseforge": "Adaptive Performance Tweaks: Spawn", - "modrinth": "Adaptive Performance Tweaks: Spawn" - }, - "id": { - "curseforge": "573708", - "modrinth": "217PsbJI" - }, - "files": [ - { - "type": "curseforge", - "file_name": "adaptive_performance_tweaks_spawn_1.20.1-11.3.0.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "neoforge", - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/5815/121/adaptive_performance_tweaks_spawn_1.20.1-11.3.0.jar", - "id": "5815121", - "parent_id": "573708", - "hashes": { - "sha1": "a933f6adb6e7b614eeff180acb20a64b5777ef41", - "md5": "aeab7fbc8d6309ff43b197e3c407c104" - }, - "required_dependencies": [ - "561087" - ], - "size": 143593, - "date_published": "2024-10-15T20:03:31.823Z" - }, - { - "type": "modrinth", - "file_name": "adaptive_performance_tweaks_spawn_1.20.1-11.3.0.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge", - "neoforge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/217PsbJI/versions/suOxhIlo/adaptive_performance_tweaks_spawn_1.20.1-11.3.0.jar", - "id": "suOxhIlo", - "parent_id": "217PsbJI", - "hashes": { - "sha512": "dd9a2e508db6ac0f22636fd974ccf2f2e1e7de4e2740704364bb3a086ae8d933b97b6fb0306f49f89cdd5bdcbfa78202e10ef935c307a869ed8d2561da3a04fb", - "sha1": "d3f2cc11a1d37042d4c94c199f08d2e0edfa18ed" - }, - "required_dependencies": [ - "L5xaBiBb" - ], - "size": 143593, - "date_published": "2024-10-15T20:03:03.303293Z" - } - ] - }, { "pakku_id": "O7PVs47VlRBYKE7b", "type": "MOD", @@ -901,7 +749,7 @@ "files": [ { "type": "curseforge", - "file_name": "alltheleaks-0.1.4-beta+1.20.1-forge.jar", + "file_name": "alltheleaks-1.0.0+1.20.1-forge.jar", "mc_versions": [ "1.20.1" ], @@ -909,16 +757,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6482/449/alltheleaks-0.1.4-beta+1.20.1-forge.jar", - "id": "6482449", + "url": "https://edge.forgecdn.net/files/6874/194/alltheleaks-1.0.0+1.20.1-forge.jar", + "id": "6874194", "parent_id": "1091339", "hashes": { - "sha1": "31064c1cebcc90d9e914f1e17a5530385e14544d", - "md5": "bc2454a8103dbf517bb3145f4528bc25" + "sha1": "24e32ff985ceac5ef964d49b76764ed6c700ac2e", + "md5": "baa29b8a4c714ea6bbc23a6cfd36c778" }, "required_dependencies": [], - "size": 523888, - "date_published": "2025-05-01T04:32:00.873Z" + "size": 1134422, + "date_published": "2025-08-11T09:03:47.890Z" } ] }, @@ -4022,7 +3870,7 @@ "files": [ { "type": "modrinth", - "file_name": "create_hypertube-0.2.4-FORGE.jar", + "file_name": "create_hypertube-0.2.5-FORGE.jar", "mc_versions": [ "1.20.1", "1.20.2", @@ -4036,22 +3884,22 @@ "neoforge" ], "release_type": "beta", - "url": "https://cdn.modrinth.com/data/ATDdrG1y/versions/zRjvJvQr/create_hypertube-0.2.4-FORGE.jar", - "id": "zRjvJvQr", + "url": "https://cdn.modrinth.com/data/ATDdrG1y/versions/oT3tlxGs/create_hypertube-0.2.5-FORGE.jar", + "id": "oT3tlxGs", "parent_id": "ATDdrG1y", "hashes": { - "sha512": "debb83aa50948e4eca156017b3d2829c4d398e269800c651a0780c8150be1bbcd06dbf2fc2bfc58f869e2c981b5d1e8613d183687a6b6b07bd19fe326b3e08e6", - "sha1": "50e52ef50bd0b2e559d3fc52ffa7aa2ded94326c" + "sha512": "ffd47f1726bec14456a5a322e104bde942b64ea9a123d8fb3563453a7f762c580aa1732ea0917ad75714cae3fde70e16e9f38fd9952873abf205eab2dfd384ab", + "sha1": "d46bd8d5ae6ac25da9974062b0796172f698bfec" }, "required_dependencies": [ "LNytGWDc" ], - "size": 310191, - "date_published": "2025-07-23T12:37:18.369082Z" + "size": 346735, + "date_published": "2025-08-12T12:11:17.628568Z" }, { "type": "curseforge", - "file_name": "create_hypertube-0.2.4-FORGE.jar", + "file_name": "create_hypertube-0.2.5-FORGE.jar", "mc_versions": [ "1.20.1" ], @@ -4060,18 +3908,18 @@ "forge" ], "release_type": "beta", - "url": "https://edge.forgecdn.net/files/6802/739/create_hypertube-0.2.4-FORGE.jar", - "id": "6802739", + "url": "https://edge.forgecdn.net/files/6878/308/create_hypertube-0.2.5-FORGE.jar", + "id": "6878308", "parent_id": "1281336", "hashes": { - "sha1": "50e52ef50bd0b2e559d3fc52ffa7aa2ded94326c", - "md5": "916f77844a0ab19a73a1e3d56f9467d7" + "sha1": "d46bd8d5ae6ac25da9974062b0796172f698bfec", + "md5": "03784416aec9ac6193244a1b422179a7" }, "required_dependencies": [ "328085" ], - "size": 310191, - "date_published": "2025-07-23T12:33:14.783Z" + "size": 346735, + "date_published": "2025-08-12T12:05:31.173Z" } ] }, @@ -4222,30 +4070,9 @@ "modrinth": "Rw1NrDzF" }, "files": [ - { - "type": "curseforge", - "file_name": "Cucumber-1.20.1-7.0.14.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6680/445/Cucumber-1.20.1-7.0.14.jar", - "id": "6680445", - "parent_id": "272335", - "hashes": { - "sha1": "1d1f273c170dc4a2b5ff74216391838f453e536f", - "md5": "b653feea3bbf291bda7b7f2ef247758a" - }, - "required_dependencies": [], - "size": 269589, - "date_published": "2025-06-21T21:06:53.023Z" - }, { "type": "modrinth", - "file_name": "Cucumber-1.20.1-7.0.14.jar", + "file_name": "Cucumber-1.20.1-7.0.15.jar", "mc_versions": [ "1.20.1" ], @@ -4253,16 +4080,37 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/Rw1NrDzF/versions/HlbDwsPk/Cucumber-1.20.1-7.0.14.jar", - "id": "HlbDwsPk", + "url": "https://cdn.modrinth.com/data/Rw1NrDzF/versions/tHDveaxK/Cucumber-1.20.1-7.0.15.jar", + "id": "tHDveaxK", "parent_id": "Rw1NrDzF", "hashes": { - "sha512": "8b86f68b07eed47b989eefcf38f2ac8f0589b976c8ddc7b8ef00e25738e0fe1754f9d2cb0f2f287049e5da548380b95fab6f9631a55b323bcc419719d0e716ad", - "sha1": "1d1f273c170dc4a2b5ff74216391838f453e536f" + "sha512": "9ee45676c1acf8979835610e3f06163a7c69c1fcef872246f118e5dc5c387c9457736c50c7bad63e8319f4e5b75a58e731f49eeb8bfced9c92d1583b43a9afe2", + "sha1": "f376bdf46bce7d9d8cf275b05899e1abaed98c3b" }, "required_dependencies": [], - "size": 269589, - "date_published": "2025-06-21T21:06:55.448902Z" + "size": 269566, + "date_published": "2025-08-12T22:57:16.961925Z" + }, + { + "type": "curseforge", + "file_name": "Cucumber-1.20.1-7.0.15.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6880/321/Cucumber-1.20.1-7.0.15.jar", + "id": "6880321", + "parent_id": "272335", + "hashes": { + "sha1": "f376bdf46bce7d9d8cf275b05899e1abaed98c3b", + "md5": "84949e197a71b5f20a99532bd082cea6" + }, + "required_dependencies": [], + "size": 269566, + "date_published": "2025-08-12T22:57:15.407Z" } ] }, @@ -5161,7 +5009,7 @@ "files": [ { "type": "modrinth", - "file_name": "everycomp-1.20-2.8.15-forge.jar", + "file_name": "everycomp-1.20-2.8.17-forge.jar", "mc_versions": [ "1.20.1" ], @@ -5169,22 +5017,22 @@ "forge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/eiktJyw1/versions/oIyvoBy6/everycomp-1.20-2.8.15-forge.jar", - "id": "oIyvoBy6", + "url": "https://cdn.modrinth.com/data/eiktJyw1/versions/pztPAx2c/everycomp-1.20-2.8.17-forge.jar", + "id": "pztPAx2c", "parent_id": "eiktJyw1", "hashes": { - "sha512": "4461a1c2e767e5aa40baeb9e356289ffd7daf2100c3b7470ebbeb6d11ba979674f84234fb8d1446a2afac210bac188471404ff7da037a765f5073caebf46833b", - "sha1": "cedfb61a5ec202de8aacef40b1abab49d9936066" + "sha512": "6608da2f4ac880573c5f434c75995a3a3e917c47189d2d8570e9c3e09113ba78844b8c96510402a7d198e6cfde4502287ba771dc9940b8490cd97b5dc880a425", + "sha1": "79ab372f4b6645e3bd9ad34948a8ad3afa37fed5" }, "required_dependencies": [ "twkfQtEc" ], - "size": 2777935, - "date_published": "2025-07-30T05:01:45.107707Z" + "size": 2781819, + "date_published": "2025-08-14T08:05:13.713026Z" }, { "type": "curseforge", - "file_name": "everycomp-1.20-2.8.15-forge.jar", + "file_name": "everycomp-1.20-2.8.17-forge.jar", "mc_versions": [ "1.20.1" ], @@ -5192,18 +5040,18 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6827/718/everycomp-1.20-2.8.15-forge.jar", - "id": "6827718", + "url": "https://edge.forgecdn.net/files/6884/861/everycomp-1.20-2.8.17-forge.jar", + "id": "6884861", "parent_id": "628539", "hashes": { - "sha1": "cedfb61a5ec202de8aacef40b1abab49d9936066", - "md5": "12560df2919a149c357b741a257cf64a" + "sha1": "79ab372f4b6645e3bd9ad34948a8ad3afa37fed5", + "md5": "7d34a6136694fadaef8dc068e18a1455" }, "required_dependencies": [ "499980" ], - "size": 2777935, - "date_published": "2025-07-30T05:01:30.480Z" + "size": 2781819, + "date_published": "2025-08-14T08:05:03.337Z" } ] }, @@ -9092,7 +8940,7 @@ "files": [ { "type": "modrinth", - "file_name": "moonlight-1.20-2.15.6-forge.jar", + "file_name": "moonlight-1.20-2.16.1-forge.jar", "mc_versions": [ "1.20.1" ], @@ -9101,20 +8949,20 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/twkfQtEc/versions/VqBFBOg7/moonlight-1.20-2.15.6-forge.jar", - "id": "VqBFBOg7", + "url": "https://cdn.modrinth.com/data/twkfQtEc/versions/lByJnenL/moonlight-1.20-2.16.1-forge.jar", + "id": "lByJnenL", "parent_id": "twkfQtEc", "hashes": { - "sha512": "4fe8c5da1f0697a12cc453e817905d18ee039b7442ab90b0ed70ff3221ef37598ccb30eef8ada5148ee022f16ea64cbba185da58b752a6ecb4f24d2bb0300e05", - "sha1": "0ea0d478011428a02b561b24ca9db40c31b39870" + "sha512": "8a1b463c721568cdf6f197fc7aa6d3c9d11072c1f3b3d8e57402075a660b20293cab7b249654dd2c7ef34ffc88c23cda08ef78dcf0cba7b2be63a30083d45ef8", + "sha1": "17a8bbbdfd87869e7cac5ece8f3daaee380813a7" }, "required_dependencies": [], - "size": 1287123, - "date_published": "2025-08-04T09:41:41.923471Z" + "size": 1310673, + "date_published": "2025-08-15T09:47:04.798820Z" }, { "type": "curseforge", - "file_name": "moonlight-1.20-2.15.6-forge.jar", + "file_name": "moonlight-1.20-2.16.1-forge.jar", "mc_versions": [ "1.20.1" ], @@ -9123,16 +8971,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6846/127/moonlight-1.20-2.15.6-forge.jar", - "id": "6846127", + "url": "https://edge.forgecdn.net/files/6888/940/moonlight-1.20-2.16.1-forge.jar", + "id": "6888940", "parent_id": "499980", "hashes": { - "sha1": "0ea0d478011428a02b561b24ca9db40c31b39870", - "md5": "2e91dd12ddb2fc40bacb6b499568296a" + "sha1": "17a8bbbdfd87869e7cac5ece8f3daaee380813a7", + "md5": "23ef17c141597aeed404c3e483e40161" }, "required_dependencies": [], - "size": 1287123, - "date_published": "2025-08-04T09:41:35.207Z" + "size": 1310673, + "date_published": "2025-08-15T09:46:55.940Z" } ] }, @@ -11780,47 +11628,49 @@ }, "redistributable": false, "files": [ - { - "type": "curseforge", - "file_name": "species-3.4.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6744/903/species-3.4.jar", - "id": "6744903", - "parent_id": "857737", - "hashes": { - "sha1": "9a382083142bf27992fbe0836d297f89265dd24a", - "md5": "eff659ebb9c4a822f480a4c27d13a8af" - }, - "required_dependencies": [], - "size": 42101496, - "date_published": "2025-07-08T16:03:05.663Z" - }, { "type": "modrinth", - "file_name": "species-3.4.jar", + "file_name": "species-3.5.jar", "mc_versions": [ "1.20.1" ], "loaders": [ - "forge" + "forge", + "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/s5d4P01r/versions/xkMjveeZ/species-3.4.jar", - "id": "xkMjveeZ", + "url": "https://cdn.modrinth.com/data/s5d4P01r/versions/KwPDNMjG/species-3.5.jar", + "id": "KwPDNMjG", "parent_id": "s5d4P01r", "hashes": { - "sha512": "e7995bcf3a8ea07ebd2e640e03df69c9d427820a7bcf881432f82253eea31f13ce2bed549af6c0e557d39301aee422e4a4090d16e22df9a73244cdcfefd7fbe9", - "sha1": "9a382083142bf27992fbe0836d297f89265dd24a" + "sha512": "9ff8a488d3eed6950fe8eb09e3ab55e7fe65ee3340c212067e46bf98054330658e6406ad72388054f9ce00921b8d8fdeb5f28e09058c800bdf46e2e47a754a64", + "sha1": "b4d924f4faf6eb201db04205b61fa1524a8b0178" }, "required_dependencies": [], - "size": 42101496, - "date_published": "2025-07-08T16:03:37.367924Z" + "size": 42114388, + "date_published": "2025-08-14T16:26:28.693413Z" + }, + { + "type": "curseforge", + "file_name": "species-3.5.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "neoforge", + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6886/321/species-3.5.jar", + "id": "6886321", + "parent_id": "857737", + "hashes": { + "sha1": "b4d924f4faf6eb201db04205b61fa1524a8b0178", + "md5": "3fb4bc2ee270255038b08971dec18243" + }, + "required_dependencies": [], + "size": 42114388, + "date_published": "2025-08-14T16:26:07.777Z" } ] }, @@ -12895,49 +12745,51 @@ }, "files": [ { - "type": "curseforge", + "type": "modrinth", "file_name": "waterflasks-3.0.8.jar", "mc_versions": [ "1.20.1" ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/ONgsGaM9/versions/VIl9hEx7/waterflasks-3.0.8.jar", + "id": "VIl9hEx7", + "parent_id": "ONgsGaM9", + "hashes": { + "sha512": "7cc5e39ac45223a4b28387a60e0b361d777f44f34b9baa5d24a1541a0a21c0decf86146c19dbe4fcc4892048c0ca4f5a5737d09210c42f61d0e34448b3390c47", + "sha1": "6fc568609f6a182d18f8f4fac286c9bf122a486b" + }, + "required_dependencies": [ + "JaCEZUhg" + ], + "size": 939203, + "date_published": "2025-07-29T01:27:09.745095Z" + }, + { + "type": "curseforge", + "file_name": "waterflasks-3.0.9.jar", + "mc_versions": [ + "1.20.1" + ], "loaders": [ "neoforge", "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6681/183/waterflasks-3.0.8.jar", - "id": "6681183", + "url": "https://edge.forgecdn.net/files/6877/264/waterflasks-3.0.9.jar", + "id": "6877264", "parent_id": "354353", "hashes": { - "sha1": "6fc568609f6a182d18f8f4fac286c9bf122a486b", - "md5": "e71547e2b16e7d7c24c823ffec666c42" - }, - "required_dependencies": [], - "size": 939203, - "date_published": "2025-06-22T02:23:25.573Z" - }, - { - "type": "modrinth", - "file_name": "waterflasks-3.0.6.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/ONgsGaM9/versions/i7FOulRq/waterflasks-3.0.6.jar", - "id": "i7FOulRq", - "parent_id": "ONgsGaM9", - "hashes": { - "sha512": "d0e1b1646d374741c9abdf7de41c615b85e8c7d18fbb37bed46c6ddf5802ca2d52a96c999b54ac82eac77e40571b23a3dce1985973b8bfb858981fe13ef6bb3d", - "sha1": "bcb5863e29d5faedcffde83f6d5ca02486b264a4" + "sha1": "de5fec2b87cc99ff4ff73fac1e7e479c64478820", + "md5": "da255c51c7356b95a1ace27e2c3c559a" }, "required_dependencies": [ - "JaCEZUhg" + "302973" ], - "size": 933206, - "date_published": "2025-01-19T23:31:12.024095Z" + "size": 943232, + "date_published": "2025-08-12T03:42:03.923Z" } ] }, From aad81501af730581c7ff23b2311ebd144a33e212 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 15 Aug 2025 22:14:31 +0100 Subject: [PATCH 03/26] update forge --- pakku-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pakku-lock.json b/pakku-lock.json index 11abef3a0..ce9c2e3f9 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -4,7 +4,7 @@ "1.20.1" ], "loaders": { - "forge": "47.4.2" + "forge": "47.4.6" }, "projects": [ { From 03106270e12b76ed9e989bce7de79a8ee8e8cc26 Mon Sep 17 00:00:00 2001 From: GameStar <56610486+BlueBoat29@users.noreply.github.com> Date: Fri, 15 Aug 2025 16:45:09 -0500 Subject: [PATCH 04/26] Feature/wan creatures and stuff (#1633) * whitespace changes * some animal compat * snifferified recipes * nest box recipe * tag stuff * spawn stuff * tooltip * wan config * foods * loot tables * Update pakku-lock.json * Update wan_ancient_beasts-server.toml Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * Update tags.js Signed-off-by: Pyritie --------- Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> Signed-off-by: Pyritie Co-authored-by: Pyritie --- defaultconfigs/wan_ancient_beasts-server.toml | 76 ++++++++++ .../item/food/cooked_crusher_meat.png | Bin 0 -> 747 bytes .../item/food/cooked_glider_wings.png | Bin 0 -> 703 bytes .../textures/item/food/cooked_goober_meat.png | Bin 0 -> 885 bytes .../item/food/cooked_springling_chops.png | Bin 0 -> 673 bytes .../item/food/cooked_walker_steak.png | Bin 0 -> 889 bytes .../item/food/cooked_whole_soarer.png | Bin 0 -> 912 bytes .../tfg/textures/item/food/cooked_wraptor.png | Bin 0 -> 697 bytes .../textures/item/food/raw_crusher_meat.png | Bin 0 -> 756 bytes .../textures/item/food/raw_glider_wings.png | Bin 0 -> 719 bytes .../textures/item/food/raw_goober_meat.png | Bin 0 -> 959 bytes .../item/food/raw_springling_chops.png | Bin 0 -> 797 bytes .../textures/item/food/raw_walker_steak.png | Bin 0 -> 902 bytes .../textures/item/food/raw_whole_soarer.png | Bin 0 -> 907 bytes .../tfg/textures/item/food/raw_wraptor.png | Bin 0 -> 870 bytes kubejs/client_scripts/tooltips.js | 5 + .../species/loot_tables/entities/goober.json | 65 +++++++++ .../loot_tables/entities/springling.json | 65 +++++++++ .../tfg/worldgen/biome/mars/amber_hills.json | 24 +++- .../tfg/worldgen/biome/mars/amber_plains.json | 24 +++- .../biome/mars/martian_dune_edge.json | 22 ++- .../worldgen/biome/mars/rusticus_hills.json | 24 +++- .../worldgen/biome/mars/rusticus_plains.json | 24 +++- .../worldgen/biome/mars/sangnum_hills.json | 30 +++- .../worldgen/biome/mars/sangnum_plains.json | 30 +++- .../loot_tables/entities/crusher.json | 65 +++++++++ .../loot_tables/entities/glider.json | 66 +++++++++ .../loot_tables/entities/soarer.json | 66 +++++++++ .../loot_tables/entities/walker.json | 45 ++++++ kubejs/server_scripts/ad_astra/tags.js | 15 +- kubejs/server_scripts/species/tags.js | 10 +- kubejs/server_scripts/tfg/data.js | 99 ++++++++++++- kubejs/server_scripts/tfg/recipes.food.js | 21 +++ kubejs/startup_scripts/species/constants.js | 2 - kubejs/startup_scripts/tfg/items.food.js | 134 ++++++++++++++++-- pakku-lock.json | 66 +++++++++ 36 files changed, 932 insertions(+), 46 deletions(-) create mode 100644 defaultconfigs/wan_ancient_beasts-server.toml create mode 100644 kubejs/assets/tfg/textures/item/food/cooked_crusher_meat.png create mode 100644 kubejs/assets/tfg/textures/item/food/cooked_glider_wings.png create mode 100644 kubejs/assets/tfg/textures/item/food/cooked_goober_meat.png create mode 100644 kubejs/assets/tfg/textures/item/food/cooked_springling_chops.png create mode 100644 kubejs/assets/tfg/textures/item/food/cooked_walker_steak.png create mode 100644 kubejs/assets/tfg/textures/item/food/cooked_whole_soarer.png create mode 100644 kubejs/assets/tfg/textures/item/food/cooked_wraptor.png create mode 100644 kubejs/assets/tfg/textures/item/food/raw_crusher_meat.png create mode 100644 kubejs/assets/tfg/textures/item/food/raw_glider_wings.png create mode 100644 kubejs/assets/tfg/textures/item/food/raw_goober_meat.png create mode 100644 kubejs/assets/tfg/textures/item/food/raw_springling_chops.png create mode 100644 kubejs/assets/tfg/textures/item/food/raw_walker_steak.png create mode 100644 kubejs/assets/tfg/textures/item/food/raw_whole_soarer.png create mode 100644 kubejs/assets/tfg/textures/item/food/raw_wraptor.png create mode 100644 kubejs/data/species/loot_tables/entities/goober.json create mode 100644 kubejs/data/species/loot_tables/entities/springling.json create mode 100644 kubejs/data/wan_ancient_beasts/loot_tables/entities/crusher.json create mode 100644 kubejs/data/wan_ancient_beasts/loot_tables/entities/glider.json create mode 100644 kubejs/data/wan_ancient_beasts/loot_tables/entities/soarer.json create mode 100644 kubejs/data/wan_ancient_beasts/loot_tables/entities/walker.json diff --git a/defaultconfigs/wan_ancient_beasts-server.toml b/defaultconfigs/wan_ancient_beasts-server.toml new file mode 100644 index 000000000..f33c39ee8 --- /dev/null +++ b/defaultconfigs/wan_ancient_beasts-server.toml @@ -0,0 +1,76 @@ + +#Sniffer Attributes +[sniffer] + #Sniffer health [default: 75] + #Range: 1.0 ~ 1024.0 + health = 75.0 + #Sniffer armor [default: 3] + #Range: 0.0 ~ 30.0 + armor = 3.0 + #Sniffer armor toughness [default: 1] + #Range: 0.0 ~ 20.0 + armorToughness = 1.0 + +#Eater Attributes +[eater] + #Eater health [default: 100] + #Range: 1.0 ~ 1024.0 + health = 200.0 + #Eater attack damage [default: 30] + #Range: 0.0 ~ 1024.0 + damage = 30.0 + #Eater armor [default: 5] + #Range: 0.0 ~ 30.0 + armor = 8.0 + #Eater armor toughness [default: 2] + #Range: 0.0 ~ 20.0 + armorToughness = 3.0 + +#Walker Attributes +[walker] + #Walker health [default: 200] + #Range: 1.0 ~ 1024.0 + health = 400.0 + #Walker armor [default: 5] + #Range: 0.0 ~ 30.0 + armor = 14.0 + #Walker armor toughness [default: 4] + #Range: 0.0 ~ 20.0 + armorToughness = 4.0 + +#Crusher Attributes +[crusher] + #Crusher health [default: 50] + #Range: 1.0 ~ 1024.0 + health = 100.0 + #Crusher attack damage [default: 10] + #Range: 0.0 ~ 1024.0 + damage = 10.0 + #Crusher armor [default: 20] + #Range: 0.0 ~ 30.0 + armor = 25.0 + #Crusher armor toughness [default: 4] + #Range: 0.0 ~ 20.0 + armorToughness = 5.0 + +#Glider Attributes +[glider] + #Glider health [default: 25] + #Range: 1.0 ~ 1024.0 + health = 50.0 + +#Soarer Attributes +[soarer] + #Soarer health [default: 40] + #Range: 1.0 ~ 1024.0 + health = 80.0 + #Soarer attack damage [default: 15] + #Range: 0.0 ~ 1024.0 + damage = 25.0 + +#Surfer Attributes +[surfer] + #Surfer health [default: 30] + #Range: 1.0 ~ 1024.0 + health = 30.0 + diff --git a/kubejs/assets/tfg/textures/item/food/cooked_crusher_meat.png b/kubejs/assets/tfg/textures/item/food/cooked_crusher_meat.png new file mode 100644 index 0000000000000000000000000000000000000000..5b055d9343f2b5b46db89026f5d9827068c21a5c GIT binary patch literal 747 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7n=_rA13aCb6$*;-(=u~X z85lGs)=sqbIP4&EG(PyK(p0{;3Q98;THSPYmGKtsPFT1_G^*5K=NIl-CMueGeNEX1 z5B48j)!e;#9pAbpg&&NM^ei-Yd365w=F&~Fv3PfUcXj{n@`ekm46nZFW?q#hIWxuS zjCk15#&8w^CyC?^uQOMIZyuGgIey)?re<&VN1gY@^?iylqXS>Dft!%IFOx|x0aV2b1%yP>vm1z^4q?A%j0$h2;lD1?mnQ`Jm-J!$wkA7T! zGU;R}tMYNCR{@Habsy}1++7^U?~`xm&1d+R{=n?*|%#q zkH2J|uz20H{Dx-dghf6#U(3Dc`||DE`zRHUd0Ry43Z_T5hc#~xw)x% zB@E6*sfi`2DGKG8B^e6tp1uL$jeOz^3=Bs+T^vI!PVb$xk?W9wh-<#HZtJI(G&AS+ zf6b5P7!W(9cSE;9c7EDq5%L1D|wircu$sn#8Ny7Z{YiW8Jq+Qi63ERasxYtpC3lqXS>Dft!%IFOx|x0aV2b1%yP>vm1z^4q?A%j0$h2;lD1?mnQ`Jm-J!$wkA7T! zGU;R}tMYNCR{@Habsy}1++7^U?~`xm&1d+R{=n?*|%#q zkH2J|uz20H{Dx-dghf6#U(3Dc`||DE`@8i_QSig!+E&H)+gTh^NzbPvEbpSTsC#_@V4^&IK!A71rr}0 zdU`v;^fAkCwdsGqi#}>hp7f~n{*z7r7q6Uc!oZN%V>#p8TjAFrpL@FcxvXlqXS>Dft!%IFOx|x0aV2b1%yP>vm1z^4q?A%j0$h2;lD1?mnQ`Jm-J!$wkA7T! zGU;R}tMYNCR{@Habsy}1++7^U?~`xm&1d+R{=n?*|%#q zkH2J|uz20H{Dx-dghf6#U(3Dc`||DE`&kl@U0gf@ z0-P9mby>q77|m&%#a+;Ihh<5FfGkralS@Z$^82cCO@%@BMl4fc+62 z3)>e*V^kUD#P%Is&*R5mRe1Hwi)_vV6~EXV?y{b9pKPh_7U4U6_L=UP7q4tnR#ctL z8MKUH&vxN8{Tiw#moEI+=;J=?T9MtX4weO58hsAzic@}YV#@L@qD$AF=t)z4|G371 z&y3STMRF-GgUaUERo5nVwKWFz+&(W{A)m2k!Fp9UsZ-0@%gVk_&s)IIwTktO%}fQ3 z1H0lFA8cH8vSi7&f_iJEV>=G8wzUeoUM>0?^!ZlR8vY9T8@FyVzvQ%#(mt_O$zOO` z?1M+^guJzRxYg6#F6&(=X>6aZ&DY;2Dbaf9QsnXCxBJxoePi#oxap^S;M=UoQ|DU_ lAL^9n-6yS^6!^#d17m6C?C`l4Ublhb%hT1*Wt~$(699!vfye*= literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/food/cooked_springling_chops.png b/kubejs/assets/tfg/textures/item/food/cooked_springling_chops.png new file mode 100644 index 0000000000000000000000000000000000000000..4affb689b111d92c52a981c8b90a207c627509fd GIT binary patch literal 673 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVg1u-x%HfK6J2Y5O=D-;yvr)B1( zGB9XNtet4#*>-!X!W*8k%7dk#OFXD*wkDQ;nZZ<^|SH`JH;Z{~X)-X2StvWj8%ze;Gxw)3!R_4OUBNedH+&2{b(= z{z*@J&UTB{TiIUUnY`a1;!4=2nB|sTD$^!7Nhzh61i12wC2h%CGULRBxps~3xVtuT*1V$0O`Hqx>-&uS@z7oXfE3DLDyi%vv1dK z9)HO^Vez_Y`3=p^35$GgzLtB>_vPES_cQ(K?Jq1SIwRSedxC+1K{UW8#Pvzwe^*)F za8;o+J&6oGxnd)QNpW7*CU(yl7#J8!g8YIR9G=}s196hP-CYS|xv6<249-QVi6yBi z3gww484B*6z5(HleBulY41u05jv*Y^lM@bb&6u))$JCg$!y(H<$wlGH6+xW|Nl9;X z7{m(944I6bV&?K5^osSJBYKcY@mPXnXnMN(1cv60jT4nT8X5yRos11QxE4h4Fub$k WdO7LVRV@Yv1_n=8KbLh*2~7auy$z25 literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/food/cooked_walker_steak.png b/kubejs/assets/tfg/textures/item/food/cooked_walker_steak.png new file mode 100644 index 0000000000000000000000000000000000000000..25dff55b782363089b85f96a8d63b801e37269af GIT binary patch literal 889 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7n=_rA13aCb6$*;-(=u~X z85lGs)=sqbIP4&EG(PyK(p0{;3Q98;THSPYmGKtsPFT1_G^*5K=NIl-CMueGeNEX1 z5B48j)!e;#9pAbpg&&NM^ei-Yd365w=F&~Fv3PfUcXj{n@`ekm46nZFW?q#hIWxuS zjCk15#&8w^CyC?^uQOMIZyuGgIey)?re<&VN1gY@^?iylqXS>Dft!%IFOx|x0aV2b1%yP>vm1z^4q?A%j0$h2;lD1?mnQ`Jm-J!$wkA7T! zGU;R}tMYNCR{@Habsy}1++7^U?~`xm&1d+R{=n?*|%#q zkH2J|uz20H{Dx-dghf6#U(3Dc`||DE`>6Lf``$1xFi4iTMwB?`=jNv7 zl`uFLr6!i7rYMwWmSiZnd-?{1H}Z)yFfayrx;TbdoL)P5zaNvMK>Pl?Pk)qi_HMnH zQGNb^bU=WkrrHsf42^>hN>Z9RyuEJOTK5}1u!L-p>fO5Z4(p!i?$f#t5)EF3?B4wQ z?3w&D@qZbQRxf^GQ6>GwU~X40V^`ne$(;qcs*fKe@qO<9>hQ_>Mo`n7wHrcaICovh zPgmTDF{%BOY zaA8GQMP-$Vs7jcrmSoy7?uZ{!_0JYBNqE*)yLZPcBgtOPuk1;_PAPBW)N`h-_r1v- ze|b%K#x-rj8$JtPSll|-_H=u-?7eyMl6UScPT4WP=NN;bg_>g1`uukrrkH$CEAVyN zIpKLNTl#X_vTx-Zr#yM`BSSlfY058V!QQ8vs{7<$$lE{Ns%ExI)OcO|-`2#{%f9pR pF`iko-LpfMFWPi+z4RabZ=4GPnyS2aXnh66nWw9t%Q~loCIGK{h-&}< literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/food/cooked_whole_soarer.png b/kubejs/assets/tfg/textures/item/food/cooked_whole_soarer.png new file mode 100644 index 0000000000000000000000000000000000000000..5004b8e779c6bd7cc9d473e9ae38cb98321ca33f GIT binary patch literal 912 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7n=_rA13aCb6$*;-(=u~X z85lGs)=sqbIP4&EG(PyK(p0{;3Q98;THSPYmGKtsPFT1_G^*5K=NIl-CMueGeNEX1 z5B48j)!e;#9pAbpg&&NM^ei-Yd365w=F&~Fv3PfUcXj{n@`ekm46nZFW?q#hIWxuS zjCk15#&8w^CyC?^uQOMIZyuGgIey)?re<&VN1gY@^?iylqXS>Dft!%IFOx|x0aV2b1%yP>vm1z^4q?A%j0$h2;lD1?mnQ`Jm-J!$wkA7T! zGU;R}tMYNCR{@Habsy}1++7^U?~`xm&1d+R{=n?*|%#q zkH2J|uz20H{Dx-dghf6#U(3Dc`||DE`T^vI!PVb#$?|nExaP)rJfmNDHB0zm2JB=r0aezU=5z zXFPqfRrn?iFX>>8eXZW>`)bLPf8uKCe9 zqo$^c(ZJnL;5Oq5@lU_%_OG-J&pJQ#*XKty-RBa6uXF!=@@LkW`p2@n_Rp$(+>>Jt Oib_vcKbLh*2~7Yx?v*tF literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/food/cooked_wraptor.png b/kubejs/assets/tfg/textures/item/food/cooked_wraptor.png new file mode 100644 index 0000000000000000000000000000000000000000..06326a0a3a1f874fce5132f9bdb5342ec6946540 GIT binary patch literal 697 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVg1u-x%HfK6J2Y5O=D-;yvr)B1( zGB9XNtet4#*>-!X!W*8k%7dk#OFXD*wkDQ;nZZ<^|SH`JH;Z{~X)-X2StvWj8%ze;Gxw)3!R_4OUBNedH+&2{b(= z{z*@J&UTB{TiIUUnY`a1;!4=2nB|sTD$^!7Nhzh61i12wC2h%CGULRBxps~3xVtuT*1V$0O`Hqx>-&uS@z7oXfE3DLDyi%vv1dK z9)HO^Vez_Y`3=p^35$GgzLtB>_vPES_cQ(K?Jq1SIwRSedxC+1K`y{2#Fc@8AyQkQ z(^+9vjKS#|&kH??w`W(~UeWk?&!X2SR&6ZUKAVAofw3gWFPOpM*^M+1C&}C0g`tC0 z)`Nk8fwRCPvY3HEPZ@+6E0)@qF)%Q&mw5WRvcKfu7tz)aW-55dz`!6`;u=xnoS&PU znpeW$T$GwvlA5AWo>`Ki;O^-g5Z=fq&cMKs;OXKR!f`!0fq_YtjU&ORZPS$CUe*Il z%Q6=VxZOCj%|XD~wD=j1fphM&Gkq=-e2Sj;m>DRqjP&GHSt_=~OqXMccW7jBno!5X w6p@))9G5~?OcCSQ=;#y3a7d%&QUC)(8HdmoKmH^}1_lNOPgg&ebxsLQ02e47DF6Tf literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/food/raw_crusher_meat.png b/kubejs/assets/tfg/textures/item/food/raw_crusher_meat.png new file mode 100644 index 0000000000000000000000000000000000000000..44b3984a039eac7c718efbc75b28e3059251aabf GIT binary patch literal 756 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7n=_rA13aCb6$*;-(=u~X z85lGs)=sqbIP4&EG(PyK(p0{;3Q98;THSPYmGKtsPFT1_G^*5K=NIl-CMueGeNEX1 z5B48j)!e;#9pAbpg&&NM^ei-Yd365w=F&~Fv3PfUcXj{n@`ekm46nZFW?q#hIWxuS zjCk15#&8w^CyC?^uQOMIZyuGgIey)?re<&VN1gY@^?iylqXS>Dft!%IFOx|x0aV2b1%yP>vm1z^4q?A%j0$h2;lD1?mnQ`Jm-J!$wkA7T! zGU;R}tMYNCR{@Habsy}1++7^U?~`xm&1d+R{=n?*|%#q zkH2J|uz20H{Dx-dghf6#U(3Dc`||DE`&&^HE zD`9XhN=+Eak-aXL9+fp~_w*suF}I$z{t=X6G# z)#T*lQ46}n^Ri3kzo!wyvY&_6-R05WU!S6IlJ&%_!~E%1 z<(4$}?4biEKeRuzo?}<@UG(so-}VwSIWp4{AGl2XfB3`PhaZ3I7ua!cyvT9+$Ai1( zY;0_7Z8N{u8zf0gSa+gPFk^?wqmqN?db1^tSpIxi*PiKiy+g1AWPk3|qYoNgdeV9_ zR6>p2OqOXE{RtO%l$4N=px|X3Heua~kMg#AFN-iRbWUr&a(;`hCMdW(UHx3vIVCg! E0FzBh1^@s6 literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/food/raw_glider_wings.png b/kubejs/assets/tfg/textures/item/food/raw_glider_wings.png new file mode 100644 index 0000000000000000000000000000000000000000..ce34f172ab04b05e7307886a604f74a8589d2ff7 GIT binary patch literal 719 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7n=_rA13aCb6$*;-(=u~X z85lGs)=sqbIP4&EG(PyK(p0{;3Q98;THSPYmGKtsPFT1_G^*5K=NIl-CMueGeNEX1 z5B48j)!e;#9pAbpg&&NM^ei-Yd365w=F&~Fv3PfUcXj{n@`ekm46nZFW?q#hIWxuS zjCk15#&8w^CyC?^uQOMIZyuGgIey)?re<&VN1gY@^?iylqXS>Dft!%IFOx|x0aV2b1%yP>vm1z^4q?A%j0$h2;lD1?mnQ`Jm-J!$wkA7T! zGU;R}tMYNCR{@Habsy}1++7^U?~`xm&1d+R{=n?*|%#q zkH2J|uz20H{Dx-dghf6#U(3Dc`||DE`%6+&(GM@5 z8ngZ0m)fH;vu=aNtN-`Ua{v3kzy2GTA+OW*tAAZv=LAI`t6c@(j=t`f=rDVb5O}3t z)|Q!#jg76XK3vbZrs8+k4}*qGF#)mUgoK2IA0NJn9=lqXS>Dft!%IFOx|x0aV2b1%yP>vm1z^4q?A%j0$h2;lD1?mnQ`Jm-J!$wkA7T! zGU;R}tMYNCR{@Habsy}1++7^U?~`xm&1d+R{=n?*|%#q zkH2J|uz20H{Dx-dghf6#U(3Dc`||DE`-d_;?@`*Z!MOnc#y|=5HO0_}@H-uzsIIi!kTt9vF z&Ts!J*Ec^)%9x%fTeIx&!%De%hb`IPDOS1G?vmKrCdc$4?`!)H_2yqChLffmMaD8K z)F&}L_|at^oo=Z9TS1Up+&pU0`313>ObZrHylQ%C?tO+6r}-F~XPV4);#22Xd5f=l zri!;bzYEiWZz2=9E?(f^+-NhMVfy>F1cS+H^EC@HmdvdG*EB(3u83POlR&!GOtHpK z9U&(=iZ8F*s%oXlwNgb&>g!hj9y`hB2QEAg6k_1LdGwoz>g7c#Q9tG#T{toAghsH3 z>dPH+p|=?m^6O{+`Ix!?;HQgIGfwDPKV$uURHkqJimj@XjrD&{`odX|DRDC*rMhc- z{L&ZE$^6`#w`Qyb{W|s`m7!tl?IXK<{~TBR%WJz>PR~tiP0c^ef9vCSu-)RATYO>4uZy6V N_jL7hS?83{1OUnbtbG6g literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/food/raw_springling_chops.png b/kubejs/assets/tfg/textures/item/food/raw_springling_chops.png new file mode 100644 index 0000000000000000000000000000000000000000..57c624022788adf7747f47542e1afc66c6625e46 GIT binary patch literal 797 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7n=_rA13aCb6$*;-(=u~X z85lGs)=sqbIP4&EG(PyK(p0{;3Q98;THSPYmGKtsPFT1_G^*5K=NIl-CMueGeNEX1 z5B48j)!e;#9pAbpg&&NM^ei-Yd365w=F&~Fv3PfUcXj{n@`ekm46nZFW?q#hIWxuS zjCk15#&8w^CyC?^uQOMIZyuGgIey)?re<&VN1gY@^?iylqXS>Dft!%IFOx|x0aV2b1%yP>vm1z^4q?A%j0$h2;lD1?mnQ`Jm-J!$wkA7T! zGU;R}tMYNCR{@Habsy}1++7^U?~`xm&1d+R{=n?*|%#q zkH2J|uz20H{Dx-dghf6#U(3Dc`||DE`8=TR%`%Ei&o9DayDy!)^`g1vPWLqx|)(J9m2uiZRZ z%;ZzOP>bnd@Zwzx2R22^#x!wlqXS>Dft!%IFOx|x0aV2b1%yP>vm1z^4q?A%j0$h2;lD1?mnQ`Jm-J!$wkA7T! zGU;R}tMYNCR{@Habsy}1++7^U?~`xm&1d+R{=n?*|%#q zkH2J|uz20H{Dx-dghf6#U(3Dc`||DE`y3l0%nxq$*KAH>$ zOAmZw&aqE;#LjZin*FU6fBE)>%%zoXzFacpc8ecZ`TSw<<(ii(-*D`#<>G@AidL_7 z;R>ntwK~ey_j=;_SvTq$9#_f4U17ZTz@U|DXXLR75>>OZ)}Q?GZ{q98e6vJCs(sy> z6%RZ&u{eYua_lqXS>Dft!%IFOx|x0aV2b1%yP>vm1z^4q?A%j0$h2;lD1?mnQ`Jm-J!$wkA7T! zGU;R}tMYNCR{@Habsy}1++7^U?~`xm&1d+R{=n?*|%#q zkH2J|uz20H{Dx-dghf6#U(3Dc`||DE`{vD|4IE_Pa_?7bo_-|N6q7{Y_a6XTr1H?^e!O zdX#_N)s+lIB8Q6&YFXZ&Jpb{cLE0OBh6~}QT;&gLOfxVy^IRm*@a`kyrbUmc_s%() z?$cu+wJ(3)?YzXioS;judj2xLd&|3NQBnQ(1Ly9U?Ups4uMj)${nrViU-z!KYMktA zz9}Vjv*O+zz7vfj45#?aaZ#L=$6)Y{{eIs59J5d1Gos@b*8eOQaex<9A%^MdERnV-66!)t%ff4uqr^$Yu(b=OP<#iFOH KpUXO@geCx7>zF72 literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/food/raw_wraptor.png b/kubejs/assets/tfg/textures/item/food/raw_wraptor.png new file mode 100644 index 0000000000000000000000000000000000000000..06b3618f7f13c260faaa7e1dfd37336317b16ae3 GIT binary patch literal 870 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7n=_rA13aCb6$*;-(=u~X z85lGs)=sqbIP4&EG(PyK(p0{;3Q98;THSPYmGKtsPFT1_G^*5K=NIl-CMueGeNEX1 z5B48j)!e;#9pAbpg&&NM^ei-Yd365w=F&~Fv3PfUcXj{n@`ekm46nZFW?q#hIWxuS zjCk15#&8w^CyC?^uQOMIZyuGgIey)?re<&VN1gY@^?iylqXS>Dft!%IFOx|x0aV2b1%yP>vm1z^4q?A%j0$h2;lD1?mnQ`Jm-J!$wkA7T! zGU;R}tMYNCR{@Habsy}1++7^U?~`xm&1d+R{=n?*|%#q zkH2J|uz20H{Dx-dghf6#U(3Dc`||DE`$<$x+61YKg9HiH9a{ir)2wYATtRc2z7p zZTsEw{m)$+jPl*HbeS=S*RKF^H)=c@iHOrz8x8nb-&mpxV)aipp#JmOktMbzNjC2-8T`qXT`(}4>$>M#SzgE}X zuV?F6d7Np5d+3{X#jPh)78MAc`NJKyTvdO)UPXQNK{@}R(DGZ47VEF|^HwYWcmECh Xl(a5$0~-Y { text.add(1, text.of('Massive structure producing from §616384 to 65536 EU/t§r on the §6moon§r during the §6day§r')) }) + // Mars Animals + event.addAdvanced(['species:petrified_egg'], (item, advanced, text) => { + text.add(1, text.of("§7Requires Magma to Incubate")) + }) + // MEGA Deprecated 0.10 event.addAdvanced(['#megacells:mega_interface'], (item, advanced, text) => { text.add(1, text.of('§cDeprecated, cannot be crafted any more')) diff --git a/kubejs/data/species/loot_tables/entities/goober.json b/kubejs/data/species/loot_tables/entities/goober.json new file mode 100644 index 000000000..49b61e5fb --- /dev/null +++ b/kubejs/data/species/loot_tables/entities/goober.json @@ -0,0 +1,65 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_goober_meat", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 2, + "max": 8 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 5, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:slimeball", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 0, + "max": 3, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/species/loot_tables/entities/springling.json b/kubejs/data/species/loot_tables/entities/springling.json new file mode 100644 index 000000000..ac522db86 --- /dev/null +++ b/kubejs/data/species/loot_tables/entities/springling.json @@ -0,0 +1,65 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_springling_chops", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 2, + "max": 6 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 3, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "gtceu:copper_spring", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 0, + "max": 1, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json index b22f94060..7f263b9e5 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json @@ -75,22 +75,40 @@ "axolotls": [], "creature": [ { - "type": "minecraft:sniffer", + "type": "tfg:sniffer", "maxCount": 3, "minCount": 1, "weight": 100 }, { "type": "species:wraptor", - "maxCount": 3, + "maxCount": 4, "minCount": 1, "weight": 100 }, + { + "type": "wan_ancient_beasts:crusher", + "maxCount": 5, + "minCount": 1, + "weight": 100 + }, + { + "type": "wan_ancient_beasts:glider", + "maxCount": 4, + "minCount": 1, + "weight": 30 + }, + { + "type": "wan_ancient_beasts:soarer", + "maxCount": 2, + "minCount": 1, + "weight": 10 + }, { "type": "species:springling", "maxCount": 3, "minCount": 1, - "weight": 100 + "weight": 20 } ], "misc": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json index 5dc37ca8c..91ff2bae8 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json @@ -70,26 +70,38 @@ "axolotls": [], "creature": [ { - "type": "minecraft:sniffer", + "type": "tfg:sniffer", "maxCount": 3, "minCount": 1, "weight": 100 }, { "type": "species:wraptor", - "maxCount": 3, + "maxCount": 4, "minCount": 1, "weight": 100 }, { - "type": "species:goober", - "maxCount": 1, + "type": "wan_ancient_beasts:walker", + "maxCount": 4, "minCount": 1, "weight": 100 }, { - "type": "species:springling", - "maxCount": 1, + "type": "wan_ancient_beasts:crusher", + "maxCount": 5, + "minCount": 1, + "weight": 100 + }, + { + "type": "wan_ancient_beasts:glider", + "maxCount": 2, + "minCount": 1, + "weight": 20 + }, + { + "type": "tfg:glacian_ram", + "maxCount": 6, "minCount": 1, "weight": 100 } diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json index 5daa5d6c7..ecb2113ef 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json @@ -71,7 +71,27 @@ "spawners": { "ambient": [], "axolotls": [], - "creature": [], + "creature": [ + { + "type": "species:goober", + "maxCount": 3, + "minCount": 1, + "weight": 100 + }, + { + "type": "wan_ancient_beasts:crusher", + "maxCount": 2, + "minCount": 1, + "weight": 80 + }, + { + "type": "wan_ancient_beasts:glider", + "maxCount": 2, + "minCount": 1, + "weight": 50 + } + + ], "misc": [], "monster": [ { diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json index 9ee67959f..669b61600 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json @@ -75,8 +75,8 @@ "axolotls": [], "creature": [ { - "type": "minecraft:sniffer", - "maxCount": 3, + "type": "tfg:sniffer", + "maxCount": 4, "minCount": 1, "weight": 100 }, @@ -87,9 +87,27 @@ "weight": 100 }, { - "type": "species:springling", + "type": "wan_ancient_beasts:crusher", "maxCount": 3, "minCount": 1, + "weight": 20 + }, + { + "type": "wan_ancient_beasts:glider", + "maxCount": 4, + "minCount": 1, + "weight": 30 + }, + { + "type": "wan_ancient_beasts:soarer", + "maxCount": 2, + "minCount": 1, + "weight": 20 + }, + { + "type": "species:springling", + "maxCount": 5, + "minCount": 2, "weight": 100 } ], diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json index 664b6f5c0..2f6d5f406 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json @@ -70,8 +70,8 @@ "axolotls": [], "creature": [ { - "type": "minecraft:sniffer", - "maxCount": 3, + "type": "tfg:sniffer", + "maxCount": 4, "minCount": 1, "weight": 100 }, @@ -82,14 +82,26 @@ "weight": 100 }, { - "type": "species:goober", - "maxCount": 1, + "type": "wan_ancient_beasts:walker", + "maxCount": 3, "minCount": 1, "weight": 100 }, { - "type": "species:springling", - "maxCount": 1, + "type": "wan_ancient_beasts:crusher", + "maxCount": 4, + "minCount": 1, + "weight": 20 + }, + { + "type": "wan_ancient_beasts:glider", + "maxCount": 2, + "minCount": 1, + "weight": 20 + }, + { + "type": "tfg:glacian_ram", + "maxCount": 6, "minCount": 1, "weight": 100 } diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json index c35dadb41..952b80678 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json @@ -75,17 +75,41 @@ "axolotls": [], "creature": [ { - "type": "minecraft:sniffer", - "maxCount": 3, + "type": "tfg:sniffer", + "maxCount": 4, "minCount": 1, "weight": 100 }, { "type": "species:wraptor", - "maxCount": 3, + "maxCount": 4, "minCount": 1, "weight": 100 }, + { + "type": "wan_ancient_beasts:crusher", + "maxCount": 3, + "minCount": 1, + "weight": 20 + }, + { + "type": "wan_ancient_beasts:glider", + "maxCount": 4, + "minCount": 1, + "weight": 100 + }, + { + "type": "wan_ancient_beasts:soarer", + "maxCount": 2, + "minCount": 1, + "weight": 40 + }, + { + "type": "species:goober", + "maxCount": 1, + "minCount": 1, + "weight": 50 + }, { "type": "species:springling", "maxCount": 3, diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json index 49e9656fd..f6d77a5ac 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json @@ -70,14 +70,32 @@ "axolotls": [], "creature": [ { - "type": "minecraft:sniffer", - "maxCount": 3, + "type": "tfg:sniffer", + "maxCount": 4, "minCount": 1, "weight": 100 }, { "type": "species:wraptor", - "maxCount": 3, + "maxCount": 4, + "minCount": 1, + "weight": 100 + }, + { + "type": "wan_ancient_beasts:walker", + "maxCount": 5, + "minCount": 1, + "weight": 100 + }, + { + "type": "wan_ancient_beasts:crusher", + "maxCount": 4, + "minCount": 1, + "weight": 20 + }, + { + "type": "wan_ancient_beasts:glider", + "maxCount": 2, "minCount": 1, "weight": 100 }, @@ -85,11 +103,11 @@ "type": "species:goober", "maxCount": 1, "minCount": 1, - "weight": 100 + "weight": 50 }, { - "type": "species:springling", - "maxCount": 1, + "type": "tfg:glacian_ram", + "maxCount": 6, "minCount": 1, "weight": 100 } diff --git a/kubejs/data/wan_ancient_beasts/loot_tables/entities/crusher.json b/kubejs/data/wan_ancient_beasts/loot_tables/entities/crusher.json new file mode 100644 index 000000000..41865f871 --- /dev/null +++ b/kubejs/data/wan_ancient_beasts/loot_tables/entities/crusher.json @@ -0,0 +1,65 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_crusher_meat", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 2, + "max": 5 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 3, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "wan_ancient_beasts:crusher_spike", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 0, + "max": 2, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/wan_ancient_beasts/loot_tables/entities/glider.json b/kubejs/data/wan_ancient_beasts/loot_tables/entities/glider.json new file mode 100644 index 000000000..90570f5b2 --- /dev/null +++ b/kubejs/data/wan_ancient_beasts/loot_tables/entities/glider.json @@ -0,0 +1,66 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_glider_wings", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 2, + "max": 6 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 2, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + , + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "wan_ancient_beasts:glider_feather", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 0, + "max": 2, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/wan_ancient_beasts/loot_tables/entities/soarer.json b/kubejs/data/wan_ancient_beasts/loot_tables/entities/soarer.json new file mode 100644 index 000000000..2499bd85b --- /dev/null +++ b/kubejs/data/wan_ancient_beasts/loot_tables/entities/soarer.json @@ -0,0 +1,66 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_whole_soarer", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 4 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 4, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + , + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "wan_ancient_beasts:glider_feather", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 0, + "max": 4, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/wan_ancient_beasts/loot_tables/entities/walker.json b/kubejs/data/wan_ancient_beasts/loot_tables/entities/walker.json new file mode 100644 index 000000000..9808e1bba --- /dev/null +++ b/kubejs/data/wan_ancient_beasts/loot_tables/entities/walker.json @@ -0,0 +1,45 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_walker_steak", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 10, + "max": 25 + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 4, + "max": 10, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 40a689ee7..d41342161 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -349,7 +349,8 @@ const registerAdAstraEntityTypeTags = (event) => { 'endermanoverhaul:end_enderman', 'endermanoverhaul:end_islands_enderman', - 'minecraft:sniffer', + 'tfg:sniffer', + 'tfg:glacian_ram', 'species:wraptor', 'species:goober', 'species:cruncher', @@ -357,7 +358,12 @@ const registerAdAstraEntityTypeTags = (event) => { 'species:quake', 'endermanoverhaul:crimson_forest_enderman', 'endermanoverhaul:warped_forest_enderman', - 'endermanoverhaul:badlands_enderman' + 'endermanoverhaul:badlands_enderman', + 'wan_ancient_beasts:walker', + 'wan_ancient_beasts:eater', + 'wan_ancient_beasts:crusher', + 'wan_ancient_beasts:soarer', + 'wan_ancient_beasts:glider' ] COLD_ENTITIES.forEach(entity => { @@ -378,6 +384,11 @@ const registerAdAstraEntityTypeTags = (event) => { event.add('tfg:ignores_gravity', 'endermanoverhaul:spirit') event.add('tfg:ignores_gravity', 'species:birt') event.add('tfg:ignores_gravity', 'ad_astra:star_crawler') + + event.add('tfg:ignores_gravity', 'species:wraptor') + event.add('tfg:ignores_gravity', 'wan_ancient_beasts:crusher') + event.add('tfg:ignores_gravity', 'wan_ancient_beasts:soarer') + event.add('tfg:ignores_gravity', 'wan_ancient_beasts:glider') } const registerAdAstraPlacedFeatures = (event) => { diff --git a/kubejs/server_scripts/species/tags.js b/kubejs/server_scripts/species/tags.js index 509b6c004..1cf9597a5 100644 --- a/kubejs/server_scripts/species/tags.js +++ b/kubejs/server_scripts/species/tags.js @@ -7,6 +7,8 @@ const registerSpeciesBlockTags = (event) => { }) event.removeAll('species:wraptor_nesting_blocks') + + event.add('species:petrified_egg_hatch', '#tfcambiental:warm_stuff') } const registerSpeciesItemTags = (event) => { @@ -17,6 +19,10 @@ const registerSpeciesItemTags = (event) => { event.add('forge:eggs', 'species:birt_egg') event.add('firmalife:foods/raw_eggs', 'species:birt_egg') - + + event.add('species:goober_breed_items', 'betterend:flammalix') + event.add('species:goober_breed_items', 'betterend:small_amaranita_mushroom') + event.add('species:goober_breed_items', 'betterend:bolux_mushroom_product') + event.add('species:goober_breed_items', 'betterend:chorus_mushroom_product') event.add('species:cruncher_eats', '#tfc:foods/meat') -} \ No newline at end of file +} diff --git a/kubejs/server_scripts/tfg/data.js b/kubejs/server_scripts/tfg/data.js index b5d6df690..561dc4d85 100644 --- a/kubejs/server_scripts/tfg/data.js +++ b/kubejs/server_scripts/tfg/data.js @@ -128,7 +128,7 @@ const registerTFGFoodData = (event) => { }) event.foodItem('tfg:food/raw_moon_rabbit', food => { - food.hunger(4) + food.hunger(3) food.protein(2.0) food.decayModifier(3) }) @@ -141,7 +141,7 @@ const registerTFGFoodData = (event) => { }) event.foodItem('tfg:food/raw_glacian_mutton', food => { - food.hunger(4) + food.hunger(3) food.protein(2.0) food.decayModifier(3) }) @@ -154,7 +154,7 @@ const registerTFGFoodData = (event) => { }) event.foodItem('tfg:food/raw_sniffer_beef', food => { - food.hunger(4) + food.hunger(3) food.protein(2.0) food.decayModifier(3) }) @@ -166,6 +166,99 @@ const registerTFGFoodData = (event) => { food.decayModifier(1.5) }) + event.foodItem('tfg:food/raw_wraptor', food => { + food.hunger(3) + food.protein(2.0) + food.decayModifier(3) + }) + + event.foodItem('tfg:food/cooked_wraptor', food => { + food.hunger(6) + food.saturation(4) + food.protein(5) + food.decayModifier(1.5) + }) + + event.foodItem('tfg:food/raw_springling_chops', food => { + food.hunger(2) + food.protein(1.5) + food.decayModifier(3) + }) + + event.foodItem('tfg:food/cooked_springling_chops', food => { + food.hunger(4) + food.saturation(3) + food.protein(5) + food.decayModifier(1.5) + }) + + event.foodItem('tfg:food/raw_walker_steak', food => { + food.hunger(3) + food.protein(2.0) + food.decayModifier(3) + }) + + event.foodItem('tfg:food/cooked_walker_steak', food => { + food.hunger(6) + food.saturation(3) + food.protein(8) + food.decayModifier(1.5) + }) + + event.foodItem('tfg:food/raw_glider_wings', food => { + food.hunger(1) + food.protein(1.5) + food.decayModifier(3) + }) + + event.foodItem('tfg:food/cooked_glider_wings', food => { + food.hunger(3) + food.saturation(3) + food.protein(3) + food.decayModifier(1.5) + }) + + event.foodItem('tfg:food/raw_whole_soarer', food => { + food.hunger(3) + food.protein(2.0) + food.decayModifier(3) + }) + + event.foodItem('tfg:food/cooked_whole_soarer', food => { + food.hunger(6) + food.saturation(6) + food.protein(4) + food.decayModifier(1.5) + }) + + event.foodItem('tfg:food/raw_crusher_meat', food => { + food.hunger(3) + food.protein(1.5) + food.decayModifier(3) + }) + + event.foodItem('tfg:food/cooked_crusher_meat', food => { + food.hunger(5) + food.saturation(6) + food.protein(4) + food.decayModifier(1.5) + }) + + event.foodItem('tfg:food/raw_goober_meat', food => { + food.hunger(2) + food.protein(3.0) + food.decayModifier(3) + }) + + event.foodItem('tfg:food/cooked_goober_meat', food => { + food.hunger(4) + food.saturation(3) + food.protein(6) + food.decayModifier(1.5) + }) + + + // high-tech food global.FOOD_FRUIT.forEach(fruit => { diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index f3d7eb3c0..660257cda 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -932,6 +932,27 @@ function registerTFGFoodRecipes(event) { event.recipes.tfc.heating('tfg:food/raw_sniffer_beef', 200) .resultItem(TFC.isp.of('tfg:food/cooked_sniffer_beef').copyFood()) + + event.recipes.tfc.heating('tfg:food/raw_wraptor', 200) + .resultItem(TFC.isp.of('tfg:food/cooked_wraptor').copyFood()) + + event.recipes.tfc.heating('tfg:food/raw_springling_chops', 200) + .resultItem(TFC.isp.of('tfg:food/cooked_springling_chops').copyFood()) + + event.recipes.tfc.heating('tfg:food/raw_walker_steak', 200) + .resultItem(TFC.isp.of('tfg:food/cooked_walker_steak').copyFood()) + + event.recipes.tfc.heating('tfg:food/raw_glider_wings', 200) + .resultItem(TFC.isp.of('tfg:food/cooked_glider_wings').copyFood()) + + event.recipes.tfc.heating('tfg:food/raw_whole_soarer', 200) + .resultItem(TFC.isp.of('tfg:food/cooked_whole_soarer').copyFood()) + + event.recipes.tfc.heating('tfg:food/raw_crusher_meat', 200) + .resultItem(TFC.isp.of('tfg:food/cooked_crusher_meat').copyFood()) + + event.recipes.tfc.heating('tfg:food/raw_goober_meat', 200) + .resultItem(TFC.isp.of('tfg:food/cooked_goober_meat').copyFood()) event.recipes.tfc.advanced_shapeless_crafting( TFC.itemStackProvider.of('4x betterend:cave_pumpkin_chunks').copyFood(), diff --git a/kubejs/startup_scripts/species/constants.js b/kubejs/startup_scripts/species/constants.js index 4eb2a3e55..711a5db52 100644 --- a/kubejs/startup_scripts/species/constants.js +++ b/kubejs/startup_scripts/species/constants.js @@ -17,11 +17,9 @@ global.SPECIES_DISABLED_ITEMS = [ 'species:deepfish_bucket', 'species:bone_spike', 'species:ancient_pinecone', - 'species:petrified_egg', 'species:cruncher_egg', 'species:ichor_bottle', 'species:youth_potion', - 'species:springling_egg', 'species:wraptor_egg', 'species:chaindelier', 'species:spectralibur_pedestal', diff --git a/kubejs/startup_scripts/tfg/items.food.js b/kubejs/startup_scripts/tfg/items.food.js index fb83495cd..58563747a 100644 --- a/kubejs/startup_scripts/tfg/items.food.js +++ b/kubejs/startup_scripts/tfg/items.food.js @@ -74,14 +74,8 @@ function registerTFGFoodItems(event) { .food(food => food.hunger(4).saturation(2)) .tag('tfc:foods/grains') .tag('tfc:foods/usable_in_salad') - - event.create('tfg:food/cooked_moon_rabbit') - .translationKey('item.tfg.food.cooked_moon_rabbit') - .texture('tfg:item/food/cooked_moon_rabbit') - .food(food => food.hunger(4).saturation(8)) - .tag('tfc:foods/meats') - .tag('tfc:foods/cooked_meats') - + + //Moon Rabbit event.create('tfg:food/raw_moon_rabbit') .translationKey('item.tfg.food.raw_moon_rabbit') .texture('tfg:item/food/raw_moon_rabbit') @@ -90,6 +84,14 @@ function registerTFGFoodItems(event) { .tag('tfc:foods/meats') .tag('tfc:foods/raw_meats') + event.create('tfg:food/cooked_moon_rabbit') + .translationKey('item.tfg.food.cooked_moon_rabbit') + .texture('tfg:item/food/cooked_moon_rabbit') + .food(food => food.hunger(4).saturation(8)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + + //Glacian Ram event.create('tfg:food/raw_glacian_mutton') .translationKey('item.tfg.food.raw_glacian_mutton') .texture('tfg:item/food/raw_glacian_mutton') @@ -101,10 +103,11 @@ function registerTFGFoodItems(event) { event.create('tfg:food/cooked_glacian_mutton') .translationKey('item.tfg.food.cooked_glacian_mutton') .texture('tfg:item/food/cooked_glacian_mutton') - .food(food => food.hunger(6).saturation(10)) + .food(food => food.hunger(5).saturation(8)) .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') + //Sniffer event.create('tfg:food/raw_sniffer_beef') .translationKey('item.tfg.food.raw_sniffer_beef') .texture('tfg:item/food/raw_sniffer_beef') @@ -116,9 +119,122 @@ function registerTFGFoodItems(event) { event.create('tfg:food/cooked_sniffer_beef') .translationKey('item.tfg.food.cooked_sniffer_beef') .texture('tfg:item/food/cooked_sniffer_beef') + .food(food => food.hunger(8).saturation(9)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + + //Wraptor + event.create('tfg:food/raw_wraptor') + .translationKey('item.tfg.food.raw_wraptor') + .texture('tfg:item/food/raw_wraptor') + .food(food => food.hunger(3).saturation(2) + .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods/meats') + .tag('tfc:foods/raw_meats') + + event.create('tfg:food/cooked_wraptor') + .translationKey('item.tfg.food.cooked_wraptor') + .texture('tfg:item/food/cooked_wraptor') + .food(food => food.hunger(6).saturation(8)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + + //Springling + event.create('tfg:food/raw_springling_chops') + .translationKey('item.tfg.food.raw_springling_chops') + .texture('tfg:item/food/raw_springling_chops') + .food(food => food.hunger(2).saturation(2) + .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods/meats') + .tag('tfc:foods/raw_meats') + + event.create('tfg:food/cooked_springling_chops') + .translationKey('item.tfg.food.cooked_springling_chops') + .texture('tfg:item/food/cooked_springling_chops') + .food(food => food.hunger(4).saturation(4)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + + //Walker + event.create('tfg:food/raw_walker_steak') + .translationKey('item.tfg.food.raw_walker_steak') + .texture('tfg:item/food/raw_walker_steak') + .food(food => food.hunger(3).saturation(2) + .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods/meats') + .tag('tfc:foods/raw_meats') + + event.create('tfg:food/cooked_walker_steak') + .translationKey('item.tfg.food.cooked_walker_steak') + .texture('tfg:item/food/cooked_walker_steak') .food(food => food.hunger(8).saturation(10)) .tag('tfc:foods/meats') .tag('tfc:foods/cooked_meats') + + //Glider + event.create('tfg:food/raw_glider_wings') + .translationKey('item.tfg.food.raw_glider_wings') + .texture('tfg:item/food/raw_glider_wings') + .food(food => food.hunger(1).saturation(1) + .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods/meats') + .tag('tfc:foods/raw_meats') + + event.create('tfg:food/cooked_glider_wings') + .translationKey('item.tfg.food.cooked_glider_wings') + .texture('tfg:item/food/cooked_glider_wings') + .food(food => food.hunger(2).saturation(3)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + + //Soarer + event.create('tfg:food/raw_whole_soarer') + .translationKey('item.tfg.food.raw_whole_soarer') + .texture('tfg:item/food/raw_whole_soarer') + .food(food => food.hunger(2).saturation(2) + .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods/meats') + .tag('tfc:foods/raw_meats') + + event.create('tfg:food/cooked_whole_soarer') + .translationKey('item.tfg.food.cooked_whole_soarer') + .texture('tfg:item/food/cooked_whole_soarer') + .food(food => food.hunger(6).saturation(6)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + + //Crusher + event.create('tfg:food/raw_crusher_meat') + .translationKey('item.tfg.food.raw_crusher_meat') + .texture('tfg:item/food/raw_crusher_meat') + .food(food => food.hunger(3).saturation(2) + .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods/meats') + .tag('tfc:foods/raw_meats') + + event.create('tfg:food/cooked_crusher_meat') + .translationKey('item.tfg.food.cooked_crusher_meat') + .texture('tfg:item/food/cooked_crusher_meat') + .food(food => food.hunger(5).saturation(6)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + + //Goober + event.create('tfg:food/raw_goober_meat') + .translationKey('item.tfg.food.raw_goober_meat') + .texture('tfg:item/food/raw_goober_meat') + .food(food => food.hunger(1).saturation(2) + .effect('minecraft:hunger', 100, 0, 1)) + .tag('tfc:foods/meats') + .tag('tfc:foods/raw_meats') + + event.create('tfg:food/cooked_goober_meat') + .translationKey('item.tfg.food.cooked_goober_meat') + .texture('tfg:item/food/cooked_goober_meat') + .food(food => food.hunger(3).saturation(6)) + .tag('tfc:foods/meats') + .tag('tfc:foods/cooked_meats') + event.create('tfg:food/ice_soup') .translationKey('item.tfg.food.ice_soup') diff --git a/pakku-lock.json b/pakku-lock.json index ce9c2e3f9..38eaa01cc 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -13522,6 +13522,72 @@ } ] }, + { + "pakku_id": "qM5Yyq0zqqJc8XtT", + "pakku_links": [ + "pB7ARGecP03UXpd6" + ], + "type": "MOD", + "side": "BOTH", + "slug": { + "curseforge": "wans-ancient-beasts", + "modrinth": "wab" + }, + "name": { + "curseforge": "Wan's Ancient Beasts", + "modrinth": "Wan's Ancient Beasts" + }, + "id": { + "curseforge": "1108604", + "modrinth": "nWC3kyL3" + }, + "files": [ + { + "type": "curseforge", + "file_name": "wab-1.20.1-1.3.0.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6871/96/wab-1.20.1-1.3.0.jar", + "id": "6871096", + "parent_id": "1108604", + "hashes": { + "sha1": "e614c4c18b0623cb26c7aede3f75b9ed43cf54c7", + "md5": "190aa6671f0a42775ee89381a47369a9" + }, + "required_dependencies": [], + "size": 9916516, + "date_published": "2025-08-10T12:28:16.640Z" + }, + { + "type": "modrinth", + "file_name": "wab-1.20.1-1.3.0.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/nWC3kyL3/versions/txtFU0oY/wab-1.20.1-1.3.0.jar", + "id": "txtFU0oY", + "parent_id": "nWC3kyL3", + "hashes": { + "sha512": "216b256897bfa01671883aebd9f38dceb1077b8abff63a85f12f80ef800cb28d6b7bd8dd42c54ff928a587dd43d4ddc8fde7a8f45ec85459287bfabe578d4760", + "sha1": "e614c4c18b0623cb26c7aede3f75b9ed43cf54c7" + }, + "required_dependencies": [ + "8BmcQJ2H" + ], + "size": 9916516, + "date_published": "2025-08-12T15:03:58.487235Z" + } + ] + }, { "pakku_id": "zonLLbYfp9ViO9i7", "type": "MOD", From beed3094f3b8d83e1bad5ca89387e322e16956e8 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 15 Aug 2025 22:47:44 +0100 Subject: [PATCH 05/26] buttons again #1625 --- kubejs/server_scripts/tfc/tags.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 9b7427fe0..93bd2ba28 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -443,6 +443,11 @@ const registerTFCBlockTags = (event) => { const brick_blacklist = ('drying|slab|stairs|wall|additionalplacements'); event.add('tfc:bloomery_insulation', `/^(?=.*brick)(?!.*(${brick_blacklist})).*/`); event.add('tfc:forge_insulation', `/^(?=.*brick)(?!.*(${brick_blacklist})).*/`); + + global.TFC_STONE_TYPES.forEach(stone => { + event.add('minecraft:stone_buttons', `tfc:rock/button/${stone}`) + event.add('minecraft:buttons', `tfc:rock/button/${stone}`) + }) } const registerTFCFluidTags = (event) => { From 81b3dcc8e473fc4a32ecaf3cd842702450c31ce0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 15 Aug 2025 23:05:10 +0100 Subject: [PATCH 06/26] butn --- kubejs/server_scripts/tfc/tags.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 93bd2ba28..42227aa1f 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -326,6 +326,11 @@ const registerTFCItemTags = (event) => { event.add('tfc:forge_invisible_whitelist', 'greate:titanium_mechanical_pump') event.add('forge:mushrooms', 'tfc:plant/artists_conk') + + global.TFC_STONE_TYPES.forEach(stone => { + event.add('minecraft:stone_buttons', `tfc:rock/button/${stone}`) + event.add('minecraft:buttons', `tfc:rock/button/${stone}`) + }) } const registerTFCBlockTags = (event) => { From 427b77e99ab5769b00f2aeeb1f619c3e93854a84 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 15 Aug 2025 23:05:22 +0100 Subject: [PATCH 07/26] fiddling with forest noise --- kubejs/server_scripts/tfg/events.chunks.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/tfg/events.chunks.js b/kubejs/server_scripts/tfg/events.chunks.js index a1aa0ecf9..e6979a49f 100644 --- a/kubejs/server_scripts/tfg/events.chunks.js +++ b/kubejs/server_scripts/tfg/events.chunks.js @@ -37,11 +37,11 @@ TFCEvents.createChunkDataProvider('mars', event => { const rain = TFC.misc.lerpFloatLayer(0, 0, 0, 0); const tempLayer = TFC.misc.newOpenSimplex2D(event.worldSeed + 4621678939469) - .spread(0.2) + .spread(0.002) .octaves(3) .scaled(70, 90) const forestLayer = TFC.misc.newOpenSimplex2D(event.worldSeed + 98713856895664) - .spread(0.8) + .spread(0.0002) .terraces(9) .affine(6, 12) .scaled(6, 18, 0, 1) From a341470cee16825a4ac2bde51a1220814d159a84 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 15 Aug 2025 23:30:14 +0100 Subject: [PATCH 08/26] removed cobalt oxide's meltability #1634 --- kubejs/startup_scripts/gtceu/materials.js | 1 - 1 file changed, 1 deletion(-) diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index 259ecaccc..d066405f5 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -140,7 +140,6 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Potin.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(807 * 0.6, 807 * 0.8, 807, 2)); GTMaterials.Cobalt.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1495 * 0.6, 1495 * 0.8, 1495, 3)); GTMaterials.Cobaltite.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1495 * 0.6, 1495 * 0.8, 1495, GTMaterials.Cobalt, 3, 85)); - GTMaterials.CobaltOxide.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1495 * 0.6, 1495 * 0.8, 1495, GTMaterials.Cobalt, 3)); GTMaterials.CobaltBrass.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1060 * 0.6, 1060 * 0.8, 1060, 3)); let AlSi = GTMaterials.get('aluminium_silicate') AlSi.setProperty(TFGPropertyKey.TFC_PROPERTY, new $TFC_PROPERTY(1540, 1540, 1540, 1)) From b2660923c6048003a92b1a44a5de325f76c85abc Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 16 Aug 2025 00:16:03 +0100 Subject: [PATCH 09/26] space suit capacity changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd22b6c29..1f6cb7615 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Firmalife mixing bowls can now be placed on tool racks (#1623) @Pyritie - Fixed recipe for pyroxenite button (again) (#1625) @Pyritie - Refactored locometal recipes to use stonecutters, metal plated locometal is now also much cheaper (#1624) @Pyritie +- Increased the air capacity of space suits by 250% @Pyritie ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop From 0ed457001dc53155e91cbb403cab2f743fe1ebf9 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 16 Aug 2025 00:45:29 +0100 Subject: [PATCH 10/26] fix typo in loot pool --- kubejs/data/species/loot_tables/entities/goober.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/data/species/loot_tables/entities/goober.json b/kubejs/data/species/loot_tables/entities/goober.json index 49b61e5fb..57f9bdfc7 100644 --- a/kubejs/data/species/loot_tables/entities/goober.json +++ b/kubejs/data/species/loot_tables/entities/goober.json @@ -47,7 +47,7 @@ "entries": [ { "type": "minecraft:item", - "name": "minecraft:slimeball", + "name": "minecraft:slime_ball", "functions": [ { "function": "minecraft:set_count", From c6fbc052900dd53bab630a0c21307ddd938d2320 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 16 Aug 2025 02:55:28 +0100 Subject: [PATCH 11/26] biome tweaks, adding some mobs, reducing amount of endermen --- .../tfg/worldgen/biome/mars/amber_hills.json | 32 +++++++++---- .../tfg/worldgen/biome/mars/amber_plains.json | 41 +++++++++++----- .../biome/mars/martian_dune_edge.json | 37 ++++++++------- .../worldgen/biome/mars/martian_dunes.json | 13 ++++- .../biome/mars/martian_mountains.json | 32 ++++++++++--- .../worldgen/biome/mars/martian_oasis.json | 23 +++++---- .../worldgen/biome/mars/martian_river.json | 37 +++++++++------ .../worldgen/biome/mars/martian_riverbed.json | 35 ++++++++------ .../worldgen/biome/mars/rusticus_hills.json | 46 +++++++++++------- .../worldgen/biome/mars/rusticus_plains.json | 47 +++++++++++++------ .../worldgen/biome/mars/sangnum_hills.json | 36 ++++++++------ .../worldgen/biome/mars/sangnum_plains.json | 47 ++++++++++++------- 12 files changed, 281 insertions(+), 145 deletions(-) diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json index 7f263b9e5..c9502f68e 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json @@ -58,16 +58,16 @@ "has_precipitation": false, "spawn_costs": { "endermanoverhaul:crimson_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:warped_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:badlands_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -78,7 +78,7 @@ "type": "tfg:sniffer", "maxCount": 3, "minCount": 1, - "weight": 100 + "weight": 50 }, { "type": "species:wraptor", @@ -96,19 +96,31 @@ "type": "wan_ancient_beasts:glider", "maxCount": 4, "minCount": 1, - "weight": 30 + "weight": 100 }, { "type": "wan_ancient_beasts:soarer", "maxCount": 2, "minCount": 1, + "weight": 60 + }, + { + "type": "wan_ancient_beasts:eater", + "maxCount": 1, + "minCount": 1, "weight": 10 }, { "type": "species:springling", "maxCount": 3, "minCount": 1, - "weight": 20 + "weight": 50 + }, + { + "type": "tfg:glacian_ram", + "maxCount": 3, + "minCount": 1, + "weight": 40 } ], "misc": [], @@ -121,7 +133,7 @@ }, { "type": "endermanoverhaul:warped_forest_enderman", - "maxCount": 3, + "maxCount": 1, "minCount": 1, "weight": 100 }, diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json index 91ff2bae8..22cad6f90 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json @@ -53,16 +53,16 @@ "has_precipitation": false, "spawn_costs": { "endermanoverhaul:crimson_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:warped_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:badlands_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -78,12 +78,12 @@ { "type": "species:wraptor", "maxCount": 4, - "minCount": 1, + "minCount": 2, "weight": 100 }, { "type": "wan_ancient_beasts:walker", - "maxCount": 4, + "maxCount": 3, "minCount": 1, "weight": 100 }, @@ -99,11 +99,23 @@ "minCount": 1, "weight": 20 }, + { + "type": "wan_ancient_beasts:soarer", + "maxCount": 1, + "minCount": 1, + "weight": 5 + }, { "type": "tfg:glacian_ram", - "maxCount": 6, + "maxCount": 5, "minCount": 1, "weight": 100 + }, + { + "type": "wan_ancient_beasts:eater", + "maxCount": 1, + "minCount": 1, + "weight": 5 } ], "misc": [], @@ -116,7 +128,7 @@ }, { "type": "endermanoverhaul:warped_forest_enderman", - "maxCount": 3, + "maxCount": 1, "minCount": 1, "weight": 100 }, @@ -129,7 +141,14 @@ ], "underground_water_creature": [], "water_ambient": [], - "water_creature": [] + "water_creature": [ + { + "type": "wan_ancient_beasts:surfer", + "maxCount": 2, + "minCount": 1, + "weight": 100 + } + ] }, "temperature": 0.8 } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json index ecb2113ef..7397cca40 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json @@ -56,44 +56,49 @@ "has_precipitation": false, "spawn_costs": { "endermanoverhaul:crimson_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:warped_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:badlands_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { "ambient": [], "axolotls": [], "creature": [ - { - "type": "species:goober", - "maxCount": 3, - "minCount": 1, - "weight": 100 - }, { "type": "wan_ancient_beasts:crusher", "maxCount": 2, "minCount": 1, - "weight": 80 + "weight": 100 }, { "type": "wan_ancient_beasts:glider", "maxCount": 2, "minCount": 1, - "weight": 50 + "weight": 20 } - - ], + ], "misc": [], "monster": [ + { + "type": "endermanoverhaul:crimson_forest_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 100 + }, + { + "type": "endermanoverhaul:warped_forest_enderman", + "maxCount": 1, + "minCount": 1, + "weight": 100 + }, { "type": "endermanoverhaul:badlands_enderman", "maxCount": 1, diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json index d5696a2ff..a7910be6d 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json @@ -51,7 +51,18 @@ ], "has_precipitation": false, "spawn_costs": { - + "endermanoverhaul:crimson_forest_enderman": { + "energy_budget": 0.05, + "charge": 0.9 + }, + "endermanoverhaul:warped_forest_enderman": { + "energy_budget": 0.05, + "charge": 0.9 + }, + "endermanoverhaul:badlands_enderman": { + "energy_budget": 0.05, + "charge": 0.9 + } }, "spawners": { "ambient": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json index cc0570446..8e856b551 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json @@ -57,16 +57,16 @@ "has_precipitation": false, "spawn_costs": { "endermanoverhaul:crimson_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:warped_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:badlands_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -84,6 +84,24 @@ "maxCount": 4, "minCount": 2, "weight": 100 + }, + { + "type": "wan_ancient_beasts:crusher", + "maxCount": 2, + "minCount": 1, + "weight": 80 + }, + { + "type": "wan_ancient_beasts:glider", + "maxCount": 2, + "minCount": 1, + "weight": 50 + }, + { + "type": "wan_ancient_beasts:soarer", + "maxCount": 2, + "minCount": 1, + "weight": 50 } ], "misc": [], @@ -96,7 +114,7 @@ }, { "type": "endermanoverhaul:warped_forest_enderman", - "maxCount": 3, + "maxCount": 1, "minCount": 1, "weight": 100 }, diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json b/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json index 7bf61a392..d8b2d4b6c 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json @@ -56,16 +56,16 @@ "has_precipitation": false, "spawn_costs": { "endermanoverhaul:crimson_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:warped_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:badlands_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -88,7 +88,7 @@ }, { "type": "endermanoverhaul:warped_forest_enderman", - "maxCount": 3, + "maxCount": 1, "minCount": 1, "weight": 20 }, @@ -101,7 +101,14 @@ ], "underground_water_creature": [], "water_ambient": [], - "water_creature": [] + "water_creature": [ + { + "type": "wan_ancient_beasts:surfer", + "maxCount": 2, + "minCount": 1, + "weight": 100 + } + ] }, "temperature": 0.8 } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json index 0710509e4..b67db091b 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json @@ -57,33 +57,27 @@ "has_precipitation": false, "spawn_costs": { "endermanoverhaul:crimson_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:warped_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:badlands_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { "ambient": [], "axolotls": [], "creature": [ - { - "type": "minecraft:sniffer", - "maxCount": 2, - "minCount": 1, - "weight": 75 - }, { "type": "species:wraptor", "maxCount": 2, "minCount": 1, - "weight": 75 + "weight": 50 }, { "type": "species:goober", @@ -102,7 +96,7 @@ }, { "type": "endermanoverhaul:warped_forest_enderman", - "maxCount": 3, + "maxCount": 1, "minCount": 1, "weight": 100 }, @@ -115,7 +109,20 @@ ], "underground_water_creature": [], "water_ambient": [], - "water_creature": [] + "water_creature": [ + { + "type": "wan_ancient_beasts:toxlacanth", + "maxCount": 5, + "minCount": 2, + "weight": 100 + }, + { + "type": "wan_ancient_beasts:surfer", + "maxCount": 3, + "minCount": 2, + "weight": 100 + } + ] }, "temperature": 0.8 } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json b/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json index 924aaa4d3..b3f6be5e6 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json @@ -60,28 +60,22 @@ "has_precipitation": false, "spawn_costs": { "endermanoverhaul:crimson_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:warped_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:badlands_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { "ambient": [], "axolotls": [], "creature": [ - { - "type": "minecraft:sniffer", - "maxCount": 1, - "minCount": 1, - "weight": 50 - }, { "type": "species:wraptor", "maxCount": 2, @@ -105,7 +99,7 @@ }, { "type": "endermanoverhaul:warped_forest_enderman", - "maxCount": 3, + "maxCount": 1, "minCount": 1, "weight": 100 }, @@ -118,7 +112,20 @@ ], "underground_water_creature": [], "water_ambient": [], - "water_creature": [] + "water_creature": [ + { + "type": "wan_ancient_beasts:toxlacanth", + "maxCount": 5, + "minCount": 2, + "weight": 100 + }, + { + "type": "wan_ancient_beasts:surfer", + "maxCount": 3, + "minCount": 2, + "weight": 100 + } + ] }, "temperature": 0.8 } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json index 669b61600..90fa83163 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json @@ -58,16 +58,16 @@ "has_precipitation": false, "spawn_costs": { "endermanoverhaul:crimson_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:warped_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:badlands_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -76,39 +76,51 @@ "creature": [ { "type": "tfg:sniffer", - "maxCount": 4, + "maxCount": 3, "minCount": 1, - "weight": 100 + "weight": 10 }, { "type": "species:wraptor", - "maxCount": 3, - "minCount": 1, + "maxCount": 4, + "minCount": 2, "weight": 100 }, { "type": "wan_ancient_beasts:crusher", - "maxCount": 3, + "maxCount": 5, "minCount": 1, - "weight": 20 + "weight": 100 }, { "type": "wan_ancient_beasts:glider", "maxCount": 4, "minCount": 1, - "weight": 30 + "weight": 100 }, { "type": "wan_ancient_beasts:soarer", "maxCount": 2, "minCount": 1, - "weight": 20 + "weight": 30 + }, + { + "type": "wan_ancient_beasts:eater", + "maxCount": 1, + "minCount": 1, + "weight": 10 }, { "type": "species:springling", - "maxCount": 5, - "minCount": 2, + "maxCount": 3, + "minCount": 1, "weight": 100 + }, + { + "type": "tfg:glacian_ram", + "maxCount": 3, + "minCount": 1, + "weight": 20 } ], "misc": [], @@ -121,7 +133,7 @@ }, { "type": "endermanoverhaul:warped_forest_enderman", - "maxCount": 3, + "maxCount": 1, "minCount": 1, "weight": 100 }, diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json index 2f6d5f406..8f7cf74d9 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json @@ -53,16 +53,16 @@ "has_precipitation": false, "spawn_costs": { "endermanoverhaul:crimson_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:warped_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:badlands_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -71,14 +71,14 @@ "creature": [ { "type": "tfg:sniffer", - "maxCount": 4, + "maxCount": 3, "minCount": 1, "weight": 100 }, { "type": "species:wraptor", - "maxCount": 3, - "minCount": 1, + "maxCount": 4, + "minCount": 2, "weight": 100 }, { @@ -89,9 +89,9 @@ }, { "type": "wan_ancient_beasts:crusher", - "maxCount": 4, + "maxCount": 5, "minCount": 1, - "weight": 20 + "weight": 100 }, { "type": "wan_ancient_beasts:glider", @@ -99,11 +99,23 @@ "minCount": 1, "weight": 20 }, + { + "type": "wan_ancient_beasts:soarer", + "maxCount": 1, + "minCount": 1, + "weight": 5 + }, { "type": "tfg:glacian_ram", - "maxCount": 6, + "maxCount": 5, "minCount": 1, "weight": 100 + }, + { + "type": "wan_ancient_beasts:eater", + "maxCount": 1, + "minCount": 1, + "weight": 5 } ], "misc": [], @@ -116,7 +128,7 @@ }, { "type": "endermanoverhaul:warped_forest_enderman", - "maxCount": 3, + "maxCount": 1, "minCount": 1, "weight": 100 }, @@ -129,7 +141,14 @@ ], "underground_water_creature": [], "water_ambient": [], - "water_creature": [] + "water_creature": [ + { + "type": "wan_ancient_beasts:surfer", + "maxCount": 2, + "minCount": 1, + "weight": 100 + } + ] }, "temperature": 0.8 } \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json index 952b80678..25537f193 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json @@ -58,16 +58,16 @@ "has_precipitation": false, "spawn_costs": { "endermanoverhaul:crimson_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:warped_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:badlands_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -76,21 +76,21 @@ "creature": [ { "type": "tfg:sniffer", - "maxCount": 4, + "maxCount": 3, "minCount": 1, - "weight": 100 + "weight": 20 }, { "type": "species:wraptor", "maxCount": 4, - "minCount": 1, + "minCount": 2, "weight": 100 }, { "type": "wan_ancient_beasts:crusher", "maxCount": 3, "minCount": 1, - "weight": 20 + "weight": 70 }, { "type": "wan_ancient_beasts:glider", @@ -102,19 +102,25 @@ "type": "wan_ancient_beasts:soarer", "maxCount": 2, "minCount": 1, - "weight": 40 + "weight": 100 }, { - "type": "species:goober", + "type": "wan_ancient_beasts:eater", "maxCount": 1, "minCount": 1, - "weight": 50 + "weight": 10 }, { "type": "species:springling", "maxCount": 3, "minCount": 1, - "weight": 100 + "weight": 80 + }, + { + "type": "tfg:glacian_ram", + "maxCount": 3, + "minCount": 1, + "weight": 30 } ], "misc": [], @@ -127,7 +133,7 @@ }, { "type": "endermanoverhaul:warped_forest_enderman", - "maxCount": 3, + "maxCount": 1, "minCount": 1, "weight": 100 }, diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json index f6d77a5ac..835cf9506 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json @@ -53,16 +53,16 @@ "has_precipitation": false, "spawn_costs": { "endermanoverhaul:crimson_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:warped_forest_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 }, "endermanoverhaul:badlands_enderman": { - "energy_budget": 0.15, - "charge": 0.7 + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -71,45 +71,51 @@ "creature": [ { "type": "tfg:sniffer", - "maxCount": 4, + "maxCount": 3, "minCount": 1, "weight": 100 }, { "type": "species:wraptor", "maxCount": 4, - "minCount": 1, + "minCount": 2, "weight": 100 }, { "type": "wan_ancient_beasts:walker", - "maxCount": 5, + "maxCount": 3, "minCount": 1, "weight": 100 }, { "type": "wan_ancient_beasts:crusher", - "maxCount": 4, + "maxCount": 5, "minCount": 1, - "weight": 20 + "weight": 100 }, { "type": "wan_ancient_beasts:glider", "maxCount": 2, "minCount": 1, - "weight": 100 + "weight": 20 }, { - "type": "species:goober", + "type": "wan_ancient_beasts:soarer", "maxCount": 1, "minCount": 1, - "weight": 50 + "weight": 5 }, { "type": "tfg:glacian_ram", - "maxCount": 6, + "maxCount": 5, "minCount": 1, "weight": 100 + }, + { + "type": "wan_ancient_beasts:eater", + "maxCount": 1, + "minCount": 1, + "weight": 5 } ], "misc": [], @@ -122,7 +128,7 @@ }, { "type": "endermanoverhaul:warped_forest_enderman", - "maxCount": 3, + "maxCount": 1, "minCount": 1, "weight": 100 }, @@ -135,7 +141,14 @@ ], "underground_water_creature": [], "water_ambient": [], - "water_creature": [] + "water_creature": [ + { + "type": "wan_ancient_beasts:surfer", + "maxCount": 2, + "minCount": 1, + "weight": 100 + } + ] }, "temperature": 0.8 } \ No newline at end of file From f2380e9ebde67b69a5efc99fb4b266793291596b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 16 Aug 2025 02:55:49 +0100 Subject: [PATCH 12/26] tree stuff --- kubejs/server_scripts/tfg/events.chunks.js | 16 +++++++++-- kubejs/server_scripts/tfg/events.forests.js | 32 ++++++++++++++------- 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/kubejs/server_scripts/tfg/events.chunks.js b/kubejs/server_scripts/tfg/events.chunks.js index e6979a49f..ad12db91c 100644 --- a/kubejs/server_scripts/tfg/events.chunks.js +++ b/kubejs/server_scripts/tfg/events.chunks.js @@ -2,6 +2,7 @@ "use strict"; const $HeightMap = Java.loadClass("net.minecraft.world.level.levelgen.Heightmap") +const $ForestType = Java.loadClass("net.dries007.tfc.world.chunkdata.ForestType") const ROCK_LAYER_HEIGHT = 40; @@ -70,12 +71,23 @@ TFCEvents.createChunkDataProvider('mars', event => { tempLayer.noise(x + 15, z + 15) ); + let forestType = $ForestType.NONE; + const forestTypeNoise = forestLayer.noise(x, z); + if (forestTypeNoise < 0.2) + forestType = $ForestType.OLD_GROWTH; + else if (forestTypeNoise < 0.4) + forestType = $ForestType.NORMAL; + else if (forestTypeNoise < 0.6) + forestType = $ForestType.EDGE; + else if (forestTypeNoise < 0.8) + forestType = $ForestType.SPARSE; + data.generatePartial( rain, temp, - forestLayer.noise(x, z) * 4, // Kube accepts ordinal numbers for enum constants + forestType, forestLayer.noise(x * 78423 + 869, z), - forestLayer.noise(x, z * 651349 - 698763) + forestTypeNoise //forestLayer.noise(x, z * 651349 - 698763) ); }); diff --git a/kubejs/server_scripts/tfg/events.forests.js b/kubejs/server_scripts/tfg/events.forests.js index e4045d179..7e1551a4e 100644 --- a/kubejs/server_scripts/tfg/events.forests.js +++ b/kubejs/server_scripts/tfg/events.forests.js @@ -5,13 +5,13 @@ TFCEvents.worldgenData(event => { event.forest('tfg:mars_forest', '#tfg:mars_forest_entries', [ - event.forestTypesMapEntry('none', 0, 0, 0, 0, false, false, 0), - event.forestTypesMapEntry('sparse', [1, 3], 6, 0.08, 0, true, false, null), - event.forestTypesMapEntry('edge', 2, 10, null, 1, false, false, [0, 1]), - event.forestTypesMapEntry('normal', 5, 25, null, 1, true, false, null), - event.forestTypesMapEntry('old_growth', 7, 40, null, 1, false, true, [0, 1]) + event.forestTypesMapEntry('none', [1, 3], 0, 0, 0, false, false, 0), + event.forestTypesMapEntry('sparse', [2, 5], 6, 0.08, 0, true, false, null), + event.forestTypesMapEntry('edge', 5, 15, 0.1, 1, true, true, [0, 1]), + event.forestTypesMapEntry('normal', 10, 25, 0.1, 1, true, true, [1, 2]), + event.forestTypesMapEntry('old_growth', 15, 40, 0.2, 1, true, true, [1, 2]) ], - true, + false, placement => {} ) @@ -24,7 +24,9 @@ TFCEvents.worldgenData(event => { [ // ground cover 'minecraft:crimson_fungus', 'beneath:wood/fallen_leaves/crimson', - 'beneath:wood/twig/crimson' + 'beneath:wood/twig/crimson', + 'tfc:groundcover/feather', + 'tfc:groundcover/stick' ], 'tfg:mars/tree/crimson', // tree feature 'tfg:mars/tree/crimson_dead', // dead tree feature @@ -47,7 +49,9 @@ TFCEvents.worldgenData(event => { [ 'minecraft:warped_fungus', 'beneath:wood/fallen_leaves/warped', - 'beneath:wood/twig/warped' + 'beneath:wood/twig/warped', + 'tfc:groundcover/feather', + 'tfc:groundcover/stick' ], 'tfg:mars/tree/warped', 'tfg:mars/tree/warped_dead', @@ -65,7 +69,9 @@ TFCEvents.worldgenData(event => { [ "ad_astra:aeronos_mushroom", 'beneath:wood/fallen_leaves/crimson', - 'beneath:wood/twig/crimson' + 'beneath:wood/twig/crimson', + 'tfc:groundcover/feather', + 'tfc:groundcover/stick' ], 'tfg:mars/tree/aeronos', 'tfg:mars/tree/aeronos_dead', @@ -83,7 +89,9 @@ TFCEvents.worldgenData(event => { [ "ad_astra:strophar_mushroom", 'beneath:wood/fallen_leaves/warped', - 'beneath:wood/twig/warped' + 'beneath:wood/twig/warped', + 'tfc:groundcover/feather', + 'tfc:groundcover/stick' ], 'tfg:mars/tree/strophar', 'tfg:mars/tree/strophar_dead', @@ -101,7 +109,9 @@ TFCEvents.worldgenData(event => { [ "species:alphacene_mushroom", 'beneath:wood/fallen_leaves/crimson', - 'beneath:wood/twig/crimson' + 'beneath:wood/twig/crimson', + 'tfc:groundcover/feather', + 'tfc:groundcover/stick' ], 'species:alphacene_mushroom', 'tfg:mars/tree/alphacene_dead', From 4a0c61c240189aa3197974e7b1ab23d633c5639a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 16 Aug 2025 02:55:54 +0100 Subject: [PATCH 13/26] tags for wab --- kubejs/server_scripts/ad_astra/tags.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index d41342161..112add8c1 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -243,6 +243,7 @@ const registerAdAstraBlockTags = (event) => { event.add('tfg:mars_soil', 'tfg:grass/amber_mycelium') event.add('tfg:mars_soil', 'tfg:grass/sangnum_mycelium') event.add('ad_astra:mars_stone_replaceables', '#tfg:mars_soil') + event.add('minecraft:animals_spawnable_on', '#tfg:mars_soil') event.add('tfc:can_carve', '#ad_astra:moon_stone_replaceables') event.add('tfc:can_carve', '#ad_astra:mars_stone_replaceables') @@ -363,7 +364,9 @@ const registerAdAstraEntityTypeTags = (event) => { 'wan_ancient_beasts:eater', 'wan_ancient_beasts:crusher', 'wan_ancient_beasts:soarer', - 'wan_ancient_beasts:glider' + 'wan_ancient_beasts:glider', + 'wan_ancient_beasts:toxlacanth', + 'wan_ancient_beasts:surfer' ] COLD_ENTITIES.forEach(entity => { From b42f535264afb1992a9371854c6f5482b8b07e3b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 16 Aug 2025 02:58:19 +0100 Subject: [PATCH 14/26] added regular endermen back --- .../data/tfg/worldgen/biome/mars/amber_hills.json | 10 ++++++++++ .../data/tfg/worldgen/biome/mars/amber_plains.json | 10 ++++++++++ .../tfg/worldgen/biome/mars/martian_dune_edge.json | 10 ++++++++++ .../tfg/worldgen/biome/mars/martian_dunes.json | 4 ++++ .../tfg/worldgen/biome/mars/martian_mountains.json | 10 ++++++++++ .../tfg/worldgen/biome/mars/martian_oasis.json | 14 ++++++++++++++ .../tfg/worldgen/biome/mars/martian_river.json | 10 ++++++++++ .../tfg/worldgen/biome/mars/martian_riverbed.json | 10 ++++++++++ .../tfg/worldgen/biome/mars/rusticus_hills.json | 10 ++++++++++ .../tfg/worldgen/biome/mars/rusticus_plains.json | 10 ++++++++++ .../tfg/worldgen/biome/mars/sangnum_hills.json | 10 ++++++++++ .../tfg/worldgen/biome/mars/sangnum_plains.json | 10 ++++++++++ 12 files changed, 118 insertions(+) diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json index c9502f68e..5a20f90f8 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json @@ -68,6 +68,10 @@ "endermanoverhaul:badlands_enderman": { "energy_budget": 0.05, "charge": 0.9 + }, + "minecraft:enderman": { + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -142,6 +146,12 @@ "maxCount": 1, "minCount": 1, "weight": 100 + }, + { + "type": "minecraft:enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json index 22cad6f90..0befe6e5a 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json @@ -63,6 +63,10 @@ "endermanoverhaul:badlands_enderman": { "energy_budget": 0.05, "charge": 0.9 + }, + "minecraft:enderman": { + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -137,6 +141,12 @@ "maxCount": 1, "minCount": 1, "weight": 100 + }, + { + "type": "minecraft:enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json index 7397cca40..64febb1de 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json @@ -66,6 +66,10 @@ "endermanoverhaul:badlands_enderman": { "energy_budget": 0.05, "charge": 0.9 + }, + "minecraft:enderman": { + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -104,6 +108,12 @@ "maxCount": 1, "minCount": 1, "weight": 100 + }, + { + "type": "minecraft:enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json index a7910be6d..85d45d325 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json @@ -62,6 +62,10 @@ "endermanoverhaul:badlands_enderman": { "energy_budget": 0.05, "charge": 0.9 + }, + "minecraft:enderman": { + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json index 8e856b551..f0b9acd73 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json @@ -67,6 +67,10 @@ "endermanoverhaul:badlands_enderman": { "energy_budget": 0.05, "charge": 0.9 + }, + "minecraft:enderman": { + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -123,6 +127,12 @@ "maxCount": 1, "minCount": 1, "weight": 100 + }, + { + "type": "minecraft:enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json b/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json index d8b2d4b6c..2bf7a2eba 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json @@ -66,6 +66,14 @@ "endermanoverhaul:badlands_enderman": { "energy_budget": 0.05, "charge": 0.9 + }, + "minecraft:enderman": { + "energy_budget": 0.05, + "charge": 0.9 + }, + "species:quake": { + "energy_budget": 0.15, + "charge": 0.7 } }, "spawners": { @@ -97,6 +105,12 @@ "maxCount": 1, "minCount": 1, "weight": 50 + }, + { + "type": "minecraft:enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json index b67db091b..321febf6c 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json @@ -67,6 +67,10 @@ "endermanoverhaul:badlands_enderman": { "energy_budget": 0.05, "charge": 0.9 + }, + "minecraft:enderman": { + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -105,6 +109,12 @@ "maxCount": 1, "minCount": 1, "weight": 100 + }, + { + "type": "minecraft:enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json b/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json index b3f6be5e6..e092c165d 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json +++ b/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json @@ -70,6 +70,10 @@ "endermanoverhaul:badlands_enderman": { "energy_budget": 0.05, "charge": 0.9 + }, + "minecraft:enderman": { + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -108,6 +112,12 @@ "maxCount": 1, "minCount": 1, "weight": 100 + }, + { + "type": "minecraft:enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json index 90fa83163..b53811376 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json @@ -68,6 +68,10 @@ "endermanoverhaul:badlands_enderman": { "energy_budget": 0.05, "charge": 0.9 + }, + "minecraft:enderman": { + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -142,6 +146,12 @@ "maxCount": 1, "minCount": 1, "weight": 100 + }, + { + "type": "minecraft:enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json index 8f7cf74d9..254df3963 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json @@ -63,6 +63,10 @@ "endermanoverhaul:badlands_enderman": { "energy_budget": 0.05, "charge": 0.9 + }, + "minecraft:enderman": { + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -137,6 +141,12 @@ "maxCount": 1, "minCount": 1, "weight": 100 + }, + { + "type": "minecraft:enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json index 25537f193..618c11c0e 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json @@ -68,6 +68,10 @@ "endermanoverhaul:badlands_enderman": { "energy_budget": 0.05, "charge": 0.9 + }, + "minecraft:enderman": { + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -142,6 +146,12 @@ "maxCount": 1, "minCount": 1, "weight": 100 + }, + { + "type": "minecraft:enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 } ], "underground_water_creature": [], diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json index 835cf9506..c826e3d0d 100644 --- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json +++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json @@ -63,6 +63,10 @@ "endermanoverhaul:badlands_enderman": { "energy_budget": 0.05, "charge": 0.9 + }, + "minecraft:enderman": { + "energy_budget": 0.05, + "charge": 0.9 } }, "spawners": { @@ -137,6 +141,12 @@ "maxCount": 1, "minCount": 1, "weight": 100 + }, + { + "type": "minecraft:enderman", + "maxCount": 1, + "minCount": 1, + "weight": 20 } ], "underground_water_creature": [], From 39db363896cca3c63bd464cd0e58f4919f537502 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 16 Aug 2025 03:02:29 +0100 Subject: [PATCH 15/26] made crops a little rarer, grasses a little more common --- .../tfg/worldgen/configured_feature/mars/crop/amber_root.json | 2 +- .../worldgen/configured_feature/mars/crop/blossom_berry.json | 2 +- .../worldgen/configured_feature/mars/crop/bolux_mushroom.json | 2 +- .../worldgen/configured_feature/mars/crop/cave_pumpkin.json | 2 +- .../configured_feature/mars/crop/chorus_mushroom.json | 2 +- .../worldgen/configured_feature/mars/crop/shadow_berry.json | 2 +- .../tfg/worldgen/placed_feature/mars/crop/amber_root.json | 2 +- .../tfg/worldgen/placed_feature/mars/crop/blossom_berry.json | 2 +- .../tfg/worldgen/placed_feature/mars/crop/bolux_mushroom.json | 2 +- .../tfg/worldgen/placed_feature/mars/crop/cave_pumpkin.json | 2 +- .../worldgen/placed_feature/mars/crop/chorus_mushroom.json | 2 +- .../tfg/worldgen/placed_feature/mars/crop/shadow_berry.json | 2 +- .../tfg/worldgen/placed_feature/mars/surface/aeridium.json | 4 ++-- .../tfg/worldgen/placed_feature/mars/surface/cave_grass.json | 2 +- .../tfg/worldgen/placed_feature/mars/surface/lutebus.json | 2 +- .../data/tfg/worldgen/placed_feature/mars/surface/orango.json | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/amber_root.json b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/amber_root.json index 6517e2edb..adb77bb40 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/amber_root.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/amber_root.json @@ -35,7 +35,7 @@ } ] }, - "tries": 16, + "tries": 12, "xz_spread": 10, "y_spread": 2 } diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/blossom_berry.json b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/blossom_berry.json index 84b07a38f..dcff72864 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/blossom_berry.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/blossom_berry.json @@ -35,7 +35,7 @@ } ] }, - "tries": 16, + "tries": 12, "xz_spread": 10, "y_spread": 2 } diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/bolux_mushroom.json b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/bolux_mushroom.json index 7ae8ad29f..7a4b3d1b6 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/bolux_mushroom.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/bolux_mushroom.json @@ -35,7 +35,7 @@ } ] }, - "tries": 16, + "tries": 12, "xz_spread": 10, "y_spread": 2 } diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/cave_pumpkin.json b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/cave_pumpkin.json index 89db4f83c..d9101720e 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/cave_pumpkin.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/cave_pumpkin.json @@ -30,7 +30,7 @@ } ] }, - "tries": 16, + "tries": 12, "xz_spread": 10, "y_spread": 2 } diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/chorus_mushroom.json b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/chorus_mushroom.json index 19e67254c..004a6db4c 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/chorus_mushroom.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/chorus_mushroom.json @@ -35,7 +35,7 @@ } ] }, - "tries": 16, + "tries": 12, "xz_spread": 10, "y_spread": 2 } diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/shadow_berry.json b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/shadow_berry.json index e316ca1e0..6975247b2 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/crop/shadow_berry.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/crop/shadow_berry.json @@ -35,7 +35,7 @@ } ] }, - "tries": 16, + "tries": 12, "xz_spread": 10, "y_spread": 2 } diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/amber_root.json b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/amber_root.json index a754268f1..6ffacad5c 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/amber_root.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/amber_root.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 60 + "chance": 70 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/blossom_berry.json b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/blossom_berry.json index 8be00bd3c..1a4913e22 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/blossom_berry.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/blossom_berry.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 60 + "chance": 70 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/bolux_mushroom.json b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/bolux_mushroom.json index d7b0ae0b2..dc42c645f 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/bolux_mushroom.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/bolux_mushroom.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 60 + "chance": 70 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/cave_pumpkin.json b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/cave_pumpkin.json index 639a59c9c..95c6d9943 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/cave_pumpkin.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/cave_pumpkin.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 60 + "chance": 70 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/chorus_mushroom.json b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/chorus_mushroom.json index 73f8b11f3..af59e4dc0 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/chorus_mushroom.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/chorus_mushroom.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 60 + "chance": 70 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/shadow_berry.json b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/shadow_berry.json index 510bb64d6..16d39386f 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/crop/shadow_berry.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/crop/shadow_berry.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 60 + "chance": 70 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/aeridium.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/aeridium.json index ffc5ef7f8..f1ab0c68f 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/aeridium.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/aeridium.json @@ -1,9 +1,9 @@ { - "feature": "tfg:mars/surface/ruscus", + "feature": "tfg:mars/surface/aeridium", "placement": [ { "type": "minecraft:count", - "count": 1 + "count": 2 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/cave_grass.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/cave_grass.json index b464f6c22..bc216736e 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/cave_grass.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/cave_grass.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 6 + "count": 7 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/lutebus.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/lutebus.json index d674231a5..6a1d566b5 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/lutebus.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/lutebus.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 2 + "count": 4 }, { "type": "minecraft:in_square" diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/orango.json b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/orango.json index 98419b076..d0442c031 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/surface/orango.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/surface/orango.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 2 + "count": 4 }, { "type": "minecraft:in_square" From 570072fccb97846cc6c0a879f6e9e619055cc36b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 16 Aug 2025 03:03:14 +0100 Subject: [PATCH 16/26] made ponds a little more common --- .../placed_feature/mars/semiheavy_ammoniacal_water.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/data/tfg/worldgen/placed_feature/mars/semiheavy_ammoniacal_water.json b/kubejs/data/tfg/worldgen/placed_feature/mars/semiheavy_ammoniacal_water.json index f1c558897..ec025871f 100644 --- a/kubejs/data/tfg/worldgen/placed_feature/mars/semiheavy_ammoniacal_water.json +++ b/kubejs/data/tfg/worldgen/placed_feature/mars/semiheavy_ammoniacal_water.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:rarity_filter", - "chance": 30 + "chance": 20 }, { "type": "minecraft:in_square" From 335985592371e042b5db50321f352f41c08748c0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 16 Aug 2025 03:22:01 +0100 Subject: [PATCH 17/26] fix shape of old growth strophar trees --- .../mars/tree/strophar_old_growth.json | 28 ++++--------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_old_growth.json b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_old_growth.json index ce6e15b66..42a417e5c 100644 --- a/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_old_growth.json +++ b/kubejs/data/tfg/worldgen/configured_feature/mars/tree/strophar_old_growth.json @@ -34,26 +34,10 @@ "upper_size": 0 }, "trunk_placer": { - "type": "minecraft:upwards_branching_trunk_placer", - "base_height": 2, - "height_rand_a": 2, - "height_rand_b": 8, - "can_grow_through": "#minecraft:mangrove_logs_can_grow_through", - "extra_branch_steps": { - "type": "minecraft:uniform", - "value": { - "min_inclusive": 3, - "max_inclusive": 5 - } - }, - "extra_branch_length": { - "type": "minecraft:uniform", - "value": { - "min_inclusive": 4, - "max_inclusive": 12 - } - }, - "place_branch_per_log_probability": 0.25 + "type": "minecraft:forking_trunk_placer", + "base_height": 8, + "height_rand_a": 5, + "height_rand_b": 8 }, "trunk_provider": { "type": "minecraft:simple_state_provider", @@ -65,8 +49,8 @@ "type": "minecraft:mangrove_root_placer", "trunk_offset_y": 7, "mangrove_root_placement": { - "max_root_width": 12, - "max_root_length": 12, + "max_root_width": 16, + "max_root_length": 16, "random_skew_chance": 0.8, "can_grow_through": "#minecraft:mangrove_logs_can_grow_through", "muddy_roots_in": [ From 3521adc4de3e1bfbdfa62c53217fcbbe80ee6dd1 Mon Sep 17 00:00:00 2001 From: GameStar <56610486+BlueBoat29@users.noreply.github.com> Date: Fri, 15 Aug 2025 22:20:48 -0500 Subject: [PATCH 18/26] idk some recipes (#1635) Co-authored-by: Redeix --- kubejs/server_scripts/main_server_script.js | 4 ++ .../wan_ancient_beasts/recipes.js | 55 +++++++++++++++ .../server_scripts/wan_ancient_beasts/tags.js | 28 ++++++++ kubejs/startup_scripts/tfc/constants.js | 12 +++- .../wan_ancient_beasts/constants.js | 67 +++++++++++++++++++ 5 files changed, 164 insertions(+), 2 deletions(-) create mode 100644 kubejs/server_scripts/wan_ancient_beasts/recipes.js create mode 100644 kubejs/server_scripts/wan_ancient_beasts/tags.js create mode 100644 kubejs/startup_scripts/wan_ancient_beasts/constants.js diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 6fd203e17..c2af044ab 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -51,6 +51,7 @@ ServerEvents.tags('item', event => { registerTFGItemTags(event) registerTFCLunchboxItemTags(event) registerVintageImprovementsItemTags(event) + registerWABItemTags(event) }) /** @@ -85,6 +86,7 @@ ServerEvents.tags('block', event => { registerTFCBlockTags(event) registerTFGBlockTags(event) registerVintageImprovementsBlockTags(event) + registerWABBlockTags(event) }) /** @@ -160,6 +162,7 @@ TFCEvents.data(event => { registerTFCDataForTFCLunchbox(event) registerTFCDataForTFG(event) registerTFCDataForWaterFlasks(event) + registerWABFoodData(event) }) /** @@ -263,6 +266,7 @@ ServerEvents.recipes(event => { registerTreeTapRecipes(event) registerVintageImprovementsRecipes(event) registerWaterFlasksRecipes(event) + registerWABRecipes(event) }) TaCZServerEvents.gunIndexLoad((event) => { diff --git a/kubejs/server_scripts/wan_ancient_beasts/recipes.js b/kubejs/server_scripts/wan_ancient_beasts/recipes.js new file mode 100644 index 000000000..7109c0f50 --- /dev/null +++ b/kubejs/server_scripts/wan_ancient_beasts/recipes.js @@ -0,0 +1,55 @@ + +// priority: 0 +"use strict"; + +/** + * @param {Internal.RecipesEventJS_} event + */ +const registerWABRecipes = (event) => { + + event.remove({ mod: 'wan_ancient_beasts'}) + + + event.shapeless('wan_ancient_beasts:quick_sand_bucket', + [ + '#tfc:dirt', + '#tfc:mud', + 'tfc:sand/yellow', + 'minecraft:bucket' + ]) + + event.shapeless('wan_ancient_beasts:quick_red_sand_bucket', + [ + '#tfc:dirt', + '#tfc:mud', + 'minecraft:red_sand', + 'minecraft:bucket' + ]) + + event.recipes.tfc.heating('wan_ancient_beasts:toxlacanth', 200) + .resultItem(TFC.isp.of('wan_ancient_beasts:cooked_toxlacanth').copyFood()) + + event.recipes.gtceu.macerator('wan_ancient_beasts:skull_crush') + .itemInputs('#wan_ancient_beasts:ancient_skull') + .itemOutputs('32x #forge:dusts/bone') + .duration(400) + .EUt(30) + +} + +const registerWABFoodData = (event) => { + + event.foodItem('wan_ancient_beasts:toxlacanth', food => { + food.hunger(2) + food.protein(1.5) + food.decayModifier(3) + }) + + event.foodItem('wan_ancient_beasts:cooked_toxlacanth', food => { + food.hunger(4) + food.saturation(2) + food.protein(2.5) + food.decayModifier(2.25) + }) + +} \ No newline at end of file diff --git a/kubejs/server_scripts/wan_ancient_beasts/tags.js b/kubejs/server_scripts/wan_ancient_beasts/tags.js new file mode 100644 index 000000000..390e92127 --- /dev/null +++ b/kubejs/server_scripts/wan_ancient_beasts/tags.js @@ -0,0 +1,28 @@ +"use strict"; + +const registerWABBlockTags = (event) => { + global.WAB_DISABLED_BLOCKS.forEach(block => { + event.removeAllTagsFrom(block) + event.add('c:hidden_from_recipe_viewers', block) + }) +} + +const registerWABItemTags = (event) => { + global.WAB_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + event.add('c:hidden_from_recipe_viewers', item) + }) + + event.removeAll('wan_ancient_beasts:paleontologist_common') + event.removeAll('wan_ancient_beasts:paleontologist_rare') + event.removeAll('wan_ancient_beasts:paleontologist_items') + event.removeAll('wan_ancient_beasts:eater_food') + + event.add('tfc:foods/raw_meats', 'wan_ancient_beasts:toxlacanth') + event.add('firmalife:foods/raw_fish', 'wan_ancient_beasts:toxlacanth') + event.add('tfc:foods/meats', 'wan_ancient_beasts:toxlacanth') + + event.add('tfc:foods/cooked_meats', 'wan_ancient_beasts:cooked_toxlacanth') + event.add('firmalife:foods/cooked_fish', 'wan_ancient_beasts:cooked_toxlacanth') + event.add('tfc:food/meats', 'wan_ancient_beasts:cooked_toxlacanth') +} \ No newline at end of file diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index 3d7f4843a..dd39c1ced 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -917,8 +917,16 @@ global.TFC_MEAT_RECIPE_COMPONENTS = [ { input: 'betterend:chorus_mushroom_product', output: 'betterend:chorus_mushroom_cooked', name: 'chorus_mushroom' }, { input: 'betterend:shadow_berry_product', output: 'betterend:shadow_berry_cooked', name: 'shadow_berry' }, { input: 'betterend:cave_pumpkin_pie_raw', output: 'betterend:cave_pumpkin_pie', name: 'cave_pumpkin_pie' }, - { input: 'tfg:food/raw_glacian_mutton', output: 'tfg:food/cooked_glacian_mutton', name: 'cooked_glacian_mutton' }, - { input: 'tfg:food/raw_sniffer_beef', output: 'tfg:food/cooked_sniffer_beef', name: 'cooked_sniffer_beef' } + { input: 'tfg:food/raw_glacian_mutton', output: 'tfg:food/cooked_glacian_mutton', name: 'cooked_glacian_mutton' }, + { input: 'tfg:food/raw_sniffer_beef', output: 'tfg:food/cooked_sniffer_beef', name: 'cooked_sniffer_beef' }, + { input: 'tfg:food/raw_wraptor', output: 'tfg:food/cooked_wraptor', name: 'cooked_wraptor' }, + { input: 'wan_ancient_beasts:raw_toxlacanth', output: 'wan_ancient_beasts:cooked_toxlacanth', name: 'cooked_toxlacanth' }, + { input: 'tfg:food/raw_springling_chops', output: 'tfg:food/cooked_springling_chops', name: 'cooked_springling_chops' }, + { input: 'tfg:food/raw_walker_steak', output: 'tfg:food/cooked_walker_steak', name: 'cooked_walker_steak' }, + { input: 'tfg:food/raw_glider_wings', output: 'tfg:food/cooked_glider_wings', name: 'cooked_glider_wings' }, + { input: 'tfg:food/raw_whole_soarer', output: 'tfg:food/cooked_whole_soarer', name: 'cooked_whole_soarer' }, + { input: 'tfg:food/raw_crusher_meat', output: 'tfg:food/cooked_crusher_meat', name: 'cooked_crusher_meat' }, + { input: 'tfg:food/raw_goober_meat', output: 'tfg:food/cooked_goober_meat', name: 'cooked_goober_meat' } ]; global.TFC_QUERN_POWDER_RECIPE_COMPONENTS = [ diff --git a/kubejs/startup_scripts/wan_ancient_beasts/constants.js b/kubejs/startup_scripts/wan_ancient_beasts/constants.js new file mode 100644 index 000000000..01cc0c9ee --- /dev/null +++ b/kubejs/startup_scripts/wan_ancient_beasts/constants.js @@ -0,0 +1,67 @@ +// priority: 0 +"use strict"; + +global.WAB_DISABLED_BLOCKS =[ + 'wan_ancient_beasts:frozen_straw_block', + 'wan_ancient_beasts:straw_block', + 'wan_ancient_beasts:straw_stairs', + 'wan_ancient_beasts:straw_slab', + 'wan_ancient_beasts:nest', + 'wan_ancient_beasts:suspicious_red_sand', + 'wan_ancient_beasts:suspicious_ice' +] + + +global.WAB_DISABLED_ITEMS = [ + + 'wan_ancient_beasts:frozen_straw_block', + 'wan_ancient_beasts:straw_block', + 'wan_ancient_beasts:straw_stairs', + 'wan_ancient_beasts:straw_slab', + 'wan_ancient_beasts:nest', + 'wan_ancient_beasts:suspicious_red_sand', + 'wan_ancient_beasts:suspicious_ice', + 'wan_ancient_beasts:chisel', + //'wan_ancient_beasts:eater_tooth', + 'wan_ancient_beasts:ancient_club', + //'wan_ancient_beasts:crusher_spike', + 'wan_ancient_beasts:ancient_upgrade_smithing_template', + 'wan_ancient_beasts:reinforced_shield', + //'wan_ancient_beasts:glider_feather', + 'wan_ancient_beasts:hang_glider', + //'wan_ancient_beasts:surfer_armor', + 'wan_ancient_beasts:eater_egg', + 'wan_ancient_beasts:walker_egg', + 'wan_ancient_beasts:crusher_egg', + 'wan_ancient_beasts:glider_egg', + 'wan_ancient_beasts:soarer_egg', + 'wan_ancient_beasts:surfer_egg', + 'wan_ancient_beasts:frozen_ancient_meat', + 'wan_ancient_beasts:raw_ancient_meat', + 'wan_ancient_beasts:cooked_ancient_meat', + //'wan_ancient_beasts:sniff_armor_trim_smithing_template', + //'wan_ancient_beasts:spike_armor_trim_smithing_template', + 'wan_ancient_beasts:jaw_pottery_sherd', + 'wan_ancient_beasts:spike_pottery_sherd', + 'wan_ancient_beasts:stroll_pottery_sherd', + 'wan_ancient_beasts:beak_pottery_sherd', + 'wan_ancient_beasts:fall_pottery_sherd', + 'wan_ancient_beasts:fossil_pottery_sherd', + 'wan_ancient_beasts:tide_pottery_sherd', + 'wan_ancient_beasts:white_hang_glider', + 'wan_ancient_beasts:light_gray_hang_glider', + 'wan_ancient_beasts:gray_hang_glider', + 'wan_ancient_beasts:black_hang_glider', + 'wan_ancient_beasts:brown_hang_glider', + 'wan_ancient_beasts:red_hang_glider', + 'wan_ancient_beasts:orange_hang_glider', + 'wan_ancient_beasts:yellow_hang_glider', + 'wan_ancient_beasts:lime_hang_glider', + 'wan_ancient_beasts:green_hang_glider', + 'wan_ancient_beasts:light_blue_hang_glider', + 'wan_ancient_beasts:cyan_hang_glider', + 'wan_ancient_beasts:blue_hang_glider', + 'wan_ancient_beasts:purple_hang_glider', + 'wan_ancient_beasts:magenta_hang_glider', + 'wan_ancient_beasts:pink_hang_glider' +] \ No newline at end of file From 3372a085e279da533b731b726e0a21b735031d80 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Aug 2025 11:49:41 +0500 Subject: [PATCH 19/26] Bump devops-infra/action-pull-request in the dependencies group (#1653) Bumps the dependencies group with 1 update: [devops-infra/action-pull-request](https://github.com/devops-infra/action-pull-request). Updates `devops-infra/action-pull-request` from 0.6.0 to 0.6.1 - [Release notes](https://github.com/devops-infra/action-pull-request/releases) - [Commits](https://github.com/devops-infra/action-pull-request/compare/v0.6.0...v0.6.1) --- updated-dependencies: - dependency-name: devops-infra/action-pull-request dependency-version: 0.6.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8fd91a13c..fc28695a2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -252,7 +252,7 @@ jobs: - name: 🔍 Create Pull Request if tag not found if: ${{ steps.check_existing_pr.outputs.exists == 'false' }} - uses: devops-infra/action-pull-request@v0.6.0 + uses: devops-infra/action-pull-request@v0.6.1 with: github_token: ${{ secrets.GITHUB_TOKEN }} source_branch: dev From 59ad85e08f31f36441d272341744e64dd84150ca Mon Sep 17 00:00:00 2001 From: Vincent <43859503+vdegans@users.noreply.github.com> Date: Wed, 20 Aug 2025 00:56:02 +0200 Subject: [PATCH 20/26] FIx deathMessage typo and improve grammar (#1642) * fix deathMessage typo * Some more death message improvements * add new death messages --------- Co-authored-by: Redeix --- config/enhancedvisuals.json | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/config/enhancedvisuals.json b/config/enhancedvisuals.json index 83fdff9ab..a1a6cae18 100644 --- a/config/enhancedvisuals.json +++ b/config/enhancedvisuals.json @@ -1,15 +1,36 @@ { "messages": { "deathMessages": [ - "Do you really want to respawn? think of it again.", - "Life is hard. Deal with it!", - "You are dead ... wait you already know that.", - "Did I let the stove on...?", - "Should have shot back first...", + "Do you really want to respawn?", + "You are dead... wait you already knew that.", + "Did I leave the stove on...?", "Yep, that\u0027s messed up...", - "Rage incomming!", + "Rage incoming!", "I think you dropped something.", - "Time for a break?" + "Time for a break?", + "Should have seen that coming.", + "Progress denied.", + "Another fine day for entropy.", + "Research complete: mortality confirmed.", + "Civilization setback detected.", + "The factory must grow.", + "Another sample in the archaeology record.", + "You\u0027ve been recycled by nature.", + "Respawns remaining: -1", + "Welcome back to square one.", + "A fine addition to the fossil record.", + "Even bronze can\u0027t save you from that.", + "Turns out you are biodegradable.", + "Who knew survival was this complicated?", + "Respawn pending...", + "Sometimes progress means starting over.", + "A slight delay in evolution.", + "Respawn issued, warranty void.", + "Trial run concluded.", + "You\u0027ve been scheduled for maintenance.", + "Progress report: terminated.", + "Nature always collects its debts.", + "A minor inconvenience in the grand scheme of things." ], "enabled": true } From 75d497ad5da5b5ebd7f5d7e205a61544e639e0c0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 20 Aug 2025 23:37:31 +0100 Subject: [PATCH 21/26] with great power comes great responsibility --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f6cb7615..b7c21a8d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Rebalance Large Solar Array to make Mk2 circuit 2 viable, and buffed to LSA Mk3 circuit 2 (#1591) @TomPlop - Added mechanical press recipes to weld weak steels @Pyritie - Added backpacks, lunchboxes, and vessels to the toolbelt's blacklist @Pyritie +- Toolbelt no longer has a max number of item slots, but of course use this responsibly so you don't chunkban yourself @Pyritie - Moon rabbits can eat chorus fruit now @Pyritie - Added electric greenhouse recipes for mushrooms and bamboo (#1610) @Pyritie - Increased amount of saplings that the electric greenhouse returns to be more in line with create-based tree farms @Pyritie From 3f3e1133c2f90cef44319525ab2097818f2512a6 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 21 Aug 2025 00:12:09 +0100 Subject: [PATCH 22/26] false alarm --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7c21a8d2..1f6cb7615 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,6 @@ - Rebalance Large Solar Array to make Mk2 circuit 2 viable, and buffed to LSA Mk3 circuit 2 (#1591) @TomPlop - Added mechanical press recipes to weld weak steels @Pyritie - Added backpacks, lunchboxes, and vessels to the toolbelt's blacklist @Pyritie -- Toolbelt no longer has a max number of item slots, but of course use this responsibly so you don't chunkban yourself @Pyritie - Moon rabbits can eat chorus fruit now @Pyritie - Added electric greenhouse recipes for mushrooms and bamboo (#1610) @Pyritie - Increased amount of saplings that the electric greenhouse returns to be more in line with create-based tree farms @Pyritie From cd085be512e4a2bd7ff1f5aacb10b5d8239f852c Mon Sep 17 00:00:00 2001 From: Redeix Date: Thu, 21 Aug 2025 00:27:42 -0500 Subject: [PATCH 23/26] Updated tooltip file to use lang strings (#1663) --- kubejs/assets/tfg/lang/en_us.json | 34 ++++++++++ kubejs/client_scripts/tooltips.js | 101 +++++++++++++++--------------- 2 files changed, 86 insertions(+), 49 deletions(-) diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index d6ee13eaa..8670c0a70 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -744,6 +744,40 @@ "tfg.tooltip.food_trait.refrigerating": "§bRefrigerating", "tfg.tooltip.foodtrait.freeze_dried": "Cryodesiccated", "tfg.tooltip.extraterrestrial_farming": "§4Temperature:§r An oxygenated environment provides 15°C", + "tfg.tooltip.nametag": "§7Used on a Scribing Table along with an item to name it, or with black dye to name the tag.", + "tfg.tooltip.yeast_starter": "§7Created with dried fruit", + "tfg.tooltip.beehive": "§7Needs to be filled with empty frames and surrounded by flowers to attract bees.", + "tfg.tooltip.obsolete.tree_tap": "§4Obsolete§f: Replaced by the AFC TreeTap, you can craft it from this one by placing this in a crafting table!", + "tfg.tooltip.obsolete.fridge": "§4Obsolete§f: Replaced by the TFG Refrigerator, you can craft it from this one by placing this in a crafting table!", + "tfg.tooltip.blaze_burner": "§cSuperheat§r §7with Coke, Anthracite, or Flawless and Exquisite coal gems.", + "tfg.tooltip.machine.perfect_overclock": "This machine has §2Perfect Overclocking§r!", + "tfg.tooltip.nether_dome_1": "§7Artificial enviroment to simulate the Nether.", + "tfg.tooltip.machine.customize_interior": "§7The interior is customizable! Check the multiblock preview in JEI.", + "tfg.tooltip.end_dome_1": "§7Artificial enviroment to simulate the End.", + "tfg.tooltip.armor.copper_diving_suit_warmth": "§7Warmth: -1", + "tfg.tooltip.armor.copper_diving_suit_insulation": "§7Insulation: +1", + "tfg.tooltip.armor.netherite_diving_suit_warmth": "§7Warmth: -2", + "tfg.tooltip.armor.netherite_diving_suit_insulation": "§7Insulation: +9", + "tfg.tooltip.armor.netherite_diving_suit_set": "§7Wear the full set to be §eHeatproof§7 from ambient temperatures.", + "tfg.tooltip.armor.nanomuscle_warmth": "§7Warmth: 0", + "tfg.tooltip.armor.nanomuscle_insulation": "§7Insulation: +10", + "tfg.tooltip.armor.nanomuscle_set": "§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.", + "tfg.tooltip.armor.quarktech_warmth": "§7Warmth: 0", + "tfg.tooltip.armor.quarktech_insulation": "§7Insulation: +10", + "tfg.tooltip.armor.quarktech_set": "§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.", + "tfg.tooltip.armor.space_suit_warmth": "§7Warmth: 0", + "tfg.tooltip.armor.space_suit_insulation": "§7Insulation: +10", + "tfg.tooltip.armor.space_suit_set": "§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.", + "tfg.tooltip.support.tier1": "§79 x 5 x 9", + "tfg.tooltip.support.tier2": "§717 x 9 x 17", + "tfg.tooltip.support.tier3": "§733 x 13 x 33", + "tfg.tooltip.vessels": "§cMax: 3024mB", + "tfg.tooltip.solar_panel.single": "Produces §6256 FE/t§r (64 EU/t) on the §6moon§r during the §6day§r", + "tfg.tooltip.solar_panel.large_tier1": "Massive structure producing from §61024 to 4096 EU/t§r on the §6moon§r during the §6day§r", + "tfg.tooltip.solar_panel.large_tier2": "Massive structure producing from §64096 to 16384 EU/t§r on the §6moon§r during the §6day§r", + "tfg.tooltip.solar_panel.large_tier3": "Massive structure producing from §616384 to 65536 EU/t§r on the §6moon§r during the §6day§r", + "tfg.tooltip.petrified_egg": "§7Requires Magma to Incubate", + "tfg.tooltip.obsolete.depreciated": "§cDeprecated, cannot be crafted any more", "entity.tfg.moon_rabbit.male": "Moon Rabbit", "entity.tfg.moon_rabbit.female": "Moon Rabbit", "tfg.tooltip.moon_rabbit_variant.pink": "Pink Fur", diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index 538e8d9cf..c54b99749 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -1,137 +1,140 @@ "use strict"; +/** + * @param {Internal.ItemTooltipEventJS} event + */ const registerTooltips = (event) => { - event.addAdvanced(['gtceu:lv_macerator', 'gtceu:mv_macerator', 'gtceu:hp_steam_macerator'], (item, advanced, text) => { - text.add(1, [text.of('§7Only outputs the first slot shown in EMI/JEI until HV.')]) - }) + //Your IDE may say that "item" and "advanced" are never used, but they are required! So dont remove them <3 + event.addAdvanced(['minecraft:name_tag'], (item, advanced, text) => { - text.add(1, [text.of('§7Used on a Scribing Table along with an item to name it, or with black dye to name the tag.')]) + text.add(1, Text.translate('tfg.tooltip.nametag')) }) event.addAdvanced(['firmalife:bucket/yeast_starter'], (item, advanced, text) => { - text.add(1, [text.of('§7Created with dried fruit')]) + text.add(1, Text.translate('tfg.tooltip.yeast_starter')) }) event.addAdvanced(['firmalife:beehive'], (item, advanced, text) => { - text.add(1, [text.of('§7Needs to be filled with empty frames and surrounded by flowers to attract bees.')]) - }) - event.addAdvanced(["treetap:tap"], (item, advanced, text) => { - text.add(1, [text.of("§4Obsolete§f: Replaced by the AFC TreeTap, you can craft it from this one by placing this in a crafting table!")]) - }) - event.addAdvanced(["tfcea:refrigerator"], (item, advanced, text) => { - text.add(1, [text.of("§4Obsolete§f: Replaced by the GregTech Refrigerator, you can craft it from this one by placing this in a crafting table!")]) + text.add(1, Text.translate('tfg.tooltip.beehive')) }) event.addAdvanced(['create:blaze_burner'], (item, advanced, text) => { - text.add(1, text.of('§cSuperheat§r §7with Coke, Anthracite, or Flawless and Exquisite coal gems.')) + text.add(1, Text.translate('tfg.tooltip.blaze_burner')) }) event.addAdvanced(['tfg:electric_greenhouse'], (item, advanced, text) => { - text.add(1, text.of('This machine has a §2Perfect Overclock§r!')), - text.add(2, text.of(`The interior is customizable! Check the multiblock preview in JEI.`)) + text.add(1, Text.translate('tfg.tooltip.machine.perfect_overclock')), + text.add(2, Text.translate('tfg.tooltip.machine.customize_interior')) }) event.addAdvanced(['gtceu:large_chemical_reactor'], (item, advanced, text) => { - text.add(1, text.of('This machine has a §2Perfect Overclock§r!')) + text.add(1, Text.translate('tfg.tooltip.machine.perfect_overclock')) }) event.addAdvanced(['gtceu:nether_dome'], (item, advanced, text) => { - text.add(1, text.of('§7Artificial enviroment to simulate the Nether.')), - text.add(2, text.of(`§7The interior is customizable! Check the multiblock preview in JEI.`)) + text.add(1, Text.translate('tfg.tooltip.nether_dome_1')), + text.add(2, Text.translate('tfg.tooltip.machine.customize_interior')) }) event.addAdvanced(['gtceu:end_dome'], (item, advanced, text) => { - text.add(1, text.of('§7Artificial enviroment to simulate the End.')), - text.add(2, text.of(`§7The interior is customizable! Check the multiblock preview in JEI.`)) + text.add(1, Text.translate('tfg.tooltip.end_dome_1')), + text.add(2, Text.translate('tfg.tooltip.machine.customize_interior')) }) // Insulation event.addAdvanced(['create:copper_diving_helmet', 'create:copper_backtank', 'create:copper_diving_boots'], (item, advanced, text) => { - text.add(1, text.of('§7Warmth: -1')), - text.add(2, text.of('§7Insulation: +1')) + text.add(1, Text.translate('tfg.tooltip.armor.copper_diving_suit_warmth')), + text.add(2, Text.translate('tfg.tooltip.armor.copper_diving_suit_insulation')) }) event.addAdvanced(['create:netherite_diving_helmet', 'create:netherite_backtank', 'create:netherite_diving_boots', 'minecraft:netherite_leggings'], (item, advanced, text) => { - text.add(1, text.of('§7Warmth: -2')), - text.add(2, text.of('§7Insulation: +9')) - text.add(3, text.of('§7Wear the full set to be §eHeatproof§7 from ambient temperatures.')) + text.add(1, Text.translate('tfg.tooltip.armor.netherite_diving_suit_warmth')), + text.add(2, Text.translate('tfg.tooltip.armor.netherite_diving_suit_insulation')) + text.add(3, Text.translate('tfg.tooltip.armor.netherite_diving_suit_set')) }) event.addAdvanced(['gtceu:nanomuscle_helmet', 'gtceu:nanomuscle_chestplate', 'gtceu:nanomuscle_leggings', 'gtceu:nanomuscle_boots', 'gtceu:advanced_nanomuscle_chestplate'], (item, advanced, text) => { - text.add(1, text.of('§7Warmth: 0')), - text.add(2, text.of('§7Insulation: +10')) - text.add(3, text.of('§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.')) + text.add(1, Text.translate('tfg.tooltip.armor.nanomuscle_warmth')), + text.add(2, Text.translate('tfg.tooltip.armor.nanomuscle_insulation')) + text.add(3, Text.translate('tfg.tooltip.armor.nanomuscle_set')) }) event.addAdvanced(['gtceu:quarktech_helmet', 'gtceu:quarktech_chestplate', 'gtceu:quarktech_leggings', 'gtceu:quarktech_boots', 'gtceu:advanced_quarktech_chestplate'], (item, advanced, text) => { - text.add(1, text.of('§7Warmth: 0')), - text.add(2, text.of('§7Insulation: +10')) - text.add(3, text.of('§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.')) + text.add(1, Text.translate('tfg.tooltip.armor.quarktech_warmth')), + text.add(2, Text.translate('tfg.tooltip.armor.quarktech_insulation')) + text.add(3, Text.translate('tfg.tooltip.armor.quarktech_set')) }) event.addAdvanced([ 'ad_astra:space_helmet', 'ad_astra:space_suit', 'ad_astra:space_pants', 'ad_astra:space_boots', 'ad_astra:netherite_space_helmet', 'ad_astra:netherite_space_suit', 'ad_astra:netherite_space_pants', 'ad_astra:netherite_space_boots', 'ad_astra:jet_suit_helmet', 'ad_astra:jet_suit', 'ad_astra:jet_suit_pants', 'ad_astra:jet_suit_boots' ], (item, advanced, text) => { - text.add(1, text.of('§7Warmth: 0')), - text.add(2, text.of('§7Insulation: +10')) - text.add(3, text.of('§7Wear the full set to be §eFully Insulated§7 from ambient temperatures.')) + text.add(1, Text.translate('tfg.tooltip.armor.space_suit_warmth')), + text.add(2, Text.translate('tfg.tooltip.armor.space_suit_insulation')) + text.add(3, Text.translate('tfg.tooltip.armor.space_suit_set')) }) // Supports global.TFC_WOOD_TYPES.forEach(wood => { event.addAdvanced([`tfc:wood/support/${wood}`], (item, advanced, text) => { - text.add(1, text.of('§79 x 5 x 9')) + text.add(1, Text.translate('tfg.tooltip.support.tier1')) }) }) global.AFC_WOOD_TYPES.forEach(wood => { event.addAdvanced([`afc:wood/support/${wood}`], (item, advanced, text) => { - text.add(1, text.of('§79 x 5 x 9')) + text.add(1, Text.translate('tfg.tooltip.support.tier1')) }) }) global.AD_ASTRA_WOOD.forEach(wood => { event.addAdvanced([`tfg:${wood.name}_support`], (item, advanced, text) => { - text.add(1, text.of('§79 x 5 x 9')) + text.add(1, Text.translate('tfg.tooltip.support.tier1')) }) }) event.addAdvanced(['tfg:light_concrete_support', 'tfg:dark_concrete_support', 'tfg:rebar_support'], (item, advanced, text) => { - text.add(1, text.of('§717 x 9 x 17')) + text.add(1, Text.translate('tfg.tooltip.support.tier2')) }) event.addAdvanced(['tfg:reinforced_light_concrete_support', 'tfg:reinforced_dark_concrete_support', 'tfg:steel_support'], (item, advanced, text) => { - text.add(1, text.of('§733 x 13 x 33')) + text.add(1, Text.translate('tfg.tooltip.support.tier3')) }) const other_stone = ['pyroxenite', 'migmatite', 'travertine'] const stone_types = global.TFC_STONE_TYPES.concat(other_stone) stone_types.forEach(stone => { event.addAdvanced([`tfg:${stone}_support`], (item, advanced, text) => { - text.add(1, text.of('§79 x 5 x 9')) + text.add(1, Text.translate('tfg.tooltip.support.tier1')) }) }) // Vessels event.addAdvanced(['#tfc:fired_vessels'], (item, advanced, text) => { - text.add(1, text.of('§cMax: 3024mB')) + text.add(1, Text.translate('tfg.tooltip.vessels')) }) // Solar Panel event.addAdvanced(['ad_astra:solar_panel'], (item, advanced, text) => { - text.add(1, text.of('Produces §6256 FE/t§r (64 EU/t) on the §6moon§r during the §6day§r')) + text.add(1, Text.translate('tfg.tooltip.solar_panel.single')) }) event.addAdvanced(['gtceu:large_solar_panel'], (item, advanced, text) => { - text.add(1, text.of('Massive structure producing from §61024 to 4096 EU/t§r on the §6moon§r during the §6day§r')) + text.add(1, Text.translate('tfg.tooltip.solar_panel.large_tier1')) }) event.addAdvanced(['gtceu:large_solar_panel_tier2'], (item, advanced, text) => { - text.add(1, text.of('Massive structure producing from §64096 to 16384 EU/t§r on the §6moon§r during the §6day§r')) + text.add(1, Text.translate('tfg.tooltip.solar_panel.large_tier2')) }) event.addAdvanced(['gtceu:large_solar_panel_tier3'], (item, advanced, text) => { - text.add(1, text.of('Massive structure producing from §616384 to 65536 EU/t§r on the §6moon§r during the §6day§r')) + text.add(1, Text.translate('tfg.tooltip.solar_panel.large_tier3')) }) // Mars Animals event.addAdvanced(['species:petrified_egg'], (item, advanced, text) => { - text.add(1, text.of("§7Requires Magma to Incubate")) + text.add(1, Text.translate('tfg.tooltip.petrified_egg')) }) - // MEGA Deprecated 0.10 + //#region Deprecated Items event.addAdvanced(['#megacells:mega_interface'], (item, advanced, text) => { - text.add(1, text.of('§cDeprecated, cannot be crafted any more')) + text.add(1, Text.translate('tfg.tooltip.obsolete.depreciated')) }) event.addAdvanced(['#megacells:mega_pattern_provider'], (item, advanced, text) => { - text.add(1, text.of('§cDeprecated, cannot be crafted any more')) + text.add(1, Text.translate('tfg.tooltip.obsolete.depreciated')) }) + event.addAdvanced(["treetap:tap"], (item, advanced, text) => { + text.add(1, Text.translate('tfg.tooltip.obsolete.tree_tap')) + }) + event.addAdvanced(["tfcea:refrigerator"], (item, advanced, text) => { + text.add(1, Text.translate('tfg.tooltip.obsolete.fridge')) + }) + //#endregion } \ No newline at end of file From 2f4b9fa9546d49ab54863c29b9e3b1fe0e046154 Mon Sep 17 00:00:00 2001 From: Redeix Date: Thu, 21 Aug 2025 02:33:46 -0500 Subject: [PATCH 24/26] Feature/quick fixes (#1664) * Some reflector block fixes * Trim tool changes * Added rose gold alloy smelter recipes --- .../tfg/models/block/reflector_day_1.json | 90 +++ .../tfg/models/block/reflector_day_2.json | 90 +++ .../tfg/models/block/reflector_day_3.json | 90 +++ .../tfg/models/block/reflector_night.json | 601 +----------------- kubejs/server_scripts/tfc/recipes.metals.js | 22 + .../tfg/json_tool.armor_trim.js | 365 +++++------ 6 files changed, 481 insertions(+), 777 deletions(-) diff --git a/kubejs/assets/tfg/models/block/reflector_day_1.json b/kubejs/assets/tfg/models/block/reflector_day_1.json index 0322e6dc6..d9a01c54c 100644 --- a/kubejs/assets/tfg/models/block/reflector_day_1.json +++ b/kubejs/assets/tfg/models/block/reflector_day_1.json @@ -11,6 +11,8 @@ { "from": [0, 0, 0], "to": [16, 16, 16], + "shade": false, + "light_emission": 15, "faces": { "north": {"uv": [0, 12, 4, 16], "texture": "#1"}, "east": {"uv": [0, 12, 4, 16], "texture": "#1"}, @@ -23,6 +25,8 @@ { "from": [-15, -16, -10.8], "to": [-12, -0.1, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-28, 5.9, -12.8]}, "faces": { "north": {"uv": [11, 5.5, 11.75, 9.5], "texture": "#1"}, @@ -36,6 +40,8 @@ { "from": [-12, -16, -10.8], "to": [-9, 4.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-25, 5.9, -12.8]}, "faces": { "north": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, @@ -49,6 +55,8 @@ { "from": [-9, -16, -10.8], "to": [-6, 8.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-22, 5.9, -12.8]}, "faces": { "north": {"uv": [9.5, 3.25, 10.25, 9.5], "texture": "#1"}, @@ -62,6 +70,8 @@ { "from": [-6, -16, -10.8], "to": [-3, 12.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-19, 5.9, -12.8]}, "faces": { "north": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, @@ -75,6 +85,8 @@ { "from": [-3, -16, -10.8], "to": [0, 16.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-16, 5.9, -12.8]}, "faces": { "north": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, @@ -88,6 +100,8 @@ { "from": [28, -16, -10.8], "to": [31, -0.1, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [44, 5.9, -12.8]}, "faces": { "north": {"uv": [11.75, 5.5, 11, 9.5], "texture": "#1"}, @@ -101,6 +115,8 @@ { "from": [25, -16, -10.8], "to": [28, 4.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [41, 5.9, -12.8]}, "faces": { "north": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, @@ -114,6 +130,8 @@ { "from": [22, -16, -10.8], "to": [25, 8.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [38, 5.9, -12.8]}, "faces": { "north": {"uv": [10.25, 3.25, 9.5, 9.5], "texture": "#1"}, @@ -127,6 +145,8 @@ { "from": [19, -16, -10.8], "to": [22, 12.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [35, 5.9, -12.8]}, "faces": { "north": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, @@ -140,6 +160,8 @@ { "from": [16, -16, -10.8], "to": [19, 16.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [32, 5.9, -12.8]}, "faces": { "north": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, @@ -153,6 +175,8 @@ { "from": [0, -16, -10.8], "to": [16, 21.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [0, 5.9, -12.8]}, "faces": { "north": {"uv": [4, 0, 8, 9.5], "texture": "#1"}, @@ -166,6 +190,8 @@ { "from": [-15, -16, 26.8], "to": [-12, -0.1, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-28, 5.9, 28.8]}, "faces": { "north": {"uv": [11, 3.75, 11.75, 9.5], "texture": "#1"}, @@ -179,6 +205,8 @@ { "from": [-12, -16, 26.8], "to": [-9, 4.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-25, 5.9, 28.8]}, "faces": { "north": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, @@ -192,6 +220,8 @@ { "from": [-9, -16, 26.8], "to": [-6, 8.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-22, 5.9, 28.8]}, "faces": { "north": {"uv": [9.5, 3.25, 10.25, 9.5], "texture": "#1"}, @@ -205,6 +235,8 @@ { "from": [-6, -16, 26.8], "to": [-3, 12.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-19, 5.9, 28.8]}, "faces": { "north": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, @@ -218,6 +250,8 @@ { "from": [-3, -16, 26.8], "to": [0, 16.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-16, 5.9, 28.8]}, "faces": { "north": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, @@ -231,6 +265,8 @@ { "from": [28, -16, 26.8], "to": [31, -0.1, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [44, 5.9, 28.8]}, "faces": { "north": {"uv": [11.75, 3.75, 11, 9.5], "texture": "#1"}, @@ -244,6 +280,8 @@ { "from": [25, -16, 26.8], "to": [28, 4.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [41, 5.9, 28.8]}, "faces": { "north": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, @@ -257,6 +295,8 @@ { "from": [22, -16, 26.8], "to": [25, 8.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [38, 5.9, 28.8]}, "faces": { "north": {"uv": [10.25, 3.25, 9.5, 9.5], "texture": "#1"}, @@ -270,6 +310,8 @@ { "from": [19, -16, 26.8], "to": [22, 12.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [35, 5.9, 28.8]}, "faces": { "north": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, @@ -283,6 +325,8 @@ { "from": [16, -16, 26.8], "to": [19, 16.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [32, 5.9, 28.8]}, "faces": { "north": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, @@ -296,6 +340,8 @@ { "from": [0, -16, 26.8], "to": [16, 21.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [0, 5.9, 28.8]}, "faces": { "north": {"uv": [8, 0, 4, 9.5], "texture": "#1"}, @@ -309,6 +355,8 @@ { "from": [-10.7, -16, -15], "to": [-10.7, -0.1, -12], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -28]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -322,6 +370,8 @@ { "from": [-10.7, -16, 16], "to": [-10.7, 16.9, 19], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 32]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -335,6 +385,8 @@ { "from": [-10.7, -16, 19], "to": [-10.7, 12.9, 22], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 35]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -348,6 +400,8 @@ { "from": [-10.7, -16, 22], "to": [-10.7, 8.9, 25], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 38]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -361,6 +415,8 @@ { "from": [-10.7, -16, 25], "to": [-10.7, 4.9, 28], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 41]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -374,6 +430,8 @@ { "from": [-10.7, -16, 28], "to": [-10.7, -0.1, 31], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 44]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -387,6 +445,8 @@ { "from": [-10.7, -16, -12], "to": [-10.7, 4.9, -9], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -25]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -400,6 +460,8 @@ { "from": [-10.7, -16, -9], "to": [-10.7, 8.9, -6], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -22]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -413,6 +475,8 @@ { "from": [-10.7, -16, -6], "to": [-10.7, 12.9, -3], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -19]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -426,6 +490,8 @@ { "from": [-10.7, -16, -3], "to": [-10.7, 16.9, 0], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -16]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -439,6 +505,8 @@ { "from": [-10.7, -16, 0], "to": [-10.7, 21.9, 16], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 0]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -452,6 +520,8 @@ { "from": [26.7, -16, -15], "to": [26.7, -0.1, -12], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -28]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -465,6 +535,8 @@ { "from": [26.7, -16, 16], "to": [26.7, 16.9, 19], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 32]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -478,6 +550,8 @@ { "from": [26.7, -16, 19], "to": [26.7, 12.9, 22], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 35]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -491,6 +565,8 @@ { "from": [26.7, -16, 22], "to": [26.7, 8.9, 25], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 38]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -504,6 +580,8 @@ { "from": [26.7, -16, 25], "to": [26.7, 4.9, 28], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 41]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -517,6 +595,8 @@ { "from": [26.7, -16, 28], "to": [26.7, -0.1, 31], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 44]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -530,6 +610,8 @@ { "from": [26.7, -16, -12], "to": [26.7, 4.9, -9], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -25]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -543,6 +625,8 @@ { "from": [26.7, -16, -9], "to": [26.7, 8.9, -6], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -22]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -556,6 +640,8 @@ { "from": [26.7, -16, -6], "to": [26.7, 12.9, -3], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -19]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -569,6 +655,8 @@ { "from": [26.7, -16, -3], "to": [26.7, 16.9, 0], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -16]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -582,6 +670,8 @@ { "from": [26.7, -16, 0], "to": [26.7, 21.9, 16], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 0]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, diff --git a/kubejs/assets/tfg/models/block/reflector_day_2.json b/kubejs/assets/tfg/models/block/reflector_day_2.json index ce700036f..e2d493b06 100644 --- a/kubejs/assets/tfg/models/block/reflector_day_2.json +++ b/kubejs/assets/tfg/models/block/reflector_day_2.json @@ -11,6 +11,8 @@ { "from": [0, 0, 0], "to": [16, 16, 16], + "shade": false, + "light_emission": 15, "faces": { "north": {"uv": [0, 12, 4, 16], "texture": "#1"}, "east": {"uv": [0, 12, 4, 16], "texture": "#1"}, @@ -23,6 +25,8 @@ { "from": [-15, -16, -10.8], "to": [-12, -0.1, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-28, 5.9, -12.8]}, "faces": { "north": {"uv": [11, 5.5, 11.75, 9.5], "texture": "#1"}, @@ -36,6 +40,8 @@ { "from": [-12, -16, -10.8], "to": [-9, 4.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-25, 5.9, -12.8]}, "faces": { "north": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, @@ -49,6 +55,8 @@ { "from": [-9, -16, -10.8], "to": [-6, 8.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-22, 5.9, -12.8]}, "faces": { "north": {"uv": [9.5, 3.25, 10.25, 9.5], "texture": "#1"}, @@ -62,6 +70,8 @@ { "from": [-6, -16, -10.8], "to": [-3, 12.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-19, 5.9, -12.8]}, "faces": { "north": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, @@ -75,6 +85,8 @@ { "from": [-3, -16, -10.8], "to": [0, 16.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-16, 5.9, -12.8]}, "faces": { "north": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, @@ -88,6 +100,8 @@ { "from": [28, -16, -10.8], "to": [31, -0.1, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [44, 5.9, -12.8]}, "faces": { "north": {"uv": [11.75, 5.5, 11, 9.5], "texture": "#1"}, @@ -101,6 +115,8 @@ { "from": [25, -16, -10.8], "to": [28, 4.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [41, 5.9, -12.8]}, "faces": { "north": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, @@ -114,6 +130,8 @@ { "from": [22, -16, -10.8], "to": [25, 8.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [38, 5.9, -12.8]}, "faces": { "north": {"uv": [10.25, 3.25, 9.5, 9.5], "texture": "#1"}, @@ -127,6 +145,8 @@ { "from": [19, -16, -10.8], "to": [22, 12.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [35, 5.9, -12.8]}, "faces": { "north": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, @@ -140,6 +160,8 @@ { "from": [16, -16, -10.8], "to": [19, 16.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [32, 5.9, -12.8]}, "faces": { "north": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, @@ -153,6 +175,8 @@ { "from": [0, -16, -10.8], "to": [16, 21.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [0, 5.9, -12.8]}, "faces": { "north": {"uv": [4, 0, 8, 9.5], "texture": "#1"}, @@ -166,6 +190,8 @@ { "from": [-15, -16, 26.8], "to": [-12, -0.1, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-28, 5.9, 28.8]}, "faces": { "north": {"uv": [11, 3.75, 11.75, 9.5], "texture": "#1"}, @@ -179,6 +205,8 @@ { "from": [-12, -16, 26.8], "to": [-9, 4.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-25, 5.9, 28.8]}, "faces": { "north": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, @@ -192,6 +220,8 @@ { "from": [-9, -16, 26.8], "to": [-6, 8.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-22, 5.9, 28.8]}, "faces": { "north": {"uv": [9.5, 3.25, 10.25, 9.5], "texture": "#1"}, @@ -205,6 +235,8 @@ { "from": [-6, -16, 26.8], "to": [-3, 12.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-19, 5.9, 28.8]}, "faces": { "north": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, @@ -218,6 +250,8 @@ { "from": [-3, -16, 26.8], "to": [0, 16.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-16, 5.9, 28.8]}, "faces": { "north": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, @@ -231,6 +265,8 @@ { "from": [28, -16, 26.8], "to": [31, -0.1, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [44, 5.9, 28.8]}, "faces": { "north": {"uv": [11.75, 3.75, 11, 9.5], "texture": "#1"}, @@ -244,6 +280,8 @@ { "from": [25, -16, 26.8], "to": [28, 4.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [41, 5.9, 28.8]}, "faces": { "north": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, @@ -257,6 +295,8 @@ { "from": [22, -16, 26.8], "to": [25, 8.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [38, 5.9, 28.8]}, "faces": { "north": {"uv": [10.25, 3.25, 9.5, 9.5], "texture": "#1"}, @@ -270,6 +310,8 @@ { "from": [19, -16, 26.8], "to": [22, 12.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [35, 5.9, 28.8]}, "faces": { "north": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, @@ -283,6 +325,8 @@ { "from": [16, -16, 26.8], "to": [19, 16.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [32, 5.9, 28.8]}, "faces": { "north": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, @@ -296,6 +340,8 @@ { "from": [0, -16, 26.8], "to": [16, 21.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [0, 5.9, 28.8]}, "faces": { "north": {"uv": [8, 0, 4, 9.5], "texture": "#1"}, @@ -309,6 +355,8 @@ { "from": [-10.7, -16, -15], "to": [-10.7, -0.1, -12], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -28]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -322,6 +370,8 @@ { "from": [-10.7, -16, 16], "to": [-10.7, 16.9, 19], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 32]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -335,6 +385,8 @@ { "from": [-10.7, -16, 19], "to": [-10.7, 12.9, 22], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 35]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -348,6 +400,8 @@ { "from": [-10.7, -16, 22], "to": [-10.7, 8.9, 25], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 38]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -361,6 +415,8 @@ { "from": [-10.7, -16, 25], "to": [-10.7, 4.9, 28], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 41]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -374,6 +430,8 @@ { "from": [-10.7, -16, 28], "to": [-10.7, -0.1, 31], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 44]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -387,6 +445,8 @@ { "from": [-10.7, -16, -12], "to": [-10.7, 4.9, -9], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -25]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -400,6 +460,8 @@ { "from": [-10.7, -16, -9], "to": [-10.7, 8.9, -6], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -22]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -413,6 +475,8 @@ { "from": [-10.7, -16, -6], "to": [-10.7, 12.9, -3], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -19]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -426,6 +490,8 @@ { "from": [-10.7, -16, -3], "to": [-10.7, 16.9, 0], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -16]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -439,6 +505,8 @@ { "from": [-10.7, -16, 0], "to": [-10.7, 21.9, 16], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 0]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -452,6 +520,8 @@ { "from": [26.7, -16, -15], "to": [26.7, -0.1, -12], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -28]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -465,6 +535,8 @@ { "from": [26.7, -16, 16], "to": [26.7, 16.9, 19], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 32]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -478,6 +550,8 @@ { "from": [26.7, -16, 19], "to": [26.7, 12.9, 22], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 35]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -491,6 +565,8 @@ { "from": [26.7, -16, 22], "to": [26.7, 8.9, 25], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 38]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -504,6 +580,8 @@ { "from": [26.7, -16, 25], "to": [26.7, 4.9, 28], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 41]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -517,6 +595,8 @@ { "from": [26.7, -16, 28], "to": [26.7, -0.1, 31], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 44]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -530,6 +610,8 @@ { "from": [26.7, -16, -12], "to": [26.7, 4.9, -9], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -25]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -543,6 +625,8 @@ { "from": [26.7, -16, -9], "to": [26.7, 8.9, -6], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -22]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -556,6 +640,8 @@ { "from": [26.7, -16, -6], "to": [26.7, 12.9, -3], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -19]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -569,6 +655,8 @@ { "from": [26.7, -16, -3], "to": [26.7, 16.9, 0], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -16]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -582,6 +670,8 @@ { "from": [26.7, -16, 0], "to": [26.7, 21.9, 16], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 0]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, diff --git a/kubejs/assets/tfg/models/block/reflector_day_3.json b/kubejs/assets/tfg/models/block/reflector_day_3.json index 989d7bc01..721465ba9 100644 --- a/kubejs/assets/tfg/models/block/reflector_day_3.json +++ b/kubejs/assets/tfg/models/block/reflector_day_3.json @@ -11,6 +11,8 @@ { "from": [0, 0, 0], "to": [16, 16, 16], + "shade": false, + "light_emission": 15, "faces": { "north": {"uv": [0, 12, 4, 16], "texture": "#1"}, "east": {"uv": [0, 12, 4, 16], "texture": "#1"}, @@ -23,6 +25,8 @@ { "from": [-15, -16, -10.8], "to": [-12, -0.1, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-28, 5.9, -12.8]}, "faces": { "north": {"uv": [11, 5.5, 11.75, 9.5], "texture": "#1"}, @@ -36,6 +40,8 @@ { "from": [-12, -16, -10.8], "to": [-9, 4.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-25, 5.9, -12.8]}, "faces": { "north": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, @@ -49,6 +55,8 @@ { "from": [-9, -16, -10.8], "to": [-6, 8.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-22, 5.9, -12.8]}, "faces": { "north": {"uv": [9.5, 3.25, 10.25, 9.5], "texture": "#1"}, @@ -62,6 +70,8 @@ { "from": [-6, -16, -10.8], "to": [-3, 12.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-19, 5.9, -12.8]}, "faces": { "north": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, @@ -75,6 +85,8 @@ { "from": [-3, -16, -10.8], "to": [0, 16.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [-16, 5.9, -12.8]}, "faces": { "north": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, @@ -88,6 +100,8 @@ { "from": [28, -16, -10.8], "to": [31, -0.1, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [44, 5.9, -12.8]}, "faces": { "north": {"uv": [11.75, 5.5, 11, 9.5], "texture": "#1"}, @@ -101,6 +115,8 @@ { "from": [25, -16, -10.8], "to": [28, 4.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [41, 5.9, -12.8]}, "faces": { "north": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, @@ -114,6 +130,8 @@ { "from": [22, -16, -10.8], "to": [25, 8.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [38, 5.9, -12.8]}, "faces": { "north": {"uv": [10.25, 3.25, 9.5, 9.5], "texture": "#1"}, @@ -127,6 +145,8 @@ { "from": [19, -16, -10.8], "to": [22, 12.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [35, 5.9, -12.8]}, "faces": { "north": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, @@ -140,6 +160,8 @@ { "from": [16, -16, -10.8], "to": [19, 16.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [32, 5.9, -12.8]}, "faces": { "north": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, @@ -153,6 +175,8 @@ { "from": [0, -16, -10.8], "to": [16, 21.9, -10.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "x", "origin": [0, 5.9, -12.8]}, "faces": { "north": {"uv": [4, 0, 8, 9.5], "texture": "#1"}, @@ -166,6 +190,8 @@ { "from": [-15, -16, 26.8], "to": [-12, -0.1, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-28, 5.9, 28.8]}, "faces": { "north": {"uv": [11, 3.75, 11.75, 9.5], "texture": "#1"}, @@ -179,6 +205,8 @@ { "from": [-12, -16, 26.8], "to": [-9, 4.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-25, 5.9, 28.8]}, "faces": { "north": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, @@ -192,6 +220,8 @@ { "from": [-9, -16, 26.8], "to": [-6, 8.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-22, 5.9, 28.8]}, "faces": { "north": {"uv": [9.5, 3.25, 10.25, 9.5], "texture": "#1"}, @@ -205,6 +235,8 @@ { "from": [-6, -16, 26.8], "to": [-3, 12.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-19, 5.9, 28.8]}, "faces": { "north": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, @@ -218,6 +250,8 @@ { "from": [-3, -16, 26.8], "to": [0, 16.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [-16, 5.9, 28.8]}, "faces": { "north": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, @@ -231,6 +265,8 @@ { "from": [28, -16, 26.8], "to": [31, -0.1, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [44, 5.9, 28.8]}, "faces": { "north": {"uv": [11.75, 3.75, 11, 9.5], "texture": "#1"}, @@ -244,6 +280,8 @@ { "from": [25, -16, 26.8], "to": [28, 4.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [41, 5.9, 28.8]}, "faces": { "north": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, @@ -257,6 +295,8 @@ { "from": [22, -16, 26.8], "to": [25, 8.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [38, 5.9, 28.8]}, "faces": { "north": {"uv": [10.25, 3.25, 9.5, 9.5], "texture": "#1"}, @@ -270,6 +310,8 @@ { "from": [19, -16, 26.8], "to": [22, 12.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [35, 5.9, 28.8]}, "faces": { "north": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, @@ -283,6 +325,8 @@ { "from": [16, -16, 26.8], "to": [19, 16.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [32, 5.9, 28.8]}, "faces": { "north": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, @@ -296,6 +340,8 @@ { "from": [0, -16, 26.8], "to": [16, 21.9, 26.8], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "x", "origin": [0, 5.9, 28.8]}, "faces": { "north": {"uv": [8, 0, 4, 9.5], "texture": "#1"}, @@ -309,6 +355,8 @@ { "from": [-10.7, -16, -15], "to": [-10.7, -0.1, -12], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -28]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -322,6 +370,8 @@ { "from": [-10.7, -16, 16], "to": [-10.7, 16.9, 19], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 32]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -335,6 +385,8 @@ { "from": [-10.7, -16, 19], "to": [-10.7, 12.9, 22], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 35]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -348,6 +400,8 @@ { "from": [-10.7, -16, 22], "to": [-10.7, 8.9, 25], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 38]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -361,6 +415,8 @@ { "from": [-10.7, -16, 25], "to": [-10.7, 4.9, 28], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 41]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -374,6 +430,8 @@ { "from": [-10.7, -16, 28], "to": [-10.7, -0.1, 31], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 44]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -387,6 +445,8 @@ { "from": [-10.7, -16, -12], "to": [-10.7, 4.9, -9], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -25]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -400,6 +460,8 @@ { "from": [-10.7, -16, -9], "to": [-10.7, 8.9, -6], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -22]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -413,6 +475,8 @@ { "from": [-10.7, -16, -6], "to": [-10.7, 12.9, -3], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -19]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -426,6 +490,8 @@ { "from": [-10.7, -16, -3], "to": [-10.7, 16.9, 0], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -16]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -439,6 +505,8 @@ { "from": [-10.7, -16, 0], "to": [-10.7, 21.9, 16], + "shade": false, + "light_emission": 15, "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 0]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -452,6 +520,8 @@ { "from": [26.7, -16, -15], "to": [26.7, -0.1, -12], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -28]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -465,6 +535,8 @@ { "from": [26.7, -16, 16], "to": [26.7, 16.9, 19], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 32]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -478,6 +550,8 @@ { "from": [26.7, -16, 19], "to": [26.7, 12.9, 22], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 35]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -491,6 +565,8 @@ { "from": [26.7, -16, 22], "to": [26.7, 8.9, 25], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 38]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -504,6 +580,8 @@ { "from": [26.7, -16, 25], "to": [26.7, 4.9, 28], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 41]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -517,6 +595,8 @@ { "from": [26.7, -16, 28], "to": [26.7, -0.1, 31], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 44]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -530,6 +610,8 @@ { "from": [26.7, -16, -12], "to": [26.7, 4.9, -9], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -25]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -543,6 +625,8 @@ { "from": [26.7, -16, -9], "to": [26.7, 8.9, -6], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -22]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -556,6 +640,8 @@ { "from": [26.7, -16, -6], "to": [26.7, 12.9, -3], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -19]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -569,6 +655,8 @@ { "from": [26.7, -16, -3], "to": [26.7, 16.9, 0], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -16]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, @@ -582,6 +670,8 @@ { "from": [26.7, -16, 0], "to": [26.7, 21.9, 16], + "shade": false, + "light_emission": 15, "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 0]}, "faces": { "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, diff --git a/kubejs/assets/tfg/models/block/reflector_night.json b/kubejs/assets/tfg/models/block/reflector_night.json index ad2b8884a..7793a9e71 100644 --- a/kubejs/assets/tfg/models/block/reflector_night.json +++ b/kubejs/assets/tfg/models/block/reflector_night.json @@ -19,578 +19,6 @@ "up": {"uv": [4, 12, 8, 16], "texture": "#1"}, "down": {"uv": [4, 12, 8, 16], "texture": "#1"} } - }, - { - "from": [-15, -16, -10.8], - "to": [-12, -0.1, -10.8], - "rotation": {"angle": 45, "axis": "x", "origin": [-28, 5.9, -12.8]}, - "faces": { - "north": {"uv": [11, 5.5, 11.75, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [11.75, 3.75, 11, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "texture": "#1"} - } - }, - { - "from": [-12, -16, -10.8], - "to": [-9, 4.9, -10.8], - "rotation": {"angle": 45, "axis": "x", "origin": [-25, 5.9, -12.8]}, - "faces": { - "north": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "texture": "#1"} - } - }, - { - "from": [-9, -16, -10.8], - "to": [-6, 8.9, -10.8], - "rotation": {"angle": 45, "axis": "x", "origin": [-22, 5.9, -12.8]}, - "faces": { - "north": {"uv": [9.5, 3.25, 10.25, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [10.25, 3.25, 9.5, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "texture": "#1"} - } - }, - { - "from": [-6, -16, -10.8], - "to": [-3, 12.9, -10.8], - "rotation": {"angle": 45, "axis": "x", "origin": [-19, 5.9, -12.8]}, - "faces": { - "north": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "texture": "#1"} - } - }, - { - "from": [-3, -16, -10.8], - "to": [0, 16.9, -10.8], - "rotation": {"angle": 45, "axis": "x", "origin": [-16, 5.9, -12.8]}, - "faces": { - "north": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "texture": "#1"} - } - }, - { - "from": [28, -16, -10.8], - "to": [31, -0.1, -10.8], - "rotation": {"angle": 45, "axis": "x", "origin": [44, 5.9, -12.8]}, - "faces": { - "north": {"uv": [11.75, 5.5, 11, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [11, 3.75, 11.75, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "texture": "#1"} - } - }, - { - "from": [25, -16, -10.8], - "to": [28, 4.9, -10.8], - "rotation": {"angle": 45, "axis": "x", "origin": [41, 5.9, -12.8]}, - "faces": { - "north": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "texture": "#1"} - } - }, - { - "from": [22, -16, -10.8], - "to": [25, 8.9, -10.8], - "rotation": {"angle": 45, "axis": "x", "origin": [38, 5.9, -12.8]}, - "faces": { - "north": {"uv": [10.25, 3.25, 9.5, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [9.5, 3.25, 10.25, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "texture": "#1"} - } - }, - { - "from": [19, -16, -10.8], - "to": [22, 12.9, -10.8], - "rotation": {"angle": 45, "axis": "x", "origin": [35, 5.9, -12.8]}, - "faces": { - "north": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "texture": "#1"} - } - }, - { - "from": [16, -16, -10.8], - "to": [19, 16.9, -10.8], - "rotation": {"angle": 45, "axis": "x", "origin": [32, 5.9, -12.8]}, - "faces": { - "north": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "texture": "#1"} - } - }, - { - "from": [0, -16, -10.8], - "to": [16, 21.9, -10.8], - "rotation": {"angle": 45, "axis": "x", "origin": [0, 5.9, -12.8]}, - "faces": { - "north": {"uv": [4, 0, 8, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [4, 0, 8, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "texture": "#1"} - } - }, - { - "from": [-15, -16, 26.8], - "to": [-12, -0.1, 26.8], - "rotation": {"angle": -45, "axis": "x", "origin": [-28, 5.9, 28.8]}, - "faces": { - "north": {"uv": [11, 3.75, 11.75, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [11.75, 5.5, 11, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "texture": "#1"} - } - }, - { - "from": [-12, -16, 26.8], - "to": [-9, 4.9, 26.8], - "rotation": {"angle": -45, "axis": "x", "origin": [-25, 5.9, 28.8]}, - "faces": { - "north": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "texture": "#1"} - } - }, - { - "from": [-9, -16, 26.8], - "to": [-6, 8.9, 26.8], - "rotation": {"angle": -45, "axis": "x", "origin": [-22, 5.9, 28.8]}, - "faces": { - "north": {"uv": [9.5, 3.25, 10.25, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [10.25, 3.25, 9.5, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "texture": "#1"} - } - }, - { - "from": [-6, -16, 26.8], - "to": [-3, 12.9, 26.8], - "rotation": {"angle": -45, "axis": "x", "origin": [-19, 5.9, 28.8]}, - "faces": { - "north": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "texture": "#1"} - } - }, - { - "from": [-3, -16, 26.8], - "to": [0, 16.9, 26.8], - "rotation": {"angle": -45, "axis": "x", "origin": [-16, 5.9, 28.8]}, - "faces": { - "north": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "texture": "#1"} - } - }, - { - "from": [28, -16, 26.8], - "to": [31, -0.1, 26.8], - "rotation": {"angle": -45, "axis": "x", "origin": [44, 5.9, 28.8]}, - "faces": { - "north": {"uv": [11.75, 3.75, 11, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [11, 5.5, 11.75, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "texture": "#1"} - } - }, - { - "from": [25, -16, 26.8], - "to": [28, 4.9, 26.8], - "rotation": {"angle": -45, "axis": "x", "origin": [41, 5.9, 28.8]}, - "faces": { - "north": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "texture": "#1"} - } - }, - { - "from": [22, -16, 26.8], - "to": [25, 8.9, 26.8], - "rotation": {"angle": -45, "axis": "x", "origin": [38, 5.9, 28.8]}, - "faces": { - "north": {"uv": [10.25, 3.25, 9.5, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [9.5, 3.25, 10.25, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "texture": "#1"} - } - }, - { - "from": [19, -16, 26.8], - "to": [22, 12.9, 26.8], - "rotation": {"angle": -45, "axis": "x", "origin": [35, 5.9, 28.8]}, - "faces": { - "north": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "texture": "#1"} - } - }, - { - "from": [16, -16, 26.8], - "to": [19, 16.9, 26.8], - "rotation": {"angle": -45, "axis": "x", "origin": [32, 5.9, 28.8]}, - "faces": { - "north": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "texture": "#1"} - } - }, - { - "from": [0, -16, 26.8], - "to": [16, 21.9, 26.8], - "rotation": {"angle": -45, "axis": "x", "origin": [0, 5.9, 28.8]}, - "faces": { - "north": {"uv": [8, 0, 4, 9.5], "texture": "#1"}, - "east": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "south": {"uv": [8, 0, 4, 9.5], "texture": "#1"}, - "west": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "texture": "#1"} - } - }, - { - "from": [-10.7, -16, -15], - "to": [-10.7, -0.1, -12], - "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -28]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [11, 5.5, 11.75, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [11.75, 5.5, 11, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-10.7, -16, 16], - "to": [-10.7, 16.9, 19], - "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 32]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-10.7, -16, 19], - "to": [-10.7, 12.9, 22], - "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 35]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-10.7, -16, 22], - "to": [-10.7, 8.9, 25], - "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 38]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [10.25, 2.25, 9.5, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [9.5, 3.25, 10.25, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-10.7, -16, 25], - "to": [-10.7, 4.9, 28], - "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 41]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-10.7, -16, 28], - "to": [-10.7, -0.1, 31], - "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 44]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [11.75, 5.5, 11, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [11, 5.5, 11.75, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-10.7, -16, -12], - "to": [-10.7, 4.9, -9], - "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -25]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-10.7, -16, -9], - "to": [-10.7, 8.9, -6], - "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -22]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [9.5, 2.25, 10.25, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [10.25, 3.25, 9.5, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-10.7, -16, -6], - "to": [-10.7, 12.9, -3], - "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -19]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-10.7, -16, -3], - "to": [-10.7, 16.9, 0], - "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, -16]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-10.7, -16, 0], - "to": [-10.7, 21.9, 16], - "rotation": {"angle": -45, "axis": "z", "origin": [-12.7, 5.9, 0]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [8, 0, 4, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [8, 0, 4, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [26.7, -16, -15], - "to": [26.7, -0.1, -12], - "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -28]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [11, 5.5, 11.75, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [11.75, 5.5, 11, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [26.7, -16, 16], - "to": [26.7, 16.9, 19], - "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 32]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [26.7, -16, 19], - "to": [26.7, 12.9, 22], - "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 35]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [26.7, -16, 22], - "to": [26.7, 8.9, 25], - "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 38]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [10.25, 3.25, 9.5, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [9.5, 2.25, 10.25, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [26.7, -16, 25], - "to": [26.7, 4.9, 28], - "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 41]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [26.7, -16, 28], - "to": [26.7, -0.1, 31], - "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 44]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [11.75, 5.5, 11, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [11, 5.5, 11.75, 9.5], "texture": "#1"}, - "up": {"uv": [0, 0, 12, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 12, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [26.7, -16, -12], - "to": [26.7, 4.9, -9], - "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -25]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [10.25, 4.25, 11, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [11, 4.25, 10.25, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [26.7, -16, -9], - "to": [26.7, 8.9, -6], - "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -22]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [9.5, 3.25, 10.25, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [10.25, 2.25, 9.5, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [26.7, -16, -6], - "to": [26.7, 12.9, -3], - "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -19]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [8.75, 2.25, 9.5, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [9.5, 2.25, 8.75, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [26.7, -16, -3], - "to": [26.7, 16.9, 0], - "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, -16]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [8, 1.25, 8.75, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [8.75, 1.25, 8, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [26.7, -16, 0], - "to": [26.7, 21.9, 16], - "rotation": {"angle": 45, "axis": "z", "origin": [28.7, 5.9, 0]}, - "faces": { - "north": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "east": {"uv": [4, 0, 8, 9.5], "texture": "#1"}, - "south": {"uv": [0, 0, 0, 9.5], "texture": "#1"}, - "west": {"uv": [4, 0, 8, 9.5], "texture": "#1"}, - "up": {"uv": [12, 0, 0, 0], "rotation": 90, "texture": "#1"}, - "down": {"uv": [12, 0, 0, 0], "rotation": 270, "texture": "#1"} - } } ], "display": { @@ -623,32 +51,5 @@ "fixed": { "scale": [0.5, 0.5, 0.5] } - }, - "groups": [ - 0, - { - "name": "ray1", - "origin": [-28, 5.9, -12.8], - "color": 0, - "children": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] - }, - { - "name": "ray2", - "origin": [-28, 5.9, -12.8], - "color": 0, - "children": [12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22] - }, - { - "name": "ray3", - "origin": [-28, 5.9, -12.8], - "color": 0, - "children": [23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33] - }, - { - "name": "ray3", - "origin": [-28, 5.9, -12.8], - "color": 0, - "children": [34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44] - } - ] + } } \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/recipes.metals.js b/kubejs/server_scripts/tfc/recipes.metals.js index 0a005c29c..ec358a554 100644 --- a/kubejs/server_scripts/tfc/recipes.metals.js +++ b/kubejs/server_scripts/tfc/recipes.metals.js @@ -200,6 +200,28 @@ function registerTFCMetalsRecipes(event) { .duration(700) .EUt(4) + // Rose Gold + const copper_types = [ + "#forge:ingots/copper", + "#forge:dusts/copper", + "#forge:ingots/annealed_copper", + "#forge:dusts/annealed_copper" + ]; + const gold_types = [ + "#forge:ingots/gold", + "#forge:dusts/gold" + ]; + + copper_types.forEach(copper_types_array => { + gold_types.forEach(gold_types_array => { + event.recipes.gtceu.alloy_smelter(`rose_gold_from_${copper_types_array.replace(/:/g, "/").replace(/#/g, "")}_and_${gold_types_array.replace(/:/g, "/").replace(/#/g, "")}`) + .itemInputs(Ingredient.of(copper_types_array).withCount(1), Ingredient.of(gold_types_array).withCount(4)) + .itemOutputs(ChemicalHelper.get(TagPrefix.ingot, GTMaterials.RoseGold, 5)) + .duration(20*10) + .EUt(GTValues.VA[GTValues.LV]) + }) + }); + const TFC_INTERMEDIATE_METALS = [ { metal: 'pig_iron', meltTemp: 1535 }, diff --git a/kubejs/server_scripts/tfg/json_tool.armor_trim.js b/kubejs/server_scripts/tfg/json_tool.armor_trim.js index 813fb4143..4f66e02ce 100644 --- a/kubejs/server_scripts/tfg/json_tool.armor_trim.js +++ b/kubejs/server_scripts/tfg/json_tool.armor_trim.js @@ -2,63 +2,67 @@ //priority: 0 "use strict"; +/* + * Set this const to true only when you need to run the tool because you added a new material. + * It does not need to be enabled all the time. + */ +const enableTool = false; + //#region Assign materials -////////////////////////////// -////////////////////////////// //Assign a new material here with the name of the material, the hex color for the name display, the item id that is used during smithing, and an index number that should be !!!unique!!! const materials = [ //Gems - {materialName: 'almandine_tfc', nameColor: '#7b1112', itemName: 'gtceu:exquisite_almandine_gem', indexNumber: 0.11, lang_en_us: 'Almandine'}, - {materialName: 'andradite_tfc', nameColor: '#c29d1e', itemName: 'gtceu:exquisite_andradite_gem', indexNumber: 0.12, lang_en_us: 'Andradite'}, - {materialName: 'blue_topaz_tfc', nameColor: '#a7c1c6', itemName: 'gtceu:exquisite_blue_topaz_gem', indexNumber: 0.13, lang_en_us: 'Blue Topaz'}, - {materialName: 'cinnabar_tfc', nameColor: '#c2274a', itemName: 'gtceu:exquisite_cinnabar_gem', indexNumber: 0.14, lang_en_us: 'Cinnabar'}, - {materialName: 'coal_tfc', nameColor: '#2b2f32', itemName: 'gtceu:exquisite_coal_gem', indexNumber: 0.15, lang_en_us: 'Coal'}, - {materialName: 'diamond_tfc', nameColor: '#98c2c6', itemName: 'gtceu:exquisite_diamond_gem', indexNumber: 0.16, lang_en_us: 'Diamond'}, - {materialName: 'emerald_tfc', nameColor: '#11c254', itemName: 'gtceu:exquisite_emerald_gem', indexNumber: 0.17, lang_en_us: 'Emerald'}, - {materialName: 'green_sapphire_tfc', nameColor: '#75af89', itemName: 'gtceu:exquisite_green_sapphire_gem', indexNumber: 0.18, lang_en_us: 'Green Sapphire'}, - {materialName: 'grossular_tfc', nameColor: '#c28b5c', itemName: 'gtceu:exquisite_grossular_gem', indexNumber: 0.19, lang_en_us: 'Grossular'}, - {materialName: 'rutile_tfc', nameColor: '#681c05', itemName: 'gtceu:exquisite_rutile_gem', indexNumber: 0.191, lang_en_us: 'Rutile'}, - {materialName: 'lazurite_tfc', nameColor: '#1e29bb', itemName: 'gtceu:exquisite_lazurite_gem', indexNumber: 0.192, lang_en_us: 'Lazurite'}, - {materialName: 'pyrope_tfc', nameColor: '#b11344', itemName: 'gtceu:exquisite_pyrope_gem', indexNumber: 0.193, lang_en_us: 'Pyrope'}, - {materialName: 'rock_salt_tfc', nameColor: '#c2b2af', itemName: 'gtceu:exquisite_rock_salt_gem', indexNumber: 0.194, lang_en_us: 'Rock Salt'}, - {materialName: 'ruby_tfc', nameColor: '#a41b0c', itemName: 'gtceu:exquisite_ruby_gem', indexNumber: 0.195, lang_en_us: 'Ruby'}, - {materialName: 'salt_tfc', nameColor: '#bebec2', itemName: 'gtceu:exquisite_salt_gem', indexNumber: 0.196, lang_en_us: 'salt'}, - {materialName: 'sapphire_tfc', nameColor: '#2628b0', itemName: 'gtceu:exquisite_sapphire_gem', indexNumber: 0.197, lang_en_us: 'Sapphire'}, - {materialName: 'sodalite_tfc', nameColor: '#2e40c6', itemName: 'gtceu:exquisite_sodalite_gem', indexNumber: 0.198, lang_en_us: 'Sodalite'}, - {materialName: 'coke_tfc', nameColor: '#424847', itemName: 'gtceu:exquisite_coke_gem', indexNumber: 0.199, lang_en_us: 'Coke'}, - {materialName: 'spessartine_tfc', nameColor: '#c28017', itemName: 'gtceu:exquisite_spessartine_gem', indexNumber: 0.181, lang_en_us: 'Spessartine'}, - {materialName: 'topaz_tfc', nameColor: '#b1a42d', itemName: 'gtceu:exquisite_topaz_gem', indexNumber: 0.182, lang_en_us: 'Topaz'}, - {materialName: 'uvarovite_tfc', nameColor: '#22b43b', itemName: 'gtceu:exquisite_uvarovite_gem', indexNumber: 0.183, lang_en_us: 'Uvarovite'}, - {materialName: 'nether_quartz_tfc', nameColor: '#bdb6b0', itemName: 'gtceu:exquisite_nether_quartz_gem', indexNumber: 0.184, lang_en_us: 'Nether Quartz'}, - {materialName: 'certus_quartz_tfc', nameColor: '#8ca4c4', itemName: 'gtceu:exquisite_certus_quartz_gem', indexNumber: 0.185, lang_en_us: 'Certus Quartz'}, - {materialName: 'quartzite_tfc', nameColor: '#b8bab8', itemName: 'gtceu:exquisite_quartzite_gem', indexNumber: 0.186, lang_en_us: 'Quartzite'}, - {materialName: 'realgar_tfc', nameColor: '#c22e28', itemName: 'gtceu:exquisite_realgar_gem', indexNumber: 0.187, lang_en_us: 'Realgar'}, - {materialName: 'malachite_tfc', nameColor: '#00b789', itemName: 'gtceu:exquisite_malachite_gem', indexNumber: 0.188, lang_en_us: 'Malachite'}, - {materialName: 'glass_tfc', nameColor: '#c2c2c6', itemName: 'gtceu:exquisite_glass_gem', indexNumber: 0.189, lang_en_us: 'Glass'}, - {materialName: 'olivine_tfc', nameColor: '#7fad03', itemName: 'gtceu:exquisite_olivine_gem', indexNumber: 0.171, lang_en_us: 'Olivine'}, - {materialName: 'opal_tfc', nameColor: '#bdadb6', itemName: 'gtceu:exquisite_opal_gem', indexNumber: 0.172, lang_en_us: 'Opal'}, - {materialName: 'amethyst_tfc', nameColor: '#9b78ba', itemName: 'gtceu:exquisite_amethyst_gem', indexNumber: 0.173, lang_en_us: 'Amethyst'}, - // {materialName: 'echo_shard_tfc', nameColor: '#002123', itemName: 'gtceu:exquisite_echo_shard_gem', indexNumber: 0.174, lang_en_us: 'Echo Shard'}, // disabled - {materialName: 'lapis_tfc', nameColor: '#6581c6', itemName: 'gtceu:exquisite_lapis_gem', indexNumber: 0.175, lang_en_us: 'Lapis'}, - {materialName: 'apatite_tfc', nameColor: '#059cbb', itemName: 'gtceu:exquisite_apatite_gem', indexNumber: 0.176, lang_en_us: 'Apatite'}, - {materialName: 'red_garnet_tfc', nameColor: '#710910', itemName: 'gtceu:exquisite_red_garnet_gem', indexNumber: 0.177, lang_en_us: 'Red Garnet'}, - {materialName: 'yellow_garnet_tfc', nameColor: '#bbc207', itemName: 'gtceu:exquisite_yellow_garnet_gem', indexNumber: 0.178, lang_en_us: 'Yellow Garnet'}, - {materialName: 'monazite_tfc', nameColor: '#9eb576', itemName: 'gtceu:exquisite_monazite_gem', indexNumber: 0.179, lang_en_us: 'Monazite'}, - {materialName: 'rose_quartz_tfc', nameColor: '#ba3458', itemName: 'gtceu:exquisite_rose_quartz_gem', indexNumber: 0.161, lang_en_us: 'Rose Quartz'}, - {materialName: 'fluix_tfc', nameColor: '#53458d', itemName: 'tfg:exquisite_fluix_gem', indexNumber: 0.162, lang_en_us: 'Fluix'}, + {materialName: 'almandine_tfc', nameColor: '#7b1112', itemName: 'gtceu:exquisite_almandine_gem', indexNumber: 0.11}, + {materialName: 'andradite_tfc', nameColor: '#c29d1e', itemName: 'gtceu:exquisite_andradite_gem', indexNumber: 0.12}, + {materialName: 'blue_topaz_tfc', nameColor: '#a7c1c6', itemName: 'gtceu:exquisite_blue_topaz_gem', indexNumber: 0.13}, + {materialName: 'cinnabar_tfc', nameColor: '#c2274a', itemName: 'gtceu:exquisite_cinnabar_gem', indexNumber: 0.14}, + {materialName: 'coal_tfc', nameColor: '#2b2f32', itemName: 'gtceu:exquisite_coal_gem', indexNumber: 0.15}, + {materialName: 'diamond_tfc', nameColor: '#98c2c6', itemName: 'gtceu:exquisite_diamond_gem', indexNumber: 0.16}, + {materialName: 'emerald_tfc', nameColor: '#11c254', itemName: 'gtceu:exquisite_emerald_gem', indexNumber: 0.17}, + {materialName: 'green_sapphire_tfc', nameColor: '#75af89', itemName: 'gtceu:exquisite_green_sapphire_gem', indexNumber: 0.18}, + {materialName: 'grossular_tfc', nameColor: '#c28b5c', itemName: 'gtceu:exquisite_grossular_gem', indexNumber: 0.19}, + {materialName: 'rutile_tfc', nameColor: '#681c05', itemName: 'gtceu:exquisite_rutile_gem', indexNumber: 0.191}, + {materialName: 'lazurite_tfc', nameColor: '#1e29bb', itemName: 'gtceu:exquisite_lazurite_gem', indexNumber: 0.192}, + {materialName: 'pyrope_tfc', nameColor: '#b11344', itemName: 'gtceu:exquisite_pyrope_gem', indexNumber: 0.193}, + {materialName: 'rock_salt_tfc', nameColor: '#c2b2af', itemName: 'gtceu:exquisite_rock_salt_gem', indexNumber: 0.194}, + {materialName: 'ruby_tfc', nameColor: '#a41b0c', itemName: 'gtceu:exquisite_ruby_gem', indexNumber: 0.195}, + {materialName: 'salt_tfc', nameColor: '#bebec2', itemName: 'gtceu:exquisite_salt_gem', indexNumber: 0.196}, + {materialName: 'sapphire_tfc', nameColor: '#2628b0', itemName: 'gtceu:exquisite_sapphire_gem', indexNumber: 0.197}, + {materialName: 'sodalite_tfc', nameColor: '#2e40c6', itemName: 'gtceu:exquisite_sodalite_gem', indexNumber: 0.198}, + {materialName: 'coke_tfc', nameColor: '#424847', itemName: 'gtceu:exquisite_coke_gem', indexNumber: 0.199}, + {materialName: 'spessartine_tfc', nameColor: '#c28017', itemName: 'gtceu:exquisite_spessartine_gem', indexNumber: 0.181}, + {materialName: 'topaz_tfc', nameColor: '#b1a42d', itemName: 'gtceu:exquisite_topaz_gem', indexNumber: 0.182}, + {materialName: 'uvarovite_tfc', nameColor: '#22b43b', itemName: 'gtceu:exquisite_uvarovite_gem', indexNumber: 0.183}, + {materialName: 'nether_quartz_tfc', nameColor: '#bdb6b0', itemName: 'gtceu:exquisite_nether_quartz_gem', indexNumber: 0.184}, + {materialName: 'certus_quartz_tfc', nameColor: '#8ca4c4', itemName: 'gtceu:exquisite_certus_quartz_gem', indexNumber: 0.185}, + {materialName: 'quartzite_tfc', nameColor: '#b8bab8', itemName: 'gtceu:exquisite_quartzite_gem', indexNumber: 0.186}, + {materialName: 'realgar_tfc', nameColor: '#c22e28', itemName: 'gtceu:exquisite_realgar_gem', indexNumber: 0.187}, + {materialName: 'malachite_tfc', nameColor: '#00b789', itemName: 'gtceu:exquisite_malachite_gem', indexNumber: 0.188}, + {materialName: 'glass_tfc', nameColor: '#c2c2c6', itemName: 'gtceu:exquisite_glass_gem', indexNumber: 0.189}, + {materialName: 'olivine_tfc', nameColor: '#7fad03', itemName: 'gtceu:exquisite_olivine_gem', indexNumber: 0.171}, + {materialName: 'opal_tfc', nameColor: '#bdadb6', itemName: 'gtceu:exquisite_opal_gem', indexNumber: 0.172}, + {materialName: 'amethyst_tfc', nameColor: '#9b78ba', itemName: 'gtceu:exquisite_amethyst_gem', indexNumber: 0.173}, + // {materialName: 'echo_shard_tfc', nameColor: '#002123', itemName: 'gtceu:exquisite_echo_shard_gem', indexNumber: 0.174}, // disabled + {materialName: 'lapis_tfc', nameColor: '#6581c6', itemName: 'gtceu:exquisite_lapis_gem', indexNumber: 0.175}, + {materialName: 'apatite_tfc', nameColor: '#059cbb', itemName: 'gtceu:exquisite_apatite_gem', indexNumber: 0.176}, + {materialName: 'red_garnet_tfc', nameColor: '#710910', itemName: 'gtceu:exquisite_red_garnet_gem', indexNumber: 0.177}, + {materialName: 'yellow_garnet_tfc', nameColor: '#bbc207', itemName: 'gtceu:exquisite_yellow_garnet_gem', indexNumber: 0.178}, + {materialName: 'monazite_tfc', nameColor: '#9eb576', itemName: 'gtceu:exquisite_monazite_gem', indexNumber: 0.179}, + {materialName: 'rose_quartz_tfc', nameColor: '#ba3458', itemName: 'gtceu:exquisite_rose_quartz_gem', indexNumber: 0.161}, + {materialName: 'fluix_tfc', nameColor: '#53458d', itemName: 'tfg:exquisite_fluix_gem', indexNumber: 0.162}, //Metals - {materialName: 'silver_tfc', nameColor: '#d8d8f4', itemName: 'vintageimprovements:silver_sheet', indexNumber: 0.162, lang_en_us: 'Silver'}, - {materialName: 'sterling_silver_tfc', nameColor: '#eae5d3', itemName: 'gtceu:sterling_silver_plate', indexNumber: 0.163, lang_en_us: 'Sterling Silver'}, - {materialName: 'gold_tfc', nameColor: '#ede65b', itemName: 'create:golden_sheet', indexNumber: 0.164, lang_en_us: 'Gold'}, - {materialName: 'rose_gold_tfc', nameColor: '#eddedb', itemName: 'vintageimprovements:rose_gold_sheet', indexNumber: 0.165, lang_en_us: 'Rose Gold'}, - {materialName: 'nickel_tfc', nameColor: '#bfd1ea', itemName: 'vintageimprovements:nickel_sheet', indexNumber: 0.166, lang_en_us: 'Nickel'}, - {materialName: 'platinum_tfc', nameColor: '#d8cea1', itemName: 'vintageimprovements:platinum_sheet', indexNumber: 0.167, lang_en_us: 'Platinum'}, - {materialName: 'titanium_tfc', nameColor: '#c496d8', itemName: 'gtceu:titanium_plate', indexNumber: 0.168, lang_en_us: 'Titanium'}, - {materialName: 'bismuth_tfc', nameColor: '#607c79', itemName: 'gtceu:bismuth_plate', indexNumber: 0.169, lang_en_us: 'Bismuth'}, - {materialName: 'neutronium_tfc', nameColor: '#d7d7db', itemName: 'gtceu:neutronium_plate', indexNumber: 0.151, lang_en_us: 'Neutronium'}, + {materialName: 'silver_tfc', nameColor: '#d8d8f4', itemName: 'vintageimprovements:silver_sheet', indexNumber: 0.162}, + {materialName: 'sterling_silver_tfc', nameColor: '#eae5d3', itemName: 'gtceu:sterling_silver_plate', indexNumber: 0.163}, + {materialName: 'gold_tfc', nameColor: '#ede65b', itemName: 'create:golden_sheet', indexNumber: 0.164}, + {materialName: 'rose_gold_tfc', nameColor: '#eddedb', itemName: 'vintageimprovements:rose_gold_sheet', indexNumber: 0.165}, + {materialName: 'nickel_tfc', nameColor: '#bfd1ea', itemName: 'vintageimprovements:nickel_sheet', indexNumber: 0.166}, + {materialName: 'platinum_tfc', nameColor: '#d8cea1', itemName: 'vintageimprovements:platinum_sheet', indexNumber: 0.167}, + {materialName: 'titanium_tfc', nameColor: '#c496d8', itemName: 'gtceu:titanium_plate', indexNumber: 0.168}, + {materialName: 'bismuth_tfc', nameColor: '#607c79', itemName: 'gtceu:bismuth_plate', indexNumber: 0.169}, + {materialName: 'neutronium_tfc', nameColor: '#d7d7db', itemName: 'gtceu:neutronium_plate', indexNumber: 0.151}, //Other - {materialName: 'pyrite_tfc', nameColor: '#a75e10', itemName: 'gtceu:rich_raw_pyrite', indexNumber: 0.152, lang_en_us: 'Pyrite'}, - {materialName: 'redx_tfc', nameColor: '#a06156', itemName: 'morered:red_alloy_wire', indexNumber: 0.153, lang_en_us: 'RedX'} + {materialName: 'pyrite_tfc', nameColor: '#a75e10', itemName: 'gtceu:rich_raw_pyrite', indexNumber: 0.152}, + {materialName: 'redx_tfc', nameColor: '#a06156', itemName: 'morered:red_alloy_wire', indexNumber: 0.153} ] ///////////////////////////// ///////////////////////////// @@ -75,136 +79,143 @@ function registerTFGTrimTags(event) { //#region Trim Item Atlas //Automatically creates armor_trims.json file -const trimfilePath = 'kubejs/assets/minecraft/atlases/armor_trims.json'; -let trimdata = JsonIO.read(trimfilePath) || {}; -trimdata["sources"] = trimdata["sources"] || []; +if (enableTool) { -let trimsource = trimdata["sources"].find(s => s.type === "paletted_permutations"); + const trimfilePath = 'kubejs/assets/minecraft/atlases/armor_trims.json'; + let trimdata = JsonIO.read(trimfilePath) || {}; + trimdata["sources"] = trimdata["sources"] || []; -if (!trimsource) { - trimsource = { - type: "paletted_permutations", - textures: [ - "trims/models/armor/coast", - "trims/models/armor/coast_leggings", - "trims/models/armor/sentry", - "trims/models/armor/sentry_leggings", - "trims/models/armor/dune", - "trims/models/armor/dune_leggings", - "trims/models/armor/wild", - "trims/models/armor/wild_leggings", - "trims/models/armor/ward", - "trims/models/armor/ward_leggings", - "trims/models/armor/eye", - "trims/models/armor/eye_leggings", - "trims/models/armor/vex", - "trims/models/armor/vex_leggings", - "trims/models/armor/tide", - "trims/models/armor/tide_leggings", - "trims/models/armor/snout", - "trims/models/armor/snout_leggings", - "trims/models/armor/rib", - "trims/models/armor/rib_leggings", - "trims/models/armor/spire", - "trims/models/armor/spire_leggings", - "trims/models/armor/wayfinder", - "trims/models/armor/wayfinder_leggings", - "trims/models/armor/shaper", - "trims/models/armor/shaper_leggings", - "trims/models/armor/silence", - "trims/models/armor/silence_leggings", - "trims/models/armor/raiser", - "trims/models/armor/raiser_leggings", - "trims/models/armor/host", - "trims/models/armor/host_leggings" - ], - palette_key: "trims/color_palettes/trim_palette", - permutations: {} - }; - trimdata["sources"].push(trimsource); -} + let trimsource = trimdata["sources"].find(s => s.type === "paletted_permutations"); -trimsource.permutations = trimsource.permutations || {}; + if (!trimsource) { + trimsource = { + type: "paletted_permutations", + textures: [ + "trims/models/armor/coast", + "trims/models/armor/coast_leggings", + "trims/models/armor/sentry", + "trims/models/armor/sentry_leggings", + "trims/models/armor/dune", + "trims/models/armor/dune_leggings", + "trims/models/armor/wild", + "trims/models/armor/wild_leggings", + "trims/models/armor/ward", + "trims/models/armor/ward_leggings", + "trims/models/armor/eye", + "trims/models/armor/eye_leggings", + "trims/models/armor/vex", + "trims/models/armor/vex_leggings", + "trims/models/armor/tide", + "trims/models/armor/tide_leggings", + "trims/models/armor/snout", + "trims/models/armor/snout_leggings", + "trims/models/armor/rib", + "trims/models/armor/rib_leggings", + "trims/models/armor/spire", + "trims/models/armor/spire_leggings", + "trims/models/armor/wayfinder", + "trims/models/armor/wayfinder_leggings", + "trims/models/armor/shaper", + "trims/models/armor/shaper_leggings", + "trims/models/armor/silence", + "trims/models/armor/silence_leggings", + "trims/models/armor/raiser", + "trims/models/armor/raiser_leggings", + "trims/models/armor/host", + "trims/models/armor/host_leggings" + ], + palette_key: "trims/color_palettes/trim_palette", + permutations: {} + }; + trimdata["sources"].push(trimsource); + } -materials.forEach(material => { - trimsource.permutations[material.materialName] = `tfc:color_palettes/trims/${material.materialName}`; -}); -JsonIO.write(trimfilePath, trimdata); -//#endregion + trimsource.permutations = trimsource.permutations || {}; -//#region Trim Block Atlas -//Automatically creates blocks.json file -const blockfilePath = 'kubejs/assets/minecraft/atlases/blocks.json'; -let blockdata = JsonIO.read(blockfilePath) || {}; -blockdata["sources"] = blockdata["sources"] || []; - -let blocksource = blockdata["sources"].find(s => s.type === "paletted_permutations"); - -if (!blocksource) { - blocksource = { - type: "paletted_permutations", - textures: [ - "trims/items/leggings_trim", - "trims/items/chestplate_trim", - "trims/items/helmet_trim", - "trims/items/boots_trim", - "tfc:item/helmet_trim", - "tfc:item/chestplate_trim", - "tfc:item/greaves_trim", - "tfc:item/boots_trim" - ], - palette_key: "trims/color_palettes/trim_palette", - permutations: {} - }; - blockdata["sources"].push(blocksource); -} - -blocksource.permutations = blocksource.permutations || {}; - -materials.forEach(material => { - blocksource.permutations[material.materialName] = `tfc:color_palettes/trims/${material.materialName}`; -}); -JsonIO.write(blockfilePath, blockdata); -//#endregion - -//#region Trim Material Data -//Automatically creates material.json files -materials.forEach(material => { - const trimfilepaths = [ - `kubejs/data/minecraft/trim_material/${material.materialName}.json`, - `kubejs/data/tfc/trim_material/${material.materialName}.json` - ]; - - const newtrimdata = { - asset_name: material.materialName, - description: { - color: material.nameColor, - translate: `trim_material.tfc.${material.materialName}` - }, - ingredient: material.itemName, - item_model_index: material.indexNumber - }; - - trimfilepaths.forEach(trimfilepaths => { - const existingData = JsonIO.read(trimfilepaths); - - // Only write if the file is missing or contents are different - if (JSON.stringify(existingData) !== JSON.stringify(newtrimdata)) { - JsonIO.write(trimfilepaths, newtrimdata); - } + materials.forEach(material => { + trimsource.permutations[material.materialName] = `tfc:color_palettes/trims/${material.materialName}`; }); - }); -//#endregion - -//#region Lang -//en_us -//reads the existing file, inserts new key-value pair, writes info back to the file -const langfilePath = 'kubejs/assets/tfc/lang/en_us.json'; -let langdata = JsonIO.read(langfilePath) || {}; - -materials.forEach(material => { - langdata[`trim_material.tfc.${material.materialName}`] = material.lang_en_us; -}); - -JsonIO.write(langfilePath, langdata); + JsonIO.write(trimfilePath, trimdata); + //#endregion + + //#region Trim Block Atlas + //Automatically creates blocks.json file + const blockfilePath = 'kubejs/assets/minecraft/atlases/blocks.json'; + let blockdata = JsonIO.read(blockfilePath) || {}; + blockdata["sources"] = blockdata["sources"] || []; + + let blocksource = blockdata["sources"].find(s => s.type === "paletted_permutations"); + + if (!blocksource) { + blocksource = { + type: "paletted_permutations", + textures: [ + "trims/items/leggings_trim", + "trims/items/chestplate_trim", + "trims/items/helmet_trim", + "trims/items/boots_trim", + "tfc:item/helmet_trim", + "tfc:item/chestplate_trim", + "tfc:item/greaves_trim", + "tfc:item/boots_trim" + ], + palette_key: "trims/color_palettes/trim_palette", + permutations: {} + }; + blockdata["sources"].push(blocksource); + } + + blocksource.permutations = blocksource.permutations || {}; + + materials.forEach(material => { + blocksource.permutations[material.materialName] = `tfc:color_palettes/trims/${material.materialName}`; + }); + JsonIO.write(blockfilePath, blockdata); + //#endregion + + //#region Trim Material Data + //Automatically creates material.json files + materials.forEach(material => { + const trimfilepaths = [ + `kubejs/data/minecraft/trim_material/${material.materialName}.json`, + `kubejs/data/tfc/trim_material/${material.materialName}.json` + ]; + + const newtrimdata = { + asset_name: material.materialName, + description: { + color: material.nameColor, + translate: `trim_material.tfc.${material.materialName}` + }, + ingredient: material.itemName, + item_model_index: material.indexNumber + }; + + trimfilepaths.forEach(trimfilepaths => { + const existingData = JsonIO.read(trimfilepaths); + + // Only write if the file is missing or contents are different + if (JSON.stringify(existingData) !== JSON.stringify(newtrimdata)) { + JsonIO.write(trimfilepaths, newtrimdata); + } + }); + }); + //#endregion + + /* + ** Depreciated. I will leave this here for future reference. ** + + en_us + reads the existing file, inserts new key-value pair, writes info back to the file + + const langfilePath = 'kubejs/assets/tfc/lang/en_us.json'; + let langdata = JsonIO.read(langfilePath) || {}; + + materials.forEach(material => { + langdata[`trim_material.tfc.${material.materialName}`] = material.lang_en_us; + }); + + JsonIO.write(langfilePath, langdata); + */ +}; //#endregion From 6134da9caf0e2860905545ffbae64f7bde20acd6 Mon Sep 17 00:00:00 2001 From: Redeix Date: Thu, 21 Aug 2025 02:36:22 -0500 Subject: [PATCH 25/26] Update CHANGELOG.md Signed-off-by: Redeix --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f6cb7615..a57a3c42c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Fixed recipe for pyroxenite button (again) (#1625) @Pyritie - Refactored locometal recipes to use stonecutters, metal plated locometal is now also much cheaper (#1624) @Pyritie - Increased the air capacity of space suits by 250% @Pyritie +- Converted custom tooltips to lang strings for translations (#1663) @Redeix ### Bug fixes - Fixed moon mob spawning light levels, so now they need a light level of 0 instead of 11 (#1587) @NINAustinFett - Fixed wrong output amount of mortaring soybean paste (#1607) @TomPlop @@ -23,6 +24,8 @@ - Moved the golden apple recipe over to the food processor so it respects food expiry data @Pyritie - Removed some remaining swine-steel crafting recipes @Pyritie - Added missing hoe/scythe mineable tags from custom crops (#1622) @Pyritie +- Added missing rose gold alloy smelter recipes (#1664) @Redeix +- Fixed some (but not all) model issues with the reflector block (#1664) @Redeix ## [0.10.9] - 10-08-2025 ### Changes From 4d801d9c96f456f9122296e2ace20070d3906943 Mon Sep 17 00:00:00 2001 From: TomPlop Date: Thu, 21 Aug 2025 04:42:07 -0400 Subject: [PATCH 26/26] Disable energy p2p (#1661) * github being github * First bandage fix for removing FE P2P --- config/ae2/common.json | 2 +- .../tfg/blockstates/large_nest_box.json | 278 +++++++++--------- .../blockstates/large_nest_box_warped.json | 278 +++++++++--------- .../assets/tfg/models/item/sniffer_egg.json | 10 +- .../loot_tables/entities/conductor.json | 8 +- kubejs/server_scripts/ae2/recipes.js | 2 + kubejs/server_scripts/ae2/tags.js | 2 + kubejs/startup_scripts/ae2/constants.js | 1 + 8 files changed, 293 insertions(+), 288 deletions(-) diff --git a/config/ae2/common.json b/config/ae2/common.json index 6f089b803..2c91128bd 100644 --- a/config/ae2/common.json +++ b/config/ae2/common.json @@ -76,7 +76,7 @@ "CrystalResonanceGeneratorRate_comment": "How much energy a crystal resonance generator generates per tick.", "CrystalResonanceGeneratorRate": 20.0, "p2pTunnelEnergyTax_comment": "The cost to transport energy through an energy P2P tunnel expressed as a factor of the transported energy.", - "p2pTunnelEnergyTax": 0.025, + "p2pTunnelEnergyTax": 0.999, "p2pTunnelTransportTax_comment": "The cost to transport items/fluids/etc. through P2P tunnels, expressed in AE energy per equivalent I/O bus operation for the transported object type (i.e. items\u003dper 1 item, fluids\u003dper 125mb).", "p2pTunnelTransportTax": 0.025 }, diff --git a/kubejs/assets/tfg/blockstates/large_nest_box.json b/kubejs/assets/tfg/blockstates/large_nest_box.json index 93f899574..810bfd65f 100644 --- a/kubejs/assets/tfg/blockstates/large_nest_box.json +++ b/kubejs/assets/tfg/blockstates/large_nest_box.json @@ -1,140 +1,140 @@ -{ - "variants": { - "facing=north,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - }, - "facing=north,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - }, - "facing=north,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - "facing=north,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - - - "facing=south,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - "facing=south,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - "facing=south,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - }, - "facing=south,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - }, - - - "facing=east,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - }, - "facing=east,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - "facing=east,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - }, - "facing=east,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - - - "facing=west,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 270 - }, - "facing=west,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_empty" - - }, - "facing=west,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 180 - }, - "facing=west,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_empty", - "y": 90 - - }, - - - "facing=north,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0" - }, - "facing=north,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", - "y": 90 - }, - "facing=north,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", - "y": 270 - }, - "facing=north,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", - "y": 180 - }, - - "facing=south,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", - "y": 180 - }, - "facing=south,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", - "y": 270 - }, - "facing=south,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", - "y": 90 - }, - "facing=south,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3" - }, - - "facing=east,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", - "y": 90 - }, - "facing=east,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", - "y": 180 - }, - "facing=east,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2" - }, - "facing=east,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", - "y": 270 - }, - - "facing=west,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", - "y": 270 - }, - "facing=west,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1" - - }, - "facing=west,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", - "y": 180 - }, - "facing=west,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", - "y": 90 - - } - - } +{ + "variants": { + "facing=north,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + }, + "facing=north,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + }, + "facing=north,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + "facing=north,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + + + "facing=south,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + "facing=south,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + "facing=south,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + }, + "facing=south,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + }, + + + "facing=east,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + }, + "facing=east,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + "facing=east,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + }, + "facing=east,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + + + "facing=west,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 270 + }, + "facing=west,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_empty" + + }, + "facing=west,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 180 + }, + "facing=west,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_empty", + "y": 90 + + }, + + + "facing=north,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0" + }, + "facing=north,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", + "y": 90 + }, + "facing=north,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", + "y": 270 + }, + "facing=north,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", + "y": 180 + }, + + "facing=south,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", + "y": 180 + }, + "facing=south,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", + "y": 270 + }, + "facing=south,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", + "y": 90 + }, + "facing=south,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3" + }, + + "facing=east,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", + "y": 90 + }, + "facing=east,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1", + "y": 180 + }, + "facing=east,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2" + }, + "facing=east,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", + "y": 270 + }, + + "facing=west,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_0", + "y": 270 + }, + "facing=west,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_1" + + }, + "facing=west,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_2", + "y": 180 + }, + "facing=west,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_sniffer_3", + "y": 90 + + } + + } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/large_nest_box_warped.json b/kubejs/assets/tfg/blockstates/large_nest_box_warped.json index 89e95bf8a..5b7e00742 100644 --- a/kubejs/assets/tfg/blockstates/large_nest_box_warped.json +++ b/kubejs/assets/tfg/blockstates/large_nest_box_warped.json @@ -1,140 +1,140 @@ -{ - "variants": { - "facing=north,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - }, - "facing=north,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - }, - "facing=north,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - "facing=north,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - - - "facing=south,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - "facing=south,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - "facing=south,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - }, - "facing=south,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - }, - - - "facing=east,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - }, - "facing=east,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - "facing=east,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - }, - "facing=east,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - - - "facing=west,has_egg_type=0,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 270 - }, - "facing=west,has_egg_type=0,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" - - }, - "facing=west,has_egg_type=0,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 180 - }, - "facing=west,has_egg_type=0,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", - "y": 90 - - }, - - - "facing=north,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0" - }, - "facing=north,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", - "y": 90 - }, - "facing=north,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", - "y": 270 - }, - "facing=north,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", - "y": 180 - }, - - "facing=south,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", - "y": 180 - }, - "facing=south,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", - "y": 270 - }, - "facing=south,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", - "y": 90 - }, - "facing=south,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3" - }, - - "facing=east,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", - "y": 90 - }, - "facing=east,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", - "y": 180 - }, - "facing=east,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2" - }, - "facing=east,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", - "y": 270 - }, - - "facing=west,has_egg_type=1,nest_part=0": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", - "y": 270 - }, - "facing=west,has_egg_type=1,nest_part=1": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1" - - }, - "facing=west,has_egg_type=1,nest_part=2": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", - "y": 180 - }, - "facing=west,has_egg_type=1,nest_part=3": { - "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", - "y": 90 - - } - - } +{ + "variants": { + "facing=north,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + }, + "facing=north,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + }, + "facing=north,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + "facing=north,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + + + "facing=south,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + "facing=south,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + "facing=south,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + }, + "facing=south,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + }, + + + "facing=east,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + }, + "facing=east,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + "facing=east,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + }, + "facing=east,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + + + "facing=west,has_egg_type=0,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 270 + }, + "facing=west,has_egg_type=0,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty" + + }, + "facing=west,has_egg_type=0,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 180 + }, + "facing=west,has_egg_type=0,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_empty", + "y": 90 + + }, + + + "facing=north,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0" + }, + "facing=north,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", + "y": 90 + }, + "facing=north,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", + "y": 270 + }, + "facing=north,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", + "y": 180 + }, + + "facing=south,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", + "y": 180 + }, + "facing=south,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", + "y": 270 + }, + "facing=south,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", + "y": 90 + }, + "facing=south,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3" + }, + + "facing=east,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", + "y": 90 + }, + "facing=east,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1", + "y": 180 + }, + "facing=east,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2" + }, + "facing=east,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", + "y": 270 + }, + + "facing=west,has_egg_type=1,nest_part=0": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_0", + "y": 270 + }, + "facing=west,has_egg_type=1,nest_part=1": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_1" + + }, + "facing=west,has_egg_type=1,nest_part=2": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_2", + "y": 180 + }, + "facing=west,has_egg_type=1,nest_part=3": { + "model": "tfg:block/large_nest_box/large_nest_box_warped_sniffer_3", + "y": 90 + + } + + } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/sniffer_egg.json b/kubejs/assets/tfg/models/item/sniffer_egg.json index 4ff54261b..ee27e4927 100644 --- a/kubejs/assets/tfg/models/item/sniffer_egg.json +++ b/kubejs/assets/tfg/models/item/sniffer_egg.json @@ -1,6 +1,6 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "minecraft:item/sniffer_egg" - } +{ + "parent": "item/generated", + "textures": { + "layer0": "minecraft:item/sniffer_egg" + } } \ No newline at end of file diff --git a/kubejs/data/railways/loot_tables/entities/conductor.json b/kubejs/data/railways/loot_tables/entities/conductor.json index 1f3b78b18..6fe9965c2 100644 --- a/kubejs/data/railways/loot_tables/entities/conductor.json +++ b/kubejs/data/railways/loot_tables/entities/conductor.json @@ -1,5 +1,5 @@ -{ - "type": "minecraft:entity", - "pools": [], - "random_sequence": "railways:entities/conductor" +{ + "type": "minecraft:entity", + "pools": [], + "random_sequence": "railways:entities/conductor" } \ No newline at end of file diff --git a/kubejs/server_scripts/ae2/recipes.js b/kubejs/server_scripts/ae2/recipes.js index 7198628da..2e7b72e49 100644 --- a/kubejs/server_scripts/ae2/recipes.js +++ b/kubejs/server_scripts/ae2/recipes.js @@ -17,6 +17,8 @@ const registerAE2Recipes = (event) => { ], mod: 'ae2' }); + event.remove( { output: 'ae2:fe_p2p_tunnel' } ) + // Cutting knives (for renaming things) event.shaped('ae2:certus_quartz_cutting_knife', [ ' A', diff --git a/kubejs/server_scripts/ae2/tags.js b/kubejs/server_scripts/ae2/tags.js index 316431166..30ad88670 100644 --- a/kubejs/server_scripts/ae2/tags.js +++ b/kubejs/server_scripts/ae2/tags.js @@ -10,6 +10,8 @@ const registerAE2ItemTags = (event) => { event.remove('forge:storage_blocks', 'ae2:quartz_block') event.remove('forge:storage_blocks/certus_quartz', 'ae2:quartz_block') + + event.removeAll('ae2:p2p_attunements/fe_p2p_tunnel') event.add('tfg:certus_quartz_blocks', 'gtceu:certus_quartz_block') event.add('tfg:certus_quartz_blocks', 'ae2:quartz_block') diff --git a/kubejs/startup_scripts/ae2/constants.js b/kubejs/startup_scripts/ae2/constants.js index 9496276a9..88e39d121 100644 --- a/kubejs/startup_scripts/ae2/constants.js +++ b/kubejs/startup_scripts/ae2/constants.js @@ -25,6 +25,7 @@ global.AE2_DISABLED_ITEMS = [ 'ae2:charged_staff', 'ae2:name_press', 'ae2:charger', + 'ae2:fe_p2p_tunnel', // Блоки 'ae2:vibration_chamber',