From dd80dd5859f4c3191df8571f0ec4072bb96b343f Mon Sep 17 00:00:00 2001 From: p2vman Date: Fri, 20 Jun 2025 22:53:32 +0300 Subject: [PATCH] ... --- .gitignore | 0 .idea/.gitignore | 0 .idea/.name | 0 .idea/codeStyles/Project.xml | 0 .idea/codeStyles/codeStyleConfig.xml | 0 .idea/compiler.xml | 0 .idea/discord.xml | 7 + .idea/discordrp.xml | 6 + .idea/gradle.xml | 1 + .idea/jarRepositories.xml | 20 ++ .idea/misc.xml | 0 .idea/modules.xml | 0 .idea/modules/io.p2vman.vmodextras.test.iml | 22 ++ .idea/modules/vmodextras.main.iml | 0 .idea/modules/vmodextras.test.iml | 0 .idea/vcs.xml | 0 build.gradle | 45 +++- gradle.properties | 4 +- license | 0 settings.gradle | 0 .../p2vman}/vmodextras/Config.java | 42 +++- .../io/p2vman/vmodextras/GameRulesBlat.java | 13 ++ .../p2vman}/vmodextras/IValidator.java | 2 +- .../p2vman}/vmodextras/Validator.java | 4 +- .../p2vman}/vmodextras/VmodExtras.java | 33 ++- .../vmodextras/cc/ComputerCraftCompact.java | 58 ++++++ .../cc/block/BlockNetworkModem.java | 127 ++++++++++++ .../cc/block/TrackWorkController.java | 29 +++ .../cc/block/WireNetworkHubBlock.java | 44 ++++ .../cc/block/entity/NetworkModemEntity.java | 140 +++++++++++++ .../entity/TrackWorkControllerEntity.java | 10 +- .../vmodextras/cc/net/IDomainNameHandler.java | 5 + .../io/p2vman/vmodextras/cc/net/INetwork.java | 11 + .../vmodextras/cc/net/IPacketReceiver.java | 12 ++ .../vmodextras/cc/net/IPacketSender.java | 15 ++ .../p2vman/vmodextras/cc/net/ModemState.java | 80 ++++++++ .../io/p2vman/vmodextras/cc/net/Network.java | 65 ++++++ .../vmodextras/cc/net/NetworkPacket.java | 8 + .../cc}/peripheral/PeripheralBase.java | 4 +- .../TrackWorkControllerPeripheral.java | 122 +++++++++++ .../net/NetworkModemPeripheral.java | 174 ++++++++++++++++ .../p2vman}/vmodextras/compact/Compact.java | 15 +- .../java/io/p2vman/vmodextras/main/Main.java | 9 + .../p2vman}/vmodextras/mixin/MixinPlugin.java | 2 +- .../vmodextras/mixin/package-info.java | 2 +- .../create/LecternControllerBlockMixin.java | 63 ++++++ .../mixins/create/LinkHandlerMixin.java | 24 +++ .../mixins/create/RedstoneLinkBlockMixin.java | 28 +++ .../TweakedLecternControllerBlockMixin.java | 68 ++++++ .../PhysicsTrackControllerAccessor.java | 2 +- .../PhysicsTrackControllerMixin.java | 6 +- .../SimpleWheelControllerAccessor.java | 2 +- .../trackwork/SimpleWheelControllerMixin.java | 6 +- .../mixins/trackwork/TrackToolkitMixin.java | 2 +- .../vmod}/BlockPaletteHashMapV1Mixin.java | 6 +- .../mixins/vmod/ScaleModeMixin.java | 25 +++ .../TeleportShipWithConnectedKtMixin.java | 9 + .../vmodextras/serialization/Codec.java | 41 ++++ .../vmodextras/serialization/Context.java | 7 + .../vmodextras/serialization/Decode.java | 8 + .../vmodextras/serialization/Encode.java | 8 + .../trackwork/IBlockEntityClear.java | 2 +- .../vmodextras/trackwork/IController.java | 36 ++++ .../trackwork/IPhysicsTrackController.java | 7 + .../trackwork/ISimpleWheelController.java | 6 + .../trackwork/TrackWorkCompact.java | 13 +- .../trackwork/block/CompactBackupBlock.java | 19 ++ .../trackwork/block/TrackBackupBlock.java | 19 ++ .../entity/CompactBackupBlockEntity.java | 85 ++++++++ .../block/entity/TrackBackupBlockEntity.java | 100 +++++++++ .../vmodextras/util/CollectorFactory.java | 82 ++++++++ .../p2vman/vmodextras/util/IBlockEntity.java | 15 ++ .../p2vman/vmodextras/util/ModRegistry.java | 193 ++++++++++++++++++ .../vmodextras/util/ReflectionUtil.java | 14 ++ .../vmodextras/util/ResourceLocationUtil.java | 2 +- .../java/io/p2vman/vmodextras/util/Utils.java | 25 +++ .../io/p2vman/vmodextras/util/VsUtils.java | 20 ++ .../vmodextras/block/EntityBackupBlock.java | 23 --- .../block/EntityBackupBlockEntity.java | 29 --- .../computercraft/ComputerCraftCompact.java | 34 --- .../block/TrackWorkController.java | 24 --- .../TrackWorkControllerPeripheral.java | 84 -------- .../compact/trackwork/IController.java | 39 ---- .../trackwork/IPhysicsTrackController.java | 7 - .../trackwork/ISimpleWheelController.java | 6 - .../trackwork/block/CompactBackupBlock.java | 24 --- .../trackwork/block/TrackBackupBlock.java | 24 --- .../entity/CompactBackupBlockEntity.java | 97 --------- .../block/entity/TrackBackupBlockEntity.java | 115 ----------- .../compact/trackwork/item/ToolKit.java | 34 --- .../eptaproject/vmodextras/mixins/A.java | 4 - .../vmodextras/util/ModRegistry.java | 77 ------- .../eptaproject/vmodextras/util/Utils.java | 17 -- .../resources/META-INF/accesstransformer.cfg | 5 +- src/main/resources/META-INF/mods.toml | 2 +- .../blockstates/compact_backup.json | 5 + .../vmodextras/blockstates/track_backup.json | 0 .../blockstates/track_work_controller.json | 0 .../assets/vmodextras/lang/en_us.json | 0 .../models/block/compact_backup.json | 6 + .../vmodextras/models/block/track_backup.json | 0 .../models/block/track_work_controller.json | 0 .../models/item/compact_backup.json | 6 + .../vmodextras/models/item/track_backup.json | 0 .../models/item/track_work_controller.json | 0 .../textures/block/compact_backup.png | Bin 0 -> 170 bytes .../textures/block/track_work_controller.png | Bin .../lua/rom/modules/main/vmodextras.lua | 15 ++ .../data/vmodextras/vs_mass/all.json | 0 src/main/resources/pack.mcmeta | 0 src/main/resources/vmodextras.mixins.json | 15 +- 111 files changed, 2057 insertions(+), 709 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 .idea/.gitignore mode change 100644 => 100755 .idea/.name mode change 100644 => 100755 .idea/codeStyles/Project.xml mode change 100644 => 100755 .idea/codeStyles/codeStyleConfig.xml mode change 100644 => 100755 .idea/compiler.xml create mode 100755 .idea/discord.xml create mode 100755 .idea/discordrp.xml mode change 100644 => 100755 .idea/gradle.xml mode change 100644 => 100755 .idea/jarRepositories.xml mode change 100644 => 100755 .idea/misc.xml mode change 100644 => 100755 .idea/modules.xml create mode 100755 .idea/modules/io.p2vman.vmodextras.test.iml mode change 100644 => 100755 .idea/modules/vmodextras.main.iml mode change 100644 => 100755 .idea/modules/vmodextras.test.iml mode change 100644 => 100755 .idea/vcs.xml mode change 100644 => 100755 build.gradle mode change 100644 => 100755 gradle.properties mode change 100644 => 100755 license mode change 100644 => 100755 settings.gradle rename src/main/java/{space/eptaproject => io/p2vman}/vmodextras/Config.java (80%) mode change 100644 => 100755 create mode 100755 src/main/java/io/p2vman/vmodextras/GameRulesBlat.java rename src/main/java/{space/eptaproject => io/p2vman}/vmodextras/IValidator.java (90%) mode change 100644 => 100755 rename src/main/java/{space/eptaproject => io/p2vman}/vmodextras/Validator.java (91%) mode change 100644 => 100755 rename src/main/java/{space/eptaproject => io/p2vman}/vmodextras/VmodExtras.java (77%) mode change 100644 => 100755 create mode 100755 src/main/java/io/p2vman/vmodextras/cc/ComputerCraftCompact.java create mode 100755 src/main/java/io/p2vman/vmodextras/cc/block/BlockNetworkModem.java create mode 100755 src/main/java/io/p2vman/vmodextras/cc/block/TrackWorkController.java create mode 100755 src/main/java/io/p2vman/vmodextras/cc/block/WireNetworkHubBlock.java create mode 100755 src/main/java/io/p2vman/vmodextras/cc/block/entity/NetworkModemEntity.java rename src/main/java/{space/eptaproject/vmodextras/compact/computercraft => io/p2vman/vmodextras/cc}/block/entity/TrackWorkControllerEntity.java (82%) mode change 100644 => 100755 create mode 100755 src/main/java/io/p2vman/vmodextras/cc/net/IDomainNameHandler.java create mode 100755 src/main/java/io/p2vman/vmodextras/cc/net/INetwork.java create mode 100755 src/main/java/io/p2vman/vmodextras/cc/net/IPacketReceiver.java create mode 100755 src/main/java/io/p2vman/vmodextras/cc/net/IPacketSender.java create mode 100755 src/main/java/io/p2vman/vmodextras/cc/net/ModemState.java create mode 100755 src/main/java/io/p2vman/vmodextras/cc/net/Network.java create mode 100755 src/main/java/io/p2vman/vmodextras/cc/net/NetworkPacket.java rename src/main/java/{space/eptaproject/vmodextras/compact/computercraft => io/p2vman/vmodextras/cc}/peripheral/PeripheralBase.java (92%) mode change 100644 => 100755 create mode 100755 src/main/java/io/p2vman/vmodextras/cc/peripheral/TrackWorkControllerPeripheral.java create mode 100755 src/main/java/io/p2vman/vmodextras/cc/peripheral/net/NetworkModemPeripheral.java rename src/main/java/{space/eptaproject => io/p2vman}/vmodextras/compact/Compact.java (66%) mode change 100644 => 100755 create mode 100644 src/main/java/io/p2vman/vmodextras/main/Main.java rename src/main/java/{space/eptaproject => io/p2vman}/vmodextras/mixin/MixinPlugin.java (95%) mode change 100644 => 100755 rename src/main/java/{space/eptaproject => io/p2vman}/vmodextras/mixin/package-info.java (61%) mode change 100644 => 100755 create mode 100755 src/main/java/io/p2vman/vmodextras/mixins/create/LecternControllerBlockMixin.java create mode 100755 src/main/java/io/p2vman/vmodextras/mixins/create/LinkHandlerMixin.java create mode 100755 src/main/java/io/p2vman/vmodextras/mixins/create/RedstoneLinkBlockMixin.java create mode 100755 src/main/java/io/p2vman/vmodextras/mixins/create_tweaked_controllers/TweakedLecternControllerBlockMixin.java rename src/main/java/{space/eptaproject => io/p2vman}/vmodextras/mixins/trackwork/PhysicsTrackControllerAccessor.java (92%) mode change 100644 => 100755 rename src/main/java/{space/eptaproject => io/p2vman}/vmodextras/mixins/trackwork/PhysicsTrackControllerMixin.java (82%) mode change 100644 => 100755 rename src/main/java/{space/eptaproject => io/p2vman}/vmodextras/mixins/trackwork/SimpleWheelControllerAccessor.java (92%) mode change 100644 => 100755 rename src/main/java/{space/eptaproject => io/p2vman}/vmodextras/mixins/trackwork/SimpleWheelControllerMixin.java (82%) mode change 100644 => 100755 rename src/main/java/{space/eptaproject => io/p2vman}/vmodextras/mixins/trackwork/TrackToolkitMixin.java (74%) mode change 100644 => 100755 rename src/main/java/{space/eptaproject/vmodextras/mixins/trackwork => io/p2vman/vmodextras/mixins/vmod}/BlockPaletteHashMapV1Mixin.java (92%) mode change 100644 => 100755 create mode 100755 src/main/java/io/p2vman/vmodextras/mixins/vmod/ScaleModeMixin.java create mode 100755 src/main/java/io/p2vman/vmodextras/mixins/vmod/TeleportShipWithConnectedKtMixin.java create mode 100755 src/main/java/io/p2vman/vmodextras/serialization/Codec.java create mode 100755 src/main/java/io/p2vman/vmodextras/serialization/Context.java create mode 100755 src/main/java/io/p2vman/vmodextras/serialization/Decode.java create mode 100755 src/main/java/io/p2vman/vmodextras/serialization/Encode.java rename src/main/java/{space/eptaproject/vmodextras/compact => io/p2vman/vmodextras}/trackwork/IBlockEntityClear.java (68%) mode change 100644 => 100755 create mode 100755 src/main/java/io/p2vman/vmodextras/trackwork/IController.java create mode 100755 src/main/java/io/p2vman/vmodextras/trackwork/IPhysicsTrackController.java create mode 100755 src/main/java/io/p2vman/vmodextras/trackwork/ISimpleWheelController.java rename src/main/java/{space/eptaproject/vmodextras/compact => io/p2vman/vmodextras}/trackwork/TrackWorkCompact.java (83%) mode change 100644 => 100755 create mode 100755 src/main/java/io/p2vman/vmodextras/trackwork/block/CompactBackupBlock.java create mode 100755 src/main/java/io/p2vman/vmodextras/trackwork/block/TrackBackupBlock.java create mode 100755 src/main/java/io/p2vman/vmodextras/trackwork/block/entity/CompactBackupBlockEntity.java create mode 100755 src/main/java/io/p2vman/vmodextras/trackwork/block/entity/TrackBackupBlockEntity.java create mode 100755 src/main/java/io/p2vman/vmodextras/util/CollectorFactory.java create mode 100755 src/main/java/io/p2vman/vmodextras/util/IBlockEntity.java create mode 100755 src/main/java/io/p2vman/vmodextras/util/ModRegistry.java create mode 100755 src/main/java/io/p2vman/vmodextras/util/ReflectionUtil.java rename src/main/java/{space/eptaproject => io/p2vman}/vmodextras/util/ResourceLocationUtil.java (84%) mode change 100644 => 100755 create mode 100755 src/main/java/io/p2vman/vmodextras/util/Utils.java create mode 100755 src/main/java/io/p2vman/vmodextras/util/VsUtils.java delete mode 100644 src/main/java/space/eptaproject/vmodextras/block/EntityBackupBlock.java delete mode 100644 src/main/java/space/eptaproject/vmodextras/block/EntityBackupBlockEntity.java delete mode 100644 src/main/java/space/eptaproject/vmodextras/compact/computercraft/ComputerCraftCompact.java delete mode 100644 src/main/java/space/eptaproject/vmodextras/compact/computercraft/block/TrackWorkController.java delete mode 100644 src/main/java/space/eptaproject/vmodextras/compact/computercraft/peripheral/TrackWorkControllerPeripheral.java delete mode 100644 src/main/java/space/eptaproject/vmodextras/compact/trackwork/IController.java delete mode 100644 src/main/java/space/eptaproject/vmodextras/compact/trackwork/IPhysicsTrackController.java delete mode 100644 src/main/java/space/eptaproject/vmodextras/compact/trackwork/ISimpleWheelController.java delete mode 100644 src/main/java/space/eptaproject/vmodextras/compact/trackwork/block/CompactBackupBlock.java delete mode 100644 src/main/java/space/eptaproject/vmodextras/compact/trackwork/block/TrackBackupBlock.java delete mode 100644 src/main/java/space/eptaproject/vmodextras/compact/trackwork/block/entity/CompactBackupBlockEntity.java delete mode 100644 src/main/java/space/eptaproject/vmodextras/compact/trackwork/block/entity/TrackBackupBlockEntity.java delete mode 100644 src/main/java/space/eptaproject/vmodextras/compact/trackwork/item/ToolKit.java delete mode 100644 src/main/java/space/eptaproject/vmodextras/mixins/A.java delete mode 100644 src/main/java/space/eptaproject/vmodextras/util/ModRegistry.java delete mode 100644 src/main/java/space/eptaproject/vmodextras/util/Utils.java mode change 100644 => 100755 src/main/resources/META-INF/accesstransformer.cfg mode change 100644 => 100755 src/main/resources/META-INF/mods.toml create mode 100644 src/main/resources/assets/vmodextras/blockstates/compact_backup.json mode change 100644 => 100755 src/main/resources/assets/vmodextras/blockstates/track_backup.json mode change 100644 => 100755 src/main/resources/assets/vmodextras/blockstates/track_work_controller.json mode change 100644 => 100755 src/main/resources/assets/vmodextras/lang/en_us.json create mode 100644 src/main/resources/assets/vmodextras/models/block/compact_backup.json mode change 100644 => 100755 src/main/resources/assets/vmodextras/models/block/track_backup.json mode change 100644 => 100755 src/main/resources/assets/vmodextras/models/block/track_work_controller.json create mode 100644 src/main/resources/assets/vmodextras/models/item/compact_backup.json mode change 100644 => 100755 src/main/resources/assets/vmodextras/models/item/track_backup.json mode change 100644 => 100755 src/main/resources/assets/vmodextras/models/item/track_work_controller.json create mode 100644 src/main/resources/assets/vmodextras/textures/block/compact_backup.png mode change 100644 => 100755 src/main/resources/assets/vmodextras/textures/block/track_work_controller.png create mode 100755 src/main/resources/data/computercraft/lua/rom/modules/main/vmodextras.lua mode change 100644 => 100755 src/main/resources/data/vmodextras/vs_mass/all.json mode change 100644 => 100755 src/main/resources/pack.mcmeta mode change 100644 => 100755 src/main/resources/vmodextras.mixins.json diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.idea/.gitignore b/.idea/.gitignore old mode 100644 new mode 100755 diff --git a/.idea/.name b/.idea/.name old mode 100644 new mode 100755 diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml old mode 100644 new mode 100755 diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml old mode 100644 new mode 100755 diff --git a/.idea/compiler.xml b/.idea/compiler.xml old mode 100644 new mode 100755 diff --git a/.idea/discord.xml b/.idea/discord.xml new file mode 100755 index 0000000..d8e9561 --- /dev/null +++ b/.idea/discord.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/.idea/discordrp.xml b/.idea/discordrp.xml new file mode 100755 index 0000000..43eeb43 --- /dev/null +++ b/.idea/discordrp.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml old mode 100644 new mode 100755 index 1fd1b27..4bd1d19 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -5,6 +5,7 @@