diff --git a/.gitignore b/.gitignore index 778a722..e498e7d 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ build # other eclipse run +/.idea/ diff --git a/build.gradle b/build.gradle index 53c7288..c7f1eef 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'fabric-loom' version '1.2-SNAPSHOT' apply(false) - id 'net.minecraftforge.gradle' version '[6.0,6.2)' apply(false) + id 'fabric-loom' version '1.3-SNAPSHOT' apply(false) + id 'net.neoforged.gradle' version '[6.0.18,6.2)' apply(false) id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT' apply(false) id("org.spongepowered.mixin") version "0.7-SNAPSHOT" apply(false) } diff --git a/Common/build.gradle b/common/build.gradle similarity index 100% rename from Common/build.gradle rename to common/build.gradle diff --git a/Common/src/main/java/su/a71/tardim_ic/Constants.java b/common/src/main/java/su/a71/tardim_ic/Constants.java similarity index 100% rename from Common/src/main/java/su/a71/tardim_ic/Constants.java rename to common/src/main/java/su/a71/tardim_ic/Constants.java diff --git a/Common/src/main/java/su/a71/tardim_ic/command/CommandListBiomes.java b/common/src/main/java/su/a71/tardim_ic/command/CommandListBiomes.java similarity index 100% rename from Common/src/main/java/su/a71/tardim_ic/command/CommandListBiomes.java rename to common/src/main/java/su/a71/tardim_ic/command/CommandListBiomes.java diff --git a/Common/src/main/java/su/a71/tardim_ic/command/CommandListDimensions.java b/common/src/main/java/su/a71/tardim_ic/command/CommandListDimensions.java similarity index 100% rename from Common/src/main/java/su/a71/tardim_ic/command/CommandListDimensions.java rename to common/src/main/java/su/a71/tardim_ic/command/CommandListDimensions.java diff --git a/Common/src/main/java/su/a71/tardim_ic/command/CommandModemTransmit.java b/common/src/main/java/su/a71/tardim_ic/command/CommandModemTransmit.java similarity index 100% rename from Common/src/main/java/su/a71/tardim_ic/command/CommandModemTransmit.java rename to common/src/main/java/su/a71/tardim_ic/command/CommandModemTransmit.java diff --git a/Common/src/main/java/su/a71/tardim_ic/command/CommandSender.java b/common/src/main/java/su/a71/tardim_ic/command/CommandSender.java similarity index 100% rename from Common/src/main/java/su/a71/tardim_ic/command/CommandSender.java rename to common/src/main/java/su/a71/tardim_ic/command/CommandSender.java diff --git 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 similarity index 100% rename from Common/src/main/java/su/a71/tardim_ic/computercraft_compat/entity/FakeTardimPeripheralTileEntity.java rename to common/src/main/java/su/a71/tardim_ic/computercraft_compat/entity/FakeTardimPeripheralTileEntity.java diff --git 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 similarity index 100% rename from Common/src/main/java/su/a71/tardim_ic/computercraft_compat/entity/ITardimPeripheralTileEntity.java rename to common/src/main/java/su/a71/tardim_ic/computercraft_compat/entity/ITardimPeripheralTileEntity.java diff --git 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 similarity index 100% rename from Common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/FuelStoragePeripheral.java rename to common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/FuelStoragePeripheral.java diff --git 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 similarity index 100% rename from Common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/TardimPeripheral.java rename to common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/TardimPeripheral.java diff --git 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 similarity index 100% rename from Common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/TardimScannerPeripheral.java rename to common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/TardimScannerPeripheral.java diff --git 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 similarity index 100% rename from Common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/TimeRotorPeripheral.java rename to common/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/TimeRotorPeripheral.java diff --git a/Common/src/main/java/su/a71/tardim_ic/mixin/JammerMixin.java b/common/src/main/java/su/a71/tardim_ic/mixin/JammerMixin.java similarity index 100% rename from Common/src/main/java/su/a71/tardim_ic/mixin/JammerMixin.java rename to common/src/main/java/su/a71/tardim_ic/mixin/JammerMixin.java diff --git a/Common/src/main/java/su/a71/tardim_ic/platform/Services.java b/common/src/main/java/su/a71/tardim_ic/platform/Services.java similarity index 100% rename from Common/src/main/java/su/a71/tardim_ic/platform/Services.java rename to common/src/main/java/su/a71/tardim_ic/platform/Services.java diff --git 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 similarity index 100% rename from Common/src/main/java/su/a71/tardim_ic/platform/services/IPlatformHelper.java rename to common/src/main/java/su/a71/tardim_ic/platform/services/IPlatformHelper.java diff --git a/Common/src/main/java/su/a71/tardim_ic/utils/FakePlayer.java b/common/src/main/java/su/a71/tardim_ic/utils/FakePlayer.java similarity index 100% rename from Common/src/main/java/su/a71/tardim_ic/utils/FakePlayer.java rename to common/src/main/java/su/a71/tardim_ic/utils/FakePlayer.java diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/minecraft/textures/models/armor/personal_jammer.png rename to common/src/main/resources/assets/minecraft/textures/models/armor/personal_jammer.png diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/minecraft/textures/models/armor/personal_jammer_layer_1.png rename to common/src/main/resources/assets/minecraft/textures/models/armor/personal_jammer_layer_1.png diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/minecraft/textures/models/armor/personal_jammer_layer_2.png rename to common/src/main/resources/assets/minecraft/textures/models/armor/personal_jammer_layer_2.png diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/blockstates/digital_tardim_interface.json rename to common/src/main/resources/assets/tardim_ic/blockstates/digital_tardim_interface.json diff --git a/Common/src/main/resources/assets/tardim_ic/blockstates/food_machine.json b/common/src/main/resources/assets/tardim_ic/blockstates/food_machine.json similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/blockstates/food_machine.json rename to common/src/main/resources/assets/tardim_ic/blockstates/food_machine.json diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/blockstates/redstone_tardim_input.json rename to common/src/main/resources/assets/tardim_ic/blockstates/redstone_tardim_input.json diff --git a/Common/src/main/resources/assets/tardim_ic/blockstates/tardim_dock.json b/common/src/main/resources/assets/tardim_ic/blockstates/tardim_dock.json similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/blockstates/tardim_dock.json rename to common/src/main/resources/assets/tardim_ic/blockstates/tardim_dock.json diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/blockstates/tardim_door_soviet.json rename to common/src/main/resources/assets/tardim_ic/blockstates/tardim_door_soviet.json diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/blockstates/tardim_floor_soviet.json rename to common/src/main/resources/assets/tardim_ic/blockstates/tardim_floor_soviet.json diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/blockstates/tardim_roof_soviet.json rename to common/src/main/resources/assets/tardim_ic/blockstates/tardim_roof_soviet.json diff --git a/Common/src/main/resources/assets/tardim_ic/icon.png b/common/src/main/resources/assets/tardim_ic/icon.png similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/icon.png rename to common/src/main/resources/assets/tardim_ic/icon.png diff --git a/Common/src/main/resources/assets/tardim_ic/lang/en_uk.json b/common/src/main/resources/assets/tardim_ic/lang/en_uk.json similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/lang/en_uk.json rename to common/src/main/resources/assets/tardim_ic/lang/en_uk.json diff --git a/Common/src/main/resources/assets/tardim_ic/lang/en_us.json b/common/src/main/resources/assets/tardim_ic/lang/en_us.json similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/lang/en_us.json rename to common/src/main/resources/assets/tardim_ic/lang/en_us.json diff --git a/Common/src/main/resources/assets/tardim_ic/lang/rpr.json b/common/src/main/resources/assets/tardim_ic/lang/rpr.json similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/lang/rpr.json rename to common/src/main/resources/assets/tardim_ic/lang/rpr.json diff --git a/Common/src/main/resources/assets/tardim_ic/lang/ru_ru.json b/common/src/main/resources/assets/tardim_ic/lang/ru_ru.json similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/lang/ru_ru.json rename to common/src/main/resources/assets/tardim_ic/lang/ru_ru.json diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/models/block/digital_tardim_interface.json rename to common/src/main/resources/assets/tardim_ic/models/block/digital_tardim_interface.json diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/models/block/food_machine.json rename to common/src/main/resources/assets/tardim_ic/models/block/food_machine.json diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/models/block/redstone_tardim_input.json rename to common/src/main/resources/assets/tardim_ic/models/block/redstone_tardim_input.json diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/models/block/redstone_tardim_input_lit.json rename to common/src/main/resources/assets/tardim_ic/models/block/redstone_tardim_input_lit.json diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/models/block/tardim_dock.json rename to common/src/main/resources/assets/tardim_ic/models/block/tardim_dock.json diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_bottom_closed.json rename to common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_bottom_closed.json diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_bottom_open.json rename to common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_bottom_open.json diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_sides.json rename to common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_sides.json diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_sides_bottom.json rename to common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_sides_bottom.json diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_sides_top.json rename to common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_sides_top.json diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_top_front_closed.json rename to common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_top_front_closed.json diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_top_front_open.json rename to common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_door_top_front_open.json diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_floor.json rename to common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_floor.json diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_roof.json rename to common/src/main/resources/assets/tardim_ic/models/block/tardim_soviet_chronobox/tardim_roof.json diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/models/item/digital_tardim_interface.json rename to common/src/main/resources/assets/tardim_ic/models/item/digital_tardim_interface.json diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/models/item/food_machine.json rename to common/src/main/resources/assets/tardim_ic/models/item/food_machine.json diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/models/item/personal_jammer.json rename to common/src/main/resources/assets/tardim_ic/models/item/personal_jammer.json diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/models/item/redstone_tardim_input.json rename to common/src/main/resources/assets/tardim_ic/models/item/redstone_tardim_input.json diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/models/item/tardim_dock.json rename to common/src/main/resources/assets/tardim_ic/models/item/tardim_dock.json diff --git a/Common/src/main/resources/assets/tardim_ic/sounds.json b/common/src/main/resources/assets/tardim_ic/sounds.json similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/sounds.json rename to common/src/main/resources/assets/tardim_ic/sounds.json diff --git a/Common/src/main/resources/assets/tardim_ic/sounds/cloister.ogg b/common/src/main/resources/assets/tardim_ic/sounds/cloister.ogg similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/sounds/cloister.ogg rename to common/src/main/resources/assets/tardim_ic/sounds/cloister.ogg diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/textures/block/digital_tardim_interface.png rename to common/src/main/resources/assets/tardim_ic/textures/block/digital_tardim_interface.png diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/textures/block/food_machine.png rename to common/src/main/resources/assets/tardim_ic/textures/block/food_machine.png diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/textures/block/redstone_input.png rename to common/src/main/resources/assets/tardim_ic/textures/block/redstone_input.png diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/textures/block/redstone_input.png.mcmeta rename to common/src/main/resources/assets/tardim_ic/textures/block/redstone_input.png.mcmeta diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/textures/block/redstone_input_lit.png rename to common/src/main/resources/assets/tardim_ic/textures/block/redstone_input_lit.png diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/textures/block/redstone_input_lit.png.mcmeta rename to common/src/main/resources/assets/tardim_ic/textures/block/redstone_input_lit.png.mcmeta diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/textures/block/tardim_dock.png rename to common/src/main/resources/assets/tardim_ic/textures/block/tardim_dock.png diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/textures/block/tardim_soviet_chronobox.png rename to common/src/main/resources/assets/tardim_ic/textures/block/tardim_soviet_chronobox.png diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/cartridge_pins.png rename to common/src/main/resources/assets/tardim_ic/textures/item/cartridges/cartridge_pins.png diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/cartridge_shell.png rename to common/src/main/resources/assets/tardim_ic/textures/item/cartridges/cartridge_shell.png diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/temp/cartridge_blue.png rename to common/src/main/resources/assets/tardim_ic/textures/item/cartridges/temp/cartridge_blue.png diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/temp/cartridge_green.png rename to common/src/main/resources/assets/tardim_ic/textures/item/cartridges/temp/cartridge_green.png diff --git 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 similarity index 100% rename from Common/src/main/resources/assets/tardim_ic/textures/item/cartridges/temp/cartridge_red.png rename to common/src/main/resources/assets/tardim_ic/textures/item/cartridges/temp/cartridge_red.png diff --git a/Common/src/main/resources/data/computercraft/lua/premade/NavDash.lua b/common/src/main/resources/data/computercraft/lua/premade/NavDash.lua similarity index 100% rename from Common/src/main/resources/data/computercraft/lua/premade/NavDash.lua rename to common/src/main/resources/data/computercraft/lua/premade/NavDash.lua diff --git a/Common/src/main/resources/data/computercraft/lua/premade/basicTest.lua b/common/src/main/resources/data/computercraft/lua/premade/basicTest.lua similarity index 100% rename from Common/src/main/resources/data/computercraft/lua/premade/basicTest.lua rename to common/src/main/resources/data/computercraft/lua/premade/basicTest.lua diff --git 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 similarity index 100% rename from Common/src/main/resources/data/tardim_ic/loot_tables/blocks/digital_tardim_interface.json rename to common/src/main/resources/data/tardim_ic/loot_tables/blocks/digital_tardim_interface.json diff --git 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 similarity index 100% rename from Common/src/main/resources/data/tardim_ic/loot_tables/blocks/redstone_tardim_input.json rename to common/src/main/resources/data/tardim_ic/loot_tables/blocks/redstone_tardim_input.json diff --git 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 similarity index 100% rename from Common/src/main/resources/data/tardim_ic/recipes/digital_tardim_interface.json rename to common/src/main/resources/data/tardim_ic/recipes/digital_tardim_interface.json diff --git 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 similarity index 100% rename from Common/src/main/resources/data/tardim_ic/recipes/redstone_tardim_input.json rename to common/src/main/resources/data/tardim_ic/recipes/redstone_tardim_input.json diff --git a/Common/src/main/resources/pack.mcmeta b/common/src/main/resources/pack.mcmeta similarity index 100% rename from Common/src/main/resources/pack.mcmeta rename to common/src/main/resources/pack.mcmeta diff --git a/Common/src/main/resources/tardim_ic.mixins.json b/common/src/main/resources/tardim_ic.mixins.json similarity index 100% rename from Common/src/main/resources/tardim_ic.mixins.json rename to common/src/main/resources/tardim_ic.mixins.json diff --git a/Common/tardim-1.2.2-dev.jar b/common/tardim-1.2.2-dev.jar similarity index 100% rename from Common/tardim-1.2.2-dev.jar rename to common/tardim-1.2.2-dev.jar diff --git a/Fabric/build.gradle b/fabric/build.gradle similarity index 100% rename from Fabric/build.gradle rename to fabric/build.gradle diff --git a/Fabric/src/main/java/su/a71/tardim_ic/TardimInControl.java b/fabric/src/main/java/su/a71/tardim_ic/TardimInControl.java similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/TardimInControl.java rename to fabric/src/main/java/su/a71/tardim_ic/TardimInControl.java diff --git 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 similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/blocks/food_machine/FoodMachineBlock.java rename to fabric/src/main/java/su/a71/tardim_ic/blocks/food_machine/FoodMachineBlock.java diff --git 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 similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/blocks/food_machine/FoodMachineBlockEntity.java rename to fabric/src/main/java/su/a71/tardim_ic/blocks/food_machine/FoodMachineBlockEntity.java diff --git 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 similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/blocks/redstone_input/RedstoneInputBlock.java rename to fabric/src/main/java/su/a71/tardim_ic/blocks/redstone_input/RedstoneInputBlock.java diff --git 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 similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/blocks/redstone_input/RedstoneInputBlockEntity.java rename to fabric/src/main/java/su/a71/tardim_ic/blocks/redstone_input/RedstoneInputBlockEntity.java diff --git 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 similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/blocks/roundels/roundels.txt rename to fabric/src/main/java/su/a71/tardim_ic/blocks/roundels/roundels.txt diff --git a/Fabric/src/main/java/su/a71/tardim_ic/command/CommandCloisterBell.java b/fabric/src/main/java/su/a71/tardim_ic/command/CommandCloisterBell.java similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/command/CommandCloisterBell.java rename to fabric/src/main/java/su/a71/tardim_ic/command/CommandCloisterBell.java diff --git a/Fabric/src/main/java/su/a71/tardim_ic/command/CommandInit.java b/fabric/src/main/java/su/a71/tardim_ic/command/CommandInit.java similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/command/CommandInit.java rename to fabric/src/main/java/su/a71/tardim_ic/command/CommandInit.java diff --git 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 similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/computercraft_compat/digital_interface/DigitalInterfaceBlock.java rename to fabric/src/main/java/su/a71/tardim_ic/computercraft_compat/digital_interface/DigitalInterfaceBlock.java diff --git 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 similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/computercraft_compat/digital_interface/DigitalInterfaceTileEntity.java rename to fabric/src/main/java/su/a71/tardim_ic/computercraft_compat/digital_interface/DigitalInterfaceTileEntity.java diff --git 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 similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/DigitalInterfacePeripheral.java rename to fabric/src/main/java/su/a71/tardim_ic/computercraft_compat/peripherals/DigitalInterfacePeripheral.java diff --git 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 similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/display_source/cartridge_loader/temp_ideas.txt rename to fabric/src/main/java/su/a71/tardim_ic/display_source/cartridge_loader/temp_ideas.txt diff --git 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 similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/display_source/dock/temp_ideas.txt rename to fabric/src/main/java/su/a71/tardim_ic/display_source/dock/temp_ideas.txt diff --git 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 similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/display_source/fuel_storage/FuelLevelDisplaySource.java rename to fabric/src/main/java/su/a71/tardim_ic/display_source/fuel_storage/FuelLevelDisplaySource.java diff --git 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 similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/display_source/fuel_storage/RequiredFuelDisplaySource.java rename to fabric/src/main/java/su/a71/tardim_ic/display_source/fuel_storage/RequiredFuelDisplaySource.java diff --git 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 similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/display_source/scanner/temp_ideas.txt rename to fabric/src/main/java/su/a71/tardim_ic/display_source/scanner/temp_ideas.txt diff --git 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 similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/display_source/time_rotor/temp_ideas.txt rename to fabric/src/main/java/su/a71/tardim_ic/display_source/time_rotor/temp_ideas.txt diff --git a/Fabric/src/main/java/su/a71/tardim_ic/jammer/PersonalJammerMaterial.java b/fabric/src/main/java/su/a71/tardim_ic/jammer/PersonalJammerMaterial.java similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/jammer/PersonalJammerMaterial.java rename to fabric/src/main/java/su/a71/tardim_ic/jammer/PersonalJammerMaterial.java diff --git a/Fabric/src/main/java/su/a71/tardim_ic/mixin/BetterFuelMapMixin.java b/fabric/src/main/java/su/a71/tardim_ic/mixin/BetterFuelMapMixin.java similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/mixin/BetterFuelMapMixin.java rename to fabric/src/main/java/su/a71/tardim_ic/mixin/BetterFuelMapMixin.java diff --git a/Fabric/src/main/java/su/a71/tardim_ic/mixin/BetterFuelStorageMixin.java b/fabric/src/main/java/su/a71/tardim_ic/mixin/BetterFuelStorageMixin.java similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/mixin/BetterFuelStorageMixin.java rename to fabric/src/main/java/su/a71/tardim_ic/mixin/BetterFuelStorageMixin.java diff --git a/Fabric/src/main/java/su/a71/tardim_ic/mixin/CommandsMixin.java b/fabric/src/main/java/su/a71/tardim_ic/mixin/CommandsMixin.java similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/mixin/CommandsMixin.java rename to fabric/src/main/java/su/a71/tardim_ic/mixin/CommandsMixin.java diff --git a/Fabric/src/main/java/su/a71/tardim_ic/platform/FabricPlatformHelper.java b/fabric/src/main/java/su/a71/tardim_ic/platform/FabricPlatformHelper.java similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/platform/FabricPlatformHelper.java rename to fabric/src/main/java/su/a71/tardim_ic/platform/FabricPlatformHelper.java diff --git 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 similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/soviet_chronobox/SovietChronoboxTileEntity.java rename to fabric/src/main/java/su/a71/tardim_ic/soviet_chronobox/SovietChronoboxTileEntity.java diff --git 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 similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/ComputerCraftCompat.java rename to fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/ComputerCraftCompat.java diff --git a/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/CreateCompat.java b/fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/CreateCompat.java similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/CreateCompat.java rename to fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/CreateCompat.java diff --git a/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/Exteriors.java b/fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/Exteriors.java similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/Exteriors.java rename to fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/Exteriors.java diff --git a/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/Registration.java b/fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/Registration.java similarity index 100% rename from Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/Registration.java rename to fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/Registration.java diff --git a/Fabric/src/main/resources/META-INF/services/su.a71.tardim_ic.platform.services.IPlatformHelper b/fabric/src/main/resources/META-INF/services/su.a71.tardim_ic.platform.services.IPlatformHelper similarity index 100% rename from Fabric/src/main/resources/META-INF/services/su.a71.tardim_ic.platform.services.IPlatformHelper rename to fabric/src/main/resources/META-INF/services/su.a71.tardim_ic.platform.services.IPlatformHelper diff --git a/Fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json similarity index 100% rename from Fabric/src/main/resources/fabric.mod.json rename to fabric/src/main/resources/fabric.mod.json diff --git a/Fabric/src/main/resources/tardim_ic.fabric.mixins.json b/fabric/src/main/resources/tardim_ic.fabric.mixins.json similarity index 100% rename from Fabric/src/main/resources/tardim_ic.fabric.mixins.json rename to fabric/src/main/resources/tardim_ic.fabric.mixins.json diff --git a/Forge/build.gradle b/forge/build.gradle similarity index 96% rename from Forge/build.gradle rename to forge/build.gradle index 562ac05..99bbaf1 100644 --- a/Forge/build.gradle +++ b/forge/build.gradle @@ -1,7 +1,7 @@ plugins { id 'idea' id 'maven-publish' - id 'net.minecraftforge.gradle' + id 'net.neoforged.gradle' version '[6.0.18,6.2)' id 'org.spongepowered.mixin' } base { @@ -73,7 +73,7 @@ minecraft { sourceSets.main.resources.srcDir 'src/generated/resources' dependencies { - minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" + minecraft "net.neoforged:forge:${minecraft_version}-${neoforged_version}" compileOnly project(":common") annotationProcessor("org.spongepowered:mixin:0.8.5-SNAPSHOT:processor") } diff --git a/Forge/src/main/java/su/a71/tardim_ic/TardiminControl.java b/forge/src/main/java/su/a71/tardim_ic/TardiminControl.java similarity index 100% rename from Forge/src/main/java/su/a71/tardim_ic/TardiminControl.java rename to forge/src/main/java/su/a71/tardim_ic/TardiminControl.java diff --git a/Forge/src/main/java/su/a71/tardim_ic/platform/ForgePlatformHelper.java b/forge/src/main/java/su/a71/tardim_ic/platform/ForgePlatformHelper.java similarity index 100% rename from Forge/src/main/java/su/a71/tardim_ic/platform/ForgePlatformHelper.java rename to forge/src/main/java/su/a71/tardim_ic/platform/ForgePlatformHelper.java diff --git a/Forge/src/main/java/su/a71/tardim_ic/tardim_ic/redsone_input/RedstoneInputBlock.java b/forge/src/main/java/su/a71/tardim_ic/tardim_ic/redsone_input/RedstoneInputBlock.java similarity index 100% rename from Forge/src/main/java/su/a71/tardim_ic/tardim_ic/redsone_input/RedstoneInputBlock.java rename to forge/src/main/java/su/a71/tardim_ic/tardim_ic/redsone_input/RedstoneInputBlock.java diff --git a/Forge/src/main/java/su/a71/tardim_ic/tardim_ic/redsone_input/RedstoneInputTileEntity.java b/forge/src/main/java/su/a71/tardim_ic/tardim_ic/redsone_input/RedstoneInputTileEntity.java similarity index 100% rename from Forge/src/main/java/su/a71/tardim_ic/tardim_ic/redsone_input/RedstoneInputTileEntity.java rename to forge/src/main/java/su/a71/tardim_ic/tardim_ic/redsone_input/RedstoneInputTileEntity.java diff --git a/Forge/src/main/java/su/a71/tardim_ic/tardim_ic/sonic/SonicProbe.java b/forge/src/main/java/su/a71/tardim_ic/tardim_ic/sonic/SonicProbe.java similarity index 100% rename from Forge/src/main/java/su/a71/tardim_ic/tardim_ic/sonic/SonicProbe.java rename to forge/src/main/java/su/a71/tardim_ic/tardim_ic/sonic/SonicProbe.java diff --git a/Forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml similarity index 100% rename from Forge/src/main/resources/META-INF/mods.toml rename to forge/src/main/resources/META-INF/mods.toml diff --git a/Forge/src/main/resources/META-INF/services/com.example.examplemod.platform.services.IPlatformHelper b/forge/src/main/resources/META-INF/services/com.example.examplemod.platform.services.IPlatformHelper similarity index 100% rename from Forge/src/main/resources/META-INF/services/com.example.examplemod.platform.services.IPlatformHelper rename to forge/src/main/resources/META-INF/services/com.example.examplemod.platform.services.IPlatformHelper diff --git a/Forge/src/main/resources/assets/tardim_ic/blockstates/digital_tardim_interface.json b/forge/src/main/resources/assets/tardim_ic/blockstates/digital_tardim_interface.json similarity index 100% rename from Forge/src/main/resources/assets/tardim_ic/blockstates/digital_tardim_interface.json rename to forge/src/main/resources/assets/tardim_ic/blockstates/digital_tardim_interface.json diff --git a/Forge/src/main/resources/assets/tardim_ic/blockstates/redstone_tardim_input.json b/forge/src/main/resources/assets/tardim_ic/blockstates/redstone_tardim_input.json similarity index 100% rename from Forge/src/main/resources/assets/tardim_ic/blockstates/redstone_tardim_input.json rename to forge/src/main/resources/assets/tardim_ic/blockstates/redstone_tardim_input.json diff --git a/Forge/src/main/resources/assets/tardim_ic/icon.png b/forge/src/main/resources/assets/tardim_ic/icon.png similarity index 100% rename from Forge/src/main/resources/assets/tardim_ic/icon.png rename to forge/src/main/resources/assets/tardim_ic/icon.png diff --git a/Forge/src/main/resources/assets/tardim_ic/lang/en_uk.json b/forge/src/main/resources/assets/tardim_ic/lang/en_uk.json similarity index 100% rename from Forge/src/main/resources/assets/tardim_ic/lang/en_uk.json rename to forge/src/main/resources/assets/tardim_ic/lang/en_uk.json diff --git a/Forge/src/main/resources/assets/tardim_ic/lang/en_us.json b/forge/src/main/resources/assets/tardim_ic/lang/en_us.json similarity index 100% rename from Forge/src/main/resources/assets/tardim_ic/lang/en_us.json rename to forge/src/main/resources/assets/tardim_ic/lang/en_us.json diff --git a/Forge/src/main/resources/assets/tardim_ic/lang/rpr.json b/forge/src/main/resources/assets/tardim_ic/lang/rpr.json similarity index 100% rename from Forge/src/main/resources/assets/tardim_ic/lang/rpr.json rename to forge/src/main/resources/assets/tardim_ic/lang/rpr.json diff --git a/Forge/src/main/resources/assets/tardim_ic/lang/ru_ru.json b/forge/src/main/resources/assets/tardim_ic/lang/ru_ru.json similarity index 100% rename from Forge/src/main/resources/assets/tardim_ic/lang/ru_ru.json rename to forge/src/main/resources/assets/tardim_ic/lang/ru_ru.json diff --git a/Forge/src/main/resources/assets/tardim_ic/models/block/digital_tardim_interface.json b/forge/src/main/resources/assets/tardim_ic/models/block/digital_tardim_interface.json similarity index 100% rename from Forge/src/main/resources/assets/tardim_ic/models/block/digital_tardim_interface.json rename to forge/src/main/resources/assets/tardim_ic/models/block/digital_tardim_interface.json diff --git a/Forge/src/main/resources/assets/tardim_ic/models/block/redstone_tardim_input.json b/forge/src/main/resources/assets/tardim_ic/models/block/redstone_tardim_input.json similarity index 100% rename from Forge/src/main/resources/assets/tardim_ic/models/block/redstone_tardim_input.json rename to forge/src/main/resources/assets/tardim_ic/models/block/redstone_tardim_input.json diff --git a/Forge/src/main/resources/assets/tardim_ic/models/item/digital_tardim_interface.json b/forge/src/main/resources/assets/tardim_ic/models/item/digital_tardim_interface.json similarity index 100% rename from Forge/src/main/resources/assets/tardim_ic/models/item/digital_tardim_interface.json rename to forge/src/main/resources/assets/tardim_ic/models/item/digital_tardim_interface.json diff --git a/Forge/src/main/resources/assets/tardim_ic/models/item/redstone_tardim_input.json b/forge/src/main/resources/assets/tardim_ic/models/item/redstone_tardim_input.json similarity index 100% rename from Forge/src/main/resources/assets/tardim_ic/models/item/redstone_tardim_input.json rename to forge/src/main/resources/assets/tardim_ic/models/item/redstone_tardim_input.json diff --git a/Forge/src/main/resources/assets/tardim_ic/textures/blocks/digital_tardim_interface.png b/forge/src/main/resources/assets/tardim_ic/textures/blocks/digital_tardim_interface.png similarity index 100% rename from Forge/src/main/resources/assets/tardim_ic/textures/blocks/digital_tardim_interface.png rename to forge/src/main/resources/assets/tardim_ic/textures/blocks/digital_tardim_interface.png diff --git a/Forge/src/main/resources/assets/tardim_ic/textures/blocks/red_contr.png b/forge/src/main/resources/assets/tardim_ic/textures/blocks/red_contr.png similarity index 100% rename from Forge/src/main/resources/assets/tardim_ic/textures/blocks/red_contr.png rename to forge/src/main/resources/assets/tardim_ic/textures/blocks/red_contr.png diff --git a/Forge/src/main/resources/assets/tardim_ic/textures/blocks/red_contr.png.mcmeta b/forge/src/main/resources/assets/tardim_ic/textures/blocks/red_contr.png.mcmeta similarity index 100% rename from Forge/src/main/resources/assets/tardim_ic/textures/blocks/red_contr.png.mcmeta rename to forge/src/main/resources/assets/tardim_ic/textures/blocks/red_contr.png.mcmeta diff --git a/Forge/src/main/resources/data/tardim_ic/loot_tables/blocks/digital_tardim_interface.json b/forge/src/main/resources/data/tardim_ic/loot_tables/blocks/digital_tardim_interface.json similarity index 100% rename from Forge/src/main/resources/data/tardim_ic/loot_tables/blocks/digital_tardim_interface.json rename to forge/src/main/resources/data/tardim_ic/loot_tables/blocks/digital_tardim_interface.json diff --git a/Forge/src/main/resources/data/tardim_ic/loot_tables/blocks/redstone_tardim_input.json b/forge/src/main/resources/data/tardim_ic/loot_tables/blocks/redstone_tardim_input.json similarity index 100% rename from Forge/src/main/resources/data/tardim_ic/loot_tables/blocks/redstone_tardim_input.json rename to forge/src/main/resources/data/tardim_ic/loot_tables/blocks/redstone_tardim_input.json diff --git a/Forge/src/main/resources/data/tardim_ic/recipes/digital_tardim_interface.json b/forge/src/main/resources/data/tardim_ic/recipes/digital_tardim_interface.json similarity index 100% rename from Forge/src/main/resources/data/tardim_ic/recipes/digital_tardim_interface.json rename to forge/src/main/resources/data/tardim_ic/recipes/digital_tardim_interface.json diff --git a/Forge/src/main/resources/data/tardim_ic/recipes/redstone_tardim_input.json b/forge/src/main/resources/data/tardim_ic/recipes/redstone_tardim_input.json similarity index 100% rename from Forge/src/main/resources/data/tardim_ic/recipes/redstone_tardim_input.json rename to forge/src/main/resources/data/tardim_ic/recipes/redstone_tardim_input.json diff --git a/Forge/src/main/resources/examplemod.forge.mixins.json b/forge/src/main/resources/examplemod.forge.mixins.json similarity index 100% rename from Forge/src/main/resources/examplemod.forge.mixins.json rename to forge/src/main/resources/examplemod.forge.mixins.json diff --git a/Forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta similarity index 100% rename from Forge/src/main/resources/pack.mcmeta rename to forge/src/main/resources/pack.mcmeta diff --git a/gradle.properties b/gradle.properties index 159a927..1839400 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ group=su.a71.tardim_ic minecraft_version=1.20.1 # Forge -forge_version=47.1.0 +neoforged_version=47.1.79 # Fabric fabric_version=0.86.1+1.20.1 diff --git a/settings.gradle b/settings.gradle index ada7750..edc6d10 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,8 +2,8 @@ pluginManagement { repositories { gradlePluginPortal() maven { - name = 'Forge' - url = 'https://maven.minecraftforge.net/' + name = 'NeoForged' + url = 'https://maven.neoforged.net/releases' } maven { name = 'Fabric'