diff --git a/CHANGELOG.md b/CHANGELOG.md index 790692691..bbb6ba945 100644 --- a/CHANGELOG.md +++ b/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 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 000000000..c7ac8dfb9 Binary files /dev/null and b/kubejs/assets/tfg/textures/particle/railgun_boom_0.png differ 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 000000000..051d24544 Binary files /dev/null and b/kubejs/assets/tfg/textures/particle/railgun_boom_1.png differ diff --git a/kubejs/assets/tfg/textures/particle/railgun_boom_2.png b/kubejs/assets/tfg/textures/particle/railgun_boom_2.png new file mode 100644 index 000000000..78a012611 Binary files /dev/null and b/kubejs/assets/tfg/textures/particle/railgun_boom_2.png differ 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 000000000..a124494bb Binary files /dev/null and b/kubejs/assets/tfg/textures/particle/railgun_boom_3.png differ 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 000000000..8299aef69 Binary files /dev/null and b/kubejs/assets/tfg/textures/particle/railgun_boom_4.png differ 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 000000000..9728d234b Binary files /dev/null and b/kubejs/assets/tfg/textures/particle/railgun_boom_5.png differ 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 000000000..c4460839c Binary files /dev/null and b/kubejs/assets/tfg/textures/particle/railgun_boom_6.png differ 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 000000000..7bd705617 Binary files /dev/null and b/kubejs/assets/tfg/textures/particle/railgun_boom_7.png differ 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 000000000..75ad2d83a Binary files /dev/null and b/kubejs/assets/tfg/textures/particle/railgun_boom_8.png differ 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 000000000..9a2cb5285 Binary files /dev/null and b/kubejs/assets/tfg/textures/particle/railgun_boom_9.png differ 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) diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index 7ab899cd3..6de3fd8c3 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"], 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++) 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 +}