From 12cf1c787b37d2793d4f6d1c903bd9d41ca859eb Mon Sep 17 00:00:00 2001 From: DrMangoTea Date: Sun, 2 Mar 2025 12:55:44 +0100 Subject: [PATCH] more stuff --- .idea/workspace.xml | 270 +- build.gradle | 14 +- gradle.properties | 6 +- run-data/logs/2025-02-20-2.log.gz | Bin 0 -> 2576 bytes ...025-02-20-1.log.gz => 2025-02-20-3.log.gz} | Bin run-data/logs/2025-02-27-2.log.gz | Bin 0 -> 2559 bytes run-data/logs/2025-02-27-3.log.gz | Bin 0 -> 1856 bytes run-data/logs/2025-02-27-4.log.gz | Bin 0 -> 1854 bytes run-data/logs/debug-1.log.gz | Bin 73236 -> 72631 bytes run-data/logs/debug-2.log.gz | Bin 72634 -> 65233 bytes run-data/logs/debug-3.log.gz | Bin 72435 -> 66095 bytes run-data/logs/debug-4.log.gz | Bin 72115 -> 74734 bytes run-data/logs/debug-5.log.gz | Bin 73109 -> 73236 bytes run-data/logs/debug.log | 17828 ++++++++-------- run-data/logs/latest.log | 132 +- run/logs/2025-02-26-1.log.gz | Bin 7977 -> 0 bytes run/logs/2025-02-26-2.log.gz | Bin 7876 -> 9090 bytes run/logs/2025-02-26-3.log.gz | Bin 8216 -> 8357 bytes run/logs/2025-02-26-4.log.gz | Bin 8169 -> 7977 bytes run/logs/2025-02-26-5.log.gz | Bin 0 -> 7876 bytes run/logs/2025-02-26-6.log.gz | Bin 0 -> 8216 bytes run/logs/2025-02-26-7.log.gz | Bin 0 -> 8169 bytes run/logs/2025-02-27-2.log.gz | Bin 0 -> 7987 bytes run/logs/2025-02-27-3.log.gz | Bin 0 -> 7891 bytes run/logs/2025-02-27-4.log.gz | Bin 0 -> 7752 bytes run/logs/2025-02-27-5.log.gz | Bin 0 -> 7798 bytes run/logs/2025-02-27-6.log.gz | Bin 0 -> 7742 bytes run/logs/2025-02-27-7.log.gz | Bin 0 -> 7742 bytes run/logs/2025-02-27-8.log.gz | Bin 0 -> 7854 bytes run/logs/2025-02-27-9.log.gz | Bin 0 -> 8105 bytes run/logs/2025-02-28-2.log.gz | Bin 0 -> 8271 bytes run/logs/2025-02-28-3.log.gz | Bin 0 -> 8054 bytes run/logs/2025-02-28-4.log.gz | Bin 0 -> 7914 bytes run/logs/2025-02-28-5.log.gz | Bin 0 -> 7831 bytes run/logs/2025-02-28-6.log.gz | Bin 0 -> 7899 bytes run/logs/2025-03-01-1.log.gz | Bin 0 -> 8394 bytes run/logs/debug-1.log.gz | Bin 95187 -> 83835 bytes run/logs/debug-2.log.gz | Bin 83385 -> 84082 bytes run/logs/debug-3.log.gz | Bin 124101 -> 82912 bytes run/logs/debug-4.log.gz | Bin 85290 -> 82187 bytes run/logs/debug-5.log.gz | Bin 117838 -> 82874 bytes run/logs/debug.log | 16222 +++++++------- run/logs/latest.log | 472 +- run/options.txt | 56 +- run/saves/New World (1)/DIM-1/data/raids.dat | Bin 90 -> 90 bytes .../New World (1)/DIM1/data/raids_end.dat | Bin 90 -> 90 bytes run/saves/New World (1)/data/raids.dat | Bin 90 -> 90 bytes .../New World (1)/data/random_sequences.dat | Bin 2711 -> 2710 bytes .../New World (1)/data/tfmg_deposits.dat | Bin 127 -> 128 bytes run/saves/New World (1)/entities/r.-6.-3.mca | Bin 540672 -> 540672 bytes run/saves/New World (1)/entities/r.-6.-4.mca | Bin 290816 -> 290816 bytes run/saves/New World (1)/entities/r.-7.-3.mca | Bin 794624 -> 794624 bytes run/saves/New World (1)/entities/r.-7.-4.mca | Bin 401408 -> 401408 bytes run/saves/New World (1)/level.dat | Bin 63432 -> 63474 bytes run/saves/New World (1)/level.dat_old | Bin 63435 -> 63473 bytes .../380df991-f603-344c-a090-369bad2a924a.dat | Bin 6317 -> 6327 bytes ...0df991-f603-344c-a090-369bad2a924a.dat_old | Bin 6321 -> 6328 bytes run/saves/New World (1)/poi/r.-7.-3.mca | Bin 69632 -> 69632 bytes run/saves/New World (1)/region/r.-6.-3.mca | Bin 10338304 -> 10338304 bytes run/saves/New World (1)/region/r.-6.-4.mca | Bin 9072640 -> 9072640 bytes run/saves/New World (1)/region/r.-7.-3.mca | Bin 9539584 -> 9539584 bytes run/saves/New World (1)/region/r.-7.-4.mca | Bin 10391552 -> 10391552 bytes .../380df991-f603-344c-a090-369bad2a924a.json | 2 +- run/usercache.json | 2 +- .../e54e4c34b4f65d271b7b9f53d4ba815125cff8b9 | 16 +- .../tfmg/blockstates/engine_controller.json | 19 + .../tfmg/blockstates/engine_gearbox.json | 19 + .../resources/assets/tfmg/lang/en_ud.json | 7 +- .../resources/assets/tfmg/lang/en_us.json | 7 +- .../tfmg/models/item/engine_controller.json | 3 + .../tfmg/models/item/engine_gearbox.json | 3 + .../assets/tfmg/models/item/golden_turbo.json | 6 + .../assets/tfmg/models/item/transmission.json | 6 + .../assets/tfmg/models/item/turbo.json | 6 + .../data/forge/tags/fluids/furnace_gas.json | 6 + .../loot_tables/blocks/engine_controller.json | 21 + .../loot_tables/blocks/engine_gearbox.json | 21 + .../com/drmangotea/tfmg/base/TFMGShapes.java | 22 +- .../tfmg/base/events/TFMGClientEvents.java | 39 + .../electricity/base/ElectricBlockEntity.java | 5 +- .../content/electricity/base/IElectric.java | 30 +- .../debug/DebugCinderBlockItem.java | 27 +- .../EngineControllerBlock.java | 41 + .../EngineControllerBlockEntity.java | 153 + .../EngineControllerClientHandler.java | 259 + .../EngineControllerClientRenderer.java | 4 + .../EngineControllerRenderer.java | 4 + .../packets/EngineControllerBindPacket.java | 59 + .../packets/EngineControllerInputPacket.java | 70 + .../packets/EngineControllerPacketBase.java | 70 + .../EngineControllerStopControllerPacket.java | 29 + .../engine_gearbox/EngineGearboxBlock.java | 53 + .../EngineGearboxBlockEntity.java | 14 + .../engine_gearbox/EngineGearboxInstance.java | 11 + .../engine_gearbox/EngineGearboxRenderer.java | 11 + .../tfmg/registry/TFMGBlockEntities.java | 19 + .../drmangotea/tfmg/registry/TFMGBlocks.java | 19 + .../drmangotea/tfmg/registry/TFMGPackets.java | 7 + src/main/resources/META-INF/mods.toml | 1 + .../models/block/engine_controller/block.json | 346 + .../models/block/engine_controller/item.json | 346 + .../models/block/engine_gearbox/block.json | 191 + .../models/block/engine_gearbox/item.json | 205 + .../tfmg/textures/block/engine_controller.png | Bin 0 -> 697 bytes .../block/engines/engine_back - Copy.png | Bin 0 -> 326 bytes .../block/engines/engine_controller_parts.png | Bin 0 -> 700 bytes .../textures/block/engines/engine_front.png | Bin 451 -> 720 bytes .../textures/block/engines/engine_gearbox.png | Bin 0 -> 675 bytes .../block/engines/engine_gearbox_front.png | Bin 0 -> 514 bytes .../textures/block/engines/engine_side.png | Bin 361 -> 623 bytes .../tfmg/textures/item/golden_turbo.png | Bin 0 -> 279 bytes .../tfmg/textures/item/transmission.png | Bin 0 -> 279 bytes .../assets/tfmg/textures/item/turbo.png | Bin 0 -> 279 bytes 113 files changed, 19395 insertions(+), 17784 deletions(-) create mode 100644 run-data/logs/2025-02-20-2.log.gz rename run-data/logs/{2025-02-20-1.log.gz => 2025-02-20-3.log.gz} (100%) create mode 100644 run-data/logs/2025-02-27-2.log.gz create mode 100644 run-data/logs/2025-02-27-3.log.gz create mode 100644 run-data/logs/2025-02-27-4.log.gz delete mode 100644 run/logs/2025-02-26-1.log.gz create mode 100644 run/logs/2025-02-26-5.log.gz create mode 100644 run/logs/2025-02-26-6.log.gz create mode 100644 run/logs/2025-02-26-7.log.gz create mode 100644 run/logs/2025-02-27-2.log.gz create mode 100644 run/logs/2025-02-27-3.log.gz create mode 100644 run/logs/2025-02-27-4.log.gz create mode 100644 run/logs/2025-02-27-5.log.gz create mode 100644 run/logs/2025-02-27-6.log.gz create mode 100644 run/logs/2025-02-27-7.log.gz create mode 100644 run/logs/2025-02-27-8.log.gz create mode 100644 run/logs/2025-02-27-9.log.gz create mode 100644 run/logs/2025-02-28-2.log.gz create mode 100644 run/logs/2025-02-28-3.log.gz create mode 100644 run/logs/2025-02-28-4.log.gz create mode 100644 run/logs/2025-02-28-5.log.gz create mode 100644 run/logs/2025-02-28-6.log.gz create mode 100644 run/logs/2025-03-01-1.log.gz create mode 100644 src/generated/resources/assets/tfmg/blockstates/engine_controller.json create mode 100644 src/generated/resources/assets/tfmg/blockstates/engine_gearbox.json create mode 100644 src/generated/resources/assets/tfmg/models/item/engine_controller.json create mode 100644 src/generated/resources/assets/tfmg/models/item/engine_gearbox.json create mode 100644 src/generated/resources/assets/tfmg/models/item/golden_turbo.json create mode 100644 src/generated/resources/assets/tfmg/models/item/transmission.json create mode 100644 src/generated/resources/assets/tfmg/models/item/turbo.json create mode 100644 src/generated/resources/data/forge/tags/fluids/furnace_gas.json create mode 100644 src/generated/resources/data/tfmg/loot_tables/blocks/engine_controller.json create mode 100644 src/generated/resources/data/tfmg/loot_tables/blocks/engine_gearbox.json create mode 100644 src/main/java/com/drmangotea/tfmg/base/events/TFMGClientEvents.java create mode 100644 src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerBlock.java create mode 100644 src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerBlockEntity.java create mode 100644 src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerClientHandler.java create mode 100644 src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerClientRenderer.java create mode 100644 src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerRenderer.java create mode 100644 src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerBindPacket.java create mode 100644 src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerInputPacket.java create mode 100644 src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerPacketBase.java create mode 100644 src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerStopControllerPacket.java create mode 100644 src/main/java/com/drmangotea/tfmg/content/engines/engine_gearbox/EngineGearboxBlock.java create mode 100644 src/main/java/com/drmangotea/tfmg/content/engines/engine_gearbox/EngineGearboxBlockEntity.java create mode 100644 src/main/java/com/drmangotea/tfmg/content/engines/engine_gearbox/EngineGearboxInstance.java create mode 100644 src/main/java/com/drmangotea/tfmg/content/engines/engine_gearbox/EngineGearboxRenderer.java create mode 100644 src/main/resources/assets/tfmg/models/block/engine_controller/block.json create mode 100644 src/main/resources/assets/tfmg/models/block/engine_controller/item.json create mode 100644 src/main/resources/assets/tfmg/models/block/engine_gearbox/block.json create mode 100644 src/main/resources/assets/tfmg/models/block/engine_gearbox/item.json create mode 100644 src/main/resources/assets/tfmg/textures/block/engine_controller.png create mode 100644 src/main/resources/assets/tfmg/textures/block/engines/engine_back - Copy.png create mode 100644 src/main/resources/assets/tfmg/textures/block/engines/engine_controller_parts.png create mode 100644 src/main/resources/assets/tfmg/textures/block/engines/engine_gearbox.png create mode 100644 src/main/resources/assets/tfmg/textures/block/engines/engine_gearbox_front.png create mode 100644 src/main/resources/assets/tfmg/textures/item/golden_turbo.png create mode 100644 src/main/resources/assets/tfmg/textures/item/transmission.png create mode 100644 src/main/resources/assets/tfmg/textures/item/turbo.png diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 20f86c40..ab147b2b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,51 +4,10 @@