Revert "Begin fixing this mess"

This reverts commit 1d19f464c5.
2023-10-06 20:25:50 +03:00 · 2023-10-06 20:25:50 +03:00 · d989f493c2
commit d989f493c2
parent 1d19f464c5
137 changed files with 7 additions and 8 deletions
--- a/.gitignore
+++ b/.gitignore
@ -21,4 +21,3 @@ build
 # other
 eclipse
 run
 /.idea/
--- a/Common/build.gradle
+++ b/Common/build.gradle
--- a/Common/src/main/java/su/a71/tardim_ic/Constants.java
+++ b/Common/src/main/java/su/a71/tardim_ic/Constants.java
--- a/Common/src/main/java/su/a71/tardim_ic/command/CommandListBiomes.java
+++ b/Common/src/main/java/su/a71/tardim_ic/command/CommandListBiomes.java
--- a/Common/src/main/java/su/a71/tardim_ic/command/CommandListDimensions.java
+++ b/Common/src/main/java/su/a71/tardim_ic/command/CommandListDimensions.java
--- a/Common/src/main/java/su/a71/tardim_ic/command/CommandModemTransmit.java
+++ b/Common/src/main/java/su/a71/tardim_ic/command/CommandModemTransmit.java
--- a/Common/src/main/java/su/a71/tardim_ic/command/CommandSender.java
+++ b/Common/src/main/java/su/a71/tardim_ic/command/CommandSender.java
--- a/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/entity/FakeTardimPeripheralTileEntity.java
+++ b/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/entity/FakeTardimPeripheralTileEntity.java
--- a/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/entity/ITardimPeripheralTileEntity.java
+++ b/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/entity/ITardimPeripheralTileEntity.java
--- a/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/FuelStoragePeripheral.java
+++ b/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/FuelStoragePeripheral.java
--- a/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/TardimPeripheral.java
+++ b/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/TardimPeripheral.java
--- a/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/TardimScannerPeripheral.java
+++ b/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/TardimScannerPeripheral.java
--- a/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/TimeRotorPeripheral.java
+++ b/Common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/TimeRotorPeripheral.java
--- a/Common/src/main/java/su/a71/tardim_ic/mixin/JammerMixin.java
+++ b/Common/src/main/java/su/a71/tardim_ic/mixin/JammerMixin.java
--- a/Common/src/main/java/su/a71/tardim_ic/platform/Services.java
+++ b/Common/src/main/java/su/a71/tardim_ic/platform/Services.java
--- a/Common/src/main/java/su/a71/tardim_ic/platform/services/IPlatformHelper.java
+++ b/Common/src/main/java/su/a71/tardim_ic/platform/services/IPlatformHelper.java
--- a/Common/src/main/java/su/a71/tardim_ic/utils/FakePlayer.java
+++ b/Common/src/main/java/su/a71/tardim_ic/utils/FakePlayer.java
--- a/Common/src/main/resources/assets/minecraft/textures/models/armor/personal_jammer.png
+++ b/Common/src/main/resources/assets/minecraft/textures/models/armor/personal_jammer.png
--- a/Common/src/main/resources/assets/minecraft/textures/models/armor/personal_jammer_layer_1.png
+++ b/Common/src/main/resources/assets/minecraft/textures/models/armor/personal_jammer_layer_1.png
--- a/Common/src/main/resources/assets/minecraft/textures/models/armor/personal_jammer_layer_2.png
+++ b/Common/src/main/resources/assets/minecraft/textures/models/armor/personal_jammer_layer_2.png
--- a/Common/src/main/resources/assets/tardim_ic/blockstates/digital_tardim_interface.json
+++ b/Common/src/main/resources/assets/tardim_ic/blockstates/digital_tardim_interface.json
--- a/Common/src/main/resources/assets/tardim_ic/blockstates/food_machine.json
+++ b/Common/src/main/resources/assets/tardim_ic/blockstates/food_machine.json
--- a/Common/src/main/resources/assets/tardim_ic/blockstates/redstone_tardim_input.json
+++ b/Common/src/main/resources/assets/tardim_ic/blockstates/redstone_tardim_input.json
--- a/Common/src/main/resources/assets/tardim_ic/blockstates/tardim_dock.json
+++ b/Common/src/main/resources/assets/tardim_ic/blockstates/tardim_dock.json
--- a/Common/src/main/resources/assets/tardim_ic/blockstates/tardim_door_soviet.json
+++ b/Common/src/main/resources/assets/tardim_ic/blockstates/tardim_door_soviet.json
--- a/Common/src/main/resources/assets/tardim_ic/blockstates/tardim_floor_soviet.json
+++ b/Common/src/main/resources/assets/tardim_ic/blockstates/tardim_floor_soviet.json
--- a/Common/src/main/resources/assets/tardim_ic/blockstates/tardim_roof_soviet.json
+++ b/Common/src/main/resources/assets/tardim_ic/blockstates/tardim_roof_soviet.json
--- a/Common/src/main/resources/assets/tardim_ic/icon.png
+++ b/Common/src/main/resources/assets/tardim_ic/icon.png
--- a/Common/src/main/resources/assets/tardim_ic/lang/en_uk.json
+++ b/Common/src/main/resources/assets/tardim_ic/lang/en_uk.json
--- a/Common/src/main/resources/assets/tardim_ic/lang/en_us.json
+++ b/Common/src/main/resources/assets/tardim_ic/lang/en_us.json
--- a/Common/src/main/resources/assets/tardim_ic/lang/rpr.json
+++ b/Common/src/main/resources/assets/tardim_ic/lang/rpr.json
--- a/Common/src/main/resources/assets/tardim_ic/lang/ru_ru.json
+++ b/Common/src/main/resources/assets/tardim_ic/lang/ru_ru.json
--- a/Common/src/main/resources/assets/tardim_ic/models/block/digital_tardim_interface.json
+++ b/Common/src/main/resources/assets/tardim_ic/models/block/digital_tardim_interface.json
--- a/Common/src/main/resources/assets/tardim_ic/models/block/food_machine.json
+++ b/Common/src/main/resources/assets/tardim_ic/models/block/food_machine.json
--- a/Common/src/main/resources/assets/tardim_ic/models/block/redstone_tardim_input.json
+++ b/Common/src/main/resources/assets/tardim_ic/models/block/redstone_tardim_input.json
--- a/Common/src/main/resources/assets/tardim_ic/models/block/redstone_tardim_input_lit.json
+++ b/Common/src/main/resources/assets/tardim_ic/models/block/redstone_tardim_input_lit.json
--- a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_dock.json
+++ b/Common/src/main/resources/assets/tardim_ic/models/block/tardim_dock.json
--- a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_bottom_closed.json
+++ b/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_bottom_closed.json
--- a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_bottom_open.json
+++ b/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_bottom_open.json
--- a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_sides.json
+++ b/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_sides.json
--- a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_sides_bottom.json
+++ b/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_sides_bottom.json
--- a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_sides_top.json
+++ b/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_sides_top.json
--- a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_top_front_closed.json
+++ b/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_top_front_closed.json
--- a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_top_front_open.json
+++ b/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_top_front_open.json
--- a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_floor.json
+++ b/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_floor.json
--- a/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_roof.json
+++ b/Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_roof.json
--- a/Common/src/main/resources/assets/tardim_ic/models/item/digital_tardim_interface.json
+++ b/Common/src/main/resources/assets/tardim_ic/models/item/digital_tardim_interface.json
--- a/Common/src/main/resources/assets/tardim_ic/models/item/food_machine.json
+++ b/Common/src/main/resources/assets/tardim_ic/models/item/food_machine.json
--- a/Common/src/main/resources/assets/tardim_ic/models/item/personal_jammer.json
+++ b/Common/src/main/resources/assets/tardim_ic/models/item/personal_jammer.json
--- a/Common/src/main/resources/assets/tardim_ic/models/item/redstone_tardim_input.json
+++ b/Common/src/main/resources/assets/tardim_ic/models/item/redstone_tardim_input.json
--- a/Common/src/main/resources/assets/tardim_ic/models/item/tardim_dock.json
+++ b/Common/src/main/resources/assets/tardim_ic/models/item/tardim_dock.json
--- a/Common/src/main/resources/assets/tardim_ic/sounds.json
+++ b/Common/src/main/resources/assets/tardim_ic/sounds.json
--- a/Common/src/main/resources/assets/tardim_ic/sounds/cloister.ogg
+++ b/Common/src/main/resources/assets/tardim_ic/sounds/cloister.ogg
--- a/Common/src/main/resources/assets/tardim_ic/textures/block/digital_tardim_interface.png
+++ b/Common/src/main/resources/assets/tardim_ic/textures/block/digital_tardim_interface.png
--- a/Common/src/main/resources/assets/tardim_ic/textures/block/food_machine.png
+++ b/Common/src/main/resources/assets/tardim_ic/textures/block/food_machine.png
--- a/Common/src/main/resources/assets/tardim_ic/textures/block/redstone_input.png
+++ b/Common/src/main/resources/assets/tardim_ic/textures/block/redstone_input.png
--- a/Common/src/main/resources/assets/tardim_ic/textures/block/redstone_input.png.mcmeta
+++ b/Common/src/main/resources/assets/tardim_ic/textures/block/redstone_input.png.mcmeta
--- a/Common/src/main/resources/assets/tardim_ic/textures/block/redstone_input_lit.png
+++ b/Common/src/main/resources/assets/tardim_ic/textures/block/redstone_input_lit.png
--- a/Common/src/main/resources/assets/tardim_ic/textures/block/redstone_input_lit.png.mcmeta
+++ b/Common/src/main/resources/assets/tardim_ic/textures/block/redstone_input_lit.png.mcmeta
--- a/Common/src/main/resources/assets/tardim_ic/textures/block/tardim_dock.png
+++ b/Common/src/main/resources/assets/tardim_ic/textures/block/tardim_dock.png
--- a/Common/src/main/resources/assets/tardim_ic/textures/block/tardim_soviet_chronobox.png
+++ b/Common/src/main/resources/assets/tardim_ic/textures/block/tardim_soviet_chronobox.png
--- a/Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/cartridge_pins.png
+++ b/Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/cartridge_pins.png
--- a/Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/cartridge_shell.png
+++ b/Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/cartridge_shell.png
--- a/Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/temp/cartridge_blue.png
+++ b/Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/temp/cartridge_blue.png
--- a/Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/temp/cartridge_green.png
+++ b/Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/temp/cartridge_green.png
--- a/Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/temp/cartridge_red.png
+++ b/Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/temp/cartridge_red.png
--- a/Common/src/main/resources/data/computercraft/lua/premade/NavDash.lua
+++ b/Common/src/main/resources/data/computercraft/lua/premade/NavDash.lua
--- a/Common/src/main/resources/data/computercraft/lua/premade/basicTest.lua
+++ b/Common/src/main/resources/data/computercraft/lua/premade/basicTest.lua
--- a/Common/src/main/resources/data/tardim_ic/loot_tables/blocks/digital_tardim_interface.json
+++ b/Common/src/main/resources/data/tardim_ic/loot_tables/blocks/digital_tardim_interface.json
--- a/Common/src/main/resources/data/tardim_ic/loot_tables/blocks/redstone_tardim_input.json
+++ b/Common/src/main/resources/data/tardim_ic/loot_tables/blocks/redstone_tardim_input.json
--- a/Common/src/main/resources/data/tardim_ic/recipes/digital_tardim_interface.json
+++ b/Common/src/main/resources/data/tardim_ic/recipes/digital_tardim_interface.json
--- a/Common/src/main/resources/data/tardim_ic/recipes/redstone_tardim_input.json
+++ b/Common/src/main/resources/data/tardim_ic/recipes/redstone_tardim_input.json
--- a/Common/src/main/resources/pack.mcmeta
+++ b/Common/src/main/resources/pack.mcmeta
--- a/Common/src/main/resources/tardim_ic.mixins.json
+++ b/Common/src/main/resources/tardim_ic.mixins.json
--- a/Common/tardim-1.2.2-dev.jar
+++ b/Common/tardim-1.2.2-dev.jar
--- a/Fabric/build.gradle
+++ b/Fabric/build.gradle
--- a/Fabric/src/main/java/su/a71/tardim_ic/TardimInControl.java
+++ b/Fabric/src/main/java/su/a71/tardim_ic/TardimInControl.java
--- a/Fabric/src/main/java/su/a71/tardim_ic/blocks/food_machine/FoodMachineBlock.java
+++ b/Fabric/src/main/java/su/a71/tardim_ic/blocks/food_machine/FoodMachineBlock.java
--- a/Fabric/src/main/java/su/a71/tardim_ic/blocks/food_machine/FoodMachineBlockEntity.java
+++ b/Fabric/src/main/java/su/a71/tardim_ic/blocks/food_machine/FoodMachineBlockEntity.java
--- a/Fabric/src/main/java/su/a71/tardim_ic/blocks/redstone_input/RedstoneInputBlock.java
+++ b/Fabric/src/main/java/su/a71/tardim_ic/blocks/redstone_input/RedstoneInputBlock.java
--- a/Fabric/src/main/java/su/a71/tardim_ic/blocks/redstone_input/RedstoneInputBlockEntity.java
+++ b/Fabric/src/main/java/su/a71/tardim_ic/blocks/redstone_input/RedstoneInputBlockEntity.java
--- a/Fabric/src/main/java/su/a71/tardim_ic/blocks/roundels/roundels.txt
+++ b/Fabric/src/main/java/su/a71/tardim_ic/blocks/roundels/roundels.txt
--- a/Fabric/src/main/java/su/a71/tardim_ic/command/CommandCloisterBell.java
+++ b/Fabric/src/main/java/su/a71/tardim_ic/command/CommandCloisterBell.java
--- a/Fabric/src/main/java/su/a71/tardim_ic/command/CommandInit.java
+++ b/Fabric/src/main/java/su/a71/tardim_ic/command/CommandInit.java
--- a/Fabric/src/main/java/su/a71/tardim_ic/computercraft_compat/digital_interface/DigitalInterfaceBlock.java
+++ b/Fabric/src/main/java/su/a71/tardim_ic/computercraft_compat/digital_interface/DigitalInterfaceBlock.java
--- a/Fabric/src/main/java/su/a71/tardim_ic/computercraft_compat/digital_interface/DigitalInterfaceTileEntity.java
+++ b/Fabric/src/main/java/su/a71/tardim_ic/computercraft_compat/digital_interface/DigitalInterfaceTileEntity.java
--- a/Fabric/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/DigitalInterfacePeripheral.java
+++ b/Fabric/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/DigitalInterfacePeripheral.java
--- a/Fabric/src/main/java/su/a71/tardim_ic/display_source/cartridge_loader/temp_ideas.txt
+++ b/Fabric/src/main/java/su/a71/tardim_ic/display_source/cartridge_loader/temp_ideas.txt
--- a/Fabric/src/main/java/su/a71/tardim_ic/display_source/dock/temp_ideas.txt
+++ b/Fabric/src/main/java/su/a71/tardim_ic/display_source/dock/temp_ideas.txt
--- a/Fabric/src/main/java/su/a71/tardim_ic/display_source/fuel_storage/FuelLevelDisplaySource.java
+++ b/Fabric/src/main/java/su/a71/tardim_ic/display_source/fuel_storage/FuelLevelDisplaySource.java
--- a/Fabric/src/main/java/su/a71/tardim_ic/display_source/fuel_storage/RequiredFuelDisplaySource.java
+++ b/Fabric/src/main/java/su/a71/tardim_ic/display_source/fuel_storage/RequiredFuelDisplaySource.java
--- a/Fabric/src/main/java/su/a71/tardim_ic/display_source/scanner/temp_ideas.txt
+++ b/Fabric/src/main/java/su/a71/tardim_ic/display_source/scanner/temp_ideas.txt
--- a/Fabric/src/main/java/su/a71/tardim_ic/display_source/time_rotor/temp_ideas.txt
+++ b/Fabric/src/main/java/su/a71/tardim_ic/display_source/time_rotor/temp_ideas.txt
--- a/Fabric/src/main/java/su/a71/tardim_ic/jammer/PersonalJammerMaterial.java
+++ b/Fabric/src/main/java/su/a71/tardim_ic/jammer/PersonalJammerMaterial.java
--- a/Fabric/src/main/java/su/a71/tardim_ic/mixin/BetterFuelMapMixin.java
+++ b/Fabric/src/main/java/su/a71/tardim_ic/mixin/BetterFuelMapMixin.java
--- a/Fabric/src/main/java/su/a71/tardim_ic/mixin/BetterFuelStorageMixin.java
+++ b/Fabric/src/main/java/su/a71/tardim_ic/mixin/BetterFuelStorageMixin.java
--- a/Fabric/src/main/java/su/a71/tardim_ic/mixin/CommandsMixin.java
+++ b/Fabric/src/main/java/su/a71/tardim_ic/mixin/CommandsMixin.java
--- a/Fabric/src/main/java/su/a71/tardim_ic/platform/FabricPlatformHelper.java
+++ b/Fabric/src/main/java/su/a71/tardim_ic/platform/FabricPlatformHelper.java
--- a/Fabric/src/main/java/su/a71/tardim_ic/soviet_chronobox/SovietChronoboxTileEntity.java
+++ b/Fabric/src/main/java/su/a71/tardim_ic/soviet_chronobox/SovietChronoboxTileEntity.java
--- a/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/ComputerCraftCompat.java
+++ b/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/ComputerCraftCompat.java
--- a/Show more
+++ b/Show more