Clean up packages

terrarium-earth · Feb 1, 2024 · b6dc72e · b6dc72e
1 parent 29e7736
commit b6dc72e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -70,14 +70,6 @@ subprojects {
                 includeGroup("maven.modrinth")
             }
         }
-        maven {
-            url = uri("https://maven.tterrag.com/")
-            content {
-                includeGroup("com.tterrag.registrate")
-                includeGroup("com.jozufozu.flywheel")
-                includeGroup("com.simibubi.create")
-            }
-        }
     }
 
     dependencies {

diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts
@@ -17,6 +17,17 @@ loom {
     }
 }
 
+repositories {
+    maven {
+        url = uri("https://maven.tterrag.com/")
+        content {
+            includeGroup("com.tterrag.registrate")
+            includeGroup("com.jozufozu.flywheel")
+            includeGroup("com.simibubi.create")
+        }
+    }
+}
+
 val common: Configuration by configurations.creating {
     configurations.compileClasspath.get().extendsFrom(this)
     configurations.runtimeClasspath.get().extendsFrom(this)

diff --git a/...um/adastra/forge/compat/CreateCompat.java → ...ra/common/compat/create/CreateCompat.java b/...um/adastra/forge/compat/CreateCompat.java → ...ra/common/compat/create/CreateCompat.java
@@ -1,4 +1,4 @@
-package earth.terrarium.adastra.forge.compat;
+package earth.terrarium.adastra.common.compat.create;
 
 import com.simibubi.create.content.kinetics.mechanicalArm.ArmInteractionPointType;
 import earth.terrarium.adastra.AdAstra;

diff --git a/...rge/compat/LaunchPadInteractionPoint.java → ...pat/create/LaunchPadInteractionPoint.java b/...rge/compat/LaunchPadInteractionPoint.java → ...pat/create/LaunchPadInteractionPoint.java
@@ -1,4 +1,4 @@
-package earth.terrarium.adastra.forge.compat;
+package earth.terrarium.adastra.common.compat.create;
 
 import com.simibubi.create.content.kinetics.mechanicalArm.AllArmInteractionPointTypes;
 import com.simibubi.create.content.kinetics.mechanicalArm.ArmInteractionPoint;

diff --git a/forge/src/main/java/earth/terrarium/adastra/forge/AdAstraForge.java b/forge/src/main/java/earth/terrarium/adastra/forge/AdAstraForge.java
@@ -6,7 +6,7 @@
 import earth.terrarium.adastra.common.commands.AdAstraCommands;
 import earth.terrarium.adastra.common.registry.ModEntityTypes;
 import earth.terrarium.adastra.common.tags.ModBlockTags;
-import earth.terrarium.adastra.forge.compat.CreateCompat;
+import earth.terrarium.adastra.common.compat.create.CreateCompat;
 import net.minecraft.world.level.Level;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.AddReloadListenerEvent;