From c050e96f65a50927d8b87917daa5b2aba15d7706 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 23 Sep 2025 14:05:12 +0100 Subject: [PATCH 1/6] added back space helmet and chest as PPE armor so they can at least protect from contact/inhalation hazards --- kubejs/server_scripts/ad_astra/tags.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index c1a079b45..cfe75864f 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -49,6 +49,8 @@ const registerAdAstraItemTags = (event) => { event.add('c:hidden_from_recipe_viewers', 'ad_astra:alphacene_mushroom') event.add('c:hidden_from_recipe_viewers', 'ad_astra:strophar_mushroom') + event.add('gtceu:ppe_armor', 'ad_astra:space_helmet') + event.add('gtceu:ppe_armor', 'ad_astra:space_suit') event.add('gtceu:ppe_armor', 'ad_astra:netherite_space_helmet') event.add('gtceu:ppe_armor', 'ad_astra:netherite_space_suit') event.add('gtceu:ppe_armor', 'ad_astra:netherite_space_pants') From be3e0448ad95fd04e08c54a0ff90d696a248ca72 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 23 Sep 2025 14:08:41 +0100 Subject: [PATCH 2/6] fine, all space suits are hazmats now --- kubejs/server_scripts/ad_astra/tags.js | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index cfe75864f..26a64ff97 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -49,16 +49,7 @@ const registerAdAstraItemTags = (event) => { event.add('c:hidden_from_recipe_viewers', 'ad_astra:alphacene_mushroom') event.add('c:hidden_from_recipe_viewers', 'ad_astra:strophar_mushroom') - event.add('gtceu:ppe_armor', 'ad_astra:space_helmet') - event.add('gtceu:ppe_armor', 'ad_astra:space_suit') - event.add('gtceu:ppe_armor', 'ad_astra:netherite_space_helmet') - event.add('gtceu:ppe_armor', 'ad_astra:netherite_space_suit') - event.add('gtceu:ppe_armor', 'ad_astra:netherite_space_pants') - event.add('gtceu:ppe_armor', 'ad_astra:netherite_space_boots') - event.add('gtceu:ppe_armor', 'ad_astra:jet_suit_helmet') - event.add('gtceu:ppe_armor', 'ad_astra:jet_suit') - event.add('gtceu:ppe_armor', 'ad_astra:jet_suit_pants') - event.add('gtceu:ppe_armor', 'ad_astra:jet_suit_boots') + event.add('gtceu:ppe_armor', '#ad_astra:space_suit_items') event.add('minecraft:trimmable_armor', '#ad_astra:space_suit_items') event.add('forge:cobblestone', 'ad_astra:moon_cobblestone') From 73aba8356199ce79a7f7496a2b3be3758239bb6b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 23 Sep 2025 14:20:07 +0100 Subject: [PATCH 3/6] cleaned up some loot table stuff that linux doesn't like? --- .../loot_tables/entities/badlands_enderman.json | 3 +-- .../endermanoverhaul/loot_tables/entities/cave_enderman.json | 3 +-- .../loot_tables/entities/crimson_enderman.json | 3 +-- .../loot_tables/entities/dark_oak_enderman.json | 3 +-- .../endermanoverhaul/loot_tables/entities/end_enderman.json | 3 +-- .../loot_tables/entities/end_islands_enderman.json | 3 +-- .../loot_tables/entities/mushroom_fields_enderman.json | 3 +-- .../loot_tables/entities/nether_wastes_enderman.json | 3 +-- .../loot_tables/entities/soulsand_valley_enderman.json | 3 +-- .../endermanoverhaul/loot_tables/entities/swamp_enderman.json | 3 +-- .../endermanoverhaul/loot_tables/entities/warped_enderman.json | 3 +-- .../loot_tables/entities/windswept_hills_enderman.json | 3 +-- 12 files changed, 12 insertions(+), 24 deletions(-) diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/badlands_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/badlands_enderman.json index bfc1525e1..65fb2a58a 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/badlands_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/badlands_enderman.json @@ -57,6 +57,5 @@ ], "rolls": 2.0 } - ], - "random_sequence": "endermanoverhaul:entities/badlands_enderman" + ] } \ No newline at end of file diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json index a308042c6..63f8e6b51 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json @@ -36,6 +36,5 @@ ], "rolls": 2.0 } - ], - "random_sequence": "endermanoverhaul:entities/cave_enderman" + ] } \ No newline at end of file diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/crimson_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/crimson_enderman.json index 418bf07c7..dd94d9a88 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/crimson_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/crimson_enderman.json @@ -32,6 +32,5 @@ ], "rolls": 2.0 } - ], - "random_sequence": "endermanoverhaul:entities/crimson_enderman" + ] } \ No newline at end of file diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/dark_oak_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/dark_oak_enderman.json index a993404ae..cc34d0b65 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/dark_oak_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/dark_oak_enderman.json @@ -57,6 +57,5 @@ ], "rolls": 1.0 } - ], - "random_sequence": "endermanoverhaul:entities/dark_oak_enderman" + ] } \ No newline at end of file diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/end_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/end_enderman.json index 4ce0c5338..7a0112727 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/end_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/end_enderman.json @@ -40,6 +40,5 @@ ], "rolls": 2.0 } - ], - "random_sequence": "endermanoverhaul:entities/soulsand_valley_enderman" + ] } \ No newline at end of file diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/end_islands_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/end_islands_enderman.json index e625b2cc2..e96369c51 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/end_islands_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/end_islands_enderman.json @@ -29,6 +29,5 @@ ], "rolls": 1.0 } - ], - "random_sequence": "endermanoverhaul:entities/soulsand_valley_enderman" + ] } \ No newline at end of file diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/mushroom_fields_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/mushroom_fields_enderman.json index 3fca22932..4384f76eb 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/mushroom_fields_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/mushroom_fields_enderman.json @@ -45,6 +45,5 @@ ], "rolls": 3.0 } - ], - "random_sequence": "endermanoverhaul:entities/mushroom_fields_enderman" + ] } \ No newline at end of file diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/nether_wastes_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/nether_wastes_enderman.json index 8e75cf209..85dbdff07 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/nether_wastes_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/nether_wastes_enderman.json @@ -66,6 +66,5 @@ ], "rolls": 1.0 } - ], - "random_sequence": "endermanoverhaul:entities/nether_wastes_enderman" + ] } \ No newline at end of file diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/soulsand_valley_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/soulsand_valley_enderman.json index 5cd23cb7a..63f8e6b51 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/soulsand_valley_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/soulsand_valley_enderman.json @@ -36,6 +36,5 @@ ], "rolls": 2.0 } - ], - "random_sequence": "endermanoverhaul:entities/soulsand_valley_enderman" + ] } \ No newline at end of file diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/swamp_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/swamp_enderman.json index 25ec767e4..3e4695d51 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/swamp_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/swamp_enderman.json @@ -66,6 +66,5 @@ ], "rolls": 2.0 } - ], - "random_sequence": "endermanoverhaul:entities/swamp_enderman" + ] } \ No newline at end of file diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/warped_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/warped_enderman.json index 8cdd36e2a..14b5db23c 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/warped_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/warped_enderman.json @@ -32,6 +32,5 @@ ], "rolls": 2.0 } - ], - "random_sequence": "endermanoverhaul:entities/warped_enderman" + ] } \ No newline at end of file diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/windswept_hills_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/windswept_hills_enderman.json index 6ffd29930..a0cd24e24 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/windswept_hills_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/windswept_hills_enderman.json @@ -36,6 +36,5 @@ ], "rolls": 2.0 } - ], - "random_sequence": "endermanoverhaul:entities/windswept_hills_enderman" + ] } \ No newline at end of file From 29df90dc8a797774244755a7f7dc2bbb014fc5f5 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 23 Sep 2025 14:23:38 +0100 Subject: [PATCH 4/6] fix typo in polished ad astra stone tag --- kubejs/server_scripts/tfg/tags.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 3bac4ed64..a11fd996d 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -605,9 +605,9 @@ const registerTFGItemTags = (event) => { event.add(`tfg:rock_${shape}`.replace(/ss/g, 's'), `ad_astra:${stone}_cobblestone_${shape}`) }) - event.add('forge:smooth_stone', `ad_astra:polished_:${stone}_stone`) + event.add('forge:smooth_stone', `ad_astra:polished_${stone}_stone`) event.add(`tfc:${getStoneType(stone)}_items`, `ad_astra:polished_${stone}_stone`) - event.add('tfc:rock/smooth', `ad_astra:polished_:${stone}_stone`) + event.add('tfc:rock/smooth', `ad_astra:polished_${stone}_stone`) SHAPES_AA.forEach(shape => { event.add(`tfc:${getStoneType(stone)}_items`, `ad_astra:polished_${stone}_stone_${shape}`) From 5b8453ad05e3f35390898473a6304d2c2c00757f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 23 Sep 2025 14:38:07 +0100 Subject: [PATCH 5/6] fix badlands enderman loot table --- .../loot_tables/entities/badlands_enderman.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/badlands_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/badlands_enderman.json index 65fb2a58a..d1af92e13 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/badlands_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/badlands_enderman.json @@ -24,9 +24,7 @@ "entries": [ { "type": "minecraft:item", - "name": "endermanoverhaul:badlands_hood" - }, - { + "name": "endermanoverhaul:badlands_hood", "conditions": [ { "condition": "minecraft:random_chance", From 08363d7a368ad0b46827c61505e3186640be6fc8 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 23 Sep 2025 14:39:24 +0100 Subject: [PATCH 6/6] "0.10.15 will be the last 0.10 release" famous last words --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 610297c62..b77d187e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ ### Changes ### Bug fixes +## [0.10.16] - 23-09-2025 +### Bug fixes +- Fix startup crash on linux servers @Pyritie +- Fix broken loot table for badlands enderman @Pyritie + ## [0.10.15] - 23-09-2025 ### Major Changes - GregTech updated to 7.2.0, check [here](https://www.curseforge.com/minecraft/mc-mods/gregtechceu-modern/files/7022042) for the full list of changes, but here's a summary: