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.
SpongePowered · May 17, 2021 · 1ef06ed · 1ef06ed
1 parent 7a0676c
commit 1ef06ed
Show file tree

Hide file tree

Showing 96 changed files with 254 additions and 274 deletions.
diff --git a/...worker/AccessWidenerEntryTransformer.java → ...worker/AccessWidenerEntryTransformer.java b/...worker/AccessWidenerEntryTransformer.java → ...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/...ker/AccessWidenerTransformerProvider.java → ...ker/AccessWidenerTransformerProvider.java b/...ker/AccessWidenerTransformerProvider.java → ...ker/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/.../gradle/vanilla/worker/Decompilation.java → ...anilla/internal/worker/Decompilation.java b/.../gradle/vanilla/worker/Decompilation.java → ...anilla/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/...le/vanilla/worker/JarDecompileWorker.java → ...a/internal/worker/JarDecompileWorker.java b/...le/vanilla/worker/JarDecompileWorker.java → ...a/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/...anilla/worker/LineMappingResultSaver.java → ...ternal/worker/LineMappingResultSaver.java b/...anilla/worker/LineMappingResultSaver.java → ...ternal/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/...le/vanilla/worker/LineMappingVisitor.java → ...a/internal/worker/LineMappingVisitor.java b/...le/vanilla/worker/LineMappingVisitor.java → ...a/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/...vanilla/worker/SLF4JFernFlowerLogger.java → ...nternal/worker/SLF4JFernFlowerLogger.java b/...vanilla/worker/SLF4JFernFlowerLogger.java → ...nternal/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/...ered/gradle/vanilla/worker/JarMerger.java → ...le/vanilla/internal/worker/JarMerger.java b/...ered/gradle/vanilla/worker/JarMerger.java → ...le/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
@@ -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/...ongepowered/gradle/vanilla/Constants.java → ...ed/gradle/vanilla/internal/Constants.java b/...ongepowered/gradle/vanilla/Constants.java → ...ed/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/...radle/vanilla/MinecraftExtensionImpl.java → ...illa/internal/MinecraftExtensionImpl.java b/...radle/vanilla/MinecraftExtensionImpl.java → ...illa/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/...radle/vanilla/ProvideMinecraftPlugin.java → ...illa/internal/ProvideMinecraftPlugin.java b/...radle/vanilla/ProvideMinecraftPlugin.java → ...illa/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/...le/vanilla/asm/EnhancedClassRemapper.java → ...a/internal/asm/EnhancedClassRemapper.java b/...le/vanilla/asm/EnhancedClassRemapper.java → ...a/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/...radle/vanilla/asm/LocalVariableNamer.java → ...illa/internal/asm/LocalVariableNamer.java b/...radle/vanilla/asm/LocalVariableNamer.java → ...illa/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/.../asm/LocalVariableNamingClassVisitor.java → .../asm/LocalVariableNamingClassVisitor.java b/.../asm/LocalVariableNamingClassVisitor.java → .../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/...asm/SyntheticParameterAnnotationsFix.java → ...asm/SyntheticParameterAnnotationsFix.java b/...asm/SyntheticParameterAnnotationsFix.java → ...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/...red/gradle/vanilla/asm/VariableScope.java → ...e/vanilla/internal/asm/VariableScope.java b/...red/gradle/vanilla/asm/VariableScope.java → ...e/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/...dle/vanilla/asm/VariableScopeTracker.java → ...la/internal/asm/VariableScopeTracker.java b/...dle/vanilla/asm/VariableScopeTracker.java → ...la/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/...owered/gradle/vanilla/model/Argument.java → ...adle/vanilla/internal/model/Argument.java b/...owered/gradle/vanilla/model/Argument.java → ...adle/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/...wered/gradle/vanilla/model/Arguments.java → ...dle/vanilla/internal/model/Arguments.java b/...wered/gradle/vanilla/model/Arguments.java → ...dle/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/...ered/gradle/vanilla/model/AssetIndex.java → ...le/vanilla/internal/model/AssetIndex.java b/...ered/gradle/vanilla/model/AssetIndex.java → ...le/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/...le/vanilla/model/AssetIndexReference.java → ...a/internal/model/AssetIndexReference.java b/...le/vanilla/model/AssetIndexReference.java → ...a/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/...owered/gradle/vanilla/model/Download.java → ...adle/vanilla/internal/model/Download.java b/...owered/gradle/vanilla/model/Download.java → ...adle/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/...dle/vanilla/model/DownloadClassifier.java → ...la/internal/model/DownloadClassifier.java b/...dle/vanilla/model/DownloadClassifier.java → ...la/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/...loaderBasedVersionManifestRepository.java → ...loaderBasedVersionManifestRepository.java b/...loaderBasedVersionManifestRepository.java → ...loaderBasedVersionManifestRepository.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/...e/vanilla/model/GroupArtifactVersion.java → .../internal/model/GroupArtifactVersion.java b/...e/vanilla/model/GroupArtifactVersion.java → .../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/...dle/vanilla/model/JavaRuntimeVersion.java → ...la/internal/model/JavaRuntimeVersion.java b/...dle/vanilla/model/JavaRuntimeVersion.java → ...la/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/...powered/gradle/vanilla/model/Library.java → ...radle/vanilla/internal/model/Library.java b/...powered/gradle/vanilla/model/Library.java → ...radle/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/...radle/vanilla/model/LibraryDownloads.java → ...illa/internal/model/LibraryDownloads.java b/...radle/vanilla/model/LibraryDownloads.java → ...illa/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;