From 35b6ffec8aeef0160b465c21fe089a72a2cb1bf6 Mon Sep 17 00:00:00 2001 From: Johann Bernhardt Date: Mon, 20 Dec 2021 13:56:32 +0100 Subject: [PATCH] Move sources and resources --- resources/nei_at.cfg | 5 ----- src/main/resources/META-INF/ae2stuff_at.cfg | 2 ++ .../resources}/assets/ae2stuff/config/files.lst | 0 .../resources}/assets/ae2stuff/config/recipes.cfg | 0 .../resources}/assets/ae2stuff/config/tuning.cfg | 0 .../main/resources}/assets/ae2stuff/lang/de_DE.lang | 0 .../main/resources}/assets/ae2stuff/lang/en_US.lang | 0 .../main/resources}/assets/ae2stuff/lang/fr_FR.lang | 0 .../main/resources}/assets/ae2stuff/lang/hu_HU.lang | 0 .../main/resources}/assets/ae2stuff/lang/it_IT.lang | 0 .../main/resources}/assets/ae2stuff/lang/ja_JP.lang | 0 .../main/resources}/assets/ae2stuff/lang/ko_KR.lang | 0 .../main/resources}/assets/ae2stuff/lang/pt_BR.lang | 0 .../main/resources}/assets/ae2stuff/lang/ru_RU.lang | 0 .../main/resources}/assets/ae2stuff/lang/zh_CN.lang | 0 .../ae2stuff/textures/blocks/encoder/side.png | Bin .../ae2stuff/textures/blocks/encoder/top_off.png | Bin .../ae2stuff/textures/blocks/encoder/top_on.png | Bin .../assets/ae2stuff/textures/blocks/grower/main.psd | Bin .../ae2stuff/textures/blocks/grower/main_off.png | Bin .../ae2stuff/textures/blocks/grower/main_on.png | Bin .../textures/blocks/grower/main_on.png.mcmeta | 0 .../ae2stuff/textures/blocks/icons/lock/lock.psd | Bin .../ae2stuff/textures/blocks/icons/lock/off.png | Bin .../ae2stuff/textures/blocks/icons/lock/on.png | Bin .../ae2stuff/textures/blocks/inscriber/side.psd | Bin .../ae2stuff/textures/blocks/inscriber/side_off.png | Bin .../ae2stuff/textures/blocks/inscriber/side_on.png | Bin .../textures/blocks/inscriber/side_on.png.mcmeta | 0 .../ae2stuff/textures/blocks/inscriber/top.png | Bin .../ae2stuff/textures/blocks/wireless/side_off.png | Bin .../ae2stuff/textures/blocks/wireless/side_on.png | Bin .../ae2stuff/textures/blocks/wireless/top_off.png | Bin .../ae2stuff/textures/blocks/wireless/top_on.png | Bin .../assets/ae2stuff/textures/gui/encoder.png | Bin .../assets/ae2stuff/textures/gui/encoder.psd | Bin .../assets/ae2stuff/textures/gui/grower.png | Bin .../assets/ae2stuff/textures/gui/grower.psd | Bin .../assets/ae2stuff/textures/items/visualiser.png | Bin .../assets/ae2stuff/textures/items/wirelesskit.png | Bin {resources => src/main/resources}/mcmod.info | 7 ++++--- .../scala}/net/bdew/ae2stuff/AE2Defs.scala | 0 .../scala}/net/bdew/ae2stuff/AE2Stuff.scala | 2 +- .../scala}/net/bdew/ae2stuff/AE2Textures.scala | 0 .../scala}/net/bdew/ae2stuff/CreativeTabs.scala | 0 src/{ => main/scala}/net/bdew/ae2stuff/Items.scala | 0 .../scala}/net/bdew/ae2stuff/Machines.scala | 0 src/{ => main/scala}/net/bdew/ae2stuff/Tuning.scala | 0 .../net/bdew/ae2stuff/compat/AEWrenchHandler.scala | 0 .../net/bdew/ae2stuff/compat/BCWrenchHandler.scala | 0 .../net/bdew/ae2stuff/compat/WrenchRegistry.scala | 0 .../scala}/net/bdew/ae2stuff/grid/GridTile.scala | 0 .../scala}/net/bdew/ae2stuff/grid/PoweredTile.scala | 0 .../scala}/net/bdew/ae2stuff/grid/Security.scala | 0 .../net/bdew/ae2stuff/grid/SleepableTile.scala | 0 .../net/bdew/ae2stuff/grid/VariableIdlePower.scala | 0 .../net/bdew/ae2stuff/items/ItemWirelessKit.scala | 0 .../ae2stuff/items/visualiser/ItemVisualiser.scala | 0 .../items/visualiser/VisualiserOverlayRender.scala | 0 .../items/visualiser/VisualiserPlayerTracker.scala | 0 .../net/bdew/ae2stuff/items/visualiser/data.scala | 0 .../ae2stuff/machines/encoder/BlockEncoder.scala | 0 .../machines/encoder/ContainerEncoder.scala | 0 .../bdew/ae2stuff/machines/encoder/GuiEncoder.scala | 0 .../ae2stuff/machines/encoder/MachineEncoder.scala | 0 .../ae2stuff/machines/encoder/TileEncoder.scala | 0 .../net/bdew/ae2stuff/machines/encoder/slots.scala | 0 .../bdew/ae2stuff/machines/grower/BlockGrower.scala | 0 .../ae2stuff/machines/grower/ContainerGrower.scala | 0 .../bdew/ae2stuff/machines/grower/GuiGrower.scala | 0 .../ae2stuff/machines/grower/MachineGrower.scala | 0 .../bdew/ae2stuff/machines/grower/TileGrower.scala | 0 .../machines/inscriber/BlockInscriber.scala | 0 .../machines/inscriber/ContainerInscriber.scala | 0 .../ae2stuff/machines/inscriber/GuiInscriber.scala | 0 .../machines/inscriber/MachineInscriber.scala | 0 .../ae2stuff/machines/inscriber/TileInscriber.scala | 0 .../ae2stuff/machines/wireless/BlockWireless.scala | 0 .../machines/wireless/MachineWireless.scala | 0 .../ae2stuff/machines/wireless/TileWireless.scala | 0 .../machines/wireless/WirelessOverlayRender.scala | 0 .../net/bdew/ae2stuff/misc/BlockWrenchable.scala | 0 .../bdew/ae2stuff/misc/ContainerUpgradeable.scala | 0 .../scala}/net/bdew/ae2stuff/misc/Icons.scala | 0 .../net/bdew/ae2stuff/misc/ItemLocationStore.scala | 0 .../net/bdew/ae2stuff/misc/MachineMaterial.scala | 0 .../net/bdew/ae2stuff/misc/MouseEventHandler.scala | 0 .../bdew/ae2stuff/misc/OverlayRenderHandler.scala | 0 .../net/bdew/ae2stuff/misc/UpgradeInventory.scala | 0 .../net/bdew/ae2stuff/misc/UpgradeableHelper.scala | 0 .../net/bdew/ae2stuff/misc/WidgetSlotLock.scala | 0 .../bdew/ae2stuff/nei/EncoderOverlayHandler.scala | 0 .../net/bdew/ae2stuff/nei/InscriberGuiHandler.scala | 0 .../net/bdew/ae2stuff/nei/NEI_AE2Stuff_Config.scala | 0 .../net/bdew/ae2stuff/network/NetHandler.scala | 0 .../scala}/net/bdew/ae2stuff/network/packets.scala | 0 .../net/bdew/ae2stuff/waila/BaseDataProvider.scala | 0 .../net/bdew/ae2stuff/waila/WailaHandler.scala | 0 .../ae2stuff/waila/WailaPoweredDataProvider.scala | 0 .../ae2stuff/waila/WailaWirelessDataProvider.scala | 0 100 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 resources/nei_at.cfg create mode 100644 src/main/resources/META-INF/ae2stuff_at.cfg rename {resources => src/main/resources}/assets/ae2stuff/config/files.lst (100%) rename {resources => src/main/resources}/assets/ae2stuff/config/recipes.cfg (100%) rename {resources => src/main/resources}/assets/ae2stuff/config/tuning.cfg (100%) rename {resources => src/main/resources}/assets/ae2stuff/lang/de_DE.lang (100%) rename {resources => src/main/resources}/assets/ae2stuff/lang/en_US.lang (100%) rename {resources => src/main/resources}/assets/ae2stuff/lang/fr_FR.lang (100%) rename {resources => src/main/resources}/assets/ae2stuff/lang/hu_HU.lang (100%) rename {resources => src/main/resources}/assets/ae2stuff/lang/it_IT.lang (100%) rename {resources => src/main/resources}/assets/ae2stuff/lang/ja_JP.lang (100%) rename {resources => src/main/resources}/assets/ae2stuff/lang/ko_KR.lang (100%) rename {resources => src/main/resources}/assets/ae2stuff/lang/pt_BR.lang (100%) rename {resources => src/main/resources}/assets/ae2stuff/lang/ru_RU.lang (100%) rename {resources => src/main/resources}/assets/ae2stuff/lang/zh_CN.lang (100%) rename {resources => src/main/resources}/assets/ae2stuff/textures/blocks/encoder/side.png (100%) rename {resources => src/main/resources}/assets/ae2stuff/textures/blocks/encoder/top_off.png (100%) rename {resources => src/main/resources}/assets/ae2stuff/textures/blocks/encoder/top_on.png (100%) rename {resources => src/main/resources}/assets/ae2stuff/textures/blocks/grower/main.psd (100%) rename {resources => src/main/resources}/assets/ae2stuff/textures/blocks/grower/main_off.png (100%) rename {resources => src/main/resources}/assets/ae2stuff/textures/blocks/grower/main_on.png (100%) rename {resources => src/main/resources}/assets/ae2stuff/textures/blocks/grower/main_on.png.mcmeta (100%) rename {resources => src/main/resources}/assets/ae2stuff/textures/blocks/icons/lock/lock.psd (100%) rename {resources => src/main/resources}/assets/ae2stuff/textures/blocks/icons/lock/off.png (100%) rename {resources => src/main/resources}/assets/ae2stuff/textures/blocks/icons/lock/on.png (100%) rename {resources => src/main/resources}/assets/ae2stuff/textures/blocks/inscriber/side.psd (100%) rename {resources => src/main/resources}/assets/ae2stuff/textures/blocks/inscriber/side_off.png (100%) rename {resources => src/main/resources}/assets/ae2stuff/textures/blocks/inscriber/side_on.png (100%) rename {resources => src/main/resources}/assets/ae2stuff/textures/blocks/inscriber/side_on.png.mcmeta (100%) rename {resources => src/main/resources}/assets/ae2stuff/textures/blocks/inscriber/top.png (100%) rename {resources => src/main/resources}/assets/ae2stuff/textures/blocks/wireless/side_off.png (100%) rename {resources => src/main/resources}/assets/ae2stuff/textures/blocks/wireless/side_on.png (100%) rename {resources => src/main/resources}/assets/ae2stuff/textures/blocks/wireless/top_off.png (100%) rename {resources => src/main/resources}/assets/ae2stuff/textures/blocks/wireless/top_on.png (100%) rename {resources => src/main/resources}/assets/ae2stuff/textures/gui/encoder.png (100%) rename {resources => src/main/resources}/assets/ae2stuff/textures/gui/encoder.psd (100%) rename {resources => src/main/resources}/assets/ae2stuff/textures/gui/grower.png (100%) rename {resources => src/main/resources}/assets/ae2stuff/textures/gui/grower.psd (100%) rename {resources => src/main/resources}/assets/ae2stuff/textures/items/visualiser.png (100%) rename {resources => src/main/resources}/assets/ae2stuff/textures/items/wirelesskit.png (100%) rename {resources => src/main/resources}/mcmod.info (63%) rename src/{ => main/scala}/net/bdew/ae2stuff/AE2Defs.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/AE2Stuff.scala (93%) rename src/{ => main/scala}/net/bdew/ae2stuff/AE2Textures.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/CreativeTabs.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/Items.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/Machines.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/Tuning.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/compat/AEWrenchHandler.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/compat/BCWrenchHandler.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/compat/WrenchRegistry.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/grid/GridTile.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/grid/PoweredTile.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/grid/Security.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/grid/SleepableTile.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/grid/VariableIdlePower.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/items/ItemWirelessKit.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/items/visualiser/ItemVisualiser.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/items/visualiser/VisualiserOverlayRender.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/items/visualiser/VisualiserPlayerTracker.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/items/visualiser/data.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/machines/encoder/BlockEncoder.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/machines/encoder/ContainerEncoder.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/machines/encoder/GuiEncoder.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/machines/encoder/MachineEncoder.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/machines/encoder/TileEncoder.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/machines/encoder/slots.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/machines/grower/BlockGrower.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/machines/grower/ContainerGrower.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/machines/grower/GuiGrower.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/machines/grower/MachineGrower.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/machines/grower/TileGrower.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/machines/inscriber/BlockInscriber.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/machines/inscriber/ContainerInscriber.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/machines/inscriber/GuiInscriber.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/machines/inscriber/MachineInscriber.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/machines/inscriber/TileInscriber.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/machines/wireless/BlockWireless.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/machines/wireless/MachineWireless.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/machines/wireless/TileWireless.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/machines/wireless/WirelessOverlayRender.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/misc/BlockWrenchable.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/misc/ContainerUpgradeable.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/misc/Icons.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/misc/ItemLocationStore.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/misc/MachineMaterial.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/misc/MouseEventHandler.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/misc/OverlayRenderHandler.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/misc/UpgradeInventory.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/misc/UpgradeableHelper.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/misc/WidgetSlotLock.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/nei/EncoderOverlayHandler.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/nei/InscriberGuiHandler.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/nei/NEI_AE2Stuff_Config.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/network/NetHandler.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/network/packets.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/waila/BaseDataProvider.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/waila/WailaHandler.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/waila/WailaPoweredDataProvider.scala (100%) rename src/{ => main/scala}/net/bdew/ae2stuff/waila/WailaWirelessDataProvider.scala (100%) diff --git a/resources/nei_at.cfg b/resources/nei_at.cfg deleted file mode 100644 index cd2e437..0000000 --- a/resources/nei_at.cfg +++ /dev/null @@ -1,5 +0,0 @@ -# Shamelessly stolen from NEI -public net.minecraft.client.gui.inventory.GuiContainer field_146999_f #xSize -public net.minecraft.client.gui.inventory.GuiContainer field_147000_g #ySize -public net.minecraft.client.gui.inventory.GuiContainer field_147003_i #guiLeft -public net.minecraft.client.gui.inventory.GuiContainer field_147009_r #guiTop diff --git a/src/main/resources/META-INF/ae2stuff_at.cfg b/src/main/resources/META-INF/ae2stuff_at.cfg new file mode 100644 index 0000000..17e1ce8 --- /dev/null +++ b/src/main/resources/META-INF/ae2stuff_at.cfg @@ -0,0 +1,2 @@ +public net.minecraft.client.gui.inventory.GuiContainer field_147003_i #guiLeft +public net.minecraft.client.gui.inventory.GuiContainer field_147009_r #guiTop \ No newline at end of file diff --git a/resources/assets/ae2stuff/config/files.lst b/src/main/resources/assets/ae2stuff/config/files.lst similarity index 100% rename from resources/assets/ae2stuff/config/files.lst rename to src/main/resources/assets/ae2stuff/config/files.lst diff --git a/resources/assets/ae2stuff/config/recipes.cfg b/src/main/resources/assets/ae2stuff/config/recipes.cfg similarity index 100% rename from resources/assets/ae2stuff/config/recipes.cfg rename to src/main/resources/assets/ae2stuff/config/recipes.cfg diff --git a/resources/assets/ae2stuff/config/tuning.cfg b/src/main/resources/assets/ae2stuff/config/tuning.cfg similarity index 100% rename from resources/assets/ae2stuff/config/tuning.cfg rename to src/main/resources/assets/ae2stuff/config/tuning.cfg diff --git a/resources/assets/ae2stuff/lang/de_DE.lang b/src/main/resources/assets/ae2stuff/lang/de_DE.lang similarity index 100% rename from resources/assets/ae2stuff/lang/de_DE.lang rename to src/main/resources/assets/ae2stuff/lang/de_DE.lang diff --git a/resources/assets/ae2stuff/lang/en_US.lang b/src/main/resources/assets/ae2stuff/lang/en_US.lang similarity index 100% rename from resources/assets/ae2stuff/lang/en_US.lang rename to src/main/resources/assets/ae2stuff/lang/en_US.lang diff --git a/resources/assets/ae2stuff/lang/fr_FR.lang b/src/main/resources/assets/ae2stuff/lang/fr_FR.lang similarity index 100% rename from resources/assets/ae2stuff/lang/fr_FR.lang rename to src/main/resources/assets/ae2stuff/lang/fr_FR.lang diff --git a/resources/assets/ae2stuff/lang/hu_HU.lang b/src/main/resources/assets/ae2stuff/lang/hu_HU.lang similarity index 100% rename from resources/assets/ae2stuff/lang/hu_HU.lang rename to src/main/resources/assets/ae2stuff/lang/hu_HU.lang diff --git a/resources/assets/ae2stuff/lang/it_IT.lang b/src/main/resources/assets/ae2stuff/lang/it_IT.lang similarity index 100% rename from resources/assets/ae2stuff/lang/it_IT.lang rename to src/main/resources/assets/ae2stuff/lang/it_IT.lang diff --git a/resources/assets/ae2stuff/lang/ja_JP.lang b/src/main/resources/assets/ae2stuff/lang/ja_JP.lang similarity index 100% rename from resources/assets/ae2stuff/lang/ja_JP.lang rename to src/main/resources/assets/ae2stuff/lang/ja_JP.lang diff --git a/resources/assets/ae2stuff/lang/ko_KR.lang b/src/main/resources/assets/ae2stuff/lang/ko_KR.lang similarity index 100% rename from resources/assets/ae2stuff/lang/ko_KR.lang rename to src/main/resources/assets/ae2stuff/lang/ko_KR.lang diff --git a/resources/assets/ae2stuff/lang/pt_BR.lang b/src/main/resources/assets/ae2stuff/lang/pt_BR.lang similarity index 100% rename from resources/assets/ae2stuff/lang/pt_BR.lang rename to src/main/resources/assets/ae2stuff/lang/pt_BR.lang diff --git a/resources/assets/ae2stuff/lang/ru_RU.lang b/src/main/resources/assets/ae2stuff/lang/ru_RU.lang similarity index 100% rename from resources/assets/ae2stuff/lang/ru_RU.lang rename to src/main/resources/assets/ae2stuff/lang/ru_RU.lang diff --git a/resources/assets/ae2stuff/lang/zh_CN.lang b/src/main/resources/assets/ae2stuff/lang/zh_CN.lang similarity index 100% rename from resources/assets/ae2stuff/lang/zh_CN.lang rename to src/main/resources/assets/ae2stuff/lang/zh_CN.lang diff --git a/resources/assets/ae2stuff/textures/blocks/encoder/side.png b/src/main/resources/assets/ae2stuff/textures/blocks/encoder/side.png similarity index 100% rename from resources/assets/ae2stuff/textures/blocks/encoder/side.png rename to src/main/resources/assets/ae2stuff/textures/blocks/encoder/side.png diff --git a/resources/assets/ae2stuff/textures/blocks/encoder/top_off.png b/src/main/resources/assets/ae2stuff/textures/blocks/encoder/top_off.png similarity index 100% rename from resources/assets/ae2stuff/textures/blocks/encoder/top_off.png rename to src/main/resources/assets/ae2stuff/textures/blocks/encoder/top_off.png diff --git a/resources/assets/ae2stuff/textures/blocks/encoder/top_on.png b/src/main/resources/assets/ae2stuff/textures/blocks/encoder/top_on.png similarity index 100% rename from resources/assets/ae2stuff/textures/blocks/encoder/top_on.png rename to src/main/resources/assets/ae2stuff/textures/blocks/encoder/top_on.png diff --git a/resources/assets/ae2stuff/textures/blocks/grower/main.psd b/src/main/resources/assets/ae2stuff/textures/blocks/grower/main.psd similarity index 100% rename from resources/assets/ae2stuff/textures/blocks/grower/main.psd rename to src/main/resources/assets/ae2stuff/textures/blocks/grower/main.psd diff --git a/resources/assets/ae2stuff/textures/blocks/grower/main_off.png b/src/main/resources/assets/ae2stuff/textures/blocks/grower/main_off.png similarity index 100% rename from resources/assets/ae2stuff/textures/blocks/grower/main_off.png rename to src/main/resources/assets/ae2stuff/textures/blocks/grower/main_off.png diff --git a/resources/assets/ae2stuff/textures/blocks/grower/main_on.png b/src/main/resources/assets/ae2stuff/textures/blocks/grower/main_on.png similarity index 100% rename from resources/assets/ae2stuff/textures/blocks/grower/main_on.png rename to src/main/resources/assets/ae2stuff/textures/blocks/grower/main_on.png diff --git a/resources/assets/ae2stuff/textures/blocks/grower/main_on.png.mcmeta b/src/main/resources/assets/ae2stuff/textures/blocks/grower/main_on.png.mcmeta similarity index 100% rename from resources/assets/ae2stuff/textures/blocks/grower/main_on.png.mcmeta rename to src/main/resources/assets/ae2stuff/textures/blocks/grower/main_on.png.mcmeta diff --git a/resources/assets/ae2stuff/textures/blocks/icons/lock/lock.psd b/src/main/resources/assets/ae2stuff/textures/blocks/icons/lock/lock.psd similarity index 100% rename from resources/assets/ae2stuff/textures/blocks/icons/lock/lock.psd rename to src/main/resources/assets/ae2stuff/textures/blocks/icons/lock/lock.psd diff --git a/resources/assets/ae2stuff/textures/blocks/icons/lock/off.png b/src/main/resources/assets/ae2stuff/textures/blocks/icons/lock/off.png similarity index 100% rename from resources/assets/ae2stuff/textures/blocks/icons/lock/off.png rename to src/main/resources/assets/ae2stuff/textures/blocks/icons/lock/off.png diff --git a/resources/assets/ae2stuff/textures/blocks/icons/lock/on.png b/src/main/resources/assets/ae2stuff/textures/blocks/icons/lock/on.png similarity index 100% rename from resources/assets/ae2stuff/textures/blocks/icons/lock/on.png rename to src/main/resources/assets/ae2stuff/textures/blocks/icons/lock/on.png diff --git a/resources/assets/ae2stuff/textures/blocks/inscriber/side.psd b/src/main/resources/assets/ae2stuff/textures/blocks/inscriber/side.psd similarity index 100% rename from resources/assets/ae2stuff/textures/blocks/inscriber/side.psd rename to src/main/resources/assets/ae2stuff/textures/blocks/inscriber/side.psd diff --git a/resources/assets/ae2stuff/textures/blocks/inscriber/side_off.png b/src/main/resources/assets/ae2stuff/textures/blocks/inscriber/side_off.png similarity index 100% rename from resources/assets/ae2stuff/textures/blocks/inscriber/side_off.png rename to src/main/resources/assets/ae2stuff/textures/blocks/inscriber/side_off.png diff --git a/resources/assets/ae2stuff/textures/blocks/inscriber/side_on.png b/src/main/resources/assets/ae2stuff/textures/blocks/inscriber/side_on.png similarity index 100% rename from resources/assets/ae2stuff/textures/blocks/inscriber/side_on.png rename to src/main/resources/assets/ae2stuff/textures/blocks/inscriber/side_on.png diff --git a/resources/assets/ae2stuff/textures/blocks/inscriber/side_on.png.mcmeta b/src/main/resources/assets/ae2stuff/textures/blocks/inscriber/side_on.png.mcmeta similarity index 100% rename from resources/assets/ae2stuff/textures/blocks/inscriber/side_on.png.mcmeta rename to src/main/resources/assets/ae2stuff/textures/blocks/inscriber/side_on.png.mcmeta diff --git a/resources/assets/ae2stuff/textures/blocks/inscriber/top.png b/src/main/resources/assets/ae2stuff/textures/blocks/inscriber/top.png similarity index 100% rename from resources/assets/ae2stuff/textures/blocks/inscriber/top.png rename to src/main/resources/assets/ae2stuff/textures/blocks/inscriber/top.png diff --git a/resources/assets/ae2stuff/textures/blocks/wireless/side_off.png b/src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_off.png similarity index 100% rename from resources/assets/ae2stuff/textures/blocks/wireless/side_off.png rename to src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_off.png diff --git a/resources/assets/ae2stuff/textures/blocks/wireless/side_on.png b/src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on.png similarity index 100% rename from resources/assets/ae2stuff/textures/blocks/wireless/side_on.png rename to src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on.png diff --git a/resources/assets/ae2stuff/textures/blocks/wireless/top_off.png b/src/main/resources/assets/ae2stuff/textures/blocks/wireless/top_off.png similarity index 100% rename from resources/assets/ae2stuff/textures/blocks/wireless/top_off.png rename to src/main/resources/assets/ae2stuff/textures/blocks/wireless/top_off.png diff --git a/resources/assets/ae2stuff/textures/blocks/wireless/top_on.png b/src/main/resources/assets/ae2stuff/textures/blocks/wireless/top_on.png similarity index 100% rename from resources/assets/ae2stuff/textures/blocks/wireless/top_on.png rename to src/main/resources/assets/ae2stuff/textures/blocks/wireless/top_on.png diff --git a/resources/assets/ae2stuff/textures/gui/encoder.png b/src/main/resources/assets/ae2stuff/textures/gui/encoder.png similarity index 100% rename from resources/assets/ae2stuff/textures/gui/encoder.png rename to src/main/resources/assets/ae2stuff/textures/gui/encoder.png diff --git a/resources/assets/ae2stuff/textures/gui/encoder.psd b/src/main/resources/assets/ae2stuff/textures/gui/encoder.psd similarity index 100% rename from resources/assets/ae2stuff/textures/gui/encoder.psd rename to src/main/resources/assets/ae2stuff/textures/gui/encoder.psd diff --git a/resources/assets/ae2stuff/textures/gui/grower.png b/src/main/resources/assets/ae2stuff/textures/gui/grower.png similarity index 100% rename from resources/assets/ae2stuff/textures/gui/grower.png rename to src/main/resources/assets/ae2stuff/textures/gui/grower.png diff --git a/resources/assets/ae2stuff/textures/gui/grower.psd b/src/main/resources/assets/ae2stuff/textures/gui/grower.psd similarity index 100% rename from resources/assets/ae2stuff/textures/gui/grower.psd rename to src/main/resources/assets/ae2stuff/textures/gui/grower.psd diff --git a/resources/assets/ae2stuff/textures/items/visualiser.png b/src/main/resources/assets/ae2stuff/textures/items/visualiser.png similarity index 100% rename from resources/assets/ae2stuff/textures/items/visualiser.png rename to src/main/resources/assets/ae2stuff/textures/items/visualiser.png diff --git a/resources/assets/ae2stuff/textures/items/wirelesskit.png b/src/main/resources/assets/ae2stuff/textures/items/wirelesskit.png similarity index 100% rename from resources/assets/ae2stuff/textures/items/wirelesskit.png rename to src/main/resources/assets/ae2stuff/textures/items/wirelesskit.png diff --git a/resources/mcmod.info b/src/main/resources/mcmod.info similarity index 63% rename from resources/mcmod.info rename to src/main/resources/mcmod.info index bce3c0a..2780b1b 100644 --- a/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,9 +1,10 @@ [ { - "modid": "ae2stuff", - "name": "AE2 Stuff", + "modid": "${modId}", + "name": "${modName}", "description": "", - "version": "@AE2STUFF_VER@", + "version": "${modVersion}", + "mcversion": "${minecraftVersion}", "url": "bdew.net", "updateUrl": "", "authorList": [ diff --git a/src/net/bdew/ae2stuff/AE2Defs.scala b/src/main/scala/net/bdew/ae2stuff/AE2Defs.scala similarity index 100% rename from src/net/bdew/ae2stuff/AE2Defs.scala rename to src/main/scala/net/bdew/ae2stuff/AE2Defs.scala diff --git a/src/net/bdew/ae2stuff/AE2Stuff.scala b/src/main/scala/net/bdew/ae2stuff/AE2Stuff.scala similarity index 93% rename from src/net/bdew/ae2stuff/AE2Stuff.scala rename to src/main/scala/net/bdew/ae2stuff/AE2Stuff.scala index 1982da4..f6c42db 100644 --- a/src/net/bdew/ae2stuff/AE2Stuff.scala +++ b/src/main/scala/net/bdew/ae2stuff/AE2Stuff.scala @@ -25,7 +25,7 @@ import net.bdew.lib.Event import net.bdew.lib.gui.GuiHandler import org.apache.logging.log4j.Logger -@Mod(modid = AE2Stuff.modId, version = "AE2STUFF_VER", name = "AE2 Stuff", dependencies = "required-after:appliedenergistics2;required-after:bdlib@[BDLIB_VER,)", modLanguage = "scala") +@Mod(modid = AE2Stuff.modId, version = "GRADLETOKEN_VERSION", name = "AE2 Stuff", dependencies = "required-after:appliedenergistics2;required-after:bdlib@[1.9.4.109,)", modLanguage = "scala") object AE2Stuff { var log: Logger = null var instance = this diff --git a/src/net/bdew/ae2stuff/AE2Textures.scala b/src/main/scala/net/bdew/ae2stuff/AE2Textures.scala similarity index 100% rename from src/net/bdew/ae2stuff/AE2Textures.scala rename to src/main/scala/net/bdew/ae2stuff/AE2Textures.scala diff --git a/src/net/bdew/ae2stuff/CreativeTabs.scala b/src/main/scala/net/bdew/ae2stuff/CreativeTabs.scala similarity index 100% rename from src/net/bdew/ae2stuff/CreativeTabs.scala rename to src/main/scala/net/bdew/ae2stuff/CreativeTabs.scala diff --git a/src/net/bdew/ae2stuff/Items.scala b/src/main/scala/net/bdew/ae2stuff/Items.scala similarity index 100% rename from src/net/bdew/ae2stuff/Items.scala rename to src/main/scala/net/bdew/ae2stuff/Items.scala diff --git a/src/net/bdew/ae2stuff/Machines.scala b/src/main/scala/net/bdew/ae2stuff/Machines.scala similarity index 100% rename from src/net/bdew/ae2stuff/Machines.scala rename to src/main/scala/net/bdew/ae2stuff/Machines.scala diff --git a/src/net/bdew/ae2stuff/Tuning.scala b/src/main/scala/net/bdew/ae2stuff/Tuning.scala similarity index 100% rename from src/net/bdew/ae2stuff/Tuning.scala rename to src/main/scala/net/bdew/ae2stuff/Tuning.scala diff --git a/src/net/bdew/ae2stuff/compat/AEWrenchHandler.scala b/src/main/scala/net/bdew/ae2stuff/compat/AEWrenchHandler.scala similarity index 100% rename from src/net/bdew/ae2stuff/compat/AEWrenchHandler.scala rename to src/main/scala/net/bdew/ae2stuff/compat/AEWrenchHandler.scala diff --git a/src/net/bdew/ae2stuff/compat/BCWrenchHandler.scala b/src/main/scala/net/bdew/ae2stuff/compat/BCWrenchHandler.scala similarity index 100% rename from src/net/bdew/ae2stuff/compat/BCWrenchHandler.scala rename to src/main/scala/net/bdew/ae2stuff/compat/BCWrenchHandler.scala diff --git a/src/net/bdew/ae2stuff/compat/WrenchRegistry.scala b/src/main/scala/net/bdew/ae2stuff/compat/WrenchRegistry.scala similarity index 100% rename from src/net/bdew/ae2stuff/compat/WrenchRegistry.scala rename to src/main/scala/net/bdew/ae2stuff/compat/WrenchRegistry.scala diff --git a/src/net/bdew/ae2stuff/grid/GridTile.scala b/src/main/scala/net/bdew/ae2stuff/grid/GridTile.scala similarity index 100% rename from src/net/bdew/ae2stuff/grid/GridTile.scala rename to src/main/scala/net/bdew/ae2stuff/grid/GridTile.scala diff --git a/src/net/bdew/ae2stuff/grid/PoweredTile.scala b/src/main/scala/net/bdew/ae2stuff/grid/PoweredTile.scala similarity index 100% rename from src/net/bdew/ae2stuff/grid/PoweredTile.scala rename to src/main/scala/net/bdew/ae2stuff/grid/PoweredTile.scala diff --git a/src/net/bdew/ae2stuff/grid/Security.scala b/src/main/scala/net/bdew/ae2stuff/grid/Security.scala similarity index 100% rename from src/net/bdew/ae2stuff/grid/Security.scala rename to src/main/scala/net/bdew/ae2stuff/grid/Security.scala diff --git a/src/net/bdew/ae2stuff/grid/SleepableTile.scala b/src/main/scala/net/bdew/ae2stuff/grid/SleepableTile.scala similarity index 100% rename from src/net/bdew/ae2stuff/grid/SleepableTile.scala rename to src/main/scala/net/bdew/ae2stuff/grid/SleepableTile.scala diff --git a/src/net/bdew/ae2stuff/grid/VariableIdlePower.scala b/src/main/scala/net/bdew/ae2stuff/grid/VariableIdlePower.scala similarity index 100% rename from src/net/bdew/ae2stuff/grid/VariableIdlePower.scala rename to src/main/scala/net/bdew/ae2stuff/grid/VariableIdlePower.scala diff --git a/src/net/bdew/ae2stuff/items/ItemWirelessKit.scala b/src/main/scala/net/bdew/ae2stuff/items/ItemWirelessKit.scala similarity index 100% rename from src/net/bdew/ae2stuff/items/ItemWirelessKit.scala rename to src/main/scala/net/bdew/ae2stuff/items/ItemWirelessKit.scala diff --git a/src/net/bdew/ae2stuff/items/visualiser/ItemVisualiser.scala b/src/main/scala/net/bdew/ae2stuff/items/visualiser/ItemVisualiser.scala similarity index 100% rename from src/net/bdew/ae2stuff/items/visualiser/ItemVisualiser.scala rename to src/main/scala/net/bdew/ae2stuff/items/visualiser/ItemVisualiser.scala diff --git a/src/net/bdew/ae2stuff/items/visualiser/VisualiserOverlayRender.scala b/src/main/scala/net/bdew/ae2stuff/items/visualiser/VisualiserOverlayRender.scala similarity index 100% rename from src/net/bdew/ae2stuff/items/visualiser/VisualiserOverlayRender.scala rename to src/main/scala/net/bdew/ae2stuff/items/visualiser/VisualiserOverlayRender.scala diff --git a/src/net/bdew/ae2stuff/items/visualiser/VisualiserPlayerTracker.scala b/src/main/scala/net/bdew/ae2stuff/items/visualiser/VisualiserPlayerTracker.scala similarity index 100% rename from src/net/bdew/ae2stuff/items/visualiser/VisualiserPlayerTracker.scala rename to src/main/scala/net/bdew/ae2stuff/items/visualiser/VisualiserPlayerTracker.scala diff --git a/src/net/bdew/ae2stuff/items/visualiser/data.scala b/src/main/scala/net/bdew/ae2stuff/items/visualiser/data.scala similarity index 100% rename from src/net/bdew/ae2stuff/items/visualiser/data.scala rename to src/main/scala/net/bdew/ae2stuff/items/visualiser/data.scala diff --git a/src/net/bdew/ae2stuff/machines/encoder/BlockEncoder.scala b/src/main/scala/net/bdew/ae2stuff/machines/encoder/BlockEncoder.scala similarity index 100% rename from src/net/bdew/ae2stuff/machines/encoder/BlockEncoder.scala rename to src/main/scala/net/bdew/ae2stuff/machines/encoder/BlockEncoder.scala diff --git a/src/net/bdew/ae2stuff/machines/encoder/ContainerEncoder.scala b/src/main/scala/net/bdew/ae2stuff/machines/encoder/ContainerEncoder.scala similarity index 100% rename from src/net/bdew/ae2stuff/machines/encoder/ContainerEncoder.scala rename to src/main/scala/net/bdew/ae2stuff/machines/encoder/ContainerEncoder.scala diff --git a/src/net/bdew/ae2stuff/machines/encoder/GuiEncoder.scala b/src/main/scala/net/bdew/ae2stuff/machines/encoder/GuiEncoder.scala similarity index 100% rename from src/net/bdew/ae2stuff/machines/encoder/GuiEncoder.scala rename to src/main/scala/net/bdew/ae2stuff/machines/encoder/GuiEncoder.scala diff --git a/src/net/bdew/ae2stuff/machines/encoder/MachineEncoder.scala b/src/main/scala/net/bdew/ae2stuff/machines/encoder/MachineEncoder.scala similarity index 100% rename from src/net/bdew/ae2stuff/machines/encoder/MachineEncoder.scala rename to src/main/scala/net/bdew/ae2stuff/machines/encoder/MachineEncoder.scala diff --git a/src/net/bdew/ae2stuff/machines/encoder/TileEncoder.scala b/src/main/scala/net/bdew/ae2stuff/machines/encoder/TileEncoder.scala similarity index 100% rename from src/net/bdew/ae2stuff/machines/encoder/TileEncoder.scala rename to src/main/scala/net/bdew/ae2stuff/machines/encoder/TileEncoder.scala diff --git a/src/net/bdew/ae2stuff/machines/encoder/slots.scala b/src/main/scala/net/bdew/ae2stuff/machines/encoder/slots.scala similarity index 100% rename from src/net/bdew/ae2stuff/machines/encoder/slots.scala rename to src/main/scala/net/bdew/ae2stuff/machines/encoder/slots.scala diff --git a/src/net/bdew/ae2stuff/machines/grower/BlockGrower.scala b/src/main/scala/net/bdew/ae2stuff/machines/grower/BlockGrower.scala similarity index 100% rename from src/net/bdew/ae2stuff/machines/grower/BlockGrower.scala rename to src/main/scala/net/bdew/ae2stuff/machines/grower/BlockGrower.scala diff --git a/src/net/bdew/ae2stuff/machines/grower/ContainerGrower.scala b/src/main/scala/net/bdew/ae2stuff/machines/grower/ContainerGrower.scala similarity index 100% rename from src/net/bdew/ae2stuff/machines/grower/ContainerGrower.scala rename to src/main/scala/net/bdew/ae2stuff/machines/grower/ContainerGrower.scala diff --git a/src/net/bdew/ae2stuff/machines/grower/GuiGrower.scala b/src/main/scala/net/bdew/ae2stuff/machines/grower/GuiGrower.scala similarity index 100% rename from src/net/bdew/ae2stuff/machines/grower/GuiGrower.scala rename to src/main/scala/net/bdew/ae2stuff/machines/grower/GuiGrower.scala diff --git a/src/net/bdew/ae2stuff/machines/grower/MachineGrower.scala b/src/main/scala/net/bdew/ae2stuff/machines/grower/MachineGrower.scala similarity index 100% rename from src/net/bdew/ae2stuff/machines/grower/MachineGrower.scala rename to src/main/scala/net/bdew/ae2stuff/machines/grower/MachineGrower.scala diff --git a/src/net/bdew/ae2stuff/machines/grower/TileGrower.scala b/src/main/scala/net/bdew/ae2stuff/machines/grower/TileGrower.scala similarity index 100% rename from src/net/bdew/ae2stuff/machines/grower/TileGrower.scala rename to src/main/scala/net/bdew/ae2stuff/machines/grower/TileGrower.scala diff --git a/src/net/bdew/ae2stuff/machines/inscriber/BlockInscriber.scala b/src/main/scala/net/bdew/ae2stuff/machines/inscriber/BlockInscriber.scala similarity index 100% rename from src/net/bdew/ae2stuff/machines/inscriber/BlockInscriber.scala rename to src/main/scala/net/bdew/ae2stuff/machines/inscriber/BlockInscriber.scala diff --git a/src/net/bdew/ae2stuff/machines/inscriber/ContainerInscriber.scala b/src/main/scala/net/bdew/ae2stuff/machines/inscriber/ContainerInscriber.scala similarity index 100% rename from src/net/bdew/ae2stuff/machines/inscriber/ContainerInscriber.scala rename to src/main/scala/net/bdew/ae2stuff/machines/inscriber/ContainerInscriber.scala diff --git a/src/net/bdew/ae2stuff/machines/inscriber/GuiInscriber.scala b/src/main/scala/net/bdew/ae2stuff/machines/inscriber/GuiInscriber.scala similarity index 100% rename from src/net/bdew/ae2stuff/machines/inscriber/GuiInscriber.scala rename to src/main/scala/net/bdew/ae2stuff/machines/inscriber/GuiInscriber.scala diff --git a/src/net/bdew/ae2stuff/machines/inscriber/MachineInscriber.scala b/src/main/scala/net/bdew/ae2stuff/machines/inscriber/MachineInscriber.scala similarity index 100% rename from src/net/bdew/ae2stuff/machines/inscriber/MachineInscriber.scala rename to src/main/scala/net/bdew/ae2stuff/machines/inscriber/MachineInscriber.scala diff --git a/src/net/bdew/ae2stuff/machines/inscriber/TileInscriber.scala b/src/main/scala/net/bdew/ae2stuff/machines/inscriber/TileInscriber.scala similarity index 100% rename from src/net/bdew/ae2stuff/machines/inscriber/TileInscriber.scala rename to src/main/scala/net/bdew/ae2stuff/machines/inscriber/TileInscriber.scala diff --git a/src/net/bdew/ae2stuff/machines/wireless/BlockWireless.scala b/src/main/scala/net/bdew/ae2stuff/machines/wireless/BlockWireless.scala similarity index 100% rename from src/net/bdew/ae2stuff/machines/wireless/BlockWireless.scala rename to src/main/scala/net/bdew/ae2stuff/machines/wireless/BlockWireless.scala diff --git a/src/net/bdew/ae2stuff/machines/wireless/MachineWireless.scala b/src/main/scala/net/bdew/ae2stuff/machines/wireless/MachineWireless.scala similarity index 100% rename from src/net/bdew/ae2stuff/machines/wireless/MachineWireless.scala rename to src/main/scala/net/bdew/ae2stuff/machines/wireless/MachineWireless.scala diff --git a/src/net/bdew/ae2stuff/machines/wireless/TileWireless.scala b/src/main/scala/net/bdew/ae2stuff/machines/wireless/TileWireless.scala similarity index 100% rename from src/net/bdew/ae2stuff/machines/wireless/TileWireless.scala rename to src/main/scala/net/bdew/ae2stuff/machines/wireless/TileWireless.scala diff --git a/src/net/bdew/ae2stuff/machines/wireless/WirelessOverlayRender.scala b/src/main/scala/net/bdew/ae2stuff/machines/wireless/WirelessOverlayRender.scala similarity index 100% rename from src/net/bdew/ae2stuff/machines/wireless/WirelessOverlayRender.scala rename to src/main/scala/net/bdew/ae2stuff/machines/wireless/WirelessOverlayRender.scala diff --git a/src/net/bdew/ae2stuff/misc/BlockWrenchable.scala b/src/main/scala/net/bdew/ae2stuff/misc/BlockWrenchable.scala similarity index 100% rename from src/net/bdew/ae2stuff/misc/BlockWrenchable.scala rename to src/main/scala/net/bdew/ae2stuff/misc/BlockWrenchable.scala diff --git a/src/net/bdew/ae2stuff/misc/ContainerUpgradeable.scala b/src/main/scala/net/bdew/ae2stuff/misc/ContainerUpgradeable.scala similarity index 100% rename from src/net/bdew/ae2stuff/misc/ContainerUpgradeable.scala rename to src/main/scala/net/bdew/ae2stuff/misc/ContainerUpgradeable.scala diff --git a/src/net/bdew/ae2stuff/misc/Icons.scala b/src/main/scala/net/bdew/ae2stuff/misc/Icons.scala similarity index 100% rename from src/net/bdew/ae2stuff/misc/Icons.scala rename to src/main/scala/net/bdew/ae2stuff/misc/Icons.scala diff --git a/src/net/bdew/ae2stuff/misc/ItemLocationStore.scala b/src/main/scala/net/bdew/ae2stuff/misc/ItemLocationStore.scala similarity index 100% rename from src/net/bdew/ae2stuff/misc/ItemLocationStore.scala rename to src/main/scala/net/bdew/ae2stuff/misc/ItemLocationStore.scala diff --git a/src/net/bdew/ae2stuff/misc/MachineMaterial.scala b/src/main/scala/net/bdew/ae2stuff/misc/MachineMaterial.scala similarity index 100% rename from src/net/bdew/ae2stuff/misc/MachineMaterial.scala rename to src/main/scala/net/bdew/ae2stuff/misc/MachineMaterial.scala diff --git a/src/net/bdew/ae2stuff/misc/MouseEventHandler.scala b/src/main/scala/net/bdew/ae2stuff/misc/MouseEventHandler.scala similarity index 100% rename from src/net/bdew/ae2stuff/misc/MouseEventHandler.scala rename to src/main/scala/net/bdew/ae2stuff/misc/MouseEventHandler.scala diff --git a/src/net/bdew/ae2stuff/misc/OverlayRenderHandler.scala b/src/main/scala/net/bdew/ae2stuff/misc/OverlayRenderHandler.scala similarity index 100% rename from src/net/bdew/ae2stuff/misc/OverlayRenderHandler.scala rename to src/main/scala/net/bdew/ae2stuff/misc/OverlayRenderHandler.scala diff --git a/src/net/bdew/ae2stuff/misc/UpgradeInventory.scala b/src/main/scala/net/bdew/ae2stuff/misc/UpgradeInventory.scala similarity index 100% rename from src/net/bdew/ae2stuff/misc/UpgradeInventory.scala rename to src/main/scala/net/bdew/ae2stuff/misc/UpgradeInventory.scala diff --git a/src/net/bdew/ae2stuff/misc/UpgradeableHelper.scala b/src/main/scala/net/bdew/ae2stuff/misc/UpgradeableHelper.scala similarity index 100% rename from src/net/bdew/ae2stuff/misc/UpgradeableHelper.scala rename to src/main/scala/net/bdew/ae2stuff/misc/UpgradeableHelper.scala diff --git a/src/net/bdew/ae2stuff/misc/WidgetSlotLock.scala b/src/main/scala/net/bdew/ae2stuff/misc/WidgetSlotLock.scala similarity index 100% rename from src/net/bdew/ae2stuff/misc/WidgetSlotLock.scala rename to src/main/scala/net/bdew/ae2stuff/misc/WidgetSlotLock.scala diff --git a/src/net/bdew/ae2stuff/nei/EncoderOverlayHandler.scala b/src/main/scala/net/bdew/ae2stuff/nei/EncoderOverlayHandler.scala similarity index 100% rename from src/net/bdew/ae2stuff/nei/EncoderOverlayHandler.scala rename to src/main/scala/net/bdew/ae2stuff/nei/EncoderOverlayHandler.scala diff --git a/src/net/bdew/ae2stuff/nei/InscriberGuiHandler.scala b/src/main/scala/net/bdew/ae2stuff/nei/InscriberGuiHandler.scala similarity index 100% rename from src/net/bdew/ae2stuff/nei/InscriberGuiHandler.scala rename to src/main/scala/net/bdew/ae2stuff/nei/InscriberGuiHandler.scala diff --git a/src/net/bdew/ae2stuff/nei/NEI_AE2Stuff_Config.scala b/src/main/scala/net/bdew/ae2stuff/nei/NEI_AE2Stuff_Config.scala similarity index 100% rename from src/net/bdew/ae2stuff/nei/NEI_AE2Stuff_Config.scala rename to src/main/scala/net/bdew/ae2stuff/nei/NEI_AE2Stuff_Config.scala diff --git a/src/net/bdew/ae2stuff/network/NetHandler.scala b/src/main/scala/net/bdew/ae2stuff/network/NetHandler.scala similarity index 100% rename from src/net/bdew/ae2stuff/network/NetHandler.scala rename to src/main/scala/net/bdew/ae2stuff/network/NetHandler.scala diff --git a/src/net/bdew/ae2stuff/network/packets.scala b/src/main/scala/net/bdew/ae2stuff/network/packets.scala similarity index 100% rename from src/net/bdew/ae2stuff/network/packets.scala rename to src/main/scala/net/bdew/ae2stuff/network/packets.scala diff --git a/src/net/bdew/ae2stuff/waila/BaseDataProvider.scala b/src/main/scala/net/bdew/ae2stuff/waila/BaseDataProvider.scala similarity index 100% rename from src/net/bdew/ae2stuff/waila/BaseDataProvider.scala rename to src/main/scala/net/bdew/ae2stuff/waila/BaseDataProvider.scala diff --git a/src/net/bdew/ae2stuff/waila/WailaHandler.scala b/src/main/scala/net/bdew/ae2stuff/waila/WailaHandler.scala similarity index 100% rename from src/net/bdew/ae2stuff/waila/WailaHandler.scala rename to src/main/scala/net/bdew/ae2stuff/waila/WailaHandler.scala diff --git a/src/net/bdew/ae2stuff/waila/WailaPoweredDataProvider.scala b/src/main/scala/net/bdew/ae2stuff/waila/WailaPoweredDataProvider.scala similarity index 100% rename from src/net/bdew/ae2stuff/waila/WailaPoweredDataProvider.scala rename to src/main/scala/net/bdew/ae2stuff/waila/WailaPoweredDataProvider.scala diff --git a/src/net/bdew/ae2stuff/waila/WailaWirelessDataProvider.scala b/src/main/scala/net/bdew/ae2stuff/waila/WailaWirelessDataProvider.scala similarity index 100% rename from src/net/bdew/ae2stuff/waila/WailaWirelessDataProvider.scala rename to src/main/scala/net/bdew/ae2stuff/waila/WailaWirelessDataProvider.scala