build: update to arnicalib 5.6.0

auioc · Oct 3, 2022 · 15f5524 · 15f5524
1 parent 1ca84ce
commit 15f5524
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 25 deletions.
diff --git a/build.gradle b/build.gradle
@@ -53,19 +53,16 @@ minecraft {
 sourceSets.remove(sourceSets.test)
 
 repositories {
-    maven {
-        url "https://maven.pkg.github.com/auioc/arnicalib-mcmod"
-        credentials {
-            username = System.getenv("GITHUB_ACTOR") ? System.getenv("GITHUB_ACTOR") : System.getenv("GITHUB_USERNAME")
-            password = System.getenv("GITHUB_TOKEN")
-        }
+    maven { 
+        url 'https://repo.auioc.org/maven/releases'
+        content { includeGroup "org.auioc.mcmod" }
     }
 }
 
 dependencies {
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
 
-    implementation "org.auioc.mcmod:arnicalib:${minecraft_version}-${arnicalib_version}:forgelib"
+    implementation("org.auioc.mcmod:arnicalib:${minecraft_version}-${arnicalib_version}:forgelib"){ transitive = false }
 }
 
 apply from: 'gradle/tasks.gradle'

diff --git a/gradle.properties b/gradle.properties
@@ -4,12 +4,12 @@ org.gradle.jvmargs=-Xmx4G -Dhttps://maven.minecraftforge.net/=false
 org.gradle.daemon=false
 
 minecraft_version=1.18.2
-forge_version=40.1.73
+forge_version=40.1.80
 
 mappings_channel=official
 mappings_version=1.18.2
 
-arnicalib_version=5.4.4
+arnicalib_version=5.6.0
 
 github_repo=auioc/addrlimiter-mcmod
 group=org.auioc.mcmod

diff --git a/src/main/java/org/auioc/mcmod/addrlimiter/AddrLimiter.java b/src/main/java/org/auioc/mcmod/addrlimiter/AddrLimiter.java
@@ -3,8 +3,8 @@
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.Marker;
-import org.auioc.mcmod.arnicalib.utils.LogUtil;
-import org.auioc.mcmod.arnicalib.utils.java.VersionUtils;
+import org.auioc.mcmod.arnicalib.base.log.LogUtil;
+import org.auioc.mcmod.arnicalib.base.version.VersionUtils;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.fml.common.Mod;
 

diff --git a/src/main/java/org/auioc/mcmod/addrlimiter/server/address/AddressHandler.java b/src/main/java/org/auioc/mcmod/addrlimiter/server/address/AddressHandler.java
@@ -2,8 +2,8 @@
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.auioc.mcmod.addrlimiter.server.config.ALConfig;
-import org.auioc.mcmod.arnicalib.server.event.impl.ServerLoginEvent;
-import org.auioc.mcmod.arnicalib.utils.game.AddrUtils;
+import org.auioc.mcmod.arnicalib.game.entity.player.AddrUtils;
+import org.auioc.mcmod.arnicalib.game.event.server.ServerLoginEvent;
 import net.minecraft.Util;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TextComponent;

diff --git a/src/main/java/org/auioc/mcmod/addrlimiter/server/address/AddressManager.java b/src/main/java/org/auioc/mcmod/addrlimiter/server/address/AddressManager.java
@@ -1,15 +1,15 @@
 package org.auioc.mcmod.addrlimiter.server.address;
 
-import static org.auioc.mcmod.arnicalib.utils.game.TextUtils.literal;
+import static org.auioc.mcmod.arnicalib.game.chat.TextUtils.literal;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import org.auioc.mcmod.addrlimiter.AddrLimiter;
-import org.auioc.mcmod.arnicalib.utils.game.TextUtils;
-import org.auioc.mcmod.arnicalib.utils.network.AddressUtils;
+import org.auioc.mcmod.arnicalib.base.network.AddressUtils;
+import org.auioc.mcmod.arnicalib.game.chat.TextUtils;
 import com.google.gson.Gson;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;

diff --git a/src/main/java/org/auioc/mcmod/addrlimiter/server/command/ALCommandReferences.java b/src/main/java/org/auioc/mcmod/addrlimiter/server/command/ALCommandReferences.java
@@ -1,7 +1,7 @@
 package org.auioc.mcmod.addrlimiter.server.command;
 
 import org.auioc.mcmod.addrlimiter.AddrLimiter;
-import org.auioc.mcmod.arnicalib.utils.game.MessageHelper;
+import org.auioc.mcmod.arnicalib.game.chat.MessageHelper;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
 
 public class ALCommandReferences {

diff --git a/src/main/java/org/auioc/mcmod/addrlimiter/server/command/ALServerCommands.java b/src/main/java/org/auioc/mcmod/addrlimiter/server/command/ALServerCommands.java
@@ -5,8 +5,8 @@
 import org.auioc.mcmod.addrlimiter.server.command.impl.DumpCommand;
 import org.auioc.mcmod.addrlimiter.server.command.impl.RefreshCommand;
 import org.auioc.mcmod.addrlimiter.server.command.impl.SwitchCommand;
-import org.auioc.mcmod.arnicalib.common.command.impl.VersionCommand;
-import org.auioc.mcmod.arnicalib.server.command.AHServerCommands;
+import org.auioc.mcmod.arnicalib.game.command.node.VersionCommand;
+import org.auioc.mcmod.arnicalib.mod.server.command.AHServerCommands;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.tree.CommandNode;
 import net.minecraft.commands.CommandSourceStack;

diff --git a/src/main/java/org/auioc/mcmod/addrlimiter/server/command/impl/DumpCommand.java b/src/main/java/org/auioc/mcmod/addrlimiter/server/command/impl/DumpCommand.java
@@ -6,9 +6,9 @@
 import org.auioc.mcmod.addrlimiter.server.address.AddressHandler;
 import org.auioc.mcmod.addrlimiter.server.address.AddressManager;
 import org.auioc.mcmod.addrlimiter.server.command.ALCommandReferences;
-import org.auioc.mcmod.arnicalib.utils.game.command.CommandExceptions;
-import org.auioc.mcmod.arnicalib.utils.game.command.CommandSourceUtils;
-import org.auioc.mcmod.arnicalib.utils.java.FileUtils;
+import org.auioc.mcmod.arnicalib.base.file.FileUtils;
+import org.auioc.mcmod.arnicalib.game.command.CommandExceptions;
+import org.auioc.mcmod.arnicalib.game.command.CommandSourceUtils;
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;

diff --git a/src/main/java/org/auioc/mcmod/addrlimiter/server/command/impl/SwitchCommand.java b/src/main/java/org/auioc/mcmod/addrlimiter/server/command/impl/SwitchCommand.java
@@ -3,7 +3,7 @@
 import static net.minecraft.commands.Commands.literal;
 import static org.auioc.mcmod.addrlimiter.server.command.ALCommandReferences.MSGH;
 import org.auioc.mcmod.addrlimiter.server.address.AddressHandler;
-import org.auioc.mcmod.arnicalib.utils.game.command.CommandSourceUtils;
+import org.auioc.mcmod.arnicalib.game.command.CommandSourceUtils;
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;

diff --git a/src/main/java/org/auioc/mcmod/addrlimiter/server/event/ALServerEventHandler.java b/src/main/java/org/auioc/mcmod/addrlimiter/server/event/ALServerEventHandler.java
@@ -3,7 +3,7 @@
 import org.auioc.mcmod.addrlimiter.server.address.AddressHandler;
 import org.auioc.mcmod.addrlimiter.server.command.ALServerCommands;
 import org.auioc.mcmod.addrlimiter.server.config.ALConfig;
-import org.auioc.mcmod.arnicalib.server.event.impl.ServerLoginEvent;
+import org.auioc.mcmod.arnicalib.game.event.server.ServerLoginEvent;
 import net.minecraft.network.ConnectionProtocol;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraftforge.event.RegisterCommandsEvent;

diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -29,6 +29,6 @@ description='''
 [[dependencies.addrlimiter]]
     modId="arnicalib"
     mandatory=true
-    versionRange="[5.4.4,)"
+    versionRange="[5.6.0,)"
     ordering="NONE"
     side="BOTH"