chore: Make domination up to date (3)

phinner · phinner · commit 86564dfb8faa · 2024-12-30T20:07:45.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -127,9 +127,12 @@ tasks.shadowJar {
     from(generateMetadataFile)
     from(rootProject.file("LICENSE.md")) { into("META-INF") }
     minimize()
-    // relocate("com.distributor")
-    // relocate("com.distributor")
-    // relocate("com.distributor")
+    val shadowPackage = "$rootPackage.shadow"
+    relocate("com.google.gson", "$shadowPackage.gson")
+    relocate("io.leangen.geantyref", "$shadowPackage.geantyref")
+    relocate("net.mindustry_ddns.filestore", "$shadowPackage.filestore")
+    relocate("org.incendo.cloud", "$shadowPackage.cloud")
+    mergeServiceFiles()
 }
 
 tasks.register<Copy>("release") {
diff --git a/plugin.json b/plugin.json
@@ -7,7 +7,7 @@
   "minGameVersion": "146",
   "hidden": true,
   "java": true,
-  "main": "fr.xpdustry.domination.DominationPlugin",
+  "main": "com.xpdustry.domination.DominationPlugin",
   "repo": "xpdustry/domination",
   "dependencies": ["distributor-common"]
 }
diff --git a/src/main/java/com/xpdustry/domination/DominationLogic.java b/src/main/java/com/xpdustry/domination/DominationLogic.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package fr.xpdustry.domination;
+package com.xpdustry.domination;
 
 import arc.struct.ObjectIntMap;
 import arc.util.CommandHandler;
diff --git a/src/main/java/com/xpdustry/domination/DominationPlugin.java b/src/main/java/com/xpdustry/domination/DominationPlugin.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package fr.xpdustry.domination;
+package com.xpdustry.domination;
 
 import arc.util.CommandHandler;
 import com.google.gson.FieldNamingPolicy;
@@ -25,10 +25,10 @@
 import com.xpdustry.distributor.api.command.CommandSender;
 import com.xpdustry.distributor.api.command.cloud.MindustryCommandManager;
 import com.xpdustry.distributor.api.plugin.AbstractMindustryPlugin;
-import fr.xpdustry.domination.Zone.Adapter;
-import fr.xpdustry.domination.commands.EditCommands;
-import fr.xpdustry.domination.commands.StartCommand;
-import fr.xpdustry.domination.commands.ZoneListCommand;
+import com.xpdustry.domination.Zone.Adapter;
+import com.xpdustry.domination.commands.EditCommands;
+import com.xpdustry.domination.commands.StartCommand;
+import com.xpdustry.domination.commands.ZoneListCommand;
 import io.leangen.geantyref.TypeToken;
 import java.time.Duration;
 import java.util.ArrayList;
diff --git a/src/main/java/com/xpdustry/domination/DominationRenderer.java b/src/main/java/com/xpdustry/domination/DominationRenderer.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package fr.xpdustry.domination;
+package com.xpdustry.domination;
 
 import arc.math.Mathf;
 import arc.math.geom.Geometry;
@@ -69,7 +69,7 @@ public void onPluginClientCommandsRegistration(final CommandHandler handler) {
                         .literal("view")
                         .commandDescription(
                                 CommandDescription.commandDescription("Enable/Disable domination zone view mode."))
-                        .permission("fr.xpdustry.domination.map.zone.view")
+                        .permission("com.xpdustry.domination.map.zone.view")
                         .handler(ctx -> {
                             final var player = ctx.sender().getPlayer();
                             if (!this.viewers.add(player)) {
diff --git a/src/main/java/com/xpdustry/domination/DominationState.java b/src/main/java/com/xpdustry/domination/DominationState.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package fr.xpdustry.domination;
+package com.xpdustry.domination;
 
 import java.time.Clock;
 import java.time.Duration;
diff --git a/src/main/java/com/xpdustry/domination/DurationAdapter.java b/src/main/java/com/xpdustry/domination/DurationAdapter.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package fr.xpdustry.domination;
+package com.xpdustry.domination;
 
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
diff --git a/src/main/java/com/xpdustry/domination/Zone.java b/src/main/java/com/xpdustry/domination/Zone.java
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package fr.xpdustry.domination;
+package com.xpdustry.domination;
 
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
diff --git a/src/main/java/com/xpdustry/domination/commands/EditCommands.java b/src/main/java/com/xpdustry/domination/commands/EditCommands.java
@@ -16,11 +16,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package fr.xpdustry.domination.commands;
+package com.xpdustry.domination.commands;
 
 import com.xpdustry.distributor.api.command.CommandSender;
-import fr.xpdustry.domination.DominationPlugin;
-import fr.xpdustry.domination.Zone;
+import com.xpdustry.domination.DominationPlugin;
+import com.xpdustry.domination.Zone;
 import mindustry.Vars;
 import org.incendo.cloud.annotation.specifier.Range;
 import org.incendo.cloud.annotations.Argument;
diff --git a/src/main/java/com/xpdustry/domination/commands/StartCommand.java b/src/main/java/com/xpdustry/domination/commands/StartCommand.java
@@ -16,12 +16,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package fr.xpdustry.domination.commands;
+package com.xpdustry.domination.commands;
 
 import arc.Core;
 import arc.util.Strings;
 import com.xpdustry.distributor.api.command.CommandSender;
-import fr.xpdustry.domination.DominationPlugin;
+import com.xpdustry.domination.DominationPlugin;
 import mindustry.Vars;
 import mindustry.game.Gamemode;
 import mindustry.net.WorldReloader;
diff --git a/src/main/java/com/xpdustry/domination/commands/ZoneListCommand.java b/src/main/java/com/xpdustry/domination/commands/ZoneListCommand.java
@@ -16,11 +16,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package fr.xpdustry.domination.commands;
+package com.xpdustry.domination.commands;
 
 import com.xpdustry.distributor.api.command.CommandSender;
-import fr.xpdustry.domination.DominationPlugin;
-import fr.xpdustry.domination.Zone;
+import com.xpdustry.domination.DominationPlugin;
+import com.xpdustry.domination.Zone;
 import org.incendo.cloud.annotations.Command;
 import org.incendo.cloud.annotations.CommandDescription;
 
diff --git a/src/main/java/com/xpdustry/domination/package-info.java b/src/main/java/com/xpdustry/domination/package-info.java
@@ -16,7 +16,7 @@
             TypeUseLocation.UPPER_BOUND,
             TypeUseLocation.OTHERWISE,
         })
-package fr.xpdustry.domination;
+package com.xpdustry.domination;
 
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.framework.qual.DefaultQualifier;

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`"minGameVersion": "146",`
`8`	`8`	`"hidden": true,`
`9`	`9`	`"java": true,`
`10`		`- "main": "fr.xpdustry.domination.DominationPlugin",`
	`10`	`+ "main": "com.xpdustry.domination.DominationPlugin",`
`11`	`11`	`"repo": "xpdustry/domination",`
`12`	`12`	`"dependencies": ["distributor-common"]`
`13`	`13`	`}`