diff --git a/.hgtags.orig b/.hgtags.orig new file mode 100644 index 0000000..8dc66fc --- /dev/null +++ b/.hgtags.orig @@ -0,0 +1,25 @@ +28ccc9a07b5421f7e529c417b9baf0cf0a384d9f v1.2.0 +38f148ebeb8f6cfbdbaff0afc93612eb297188cd v1.3.1 +4a92f4e3296c1b64557ecf30023c61badf598a3e 1.3.2 +8ee781ebab6c82631601fee3dc1fb4d3a03f9351 1.3.3 +2f6144f8e55ca2f0fa6ccbbee707ca58f5e75c80 1.3.4 +45e01e7ee1a8e1587832e388584fd102672066ae 1.3.8_1.6.2 +1e7cde94ccceb8c1425a03c90fe2523afbe20d53 1.3.9_1.6.2 +02ebbb4aeebe23b3eaaded32bda20dad2fe14381 Nightly_131024 +bc4937f3a7d4c8eef31b8273cab6e043a8b354ef Nightly_131025 +246642120b36fb05ed2682ef79e7b48020edf21d Nightly_131116 +9280666656c77770a35c2797129f9fb806ed6367 Nightly_13111 +d2ec5e84d19f679d5b482112ed1fab4cb4d0b427 Nightly_131118 +c7e3d16cb236195aaa6d978fe15706d63831a4e2 Nightly_131121a +e8b1906c3f51a14a12539850404b4622311b936b v1.4.0 +f9daea609042db35e35989da99a1c4c8696eb8ab 1.4.1 +1c391d52f3d955eebe3437d81dd8eca8ca142a8c 1.4.3 +7ff010d0fad85eb59eca7f1bc6583a6dada6ef8d 1.4.5 +5dd753fa7c80d22c3526714d48cf9c3a01918dec 1.4.5a +1066f782daede2a968ec282d4e3eba5a6ec74a53 Waila_1.5.0_dev2 +ad46f8b41bbe08c95a6ae4a6c609be96196148ca Waila_1.5.0 +<<<<<<< local +be89d97648acdc95afe1f7fea6a190641ae629d5 v1.5.2 +======= +bb4fc720238a6545946c35de78e417141625a69c v1.4.5_1.7.2 +>>>>>>> other diff --git a/activity.png b/activity.png new file mode 100644 index 0000000..2e31c92 Binary files /dev/null and b/activity.png differ diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..a9cc5b0 --- /dev/null +++ b/build.gradle @@ -0,0 +1,135 @@ +buildscript { + repositories { + mavenCentral() + maven { + name = "forge" + url = "http://files.minecraftforge.net/maven" + } + maven { + name = "sonatype" + url = "https://oss.sonatype.org/content/repositories/snapshots/" + } + } + dependencies { + classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + } +} + +configurations { + deployerJars +} + +//add dependency repositories +repositories { + mavenLocal() + mavenCentral() + maven { + name = "chickenbones" + url = "http://chickenbones.net/maven/" + } +} + +apply plugin: 'java' +apply plugin: 'forge' +apply plugin: 'maven' + +version = "1.5.2a" +group= "mcp.mobius.waila" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = "Waila" + +// Define properties file +ext.configFile = file "build.properties" + +configFile.withReader { + // Load config. It shall from now be referenced as simply config or project.config + def prop = new Properties() + prop.load(it) + project.ext.config = new ConfigSlurper().parse prop +} + +dependencies { + compile "codechicken:CodeChickenLib:${config.mc_version}-${config.ccl_version}:dev" + compile "codechicken:CodeChickenCore:${config.mc_version}-${config.ccc_version}:dev" + compile "codechicken:NotEnoughItems:${config.mc_version}-${config.nei_version}:dev" + deployerJars "org.apache.maven.wagon:wagon-ssh:2.2" +} + +minecraft { + version = "1.7.2-10.12.1.1112" + assetDir = "eclipse/assets" +} + +def root = project.projectDir.parentFile +sourceSets { + main { + java { + srcDir new File(root, "src") + } + resources { + srcDir new File(root, "resources") + } + } +} + +processResources +{ + // this will ensure that this task is redone when the versions change. + inputs.property "version", project.version + inputs.property "mcversion", project.minecraft.version + + // replace stuff in mcmod.info, nothing else + from(sourceSets.main.resources.srcDirs) { + include 'mcmod.info' + + // replace version and mcversion + expand 'version':project.version, 'mcversion':project.minecraft.version + } + + // copy everything else, thats not the mcmod.info + from(sourceSets.main.resources.srcDirs) { + exclude 'mcmod.info' + } +} + +jar { +exclude "**/client/gui/inventory/GuiContainer.class" +exclude "**/client/gui/inventory/GuiContainer.java" +} + +task sourceJar(type: Jar) { + from sourceSets.main.java + from new File(root, "dev") + classifier = 'sources' +} + +task devJar(type: Jar) { + from sourceSets.main.output + classifier = 'dev' +} + +artifacts { + archives sourceJar, devJar +} + +uploadArchives { + dependsOn 'reobf' + repositories.mavenDeployer { + configuration = configurations.deployerJars + repository(url: "scp://mobiusstrip.eu/home/mobius/web/maven"){ + authentication(userName: "mobius") + } + + pom { + groupId = project.group + version = project.version + artifactId = project.archivesBaseName + project { + name project.archivesBaseName + packaging 'jar' + description 'Waila ' + url 'http://mobiusstrip.eu' + } + } + } + +} diff --git a/build.properties b/build.properties new file mode 100644 index 0000000..e7efe2c --- /dev/null +++ b/build.properties @@ -0,0 +1,7 @@ +mc_version=1.7.2 +forge_version=10.12.0.1054 +ccl_version=1.1.0.77 +ccc_version=1.0.1 +nei_version=1.0.1 +mod_version=1.0 +waila_version=1.5.2a \ No newline at end of file diff --git a/au/com/bytecode/opencsv/CSVParser.java b/src/main/java/au/com/bytecode/opencsv/CSVParser.java similarity index 100% rename from au/com/bytecode/opencsv/CSVParser.java rename to src/main/java/au/com/bytecode/opencsv/CSVParser.java diff --git a/au/com/bytecode/opencsv/CSVReader.java b/src/main/java/au/com/bytecode/opencsv/CSVReader.java similarity index 100% rename from au/com/bytecode/opencsv/CSVReader.java rename to src/main/java/au/com/bytecode/opencsv/CSVReader.java diff --git a/au/com/bytecode/opencsv/CSVWriter.java b/src/main/java/au/com/bytecode/opencsv/CSVWriter.java similarity index 100% rename from au/com/bytecode/opencsv/CSVWriter.java rename to src/main/java/au/com/bytecode/opencsv/CSVWriter.java diff --git a/au/com/bytecode/opencsv/ResultSetHelper.java b/src/main/java/au/com/bytecode/opencsv/ResultSetHelper.java similarity index 100% rename from au/com/bytecode/opencsv/ResultSetHelper.java rename to src/main/java/au/com/bytecode/opencsv/ResultSetHelper.java diff --git a/au/com/bytecode/opencsv/ResultSetHelperService.java b/src/main/java/au/com/bytecode/opencsv/ResultSetHelperService.java similarity index 100% rename from au/com/bytecode/opencsv/ResultSetHelperService.java rename to src/main/java/au/com/bytecode/opencsv/ResultSetHelperService.java diff --git a/au/com/bytecode/opencsv/bean/ColumnPositionMappingStrategy.java b/src/main/java/au/com/bytecode/opencsv/bean/ColumnPositionMappingStrategy.java similarity index 100% rename from au/com/bytecode/opencsv/bean/ColumnPositionMappingStrategy.java rename to src/main/java/au/com/bytecode/opencsv/bean/ColumnPositionMappingStrategy.java diff --git a/au/com/bytecode/opencsv/bean/CsvToBean.java b/src/main/java/au/com/bytecode/opencsv/bean/CsvToBean.java similarity index 100% rename from au/com/bytecode/opencsv/bean/CsvToBean.java rename to src/main/java/au/com/bytecode/opencsv/bean/CsvToBean.java diff --git a/au/com/bytecode/opencsv/bean/HeaderColumnNameMappingStrategy.java b/src/main/java/au/com/bytecode/opencsv/bean/HeaderColumnNameMappingStrategy.java similarity index 100% rename from au/com/bytecode/opencsv/bean/HeaderColumnNameMappingStrategy.java rename to src/main/java/au/com/bytecode/opencsv/bean/HeaderColumnNameMappingStrategy.java diff --git a/au/com/bytecode/opencsv/bean/HeaderColumnNameTranslateMappingStrategy.java b/src/main/java/au/com/bytecode/opencsv/bean/HeaderColumnNameTranslateMappingStrategy.java similarity index 100% rename from au/com/bytecode/opencsv/bean/HeaderColumnNameTranslateMappingStrategy.java rename to src/main/java/au/com/bytecode/opencsv/bean/HeaderColumnNameTranslateMappingStrategy.java diff --git a/au/com/bytecode/opencsv/bean/MappingStrategy.java b/src/main/java/au/com/bytecode/opencsv/bean/MappingStrategy.java similarity index 100% rename from au/com/bytecode/opencsv/bean/MappingStrategy.java rename to src/main/java/au/com/bytecode/opencsv/bean/MappingStrategy.java diff --git a/au/com/bytecode/opencsv/bean/package.html b/src/main/java/au/com/bytecode/opencsv/bean/package.html similarity index 100% rename from au/com/bytecode/opencsv/bean/package.html rename to src/main/java/au/com/bytecode/opencsv/bean/package.html diff --git a/au/com/bytecode/opencsv/package.html b/src/main/java/au/com/bytecode/opencsv/package.html similarity index 100% rename from au/com/bytecode/opencsv/package.html rename to src/main/java/au/com/bytecode/opencsv/package.html diff --git a/mcp/mobius/waila/Waila.java b/src/main/java/mcp/mobius/waila/Waila.java similarity index 100% rename from mcp/mobius/waila/Waila.java rename to src/main/java/mcp/mobius/waila/Waila.java diff --git a/mcp/mobius/waila/addons/agriculture/AgricultureModule.java b/src/main/java/mcp/mobius/waila/addons/agriculture/AgricultureModule.java similarity index 100% rename from mcp/mobius/waila/addons/agriculture/AgricultureModule.java rename to src/main/java/mcp/mobius/waila/addons/agriculture/AgricultureModule.java diff --git a/mcp/mobius/waila/addons/agriculture/HUDHandlerCrop.java b/src/main/java/mcp/mobius/waila/addons/agriculture/HUDHandlerCrop.java similarity index 100% rename from mcp/mobius/waila/addons/agriculture/HUDHandlerCrop.java rename to src/main/java/mcp/mobius/waila/addons/agriculture/HUDHandlerCrop.java diff --git a/mcp/mobius/waila/addons/appeng/AppEngModule.java b/src/main/java/mcp/mobius/waila/addons/appeng/AppEngModule.java similarity index 100% rename from mcp/mobius/waila/addons/appeng/AppEngModule.java rename to src/main/java/mcp/mobius/waila/addons/appeng/AppEngModule.java diff --git a/mcp/mobius/waila/addons/appeng/HUDAppEngMonitor.java b/src/main/java/mcp/mobius/waila/addons/appeng/HUDAppEngMonitor.java similarity index 100% rename from mcp/mobius/waila/addons/appeng/HUDAppEngMonitor.java rename to src/main/java/mcp/mobius/waila/addons/appeng/HUDAppEngMonitor.java diff --git a/mcp/mobius/waila/addons/betterbarrels/BetterBarrelsModule.java b/src/main/java/mcp/mobius/waila/addons/betterbarrels/BetterBarrelsModule.java similarity index 100% rename from mcp/mobius/waila/addons/betterbarrels/BetterBarrelsModule.java rename to src/main/java/mcp/mobius/waila/addons/betterbarrels/BetterBarrelsModule.java diff --git a/mcp/mobius/waila/addons/betterbarrels/HUDHandlerBBContent.java b/src/main/java/mcp/mobius/waila/addons/betterbarrels/HUDHandlerBBContent.java similarity index 100% rename from mcp/mobius/waila/addons/betterbarrels/HUDHandlerBBContent.java rename to src/main/java/mcp/mobius/waila/addons/betterbarrels/HUDHandlerBBContent.java diff --git a/mcp/mobius/waila/addons/buildcraft/BCModule.java b/src/main/java/mcp/mobius/waila/addons/buildcraft/BCModule.java similarity index 100% rename from mcp/mobius/waila/addons/buildcraft/BCModule.java rename to src/main/java/mcp/mobius/waila/addons/buildcraft/BCModule.java diff --git a/mcp/mobius/waila/addons/buildcraft/BCPowerAPIModule.java b/src/main/java/mcp/mobius/waila/addons/buildcraft/BCPowerAPIModule.java similarity index 100% rename from mcp/mobius/waila/addons/buildcraft/BCPowerAPIModule.java rename to src/main/java/mcp/mobius/waila/addons/buildcraft/BCPowerAPIModule.java diff --git a/mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java b/src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java similarity index 100% rename from mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java rename to src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java diff --git a/mcp/mobius/waila/addons/buildcraft/HUDHandlerIPowerReceptor.java b/src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerIPowerReceptor.java similarity index 100% rename from mcp/mobius/waila/addons/buildcraft/HUDHandlerIPowerReceptor.java rename to src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerIPowerReceptor.java diff --git a/mcp/mobius/waila/addons/buildcraft/WikiData.txt b/src/main/java/mcp/mobius/waila/addons/buildcraft/WikiData.txt similarity index 100% rename from mcp/mobius/waila/addons/buildcraft/WikiData.txt rename to src/main/java/mcp/mobius/waila/addons/buildcraft/WikiData.txt diff --git a/mcp/mobius/waila/addons/carpenters/CarpentersModule.java b/src/main/java/mcp/mobius/waila/addons/carpenters/CarpentersModule.java similarity index 100% rename from mcp/mobius/waila/addons/carpenters/CarpentersModule.java rename to src/main/java/mcp/mobius/waila/addons/carpenters/CarpentersModule.java diff --git a/mcp/mobius/waila/addons/carpenters/HUDCarpentersBlocksTE.java b/src/main/java/mcp/mobius/waila/addons/carpenters/HUDCarpentersBlocksTE.java similarity index 100% rename from mcp/mobius/waila/addons/carpenters/HUDCarpentersBlocksTE.java rename to src/main/java/mcp/mobius/waila/addons/carpenters/HUDCarpentersBlocksTE.java diff --git a/mcp/mobius/waila/addons/enderio/EnderIOModule.java b/src/main/java/mcp/mobius/waila/addons/enderio/EnderIOModule.java similarity index 100% rename from mcp/mobius/waila/addons/enderio/EnderIOModule.java rename to src/main/java/mcp/mobius/waila/addons/enderio/EnderIOModule.java diff --git a/mcp/mobius/waila/addons/enderio/HUDHandlerCapacitor.java b/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerCapacitor.java similarity index 100% rename from mcp/mobius/waila/addons/enderio/HUDHandlerCapacitor.java rename to src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerCapacitor.java diff --git a/mcp/mobius/waila/addons/enderio/HUDHandlerTesseract.java b/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerTesseract.java similarity index 100% rename from mcp/mobius/waila/addons/enderio/HUDHandlerTesseract.java rename to src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerTesseract.java diff --git a/mcp/mobius/waila/addons/enderstorage/EnderStorageModule.java b/src/main/java/mcp/mobius/waila/addons/enderstorage/EnderStorageModule.java similarity index 100% rename from mcp/mobius/waila/addons/enderstorage/EnderStorageModule.java rename to src/main/java/mcp/mobius/waila/addons/enderstorage/EnderStorageModule.java diff --git a/mcp/mobius/waila/addons/enderstorage/HUDHandlerStorage.java b/src/main/java/mcp/mobius/waila/addons/enderstorage/HUDHandlerStorage.java similarity index 100% rename from mcp/mobius/waila/addons/enderstorage/HUDHandlerStorage.java rename to src/main/java/mcp/mobius/waila/addons/enderstorage/HUDHandlerStorage.java diff --git a/mcp/mobius/waila/addons/etb/ETBModule.java b/src/main/java/mcp/mobius/waila/addons/etb/ETBModule.java similarity index 100% rename from mcp/mobius/waila/addons/etb/ETBModule.java rename to src/main/java/mcp/mobius/waila/addons/etb/ETBModule.java diff --git a/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java b/src/main/java/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java similarity index 100% rename from mcp/mobius/waila/addons/etb/HUDHandlerSocket.java rename to src/main/java/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java diff --git a/mcp/mobius/waila/addons/exu/ExtraUtilitiesModule.java b/src/main/java/mcp/mobius/waila/addons/exu/ExtraUtilitiesModule.java similarity index 100% rename from mcp/mobius/waila/addons/exu/ExtraUtilitiesModule.java rename to src/main/java/mcp/mobius/waila/addons/exu/ExtraUtilitiesModule.java diff --git a/mcp/mobius/waila/addons/exu/HUDHandlerDrum.java b/src/main/java/mcp/mobius/waila/addons/exu/HUDHandlerDrum.java similarity index 100% rename from mcp/mobius/waila/addons/exu/HUDHandlerDrum.java rename to src/main/java/mcp/mobius/waila/addons/exu/HUDHandlerDrum.java diff --git a/mcp/mobius/waila/addons/gravestone/GravestoneModule.java b/src/main/java/mcp/mobius/waila/addons/gravestone/GravestoneModule.java similarity index 100% rename from mcp/mobius/waila/addons/gravestone/GravestoneModule.java rename to src/main/java/mcp/mobius/waila/addons/gravestone/GravestoneModule.java diff --git a/mcp/mobius/waila/addons/gravestone/HUDHandlerGravestone.java b/src/main/java/mcp/mobius/waila/addons/gravestone/HUDHandlerGravestone.java similarity index 100% rename from mcp/mobius/waila/addons/gravestone/HUDHandlerGravestone.java rename to src/main/java/mcp/mobius/waila/addons/gravestone/HUDHandlerGravestone.java diff --git a/mcp/mobius/waila/addons/harvestcraft/HUDHandlerPamCrop.java b/src/main/java/mcp/mobius/waila/addons/harvestcraft/HUDHandlerPamCrop.java similarity index 100% rename from mcp/mobius/waila/addons/harvestcraft/HUDHandlerPamCrop.java rename to src/main/java/mcp/mobius/waila/addons/harvestcraft/HUDHandlerPamCrop.java diff --git a/mcp/mobius/waila/addons/harvestcraft/HarvestcraftModule.java b/src/main/java/mcp/mobius/waila/addons/harvestcraft/HarvestcraftModule.java similarity index 100% rename from mcp/mobius/waila/addons/harvestcraft/HarvestcraftModule.java rename to src/main/java/mcp/mobius/waila/addons/harvestcraft/HarvestcraftModule.java diff --git a/mcp/mobius/waila/addons/ic2/HUDHandlerTEBaseGenerator.java b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEBaseGenerator.java similarity index 100% rename from mcp/mobius/waila/addons/ic2/HUDHandlerTEBaseGenerator.java rename to src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEBaseGenerator.java diff --git a/mcp/mobius/waila/addons/ic2/HUDHandlerTEElectricBlock.java b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEElectricBlock.java similarity index 100% rename from mcp/mobius/waila/addons/ic2/HUDHandlerTEElectricBlock.java rename to src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEElectricBlock.java diff --git a/mcp/mobius/waila/addons/ic2/HUDHandlerTEStandardMachine.java b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEStandardMachine.java similarity index 100% rename from mcp/mobius/waila/addons/ic2/HUDHandlerTEStandardMachine.java rename to src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEStandardMachine.java diff --git a/mcp/mobius/waila/addons/ic2/HUDHandlerTETradeOMat.java b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTETradeOMat.java similarity index 100% rename from mcp/mobius/waila/addons/ic2/HUDHandlerTETradeOMat.java rename to src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTETradeOMat.java diff --git a/mcp/mobius/waila/addons/ic2/IC2Module.java b/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java similarity index 100% rename from mcp/mobius/waila/addons/ic2/IC2Module.java rename to src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java diff --git a/mcp/mobius/waila/addons/ic2/IC2Upgrades.java b/src/main/java/mcp/mobius/waila/addons/ic2/IC2Upgrades.java similarity index 100% rename from mcp/mobius/waila/addons/ic2/IC2Upgrades.java rename to src/main/java/mcp/mobius/waila/addons/ic2/IC2Upgrades.java diff --git a/mcp/mobius/waila/addons/magicalcrops/HUDHandlerMagicalCrops.java b/src/main/java/mcp/mobius/waila/addons/magicalcrops/HUDHandlerMagicalCrops.java similarity index 100% rename from mcp/mobius/waila/addons/magicalcrops/HUDHandlerMagicalCrops.java rename to src/main/java/mcp/mobius/waila/addons/magicalcrops/HUDHandlerMagicalCrops.java diff --git a/mcp/mobius/waila/addons/magicalcrops/MagicalCropsModule.java b/src/main/java/mcp/mobius/waila/addons/magicalcrops/MagicalCropsModule.java similarity index 100% rename from mcp/mobius/waila/addons/magicalcrops/MagicalCropsModule.java rename to src/main/java/mcp/mobius/waila/addons/magicalcrops/MagicalCropsModule.java diff --git a/mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java b/src/main/java/mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java similarity index 100% rename from mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java rename to src/main/java/mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java diff --git a/mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java b/src/main/java/mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java similarity index 100% rename from mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java rename to src/main/java/mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java diff --git a/mcp/mobius/waila/addons/projectred/HUDDecoratorRsGateLogic.java b/src/main/java/mcp/mobius/waila/addons/projectred/HUDDecoratorRsGateLogic.java similarity index 100% rename from mcp/mobius/waila/addons/projectred/HUDDecoratorRsGateLogic.java rename to src/main/java/mcp/mobius/waila/addons/projectred/HUDDecoratorRsGateLogic.java diff --git a/mcp/mobius/waila/addons/projectred/HUDFMPGateLogic.java b/src/main/java/mcp/mobius/waila/addons/projectred/HUDFMPGateLogic.java similarity index 100% rename from mcp/mobius/waila/addons/projectred/HUDFMPGateLogic.java rename to src/main/java/mcp/mobius/waila/addons/projectred/HUDFMPGateLogic.java diff --git a/mcp/mobius/waila/addons/projectred/ProjectRedModule.java b/src/main/java/mcp/mobius/waila/addons/projectred/ProjectRedModule.java similarity index 100% rename from mcp/mobius/waila/addons/projectred/ProjectRedModule.java rename to src/main/java/mcp/mobius/waila/addons/projectred/ProjectRedModule.java diff --git a/mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java b/src/main/java/mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java similarity index 100% rename from mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java rename to src/main/java/mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java diff --git a/mcp/mobius/waila/addons/railcraft/RailcraftModule.java b/src/main/java/mcp/mobius/waila/addons/railcraft/RailcraftModule.java similarity index 100% rename from mcp/mobius/waila/addons/railcraft/RailcraftModule.java rename to src/main/java/mcp/mobius/waila/addons/railcraft/RailcraftModule.java diff --git a/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java b/src/main/java/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java similarity index 100% rename from mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java rename to src/main/java/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java diff --git a/mcp/mobius/waila/addons/secretrooms/SecretRoomsModule.java b/src/main/java/mcp/mobius/waila/addons/secretrooms/SecretRoomsModule.java similarity index 100% rename from mcp/mobius/waila/addons/secretrooms/SecretRoomsModule.java rename to src/main/java/mcp/mobius/waila/addons/secretrooms/SecretRoomsModule.java diff --git a/mcp/mobius/waila/addons/statues/HUDHandlerStatues.java b/src/main/java/mcp/mobius/waila/addons/statues/HUDHandlerStatues.java similarity index 100% rename from mcp/mobius/waila/addons/statues/HUDHandlerStatues.java rename to src/main/java/mcp/mobius/waila/addons/statues/HUDHandlerStatues.java diff --git a/mcp/mobius/waila/addons/statues/StatuesModule.java b/src/main/java/mcp/mobius/waila/addons/statues/StatuesModule.java similarity index 100% rename from mcp/mobius/waila/addons/statues/StatuesModule.java rename to src/main/java/mcp/mobius/waila/addons/statues/StatuesModule.java diff --git a/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java similarity index 100% rename from mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java rename to src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java diff --git a/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java similarity index 100% rename from mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java rename to src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java diff --git a/mcp/mobius/waila/addons/stevescarts/HUDLiquidManager.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDLiquidManager.java similarity index 100% rename from mcp/mobius/waila/addons/stevescarts/HUDLiquidManager.java rename to src/main/java/mcp/mobius/waila/addons/stevescarts/HUDLiquidManager.java diff --git a/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java similarity index 100% rename from mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java rename to src/main/java/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java diff --git a/mcp/mobius/waila/addons/stevescarts/StevesCartsModule.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/StevesCartsModule.java similarity index 100% rename from mcp/mobius/waila/addons/stevescarts/StevesCartsModule.java rename to src/main/java/mcp/mobius/waila/addons/stevescarts/StevesCartsModule.java diff --git a/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java b/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java similarity index 100% rename from mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java rename to src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java diff --git a/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java b/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java similarity index 100% rename from mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java rename to src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java diff --git a/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitFluid.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitFluid.java similarity index 100% rename from mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitFluid.java rename to src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitFluid.java diff --git a/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitItem.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitItem.java similarity index 100% rename from mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitItem.java rename to src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerConduitItem.java diff --git a/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java similarity index 100% rename from mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java rename to src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java diff --git a/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java similarity index 100% rename from mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java rename to src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java diff --git a/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerISecureTile.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerISecureTile.java similarity index 100% rename from mcp/mobius/waila/addons/thermalexpansion/HUDHandlerISecureTile.java rename to src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerISecureTile.java diff --git a/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java similarity index 100% rename from mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java rename to src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java diff --git a/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTesseract.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTesseract.java similarity index 100% rename from mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTesseract.java rename to src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTesseract.java diff --git a/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java similarity index 100% rename from mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java rename to src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java diff --git a/mcp/mobius/waila/addons/twilightforest/TwilightForestGenericOverride.java b/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestGenericOverride.java similarity index 100% rename from mcp/mobius/waila/addons/twilightforest/TwilightForestGenericOverride.java rename to src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestGenericOverride.java diff --git a/mcp/mobius/waila/addons/twilightforest/TwilightForestModule.java b/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestModule.java similarity index 100% rename from mcp/mobius/waila/addons/twilightforest/TwilightForestModule.java rename to src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestModule.java diff --git a/mcp/mobius/waila/addons/vanillamc/HUDDecoratorVanilla.java b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDDecoratorVanilla.java similarity index 100% rename from mcp/mobius/waila/addons/vanillamc/HUDDecoratorVanilla.java rename to src/main/java/mcp/mobius/waila/addons/vanillamc/HUDDecoratorVanilla.java diff --git a/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java similarity index 100% rename from mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java rename to src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java diff --git a/mcp/mobius/waila/addons/vanillamc/WikiData.csv b/src/main/java/mcp/mobius/waila/addons/vanillamc/WikiData.csv similarity index 100% rename from mcp/mobius/waila/addons/vanillamc/WikiData.csv rename to src/main/java/mcp/mobius/waila/addons/vanillamc/WikiData.csv diff --git a/mcp/mobius/waila/addons/vanillamc/WikiData.txt b/src/main/java/mcp/mobius/waila/addons/vanillamc/WikiData.txt similarity index 100% rename from mcp/mobius/waila/addons/vanillamc/WikiData.txt rename to src/main/java/mcp/mobius/waila/addons/vanillamc/WikiData.txt diff --git a/mcp/mobius/waila/addons/vanillamc/WikiData_old.csv b/src/main/java/mcp/mobius/waila/addons/vanillamc/WikiData_old.csv similarity index 100% rename from mcp/mobius/waila/addons/vanillamc/WikiData_old.csv rename to src/main/java/mcp/mobius/waila/addons/vanillamc/WikiData_old.csv diff --git a/mcp/mobius/waila/api/IWailaBlock.java b/src/main/java/mcp/mobius/waila/api/IWailaBlock.java similarity index 100% rename from mcp/mobius/waila/api/IWailaBlock.java rename to src/main/java/mcp/mobius/waila/api/IWailaBlock.java diff --git a/mcp/mobius/waila/api/IWailaBlockDecorator.java b/src/main/java/mcp/mobius/waila/api/IWailaBlockDecorator.java similarity index 100% rename from mcp/mobius/waila/api/IWailaBlockDecorator.java rename to src/main/java/mcp/mobius/waila/api/IWailaBlockDecorator.java diff --git a/mcp/mobius/waila/api/IWailaConfigHandler.java b/src/main/java/mcp/mobius/waila/api/IWailaConfigHandler.java similarity index 100% rename from mcp/mobius/waila/api/IWailaConfigHandler.java rename to src/main/java/mcp/mobius/waila/api/IWailaConfigHandler.java diff --git a/mcp/mobius/waila/api/IWailaDataAccessor.java b/src/main/java/mcp/mobius/waila/api/IWailaDataAccessor.java similarity index 100% rename from mcp/mobius/waila/api/IWailaDataAccessor.java rename to src/main/java/mcp/mobius/waila/api/IWailaDataAccessor.java diff --git a/mcp/mobius/waila/api/IWailaDataProvider.java b/src/main/java/mcp/mobius/waila/api/IWailaDataProvider.java similarity index 100% rename from mcp/mobius/waila/api/IWailaDataProvider.java rename to src/main/java/mcp/mobius/waila/api/IWailaDataProvider.java diff --git a/mcp/mobius/waila/api/IWailaEntityAccessor.java b/src/main/java/mcp/mobius/waila/api/IWailaEntityAccessor.java similarity index 100% rename from mcp/mobius/waila/api/IWailaEntityAccessor.java rename to src/main/java/mcp/mobius/waila/api/IWailaEntityAccessor.java diff --git a/mcp/mobius/waila/api/IWailaEntityProvider.java b/src/main/java/mcp/mobius/waila/api/IWailaEntityProvider.java similarity index 100% rename from mcp/mobius/waila/api/IWailaEntityProvider.java rename to src/main/java/mcp/mobius/waila/api/IWailaEntityProvider.java diff --git a/mcp/mobius/waila/api/IWailaFMPAccessor.java b/src/main/java/mcp/mobius/waila/api/IWailaFMPAccessor.java similarity index 100% rename from mcp/mobius/waila/api/IWailaFMPAccessor.java rename to src/main/java/mcp/mobius/waila/api/IWailaFMPAccessor.java diff --git a/mcp/mobius/waila/api/IWailaFMPDecorator.java b/src/main/java/mcp/mobius/waila/api/IWailaFMPDecorator.java similarity index 100% rename from mcp/mobius/waila/api/IWailaFMPDecorator.java rename to src/main/java/mcp/mobius/waila/api/IWailaFMPDecorator.java diff --git a/mcp/mobius/waila/api/IWailaFMPProvider.java b/src/main/java/mcp/mobius/waila/api/IWailaFMPProvider.java similarity index 100% rename from mcp/mobius/waila/api/IWailaFMPProvider.java rename to src/main/java/mcp/mobius/waila/api/IWailaFMPProvider.java diff --git a/mcp/mobius/waila/api/IWailaRegistrar.java b/src/main/java/mcp/mobius/waila/api/IWailaRegistrar.java similarity index 100% rename from mcp/mobius/waila/api/IWailaRegistrar.java rename to src/main/java/mcp/mobius/waila/api/IWailaRegistrar.java diff --git a/mcp/mobius/waila/api/IWailaSummaryProvider.java b/src/main/java/mcp/mobius/waila/api/IWailaSummaryProvider.java similarity index 100% rename from mcp/mobius/waila/api/IWailaSummaryProvider.java rename to src/main/java/mcp/mobius/waila/api/IWailaSummaryProvider.java diff --git a/mcp/mobius/waila/api/SpecialChars.java b/src/main/java/mcp/mobius/waila/api/SpecialChars.java similarity index 100% rename from mcp/mobius/waila/api/SpecialChars.java rename to src/main/java/mcp/mobius/waila/api/SpecialChars.java diff --git a/mcp/mobius/waila/api/impl/ConfigHandler.java b/src/main/java/mcp/mobius/waila/api/impl/ConfigHandler.java similarity index 100% rename from mcp/mobius/waila/api/impl/ConfigHandler.java rename to src/main/java/mcp/mobius/waila/api/impl/ConfigHandler.java diff --git a/mcp/mobius/waila/api/impl/ConfigModule.java b/src/main/java/mcp/mobius/waila/api/impl/ConfigModule.java similarity index 100% rename from mcp/mobius/waila/api/impl/ConfigModule.java rename to src/main/java/mcp/mobius/waila/api/impl/ConfigModule.java diff --git a/mcp/mobius/waila/api/impl/DataAccessorBlock.java b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorBlock.java similarity index 100% rename from mcp/mobius/waila/api/impl/DataAccessorBlock.java rename to src/main/java/mcp/mobius/waila/api/impl/DataAccessorBlock.java diff --git a/mcp/mobius/waila/api/impl/DataAccessorEntity.java b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorEntity.java similarity index 100% rename from mcp/mobius/waila/api/impl/DataAccessorEntity.java rename to src/main/java/mcp/mobius/waila/api/impl/DataAccessorEntity.java diff --git a/mcp/mobius/waila/api/impl/DataAccessorFMP.java b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorFMP.java similarity index 100% rename from mcp/mobius/waila/api/impl/DataAccessorFMP.java rename to src/main/java/mcp/mobius/waila/api/impl/DataAccessorFMP.java diff --git a/mcp/mobius/waila/api/impl/MetaDataProvider.java b/src/main/java/mcp/mobius/waila/api/impl/MetaDataProvider.java similarity index 100% rename from mcp/mobius/waila/api/impl/MetaDataProvider.java rename to src/main/java/mcp/mobius/waila/api/impl/MetaDataProvider.java diff --git a/mcp/mobius/waila/api/impl/ModuleRegistrar.java b/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java similarity index 100% rename from mcp/mobius/waila/api/impl/ModuleRegistrar.java rename to src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java diff --git a/mcp/mobius/waila/api/package-info.java b/src/main/java/mcp/mobius/waila/api/package-info.java similarity index 100% rename from mcp/mobius/waila/api/package-info.java rename to src/main/java/mcp/mobius/waila/api/package-info.java diff --git a/mcp/mobius/waila/cbcore/LangUtil.java b/src/main/java/mcp/mobius/waila/cbcore/LangUtil.java similarity index 100% rename from mcp/mobius/waila/cbcore/LangUtil.java rename to src/main/java/mcp/mobius/waila/cbcore/LangUtil.java diff --git a/mcp/mobius/waila/client/KeyEvent.java b/src/main/java/mcp/mobius/waila/client/KeyEvent.java similarity index 100% rename from mcp/mobius/waila/client/KeyEvent.java rename to src/main/java/mcp/mobius/waila/client/KeyEvent.java diff --git a/mcp/mobius/waila/client/ProxyClient.java b/src/main/java/mcp/mobius/waila/client/ProxyClient.java similarity index 99% rename from mcp/mobius/waila/client/ProxyClient.java rename to src/main/java/mcp/mobius/waila/client/ProxyClient.java index f0b0c5d..df42c83 100644 --- a/mcp/mobius/waila/client/ProxyClient.java +++ b/src/main/java/mcp/mobius/waila/client/ProxyClient.java @@ -150,7 +150,7 @@ public class ProxyClient extends ProxyServer { StevesCartsModule.register(); /* Secret Rooms */ - SecretRoomsModule.register(); + //SecretRoomsModule.register(); /* Carpenter's Blocks */ CarpentersModule.register(); diff --git a/mcp/mobius/waila/gui/events/MouseEvent.java b/src/main/java/mcp/mobius/waila/gui/events/MouseEvent.java similarity index 100% rename from mcp/mobius/waila/gui/events/MouseEvent.java rename to src/main/java/mcp/mobius/waila/gui/events/MouseEvent.java diff --git a/mcp/mobius/waila/gui/helpers/ReverseIterator.java b/src/main/java/mcp/mobius/waila/gui/helpers/ReverseIterator.java similarity index 100% rename from mcp/mobius/waila/gui/helpers/ReverseIterator.java rename to src/main/java/mcp/mobius/waila/gui/helpers/ReverseIterator.java diff --git a/mcp/mobius/waila/gui/helpers/UIException.java b/src/main/java/mcp/mobius/waila/gui/helpers/UIException.java similarity index 100% rename from mcp/mobius/waila/gui/helpers/UIException.java rename to src/main/java/mcp/mobius/waila/gui/helpers/UIException.java diff --git a/mcp/mobius/waila/gui/helpers/UIHelper.java b/src/main/java/mcp/mobius/waila/gui/helpers/UIHelper.java similarity index 100% rename from mcp/mobius/waila/gui/helpers/UIHelper.java rename to src/main/java/mcp/mobius/waila/gui/helpers/UIHelper.java diff --git a/mcp/mobius/waila/gui/interfaces/CType.java b/src/main/java/mcp/mobius/waila/gui/interfaces/CType.java similarity index 100% rename from mcp/mobius/waila/gui/interfaces/CType.java rename to src/main/java/mcp/mobius/waila/gui/interfaces/CType.java diff --git a/mcp/mobius/waila/gui/interfaces/IWidget.java b/src/main/java/mcp/mobius/waila/gui/interfaces/IWidget.java similarity index 100% rename from mcp/mobius/waila/gui/interfaces/IWidget.java rename to src/main/java/mcp/mobius/waila/gui/interfaces/IWidget.java diff --git a/mcp/mobius/waila/gui/interfaces/RenderPriority.java b/src/main/java/mcp/mobius/waila/gui/interfaces/RenderPriority.java similarity index 100% rename from mcp/mobius/waila/gui/interfaces/RenderPriority.java rename to src/main/java/mcp/mobius/waila/gui/interfaces/RenderPriority.java diff --git a/mcp/mobius/waila/gui/interfaces/Signal.java b/src/main/java/mcp/mobius/waila/gui/interfaces/Signal.java similarity index 100% rename from mcp/mobius/waila/gui/interfaces/Signal.java rename to src/main/java/mcp/mobius/waila/gui/interfaces/Signal.java diff --git a/mcp/mobius/waila/gui/interfaces/WAlign.java b/src/main/java/mcp/mobius/waila/gui/interfaces/WAlign.java similarity index 100% rename from mcp/mobius/waila/gui/interfaces/WAlign.java rename to src/main/java/mcp/mobius/waila/gui/interfaces/WAlign.java diff --git a/mcp/mobius/waila/gui/screens/ScreenBase.java b/src/main/java/mcp/mobius/waila/gui/screens/ScreenBase.java similarity index 100% rename from mcp/mobius/waila/gui/screens/ScreenBase.java rename to src/main/java/mcp/mobius/waila/gui/screens/ScreenBase.java diff --git a/mcp/mobius/waila/gui/screens/config/ScreenConfig.java b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenConfig.java similarity index 100% rename from mcp/mobius/waila/gui/screens/config/ScreenConfig.java rename to src/main/java/mcp/mobius/waila/gui/screens/config/ScreenConfig.java diff --git a/mcp/mobius/waila/gui/screens/config/ScreenHUDConfig.java b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenHUDConfig.java similarity index 100% rename from mcp/mobius/waila/gui/screens/config/ScreenHUDConfig.java rename to src/main/java/mcp/mobius/waila/gui/screens/config/ScreenHUDConfig.java diff --git a/mcp/mobius/waila/gui/screens/config/ScreenModuleChoice.java b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleChoice.java similarity index 100% rename from mcp/mobius/waila/gui/screens/config/ScreenModuleChoice.java rename to src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleChoice.java diff --git a/mcp/mobius/waila/gui/screens/config/ScreenModuleConfig.java b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleConfig.java similarity index 100% rename from mcp/mobius/waila/gui/screens/config/ScreenModuleConfig.java rename to src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleConfig.java diff --git a/mcp/mobius/waila/gui/screens/config/ScreenWailaConfig.java b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenWailaConfig.java similarity index 100% rename from mcp/mobius/waila/gui/screens/config/ScreenWailaConfig.java rename to src/main/java/mcp/mobius/waila/gui/screens/config/ScreenWailaConfig.java diff --git a/mcp/mobius/waila/gui/screens/info/ScreenEnchants.java b/src/main/java/mcp/mobius/waila/gui/screens/info/ScreenEnchants.java similarity index 100% rename from mcp/mobius/waila/gui/screens/info/ScreenEnchants.java rename to src/main/java/mcp/mobius/waila/gui/screens/info/ScreenEnchants.java diff --git a/mcp/mobius/waila/gui/testing/ScreenTest.java b/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest.java similarity index 100% rename from mcp/mobius/waila/gui/testing/ScreenTest.java rename to src/main/java/mcp/mobius/waila/gui/testing/ScreenTest.java diff --git a/mcp/mobius/waila/gui/testing/ScreenTest2.java b/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest2.java similarity index 100% rename from mcp/mobius/waila/gui/testing/ScreenTest2.java rename to src/main/java/mcp/mobius/waila/gui/testing/ScreenTest2.java diff --git a/mcp/mobius/waila/gui/truetyper/FontHelper.java b/src/main/java/mcp/mobius/waila/gui/truetyper/FontHelper.java similarity index 100% rename from mcp/mobius/waila/gui/truetyper/FontHelper.java rename to src/main/java/mcp/mobius/waila/gui/truetyper/FontHelper.java diff --git a/mcp/mobius/waila/gui/truetyper/FontLoader.java b/src/main/java/mcp/mobius/waila/gui/truetyper/FontLoader.java similarity index 100% rename from mcp/mobius/waila/gui/truetyper/FontLoader.java rename to src/main/java/mcp/mobius/waila/gui/truetyper/FontLoader.java diff --git a/mcp/mobius/waila/gui/truetyper/Formatter.java b/src/main/java/mcp/mobius/waila/gui/truetyper/Formatter.java similarity index 100% rename from mcp/mobius/waila/gui/truetyper/Formatter.java rename to src/main/java/mcp/mobius/waila/gui/truetyper/Formatter.java diff --git a/mcp/mobius/waila/gui/truetyper/Test.java b/src/main/java/mcp/mobius/waila/gui/truetyper/Test.java similarity index 100% rename from mcp/mobius/waila/gui/truetyper/Test.java rename to src/main/java/mcp/mobius/waila/gui/truetyper/Test.java diff --git a/mcp/mobius/waila/gui/truetyper/TrueTypeFont.java b/src/main/java/mcp/mobius/waila/gui/truetyper/TrueTypeFont.java similarity index 100% rename from mcp/mobius/waila/gui/truetyper/TrueTypeFont.java rename to src/main/java/mcp/mobius/waila/gui/truetyper/TrueTypeFont.java diff --git a/mcp/mobius/waila/gui/widgets/ItemStackDisplay.java b/src/main/java/mcp/mobius/waila/gui/widgets/ItemStackDisplay.java similarity index 100% rename from mcp/mobius/waila/gui/widgets/ItemStackDisplay.java rename to src/main/java/mcp/mobius/waila/gui/widgets/ItemStackDisplay.java diff --git a/mcp/mobius/waila/gui/widgets/LabelFixedFont.java b/src/main/java/mcp/mobius/waila/gui/widgets/LabelFixedFont.java similarity index 100% rename from mcp/mobius/waila/gui/widgets/LabelFixedFont.java rename to src/main/java/mcp/mobius/waila/gui/widgets/LabelFixedFont.java diff --git a/mcp/mobius/waila/gui/widgets/LayoutBase.java b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutBase.java similarity index 100% rename from mcp/mobius/waila/gui/widgets/LayoutBase.java rename to src/main/java/mcp/mobius/waila/gui/widgets/LayoutBase.java diff --git a/mcp/mobius/waila/gui/widgets/LayoutCanvas.java b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCanvas.java similarity index 100% rename from mcp/mobius/waila/gui/widgets/LayoutCanvas.java rename to src/main/java/mcp/mobius/waila/gui/widgets/LayoutCanvas.java diff --git a/mcp/mobius/waila/gui/widgets/LayoutCropping.java b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCropping.java similarity index 100% rename from mcp/mobius/waila/gui/widgets/LayoutCropping.java rename to src/main/java/mcp/mobius/waila/gui/widgets/LayoutCropping.java diff --git a/mcp/mobius/waila/gui/widgets/LayoutMargin.java b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutMargin.java similarity index 100% rename from mcp/mobius/waila/gui/widgets/LayoutMargin.java rename to src/main/java/mcp/mobius/waila/gui/widgets/LayoutMargin.java diff --git a/mcp/mobius/waila/gui/widgets/PictureDisplay.java b/src/main/java/mcp/mobius/waila/gui/widgets/PictureDisplay.java similarity index 100% rename from mcp/mobius/waila/gui/widgets/PictureDisplay.java rename to src/main/java/mcp/mobius/waila/gui/widgets/PictureDisplay.java diff --git a/mcp/mobius/waila/gui/widgets/PictureSwitch.java b/src/main/java/mcp/mobius/waila/gui/widgets/PictureSwitch.java similarity index 100% rename from mcp/mobius/waila/gui/widgets/PictureSwitch.java rename to src/main/java/mcp/mobius/waila/gui/widgets/PictureSwitch.java diff --git a/mcp/mobius/waila/gui/widgets/ViewTable.java b/src/main/java/mcp/mobius/waila/gui/widgets/ViewTable.java similarity index 100% rename from mcp/mobius/waila/gui/widgets/ViewTable.java rename to src/main/java/mcp/mobius/waila/gui/widgets/ViewTable.java diff --git a/mcp/mobius/waila/gui/widgets/ViewportScrollable.java b/src/main/java/mcp/mobius/waila/gui/widgets/ViewportScrollable.java similarity index 100% rename from mcp/mobius/waila/gui/widgets/ViewportScrollable.java rename to src/main/java/mcp/mobius/waila/gui/widgets/ViewportScrollable.java diff --git a/mcp/mobius/waila/gui/widgets/WidgetBase.java b/src/main/java/mcp/mobius/waila/gui/widgets/WidgetBase.java similarity index 100% rename from mcp/mobius/waila/gui/widgets/WidgetBase.java rename to src/main/java/mcp/mobius/waila/gui/widgets/WidgetBase.java diff --git a/mcp/mobius/waila/gui/widgets/WidgetGeometry.java b/src/main/java/mcp/mobius/waila/gui/widgets/WidgetGeometry.java similarity index 100% rename from mcp/mobius/waila/gui/widgets/WidgetGeometry.java rename to src/main/java/mcp/mobius/waila/gui/widgets/WidgetGeometry.java diff --git a/mcp/mobius/waila/gui/widgets/buttons/ButtonBase.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBase.java similarity index 100% rename from mcp/mobius/waila/gui/widgets/buttons/ButtonBase.java rename to src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBase.java diff --git a/mcp/mobius/waila/gui/widgets/buttons/ButtonBoolean.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBoolean.java similarity index 100% rename from mcp/mobius/waila/gui/widgets/buttons/ButtonBoolean.java rename to src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBoolean.java diff --git a/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfig.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfig.java similarity index 100% rename from mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfig.java rename to src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfig.java diff --git a/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfigRemote.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfigRemote.java similarity index 100% rename from mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfigRemote.java rename to src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfigRemote.java diff --git a/mcp/mobius/waila/gui/widgets/buttons/ButtonContainer.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainer.java similarity index 100% rename from mcp/mobius/waila/gui/widgets/buttons/ButtonContainer.java rename to src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainer.java diff --git a/mcp/mobius/waila/gui/widgets/buttons/ButtonContainerLabel.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainerLabel.java similarity index 100% rename from mcp/mobius/waila/gui/widgets/buttons/ButtonContainerLabel.java rename to src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainerLabel.java diff --git a/mcp/mobius/waila/gui/widgets/buttons/ButtonInteger.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonInteger.java similarity index 100% rename from mcp/mobius/waila/gui/widgets/buttons/ButtonInteger.java rename to src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonInteger.java diff --git a/mcp/mobius/waila/gui/widgets/buttons/ButtonIntegerConfig.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonIntegerConfig.java similarity index 100% rename from mcp/mobius/waila/gui/widgets/buttons/ButtonIntegerConfig.java rename to src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonIntegerConfig.java diff --git a/mcp/mobius/waila/gui/widgets/buttons/ButtonLabel.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonLabel.java similarity index 100% rename from mcp/mobius/waila/gui/widgets/buttons/ButtonLabel.java rename to src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonLabel.java diff --git a/mcp/mobius/waila/gui/widgets/buttons/ButtonScreenChange.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonScreenChange.java similarity index 100% rename from mcp/mobius/waila/gui/widgets/buttons/ButtonScreenChange.java rename to src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonScreenChange.java diff --git a/mcp/mobius/waila/gui/widgets/movable/PictureMovableRC.java b/src/main/java/mcp/mobius/waila/gui/widgets/movable/PictureMovableRC.java similarity index 100% rename from mcp/mobius/waila/gui/widgets/movable/PictureMovableRC.java rename to src/main/java/mcp/mobius/waila/gui/widgets/movable/PictureMovableRC.java diff --git a/mcp/mobius/waila/gui_old/BaseWailaScreen.java.bak b/src/main/java/mcp/mobius/waila/gui_old/BaseWailaScreen.java.bak similarity index 100% rename from mcp/mobius/waila/gui_old/BaseWailaScreen.java.bak rename to src/main/java/mcp/mobius/waila/gui_old/BaseWailaScreen.java.bak diff --git a/mcp/mobius/waila/gui_old/GuiIngameWiki.java.bak b/src/main/java/mcp/mobius/waila/gui_old/GuiIngameWiki.java.bak similarity index 100% rename from mcp/mobius/waila/gui_old/GuiIngameWiki.java.bak rename to src/main/java/mcp/mobius/waila/gui_old/GuiIngameWiki.java.bak diff --git a/mcp/mobius/waila/gui_old/GuiTechTree.java.bak b/src/main/java/mcp/mobius/waila/gui_old/GuiTechTree.java.bak similarity index 100% rename from mcp/mobius/waila/gui_old/GuiTechTree.java.bak rename to src/main/java/mcp/mobius/waila/gui_old/GuiTechTree.java.bak diff --git a/mcp/mobius/waila/gui_old/NEI/CraftingTreeNode.java.bak b/src/main/java/mcp/mobius/waila/gui_old/NEI/CraftingTreeNode.java.bak similarity index 100% rename from mcp/mobius/waila/gui_old/NEI/CraftingTreeNode.java.bak rename to src/main/java/mcp/mobius/waila/gui_old/NEI/CraftingTreeNode.java.bak diff --git a/mcp/mobius/waila/gui_old/NEI/HandlerTechTree.java.bak b/src/main/java/mcp/mobius/waila/gui_old/NEI/HandlerTechTree.java.bak similarity index 100% rename from mcp/mobius/waila/gui_old/NEI/HandlerTechTree.java.bak rename to src/main/java/mcp/mobius/waila/gui_old/NEI/HandlerTechTree.java.bak diff --git a/mcp/mobius/waila/gui_old/NEI/HandlerWiki.java.bak b/src/main/java/mcp/mobius/waila/gui_old/NEI/HandlerWiki.java.bak similarity index 100% rename from mcp/mobius/waila/gui_old/NEI/HandlerWiki.java.bak rename to src/main/java/mcp/mobius/waila/gui_old/NEI/HandlerWiki.java.bak diff --git a/mcp/mobius/waila/gui_old/widget/BaseWidget.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget/BaseWidget.java.bak similarity index 100% rename from mcp/mobius/waila/gui_old/widget/BaseWidget.java.bak rename to src/main/java/mcp/mobius/waila/gui_old/widget/BaseWidget.java.bak diff --git a/mcp/mobius/waila/gui_old/widget/ComponentDisplay.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget/ComponentDisplay.java.bak similarity index 100% rename from mcp/mobius/waila/gui_old/widget/ComponentDisplay.java.bak rename to src/main/java/mcp/mobius/waila/gui_old/widget/ComponentDisplay.java.bak diff --git a/mcp/mobius/waila/gui_old/widget/ContainerTable.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget/ContainerTable.java.bak similarity index 100% rename from mcp/mobius/waila/gui_old/widget/ContainerTable.java.bak rename to src/main/java/mcp/mobius/waila/gui_old/widget/ContainerTable.java.bak diff --git a/mcp/mobius/waila/gui_old/widget/DraggableViewport.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget/DraggableViewport.java.bak similarity index 100% rename from mcp/mobius/waila/gui_old/widget/DraggableViewport.java.bak rename to src/main/java/mcp/mobius/waila/gui_old/widget/DraggableViewport.java.bak diff --git a/mcp/mobius/waila/gui_old/widget/IWidget.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget/IWidget.java.bak similarity index 100% rename from mcp/mobius/waila/gui_old/widget/IWidget.java.bak rename to src/main/java/mcp/mobius/waila/gui_old/widget/IWidget.java.bak diff --git a/mcp/mobius/waila/gui_old/widget/Label.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget/Label.java.bak similarity index 100% rename from mcp/mobius/waila/gui_old/widget/Label.java.bak rename to src/main/java/mcp/mobius/waila/gui_old/widget/Label.java.bak diff --git a/mcp/mobius/waila/gui_old/widget/StackDisplay.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget/StackDisplay.java.bak similarity index 100% rename from mcp/mobius/waila/gui_old/widget/StackDisplay.java.bak rename to src/main/java/mcp/mobius/waila/gui_old/widget/StackDisplay.java.bak diff --git a/mcp/mobius/waila/gui_old/widget/VerticalScrollBar.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget/VerticalScrollBar.java.bak similarity index 100% rename from mcp/mobius/waila/gui_old/widget/VerticalScrollBar.java.bak rename to src/main/java/mcp/mobius/waila/gui_old/widget/VerticalScrollBar.java.bak diff --git a/mcp/mobius/waila/gui_old/widget/WikiReader.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget/WikiReader.java.bak similarity index 100% rename from mcp/mobius/waila/gui_old/widget/WikiReader.java.bak rename to src/main/java/mcp/mobius/waila/gui_old/widget/WikiReader.java.bak diff --git a/mcp/mobius/waila/gui_old/widget_old/Button2States.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget_old/Button2States.java.bak similarity index 100% rename from mcp/mobius/waila/gui_old/widget_old/Button2States.java.bak rename to src/main/java/mcp/mobius/waila/gui_old/widget_old/Button2States.java.bak diff --git a/mcp/mobius/waila/gui_old/widget_old/ButtonChangeScreen.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonChangeScreen.java.bak similarity index 100% rename from mcp/mobius/waila/gui_old/widget_old/ButtonChangeScreen.java.bak rename to src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonChangeScreen.java.bak diff --git a/mcp/mobius/waila/gui_old/widget_old/ButtonConfigNEI.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigNEI.java.bak similarity index 100% rename from mcp/mobius/waila/gui_old/widget_old/ButtonConfigNEI.java.bak rename to src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigNEI.java.bak diff --git a/mcp/mobius/waila/gui_old/widget_old/ButtonConfigOption.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigOption.java.bak similarity index 100% rename from mcp/mobius/waila/gui_old/widget_old/ButtonConfigOption.java.bak rename to src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigOption.java.bak diff --git a/mcp/mobius/waila/gui_old/widget_old/ButtonConfigRemote.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigRemote.java.bak similarity index 100% rename from mcp/mobius/waila/gui_old/widget_old/ButtonConfigRemote.java.bak rename to src/main/java/mcp/mobius/waila/gui_old/widget_old/ButtonConfigRemote.java.bak diff --git a/mcp/mobius/waila/gui_old/widget_old/ContainerButtons.java.bak b/src/main/java/mcp/mobius/waila/gui_old/widget_old/ContainerButtons.java.bak similarity index 100% rename from mcp/mobius/waila/gui_old/widget_old/ContainerButtons.java.bak rename to src/main/java/mcp/mobius/waila/gui_old/widget_old/ContainerButtons.java.bak diff --git a/mcp/mobius/waila/handlers/DecoratorFMP.java b/src/main/java/mcp/mobius/waila/handlers/DecoratorFMP.java similarity index 100% rename from mcp/mobius/waila/handlers/DecoratorFMP.java rename to src/main/java/mcp/mobius/waila/handlers/DecoratorFMP.java diff --git a/mcp/mobius/waila/handlers/HUDHandlerBlocks.java b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java similarity index 100% rename from mcp/mobius/waila/handlers/HUDHandlerBlocks.java rename to src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java diff --git a/mcp/mobius/waila/handlers/HUDHandlerEntities.java b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerEntities.java similarity index 100% rename from mcp/mobius/waila/handlers/HUDHandlerEntities.java rename to src/main/java/mcp/mobius/waila/handlers/HUDHandlerEntities.java diff --git a/mcp/mobius/waila/handlers/HUDHandlerFMP.java b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerFMP.java similarity index 100% rename from mcp/mobius/waila/handlers/HUDHandlerFMP.java rename to src/main/java/mcp/mobius/waila/handlers/HUDHandlerFMP.java diff --git a/mcp/mobius/waila/handlers/SummaryProvider.java.bak b/src/main/java/mcp/mobius/waila/handlers/SummaryProvider.java.bak similarity index 100% rename from mcp/mobius/waila/handlers/SummaryProvider.java.bak rename to src/main/java/mcp/mobius/waila/handlers/SummaryProvider.java.bak diff --git a/mcp/mobius/waila/handlers/SummaryProviderDefault.java.bak b/src/main/java/mcp/mobius/waila/handlers/SummaryProviderDefault.java.bak similarity index 100% rename from mcp/mobius/waila/handlers/SummaryProviderDefault.java.bak rename to src/main/java/mcp/mobius/waila/handlers/SummaryProviderDefault.java.bak diff --git a/mcp/mobius/waila/handlers/nei/HandlerEnchants.java b/src/main/java/mcp/mobius/waila/handlers/nei/HandlerEnchants.java similarity index 100% rename from mcp/mobius/waila/handlers/nei/HandlerEnchants.java rename to src/main/java/mcp/mobius/waila/handlers/nei/HandlerEnchants.java diff --git a/mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java b/src/main/java/mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java similarity index 86% rename from mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java rename to src/main/java/mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java index 3b91766..81f0ddb 100644 --- a/mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java +++ b/src/main/java/mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java @@ -10,7 +10,7 @@ import net.minecraft.item.ItemStack; public class TooltipHandlerWaila implements IContainerTooltipHandler { @Override - public List handleItemDisplayName(GuiContainer arg0, ItemStack arg1, List currenttip) { + public List handleItemDisplayName(GuiContainer arg0, ItemStack itemstack, List currenttip) { return currenttip; } @@ -18,13 +18,12 @@ public class TooltipHandlerWaila implements IContainerTooltipHandler { public List handleItemTooltip(GuiContainer arg0, ItemStack itemstack, int arg2, int arg3, List currenttip) { String canonicalName = ModIdentification.nameFromStack(itemstack); if (canonicalName != null && !canonicalName.equals("")) - currenttip.add("\u00a79\u00a7o" + canonicalName); + currenttip.add("\u00a79\u00a7o" + canonicalName); return currenttip; } @Override public List handleTooltip(GuiContainer arg0, int arg1, int arg2, List currenttip) { - // TODO Auto-generated method stub return currenttip; } diff --git a/mcp/mobius/waila/network/IWailaMessage.java b/src/main/java/mcp/mobius/waila/network/IWailaMessage.java similarity index 100% rename from mcp/mobius/waila/network/IWailaMessage.java rename to src/main/java/mcp/mobius/waila/network/IWailaMessage.java diff --git a/mcp/mobius/waila/network/Message0x00ServerPing.java b/src/main/java/mcp/mobius/waila/network/Message0x00ServerPing.java similarity index 100% rename from mcp/mobius/waila/network/Message0x00ServerPing.java rename to src/main/java/mcp/mobius/waila/network/Message0x00ServerPing.java diff --git a/mcp/mobius/waila/network/Message0x01TERequest.java b/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java similarity index 100% rename from mcp/mobius/waila/network/Message0x01TERequest.java rename to src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java diff --git a/mcp/mobius/waila/network/Message0x02TENBTData.java b/src/main/java/mcp/mobius/waila/network/Message0x02TENBTData.java similarity index 100% rename from mcp/mobius/waila/network/Message0x02TENBTData.java rename to src/main/java/mcp/mobius/waila/network/Message0x02TENBTData.java diff --git a/mcp/mobius/waila/network/Message0x03EntRequest.java b/src/main/java/mcp/mobius/waila/network/Message0x03EntRequest.java similarity index 100% rename from mcp/mobius/waila/network/Message0x03EntRequest.java rename to src/main/java/mcp/mobius/waila/network/Message0x03EntRequest.java diff --git a/mcp/mobius/waila/network/Message0x04EntNBTData.java b/src/main/java/mcp/mobius/waila/network/Message0x04EntNBTData.java similarity index 100% rename from mcp/mobius/waila/network/Message0x04EntNBTData.java rename to src/main/java/mcp/mobius/waila/network/Message0x04EntNBTData.java diff --git a/mcp/mobius/waila/network/NetworkHandler.java b/src/main/java/mcp/mobius/waila/network/NetworkHandler.java similarity index 100% rename from mcp/mobius/waila/network/NetworkHandler.java rename to src/main/java/mcp/mobius/waila/network/NetworkHandler.java diff --git a/mcp/mobius/waila/network/WailaPacketHandler.java b/src/main/java/mcp/mobius/waila/network/WailaPacketHandler.java similarity index 100% rename from mcp/mobius/waila/network/WailaPacketHandler.java rename to src/main/java/mcp/mobius/waila/network/WailaPacketHandler.java diff --git a/mcp/mobius/waila/network/old/Packet0x00ServerPing.java.bak b/src/main/java/mcp/mobius/waila/network/old/Packet0x00ServerPing.java.bak similarity index 100% rename from mcp/mobius/waila/network/old/Packet0x00ServerPing.java.bak rename to src/main/java/mcp/mobius/waila/network/old/Packet0x00ServerPing.java.bak diff --git a/mcp/mobius/waila/network/old/Packet0x01TERequest.java.bak b/src/main/java/mcp/mobius/waila/network/old/Packet0x01TERequest.java.bak similarity index 100% rename from mcp/mobius/waila/network/old/Packet0x01TERequest.java.bak rename to src/main/java/mcp/mobius/waila/network/old/Packet0x01TERequest.java.bak diff --git a/mcp/mobius/waila/network/old/Packet0x02TENBTData.java.bak b/src/main/java/mcp/mobius/waila/network/old/Packet0x02TENBTData.java.bak similarity index 100% rename from mcp/mobius/waila/network/old/Packet0x02TENBTData.java.bak rename to src/main/java/mcp/mobius/waila/network/old/Packet0x02TENBTData.java.bak diff --git a/mcp/mobius/waila/network/old/Packet0x03EntRequest.java.bak b/src/main/java/mcp/mobius/waila/network/old/Packet0x03EntRequest.java.bak similarity index 100% rename from mcp/mobius/waila/network/old/Packet0x03EntRequest.java.bak rename to src/main/java/mcp/mobius/waila/network/old/Packet0x03EntRequest.java.bak diff --git a/mcp/mobius/waila/network/old/Packet0x04EntNBTData.java.bak b/src/main/java/mcp/mobius/waila/network/old/Packet0x04EntNBTData.java.bak similarity index 100% rename from mcp/mobius/waila/network/old/Packet0x04EntNBTData.java.bak rename to src/main/java/mcp/mobius/waila/network/old/Packet0x04EntNBTData.java.bak diff --git a/mcp/mobius/waila/network/old/WailaConnectionHandler.java.bak b/src/main/java/mcp/mobius/waila/network/old/WailaConnectionHandler.java.bak similarity index 100% rename from mcp/mobius/waila/network/old/WailaConnectionHandler.java.bak rename to src/main/java/mcp/mobius/waila/network/old/WailaConnectionHandler.java.bak diff --git a/mcp/mobius/waila/network/old/WailaPacketHandler.java.bak b/src/main/java/mcp/mobius/waila/network/old/WailaPacketHandler.java.bak similarity index 100% rename from mcp/mobius/waila/network/old/WailaPacketHandler.java.bak rename to src/main/java/mcp/mobius/waila/network/old/WailaPacketHandler.java.bak diff --git a/mcp/mobius/waila/overlay/DecoratorRenderer.java b/src/main/java/mcp/mobius/waila/overlay/DecoratorRenderer.java similarity index 100% rename from mcp/mobius/waila/overlay/DecoratorRenderer.java rename to src/main/java/mcp/mobius/waila/overlay/DecoratorRenderer.java diff --git a/mcp/mobius/waila/overlay/IconUI.java b/src/main/java/mcp/mobius/waila/overlay/IconUI.java similarity index 100% rename from mcp/mobius/waila/overlay/IconUI.java rename to src/main/java/mcp/mobius/waila/overlay/IconUI.java diff --git a/mcp/mobius/waila/overlay/OverlayConfig.java b/src/main/java/mcp/mobius/waila/overlay/OverlayConfig.java similarity index 100% rename from mcp/mobius/waila/overlay/OverlayConfig.java rename to src/main/java/mcp/mobius/waila/overlay/OverlayConfig.java diff --git a/mcp/mobius/waila/overlay/OverlayRenderer.java b/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java similarity index 100% rename from mcp/mobius/waila/overlay/OverlayRenderer.java rename to src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java diff --git a/mcp/mobius/waila/overlay/RayTracing.java b/src/main/java/mcp/mobius/waila/overlay/RayTracing.java similarity index 100% rename from mcp/mobius/waila/overlay/RayTracing.java rename to src/main/java/mcp/mobius/waila/overlay/RayTracing.java diff --git a/mcp/mobius/waila/overlay/Tooltip.java b/src/main/java/mcp/mobius/waila/overlay/Tooltip.java similarity index 100% rename from mcp/mobius/waila/overlay/Tooltip.java rename to src/main/java/mcp/mobius/waila/overlay/Tooltip.java diff --git a/mcp/mobius/waila/overlay/WailaTickHandler.java b/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java similarity index 100% rename from mcp/mobius/waila/overlay/WailaTickHandler.java rename to src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java diff --git a/mcp/mobius/waila/server/ProxyServer.java b/src/main/java/mcp/mobius/waila/server/ProxyServer.java similarity index 100% rename from mcp/mobius/waila/server/ProxyServer.java rename to src/main/java/mcp/mobius/waila/server/ProxyServer.java diff --git a/mcp/mobius/waila/utils/AccessHelper.java b/src/main/java/mcp/mobius/waila/utils/AccessHelper.java similarity index 100% rename from mcp/mobius/waila/utils/AccessHelper.java rename to src/main/java/mcp/mobius/waila/utils/AccessHelper.java diff --git a/mcp/mobius/waila/utils/Constants.java b/src/main/java/mcp/mobius/waila/utils/Constants.java similarity index 100% rename from mcp/mobius/waila/utils/Constants.java rename to src/main/java/mcp/mobius/waila/utils/Constants.java diff --git a/mcp/mobius/waila/utils/ModIdentification.java b/src/main/java/mcp/mobius/waila/utils/ModIdentification.java similarity index 100% rename from mcp/mobius/waila/utils/ModIdentification.java rename to src/main/java/mcp/mobius/waila/utils/ModIdentification.java diff --git a/mcp/mobius/waila/utils/NBTUtil.java b/src/main/java/mcp/mobius/waila/utils/NBTUtil.java similarity index 100% rename from mcp/mobius/waila/utils/NBTUtil.java rename to src/main/java/mcp/mobius/waila/utils/NBTUtil.java diff --git a/mcp/mobius/waila/utils/WailaExceptionHandler.java b/src/main/java/mcp/mobius/waila/utils/WailaExceptionHandler.java similarity index 100% rename from mcp/mobius/waila/utils/WailaExceptionHandler.java rename to src/main/java/mcp/mobius/waila/utils/WailaExceptionHandler.java diff --git a/assets/waila/fonts/Minecraftia.ttf b/src/main/ressources/assets/waila/fonts/Minecraftia.ttf similarity index 100% rename from assets/waila/fonts/Minecraftia.ttf rename to src/main/ressources/assets/waila/fonts/Minecraftia.ttf diff --git a/assets/waila/lang/de_DE.lang b/src/main/ressources/assets/waila/lang/de_DE.lang similarity index 100% rename from assets/waila/lang/de_DE.lang rename to src/main/ressources/assets/waila/lang/de_DE.lang diff --git a/assets/waila/lang/en_US.lang b/src/main/ressources/assets/waila/lang/en_US.lang similarity index 100% rename from assets/waila/lang/en_US.lang rename to src/main/ressources/assets/waila/lang/en_US.lang diff --git a/assets/waila/lang/et_EE b/src/main/ressources/assets/waila/lang/et_EE similarity index 100% rename from assets/waila/lang/et_EE rename to src/main/ressources/assets/waila/lang/et_EE diff --git a/assets/waila/lang/fr_FR.lang b/src/main/ressources/assets/waila/lang/fr_FR.lang similarity index 100% rename from assets/waila/lang/fr_FR.lang rename to src/main/ressources/assets/waila/lang/fr_FR.lang diff --git a/assets/waila/lang/nl_NL.lang b/src/main/ressources/assets/waila/lang/nl_NL.lang similarity index 100% rename from assets/waila/lang/nl_NL.lang rename to src/main/ressources/assets/waila/lang/nl_NL.lang diff --git a/assets/waila/lang/ru_RU.lang b/src/main/ressources/assets/waila/lang/ru_RU.lang similarity index 100% rename from assets/waila/lang/ru_RU.lang rename to src/main/ressources/assets/waila/lang/ru_RU.lang diff --git a/assets/waila/textures/config_template.png b/src/main/ressources/assets/waila/textures/config_template.png similarity index 100% rename from assets/waila/textures/config_template.png rename to src/main/ressources/assets/waila/textures/config_template.png diff --git a/assets/waila/textures/test.png b/src/main/ressources/assets/waila/textures/test.png similarity index 100% rename from assets/waila/textures/test.png rename to src/main/ressources/assets/waila/textures/test.png diff --git a/assets/waila/textures/test_solar.png b/src/main/ressources/assets/waila/textures/test_solar.png similarity index 100% rename from assets/waila/textures/test_solar.png rename to src/main/ressources/assets/waila/textures/test_solar.png diff --git a/src/main/ressources/mcmod.info b/src/main/ressources/mcmod.info new file mode 100644 index 0000000..7154872 --- /dev/null +++ b/src/main/ressources/mcmod.info @@ -0,0 +1,16 @@ +[ +{ + "modid": "waila", + "name": "Waila", + "description": "All your data are belong to us.", + "version": "${version}", + "mcversion": "${mcversion}", + "url": "", + "updateUrl": "", + "authors": ["ProfMobius"], + "credits": "The Forge and FML guys, for making this example", + "logoFile": "", + "screenshots": [], + "dependencies": [] +} +]