From 1ef06ed4330a61305203e857bde16e0e38dd3623 Mon Sep 17 00:00:00 2001 From: zml Date: Sun, 16 May 2021 21:10:32 -0700 Subject: [PATCH] Separate a lot of the internals from public API A good few things marked internal will eventually be made public, but at the moment they're not ready for stabilization. --- .../worker/AccessWidenerEntryTransformer.java | 2 +- .../AccessWidenerTransformerProvider.java | 2 +- .../{ => internal}/worker/Decompilation.java | 2 +- .../worker/JarDecompileWorker.java | 2 +- .../worker/LineMappingResultSaver.java | 2 +- .../worker/LineMappingVisitor.java | 2 +- .../worker/SLF4JFernFlowerLogger.java | 2 +- .../{ => internal}/worker/JarMerger.java | 2 +- .../gradle/vanilla/VanillaGradle.java | 14 +++--- .../vanilla/{ => internal}/Constants.java | 4 +- .../MinecraftExtensionImpl.java | 15 ++++--- .../ProvideMinecraftPlugin.java | 18 ++++---- .../asm/EnhancedClassRemapper.java | 4 +- .../asm/LocalVariableNamer.java | 4 +- .../asm/LocalVariableNamingClassVisitor.java | 4 +- .../asm/SyntheticParameterAnnotationsFix.java | 4 +- .../{ => internal}/asm/VariableScope.java | 2 +- .../asm/VariableScopeTracker.java | 2 +- .../{ => internal}/model/Argument.java | 4 +- .../{ => internal}/model/Arguments.java | 2 +- .../{ => internal}/model/AssetIndex.java | 2 +- .../model/AssetIndexReference.java | 2 +- .../{ => internal}/model/Download.java | 2 +- .../model/DownloadClassifier.java | 2 +- ...nloaderBasedVersionManifestRepository.java | 10 ++--- .../model/GroupArtifactVersion.java | 2 +- .../model/JavaRuntimeVersion.java | 2 +- .../vanilla/{ => internal}/model/Library.java | 4 +- .../model/LibraryDownloads.java | 2 +- .../model/VersionClassifier.java | 2 +- .../model/VersionDescriptor.java | 2 +- .../model/VersionManifestRepository.java | 4 +- .../model/VersionManifestV2.java | 2 +- .../{ => internal}/model/package-info.java | 4 +- .../model/rule/FeatureRule.java | 2 +- .../model/rule/OperatingSystemRule.java | 2 +- .../{ => internal}/model/rule/Rule.java | 2 +- .../{ => internal}/model/rule/RuleAction.java | 2 +- .../model/rule/RuleContext.java | 2 +- .../model/rule/RuleContextImpl.java | 2 +- .../model/rule/RuleDeclaration.java | 2 +- .../rule/RuleDeclarationTypeAdapter.java | 2 +- .../network/ApacheHttpDownloader.java | 8 ++-- .../{ => internal}/network/Downloader.java | 2 +- .../network/FutureToCompletable.java | 2 +- .../{ => internal}/network/HashAlgorithm.java | 2 +- .../network/HttpErrorResponseException.java | 2 +- .../network/TeeEntityConsumer.java | 2 +- .../network/ToPathEntityConsumer.java | 4 +- .../ValidatingDigestingEntityConsumer.java | 2 +- .../{ => internal}/network/package-info.java | 5 +-- .../repository/IvyModuleWriter.java | 30 +++++++------ ...taMetadataSupplierAndArtifactProducer.java | 12 +++-- .../repository/LauncherMetaVersionLister.java | 5 ++- .../repository/MinecraftProviderService.java | 16 ++++--- .../MinecraftRepositoryExtensionImpl.java | 3 +- .../repository/MinecraftRepositoryPlugin.java | 17 ++++--- .../repository/ResolvableTool.java | 4 +- .../modifier/AccessWidenerModifier.java | 10 ++--- .../repository/modifier/ArtifactModifier.java | 2 +- .../modifier/AssociatedResolutionFlags.java | 2 +- .../JoinedProvidesClientAndServerRule.java | 2 +- ...inecraftIvyModuleExtraDataApplierRule.java | 6 +-- .../repository/rule/package-info.java | 2 +- .../runs/EclipseRunConfigurationWriter.java | 11 ++--- .../transformer/AtlasTransformers.java | 8 ++-- .../transformer/FilterClassesTransformer.java | 2 +- .../SignatureStripperTransformer.java | 2 +- .../{ => internal}/util/AsyncUtils.java | 2 +- .../{ => internal}/util/CheckedConsumer.java | 2 +- .../util/CopyingInputStream.java | 2 +- .../{ => internal}/util/FileUtils.java | 2 +- .../{ => internal}/util/GsonSerializers.java | 4 +- .../{ => internal}/util/GsonUtils.java | 12 ++--- .../{ => internal}/util/IdeConfigurer.java | 2 +- .../{ => internal}/util/ImmutablesStyle.java | 2 +- .../util/IndentingXmlStreamWriter.java | 2 +- .../vanilla/{ => internal}/util/Pair.java | 2 +- .../util/SelfPreferringClassLoader.java | 2 +- .../{ => internal}/util/StringUtils.java | 2 +- .../gradle/vanilla/mapping/MappingType.java | 45 ------------------- .../vanilla/repository/MinecraftResolver.java | 11 ++--- .../repository/MinecraftResolverImpl.java | 30 +++++++------ .../vanilla/repository/MinecraftSide.java | 10 ++--- .../vanilla/repository/package-info.java | 2 +- .../runs/ManifestDerivedArgumentProvider.java | 4 +- .../gradle/vanilla/runs/RunConfiguration.java | 2 +- .../runs/RunConfigurationContainer.java | 12 ++--- .../gradle/vanilla/task/DecompileJarTask.java | 12 ++--- .../task/DisplayMinecraftVersionsTask.java | 6 +-- .../vanilla/task/DownloadAssetsTask.java | 18 ++++---- .../gradle/vanilla/task/GenEclipseRuns.java | 2 +- .../ShadowConfigurationApplier.java | 2 +- .../model/VersionManifestRepositoryTest.java | 12 +++-- .../model/rule/OperatingSystemRuleTest.java | 1 + .../repository/IvyModuleWriterTest.java | 9 ++-- 96 files changed, 254 insertions(+), 274 deletions(-) rename src/accessWiden/java/org/spongepowered/gradle/vanilla/{ => internal}/worker/AccessWidenerEntryTransformer.java (97%) rename src/accessWiden/java/org/spongepowered/gradle/vanilla/{ => internal}/worker/AccessWidenerTransformerProvider.java (97%) rename src/jarDecompile/java/org/spongepowered/gradle/vanilla/{ => internal}/worker/Decompilation.java (98%) rename src/jarDecompile/java/org/spongepowered/gradle/vanilla/{ => internal}/worker/JarDecompileWorker.java (98%) rename src/jarDecompile/java/org/spongepowered/gradle/vanilla/{ => internal}/worker/LineMappingResultSaver.java (98%) rename src/jarDecompile/java/org/spongepowered/gradle/vanilla/{ => internal}/worker/LineMappingVisitor.java (98%) rename src/jarDecompile/java/org/spongepowered/gradle/vanilla/{ => internal}/worker/SLF4JFernFlowerLogger.java (97%) rename src/jarMerge/java/org/spongepowered/gradle/vanilla/{ => internal}/worker/JarMerger.java (97%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/Constants.java (98%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/MinecraftExtensionImpl.java (94%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/ProvideMinecraftPlugin.java (96%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/asm/EnhancedClassRemapper.java (96%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/asm/LocalVariableNamer.java (97%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/asm/LocalVariableNamingClassVisitor.java (95%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/asm/SyntheticParameterAnnotationsFix.java (97%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/asm/VariableScope.java (98%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/asm/VariableScopeTracker.java (97%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/model/Argument.java (97%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/model/Arguments.java (96%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/model/AssetIndex.java (97%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/model/AssetIndexReference.java (97%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/model/Download.java (97%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/model/DownloadClassifier.java (96%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/model/DownloaderBasedVersionManifestRepository.java (94%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/model/GroupArtifactVersion.java (97%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/model/JavaRuntimeVersion.java (96%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/model/Library.java (94%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/model/LibraryDownloads.java (97%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/model/VersionClassifier.java (98%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/model/VersionDescriptor.java (98%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/model/VersionManifestRepository.java (97%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/model/VersionManifestV2.java (97%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/model/package-info.java (91%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/model/rule/FeatureRule.java (98%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/model/rule/OperatingSystemRule.java (98%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/model/rule/Rule.java (97%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/model/rule/RuleAction.java (95%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/model/rule/RuleContext.java (96%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/model/rule/RuleContextImpl.java (97%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/model/rule/RuleDeclaration.java (98%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/model/rule/RuleDeclarationTypeAdapter.java (98%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/network/ApacheHttpDownloader.java (98%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/network/Downloader.java (98%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/network/FutureToCompletable.java (96%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/network/HashAlgorithm.java (98%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/network/HttpErrorResponseException.java (97%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/network/TeeEntityConsumer.java (98%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/network/ToPathEntityConsumer.java (97%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/network/ValidatingDigestingEntityConsumer.java (97%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/network/package-info.java (93%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/repository/IvyModuleWriter.java (85%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/repository/LauncherMetaMetadataSupplierAndArtifactProducer.java (88%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/repository/LauncherMetaVersionLister.java (93%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/repository/MinecraftProviderService.java (93%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/repository/MinecraftRepositoryExtensionImpl.java (95%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/repository/MinecraftRepositoryPlugin.java (95%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/repository/ResolvableTool.java (93%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/repository/modifier/AccessWidenerModifier.java (92%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/repository/modifier/ArtifactModifier.java (98%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/repository/modifier/AssociatedResolutionFlags.java (95%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/repository/rule/JoinedProvidesClientAndServerRule.java (98%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/repository/rule/MinecraftIvyModuleExtraDataApplierRule.java (95%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/repository/rule/package-info.java (95%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/runs/EclipseRunConfigurationWriter.java (95%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/transformer/AtlasTransformers.java (87%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/transformer/FilterClassesTransformer.java (98%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/transformer/SignatureStripperTransformer.java (97%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/util/AsyncUtils.java (98%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/util/CheckedConsumer.java (96%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/util/CopyingInputStream.java (98%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/util/FileUtils.java (98%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/util/GsonSerializers.java (96%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/util/GsonUtils.java (89%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/util/IdeConfigurer.java (98%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/util/ImmutablesStyle.java (97%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/util/IndentingXmlStreamWriter.java (99%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/util/Pair.java (97%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/util/SelfPreferringClassLoader.java (98%) rename src/main/java/org/spongepowered/gradle/vanilla/{ => internal}/util/StringUtils.java (97%) delete mode 100644 src/main/java/org/spongepowered/gradle/vanilla/mapping/MappingType.java rename src/shadow/java/org/spongepowered/gradle/vanilla/{ => internal}/ShadowConfigurationApplier.java (98%) diff --git a/src/accessWiden/java/org/spongepowered/gradle/vanilla/worker/AccessWidenerEntryTransformer.java b/src/accessWiden/java/org/spongepowered/gradle/vanilla/internal/worker/AccessWidenerEntryTransformer.java similarity index 97% rename from src/accessWiden/java/org/spongepowered/gradle/vanilla/worker/AccessWidenerEntryTransformer.java rename to src/accessWiden/java/org/spongepowered/gradle/vanilla/internal/worker/AccessWidenerEntryTransformer.java index 94cf4be..8f275ef 100644 --- a/src/accessWiden/java/org/spongepowered/gradle/vanilla/worker/AccessWidenerEntryTransformer.java +++ b/src/accessWiden/java/org/spongepowered/gradle/vanilla/internal/worker/AccessWidenerEntryTransformer.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.worker; +package org.spongepowered.gradle.vanilla.internal.worker; import net.fabricmc.accesswidener.AccessWidener; import net.fabricmc.accesswidener.AccessWidenerVisitor; diff --git a/src/accessWiden/java/org/spongepowered/gradle/vanilla/worker/AccessWidenerTransformerProvider.java b/src/accessWiden/java/org/spongepowered/gradle/vanilla/internal/worker/AccessWidenerTransformerProvider.java similarity index 97% rename from src/accessWiden/java/org/spongepowered/gradle/vanilla/worker/AccessWidenerTransformerProvider.java rename to src/accessWiden/java/org/spongepowered/gradle/vanilla/internal/worker/AccessWidenerTransformerProvider.java index f2bd225..c2bc011 100644 --- a/src/accessWiden/java/org/spongepowered/gradle/vanilla/worker/AccessWidenerTransformerProvider.java +++ b/src/accessWiden/java/org/spongepowered/gradle/vanilla/internal/worker/AccessWidenerTransformerProvider.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.worker; +package org.spongepowered.gradle.vanilla.internal.worker; import net.fabricmc.accesswidener.AccessWidener; import net.fabricmc.accesswidener.AccessWidenerReader; diff --git a/src/jarDecompile/java/org/spongepowered/gradle/vanilla/worker/Decompilation.java b/src/jarDecompile/java/org/spongepowered/gradle/vanilla/internal/worker/Decompilation.java similarity index 98% rename from src/jarDecompile/java/org/spongepowered/gradle/vanilla/worker/Decompilation.java rename to src/jarDecompile/java/org/spongepowered/gradle/vanilla/internal/worker/Decompilation.java index c598475..2230708 100644 --- a/src/jarDecompile/java/org/spongepowered/gradle/vanilla/worker/Decompilation.java +++ b/src/jarDecompile/java/org/spongepowered/gradle/vanilla/internal/worker/Decompilation.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.worker; +package org.spongepowered.gradle.vanilla.internal.worker; import org.jetbrains.java.decompiler.main.extern.IBytecodeProvider; diff --git a/src/jarDecompile/java/org/spongepowered/gradle/vanilla/worker/JarDecompileWorker.java b/src/jarDecompile/java/org/spongepowered/gradle/vanilla/internal/worker/JarDecompileWorker.java similarity index 98% rename from src/jarDecompile/java/org/spongepowered/gradle/vanilla/worker/JarDecompileWorker.java rename to src/jarDecompile/java/org/spongepowered/gradle/vanilla/internal/worker/JarDecompileWorker.java index 28339b5..b58c540 100644 --- a/src/jarDecompile/java/org/spongepowered/gradle/vanilla/worker/JarDecompileWorker.java +++ b/src/jarDecompile/java/org/spongepowered/gradle/vanilla/internal/worker/JarDecompileWorker.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.worker; +package org.spongepowered.gradle.vanilla.internal.worker; import org.gradle.api.file.ConfigurableFileCollection; import org.gradle.api.file.RegularFileProperty; diff --git a/src/jarDecompile/java/org/spongepowered/gradle/vanilla/worker/LineMappingResultSaver.java b/src/jarDecompile/java/org/spongepowered/gradle/vanilla/internal/worker/LineMappingResultSaver.java similarity index 98% rename from src/jarDecompile/java/org/spongepowered/gradle/vanilla/worker/LineMappingResultSaver.java rename to src/jarDecompile/java/org/spongepowered/gradle/vanilla/internal/worker/LineMappingResultSaver.java index e5adc52..eff12d3 100644 --- a/src/jarDecompile/java/org/spongepowered/gradle/vanilla/worker/LineMappingResultSaver.java +++ b/src/jarDecompile/java/org/spongepowered/gradle/vanilla/internal/worker/LineMappingResultSaver.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.worker; +package org.spongepowered.gradle.vanilla.internal.worker; import org.jetbrains.java.decompiler.main.decompiler.ThreadSafeResultSaver; import org.objectweb.asm.ClassReader; diff --git a/src/jarDecompile/java/org/spongepowered/gradle/vanilla/worker/LineMappingVisitor.java b/src/jarDecompile/java/org/spongepowered/gradle/vanilla/internal/worker/LineMappingVisitor.java similarity index 98% rename from src/jarDecompile/java/org/spongepowered/gradle/vanilla/worker/LineMappingVisitor.java rename to src/jarDecompile/java/org/spongepowered/gradle/vanilla/internal/worker/LineMappingVisitor.java index 66174a1..a9384f9 100644 --- a/src/jarDecompile/java/org/spongepowered/gradle/vanilla/worker/LineMappingVisitor.java +++ b/src/jarDecompile/java/org/spongepowered/gradle/vanilla/internal/worker/LineMappingVisitor.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.worker; +package org.spongepowered.gradle.vanilla.internal.worker; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.Label; diff --git a/src/jarDecompile/java/org/spongepowered/gradle/vanilla/worker/SLF4JFernFlowerLogger.java b/src/jarDecompile/java/org/spongepowered/gradle/vanilla/internal/worker/SLF4JFernFlowerLogger.java similarity index 97% rename from src/jarDecompile/java/org/spongepowered/gradle/vanilla/worker/SLF4JFernFlowerLogger.java rename to src/jarDecompile/java/org/spongepowered/gradle/vanilla/internal/worker/SLF4JFernFlowerLogger.java index b979496..4346d79 100644 --- a/src/jarDecompile/java/org/spongepowered/gradle/vanilla/worker/SLF4JFernFlowerLogger.java +++ b/src/jarDecompile/java/org/spongepowered/gradle/vanilla/internal/worker/SLF4JFernFlowerLogger.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.worker; +package org.spongepowered.gradle.vanilla.internal.worker; import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger; import org.slf4j.Logger; diff --git a/src/jarMerge/java/org/spongepowered/gradle/vanilla/worker/JarMerger.java b/src/jarMerge/java/org/spongepowered/gradle/vanilla/internal/worker/JarMerger.java similarity index 97% rename from src/jarMerge/java/org/spongepowered/gradle/vanilla/worker/JarMerger.java rename to src/jarMerge/java/org/spongepowered/gradle/vanilla/internal/worker/JarMerger.java index 3d997da..c760aba 100644 --- a/src/jarMerge/java/org/spongepowered/gradle/vanilla/worker/JarMerger.java +++ b/src/jarMerge/java/org/spongepowered/gradle/vanilla/internal/worker/JarMerger.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.worker; +package org.spongepowered.gradle.vanilla.internal.worker; import net.minecraftforge.mergetool.AnnotationVersion; import net.minecraftforge.mergetool.Merger; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/VanillaGradle.java b/src/main/java/org/spongepowered/gradle/vanilla/VanillaGradle.java index 1127658..c5e6f73 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/VanillaGradle.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/VanillaGradle.java @@ -44,11 +44,15 @@ import org.jetbrains.gradle.ext.IdeaExtPlugin; import org.jetbrains.gradle.ext.ProjectSettings; import org.jetbrains.gradle.ext.TaskTriggersConfig; -import org.spongepowered.gradle.vanilla.repository.MinecraftProviderService; -import org.spongepowered.gradle.vanilla.repository.MinecraftRepositoryPlugin; +import org.spongepowered.gradle.vanilla.internal.Constants; +import org.spongepowered.gradle.vanilla.internal.MinecraftExtensionImpl; +import org.spongepowered.gradle.vanilla.internal.ProvideMinecraftPlugin; +import org.spongepowered.gradle.vanilla.internal.ShadowConfigurationApplier; +import org.spongepowered.gradle.vanilla.internal.repository.MinecraftProviderService; +import org.spongepowered.gradle.vanilla.internal.repository.MinecraftRepositoryPlugin; import org.spongepowered.gradle.vanilla.task.DisplayMinecraftVersionsTask; -import org.spongepowered.gradle.vanilla.util.IdeConfigurer; -import org.spongepowered.gradle.vanilla.util.SelfPreferringClassLoader; +import org.spongepowered.gradle.vanilla.internal.util.IdeConfigurer; +import org.spongepowered.gradle.vanilla.internal.util.SelfPreferringClassLoader; import java.io.IOException; import java.lang.reflect.InvocationTargetException; @@ -76,7 +80,7 @@ public void apply(final @NonNull Object target) { } } - public void applyToProject(final Project project) { + private void applyToProject(final Project project) { if (VanillaGradle.VERSION_ANNOUNCED.compareAndSet(false, true)) { project.getLogger().lifecycle(String.format("SpongePowered Vanilla 'GRADLE' Toolset Version '%s'", Constants.VERSION)); } diff --git a/src/main/java/org/spongepowered/gradle/vanilla/Constants.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/Constants.java similarity index 98% rename from src/main/java/org/spongepowered/gradle/vanilla/Constants.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/Constants.java index 262992b..2821ec1 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/Constants.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/Constants.java @@ -22,13 +22,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla; +package org.spongepowered.gradle.vanilla.internal; import org.gradle.api.artifacts.dsl.RepositoryHandler; import org.gradle.api.artifacts.repositories.MavenRepositoryContentDescriptor; import org.gradle.util.GradleVersion; import org.objectweb.asm.Opcodes; -import org.spongepowered.gradle.vanilla.model.GroupArtifactVersion; +import org.spongepowered.gradle.vanilla.internal.model.GroupArtifactVersion; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/MinecraftExtensionImpl.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/MinecraftExtensionImpl.java similarity index 94% rename from src/main/java/org/spongepowered/gradle/vanilla/MinecraftExtensionImpl.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/MinecraftExtensionImpl.java index 4fd150f..ef7caf7 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/MinecraftExtensionImpl.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/MinecraftExtensionImpl.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla; +package org.spongepowered.gradle.vanilla.internal; import groovy.lang.Closure; import groovy.lang.DelegatesTo; @@ -36,13 +36,14 @@ import org.gradle.api.provider.Property; import org.gradle.api.provider.Provider; import org.gradle.util.ConfigureUtil; -import org.spongepowered.gradle.vanilla.model.VersionClassifier; -import org.spongepowered.gradle.vanilla.model.VersionDescriptor; +import org.spongepowered.gradle.vanilla.MinecraftExtension; +import org.spongepowered.gradle.vanilla.internal.model.VersionClassifier; +import org.spongepowered.gradle.vanilla.internal.model.VersionDescriptor; import org.spongepowered.gradle.vanilla.repository.MinecraftPlatform; -import org.spongepowered.gradle.vanilla.repository.MinecraftProviderService; -import org.spongepowered.gradle.vanilla.repository.MinecraftRepositoryPlugin; -import org.spongepowered.gradle.vanilla.repository.modifier.AccessWidenerModifier; -import org.spongepowered.gradle.vanilla.repository.modifier.ArtifactModifier; +import org.spongepowered.gradle.vanilla.internal.repository.MinecraftProviderService; +import org.spongepowered.gradle.vanilla.internal.repository.MinecraftRepositoryPlugin; +import org.spongepowered.gradle.vanilla.internal.repository.modifier.AccessWidenerModifier; +import org.spongepowered.gradle.vanilla.internal.repository.modifier.ArtifactModifier; import org.spongepowered.gradle.vanilla.runs.RunConfiguration; import org.spongepowered.gradle.vanilla.runs.RunConfigurationContainer; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/ProvideMinecraftPlugin.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/ProvideMinecraftPlugin.java similarity index 96% rename from src/main/java/org/spongepowered/gradle/vanilla/ProvideMinecraftPlugin.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/ProvideMinecraftPlugin.java index 4bc4ccd..18c7de3 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/ProvideMinecraftPlugin.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/ProvideMinecraftPlugin.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla; +package org.spongepowered.gradle.vanilla.internal; import org.checkerframework.checker.nullness.qual.Nullable; import org.gradle.api.InvalidUserDataException; @@ -36,7 +36,6 @@ import org.gradle.api.artifacts.dsl.RepositoryHandler; import org.gradle.api.file.ConfigurableFileCollection; import org.gradle.api.file.Directory; -import org.gradle.api.file.DirectoryProperty; import org.gradle.api.file.DuplicatesStrategy; import org.gradle.api.file.FileCollection; import org.gradle.api.file.FileSystemLocation; @@ -57,20 +56,21 @@ import org.jetbrains.gradle.ext.Application; import org.jetbrains.gradle.ext.ProjectSettings; import org.jetbrains.gradle.ext.RunConfigurationContainer; -import org.spongepowered.gradle.vanilla.model.Library; -import org.spongepowered.gradle.vanilla.model.rule.OperatingSystemRule; -import org.spongepowered.gradle.vanilla.model.rule.RuleContext; +import org.spongepowered.gradle.vanilla.MinecraftExtension; +import org.spongepowered.gradle.vanilla.internal.model.Library; +import org.spongepowered.gradle.vanilla.internal.model.rule.OperatingSystemRule; +import org.spongepowered.gradle.vanilla.internal.model.rule.RuleContext; import org.spongepowered.gradle.vanilla.repository.MinecraftPlatform; -import org.spongepowered.gradle.vanilla.repository.MinecraftProviderService; +import org.spongepowered.gradle.vanilla.internal.repository.MinecraftProviderService; import org.spongepowered.gradle.vanilla.repository.MinecraftRepositoryExtension; -import org.spongepowered.gradle.vanilla.repository.MinecraftRepositoryPlugin; +import org.spongepowered.gradle.vanilla.internal.repository.MinecraftRepositoryPlugin; import org.spongepowered.gradle.vanilla.repository.MinecraftSide; import org.spongepowered.gradle.vanilla.runs.ClientRunParameterTokens; import org.spongepowered.gradle.vanilla.task.DecompileJarTask; import org.spongepowered.gradle.vanilla.task.DownloadAssetsTask; import org.spongepowered.gradle.vanilla.task.GenEclipseRuns; -import org.spongepowered.gradle.vanilla.util.IdeConfigurer; -import org.spongepowered.gradle.vanilla.util.StringUtils; +import org.spongepowered.gradle.vanilla.internal.util.IdeConfigurer; +import org.spongepowered.gradle.vanilla.internal.util.StringUtils; import java.io.File; import java.util.Iterator; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/asm/EnhancedClassRemapper.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/asm/EnhancedClassRemapper.java similarity index 96% rename from src/main/java/org/spongepowered/gradle/vanilla/asm/EnhancedClassRemapper.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/asm/EnhancedClassRemapper.java index 8d14850..aa0632f 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/asm/EnhancedClassRemapper.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/asm/EnhancedClassRemapper.java @@ -22,12 +22,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.asm; +package org.spongepowered.gradle.vanilla.internal.asm; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.commons.ClassRemapper; import org.objectweb.asm.commons.Remapper; -import org.spongepowered.gradle.vanilla.Constants; +import org.spongepowered.gradle.vanilla.internal.Constants; /** * Extend ASM's ClassRemapper with a few things: diff --git a/src/main/java/org/spongepowered/gradle/vanilla/asm/LocalVariableNamer.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/asm/LocalVariableNamer.java similarity index 97% rename from src/main/java/org/spongepowered/gradle/vanilla/asm/LocalVariableNamer.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/asm/LocalVariableNamer.java index 4bd9eb4..2cf579c 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/asm/LocalVariableNamer.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/asm/LocalVariableNamer.java @@ -22,12 +22,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.asm; +package org.spongepowered.gradle.vanilla.internal.asm; import org.objectweb.asm.Handle; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; -import org.spongepowered.gradle.vanilla.Constants; +import org.spongepowered.gradle.vanilla.internal.Constants; public final class LocalVariableNamer extends MethodVisitor { diff --git a/src/main/java/org/spongepowered/gradle/vanilla/asm/LocalVariableNamingClassVisitor.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/asm/LocalVariableNamingClassVisitor.java similarity index 95% rename from src/main/java/org/spongepowered/gradle/vanilla/asm/LocalVariableNamingClassVisitor.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/asm/LocalVariableNamingClassVisitor.java index d4f9557..38b0978 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/asm/LocalVariableNamingClassVisitor.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/asm/LocalVariableNamingClassVisitor.java @@ -22,13 +22,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.asm; +package org.spongepowered.gradle.vanilla.internal.asm; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; -import org.spongepowered.gradle.vanilla.Constants; +import org.spongepowered.gradle.vanilla.internal.Constants; public final class LocalVariableNamingClassVisitor extends ClassVisitor { diff --git a/src/main/java/org/spongepowered/gradle/vanilla/asm/SyntheticParameterAnnotationsFix.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/asm/SyntheticParameterAnnotationsFix.java similarity index 97% rename from src/main/java/org/spongepowered/gradle/vanilla/asm/SyntheticParameterAnnotationsFix.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/asm/SyntheticParameterAnnotationsFix.java index dd9de68..fbc227e 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/asm/SyntheticParameterAnnotationsFix.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/asm/SyntheticParameterAnnotationsFix.java @@ -22,14 +22,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.asm; +package org.spongepowered.gradle.vanilla.internal.asm; import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.signature.SignatureReader; import org.objectweb.asm.signature.SignatureVisitor; -import org.spongepowered.gradle.vanilla.Constants; +import org.spongepowered.gradle.vanilla.internal.Constants; public class SyntheticParameterAnnotationsFix extends ClassVisitor { diff --git a/src/main/java/org/spongepowered/gradle/vanilla/asm/VariableScope.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/asm/VariableScope.java similarity index 98% rename from src/main/java/org/spongepowered/gradle/vanilla/asm/VariableScope.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/asm/VariableScope.java index c08b974..c919757 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/asm/VariableScope.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/asm/VariableScope.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.asm; +package org.spongepowered.gradle.vanilla.internal.asm; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/asm/VariableScopeTracker.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/asm/VariableScopeTracker.java similarity index 97% rename from src/main/java/org/spongepowered/gradle/vanilla/asm/VariableScopeTracker.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/asm/VariableScopeTracker.java index a8b644a..5791311 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/asm/VariableScopeTracker.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/asm/VariableScopeTracker.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.asm; +package org.spongepowered.gradle.vanilla.internal.asm; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/model/Argument.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/Argument.java similarity index 97% rename from src/main/java/org/spongepowered/gradle/vanilla/model/Argument.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/model/Argument.java index 86ef448..3a32798 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/model/Argument.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/Argument.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.model; +package org.spongepowered.gradle.vanilla.internal.model; import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; @@ -33,7 +33,7 @@ import com.google.gson.stream.JsonToken; import com.google.gson.stream.JsonWriter; import org.immutables.value.Value; -import org.spongepowered.gradle.vanilla.model.rule.RuleDeclaration; +import org.spongepowered.gradle.vanilla.internal.model.rule.RuleDeclaration; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/model/Arguments.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/Arguments.java similarity index 96% rename from src/main/java/org/spongepowered/gradle/vanilla/model/Arguments.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/model/Arguments.java index 98e2761..e1f95fd 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/model/Arguments.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/Arguments.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.model; +package org.spongepowered.gradle.vanilla.internal.model; import org.immutables.gson.Gson; import org.immutables.value.Value; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/model/AssetIndex.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/AssetIndex.java similarity index 97% rename from src/main/java/org/spongepowered/gradle/vanilla/model/AssetIndex.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/model/AssetIndex.java index 29adfa2..a07ab94 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/model/AssetIndex.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/AssetIndex.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.model; +package org.spongepowered.gradle.vanilla.internal.model; import org.immutables.gson.Gson; import org.immutables.value.Value; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/model/AssetIndexReference.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/AssetIndexReference.java similarity index 97% rename from src/main/java/org/spongepowered/gradle/vanilla/model/AssetIndexReference.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/model/AssetIndexReference.java index 8ee2be4..6d05822 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/model/AssetIndexReference.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/AssetIndexReference.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.model; +package org.spongepowered.gradle.vanilla.internal.model; import org.immutables.gson.Gson; import org.immutables.value.Value; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/model/Download.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/Download.java similarity index 97% rename from src/main/java/org/spongepowered/gradle/vanilla/model/Download.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/model/Download.java index 32b5fc3..dc61019 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/model/Download.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/Download.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.model; +package org.spongepowered.gradle.vanilla.internal.model; import org.checkerframework.checker.nullness.qual.Nullable; import org.immutables.gson.Gson; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/model/DownloadClassifier.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/DownloadClassifier.java similarity index 96% rename from src/main/java/org/spongepowered/gradle/vanilla/model/DownloadClassifier.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/model/DownloadClassifier.java index 8fcb4fe..581390b 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/model/DownloadClassifier.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/DownloadClassifier.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.model; +package org.spongepowered.gradle.vanilla.internal.model; import com.google.gson.annotations.SerializedName; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/model/DownloaderBasedVersionManifestRepository.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/DownloaderBasedVersionManifestRepository.java similarity index 94% rename from src/main/java/org/spongepowered/gradle/vanilla/model/DownloaderBasedVersionManifestRepository.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/model/DownloaderBasedVersionManifestRepository.java index 4c69d75..4384f4e 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/model/DownloaderBasedVersionManifestRepository.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/DownloaderBasedVersionManifestRepository.java @@ -22,16 +22,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.model; +package org.spongepowered.gradle.vanilla.internal.model; import org.checkerframework.checker.nullness.qual.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spongepowered.gradle.vanilla.Constants; -import org.spongepowered.gradle.vanilla.network.Downloader; -import org.spongepowered.gradle.vanilla.network.HashAlgorithm; +import org.spongepowered.gradle.vanilla.internal.Constants; +import org.spongepowered.gradle.vanilla.internal.network.network.Downloader; +import org.spongepowered.gradle.vanilla.internal.network.network.HashAlgorithm; import org.spongepowered.gradle.vanilla.repository.ResolutionResult; -import org.spongepowered.gradle.vanilla.util.GsonUtils; +import org.spongepowered.gradle.vanilla.internal.util.GsonUtils; import java.io.IOException; import java.net.MalformedURLException; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/model/GroupArtifactVersion.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/GroupArtifactVersion.java similarity index 97% rename from src/main/java/org/spongepowered/gradle/vanilla/model/GroupArtifactVersion.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/model/GroupArtifactVersion.java index 2f91276..a06b5de 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/model/GroupArtifactVersion.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/GroupArtifactVersion.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.model; +package org.spongepowered.gradle.vanilla.internal.model; import org.checkerframework.checker.nullness.qual.Nullable; import org.immutables.value.Value; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/model/JavaRuntimeVersion.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/JavaRuntimeVersion.java similarity index 96% rename from src/main/java/org/spongepowered/gradle/vanilla/model/JavaRuntimeVersion.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/model/JavaRuntimeVersion.java index b079c28..2a024e9 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/model/JavaRuntimeVersion.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/JavaRuntimeVersion.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.model; +package org.spongepowered.gradle.vanilla.internal.model; import org.immutables.gson.Gson; import org.immutables.value.Value; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/model/Library.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/Library.java similarity index 94% rename from src/main/java/org/spongepowered/gradle/vanilla/model/Library.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/model/Library.java index ff70923..1423732 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/model/Library.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/Library.java @@ -22,11 +22,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.model; +package org.spongepowered.gradle.vanilla.internal.model; import org.immutables.gson.Gson; import org.immutables.value.Value; -import org.spongepowered.gradle.vanilla.model.rule.RuleDeclaration; +import org.spongepowered.gradle.vanilla.internal.model.rule.RuleDeclaration; import java.util.Collections; import java.util.Map; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/model/LibraryDownloads.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/LibraryDownloads.java similarity index 97% rename from src/main/java/org/spongepowered/gradle/vanilla/model/LibraryDownloads.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/model/LibraryDownloads.java index 454d44b..b06b139 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/model/LibraryDownloads.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/LibraryDownloads.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.model; +package org.spongepowered.gradle.vanilla.internal.model; import org.immutables.gson.Gson; import org.immutables.value.Value; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/model/VersionClassifier.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/VersionClassifier.java similarity index 98% rename from src/main/java/org/spongepowered/gradle/vanilla/model/VersionClassifier.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/model/VersionClassifier.java index 0cda0d0..0fb20cd 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/model/VersionClassifier.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/VersionClassifier.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.model; +package org.spongepowered.gradle.vanilla.internal.model; import com.google.gson.annotations.SerializedName; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/model/VersionDescriptor.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/VersionDescriptor.java similarity index 98% rename from src/main/java/org/spongepowered/gradle/vanilla/model/VersionDescriptor.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/model/VersionDescriptor.java index ed32fef..8cde666 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/model/VersionDescriptor.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/VersionDescriptor.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.model; +package org.spongepowered.gradle.vanilla.internal.model; import com.google.gson.JsonObject; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/model/VersionManifestRepository.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/VersionManifestRepository.java similarity index 97% rename from src/main/java/org/spongepowered/gradle/vanilla/model/VersionManifestRepository.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/model/VersionManifestRepository.java index e702a8d..90589d2 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/model/VersionManifestRepository.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/VersionManifestRepository.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.model; +package org.spongepowered.gradle.vanilla.internal.model; -import org.spongepowered.gradle.vanilla.network.Downloader; +import org.spongepowered.gradle.vanilla.internal.network.network.Downloader; import org.spongepowered.gradle.vanilla.repository.ResolutionResult; import java.io.File; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/model/VersionManifestV2.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/VersionManifestV2.java similarity index 97% rename from src/main/java/org/spongepowered/gradle/vanilla/model/VersionManifestV2.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/model/VersionManifestV2.java index e6297ba..295b55f 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/model/VersionManifestV2.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/VersionManifestV2.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.model; +package org.spongepowered.gradle.vanilla.internal.model; import org.immutables.gson.Gson; import org.immutables.value.Value; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/model/package-info.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/package-info.java similarity index 91% rename from src/main/java/org/spongepowered/gradle/vanilla/model/package-info.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/model/package-info.java index b4e7cfb..73ef8eb 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/model/package-info.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/package-info.java @@ -24,8 +24,8 @@ */ @DefaultQualifier(NonNull.class) @ImmutablesStyle -package org.spongepowered.gradle.vanilla.model; +package org.spongepowered.gradle.vanilla.internal.model; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.framework.qual.DefaultQualifier; -import org.spongepowered.gradle.vanilla.util.ImmutablesStyle; \ No newline at end of file +import org.spongepowered.gradle.vanilla.internal.util.ImmutablesStyle; \ No newline at end of file diff --git a/src/main/java/org/spongepowered/gradle/vanilla/model/rule/FeatureRule.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/rule/FeatureRule.java similarity index 98% rename from src/main/java/org/spongepowered/gradle/vanilla/model/rule/FeatureRule.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/model/rule/FeatureRule.java index ce70c51..0421af6 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/model/rule/FeatureRule.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/rule/FeatureRule.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.model.rule; +package org.spongepowered.gradle.vanilla.internal.model.rule; import com.google.gson.reflect.TypeToken; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/model/rule/OperatingSystemRule.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/rule/OperatingSystemRule.java similarity index 98% rename from src/main/java/org/spongepowered/gradle/vanilla/model/rule/OperatingSystemRule.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/model/rule/OperatingSystemRule.java index c721c9e..ecddf5c 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/model/rule/OperatingSystemRule.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/rule/OperatingSystemRule.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.model.rule; +package org.spongepowered.gradle.vanilla.internal.model.rule; import com.google.gson.reflect.TypeToken; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/model/rule/Rule.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/rule/Rule.java similarity index 97% rename from src/main/java/org/spongepowered/gradle/vanilla/model/rule/Rule.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/model/rule/Rule.java index 4a784a3..92dacee 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/model/rule/Rule.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/rule/Rule.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.model.rule; +package org.spongepowered.gradle.vanilla.internal.model.rule; import com.google.gson.reflect.TypeToken; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/model/rule/RuleAction.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/rule/RuleAction.java similarity index 95% rename from src/main/java/org/spongepowered/gradle/vanilla/model/rule/RuleAction.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/model/rule/RuleAction.java index 253ecef..b9f912b 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/model/rule/RuleAction.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/rule/RuleAction.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.model.rule; +package org.spongepowered.gradle.vanilla.internal.model.rule; import com.google.gson.annotations.SerializedName; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/model/rule/RuleContext.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/rule/RuleContext.java similarity index 96% rename from src/main/java/org/spongepowered/gradle/vanilla/model/rule/RuleContext.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/model/rule/RuleContext.java index 76e3f29..c4dc32b 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/model/rule/RuleContext.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/rule/RuleContext.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.model.rule; +package org.spongepowered.gradle.vanilla.internal.model.rule; import java.util.Optional; import java.util.function.Function; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/model/rule/RuleContextImpl.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/rule/RuleContextImpl.java similarity index 97% rename from src/main/java/org/spongepowered/gradle/vanilla/model/rule/RuleContextImpl.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/model/rule/RuleContextImpl.java index 335b1ed..380ef07 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/model/rule/RuleContextImpl.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/rule/RuleContextImpl.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.model.rule; +package org.spongepowered.gradle.vanilla.internal.model.rule; import java.util.Map; import java.util.Optional; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/model/rule/RuleDeclaration.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/rule/RuleDeclaration.java similarity index 98% rename from src/main/java/org/spongepowered/gradle/vanilla/model/rule/RuleDeclaration.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/model/rule/RuleDeclaration.java index ba4948c..5f81912 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/model/rule/RuleDeclaration.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/rule/RuleDeclaration.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.model.rule; +package org.spongepowered.gradle.vanilla.internal.model.rule; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/model/rule/RuleDeclarationTypeAdapter.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/rule/RuleDeclarationTypeAdapter.java similarity index 98% rename from src/main/java/org/spongepowered/gradle/vanilla/model/rule/RuleDeclarationTypeAdapter.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/model/rule/RuleDeclarationTypeAdapter.java index a55a0fe..803b68b 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/model/rule/RuleDeclarationTypeAdapter.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/model/rule/RuleDeclarationTypeAdapter.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.model.rule; +package org.spongepowered.gradle.vanilla.internal.model.rule; import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/network/ApacheHttpDownloader.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/network/ApacheHttpDownloader.java similarity index 98% rename from src/main/java/org/spongepowered/gradle/vanilla/network/ApacheHttpDownloader.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/network/ApacheHttpDownloader.java index 84f1efe..4a13232 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/network/ApacheHttpDownloader.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/network/ApacheHttpDownloader.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.network; +package org.spongepowered.gradle.vanilla.internal.network.network; import org.apache.hc.client5.http.async.methods.SimpleHttpRequests; import org.apache.hc.client5.http.async.methods.SimpleRequestProducer; @@ -43,10 +43,10 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spongepowered.gradle.vanilla.Constants; +import org.spongepowered.gradle.vanilla.internal.Constants; import org.spongepowered.gradle.vanilla.repository.ResolutionResult; -import org.spongepowered.gradle.vanilla.util.AsyncUtils; -import org.spongepowered.gradle.vanilla.util.FileUtils; +import org.spongepowered.gradle.vanilla.internal.util.AsyncUtils; +import org.spongepowered.gradle.vanilla.internal.util.FileUtils; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/network/Downloader.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/network/Downloader.java similarity index 98% rename from src/main/java/org/spongepowered/gradle/vanilla/network/Downloader.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/network/Downloader.java index d866901..b0b5c90 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/network/Downloader.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/network/Downloader.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.network; +package org.spongepowered.gradle.vanilla.internal.network.network; import org.spongepowered.gradle.vanilla.repository.ResolutionResult; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/network/FutureToCompletable.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/network/FutureToCompletable.java similarity index 96% rename from src/main/java/org/spongepowered/gradle/vanilla/network/FutureToCompletable.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/network/FutureToCompletable.java index 4e75acb..51ac807 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/network/FutureToCompletable.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/network/FutureToCompletable.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.network; +package org.spongepowered.gradle.vanilla.internal.network.network; import org.apache.hc.core5.concurrent.FutureCallback; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/network/HashAlgorithm.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/network/HashAlgorithm.java similarity index 98% rename from src/main/java/org/spongepowered/gradle/vanilla/network/HashAlgorithm.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/network/HashAlgorithm.java index ae4f3ab..7ab23f2 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/network/HashAlgorithm.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/network/HashAlgorithm.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.network; +package org.spongepowered.gradle.vanilla.internal.network.network; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/network/HttpErrorResponseException.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/network/HttpErrorResponseException.java similarity index 97% rename from src/main/java/org/spongepowered/gradle/vanilla/network/HttpErrorResponseException.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/network/HttpErrorResponseException.java index b72e43d..061a56f 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/network/HttpErrorResponseException.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/network/HttpErrorResponseException.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.network; +package org.spongepowered.gradle.vanilla.internal.network.network; import java.io.IOException; import java.net.URL; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/network/TeeEntityConsumer.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/network/TeeEntityConsumer.java similarity index 98% rename from src/main/java/org/spongepowered/gradle/vanilla/network/TeeEntityConsumer.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/network/TeeEntityConsumer.java index d1063ab..d29352e 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/network/TeeEntityConsumer.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/network/TeeEntityConsumer.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.network; +package org.spongepowered.gradle.vanilla.internal.network.network; import org.apache.hc.core5.concurrent.FutureCallback; import org.apache.hc.core5.http.EntityDetails; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/network/ToPathEntityConsumer.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/network/ToPathEntityConsumer.java similarity index 97% rename from src/main/java/org/spongepowered/gradle/vanilla/network/ToPathEntityConsumer.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/network/ToPathEntityConsumer.java index 24212d2..f7e6538 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/network/ToPathEntityConsumer.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/network/ToPathEntityConsumer.java @@ -22,12 +22,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.network; +package org.spongepowered.gradle.vanilla.internal.network.network; import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.nio.entity.AbstractBinAsyncEntityConsumer; import org.checkerframework.checker.nullness.qual.Nullable; -import org.spongepowered.gradle.vanilla.util.FileUtils; +import org.spongepowered.gradle.vanilla.internal.util.FileUtils; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/network/ValidatingDigestingEntityConsumer.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/network/ValidatingDigestingEntityConsumer.java similarity index 97% rename from src/main/java/org/spongepowered/gradle/vanilla/network/ValidatingDigestingEntityConsumer.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/network/ValidatingDigestingEntityConsumer.java index 104a8c7..3d3b425 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/network/ValidatingDigestingEntityConsumer.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/network/ValidatingDigestingEntityConsumer.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.network; +package org.spongepowered.gradle.vanilla.internal.network.network; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HttpException; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/network/package-info.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/network/package-info.java similarity index 93% rename from src/main/java/org/spongepowered/gradle/vanilla/network/package-info.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/network/package-info.java index fc63cb3..141b926 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/network/package-info.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/network/package-info.java @@ -29,7 +29,7 @@ * * @@ -46,8 +46,7 @@ * */ @DefaultQualifier(NonNull.class) -package org.spongepowered.gradle.vanilla.network; +package org.spongepowered.gradle.vanilla.internal.network.network; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.framework.qual.DefaultQualifier; -import org.spongepowered.gradle.vanilla.model.VersionDescriptor; \ No newline at end of file diff --git a/src/main/java/org/spongepowered/gradle/vanilla/repository/IvyModuleWriter.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/IvyModuleWriter.java similarity index 85% rename from src/main/java/org/spongepowered/gradle/vanilla/repository/IvyModuleWriter.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/repository/IvyModuleWriter.java index 1b0585d..1b7557f 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/repository/IvyModuleWriter.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/IvyModuleWriter.java @@ -22,16 +22,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.repository; +package org.spongepowered.gradle.vanilla.internal.repository; import org.checkerframework.checker.nullness.qual.Nullable; -import org.spongepowered.gradle.vanilla.Constants; -import org.spongepowered.gradle.vanilla.model.GroupArtifactVersion; -import org.spongepowered.gradle.vanilla.model.JavaRuntimeVersion; -import org.spongepowered.gradle.vanilla.model.Library; -import org.spongepowered.gradle.vanilla.model.VersionDescriptor; -import org.spongepowered.gradle.vanilla.model.rule.RuleContext; -import org.spongepowered.gradle.vanilla.util.IndentingXmlStreamWriter; +import org.spongepowered.gradle.vanilla.internal.Constants; +import org.spongepowered.gradle.vanilla.internal.model.GroupArtifactVersion; +import org.spongepowered.gradle.vanilla.internal.model.JavaRuntimeVersion; +import org.spongepowered.gradle.vanilla.internal.model.Library; +import org.spongepowered.gradle.vanilla.internal.model.VersionDescriptor; +import org.spongepowered.gradle.vanilla.internal.model.rule.RuleContext; +import org.spongepowered.gradle.vanilla.internal.util.IndentingXmlStreamWriter; +import org.spongepowered.gradle.vanilla.repository.MinecraftPlatform; +import org.spongepowered.gradle.vanilla.repository.MinecraftSide; import java.io.IOException; import java.io.Writer; @@ -74,34 +76,34 @@ public final class IvyModuleWriter implements AutoCloseable { private final Set extraDependencies = new HashSet<>(); private @Nullable String artifactId; - IvyModuleWriter(final Writer output) throws XMLStreamException { + public IvyModuleWriter(final Writer output) throws XMLStreamException { this.managedOutput = false; this.output = output; this.writer = new IndentingXmlStreamWriter(IvyModuleWriter.OUTPUT_FACTORY.createXMLStreamWriter(output), Constants.INDENT); } - IvyModuleWriter(final Path target) throws IOException, XMLStreamException { + public IvyModuleWriter(final Path target) throws IOException, XMLStreamException { this.managedOutput = true; this.output = Files.newBufferedWriter(target); this.writer = new IndentingXmlStreamWriter(IvyModuleWriter.OUTPUT_FACTORY.createXMLStreamWriter(this.output), Constants.INDENT); } - IvyModuleWriter overrideArtifactId(final String artifactId) { + public IvyModuleWriter overrideArtifactId(final String artifactId) { this.artifactId = Objects.requireNonNull(artifactId, "artifactId"); return this; } - IvyModuleWriter extraDependencies(final GroupArtifactVersion... dependencies) { + public IvyModuleWriter extraDependencies(final GroupArtifactVersion... dependencies) { Collections.addAll(this.extraDependencies, dependencies); return this; } - IvyModuleWriter extraDependencies(final Collection dependencies) { + public IvyModuleWriter extraDependencies(final Collection dependencies) { this.extraDependencies.addAll(dependencies); return this; } - void write(final VersionDescriptor.Full descriptor, final MinecraftPlatform platform, final RuleContext rules) throws XMLStreamException { + public void write(final VersionDescriptor.Full descriptor, final MinecraftPlatform platform, final RuleContext rules) throws XMLStreamException { this.writer.writeStartDocument("UTF-8", "1.0"); this.writer.writeStartElement("ivy-module"); this.writer.writeNamespace("xsi", IvyModuleWriter.XSI); diff --git a/src/main/java/org/spongepowered/gradle/vanilla/repository/LauncherMetaMetadataSupplierAndArtifactProducer.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/LauncherMetaMetadataSupplierAndArtifactProducer.java similarity index 88% rename from src/main/java/org/spongepowered/gradle/vanilla/repository/LauncherMetaMetadataSupplierAndArtifactProducer.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/repository/LauncherMetaMetadataSupplierAndArtifactProducer.java index 45cfa8e..0281dda 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/repository/LauncherMetaMetadataSupplierAndArtifactProducer.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/LauncherMetaMetadataSupplierAndArtifactProducer.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.repository; +package org.spongepowered.gradle.vanilla.internal.repository; import org.gradle.api.artifacts.ComponentMetadataBuilder; import org.gradle.api.artifacts.ComponentMetadataSupplier; @@ -31,8 +31,11 @@ import org.gradle.api.provider.Provider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spongepowered.gradle.vanilla.model.VersionClassifier; -import org.spongepowered.gradle.vanilla.model.VersionDescriptor; +import org.spongepowered.gradle.vanilla.internal.model.VersionClassifier; +import org.spongepowered.gradle.vanilla.internal.model.VersionDescriptor; +import org.spongepowered.gradle.vanilla.repository.MinecraftPlatform; +import org.spongepowered.gradle.vanilla.repository.MinecraftResolver; +import org.spongepowered.gradle.vanilla.repository.ResolutionResult; import java.util.Optional; import java.util.concurrent.ExecutionException; @@ -71,7 +74,8 @@ public void execute(final ComponentMetadataSupplierDetails details) { final MinecraftResolver resolver = providerService.resolver(); // Request the appropriate jar, block until it's provided // TODO: maybe validate that the state keys of the provided modifiers actually match the artifact ID? - final ResolutionResult resolution = resolver.provide(platform.get(), version, providerService.peekModifiers()).get(); + final ResolutionResult + resolution = resolver.provide(platform.get(), version, providerService.peekModifiers()).get(); if (!resolution.isPresent()) { return; } diff --git a/src/main/java/org/spongepowered/gradle/vanilla/repository/LauncherMetaVersionLister.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/LauncherMetaVersionLister.java similarity index 93% rename from src/main/java/org/spongepowered/gradle/vanilla/repository/LauncherMetaVersionLister.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/repository/LauncherMetaVersionLister.java index b9f94cc..3ed8f34 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/repository/LauncherMetaVersionLister.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/LauncherMetaVersionLister.java @@ -22,14 +22,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.repository; +package org.spongepowered.gradle.vanilla.internal.repository; import org.gradle.api.artifacts.ComponentMetadataListerDetails; import org.gradle.api.artifacts.ComponentMetadataVersionLister; import org.gradle.api.provider.Provider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spongepowered.gradle.vanilla.model.VersionDescriptor; +import org.spongepowered.gradle.vanilla.internal.model.VersionDescriptor; +import org.spongepowered.gradle.vanilla.repository.MinecraftPlatform; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/repository/MinecraftProviderService.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/MinecraftProviderService.java similarity index 93% rename from src/main/java/org/spongepowered/gradle/vanilla/repository/MinecraftProviderService.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/repository/MinecraftProviderService.java index 19cc3c9..4803e0c 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/repository/MinecraftProviderService.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/MinecraftProviderService.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.repository; +package org.spongepowered.gradle.vanilla.internal.repository; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import org.checkerframework.checker.nullness.qual.Nullable; @@ -37,11 +37,13 @@ import org.gradle.tooling.events.OperationCompletionListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spongepowered.gradle.vanilla.Constants; -import org.spongepowered.gradle.vanilla.model.VersionManifestRepository; -import org.spongepowered.gradle.vanilla.network.ApacheHttpDownloader; -import org.spongepowered.gradle.vanilla.network.Downloader; -import org.spongepowered.gradle.vanilla.repository.modifier.ArtifactModifier; +import org.spongepowered.gradle.vanilla.internal.Constants; +import org.spongepowered.gradle.vanilla.internal.model.VersionManifestRepository; +import org.spongepowered.gradle.vanilla.internal.network.network.ApacheHttpDownloader; +import org.spongepowered.gradle.vanilla.internal.network.network.Downloader; +import org.spongepowered.gradle.vanilla.internal.repository.modifier.ArtifactModifier; +import org.spongepowered.gradle.vanilla.repository.MinecraftResolver; +import org.spongepowered.gradle.vanilla.repository.MinecraftResolverImpl; import java.io.IOException; import java.net.MalformedURLException; @@ -110,7 +112,7 @@ public Set peekModifiers() { return modifiers; } - void dropState() { + public void dropState() { this.activeState.remove(); } diff --git a/src/main/java/org/spongepowered/gradle/vanilla/repository/MinecraftRepositoryExtensionImpl.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/MinecraftRepositoryExtensionImpl.java similarity index 95% rename from src/main/java/org/spongepowered/gradle/vanilla/repository/MinecraftRepositoryExtensionImpl.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/repository/MinecraftRepositoryExtensionImpl.java index 3f41e4c..fc3ac01 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/repository/MinecraftRepositoryExtensionImpl.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/MinecraftRepositoryExtensionImpl.java @@ -22,12 +22,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.repository; +package org.spongepowered.gradle.vanilla.internal.repository; import org.gradle.api.InvalidUserDataException; import org.gradle.api.file.DirectoryProperty; import org.gradle.api.model.ObjectFactory; import org.gradle.api.provider.Property; +import org.spongepowered.gradle.vanilla.repository.MinecraftRepositoryExtension; import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/repository/MinecraftRepositoryPlugin.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/MinecraftRepositoryPlugin.java similarity index 95% rename from src/main/java/org/spongepowered/gradle/vanilla/repository/MinecraftRepositoryPlugin.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/repository/MinecraftRepositoryPlugin.java index af518b8..610bb0f 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/repository/MinecraftRepositoryPlugin.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/MinecraftRepositoryPlugin.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.repository; +package org.spongepowered.gradle.vanilla.internal.repository; import org.checkerframework.checker.nullness.qual.Nullable; import org.gradle.api.Action; @@ -42,13 +42,16 @@ import org.gradle.api.plugins.ExtensionAware; import org.gradle.api.provider.Provider; import org.gradle.build.event.BuildEventsListenerRegistry; -import org.spongepowered.gradle.vanilla.Constants; +import org.spongepowered.gradle.vanilla.internal.Constants; import org.spongepowered.gradle.vanilla.MinecraftExtension; -import org.spongepowered.gradle.vanilla.MinecraftExtensionImpl; -import org.spongepowered.gradle.vanilla.model.VersionClassifier; -import org.spongepowered.gradle.vanilla.repository.modifier.ArtifactModifier; -import org.spongepowered.gradle.vanilla.repository.rule.JoinedProvidesClientAndServerRule; -import org.spongepowered.gradle.vanilla.repository.rule.MinecraftIvyModuleExtraDataApplierRule; +import org.spongepowered.gradle.vanilla.internal.MinecraftExtensionImpl; +import org.spongepowered.gradle.vanilla.internal.model.VersionClassifier; +import org.spongepowered.gradle.vanilla.internal.repository.modifier.ArtifactModifier; +import org.spongepowered.gradle.vanilla.internal.repository.rule.JoinedProvidesClientAndServerRule; +import org.spongepowered.gradle.vanilla.internal.repository.rule.MinecraftIvyModuleExtraDataApplierRule; +import org.spongepowered.gradle.vanilla.repository.MinecraftPlatform; +import org.spongepowered.gradle.vanilla.repository.MinecraftRepositoryExtension; +import org.spongepowered.gradle.vanilla.repository.MinecraftResolver; import java.io.File; import java.nio.file.Path; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/repository/ResolvableTool.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/ResolvableTool.java similarity index 93% rename from src/main/java/org/spongepowered/gradle/vanilla/repository/ResolvableTool.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/repository/ResolvableTool.java index a05af29..6f74414 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/repository/ResolvableTool.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/ResolvableTool.java @@ -22,9 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.repository; +package org.spongepowered.gradle.vanilla.internal.repository; -import org.spongepowered.gradle.vanilla.Constants; +import org.spongepowered.gradle.vanilla.internal.Constants; /** * Tools used for specific operations in the Minecraft preparation pipeline. diff --git a/src/main/java/org/spongepowered/gradle/vanilla/repository/modifier/AccessWidenerModifier.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/modifier/AccessWidenerModifier.java similarity index 92% rename from src/main/java/org/spongepowered/gradle/vanilla/repository/modifier/AccessWidenerModifier.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/repository/modifier/AccessWidenerModifier.java index a41f8e1..6fd5c38 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/repository/modifier/AccessWidenerModifier.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/modifier/AccessWidenerModifier.java @@ -22,16 +22,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.repository.modifier; +package org.spongepowered.gradle.vanilla.internal.repository.modifier; import org.cadixdev.atlas.AtlasTransformerContext; import org.cadixdev.bombe.jar.JarEntryTransformer; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import org.checkerframework.checker.nullness.qual.Nullable; -import org.spongepowered.gradle.vanilla.network.HashAlgorithm; +import org.spongepowered.gradle.vanilla.internal.network.network.HashAlgorithm; import org.spongepowered.gradle.vanilla.repository.MinecraftResolver; -import org.spongepowered.gradle.vanilla.repository.ResolvableTool; -import org.spongepowered.gradle.vanilla.util.AsyncUtils; +import org.spongepowered.gradle.vanilla.internal.repository.ResolvableTool; +import org.spongepowered.gradle.vanilla.internal.util.AsyncUtils; import java.io.File; import java.io.IOException; @@ -94,7 +94,7 @@ public CompletableFuture providePopulator( return AsyncUtils.failableFuture(() -> new AtlasPopulator() { private final URLClassLoader loader = loaderProvider.get(); private @Nullable Function, JarEntryTransformer> accessWidenerLoader = (Function, JarEntryTransformer>) Class.forName( - "org.spongepowered.gradle.vanilla.worker.AccessWidenerTransformerProvider", + "org.spongepowered.gradle.vanilla.internal.worker.AccessWidenerTransformerProvider", true, this.loader ) diff --git a/src/main/java/org/spongepowered/gradle/vanilla/repository/modifier/ArtifactModifier.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/modifier/ArtifactModifier.java similarity index 98% rename from src/main/java/org/spongepowered/gradle/vanilla/repository/modifier/ArtifactModifier.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/repository/modifier/ArtifactModifier.java index 52f8b86..e1df8dd 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/repository/modifier/ArtifactModifier.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/modifier/ArtifactModifier.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.repository.modifier; +package org.spongepowered.gradle.vanilla.internal.repository.modifier; import org.cadixdev.atlas.Atlas; import org.cadixdev.atlas.AtlasTransformerContext; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/repository/modifier/AssociatedResolutionFlags.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/modifier/AssociatedResolutionFlags.java similarity index 95% rename from src/main/java/org/spongepowered/gradle/vanilla/repository/modifier/AssociatedResolutionFlags.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/repository/modifier/AssociatedResolutionFlags.java index 3421224..d5b420b 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/repository/modifier/AssociatedResolutionFlags.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/modifier/AssociatedResolutionFlags.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.repository.modifier; +package org.spongepowered.gradle.vanilla.internal.repository.modifier; /** * Flags to configure the resolution of associated artifacts diff --git a/src/main/java/org/spongepowered/gradle/vanilla/repository/rule/JoinedProvidesClientAndServerRule.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/rule/JoinedProvidesClientAndServerRule.java similarity index 98% rename from src/main/java/org/spongepowered/gradle/vanilla/repository/rule/JoinedProvidesClientAndServerRule.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/repository/rule/JoinedProvidesClientAndServerRule.java index a5ba7b3..8bf90ef 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/repository/rule/JoinedProvidesClientAndServerRule.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/rule/JoinedProvidesClientAndServerRule.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.repository.rule; +package org.spongepowered.gradle.vanilla.internal.repository.rule; import org.gradle.api.artifacts.CapabilitiesResolution; import org.gradle.api.artifacts.CapabilityResolutionDetails; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/repository/rule/MinecraftIvyModuleExtraDataApplierRule.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/rule/MinecraftIvyModuleExtraDataApplierRule.java similarity index 95% rename from src/main/java/org/spongepowered/gradle/vanilla/repository/rule/MinecraftIvyModuleExtraDataApplierRule.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/repository/rule/MinecraftIvyModuleExtraDataApplierRule.java index f0d4923..22614d6 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/repository/rule/MinecraftIvyModuleExtraDataApplierRule.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/rule/MinecraftIvyModuleExtraDataApplierRule.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.repository.rule; +package org.spongepowered.gradle.vanilla.internal.repository.rule; import org.checkerframework.checker.nullness.qual.Nullable; import org.gradle.api.artifacts.ComponentMetadataContext; @@ -33,8 +33,8 @@ import org.gradle.api.attributes.java.TargetJvmVersion; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spongepowered.gradle.vanilla.model.VersionClassifier; -import org.spongepowered.gradle.vanilla.repository.IvyModuleWriter; +import org.spongepowered.gradle.vanilla.internal.model.VersionClassifier; +import org.spongepowered.gradle.vanilla.internal.repository.IvyModuleWriter; import org.spongepowered.gradle.vanilla.repository.MinecraftPlatform; /** diff --git a/src/main/java/org/spongepowered/gradle/vanilla/repository/rule/package-info.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/rule/package-info.java similarity index 95% rename from src/main/java/org/spongepowered/gradle/vanilla/repository/rule/package-info.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/repository/rule/package-info.java index 55ea0bf..ef99a7c 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/repository/rule/package-info.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/repository/rule/package-info.java @@ -26,7 +26,7 @@ * Metadata rules used to configure resolution of artifact IDs. */ @DefaultQualifier(NonNull.class) -package org.spongepowered.gradle.vanilla.repository.rule; +package org.spongepowered.gradle.vanilla.internal.repository.rule; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.framework.qual.DefaultQualifier; \ No newline at end of file diff --git a/src/main/java/org/spongepowered/gradle/vanilla/runs/EclipseRunConfigurationWriter.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/runs/EclipseRunConfigurationWriter.java similarity index 95% rename from src/main/java/org/spongepowered/gradle/vanilla/runs/EclipseRunConfigurationWriter.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/runs/EclipseRunConfigurationWriter.java index 4e39494..d45917a 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/runs/EclipseRunConfigurationWriter.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/runs/EclipseRunConfigurationWriter.java @@ -22,14 +22,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.runs; +package org.spongepowered.gradle.vanilla.internal.runs; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import org.gradle.jvm.toolchain.JavaLanguageVersion; -import org.spongepowered.gradle.vanilla.Constants; -import org.spongepowered.gradle.vanilla.util.CheckedConsumer; -import org.spongepowered.gradle.vanilla.util.IndentingXmlStreamWriter; -import org.spongepowered.gradle.vanilla.util.StringUtils; +import org.spongepowered.gradle.vanilla.internal.Constants; +import org.spongepowered.gradle.vanilla.internal.util.CheckedConsumer; +import org.spongepowered.gradle.vanilla.internal.util.IndentingXmlStreamWriter; +import org.spongepowered.gradle.vanilla.internal.util.StringUtils; +import org.spongepowered.gradle.vanilla.runs.RunConfiguration; import java.io.IOException; import java.io.StringWriter; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/transformer/AtlasTransformers.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/transformer/AtlasTransformers.java similarity index 87% rename from src/main/java/org/spongepowered/gradle/vanilla/transformer/AtlasTransformers.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/transformer/AtlasTransformers.java index 959f4a7..b18a7c1 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/transformer/AtlasTransformers.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/transformer/AtlasTransformers.java @@ -22,16 +22,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.transformer; +package org.spongepowered.gradle.vanilla.internal.transformer; import org.cadixdev.bombe.analysis.InheritanceProvider; import org.cadixdev.bombe.asm.jar.JarEntryRemappingTransformer; import org.cadixdev.bombe.jar.JarEntryTransformer; import org.cadixdev.lorenz.MappingSet; import org.cadixdev.lorenz.asm.LorenzRemapper; -import org.spongepowered.gradle.vanilla.asm.EnhancedClassRemapper; -import org.spongepowered.gradle.vanilla.asm.LocalVariableNamingClassVisitor; -import org.spongepowered.gradle.vanilla.asm.SyntheticParameterAnnotationsFix; +import org.spongepowered.gradle.vanilla.internal.asm.EnhancedClassRemapper; +import org.spongepowered.gradle.vanilla.internal.asm.LocalVariableNamingClassVisitor; +import org.spongepowered.gradle.vanilla.internal.asm.SyntheticParameterAnnotationsFix; import java.util.Set; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/transformer/FilterClassesTransformer.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/transformer/FilterClassesTransformer.java similarity index 98% rename from src/main/java/org/spongepowered/gradle/vanilla/transformer/FilterClassesTransformer.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/transformer/FilterClassesTransformer.java index 826ae5f..7072e70 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/transformer/FilterClassesTransformer.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/transformer/FilterClassesTransformer.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.transformer; +package org.spongepowered.gradle.vanilla.internal.transformer; import org.cadixdev.bombe.jar.JarClassEntry; import org.cadixdev.bombe.jar.JarEntryTransformer; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/transformer/SignatureStripperTransformer.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/transformer/SignatureStripperTransformer.java similarity index 97% rename from src/main/java/org/spongepowered/gradle/vanilla/transformer/SignatureStripperTransformer.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/transformer/SignatureStripperTransformer.java index ed5977d..a7e0823 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/transformer/SignatureStripperTransformer.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/transformer/SignatureStripperTransformer.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.transformer; +package org.spongepowered.gradle.vanilla.internal.transformer; import org.cadixdev.bombe.jar.JarEntryTransformer; import org.cadixdev.bombe.jar.JarManifestEntry; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/util/AsyncUtils.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/util/AsyncUtils.java similarity index 98% rename from src/main/java/org/spongepowered/gradle/vanilla/util/AsyncUtils.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/util/AsyncUtils.java index 58ecbec..e27f723 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/util/AsyncUtils.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/util/AsyncUtils.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.util; +package org.spongepowered.gradle.vanilla.internal.util; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/util/CheckedConsumer.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/util/CheckedConsumer.java similarity index 96% rename from src/main/java/org/spongepowered/gradle/vanilla/util/CheckedConsumer.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/util/CheckedConsumer.java index cca8bca..1cbd05f 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/util/CheckedConsumer.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/util/CheckedConsumer.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.util; +package org.spongepowered.gradle.vanilla.internal.util; import java.util.function.Consumer; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/util/CopyingInputStream.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/util/CopyingInputStream.java similarity index 98% rename from src/main/java/org/spongepowered/gradle/vanilla/util/CopyingInputStream.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/util/CopyingInputStream.java index 4e5186b..0eb3d54 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/util/CopyingInputStream.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/util/CopyingInputStream.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.util; +package org.spongepowered.gradle.vanilla.internal.util; import java.io.FilterInputStream; import java.io.IOException; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/util/FileUtils.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/util/FileUtils.java similarity index 98% rename from src/main/java/org/spongepowered/gradle/vanilla/util/FileUtils.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/util/FileUtils.java index cb06d95..bc1cbe4 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/util/FileUtils.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/util/FileUtils.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.util; +package org.spongepowered.gradle.vanilla.internal.util; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/util/GsonSerializers.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/util/GsonSerializers.java similarity index 96% rename from src/main/java/org/spongepowered/gradle/vanilla/util/GsonSerializers.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/util/GsonSerializers.java index d5c6c3f..a35b9a4 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/util/GsonSerializers.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/util/GsonSerializers.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.util; +package org.spongepowered.gradle.vanilla.internal.util; import com.google.gson.JsonDeserializer; import com.google.gson.JsonParseException; @@ -30,7 +30,7 @@ import com.google.gson.TypeAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; -import org.spongepowered.gradle.vanilla.model.GroupArtifactVersion; +import org.spongepowered.gradle.vanilla.internal.model.GroupArtifactVersion; import java.io.IOException; import java.time.Instant; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/util/GsonUtils.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/util/GsonUtils.java similarity index 89% rename from src/main/java/org/spongepowered/gradle/vanilla/util/GsonUtils.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/util/GsonUtils.java index 0be1fab..385683e 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/util/GsonUtils.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/util/GsonUtils.java @@ -22,16 +22,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.util; +package org.spongepowered.gradle.vanilla.internal.util; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.TypeAdapterFactory; -import org.spongepowered.gradle.vanilla.model.Argument; -import org.spongepowered.gradle.vanilla.model.GroupArtifactVersion; -import org.spongepowered.gradle.vanilla.model.rule.FeatureRule; -import org.spongepowered.gradle.vanilla.model.rule.OperatingSystemRule; -import org.spongepowered.gradle.vanilla.model.rule.RuleDeclarationTypeAdapter; +import org.spongepowered.gradle.vanilla.internal.model.Argument; +import org.spongepowered.gradle.vanilla.internal.model.GroupArtifactVersion; +import org.spongepowered.gradle.vanilla.internal.model.rule.FeatureRule; +import org.spongepowered.gradle.vanilla.internal.model.rule.OperatingSystemRule; +import org.spongepowered.gradle.vanilla.internal.model.rule.RuleDeclarationTypeAdapter; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/util/IdeConfigurer.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/util/IdeConfigurer.java similarity index 98% rename from src/main/java/org/spongepowered/gradle/vanilla/util/IdeConfigurer.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/util/IdeConfigurer.java index eae93e1..fe637dc 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/util/IdeConfigurer.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/util/IdeConfigurer.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.util; +package org.spongepowered.gradle.vanilla.internal.util; import org.gradle.api.Project; import org.gradle.api.plugins.ExtensionAware; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/util/ImmutablesStyle.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/util/ImmutablesStyle.java similarity index 97% rename from src/main/java/org/spongepowered/gradle/vanilla/util/ImmutablesStyle.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/util/ImmutablesStyle.java index 69023fc..ff209ca 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/util/ImmutablesStyle.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/util/ImmutablesStyle.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.util; +package org.spongepowered.gradle.vanilla.internal.util; import org.immutables.value.Value; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/util/IndentingXmlStreamWriter.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/util/IndentingXmlStreamWriter.java similarity index 99% rename from src/main/java/org/spongepowered/gradle/vanilla/util/IndentingXmlStreamWriter.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/util/IndentingXmlStreamWriter.java index a3f3212..1d87102 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/util/IndentingXmlStreamWriter.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/util/IndentingXmlStreamWriter.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.util; +package org.spongepowered.gradle.vanilla.internal.util; import javax.xml.namespace.NamespaceContext; import javax.xml.stream.XMLStreamException; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/util/Pair.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/util/Pair.java similarity index 97% rename from src/main/java/org/spongepowered/gradle/vanilla/util/Pair.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/util/Pair.java index ed7fc0c..0242beb 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/util/Pair.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/util/Pair.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.util; +package org.spongepowered.gradle.vanilla.internal.util; import org.immutables.value.Value; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/util/SelfPreferringClassLoader.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/util/SelfPreferringClassLoader.java similarity index 98% rename from src/main/java/org/spongepowered/gradle/vanilla/util/SelfPreferringClassLoader.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/util/SelfPreferringClassLoader.java index 5a48a64..3bc935d 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/util/SelfPreferringClassLoader.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/util/SelfPreferringClassLoader.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.util; +package org.spongepowered.gradle.vanilla.internal.util; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/util/StringUtils.java b/src/main/java/org/spongepowered/gradle/vanilla/internal/util/StringUtils.java similarity index 97% rename from src/main/java/org/spongepowered/gradle/vanilla/util/StringUtils.java rename to src/main/java/org/spongepowered/gradle/vanilla/internal/util/StringUtils.java index 461c839..8040f35 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/util/StringUtils.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/internal/util/StringUtils.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla.util; +package org.spongepowered.gradle.vanilla.internal.util; import org.gradle.process.CommandLineArgumentProvider; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/mapping/MappingType.java b/src/main/java/org/spongepowered/gradle/vanilla/mapping/MappingType.java deleted file mode 100644 index e8c2224..0000000 --- a/src/main/java/org/spongepowered/gradle/vanilla/mapping/MappingType.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of VanillaGradle, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.gradle.vanilla.mapping; - -import org.gradle.api.Incubating; - -/** - * A representation of mappings. - * - *

This will change significantly before it's useful.

- */ -@Incubating -public enum MappingType { - /** - * Obfuscated, as distributed directly from launcher meta. - */ - OBF, - /** - * Official names based on provided mappings. - */ - OFFICIAL - -} diff --git a/src/main/java/org/spongepowered/gradle/vanilla/repository/MinecraftResolver.java b/src/main/java/org/spongepowered/gradle/vanilla/repository/MinecraftResolver.java index 1c5b628..f682b93 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/repository/MinecraftResolver.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/repository/MinecraftResolver.java @@ -24,11 +24,12 @@ */ package org.spongepowered.gradle.vanilla.repository; -import org.spongepowered.gradle.vanilla.model.VersionDescriptor; -import org.spongepowered.gradle.vanilla.model.VersionManifestRepository; -import org.spongepowered.gradle.vanilla.network.Downloader; -import org.spongepowered.gradle.vanilla.repository.modifier.ArtifactModifier; -import org.spongepowered.gradle.vanilla.repository.modifier.AssociatedResolutionFlags; +import org.spongepowered.gradle.vanilla.internal.model.VersionDescriptor; +import org.spongepowered.gradle.vanilla.internal.model.VersionManifestRepository; +import org.spongepowered.gradle.vanilla.internal.network.network.Downloader; +import org.spongepowered.gradle.vanilla.internal.repository.ResolvableTool; +import org.spongepowered.gradle.vanilla.internal.repository.modifier.ArtifactModifier; +import org.spongepowered.gradle.vanilla.internal.repository.modifier.AssociatedResolutionFlags; import java.net.URLClassLoader; import java.nio.file.Path; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/repository/MinecraftResolverImpl.java b/src/main/java/org/spongepowered/gradle/vanilla/repository/MinecraftResolverImpl.java index 2f18360..cac1069 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/repository/MinecraftResolverImpl.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/repository/MinecraftResolverImpl.java @@ -32,19 +32,21 @@ import org.immutables.value.Value; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spongepowered.gradle.vanilla.Constants; -import org.spongepowered.gradle.vanilla.model.Download; -import org.spongepowered.gradle.vanilla.model.VersionDescriptor; -import org.spongepowered.gradle.vanilla.model.VersionManifestRepository; -import org.spongepowered.gradle.vanilla.model.rule.RuleContext; -import org.spongepowered.gradle.vanilla.network.Downloader; -import org.spongepowered.gradle.vanilla.network.HashAlgorithm; -import org.spongepowered.gradle.vanilla.repository.modifier.ArtifactModifier; -import org.spongepowered.gradle.vanilla.repository.modifier.AssociatedResolutionFlags; -import org.spongepowered.gradle.vanilla.transformer.AtlasTransformers; -import org.spongepowered.gradle.vanilla.util.AsyncUtils; -import org.spongepowered.gradle.vanilla.util.FileUtils; -import org.spongepowered.gradle.vanilla.util.SelfPreferringClassLoader; +import org.spongepowered.gradle.vanilla.internal.Constants; +import org.spongepowered.gradle.vanilla.internal.model.Download; +import org.spongepowered.gradle.vanilla.internal.model.VersionDescriptor; +import org.spongepowered.gradle.vanilla.internal.model.VersionManifestRepository; +import org.spongepowered.gradle.vanilla.internal.model.rule.RuleContext; +import org.spongepowered.gradle.vanilla.internal.network.network.Downloader; +import org.spongepowered.gradle.vanilla.internal.network.network.HashAlgorithm; +import org.spongepowered.gradle.vanilla.internal.repository.IvyModuleWriter; +import org.spongepowered.gradle.vanilla.internal.repository.ResolvableTool; +import org.spongepowered.gradle.vanilla.internal.repository.modifier.ArtifactModifier; +import org.spongepowered.gradle.vanilla.internal.repository.modifier.AssociatedResolutionFlags; +import org.spongepowered.gradle.vanilla.internal.transformer.AtlasTransformers; +import org.spongepowered.gradle.vanilla.internal.util.AsyncUtils; +import org.spongepowered.gradle.vanilla.internal.util.FileUtils; +import org.spongepowered.gradle.vanilla.internal.util.SelfPreferringClassLoader; import java.io.IOException; import java.lang.reflect.InvocationTargetException; @@ -230,7 +232,7 @@ CompletableFuture> provideJoined( // For now, let's resolve everything ahead-of-time // Shouldn't really do this in a `computeIfAbsent`, but oh well... what gradle tells us, we must do final CompletableFuture> descriptorFuture = this.manifests.fullVersion(key.versionId()); - final Executable merge = this.prepareChildLoader(ResolvableTool.JAR_MERGE, "org.spongepowered.gradle.vanilla.worker.JarMerger", "execute"); + final Executable merge = this.prepareChildLoader(ResolvableTool.JAR_MERGE, "org.spongepowered.gradle.vanilla.internal.worker.JarMerger", "execute"); return descriptorFuture.thenComposeAsync(potentialDescriptor -> clientFuture.thenCombineAsync(serverFuture, (client, server) -> { try { diff --git a/src/main/java/org/spongepowered/gradle/vanilla/repository/MinecraftSide.java b/src/main/java/org/spongepowered/gradle/vanilla/repository/MinecraftSide.java index ffd5e0e..a1a3c1b 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/repository/MinecraftSide.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/repository/MinecraftSide.java @@ -24,11 +24,11 @@ */ package org.spongepowered.gradle.vanilla.repository; -import org.spongepowered.gradle.vanilla.Constants; -import org.spongepowered.gradle.vanilla.model.DownloadClassifier; -import org.spongepowered.gradle.vanilla.model.GroupArtifactVersion; -import org.spongepowered.gradle.vanilla.model.Library; -import org.spongepowered.gradle.vanilla.model.rule.RuleContext; +import org.spongepowered.gradle.vanilla.internal.Constants; +import org.spongepowered.gradle.vanilla.internal.model.DownloadClassifier; +import org.spongepowered.gradle.vanilla.internal.model.GroupArtifactVersion; +import org.spongepowered.gradle.vanilla.internal.model.Library; +import org.spongepowered.gradle.vanilla.internal.model.rule.RuleContext; import java.util.Collections; import java.util.HashSet; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/repository/package-info.java b/src/main/java/org/spongepowered/gradle/vanilla/repository/package-info.java index 6020a20..b487241 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/repository/package-info.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/repository/package-info.java @@ -31,4 +31,4 @@ import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.framework.qual.DefaultQualifier; -import org.spongepowered.gradle.vanilla.util.ImmutablesStyle; \ No newline at end of file +import org.spongepowered.gradle.vanilla.internal.util.ImmutablesStyle; \ No newline at end of file diff --git a/src/main/java/org/spongepowered/gradle/vanilla/runs/ManifestDerivedArgumentProvider.java b/src/main/java/org/spongepowered/gradle/vanilla/runs/ManifestDerivedArgumentProvider.java index ae8a007..80da5f3 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/runs/ManifestDerivedArgumentProvider.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/runs/ManifestDerivedArgumentProvider.java @@ -27,8 +27,8 @@ import org.gradle.api.provider.MapProperty; import org.gradle.api.provider.Provider; import org.gradle.process.CommandLineArgumentProvider; -import org.spongepowered.gradle.vanilla.model.Argument; -import org.spongepowered.gradle.vanilla.model.rule.RuleContext; +import org.spongepowered.gradle.vanilla.internal.model.Argument; +import org.spongepowered.gradle.vanilla.internal.model.rule.RuleContext; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/runs/RunConfiguration.java b/src/main/java/org/spongepowered/gradle/vanilla/runs/RunConfiguration.java index 75495b0..315c130 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/runs/RunConfiguration.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/runs/RunConfiguration.java @@ -40,7 +40,7 @@ import org.gradle.api.tasks.SourceSet; import org.gradle.jvm.toolchain.JavaLanguageVersion; import org.gradle.process.CommandLineArgumentProvider; -import org.spongepowered.gradle.vanilla.Constants; +import org.spongepowered.gradle.vanilla.internal.Constants; import java.io.File; import java.util.ArrayList; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/runs/RunConfigurationContainer.java b/src/main/java/org/spongepowered/gradle/vanilla/runs/RunConfigurationContainer.java index dcca3a3..8a26030 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/runs/RunConfigurationContainer.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/runs/RunConfigurationContainer.java @@ -43,12 +43,12 @@ import org.gradle.api.specs.Spec; import org.gradle.jvm.toolchain.JavaLanguageVersion; import org.gradle.util.ConfigureUtil; -import org.spongepowered.gradle.vanilla.MinecraftExtensionImpl; -import org.spongepowered.gradle.vanilla.model.Argument; -import org.spongepowered.gradle.vanilla.model.Arguments; -import org.spongepowered.gradle.vanilla.model.JavaRuntimeVersion; -import org.spongepowered.gradle.vanilla.model.VersionDescriptor; -import org.spongepowered.gradle.vanilla.model.rule.RuleContext; +import org.spongepowered.gradle.vanilla.internal.MinecraftExtensionImpl; +import org.spongepowered.gradle.vanilla.internal.model.Argument; +import org.spongepowered.gradle.vanilla.internal.model.Arguments; +import org.spongepowered.gradle.vanilla.internal.model.JavaRuntimeVersion; +import org.spongepowered.gradle.vanilla.internal.model.VersionDescriptor; +import org.spongepowered.gradle.vanilla.internal.model.rule.RuleContext; import java.util.Arrays; import java.util.Collection; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/task/DecompileJarTask.java b/src/main/java/org/spongepowered/gradle/vanilla/task/DecompileJarTask.java index 2b11592..1f3338e 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/task/DecompileJarTask.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/task/DecompileJarTask.java @@ -40,15 +40,15 @@ import org.gradle.internal.component.external.model.ModuleComponentArtifactIdentifier; import org.gradle.jvm.toolchain.JavaLauncher; import org.gradle.workers.WorkerExecutor; -import org.spongepowered.gradle.vanilla.Constants; +import org.spongepowered.gradle.vanilla.internal.Constants; import org.spongepowered.gradle.vanilla.MinecraftExtension; -import org.spongepowered.gradle.vanilla.MinecraftExtensionImpl; +import org.spongepowered.gradle.vanilla.internal.MinecraftExtensionImpl; import org.spongepowered.gradle.vanilla.repository.MinecraftPlatform; -import org.spongepowered.gradle.vanilla.repository.MinecraftProviderService; +import org.spongepowered.gradle.vanilla.internal.repository.MinecraftProviderService; import org.spongepowered.gradle.vanilla.repository.ResolutionResult; -import org.spongepowered.gradle.vanilla.repository.modifier.ArtifactModifier; -import org.spongepowered.gradle.vanilla.repository.modifier.AssociatedResolutionFlags; -import org.spongepowered.gradle.vanilla.worker.JarDecompileWorker; +import org.spongepowered.gradle.vanilla.internal.repository.modifier.ArtifactModifier; +import org.spongepowered.gradle.vanilla.internal.repository.modifier.AssociatedResolutionFlags; +import org.spongepowered.gradle.vanilla.internal.worker.JarDecompileWorker; import java.io.File; import java.lang.management.ManagementFactory; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/task/DisplayMinecraftVersionsTask.java b/src/main/java/org/spongepowered/gradle/vanilla/task/DisplayMinecraftVersionsTask.java index d987f41..43e0b4b 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/task/DisplayMinecraftVersionsTask.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/task/DisplayMinecraftVersionsTask.java @@ -28,9 +28,9 @@ import org.gradle.api.provider.Property; import org.gradle.api.tasks.Internal; import org.gradle.api.tasks.TaskAction; -import org.spongepowered.gradle.vanilla.Constants; -import org.spongepowered.gradle.vanilla.model.VersionDescriptor; -import org.spongepowered.gradle.vanilla.repository.MinecraftProviderService; +import org.spongepowered.gradle.vanilla.internal.Constants; +import org.spongepowered.gradle.vanilla.internal.model.VersionDescriptor; +import org.spongepowered.gradle.vanilla.internal.repository.MinecraftProviderService; import java.time.Instant; import java.time.format.DateTimeFormatter; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/task/DownloadAssetsTask.java b/src/main/java/org/spongepowered/gradle/vanilla/task/DownloadAssetsTask.java index 9241665..24de910 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/task/DownloadAssetsTask.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/task/DownloadAssetsTask.java @@ -27,21 +27,19 @@ import org.gradle.api.DefaultTask; import org.gradle.api.GradleException; import org.gradle.api.InvalidUserDataException; -import org.gradle.api.file.DirectoryProperty; import org.gradle.api.provider.Property; import org.gradle.api.tasks.Input; import org.gradle.api.tasks.Internal; -import org.gradle.api.tasks.OutputDirectory; import org.gradle.api.tasks.TaskAction; -import org.spongepowered.gradle.vanilla.Constants; -import org.spongepowered.gradle.vanilla.model.AssetIndex; -import org.spongepowered.gradle.vanilla.model.AssetIndexReference; -import org.spongepowered.gradle.vanilla.network.Downloader; -import org.spongepowered.gradle.vanilla.network.HashAlgorithm; -import org.spongepowered.gradle.vanilla.repository.MinecraftProviderService; +import org.spongepowered.gradle.vanilla.internal.Constants; +import org.spongepowered.gradle.vanilla.internal.model.AssetIndex; +import org.spongepowered.gradle.vanilla.internal.model.AssetIndexReference; +import org.spongepowered.gradle.vanilla.internal.network.network.Downloader; +import org.spongepowered.gradle.vanilla.internal.network.network.HashAlgorithm; +import org.spongepowered.gradle.vanilla.internal.repository.MinecraftProviderService; import org.spongepowered.gradle.vanilla.repository.ResolutionResult; -import org.spongepowered.gradle.vanilla.util.GsonUtils; -import org.spongepowered.gradle.vanilla.util.Pair; +import org.spongepowered.gradle.vanilla.internal.util.GsonUtils; +import org.spongepowered.gradle.vanilla.internal.util.Pair; import java.net.MalformedURLException; import java.net.URL; diff --git a/src/main/java/org/spongepowered/gradle/vanilla/task/GenEclipseRuns.java b/src/main/java/org/spongepowered/gradle/vanilla/task/GenEclipseRuns.java index 5177d83..0419208 100644 --- a/src/main/java/org/spongepowered/gradle/vanilla/task/GenEclipseRuns.java +++ b/src/main/java/org/spongepowered/gradle/vanilla/task/GenEclipseRuns.java @@ -33,7 +33,7 @@ import org.gradle.api.tasks.Internal; import org.gradle.api.tasks.Optional; import org.gradle.api.tasks.TaskAction; -import org.spongepowered.gradle.vanilla.runs.EclipseRunConfigurationWriter; +import org.spongepowered.gradle.vanilla.internal.runs.EclipseRunConfigurationWriter; import org.spongepowered.gradle.vanilla.runs.RunConfiguration; import java.io.IOException; diff --git a/src/shadow/java/org/spongepowered/gradle/vanilla/ShadowConfigurationApplier.java b/src/shadow/java/org/spongepowered/gradle/vanilla/internal/ShadowConfigurationApplier.java similarity index 98% rename from src/shadow/java/org/spongepowered/gradle/vanilla/ShadowConfigurationApplier.java rename to src/shadow/java/org/spongepowered/gradle/vanilla/internal/ShadowConfigurationApplier.java index 69d7022..999c1bb 100644 --- a/src/shadow/java/org/spongepowered/gradle/vanilla/ShadowConfigurationApplier.java +++ b/src/shadow/java/org/spongepowered/gradle/vanilla/internal/ShadowConfigurationApplier.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.gradle.vanilla; +package org.spongepowered.gradle.vanilla.internal; import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar; import org.gradle.api.Action; diff --git a/src/test/java/org/spongepowered/gradle/vanilla/model/VersionManifestRepositoryTest.java b/src/test/java/org/spongepowered/gradle/vanilla/model/VersionManifestRepositoryTest.java index 47f699d..bdaa1e7 100644 --- a/src/test/java/org/spongepowered/gradle/vanilla/model/VersionManifestRepositoryTest.java +++ b/src/test/java/org/spongepowered/gradle/vanilla/model/VersionManifestRepositoryTest.java @@ -26,10 +26,14 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.spongepowered.gradle.vanilla.model.rule.OperatingSystemRule; -import org.spongepowered.gradle.vanilla.model.rule.RuleContext; -import org.spongepowered.gradle.vanilla.network.ApacheHttpDownloader; -import org.spongepowered.gradle.vanilla.network.Downloader; +import org.spongepowered.gradle.vanilla.internal.model.Library; +import org.spongepowered.gradle.vanilla.internal.model.VersionClassifier; +import org.spongepowered.gradle.vanilla.internal.model.VersionDescriptor; +import org.spongepowered.gradle.vanilla.internal.model.VersionManifestRepository; +import org.spongepowered.gradle.vanilla.internal.model.rule.OperatingSystemRule; +import org.spongepowered.gradle.vanilla.internal.model.rule.RuleContext; +import org.spongepowered.gradle.vanilla.internal.network.network.ApacheHttpDownloader; +import org.spongepowered.gradle.vanilla.internal.network.network.Downloader; import org.spongepowered.gradle.vanilla.repository.ResolutionResult; import java.io.IOException; diff --git a/src/test/java/org/spongepowered/gradle/vanilla/model/rule/OperatingSystemRuleTest.java b/src/test/java/org/spongepowered/gradle/vanilla/model/rule/OperatingSystemRuleTest.java index 82b33bb..578fc4e 100644 --- a/src/test/java/org/spongepowered/gradle/vanilla/model/rule/OperatingSystemRuleTest.java +++ b/src/test/java/org/spongepowered/gradle/vanilla/model/rule/OperatingSystemRuleTest.java @@ -27,6 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; +import org.spongepowered.gradle.vanilla.internal.model.rule.OperatingSystemRule; public class OperatingSystemRuleTest { diff --git a/src/test/java/org/spongepowered/gradle/vanilla/repository/IvyModuleWriterTest.java b/src/test/java/org/spongepowered/gradle/vanilla/repository/IvyModuleWriterTest.java index bd22110..e15142f 100644 --- a/src/test/java/org/spongepowered/gradle/vanilla/repository/IvyModuleWriterTest.java +++ b/src/test/java/org/spongepowered/gradle/vanilla/repository/IvyModuleWriterTest.java @@ -27,10 +27,11 @@ import org.checkerframework.checker.nullness.qual.Nullable; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.spongepowered.gradle.vanilla.model.VersionDescriptor; -import org.spongepowered.gradle.vanilla.model.rule.OperatingSystemRule; -import org.spongepowered.gradle.vanilla.model.rule.RuleContext; -import org.spongepowered.gradle.vanilla.util.GsonUtils; +import org.spongepowered.gradle.vanilla.internal.model.VersionDescriptor; +import org.spongepowered.gradle.vanilla.internal.model.rule.OperatingSystemRule; +import org.spongepowered.gradle.vanilla.internal.model.rule.RuleContext; +import org.spongepowered.gradle.vanilla.internal.repository.IvyModuleWriter; +import org.spongepowered.gradle.vanilla.internal.util.GsonUtils; import java.io.BufferedReader; import java.io.IOException;