From 2b1120cf38eee6ea4b3a4d8c8f6eb27325c42bb8 Mon Sep 17 00:00:00 2001 From: DrMangoTea Date: Sat, 10 May 2025 21:40:22 +0200 Subject: [PATCH] stufff --- .idea/workspace.xml | 252 +- run-data/logs/debug-1.log.gz | Bin 68832 -> 82517 bytes run-data/logs/debug-2.log.gz | Bin 82545 -> 81817 bytes run-data/logs/debug-3.log.gz | Bin 81495 -> 59935 bytes run-data/logs/debug-4.log.gz | Bin 81552 -> 82632 bytes run-data/logs/debug-5.log.gz | Bin 81964 -> 60027 bytes run-data/logs/debug.log | 19762 ++++++++-------- run-data/logs/latest.log | 170 +- run/config/tfmg-common.toml | 2 +- run/logs/debug-1.log.gz | Bin 121301 -> 103444 bytes run/logs/debug-2.log.gz | Bin 118343 -> 157819 bytes run/logs/debug-3.log.gz | Bin 116885 -> 120919 bytes run/logs/debug-4.log.gz | Bin 117002 -> 136865 bytes run/logs/debug-5.log.gz | Bin 116804 -> 115436 bytes run/logs/debug.log | 17606 ++++++-------- run/logs/latest.log | 690 +- run/options.txt | 58 +- run/usercache.json | 2 +- .../a4f054e33f64259067ca26a447a1fd4d4705e7dd | 36 +- .../e54e4c34b4f65d271b7b9f53d4ba815125cff8b9 | 6 +- .../resources/assets/tfmg/lang/en_ud.json | 2 + .../resources/assets/tfmg/lang/en_us.json | 2 + .../crafting/kinetics/black_multimeter.json | 35 + .../crafting/kinetics/blue_multimeter.json | 35 + .../crafting/kinetics/brown_multimeter.json | 35 + .../crafting/kinetics/cyan_multimeter.json | 35 + .../crafting/kinetics/gray_multimeter.json | 35 + .../crafting/kinetics/green_multimeter.json | 35 + .../kinetics/light_blue_multimeter.json | 35 + .../kinetics/light_gray_multimeter.json | 35 + .../crafting/kinetics/lime_multimeter.json | 35 + .../crafting/kinetics/magenta_multimeter.json | 35 + .../misc/crafting/kinetics/multimeter.json | 35 + .../crafting/kinetics/orange_multimeter.json | 35 + .../crafting/kinetics/pink_multimeter.json | 35 + .../crafting/kinetics/purple_multimeter.json | 35 + .../crafting/kinetics/red_multimeter.json | 35 + .../crafting/kinetics/white_multimeter.json | 35 + .../crafting/kinetics/yellow_multimeter.json | 35 + .../crafting/kinetics/black_multimeter.json | 15 + .../crafting/kinetics/blue_multimeter.json | 15 + .../crafting/kinetics/brown_multimeter.json | 15 + .../crafting/kinetics/cyan_multimeter.json | 15 + .../crafting/kinetics/gray_multimeter.json | 15 + .../crafting/kinetics/green_multimeter.json | 15 + .../kinetics/light_blue_multimeter.json | 15 + .../kinetics/light_gray_multimeter.json | 15 + .../crafting/kinetics/lime_multimeter.json | 15 + .../crafting/kinetics/magenta_multimeter.json | 15 + .../recipes/crafting/kinetics/multimeter.json | 24 + .../crafting/kinetics/orange_multimeter.json | 15 + .../crafting/kinetics/pink_multimeter.json | 15 + .../crafting/kinetics/purple_multimeter.json | 15 + .../crafting/kinetics/red_multimeter.json | 15 + .../crafting/kinetics/white_multimeter.json | 15 + .../crafting/kinetics/yellow_multimeter.json | 15 + .../com/drmangotea/tfmg/base/TFMGShapes.java | 10 + .../cogs/EncasedAluminumCogInstance.java | 0 .../decoration/cogs/TFMGCogwheelInstance.java | 0 .../electricity/base/ElectricBlockEntity.java | 22 +- .../electricity/base/ElectricalNetwork.java | 21 +- .../content/electricity/base/IElectric.java | 32 +- .../base/KineticElectricBlockEntity.java | 22 +- .../electricity/base/UpdateInFrontPacket.java | 1 + .../ElectricBlockItem.java | 6 +- .../ElectriciansWrenchItem.java | 11 +- .../ElectriciansWrenchPacket.java | 3 +- .../ElectriciansWrenchScreen.java | 2 +- .../connection/cables/CableRemovalPacket.java | 14 +- .../debug/DebugCinderBlockItem.java | 20 +- .../generators/GeneratorBlockEntity.java | 2 + .../large_generator/RotorBlockEntity.java | 113 +- .../storage/AccumulatorBlockEntity.java | 74 +- .../converter/ConverterBlockEntity.java | 13 +- .../electric_motor/ElectricMotorBlock.java | 2 + .../ElectricMotorBlockEntity.java | 9 +- .../ElectricPumpBlockEntity.java | 2 +- .../transformer/TransformerBlockEntity.java | 29 + .../base/AbstractEngineBlockEntity.java | 30 +- .../content/engines/base/EngineBlock.java | 22 +- .../EngineControllerBlock.java | 2 +- .../EngineControllerBlockEntity.java | 23 +- .../TransmissionRemovePacket.java | 29 + .../engine_gearbox/EngineGearboxBlock.java | 2 +- .../engine_gearbox/EngineGearboxInstance.java | 0 .../types/AbstractSmallEngineBlockEntity.java | 49 +- .../turbine_engine/TurbineEngineBlock.java | 14 + .../engines/upgrades/TransmissionUpgrade.java | 35 + .../winding_machine/WindingMachineVisual.java | 63 + .../ElectrodeHolderBlockEntity.java | 45 +- .../recipes/values/TFMGStandardRecipeGen.java | 113 + .../values/create/TFMGCrushingRecipeGen.java | 53 + .../mixin/GoggleOverlayRendererMixin.java | 4 +- .../tfmg/ponder/TFMGPonderTags.java | 147 + .../tfmg/registry/TFMGBlockEntities.java | 3 +- .../drmangotea/tfmg/registry/TFMGItems.java | 22 +- .../drmangotea/tfmg/registry/TFMGPackets.java | 6 +- .../tfmg/registry/TFMGPartialModels.java | 1 + .../assets/tfmg/lang/default/interface.json | 3 + .../tfmg/models/item/transmission_model.json | 66 +- .../textures/block/cinderflourblock_top.png | Bin 320 -> 467 bytes 101 files changed, 19891 insertions(+), 20696 deletions(-) create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/black_multimeter.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/blue_multimeter.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/brown_multimeter.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/cyan_multimeter.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/gray_multimeter.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/green_multimeter.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/light_blue_multimeter.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/light_gray_multimeter.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/lime_multimeter.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/magenta_multimeter.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/multimeter.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/orange_multimeter.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/pink_multimeter.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/purple_multimeter.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/red_multimeter.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/white_multimeter.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/yellow_multimeter.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/black_multimeter.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/blue_multimeter.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/brown_multimeter.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/cyan_multimeter.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/gray_multimeter.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/green_multimeter.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/light_blue_multimeter.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/light_gray_multimeter.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/lime_multimeter.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/magenta_multimeter.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/multimeter.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/orange_multimeter.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/pink_multimeter.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/purple_multimeter.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/red_multimeter.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/white_multimeter.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/yellow_multimeter.json delete mode 100644 src/main/java/com/drmangotea/tfmg/content/decoration/cogs/EncasedAluminumCogInstance.java delete mode 100644 src/main/java/com/drmangotea/tfmg/content/decoration/cogs/TFMGCogwheelInstance.java rename src/main/java/com/drmangotea/tfmg/content/electricity/{electrians_wrench => configuration_wrench}/ElectricBlockItem.java (79%) rename src/main/java/com/drmangotea/tfmg/content/electricity/{electrians_wrench => configuration_wrench}/ElectriciansWrenchItem.java (87%) rename src/main/java/com/drmangotea/tfmg/content/electricity/{electrians_wrench => configuration_wrench}/ElectriciansWrenchPacket.java (91%) rename src/main/java/com/drmangotea/tfmg/content/electricity/{electrians_wrench => configuration_wrench}/ElectriciansWrenchScreen.java (98%) create mode 100644 src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/TransmissionRemovePacket.java delete mode 100644 src/main/java/com/drmangotea/tfmg/content/engines/engine_gearbox/EngineGearboxInstance.java create mode 100644 src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/WindingMachineVisual.java create mode 100644 src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGCrushingRecipeGen.java create mode 100644 src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderTags.java diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ecbd62cf..e517abe3 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,30 +4,10 @@