From 68b21429f1285c3947baaa992a85e7c3861a624a Mon Sep 17 00:00:00 2001 From: DrMangoTea Date: Mon, 2 Jun 2025 19:59:00 +0200 Subject: [PATCH] fixes 2 --- .idea/workspace.xml | 163 +- run-data/logs/debug-1.log.gz | Bin 81600 -> 82026 bytes run-data/logs/debug-2.log.gz | Bin 82125 -> 82565 bytes run-data/logs/debug-3.log.gz | Bin 81561 -> 77621 bytes run-data/logs/debug-4.log.gz | Bin 81764 -> 78013 bytes run-data/logs/debug-5.log.gz | Bin 81185 -> 82203 bytes run-data/logs/debug.log | 19768 +++++++------- run-data/logs/latest.log | 182 +- run/logs/debug-1.log.gz | Bin 116649 -> 117336 bytes run/logs/debug-2.log.gz | Bin 116149 -> 115450 bytes run/logs/debug-3.log.gz | Bin 116312 -> 116985 bytes run/logs/debug-4.log.gz | Bin 115944 -> 115209 bytes run/logs/debug-5.log.gz | Bin 118144 -> 117323 bytes run/logs/debug.log | 21976 +++++++++------- run/logs/latest.log | 1928 +- run/options.txt | 58 +- run/usercache.json | 2 +- .../5b8c0f5df972d0059948e36f3c0712dca4487541 | 5 +- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 4 +- .../a4f054e33f64259067ca26a447a1fd4d4705e7dd | 16 +- .../e54e4c34b4f65d271b7b9f53d4ba815125cff8b9 | 7 +- .../resources/assets/tfmg/lang/en_ud.json | 23 +- .../resources/assets/tfmg/lang/en_us.json | 23 +- .../assets/tfmg/models/item/oil_hammer.json | 6 + .../advanced_potato_cannon.json | 28 + .../misc/crafting/kinetics/oil_hammer.json | 35 + .../recipes/crafting/kinetics/cable_tube.json | 1 + .../kinetics/diagonal_cable_block.json | 1 + .../crafting/kinetics/electric_post.json | 1 + .../recipes/crafting/kinetics/oil_hammer.json | 24 + .../tfmg/recipes/filling/napalm_potato.json | 18 + .../recipes/industrial_blasting/silicon.json | 2 +- .../tfmg/recipes/mixing/magnetic_alloy.json | 1 + .../recipes/sequenced_assembly/motor.json | 36 +- .../vat_machine_recipe/arc_furnace_steel.json | 6 +- .../recipes/vat_machine_recipe/debug_5.json | 75 - .../com/drmangotea/tfmg/base/TFMGUtils.java | 7 +- .../tfmg/base/events/TFMGCommonEvents.java | 9 - .../electricity/base/ElectricBlockEntity.java | 4 +- .../content/electricity/base/IElectric.java | 1 - .../base/KineticElectricBlockEntity.java | 25 +- .../ElectriciansWrenchPacket.java | 1 - .../cables/CableConnectorBlockEntity.java | 6 +- .../debug/DebugCinderBlockItem.java | 143 +- .../generators/GeneratorBlockEntity.java | 2 - .../large_generator/RotorBlockEntity.java | 1 + .../lights/neon_tube/NeonTubeBlock.java | 3 - .../MultimeterOverlayRenderer.java | 8 +- .../measurement/VoltMeterBlock.java | 2 +- .../measurement/VoltMeterBlockEntity.java | 15 +- .../ElectricMotorBlockEntity.java | 2 +- .../utilities/fuse_block/FuseBlockEntity.java | 4 +- .../resistor/ResistorBlockEntity.java | 1 - .../base/AbstractEngineBlockEntity.java | 1 - .../EngineControllerBlockEntity.java | 1 - .../EngineControllerClientHandler.java | 8 - .../types/AbstractSmallEngineBlockEntity.java | 5 +- .../RegularEngineBlockEntity.java | 1 - .../ConcreteFillingBehavior.java | 2 - .../oil_processing/OilHammerItem.java | 45 + .../pumpjack/pumpjack/base/TestSavedData.java | 3 +- .../pumpjack/base/TestSavedDataManager.java | 2 - .../IndustrialMixerBlockEntity.java | 1 - .../recipes/values/TFMGStandardRecipeGen.java | 16 +- .../values/create/TFMGFillingRecipeGen.java | 6 + .../TFMGMechanicalCraftingRecipeGen.java | 11 + .../values/create/TFMGMixingRecipeGen.java | 2 +- .../TFMGSequencedAssemblyRecipeGen.java | 6 +- .../tfmg/IndustrialBlastingRecipeGen.java | 2 +- .../recipes/values/tfmg/VatRecipeGen.java | 43 +- .../tfmg/mixin/FluidTankBlockEntityMixin.java | 2 - .../drmangotea/tfmg/registry/TFMGBlocks.java | 6 +- .../drmangotea/tfmg/registry/TFMGItems.java | 4 + .../assets/tfmg/lang/default/interface.json | 6 + .../tfmg/models/block/converter/block.json | 3 +- .../models/block/converter/block_rotated.json | 3 +- .../assets/tfmg/textures/item/oil_hammer.png | Bin 0 -> 510 bytes 77 files changed, 23730 insertions(+), 21072 deletions(-) create mode 100644 src/generated/resources/assets/tfmg/models/item/oil_hammer.json create mode 100644 src/generated/resources/data/create/recipes/mechanical_crafting/advanced_potato_cannon.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/oil_hammer.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/oil_hammer.json create mode 100644 src/generated/resources/data/tfmg/recipes/filling/napalm_potato.json delete mode 100644 src/generated/resources/data/tfmg/recipes/vat_machine_recipe/debug_5.json create mode 100644 src/main/java/com/drmangotea/tfmg/content/machinery/oil_processing/OilHammerItem.java create mode 100644 src/main/resources/assets/tfmg/textures/item/oil_hammer.png diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 689e0a40..8c26101e 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,9 +4,9 @@