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!ia0y~yU{C;I4mJh`hT^KKFANL}Rh}-6ArY-_r|#xGV8G#W ze&*rTl~!yYjkdF|oDj5RW3PQ+g{Wv1(-B5Tfj@JfTy$}{@+!zH*k7D+5*NePYkHjK zE-s#{ICGPCA6TxkPE^TR#_&{J%#(Eg2Y;j)_;xl&3i)a)tUUi9Qfor7pP1Ra|NAVr hx-By2XnN2qedeUQY&quyCk6%v22WQ%mvv4FO#n}8KSlrm 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!ia0y~yU{C;I4mJh`hT^KKFANL}eV#6kArY-_ryk@zpupi; zZ{2?SkK>#^$A~uD7b}<9hIVgk|J0{)s9TA_bJCx=xy@!1l%d~&5<2oaQ?)ooS zm3!r!#vd-hkFWR4S2W(!x4yegrQvs&&mVPFX6-kGRX-#`DW R8Uq6ZgQu&X%Q~loCIIdgBa;9C 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 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}FFjoxLn2z=hF#=6qQG&~ z`*?yR`^yr(M@DZR*6!t2T-$Xurs(b`0mLkj*mHZtZ z7t6d>c6e+&UtMV9DVMCGq?E?@A=y^e%2G>iZI#tR!T&`}mp!gDeYxY5?Y}iK$~W|L zx5r7#`Zv1^OMM%Uh8Dfw8eXdK{En=^^|NOfj~Fa-X4!Hpws*nZ^}>gb?OHZ%JD;yZ z_#@F-Ve+Nk8`lP?e-J2InBFt5C)2!BvU=L2AHU2G?$hE|+%E8Potu(|T+aC=J2(xB uH*~JOFP!huRVuVr{B)h0nOU7w{sX2H4^|&pZot66z~JfX=d#Wzp$PyE?0MY) 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 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANNf%$_ceArY-_!!GhND{?%Y z)pyW{?@Y^BTyn{0TU*zq zUj>>Znmg1C`LhdMY%DbO&o~y&dLR|7s}NZFFmheylpw#?ex@sQBUIxaeNu@?-fD4K z^-bc|@27P)9Qm3g#i*$ozTZY&f%B!5;NSmpj!}UpE!&wa7!Oo$4-2&M*XCPrr*Tg4 zWEa=!qboCNuPCxywY)04fW@C%W#VG*TO1F(%5SWG9{b}!*2a19S5=di^Y&XzpYuW5 zDfY?k=%>f}p8xpNc*JJX$NZB|UwwV6Jk!mCDQo%Wc^#En&suJESDuWic>Me$Q|PYC W#cgg0+ZY%a7(8A5T-G@yGywqgR*7~1 literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/particle/railgun_boom_6.png b/kubejs/assets/tfg/textures/particle/railgun_boom_6.png new file mode 100644 index 0000000000000000000000000000000000000000..c4460839c0c1a8c219468e08c334d7f2ddd5ef47 GIT binary patch literal 367 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANNfW}YsNArY-d!*5SLqQJ5D z+)bmLV@^S`trvJ|Q|!MPG_Mf8yJDyPNlp&)6*f$4jxNv5e-_Fl9*LX2sdQEl6N5qV z!s$V$_I;nQGelug@Z72+63h%8Cr+OEP<5upbCIUVM4c`xeIH-Se}GxaTtJ6o<}wdm~%7)8nqu zjgOX$ao@f)tln$;Q2E$n-Vp7i@6KT=d(sctGukjb`4MgQhsDT&?F56%l>LvqS@!lR zJKy=O^oyl-N>y9LE4B?um!vD!wN4K%uC|RmAAf1bl&hc4J$%i;z`)??>gTe~DWM4f DajQ?` 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 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}%ROBjLn2z=hCA{#DDY_S zOa5OU`M*(JSb=5cj$W7Q*_*cU2uxqVa`KLiSE_=N*1i(^C1Roz6Z_KMh*%kyon-Z# zP%~%$k=T z?i(C#En>QF#_-_3NPg3W*E=d6D#jiCt#h#T!u%j_;jD8PjxA9%$US>#c5vzUTbk*n e-ns5IOeOvukKSzI*JNN|VDNPHb6Mw<&;$Udu3d8g literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/particle/railgun_boom_9.png b/kubejs/assets/tfg/textures/particle/railgun_boom_9.png new file mode 100644 index 0000000000000000000000000000000000000000..9a2cb5285ccbb34debf0bcf159fddaecc2ffe070 GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}TRdGHLn2zAPQS?8pupqO zU0m}2Rr|301d!0F;wg$A838u$({tGvC__U!rp`|69rFF3zEC9v!!gV~HJY<;)h&0Z?& scX^k2K_AbiR}5D^cEyLvd4~5H7#J8lUHx3vIVCg!0N>nW#{d8T literal 0 HcmV?d00001 From f3bfbf6285052035a25027fed25e71319c67021a Mon Sep 17 00:00:00 2001 From: Pyritie 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 +}