From fe9986f06be3a355247644859b52a5ed7d16c3c9 Mon Sep 17 00:00:00 2001 From: DrMangoTea Date: Wed, 21 May 2025 22:10:54 +0200 Subject: [PATCH] eeeeeeeeee --- .idea/workspace.xml | 217 +- gradle.properties | 2 +- run-data/logs/debug-1.log.gz | Bin 82517 -> 82131 bytes run-data/logs/debug-2.log.gz | Bin 81817 -> 80597 bytes run-data/logs/debug-3.log.gz | Bin 59935 -> 81616 bytes run-data/logs/debug-4.log.gz | Bin 82632 -> 82356 bytes run-data/logs/debug-5.log.gz | Bin 60027 -> 82407 bytes run-data/logs/debug.log | 19746 +++++++------ run-data/logs/latest.log | 171 +- run/config/tfmg-common.toml | 10 +- run/logs/debug-1.log.gz | Bin 74619 -> 117768 bytes run/logs/debug-2.log.gz | Bin 86363 -> 118469 bytes run/logs/debug-3.log.gz | Bin 84053 -> 119284 bytes run/logs/debug-4.log.gz | Bin 96456 -> 118367 bytes run/logs/debug-5.log.gz | Bin 88901 -> 118610 bytes run/logs/debug.log | 24430 +++++++--------- run/logs/latest.log | 3551 +-- run/options.txt | 52 +- run/usercache.json | 2 +- .../5b8c0f5df972d0059948e36f3c0712dca4487541 | 10 +- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 3 +- .../a4f054e33f64259067ca26a447a1fd4d4705e7dd | 23 +- .../e54e4c34b4f65d271b7b9f53d4ba815125cff8b9 | 18 +- .../assets/tfmg/blockstates/fuse_block.json | 19 - .../tfmg/blockstates/turbine_engine.json | 368 +- .../resources/assets/tfmg/lang/en_ud.json | 33 +- .../resources/assets/tfmg/lang/en_us.json | 33 +- ...{fuse.json => diesel_engine_cylinder.json} | 2 +- .../assets/tfmg/models/item/fuse_block.json | 3 - .../models/item/simple_engine_cylinder.json | 6 + .../tags/blocks/mineable/pickaxe.json | 1 - ...inderblock_from_concrete_stonecutting.json | 35 + .../{fuse_block.json => cinder_block.json} | 6 +- ...bine_blade.json => cinderflour_block.json} | 6 +- .../kinetics/unfinished_resistor.json | 35 + .../unfinished_resistorfrom_slime.json | 35 + .../tfmg/loot_tables/blocks/fuse_block.json | 21 - ...inderblock_from_concrete_stonecutting.json | 8 + .../crafting/kinetics/cinder_block.json | 25 + .../crafting/kinetics/cinderflour_block.json | 25 + .../recipes/crafting/kinetics/fuse_block.json | 27 - ...ne_blade.json => unfinished_resistor.json} | 15 +- .../unfinished_resistorfrom_slime.json | 21 + .../data/tfmg/recipes/crushing/galena.json | 19 + .../recipes/industrial_blasting/silicon.json | 16 + .../recipes/industrial_blasting/steel.json | 2 +- .../industrial_blasting/steel_from_dust.json | 2 +- .../steel_from_raw_iron.json | 5 +- .../data/tfmg/recipes/mixing/constantan.json | 18 + .../tfmg/recipes/mixing/magnetic_alloy.json | 3 + .../tfmg/recipes/mixing/n_semiconductor.json | 16 + .../tfmg/recipes/mixing/p_semiconductor.json | 16 + .../sequenced_assembly/steel_mechanism.json | 122 + .../vat_machine_recipe/arc_furnace_steel.json | 3 +- .../data/tfmg/recipes/winding/resistor.json | 6 +- src/main/java/com/drmangotea/tfmg/TFMG.java | 4 +- .../com/drmangotea/tfmg/base/TFMGUtils.java | 2 +- .../tfmg/base/events/TFMGClientEvents.java | 20 +- .../tfmg/base/events/TFMGCommonEvents.java | 2 + .../drmangotea/tfmg/config/MachineConfig.java | 5 + .../drmangotea/tfmg/config/StressConfig.java | 0 .../decoration/cogs/TFMGEncasedCogVisual.java | 15 +- .../electricity/base/ElectricBlockEntity.java | 16 +- .../electricity/base/ElectricalNetwork.java | 3 + .../content/electricity/base/IElectric.java | 3 +- .../base/KineticElectricBlockEntity.java | 24 +- .../cables/CableConnectorBlockEntity.java | 2 +- .../cables/CableConnectorRenderer.java | 5 + .../debug/DebugCinderBlockItem.java | 22 +- .../generators/GeneratorBlockEntity.java | 19 +- .../large_generator/RotorBlockEntity.java | 5 + .../large_generator/StatorBlockEntity.java | 46 +- .../lights/LightBulbBlockEntity.java | 10 + .../measurement/VoltMeterBlockEntity.java | 56 +- .../measurement/VoltMeterRenderer.java | 3 +- .../converter/ConverterBlockEntity.java | 38 +- .../ElectricMotorBlockEntity.java | 2 +- .../utilities/fuse_block/FuseBlock.java | 58 +- .../PotentiometerBlockEntity.java | 2 +- .../SegmentedDisplayBlockEntity.java | 4 +- .../base/AbstractEngineBlockEntity.java | 18 +- .../content/engines/base/EngineBlock.java | 45 +- .../engines/base/EngineProperties.java | 9 + .../EngineControllerBlockEntity.java | 2 +- .../types/AbstractSmallEngineBlockEntity.java | 107 +- .../large_engine/LargeEngineBlockEntity.java | 142 +- .../RadialEngineBlockEntity.java | 43 +- .../RegularEngineBlockEntity.java | 152 +- .../regular_engine/RegularEngineRenderer.java | 5 +- .../turbine_engine/TurbineEngineBlock.java | 29 +- .../TurbineEngineBlockEntity.java | 212 +- .../BlastFurnaceOutputBlockEntity.java | 40 +- .../CastingBasinBlockEntity.java | 3 + .../WindingMachineBlockEntity.java | 19 +- .../machinery/vat/base/VatBlockEntity.java | 46 +- .../ElectrodeHolderBlockEntity.java | 8 +- .../ElectrodeHolderRenderer.java | 2 +- .../datagen/recipes/TFMGRecipeProvider.java | 22 +- .../recipes/values/TFMGStandardRecipeGen.java | 70 +- .../values/create/TFMGCrushingRecipeGen.java | 5 +- .../values/create/TFMGMixingRecipeGen.java | 20 + .../TFMGSequencedAssemblyRecipeGen.java | 15 + .../tfmg/IndustrialBlastingRecipeGen.java | 13 +- .../recipes/values/tfmg/VatRecipeGen.java | 3 +- .../recipes/values/tfmg/WindingRecipeGen.java | 4 +- .../jei/IndustrialBlastingCategory.java | 68 +- .../recipes/jei/machines/WindingMachine.java | 20 +- .../tfmg/registry/TFMGBlockEntities.java | 2 +- .../drmangotea/tfmg/registry/TFMGBlocks.java | 21 +- .../drmangotea/tfmg/registry/TFMGItems.java | 28 +- .../tfmg/registry/TFMGRecipeTypes.java | 9 +- .../tfmg/registry/TFMGSoundEvents.java | 436 + .../drmangotea/tfmg/registry/TFMGTags.java | 6 +- .../assets/tfmg/lang/default/interface.json | 29 +- .../models/block/converter/block_rotated.json | 3 +- .../block_flat.json | 4 +- .../copper_encased_brass_pipe/block_flat.json | 4 +- .../block_flat.json | 4 +- .../block_flat.json | 4 +- .../copper_encased_steel_pipe/block_flat.json | 4 +- .../models/block/electrode_holder/block.json | 10 +- .../models/block/electrode_holder/item.json | 10 +- .../textures/block/aluminium_encased_pipe.png | Bin 0 -> 418 bytes .../block/copper_encased_aluminum_pipe.png | Bin 673 -> 418 bytes .../copper_encased_aluminum_pipe_side.png | Bin 0 -> 529 bytes .../block/copper_encased_brass_pipe.png | Bin 673 -> 435 bytes .../block/copper_encased_brass_pipe_side.png | Bin 0 -> 529 bytes .../block/copper_encased_cast_iron_pipe.png | Bin 673 -> 388 bytes .../copper_encased_cast_iron_pipe_side.png | Bin 0 -> 529 bytes .../block/copper_encased_plastic_pipe.png | Bin 674 -> 391 bytes .../copper_encased_plastic_pipe_side.png | Bin 0 -> 529 bytes .../block/copper_encased_steel_pipe.png | Bin 673 -> 401 bytes .../block/copper_encased_steel_pipe_side.png | Bin 0 -> 529 bytes .../tfmg/textures/block/copper_frame.png | Bin 493 -> 493 bytes .../assets/tfmg/textures/block/voltmeter.png | Bin 755 -> 770 bytes .../textures/item/diesel_engine_cylinder.png | Bin 0 -> 259 bytes .../tfmg/textures/item/hydrogen_bucket.png | Bin 277 -> 224 bytes .../textures/item/simple_engine_cylinder.png | Bin 0 -> 259 bytes .../data/tfmg/recipes/engine_cylinder.json | 25 + .../tfmg/recipes/engine_cylinder_cheap.json | 30 + .../tfmg/recipes/engine_cylinder_gas.json | 40 + .../recipes/engine_cylinder_spark_plug.json | 40 + .../data/tfmg/recipes/turbine_blade.json | 28 + 143 files changed, 22752 insertions(+), 28660 deletions(-) delete mode 100644 src/generated/resources/assets/tfmg/blockstates/fuse_block.json rename src/generated/resources/assets/tfmg/models/item/{fuse.json => diesel_engine_cylinder.json} (56%) delete mode 100644 src/generated/resources/assets/tfmg/models/item/fuse_block.json create mode 100644 src/generated/resources/assets/tfmg/models/item/simple_engine_cylinder.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/building_blocks/cinderblock_from_concrete_stonecutting.json rename src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/{fuse_block.json => cinder_block.json} (79%) rename src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/{turbine_blade.json => cinderflour_block.json} (77%) create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/unfinished_resistor.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/misc/crafting/kinetics/unfinished_resistorfrom_slime.json delete mode 100644 src/generated/resources/data/tfmg/loot_tables/blocks/fuse_block.json create mode 100644 src/generated/resources/data/tfmg/recipes/cinderblock_from_concrete_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/cinder_block.json create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/cinderflour_block.json delete mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/fuse_block.json rename src/generated/resources/data/tfmg/recipes/crafting/kinetics/{turbine_blade.json => unfinished_resistor.json} (52%) create mode 100644 src/generated/resources/data/tfmg/recipes/crafting/kinetics/unfinished_resistorfrom_slime.json create mode 100644 src/generated/resources/data/tfmg/recipes/crushing/galena.json create mode 100644 src/generated/resources/data/tfmg/recipes/industrial_blasting/silicon.json create mode 100644 src/generated/resources/data/tfmg/recipes/mixing/constantan.json create mode 100644 src/generated/resources/data/tfmg/recipes/mixing/n_semiconductor.json create mode 100644 src/generated/resources/data/tfmg/recipes/mixing/p_semiconductor.json create mode 100644 src/generated/resources/data/tfmg/recipes/sequenced_assembly/steel_mechanism.json delete mode 100644 src/main/java/com/drmangotea/tfmg/config/StressConfig.java create mode 100644 src/main/java/com/drmangotea/tfmg/registry/TFMGSoundEvents.java create mode 100644 src/main/resources/assets/tfmg/textures/block/aluminium_encased_pipe.png create mode 100644 src/main/resources/assets/tfmg/textures/block/copper_encased_aluminum_pipe_side.png create mode 100644 src/main/resources/assets/tfmg/textures/block/copper_encased_brass_pipe_side.png create mode 100644 src/main/resources/assets/tfmg/textures/block/copper_encased_cast_iron_pipe_side.png create mode 100644 src/main/resources/assets/tfmg/textures/block/copper_encased_plastic_pipe_side.png create mode 100644 src/main/resources/assets/tfmg/textures/block/copper_encased_steel_pipe_side.png create mode 100644 src/main/resources/assets/tfmg/textures/item/diesel_engine_cylinder.png create mode 100644 src/main/resources/assets/tfmg/textures/item/simple_engine_cylinder.png create mode 100644 src/main/resources/data/tfmg/recipes/engine_cylinder.json create mode 100644 src/main/resources/data/tfmg/recipes/engine_cylinder_cheap.json create mode 100644 src/main/resources/data/tfmg/recipes/engine_cylinder_gas.json create mode 100644 src/main/resources/data/tfmg/recipes/engine_cylinder_spark_plug.json create mode 100644 src/main/resources/data/tfmg/recipes/turbine_blade.json diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 26a65ffe..ae7757e1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,8 +4,30 @@