From e2abb9b7f5dfe040646c4432d5f94eb85ab7cb40 Mon Sep 17 00:00:00 2001 From: DrMangoTea Date: Mon, 2 Jun 2025 17:51:00 +0200 Subject: [PATCH] fixes --- .idea/workspace.xml | 115 +- run-data/logs/debug-1.log.gz | Bin 83099 -> 81600 bytes run-data/logs/debug-2.log.gz | Bin 83206 -> 82125 bytes run-data/logs/debug-3.log.gz | Bin 77004 -> 81561 bytes run-data/logs/debug-4.log.gz | Bin 82029 -> 81764 bytes run-data/logs/debug-5.log.gz | Bin 82094 -> 81185 bytes run-data/logs/debug.log | 19753 ++++++++-------- run-data/logs/latest.log | 177 +- run/logs/debug-1.log.gz | Bin 66256 -> 116649 bytes run/logs/debug-2.log.gz | Bin 85314 -> 116149 bytes run/logs/debug-3.log.gz | Bin 88827 -> 116312 bytes run/logs/debug-4.log.gz | Bin 141872 -> 115944 bytes run/logs/debug-5.log.gz | Bin 117129 -> 118144 bytes run/logs/debug.log | 18486 ++++++++------- run/logs/latest.log | 1524 +- run/usercache.json | 2 +- .../5b8c0f5df972d0059948e36f3c0712dca4487541 | 16 +- .../7f64eb4aa3056533c06f9e8c978f0b46cdcfc23d | 6 +- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 4 +- .../a4f054e33f64259067ca26a447a1fd4d4705e7dd | 41 +- .../e54e4c34b4f65d271b7b9f53d4ba815125cff8b9 | 9 +- .../resources/assets/tfmg/lang/en_ud.json | 7 +- .../resources/assets/tfmg/lang/en_us.json | 7 +- .../tfmg/models/item/asphalt_mixture.json | 6 + .../unfinished_electromagnetic_coil.json | 35 + .../tfmg_striated_ores_nether.json | 2 +- .../tfmg/recipes/casting/cinderblock.json | 16 + .../plastic_sheet.json | 3 +- .../data/tfmg/recipes/casting/slag_block.json | 16 + .../recipes/crafting/kinetics/air_intake.json | 1 + .../kinetics/aluminum_pipe_vertical.json | 1 + .../kinetics/blast_furnace_reinforcement.json | 9 +- .../kinetics/brass_pipe_vertical.json | 1 + .../kinetics/cast_iron_pipe_vertical.json | 1 + .../recipes/crafting/kinetics/neon_tube.json | 4 +- .../kinetics/plastic_pipe_vertical.json | 1 + .../crafting/kinetics/steel_chemical_vat.json | 1 + .../kinetics/steel_pipe_vertical.json | 1 + .../unfinished_electromagnetic_coil.json | 22 + .../recipes/crafting/kinetics/voltmeter.json | 2 +- .../tfmg/recipes/crushing/slag_block.json | 18 + .../tfmg/recipes/distillation/heavy_oil.json | 8 +- .../distillation/heavy_oil_no_naphtha.json | 8 +- .../data/tfmg/recipes/hot_blast/hot_air.json | 6 +- .../tfmg/recipes/mixing/asphalt_mixture.json | 2 +- .../mixing/asphalt_mixture_from_slag.json | 2 +- .../tfmg/recipes/mixing/liquid_asphalt.json | 2 +- .../recipes/sequenced_assembly/motor.json | 26 +- ...g_bricks_from_slag_block_stonecutting.json | 2 +- .../recipes/vat_machine_recipe/aluminum.json | 1 - .../recipes/vat_machine_recipe/concrete.json | 1 - .../recipes/vat_machine_recipe/debug_5.json | 1 - .../recipes/vat_machine_recipe/naphtha.json | 29 + .../plastic_from_ethylene.json | 5 +- .../plastic_from_propylene.json | 5 +- .../recipes/vat_machine_recipe/rubber.json | 27 + .../vat_machine_recipe/sulfuric_acid.json | 1 - .../tfmg_striated_ores_nether.json | 4 +- src/main/java/com/drmangotea/tfmg/TFMG.java | 2 + .../tfmg/content/decoration/FrameBlock.java | 3 +- .../tfmg/content/decoration/TrussBlock.java | 3 +- .../electricity/base/ElectricalNetwork.java | 3 - .../base/KineticElectricBlockEntity.java | 130 +- .../connection/cable_hub/CableHubBlock.java | 3 +- .../cables/CableConnectorBlockEntity.java | 2 +- .../generators/GeneratorBlockEntity.java | 22 +- .../large_generator/RotorBlockEntity.java | 2 +- .../ElectricMotorBlockEntity.java | 2 +- .../utilities/polarizer/MagnetItem.java | 14 + .../polarizer/PolarizerBlockEntity.java | 15 +- .../transformer/TransformerBlockEntity.java | 2 +- .../misc/firebox/FireboxBlockEntity.java | 2 +- .../misc/winding_machine/SpoolItem.java | 11 +- .../DistillationControllerRenderer.java | 2 +- .../base/PumpjackBaseBlockEntity.java | 1 + .../machinery/vat/base/VatBlockEntity.java | 10 +- .../ElectrodeHolderBlockEntity.java | 24 +- .../recipes/values/TFMGStandardRecipeGen.java | 35 +- .../create/TFMGCompactingRecipeGen.java | 4 - .../values/create/TFMGCrushingRecipeGen.java | 4 + .../values/create/TFMGMixingRecipeGen.java | 4 +- .../TFMGSequencedAssemblyRecipeGen.java | 2 +- .../recipes/values/tfmg/CastingRecipeGen.java | 18 + .../values/tfmg/DistillationRecipeGen.java | 8 +- .../values/tfmg/HotBlastRecipeGen.java | 6 +- .../recipes/values/tfmg/VatRecipeGen.java | 25 +- .../drmangotea/tfmg/recipes/jei/TFMGJei.java | 2 + .../tfmg/recipes/jei/machines/Polarizer.java | 2 +- .../drmangotea/tfmg/registry/TFMGBlocks.java | 17 +- .../drmangotea/tfmg/registry/TFMGItems.java | 13 +- .../registry/TFMGMountedStorageTypes.java | 22 + .../tfmg/worldgen/TFMGBiomeModifiers.java | 2 +- .../tfmg/worldgen/TFMGLayeredPatterns.java | 4 +- .../assets/tfmg/lang/default/interface.json | 8 +- .../tfmg/textures/item/asphalt_mixture.png | Bin 246 -> 472 bytes src/main/resources/tfmg.mixins.json | 1 + 96 files changed, 21396 insertions(+), 19451 deletions(-) create mode 100644 src/generated/resources/assets/tfmg/models/item/asphalt_mixture.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/unfinished_electromagnetic_coil.json create mode 100644 src/generated/resources/data/tfmg/recipes/casting/cinderblock.json rename src/generated/resources/data/tfmg/recipes/{compacting => casting}/plastic_sheet.json (77%) create mode 100644 src/generated/resources/data/tfmg/recipes/casting/slag_block.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/unfinished_electromagnetic_coil.json create mode 100644 src/generated/resources/data/tfmg/recipes/crushing/slag_block.json create mode 100644 src/generated/resources/data/tfmg/recipes/vat_machine_recipe/naphtha.json create mode 100644 src/generated/resources/data/tfmg/recipes/vat_machine_recipe/rubber.json create mode 100644 src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/MagnetItem.java create mode 100644 src/main/java/com/drmangotea/tfmg/registry/TFMGMountedStorageTypes.java diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 595dd187..689e0a40 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,9 +4,10 @@