From be35e4e823da29aff889b255b63d2261a291a4e0 Mon Sep 17 00:00:00 2001 From: Redeix Date: Fri, 8 Aug 2025 03:25:12 -0500 Subject: [PATCH 1/6] - railgun fanfare (#1557) * - railgun fanfare * updated changelog --- CHANGELOG.md | 2 ++ .../machines/mv_aqueous_accumulator.json | 2 +- kubejs/assets/tfg/particles/railgun_boom.json | 26 +++++++----------- .../tfg/textures/particle/railgun_boom_0.png | Bin 0 -> 179 bytes .../tfg/textures/particle/railgun_boom_1.png | Bin 0 -> 199 bytes .../tfg/textures/particle/railgun_boom_2.png | Bin 0 -> 140 bytes .../tfg/textures/particle/railgun_boom_3.png | Bin 0 -> 114 bytes .../tfg/textures/particle/railgun_boom_4.png | Bin 0 -> 290 bytes .../tfg/textures/particle/railgun_boom_5.png | Bin 0 -> 316 bytes .../tfg/textures/particle/railgun_boom_6.png | Bin 0 -> 367 bytes .../tfg/textures/particle/railgun_boom_7.png | Bin 0 -> 199 bytes .../tfg/textures/particle/railgun_boom_8.png | Bin 0 -> 224 bytes .../tfg/textures/particle/railgun_boom_9.png | Bin 0 -> 237 bytes 13 files changed, 13 insertions(+), 17 deletions(-) create mode 100644 kubejs/assets/tfg/textures/particle/railgun_boom_0.png create mode 100644 kubejs/assets/tfg/textures/particle/railgun_boom_1.png create mode 100644 kubejs/assets/tfg/textures/particle/railgun_boom_2.png create mode 100644 kubejs/assets/tfg/textures/particle/railgun_boom_3.png create mode 100644 kubejs/assets/tfg/textures/particle/railgun_boom_4.png create mode 100644 kubejs/assets/tfg/textures/particle/railgun_boom_5.png create mode 100644 kubejs/assets/tfg/textures/particle/railgun_boom_6.png create mode 100644 kubejs/assets/tfg/textures/particle/railgun_boom_7.png create mode 100644 kubejs/assets/tfg/textures/particle/railgun_boom_8.png create mode 100644 kubejs/assets/tfg/textures/particle/railgun_boom_9.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 790692691..0a646ef24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,9 @@ ## [Unreleased] ### Changes +- Added fanfare effects to the railgun launcher multiblock. (#1557) @Redeix ### Bug fixes +- Fixed a broken model for the aqueous accumulator. (#1557) @Redeix ## [0.10.7] - 07-08-2025 - Fixed an issue with mod dependencies diff --git a/kubejs/assets/tfg/models/block/machines/mv_aqueous_accumulator.json b/kubejs/assets/tfg/models/block/machines/mv_aqueous_accumulator.json index 4952580d1..3637040af 100644 --- a/kubejs/assets/tfg/models/block/machines/mv_aqueous_accumulator.json +++ b/kubejs/assets/tfg/models/block/machines/mv_aqueous_accumulator.json @@ -27,7 +27,7 @@ }, "recipe_logic_status=waiting": { "model": { - "parent": "tfg:block/casings/voltage/mv", + "parent": "gtceu:block/casings/voltage/mv", "textures": { "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active", "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive", diff --git a/kubejs/assets/tfg/particles/railgun_boom.json b/kubejs/assets/tfg/particles/railgun_boom.json index f08e512b0..88af64eab 100644 --- a/kubejs/assets/tfg/particles/railgun_boom.json +++ b/kubejs/assets/tfg/particles/railgun_boom.json @@ -1,20 +1,14 @@ { "textures": [ - "minecraft:sonic_boom_0", - "minecraft:sonic_boom_1", - "minecraft:sonic_boom_2", - "minecraft:sonic_boom_3", - "minecraft:sonic_boom_4", - "minecraft:sonic_boom_5", - "minecraft:sonic_boom_6", - "minecraft:sonic_boom_7", - "minecraft:sonic_boom_8", - "minecraft:sonic_boom_9", - "minecraft:sonic_boom_10", - "minecraft:sonic_boom_11", - "minecraft:sonic_boom_12", - "minecraft:sonic_boom_13", - "minecraft:sonic_boom_14", - "minecraft:sonic_boom_15" + "tfg:railgun_boom_0", + "tfg:railgun_boom_1", + "tfg:railgun_boom_2", + "tfg:railgun_boom_3", + "tfg:railgun_boom_4", + "tfg:railgun_boom_5", + "tfg:railgun_boom_6", + "tfg:railgun_boom_7", + "tfg:railgun_boom_8", + "tfg:railgun_boom_9" ] } diff --git a/kubejs/assets/tfg/textures/particle/railgun_boom_0.png b/kubejs/assets/tfg/textures/particle/railgun_boom_0.png new file mode 100644 index 0000000000000000000000000000000000000000..c7ac8dfb954aae758564247a0ec8d7a5984bb678 GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJDo+>3kcif|Q+M+oFyL@GKlAYF zN-MUHM%&p}P6%4EvDZGZLR7Sh=?J5vz@NEKF1ol}c@^Xp>@UtZiHl+DH9byq7Z=Y} zoVm%n4=h(%C#vKuV|Xeq=1IE$gFn&?d^?*Xg?zOYR-S(lsWqY4Pt0uI|9zHQ-4>a1 cG(G5*K6BDtww!Z<6VMe5p00i_>zopr08eW_MgRZ+ literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/particle/railgun_boom_1.png b/kubejs/assets/tfg/textures/particle/railgun_boom_1.png new file mode 100644 index 0000000000000000000000000000000000000000..051d24544bafa080adc465add871f0c459ccec29 GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJK2I0Nkcif|QxEbUP~dQ_w{AcE z$8k=dV?>+ni-7zj9DWHD@; zzVl?h)78&qol`;+0D~Pgm;e9( literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/particle/railgun_boom_3.png b/kubejs/assets/tfg/textures/particle/railgun_boom_3.png new file mode 100644 index 0000000000000000000000000000000000000000..a124494bb35841a5fe778401589fcce98c3b9bf6 GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzOHUWakcif|=Qi>(DDW^Je6znT z{IlFbw?$sb0`*g^>qQwD)^ED|vQ1Y>C}p?m*ZI$v%NDz`Ffasj?@ZLH@1Orw4QL31 Mr>mdKI;Vst0PYndlK=n! literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/particle/railgun_boom_4.png b/kubejs/assets/tfg/textures/particle/railgun_boom_4.png new file mode 100644 index 0000000000000000000000000000000000000000..8299aef6907c5ac917b890a0671ba02f425231be GIT binary patch literal 290 zcmV+-0p0$IP)OJLbPnP&?BRXA3n8tF)m(Dt`;wyYu<%-8?g1C?0Ijq__z%bFhi6 o-xF_0iggmL7t4M|Ha315Z{PyR;H$)^FaQ7m07*qoM6N<$f)4C?-2eap literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/particle/railgun_boom_5.png b/kubejs/assets/tfg/textures/particle/railgun_boom_5.png new file mode 100644 index 0000000000000000000000000000000000000000..9728d234b0655837d9c902f2233a7b6b149fa0fc GIT binary patch literal 316 zcmV-C0mJ@@P)iwbPnP&?s5HSXo!M>+FY96`??r-JjHtgaO2-`%p{dk&YW|z9%FR# zJv~LG^$>y>gNPhf-U20=vUH~DcKVZ>gSvUQqL z0st^`p_fw1zW0#1R3M^LoqEI=0|1D~$;|M2%zR0rDHM?`)auOZ#2AA5jl%oqRw{_uq3iAm>SXsypLOF zUnEb#V)9g_}jd+H7V*FI;gT^#`q= zHvwkeb_?v8`vFii601>kRlDkdqM3@HKt^C!F{%n4Eyq^4lEn0mNR8gLQ5f9Wls?{; zSGT|__C%y6?@jIh8qIVJyDD6_Ml(-B-~9k;zpGQll;QLnnHomN^Ir-TI3Z0#k469h N002ovPDHLkV1hX%n@j)z literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/particle/railgun_boom_7.png b/kubejs/assets/tfg/textures/particle/railgun_boom_7.png new file mode 100644 index 0000000000000000000000000000000000000000..7bd705617f4138ec4b8f4063a9d99bd2fcdf47a3 GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJK2I0Nkcif|(+~02cTS#z#xW zxNlz?R`0casC?`(Z-{o%cjqvbJ?V$+8EqJz{D?OD!(!yXc7nlW%Kk^*EPMNuo$vfs y`o&T^rK&CB72AfSOVSnVTBipWSKG#(kH55I%GFQj9=-;;jKR~@&t;ucLK6USt54$q literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/particle/railgun_boom_8.png b/kubejs/assets/tfg/textures/particle/railgun_boom_8.png new file mode 100644 index 0000000000000000000000000000000000000000..75ad2d83af46839472a1131c2b18faba3c7682e2 GIT binary patch literal 224 zcmV<603ZK}P)JW6FCA}YRgKcp5FkztNz>=ZgP zcF6@vkbIoK#IxjlmD56en){8CPnf9U!(4F|mZiVd@)U11!{00sH z?nkgd+M)vAHUQxN6mNpi>$rH~AzsD%EWw4)pHfQ`YR=Hcq#-bE&BB{gb@$pSXEjT0 aM|=WwPl)2|v=1o&0000TxiM=ztEu10?O-hUVx0-zTD1&_n6U5T@AxHkgzKj@s^ Date: Fri, 8 Aug 2025 12:36:50 +0100 Subject: [PATCH 2/6] fixed aqueous accumulator --- CHANGELOG.md | 1 + kubejs/server_scripts/tfg/recipes.space.js | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a646ef24..e2980760a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Added fanfare effects to the railgun launcher multiblock. (#1557) @Redeix ### Bug fixes - Fixed a broken model for the aqueous accumulator. (#1557) @Redeix +- Fixed broken recipes for the aqueous accumulator. @Pyritie ## [0.10.7] - 07-08-2025 - Fixed an issue with mod dependencies diff --git a/kubejs/server_scripts/tfg/recipes.space.js b/kubejs/server_scripts/tfg/recipes.space.js index 4cfc84a71..d596ffbe0 100644 --- a/kubejs/server_scripts/tfg/recipes.space.js +++ b/kubejs/server_scripts/tfg/recipes.space.js @@ -56,28 +56,30 @@ function registerTFGSpaceRecipes(event) { .EUt(16) // Aqueous accumulator - + + let aaCircuit = 1; event.recipes.gtceu.aqueous_accumulator('water') + .circuit(aaCircuit++) .duration(20) .EUt(GTValues.VHA[GTValues.ULV]) .addDataString("fluidA", "minecraft:water") .outputFluids(Fluid.of("minecraft:water", 1000)) event.recipes.gtceu.aqueous_accumulator('sea_water') + .circuit(aaCircuit++) .duration(20) .EUt(GTValues.VA[GTValues.ULV]) .addDataString("fluidA", "tfc:salt_water") .outputFluids(Fluid.of("tfc:salt_water", 1000)) event.recipes.gtceu.aqueous_accumulator('semiheavy_water_mars') + .circuit(aaCircuit++) .dimension('ad_astra:mars') .duration(20) .EUt(GTValues.VHA[GTValues.ULV]) .addDataString("fluidA", "tfg:semiheavy_ammoniacal_water") .outputFluids(Fluid.of("tfg:semiheavy_ammoniacal_water", 1000)) - - let aaCircuit = 1; event.recipes.gtceu.aqueous_accumulator('lava_overworld') .circuit(aaCircuit++) From 65090aa58ed94c7318538f058f1496ddfc7903cd Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 8 Aug 2025 12:40:13 +0100 Subject: [PATCH 3/6] fixed moon log spam --- CHANGELOG.md | 1 + kubejs/server_scripts/tfg/events.chunks.js | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e2980760a..6a8b80c18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ ### Bug fixes - Fixed a broken model for the aqueous accumulator. (#1557) @Redeix - Fixed broken recipes for the aqueous accumulator. @Pyritie +- Fixed log spam on the moon @Pyritie ## [0.10.7] - 07-08-2025 - Fixed an issue with mod dependencies diff --git a/kubejs/server_scripts/tfg/events.chunks.js b/kubejs/server_scripts/tfg/events.chunks.js index 971c9bf0f..a1aa0ecf9 100644 --- a/kubejs/server_scripts/tfg/events.chunks.js +++ b/kubejs/server_scripts/tfg/events.chunks.js @@ -7,6 +7,8 @@ const ROCK_LAYER_HEIGHT = 40; // Bare minimum TFCEvents.createChunkDataProvider('moon', event => { + const emptyLayer = TFC.misc.lerpFloatLayer(0, 0, 0, 0); + var aquifer = []; let i = 0; while (i < 16) { @@ -21,7 +23,7 @@ TFCEvents.createChunkDataProvider('moon', event => { } event.partial((data, chunk) => { - data.generatePartial(0, 0, 0, 0, 0) + data.generatePartial(emptyLayer, emptyLayer, 0, 0, 0) }) event.full((data, chunk) => { data.generateFull(heights, aquifer) From 6f7ad3bf48933cd83338c59ed854fa468ae74984 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 8 Aug 2025 12:46:40 +0100 Subject: [PATCH 4/6] fixes #1559 --- CHANGELOG.md | 1 + kubejs/server_scripts/tfg/recipes.food.js | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a8b80c18..bbb6ba945 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Fixed a broken model for the aqueous accumulator. (#1557) @Redeix - Fixed broken recipes for the aqueous accumulator. @Pyritie - Fixed log spam on the moon @Pyritie +- Fixed recipe collision with maize flour and cured maize ## [0.10.7] - 07-08-2025 - Fixed an issue with mod dependencies diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index 7ab899cd3..99755c05a 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -661,8 +661,8 @@ function registerTFGFoodRecipes(event) { processorRecipe("butter", 300, 16, { itemInputs: ["tfc:powder/salt"], - itemOutputs: ["firmalife:food/butter"], fluidInputs: [Fluid.of('firmalife:cream', 1000)], + itemOutputs: ["firmalife:food/butter"], itemOutputProvider: TFC.isp.of('firmalife:food/butter').resetFood() }) @@ -740,6 +740,7 @@ function registerTFGFoodRecipes(event) { }) processorRecipe("cured_maize", 300, 8, { + circuit: 1 itemInputs: ["tfc:food/maize_grain"], inputFluids: [Fluid.of('tfc:limewater', 100)], itemOutputs: ["firmalife:food/cured_maize"], @@ -747,6 +748,7 @@ function registerTFGFoodRecipes(event) { }) processorRecipe("soy_mixture", 300, 8, { + circuit: 1 itemInputs: ["tfc:food/soybean", 'tfc:powder/salt'], fluidInputs: ['#tfg:clean_water 50'], itemOutputs: ["firmalife:food/soy_mixture"], From 125a6fc2938de8d91e773ebf5ceb0991e9593b75 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 8 Aug 2025 17:24:50 +0100 Subject: [PATCH 5/6] once again I break the modpack by committing on my lunch break, thanks krazh --- kubejs/server_scripts/tfg/recipes.food.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index 99755c05a..6de3fd8c3 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -740,7 +740,7 @@ function registerTFGFoodRecipes(event) { }) processorRecipe("cured_maize", 300, 8, { - circuit: 1 + circuit: 1, itemInputs: ["tfc:food/maize_grain"], inputFluids: [Fluid.of('tfc:limewater', 100)], itemOutputs: ["firmalife:food/cured_maize"], @@ -748,7 +748,7 @@ function registerTFGFoodRecipes(event) { }) processorRecipe("soy_mixture", 300, 8, { - circuit: 1 + circuit: 1, itemInputs: ["tfc:food/soybean", 'tfc:powder/salt'], fluidInputs: ['#tfg:clean_water 50'], itemOutputs: ["firmalife:food/soy_mixture"], From feec2487efad4db96596b02c41d30450c61a6fa0 Mon Sep 17 00:00:00 2001 From: TomPlop Date: Fri, 8 Aug 2025 15:01:55 -0400 Subject: [PATCH 6/6] Fix infinite energy with Large Solar Arrays (#1563) Signed-off-by: TomPlop --- kubejs/startup_scripts/gtceu/machines.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index 7e4e8a6b8..efd03d80b 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -213,6 +213,7 @@ const registerGTCEuMachines = (event) => { //#region Large Solar Panels //Tier 1 event.create('large_solar_panel', 'multiblock') + .regressWhenWaiting(false) .rotationState(RotationState.NON_Y_AXIS) .generator(true) .recipeType('large_solar_panel') @@ -257,6 +258,7 @@ const registerGTCEuMachines = (event) => { //Tier 2 event.create('large_solar_panel_tier2', 'multiblock') + .regressWhenWaiting(false) .rotationState(RotationState.NON_Y_AXIS) .generator(true) .recipeType('large_solar_panel_tier2') @@ -334,6 +336,7 @@ const registerGTCEuMachines = (event) => { //Tier 3 event.create('large_solar_panel_tier3', 'multiblock') + .regressWhenWaiting(false) .rotationState(RotationState.NON_Y_AXIS) .generator(true) .recipeType('large_solar_panel_tier3') @@ -557,4 +560,4 @@ const registerGTCEuMachines = (event) => { 'gtceu:block/casings/solid/machine_casing_stainless_evaporation', 'gtceu:block/multiblock/distillation_tower') -} \ No newline at end of file +}