Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

CHANGELOG.md

@@ -2,7 +2,12 @@
 
 ## [Unreleased]
 ### Changes
+- 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
+- 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

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",

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"
   ]
 }

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)

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"],

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++)

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')
 
-}
+}