From fbbdab869348c81d75d5e28a820fb915b1721fce Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Sun, 2 Jul 2023 00:51:38 +0300 Subject: [PATCH 1/2] Add GDI --- build.gradle | 15 ++++++++++++++- .../org/parchmentmc/compass/CompassPlugin.java | 2 +- .../compass/data/sanitation/DataSanitizer.java | 0 .../compass/data/sanitation/Sanitizer.java | 0 .../data/sanitation/impl/BouncerDataMover.java | 0 .../impl/DescriptorParametersSanitizer.java | 0 .../data/sanitation/impl/EnumValueOfRemover.java | 0 .../sanitation/impl/NonexistentMemberRemover.java | 0 .../data/sanitation/impl/SyntheticsRemover.java | 0 .../compass/data/validation/DataValidator.java | 0 .../compass/data/validation/ValidationIssue.java | 0 .../compass/data/validation/Validator.java | 0 .../data/validation/impl/BridgeValidator.java | 0 .../data/validation/impl/ClassInitValidator.java | 0 .../data/validation/impl/EnumValidator.java | 0 .../data/validation/impl/LambdaValidator.java | 0 .../validation/impl/MemberExistenceValidator.java | 0 .../validation/impl/MethodStandardsValidator.java | 0 .../impl/ParameterConflictsValidator.java | 0 .../validation/impl/ParameterIndexValidator.java | 0 .../impl/ParameterStandardsValidator.java | 0 .../data/validation/impl/RecordValidator.java | 0 .../data/validation/impl/SyntheticValidator.java | 0 .../compass/data/visitation/DataVisitor.java | 0 .../data/visitation/DataVisitorHelper.java | 0 .../data/visitation/ModifyingDataVisitor.java | 0 .../org/parchmentmc/compass/package-info.java | 0 .../compass/providers/DelegatingProvider.java | 0 .../compass/providers/IntermediateProvider.java | 0 .../providers/mcpconfig/MCPConfigFile.java | 0 .../compass/providers/mcpconfig/SRGProvider.java | 0 .../compass/storage/input/InputsReader.java | 0 .../storage/input/SimpleInputFileReader.java | 0 .../compass/storage/io/ExplodedDataIO.java | 0 .../compass/storage/io/MappingDataIO.java | 0 .../compass/storage/io/MappingIOFormat.java | 0 .../compass/storage/io/SingleFileDataIO.java | 0 .../io/enigma/EnigmaFormattedExplodedIO.java | 0 .../compass/storage/io/enigma/EnigmaReader.java | 0 .../compass/storage/io/enigma/EnigmaWriter.java | 0 .../parchmentmc/compass/tasks/ConvertMapping.java | 0 .../org/parchmentmc/compass/tasks/CopyData.java | 0 .../compass/tasks/CreateStagingData.java | 0 .../compass/tasks/DisplayMinecraftVersions.java | 0 .../parchmentmc/compass/tasks/GenerateExport.java | 0 .../compass/tasks/GenerateSanitizedExport.java | 0 .../parchmentmc/compass/tasks/SanitizeData.java | 0 .../parchmentmc/compass/tasks/ValidateData.java | 0 .../compass/tasks/VersionDownload.java | 0 .../compass/util/DescriptorIndexer.java | 0 .../org/parchmentmc/compass/util/JSONUtil.java | 0 .../org/parchmentmc/compass/util/MappingUtil.java | 0 .../compass/util/MethodDescriptorVisitor.java | 0 .../parchmentmc/compass/util/ResultContainer.java | 0 .../util/download/BlackstoneDownloader.java | 0 .../compass/util/download/DownloadUtil.java | 0 .../util/download/ManifestsDownloader.java | 0 .../util/download/ObfuscationMapsDownloader.java | 0 58 files changed, 15 insertions(+), 2 deletions(-) rename src/main/{java => groovy}/org/parchmentmc/compass/CompassPlugin.java (99%) rename src/main/{java => groovy}/org/parchmentmc/compass/data/sanitation/DataSanitizer.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/data/sanitation/Sanitizer.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/data/sanitation/impl/BouncerDataMover.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/data/sanitation/impl/DescriptorParametersSanitizer.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/data/sanitation/impl/EnumValueOfRemover.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/data/sanitation/impl/NonexistentMemberRemover.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/data/sanitation/impl/SyntheticsRemover.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/data/validation/DataValidator.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/data/validation/ValidationIssue.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/data/validation/Validator.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/data/validation/impl/BridgeValidator.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/data/validation/impl/ClassInitValidator.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/data/validation/impl/EnumValidator.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/data/validation/impl/LambdaValidator.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/data/validation/impl/MemberExistenceValidator.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/data/validation/impl/MethodStandardsValidator.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/data/validation/impl/ParameterConflictsValidator.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/data/validation/impl/ParameterIndexValidator.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/data/validation/impl/ParameterStandardsValidator.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/data/validation/impl/RecordValidator.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/data/validation/impl/SyntheticValidator.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/data/visitation/DataVisitor.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/data/visitation/DataVisitorHelper.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/data/visitation/ModifyingDataVisitor.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/package-info.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/providers/DelegatingProvider.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/providers/IntermediateProvider.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/providers/mcpconfig/MCPConfigFile.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/providers/mcpconfig/SRGProvider.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/storage/input/InputsReader.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/storage/input/SimpleInputFileReader.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/storage/io/ExplodedDataIO.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/storage/io/MappingDataIO.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/storage/io/MappingIOFormat.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/storage/io/SingleFileDataIO.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/storage/io/enigma/EnigmaFormattedExplodedIO.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/storage/io/enigma/EnigmaReader.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/storage/io/enigma/EnigmaWriter.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/tasks/ConvertMapping.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/tasks/CopyData.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/tasks/CreateStagingData.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/tasks/DisplayMinecraftVersions.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/tasks/GenerateExport.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/tasks/GenerateSanitizedExport.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/tasks/SanitizeData.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/tasks/ValidateData.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/tasks/VersionDownload.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/util/DescriptorIndexer.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/util/JSONUtil.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/util/MappingUtil.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/util/MethodDescriptorVisitor.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/util/ResultContainer.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/util/download/BlackstoneDownloader.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/util/download/DownloadUtil.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/util/download/ManifestsDownloader.java (100%) rename src/main/{java => groovy}/org/parchmentmc/compass/util/download/ObfuscationMapsDownloader.java (100%) diff --git a/build.gradle b/build.gradle index 40bae95..95eb738 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,7 @@ plugins { id 'org.parchmentmc.writtenbooks' version '0.+' id 'java-gradle-plugin' id 'maven-publish' + id 'groovy' } project.group = 'org.parchmentmc' @@ -14,6 +15,10 @@ repositories { maven { name = 'MinecraftForge' url = 'https://maven.minecraftforge.net/' + metadataSources { + mavenPom() + gradleMetadata() + } } gradlePluginPortal() mavenCentral() @@ -27,6 +32,9 @@ dependencies { implementation 'org.parchmentmc.feather:io-moshi:1.0.0.3' implementation 'com.google.guava:guava:31.1-jre' + compileOnly 'net.minecraftforge:groovydslimprover:1.0.4' + implementation 'net.minecraftforge:groovydslimprover:1.0.4:runtime' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2' } @@ -43,7 +51,7 @@ java { gradlePlugin { // Define the plugin - plugins.register("compass") { + plugins.register('compass') { id = 'org.parchmentmc.compass' implementationClass = 'org.parchmentmc.compass.CompassPlugin' } @@ -61,3 +69,8 @@ publishing { tasks.named('wrapper', Wrapper) { distributionType = Wrapper.DistributionType.ALL } + +tasks.withType(GroovyCompile).configureEach { + it.options.incremental = true + it.groovyOptions.optimizationOptions(['indy': true]) +} diff --git a/src/main/java/org/parchmentmc/compass/CompassPlugin.java b/src/main/groovy/org/parchmentmc/compass/CompassPlugin.java similarity index 99% rename from src/main/java/org/parchmentmc/compass/CompassPlugin.java rename to src/main/groovy/org/parchmentmc/compass/CompassPlugin.java index 3aacf44..71ec359 100644 --- a/src/main/java/org/parchmentmc/compass/CompassPlugin.java +++ b/src/main/groovy/org/parchmentmc/compass/CompassPlugin.java @@ -53,7 +53,7 @@ public CompassPlugin(ObjectFactory objectFactory) { @Override public void apply(Project project) { - final CompassExtension extension = project.getExtensions().create(COMPASS_EXTENSION, CompassExtension.class); + final CompassExtension extension = project.getExtensions().create(COMPASS_EXTENSION, CompassExtension.class, project); final TaskContainer tasks = project.getTasks(); manifestsDownloader = new ManifestsDownloader(project); diff --git a/src/main/java/org/parchmentmc/compass/data/sanitation/DataSanitizer.java b/src/main/groovy/org/parchmentmc/compass/data/sanitation/DataSanitizer.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/data/sanitation/DataSanitizer.java rename to src/main/groovy/org/parchmentmc/compass/data/sanitation/DataSanitizer.java diff --git a/src/main/java/org/parchmentmc/compass/data/sanitation/Sanitizer.java b/src/main/groovy/org/parchmentmc/compass/data/sanitation/Sanitizer.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/data/sanitation/Sanitizer.java rename to src/main/groovy/org/parchmentmc/compass/data/sanitation/Sanitizer.java diff --git a/src/main/java/org/parchmentmc/compass/data/sanitation/impl/BouncerDataMover.java b/src/main/groovy/org/parchmentmc/compass/data/sanitation/impl/BouncerDataMover.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/data/sanitation/impl/BouncerDataMover.java rename to src/main/groovy/org/parchmentmc/compass/data/sanitation/impl/BouncerDataMover.java diff --git a/src/main/java/org/parchmentmc/compass/data/sanitation/impl/DescriptorParametersSanitizer.java b/src/main/groovy/org/parchmentmc/compass/data/sanitation/impl/DescriptorParametersSanitizer.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/data/sanitation/impl/DescriptorParametersSanitizer.java rename to src/main/groovy/org/parchmentmc/compass/data/sanitation/impl/DescriptorParametersSanitizer.java diff --git a/src/main/java/org/parchmentmc/compass/data/sanitation/impl/EnumValueOfRemover.java b/src/main/groovy/org/parchmentmc/compass/data/sanitation/impl/EnumValueOfRemover.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/data/sanitation/impl/EnumValueOfRemover.java rename to src/main/groovy/org/parchmentmc/compass/data/sanitation/impl/EnumValueOfRemover.java diff --git a/src/main/java/org/parchmentmc/compass/data/sanitation/impl/NonexistentMemberRemover.java b/src/main/groovy/org/parchmentmc/compass/data/sanitation/impl/NonexistentMemberRemover.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/data/sanitation/impl/NonexistentMemberRemover.java rename to src/main/groovy/org/parchmentmc/compass/data/sanitation/impl/NonexistentMemberRemover.java diff --git a/src/main/java/org/parchmentmc/compass/data/sanitation/impl/SyntheticsRemover.java b/src/main/groovy/org/parchmentmc/compass/data/sanitation/impl/SyntheticsRemover.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/data/sanitation/impl/SyntheticsRemover.java rename to src/main/groovy/org/parchmentmc/compass/data/sanitation/impl/SyntheticsRemover.java diff --git a/src/main/java/org/parchmentmc/compass/data/validation/DataValidator.java b/src/main/groovy/org/parchmentmc/compass/data/validation/DataValidator.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/data/validation/DataValidator.java rename to src/main/groovy/org/parchmentmc/compass/data/validation/DataValidator.java diff --git a/src/main/java/org/parchmentmc/compass/data/validation/ValidationIssue.java b/src/main/groovy/org/parchmentmc/compass/data/validation/ValidationIssue.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/data/validation/ValidationIssue.java rename to src/main/groovy/org/parchmentmc/compass/data/validation/ValidationIssue.java diff --git a/src/main/java/org/parchmentmc/compass/data/validation/Validator.java b/src/main/groovy/org/parchmentmc/compass/data/validation/Validator.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/data/validation/Validator.java rename to src/main/groovy/org/parchmentmc/compass/data/validation/Validator.java diff --git a/src/main/java/org/parchmentmc/compass/data/validation/impl/BridgeValidator.java b/src/main/groovy/org/parchmentmc/compass/data/validation/impl/BridgeValidator.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/data/validation/impl/BridgeValidator.java rename to src/main/groovy/org/parchmentmc/compass/data/validation/impl/BridgeValidator.java diff --git a/src/main/java/org/parchmentmc/compass/data/validation/impl/ClassInitValidator.java b/src/main/groovy/org/parchmentmc/compass/data/validation/impl/ClassInitValidator.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/data/validation/impl/ClassInitValidator.java rename to src/main/groovy/org/parchmentmc/compass/data/validation/impl/ClassInitValidator.java diff --git a/src/main/java/org/parchmentmc/compass/data/validation/impl/EnumValidator.java b/src/main/groovy/org/parchmentmc/compass/data/validation/impl/EnumValidator.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/data/validation/impl/EnumValidator.java rename to src/main/groovy/org/parchmentmc/compass/data/validation/impl/EnumValidator.java diff --git a/src/main/java/org/parchmentmc/compass/data/validation/impl/LambdaValidator.java b/src/main/groovy/org/parchmentmc/compass/data/validation/impl/LambdaValidator.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/data/validation/impl/LambdaValidator.java rename to src/main/groovy/org/parchmentmc/compass/data/validation/impl/LambdaValidator.java diff --git a/src/main/java/org/parchmentmc/compass/data/validation/impl/MemberExistenceValidator.java b/src/main/groovy/org/parchmentmc/compass/data/validation/impl/MemberExistenceValidator.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/data/validation/impl/MemberExistenceValidator.java rename to src/main/groovy/org/parchmentmc/compass/data/validation/impl/MemberExistenceValidator.java diff --git a/src/main/java/org/parchmentmc/compass/data/validation/impl/MethodStandardsValidator.java b/src/main/groovy/org/parchmentmc/compass/data/validation/impl/MethodStandardsValidator.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/data/validation/impl/MethodStandardsValidator.java rename to src/main/groovy/org/parchmentmc/compass/data/validation/impl/MethodStandardsValidator.java diff --git a/src/main/java/org/parchmentmc/compass/data/validation/impl/ParameterConflictsValidator.java b/src/main/groovy/org/parchmentmc/compass/data/validation/impl/ParameterConflictsValidator.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/data/validation/impl/ParameterConflictsValidator.java rename to src/main/groovy/org/parchmentmc/compass/data/validation/impl/ParameterConflictsValidator.java diff --git a/src/main/java/org/parchmentmc/compass/data/validation/impl/ParameterIndexValidator.java b/src/main/groovy/org/parchmentmc/compass/data/validation/impl/ParameterIndexValidator.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/data/validation/impl/ParameterIndexValidator.java rename to src/main/groovy/org/parchmentmc/compass/data/validation/impl/ParameterIndexValidator.java diff --git a/src/main/java/org/parchmentmc/compass/data/validation/impl/ParameterStandardsValidator.java b/src/main/groovy/org/parchmentmc/compass/data/validation/impl/ParameterStandardsValidator.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/data/validation/impl/ParameterStandardsValidator.java rename to src/main/groovy/org/parchmentmc/compass/data/validation/impl/ParameterStandardsValidator.java diff --git a/src/main/java/org/parchmentmc/compass/data/validation/impl/RecordValidator.java b/src/main/groovy/org/parchmentmc/compass/data/validation/impl/RecordValidator.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/data/validation/impl/RecordValidator.java rename to src/main/groovy/org/parchmentmc/compass/data/validation/impl/RecordValidator.java diff --git a/src/main/java/org/parchmentmc/compass/data/validation/impl/SyntheticValidator.java b/src/main/groovy/org/parchmentmc/compass/data/validation/impl/SyntheticValidator.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/data/validation/impl/SyntheticValidator.java rename to src/main/groovy/org/parchmentmc/compass/data/validation/impl/SyntheticValidator.java diff --git a/src/main/java/org/parchmentmc/compass/data/visitation/DataVisitor.java b/src/main/groovy/org/parchmentmc/compass/data/visitation/DataVisitor.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/data/visitation/DataVisitor.java rename to src/main/groovy/org/parchmentmc/compass/data/visitation/DataVisitor.java diff --git a/src/main/java/org/parchmentmc/compass/data/visitation/DataVisitorHelper.java b/src/main/groovy/org/parchmentmc/compass/data/visitation/DataVisitorHelper.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/data/visitation/DataVisitorHelper.java rename to src/main/groovy/org/parchmentmc/compass/data/visitation/DataVisitorHelper.java diff --git a/src/main/java/org/parchmentmc/compass/data/visitation/ModifyingDataVisitor.java b/src/main/groovy/org/parchmentmc/compass/data/visitation/ModifyingDataVisitor.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/data/visitation/ModifyingDataVisitor.java rename to src/main/groovy/org/parchmentmc/compass/data/visitation/ModifyingDataVisitor.java diff --git a/src/main/java/org/parchmentmc/compass/package-info.java b/src/main/groovy/org/parchmentmc/compass/package-info.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/package-info.java rename to src/main/groovy/org/parchmentmc/compass/package-info.java diff --git a/src/main/java/org/parchmentmc/compass/providers/DelegatingProvider.java b/src/main/groovy/org/parchmentmc/compass/providers/DelegatingProvider.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/providers/DelegatingProvider.java rename to src/main/groovy/org/parchmentmc/compass/providers/DelegatingProvider.java diff --git a/src/main/java/org/parchmentmc/compass/providers/IntermediateProvider.java b/src/main/groovy/org/parchmentmc/compass/providers/IntermediateProvider.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/providers/IntermediateProvider.java rename to src/main/groovy/org/parchmentmc/compass/providers/IntermediateProvider.java diff --git a/src/main/java/org/parchmentmc/compass/providers/mcpconfig/MCPConfigFile.java b/src/main/groovy/org/parchmentmc/compass/providers/mcpconfig/MCPConfigFile.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/providers/mcpconfig/MCPConfigFile.java rename to src/main/groovy/org/parchmentmc/compass/providers/mcpconfig/MCPConfigFile.java diff --git a/src/main/java/org/parchmentmc/compass/providers/mcpconfig/SRGProvider.java b/src/main/groovy/org/parchmentmc/compass/providers/mcpconfig/SRGProvider.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/providers/mcpconfig/SRGProvider.java rename to src/main/groovy/org/parchmentmc/compass/providers/mcpconfig/SRGProvider.java diff --git a/src/main/java/org/parchmentmc/compass/storage/input/InputsReader.java b/src/main/groovy/org/parchmentmc/compass/storage/input/InputsReader.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/storage/input/InputsReader.java rename to src/main/groovy/org/parchmentmc/compass/storage/input/InputsReader.java diff --git a/src/main/java/org/parchmentmc/compass/storage/input/SimpleInputFileReader.java b/src/main/groovy/org/parchmentmc/compass/storage/input/SimpleInputFileReader.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/storage/input/SimpleInputFileReader.java rename to src/main/groovy/org/parchmentmc/compass/storage/input/SimpleInputFileReader.java diff --git a/src/main/java/org/parchmentmc/compass/storage/io/ExplodedDataIO.java b/src/main/groovy/org/parchmentmc/compass/storage/io/ExplodedDataIO.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/storage/io/ExplodedDataIO.java rename to src/main/groovy/org/parchmentmc/compass/storage/io/ExplodedDataIO.java diff --git a/src/main/java/org/parchmentmc/compass/storage/io/MappingDataIO.java b/src/main/groovy/org/parchmentmc/compass/storage/io/MappingDataIO.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/storage/io/MappingDataIO.java rename to src/main/groovy/org/parchmentmc/compass/storage/io/MappingDataIO.java diff --git a/src/main/java/org/parchmentmc/compass/storage/io/MappingIOFormat.java b/src/main/groovy/org/parchmentmc/compass/storage/io/MappingIOFormat.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/storage/io/MappingIOFormat.java rename to src/main/groovy/org/parchmentmc/compass/storage/io/MappingIOFormat.java diff --git a/src/main/java/org/parchmentmc/compass/storage/io/SingleFileDataIO.java b/src/main/groovy/org/parchmentmc/compass/storage/io/SingleFileDataIO.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/storage/io/SingleFileDataIO.java rename to src/main/groovy/org/parchmentmc/compass/storage/io/SingleFileDataIO.java diff --git a/src/main/java/org/parchmentmc/compass/storage/io/enigma/EnigmaFormattedExplodedIO.java b/src/main/groovy/org/parchmentmc/compass/storage/io/enigma/EnigmaFormattedExplodedIO.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/storage/io/enigma/EnigmaFormattedExplodedIO.java rename to src/main/groovy/org/parchmentmc/compass/storage/io/enigma/EnigmaFormattedExplodedIO.java diff --git a/src/main/java/org/parchmentmc/compass/storage/io/enigma/EnigmaReader.java b/src/main/groovy/org/parchmentmc/compass/storage/io/enigma/EnigmaReader.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/storage/io/enigma/EnigmaReader.java rename to src/main/groovy/org/parchmentmc/compass/storage/io/enigma/EnigmaReader.java diff --git a/src/main/java/org/parchmentmc/compass/storage/io/enigma/EnigmaWriter.java b/src/main/groovy/org/parchmentmc/compass/storage/io/enigma/EnigmaWriter.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/storage/io/enigma/EnigmaWriter.java rename to src/main/groovy/org/parchmentmc/compass/storage/io/enigma/EnigmaWriter.java diff --git a/src/main/java/org/parchmentmc/compass/tasks/ConvertMapping.java b/src/main/groovy/org/parchmentmc/compass/tasks/ConvertMapping.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/tasks/ConvertMapping.java rename to src/main/groovy/org/parchmentmc/compass/tasks/ConvertMapping.java diff --git a/src/main/java/org/parchmentmc/compass/tasks/CopyData.java b/src/main/groovy/org/parchmentmc/compass/tasks/CopyData.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/tasks/CopyData.java rename to src/main/groovy/org/parchmentmc/compass/tasks/CopyData.java diff --git a/src/main/java/org/parchmentmc/compass/tasks/CreateStagingData.java b/src/main/groovy/org/parchmentmc/compass/tasks/CreateStagingData.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/tasks/CreateStagingData.java rename to src/main/groovy/org/parchmentmc/compass/tasks/CreateStagingData.java diff --git a/src/main/java/org/parchmentmc/compass/tasks/DisplayMinecraftVersions.java b/src/main/groovy/org/parchmentmc/compass/tasks/DisplayMinecraftVersions.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/tasks/DisplayMinecraftVersions.java rename to src/main/groovy/org/parchmentmc/compass/tasks/DisplayMinecraftVersions.java diff --git a/src/main/java/org/parchmentmc/compass/tasks/GenerateExport.java b/src/main/groovy/org/parchmentmc/compass/tasks/GenerateExport.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/tasks/GenerateExport.java rename to src/main/groovy/org/parchmentmc/compass/tasks/GenerateExport.java diff --git a/src/main/java/org/parchmentmc/compass/tasks/GenerateSanitizedExport.java b/src/main/groovy/org/parchmentmc/compass/tasks/GenerateSanitizedExport.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/tasks/GenerateSanitizedExport.java rename to src/main/groovy/org/parchmentmc/compass/tasks/GenerateSanitizedExport.java diff --git a/src/main/java/org/parchmentmc/compass/tasks/SanitizeData.java b/src/main/groovy/org/parchmentmc/compass/tasks/SanitizeData.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/tasks/SanitizeData.java rename to src/main/groovy/org/parchmentmc/compass/tasks/SanitizeData.java diff --git a/src/main/java/org/parchmentmc/compass/tasks/ValidateData.java b/src/main/groovy/org/parchmentmc/compass/tasks/ValidateData.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/tasks/ValidateData.java rename to src/main/groovy/org/parchmentmc/compass/tasks/ValidateData.java diff --git a/src/main/java/org/parchmentmc/compass/tasks/VersionDownload.java b/src/main/groovy/org/parchmentmc/compass/tasks/VersionDownload.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/tasks/VersionDownload.java rename to src/main/groovy/org/parchmentmc/compass/tasks/VersionDownload.java diff --git a/src/main/java/org/parchmentmc/compass/util/DescriptorIndexer.java b/src/main/groovy/org/parchmentmc/compass/util/DescriptorIndexer.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/util/DescriptorIndexer.java rename to src/main/groovy/org/parchmentmc/compass/util/DescriptorIndexer.java diff --git a/src/main/java/org/parchmentmc/compass/util/JSONUtil.java b/src/main/groovy/org/parchmentmc/compass/util/JSONUtil.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/util/JSONUtil.java rename to src/main/groovy/org/parchmentmc/compass/util/JSONUtil.java diff --git a/src/main/java/org/parchmentmc/compass/util/MappingUtil.java b/src/main/groovy/org/parchmentmc/compass/util/MappingUtil.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/util/MappingUtil.java rename to src/main/groovy/org/parchmentmc/compass/util/MappingUtil.java diff --git a/src/main/java/org/parchmentmc/compass/util/MethodDescriptorVisitor.java b/src/main/groovy/org/parchmentmc/compass/util/MethodDescriptorVisitor.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/util/MethodDescriptorVisitor.java rename to src/main/groovy/org/parchmentmc/compass/util/MethodDescriptorVisitor.java diff --git a/src/main/java/org/parchmentmc/compass/util/ResultContainer.java b/src/main/groovy/org/parchmentmc/compass/util/ResultContainer.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/util/ResultContainer.java rename to src/main/groovy/org/parchmentmc/compass/util/ResultContainer.java diff --git a/src/main/java/org/parchmentmc/compass/util/download/BlackstoneDownloader.java b/src/main/groovy/org/parchmentmc/compass/util/download/BlackstoneDownloader.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/util/download/BlackstoneDownloader.java rename to src/main/groovy/org/parchmentmc/compass/util/download/BlackstoneDownloader.java diff --git a/src/main/java/org/parchmentmc/compass/util/download/DownloadUtil.java b/src/main/groovy/org/parchmentmc/compass/util/download/DownloadUtil.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/util/download/DownloadUtil.java rename to src/main/groovy/org/parchmentmc/compass/util/download/DownloadUtil.java diff --git a/src/main/java/org/parchmentmc/compass/util/download/ManifestsDownloader.java b/src/main/groovy/org/parchmentmc/compass/util/download/ManifestsDownloader.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/util/download/ManifestsDownloader.java rename to src/main/groovy/org/parchmentmc/compass/util/download/ManifestsDownloader.java diff --git a/src/main/java/org/parchmentmc/compass/util/download/ObfuscationMapsDownloader.java b/src/main/groovy/org/parchmentmc/compass/util/download/ObfuscationMapsDownloader.java similarity index 100% rename from src/main/java/org/parchmentmc/compass/util/download/ObfuscationMapsDownloader.java rename to src/main/groovy/org/parchmentmc/compass/util/download/ObfuscationMapsDownloader.java From 646caf9275010cbe3f64f9de2a2fcbd392912f72 Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Sun, 2 Jul 2023 00:52:17 +0300 Subject: [PATCH 2/2] CompassExtension gdi --- .../compass/CompassExtension.groovy | 53 +++++++++++++++++++ .../parchmentmc/compass/CompassExtension.java | 31 ----------- 2 files changed, 53 insertions(+), 31 deletions(-) create mode 100644 src/main/groovy/org/parchmentmc/compass/CompassExtension.groovy delete mode 100644 src/main/java/org/parchmentmc/compass/CompassExtension.java diff --git a/src/main/groovy/org/parchmentmc/compass/CompassExtension.groovy b/src/main/groovy/org/parchmentmc/compass/CompassExtension.groovy new file mode 100644 index 0000000..4449d7a --- /dev/null +++ b/src/main/groovy/org/parchmentmc/compass/CompassExtension.groovy @@ -0,0 +1,53 @@ +package org.parchmentmc.compass + +import groovy.transform.CompileStatic +import net.minecraftforge.gdi.annotations.DSLProperty +import net.minecraftforge.gdi.annotations.ProjectGetter +import org.gradle.api.Project +import org.gradle.api.file.DirectoryProperty +import org.gradle.api.provider.Property +import org.parchmentmc.compass.storage.io.MappingIOFormat + +import javax.inject.Inject + +@CompileStatic +abstract class CompassExtension { + private final Project project + + @Inject + CompassExtension(final Project project) { + this.project = project + getLauncherManifestURL().convention('https://piston-meta.mojang.com/mc/game/version_manifest_v2.json'); + getProductionData().convention(project.layout.projectDirectory.dir('data')) + getProductionDataFormat().convention(MappingIOFormat.ENIGMA_EXPLODED) + getStagingData().convention(project.layout.projectDirectory.dir('staging')) + getStagingDataFormat().convention(MappingIOFormat.ENIGMA_EXPLODED) + getInputs().convention(project.layout.projectDirectory.dir('input')) + } + + @ProjectGetter + private Project getProject() { + return this.@project + } + + @DSLProperty + abstract Property getLauncherManifestURL() + + @DSLProperty + abstract DirectoryProperty getProductionData() + + @DSLProperty + abstract Property getProductionDataFormat() + + @DSLProperty + abstract Property getVersion() + + @DSLProperty + abstract DirectoryProperty getStagingData() + + @DSLProperty + abstract Property getStagingDataFormat() + + @DSLProperty + abstract DirectoryProperty getInputs() +} diff --git a/src/main/java/org/parchmentmc/compass/CompassExtension.java b/src/main/java/org/parchmentmc/compass/CompassExtension.java deleted file mode 100644 index 1b804eb..0000000 --- a/src/main/java/org/parchmentmc/compass/CompassExtension.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.parchmentmc.compass; - -import org.gradle.api.file.DirectoryProperty; -import org.gradle.api.file.ProjectLayout; -import org.gradle.api.provider.Property; -import org.parchmentmc.compass.storage.io.MappingIOFormat; - -public abstract class CompassExtension { - public CompassExtension(final ProjectLayout layout) { - getLauncherManifestURL().convention("https://piston-meta.mojang.com/mc/game/version_manifest_v2.json"); - getProductionData().convention(layout.getProjectDirectory().dir("data")); - getProductionDataFormat().convention(MappingIOFormat.ENIGMA_EXPLODED); - getStagingData().convention(layout.getProjectDirectory().dir("staging")); - getStagingDataFormat().convention(MappingIOFormat.ENIGMA_EXPLODED); - getInputs().convention(layout.getProjectDirectory().dir("input")); - } - - public abstract Property getLauncherManifestURL(); - - public abstract DirectoryProperty getProductionData(); - - public abstract Property getProductionDataFormat(); - - public abstract Property getVersion(); - - public abstract DirectoryProperty getStagingData(); - - public abstract Property getStagingDataFormat(); - - public abstract DirectoryProperty getInputs(); -}