From 8b566a64f5cd638cca41fb4925fbc377681a6789 Mon Sep 17 00:00:00 2001 From: DrMangoTea Date: Sun, 25 May 2025 16:46:22 +0200 Subject: [PATCH] some fixes --- .idea/workspace.xml | 199 +- gradle.properties | 2 +- run-data/logs/debug-1.log.gz | Bin 82131 -> 83099 bytes run-data/logs/debug-2.log.gz | Bin 80597 -> 83206 bytes run-data/logs/debug-3.log.gz | Bin 81616 -> 77004 bytes run-data/logs/debug-4.log.gz | Bin 82356 -> 82029 bytes run-data/logs/debug-5.log.gz | Bin 82407 -> 82094 bytes run-data/logs/debug.log | 19742 ++++++++-------- run-data/logs/latest.log | 172 +- run/logs/debug-1.log.gz | Bin 117768 -> 66256 bytes run/logs/debug-2.log.gz | Bin 118469 -> 85314 bytes run/logs/debug-3.log.gz | Bin 119284 -> 88827 bytes run/logs/debug-4.log.gz | Bin 118367 -> 141872 bytes run/logs/debug-5.log.gz | Bin 118610 -> 117129 bytes run/logs/debug.log | 18032 ++++++-------- run/logs/latest.log | 1032 +- run/options.txt | 58 +- run/usercache.json | 2 +- .../5b8c0f5df972d0059948e36f3c0712dca4487541 | 26 +- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 4 +- .../a4f054e33f64259067ca26a447a1fd4d4705e7dd | 54 +- .../e54e4c34b4f65d271b7b9f53d4ba815125cff8b9 | 6 +- .../resources/assets/tfmg/lang/en_ud.json | 3 + .../resources/assets/tfmg/lang/en_us.json | 3 + .../misc/blasting/lead_ingot_blasting.json | 35 + .../lead_ingot_from_crushed_blasting.json | 35 + .../misc/blasting/lithium_ingot_blasting.json | 35 + .../misc/blasting/nickel_ingot_blasting.json | 35 + .../nickel_ingot_from_crushed_blasting.json | 35 + .../kinetics/screwdriverfrom_brass.json | 35 + .../misc/smelting/lead_ingot_blasting.json | 35 + .../lead_ingot_from_crushed_blasting.json | 35 + .../misc/smelting/lithium_ingot_blasting.json | 35 + .../misc/smelting/nickel_ingot_blasting.json | 35 + .../nickel_ingot_from_crushed_blasting.json | 35 + .../recipes/blasting/lead_ingot_blasting.json | 10 + .../lead_ingot_from_crushed_blasting.json | 10 + .../blasting/lithium_ingot_blasting.json | 10 + .../blasting/nickel_ingot_blasting.json | 10 + .../nickel_ingot_from_crushed_blasting.json | 10 + .../data/tfmg/recipes/casting/silicon.json | 2 +- .../data/tfmg/recipes/casting/steel.json | 2 +- .../tfmg/recipes/compacting/cast_iron.json | 1 - .../crafting/kinetics/aluminum_pipe.json | 1 + .../crafting/kinetics/blast_stove.json | 1 + .../recipes/crafting/kinetics/brass_pipe.json | 1 + .../kinetics/cast_iron_fluid_valve.json | 2 +- .../crafting/kinetics/cast_iron_flywheel.json | 2 +- .../kinetics/cast_iron_mechanical_pump.json | 2 +- .../crafting/kinetics/cast_iron_pipe.json | 5 +- .../kinetics/cast_iron_pipe_vertical.json | 4 +- .../kinetics/cast_iron_smart_fluid_pipe.json | 4 +- .../crafting/kinetics/plastic_pipe.json | 1 + .../kinetics/screwdriverfrom_brass.json | 21 + .../recipes/crafting/kinetics/steel_pipe.json | 1 + .../data/tfmg/recipes/filling/air_tank.json | 3 + .../tfmg/recipes/filling/butane_tank.json | 15 - .../recipes/filling/carbon_dioxide_tank.json | 3 + .../tfmg/recipes/filling/ethylene_tank.json | 3 + .../recipes/filling/furnace_gas_tank.json | 3 + .../tfmg/recipes/filling/hardened_planks.json | 3 + .../tfmg/recipes/filling/hot_air_tank.json | 3 + .../tfmg/recipes/filling/hydrogen_tank.json | 3 + .../data/tfmg/recipes/filling/lpg_tank.json | 3 + .../data/tfmg/recipes/filling/neon_tank.json | 3 + .../tfmg/recipes/filling/propane_tank.json | 15 - .../tfmg/recipes/filling/propylene_tank.json | 3 + .../recipes/industrial_blasting/steel.json | 2 +- .../steel_from_raw_iron.json | 2 +- .../sequenced_assembly/heavy_plate.json | 2 +- .../recipes/smelting/lead_ingot_blasting.json | 10 + .../lead_ingot_from_crushed_blasting.json | 10 + .../smelting/lithium_ingot_blasting.json | 10 + .../smelting/nickel_ingot_blasting.json | 10 + .../nickel_ingot_from_crushed_blasting.json | 10 + .../tfmg/base/TFMGCreativeTabs.java | 34 +- .../storage/AccumulatorBlockEntity.java | 7 +- .../base/AbstractEngineBlockEntity.java | 22 +- .../content/engines/base/EngineBlock.java | 1 + .../EngineControllerBlockEntity.java | 45 +- .../types/AbstractSmallEngineBlockEntity.java | 4 + .../large_engine/LargeEngineBlockEntity.java | 7 +- .../RegularEngineBlockEntity.java | 3 +- .../BlastFurnaceOutputBlockEntity.java | 6 + .../recipes/values/TFMGStandardRecipeGen.java | 65 +- .../create/TFMGCompactingRecipeGen.java | 2 +- .../values/create/TFMGFillingRecipeGen.java | 28 +- .../TFMGSequencedAssemblyRecipeGen.java | 2 +- .../recipes/values/tfmg/CastingRecipeGen.java | 4 +- .../tfmg/IndustrialBlastingRecipeGen.java | 4 +- .../tfmg/mixin/RecipeProviderMixin.java | 2 +- .../drmangotea/tfmg/registry/TFMGBlocks.java | 29 +- .../assets/tfmg/lang/default/interface.json | 3 + .../block/surface_scanner_flags/flag1.png | 0 src/main/resources/tfmg.mixins.json | 1 - 95 files changed, 19053 insertions(+), 21152 deletions(-) create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/blasting/lead_ingot_blasting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/blasting/lead_ingot_from_crushed_blasting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/blasting/lithium_ingot_blasting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/blasting/nickel_ingot_blasting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/blasting/nickel_ingot_from_crushed_blasting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/screwdriverfrom_brass.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/smelting/lead_ingot_blasting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/smelting/lead_ingot_from_crushed_blasting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/smelting/lithium_ingot_blasting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/smelting/nickel_ingot_blasting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/smelting/nickel_ingot_from_crushed_blasting.json create mode 100644 src/generated/resources/data/tfmg/recipes/blasting/lead_ingot_blasting.json create mode 100644 src/generated/resources/data/tfmg/recipes/blasting/lead_ingot_from_crushed_blasting.json create mode 100644 src/generated/resources/data/tfmg/recipes/blasting/lithium_ingot_blasting.json create mode 100644 src/generated/resources/data/tfmg/recipes/blasting/nickel_ingot_blasting.json create mode 100644 src/generated/resources/data/tfmg/recipes/blasting/nickel_ingot_from_crushed_blasting.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/screwdriverfrom_brass.json delete mode 100644 src/generated/resources/data/tfmg/recipes/filling/butane_tank.json delete mode 100644 src/generated/resources/data/tfmg/recipes/filling/propane_tank.json create mode 100644 src/generated/resources/data/tfmg/recipes/smelting/lead_ingot_blasting.json create mode 100644 src/generated/resources/data/tfmg/recipes/smelting/lead_ingot_from_crushed_blasting.json create mode 100644 src/generated/resources/data/tfmg/recipes/smelting/lithium_ingot_blasting.json create mode 100644 src/generated/resources/data/tfmg/recipes/smelting/nickel_ingot_blasting.json create mode 100644 src/generated/resources/data/tfmg/recipes/smelting/nickel_ingot_from_crushed_blasting.json delete mode 100644 src/main/resources/assets/tfmg/textures/block/surface_scanner_flags/flag1.png diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ae7757e1..595dd187 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,20 +4,7 @@