refactor(next): base package

src/main/java/org/auioc/mcmod/arnicalib/ArnicaLib.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;
 

src/main/java/org/auioc/mcmod/arnicalib/api/game/enchantment/EnchantmentVisitor.java

@@ -2,8 +2,8 @@
 
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
-import org.auioc.mcmod.arnicalib.api.java.function.QuadConsumer;
-import org.auioc.mcmod.arnicalib.api.java.function.TriConsumer;
+import org.auioc.mcmod.arnicalib.base.function.QuadConsumer;
+import org.auioc.mcmod.arnicalib.base.function.TriConsumer;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.Enchantment;

src/main/java/org/auioc/mcmod/arnicalib/api/game/registry/RegistryEntryException.java

@@ -1,6 +1,6 @@
 package org.auioc.mcmod.arnicalib.api.game.registry;
 
-import org.auioc.mcmod.arnicalib.api.java.function.ThrowableSupplier;
+import org.auioc.mcmod.arnicalib.base.function.ThrowableSupplier;
 
 public class RegistryEntryException extends RuntimeException {
 

src/main/java/org/auioc/mcmod/arnicalib/api/java/cache/Cache.java → src/main/java/org/auioc/mcmod/arnicalib/base/cache/Cache.java

@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.java.cache;
+package org.auioc.mcmod.arnicalib.base.cache;
 
 public interface Cache<K, V> {
 

src/main/java/org/auioc/mcmod/arnicalib/api/java/cache/LoadingCache.java → src/main/java/org/auioc/mcmod/arnicalib/base/cache/LoadingCache.java

@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.java.cache;
+package org.auioc.mcmod.arnicalib.base.cache;
 
 import javax.annotation.Nonnull;
 

src/main/java/org/auioc/mcmod/arnicalib/api/java/cache/PlainLoadingCache.java → src/main/java/org/auioc/mcmod/arnicalib/base/cache/PlainLoadingCache.java

@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.java.cache;
+package org.auioc.mcmod.arnicalib.base.cache;
 
 import java.util.HashMap;
 import java.util.function.Function;

src/main/java/org/auioc/mcmod/arnicalib/api/java/exception/HException.java → src/main/java/org/auioc/mcmod/arnicalib/base/exception/HException.java

@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.java.exception;
+package org.auioc.mcmod.arnicalib.base.exception;
 
 public class HException extends Exception {
 

src/main/java/org/auioc/mcmod/arnicalib/utils/java/FileUtils.java → src/main/java/org/auioc/mcmod/arnicalib/base/file/FileUtils.java

@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.utils.java;
+package org.auioc.mcmod.arnicalib.base.file;
 
 import static org.auioc.mcmod.arnicalib.ArnicaLib.LOGGER;
 import java.io.BufferedWriter;
@@ -8,7 +8,7 @@
 import java.io.IOException;
 import java.nio.charset.Charset;
 import org.apache.logging.log4j.Marker;
-import org.auioc.mcmod.arnicalib.utils.LogUtil;
+import org.auioc.mcmod.arnicalib.base.log.LogUtil;
 
 public class FileUtils extends org.apache.commons.io.FileUtils {
 

src/main/java/org/auioc/mcmod/arnicalib/utils/java/JarUtils.java → src/main/java/org/auioc/mcmod/arnicalib/base/file/JarUtils.java

@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.utils.java;
+package org.auioc.mcmod.arnicalib.base.file;
 
 import static org.auioc.mcmod.arnicalib.ArnicaLib.LOGGER;
 import java.io.IOException;
@@ -7,7 +7,7 @@
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 import org.apache.logging.log4j.Marker;
-import org.auioc.mcmod.arnicalib.utils.LogUtil;
+import org.auioc.mcmod.arnicalib.base.log.LogUtil;
 
 public interface JarUtils {
 

src/main/java/org/auioc/mcmod/arnicalib/api/java/function/DoubleToDoubleFunction.java → src/main/java/org/auioc/mcmod/arnicalib/base/function/DoubleToDoubleFunction.java

@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.java.function;
+package org.auioc.mcmod.arnicalib.base.function;
 
 @FunctionalInterface
 public interface DoubleToDoubleFunction {

src/main/java/org/auioc/mcmod/arnicalib/api/java/function/FailableTriPredicate.java → src/main/java/org/auioc/mcmod/arnicalib/base/function/FailableTriPredicate.java

@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.java.function;
+package org.auioc.mcmod.arnicalib.base.function;
 
 import java.util.Objects;
 

src/main/java/org/auioc/mcmod/arnicalib/api/java/function/IntToIntFunction.java → src/main/java/org/auioc/mcmod/arnicalib/base/function/IntToIntFunction.java

@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.java.function;
+package org.auioc.mcmod.arnicalib.base.function;
 
 @FunctionalInterface
 public interface IntToIntFunction {

src/main/java/org/auioc/mcmod/arnicalib/api/java/function/QuadConsumer.java → src/main/java/org/auioc/mcmod/arnicalib/base/function/QuadConsumer.java

@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.java.function;
+package org.auioc.mcmod.arnicalib.base.function;
 
 @FunctionalInterface
 public interface QuadConsumer<A, B, C, D> {

src/main/java/org/auioc/mcmod/arnicalib/api/java/function/QuadFunction.java → src/main/java/org/auioc/mcmod/arnicalib/base/function/QuadFunction.java

@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.java.function;
+package org.auioc.mcmod.arnicalib.base.function;
 
 @FunctionalInterface
 public interface QuadFunction<A, B, C, D, R> {

src/main/java/org/auioc/mcmod/arnicalib/api/java/function/QuadPredicate.java → src/main/java/org/auioc/mcmod/arnicalib/base/function/QuadPredicate.java

@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.java.function;
+package org.auioc.mcmod.arnicalib.base.function;
 
 import java.util.Objects;
 

src/main/java/org/auioc/mcmod/arnicalib/api/java/function/StringToStringFunction.java → src/main/java/org/auioc/mcmod/arnicalib/base/function/StringToStringFunction.java

@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.java.function;
+package org.auioc.mcmod.arnicalib.base.function;
 
 @FunctionalInterface
 public interface StringToStringFunction {

src/main/java/org/auioc/mcmod/arnicalib/api/java/function/ThrowableSupplier.java → src/main/java/org/auioc/mcmod/arnicalib/base/function/ThrowableSupplier.java

@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.java.function;
+package org.auioc.mcmod.arnicalib.base.function;
 
 import java.util.function.Supplier;
 

src/main/java/org/auioc/mcmod/arnicalib/api/java/function/TriConsumer.java → src/main/java/org/auioc/mcmod/arnicalib/base/function/TriConsumer.java

@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.java.function;
+package org.auioc.mcmod.arnicalib.base.function;
 
 @FunctionalInterface
 public interface TriConsumer<K, V, S> {

src/main/java/org/auioc/mcmod/arnicalib/api/java/holder/IObjectHolder.java → src/main/java/org/auioc/mcmod/arnicalib/base/holder/IObjectHolder.java

@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.java.holder;
+package org.auioc.mcmod.arnicalib.base.holder;
 
 public interface IObjectHolder<T> {
 

src/main/java/org/auioc/mcmod/arnicalib/api/java/holder/LazyObjectHolder.java → src/main/java/org/auioc/mcmod/arnicalib/base/holder/LazyObjectHolder.java

@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.java.holder;
+package org.auioc.mcmod.arnicalib.base.holder;
 
 import java.util.function.Supplier;
 import javax.annotation.Nullable;

src/main/java/org/auioc/mcmod/arnicalib/api/java/holder/ObjectHolder.java → src/main/java/org/auioc/mcmod/arnicalib/base/holder/ObjectHolder.java

@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.api.java.holder;
+package org.auioc.mcmod.arnicalib.base.holder;
 
 public class ObjectHolder<T> implements IObjectHolder<T> {
 

src/main/java/org/auioc/mcmod/arnicalib/utils/LogUtil.java → src/main/java/org/auioc/mcmod/arnicalib/base/log/LogUtil.java

@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.utils;
+package org.auioc.mcmod.arnicalib.base.log;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

src/main/java/org/auioc/mcmod/arnicalib/utils/Loggers.java → src/main/java/org/auioc/mcmod/arnicalib/base/log/Loggers.java

@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.utils;
+package org.auioc.mcmod.arnicalib.base.log;
 
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;

src/main/java/org/auioc/mcmod/arnicalib/utils/java/MathUtil.java → src/main/java/org/auioc/mcmod/arnicalib/base/math/MathUtil.java

@@ -1,7 +1,7 @@
-package org.auioc.mcmod.arnicalib.utils.java;
+package org.auioc.mcmod.arnicalib.base.math;
 
-import org.auioc.mcmod.arnicalib.api.java.function.DoubleToDoubleFunction;
-import org.auioc.mcmod.arnicalib.api.java.function.IntToIntFunction;
+import org.auioc.mcmod.arnicalib.base.function.DoubleToDoubleFunction;
+import org.auioc.mcmod.arnicalib.base.function.IntToIntFunction;
 
 public class MathUtil {
 

src/main/java/org/auioc/mcmod/arnicalib/utils/network/AddressUtils.java → src/main/java/org/auioc/mcmod/arnicalib/base/network/AddressUtils.java

@@ -1,12 +1,12 @@
-package org.auioc.mcmod.arnicalib.utils.network;
+package org.auioc.mcmod.arnicalib.base.network;
 
 import static org.auioc.mcmod.arnicalib.ArnicaLib.LOGGER;
 import java.net.InetAddress;
 import java.net.SocketAddress;
 import java.net.UnknownHostException;
 import javax.annotation.Nullable;
 import org.apache.logging.log4j.Marker;
-import org.auioc.mcmod.arnicalib.utils.LogUtil;
+import org.auioc.mcmod.arnicalib.base.log.LogUtil;
 
 public interface AddressUtils {
 

src/main/java/org/auioc/mcmod/arnicalib/utils/network/HttpUtils.java → src/main/java/org/auioc/mcmod/arnicalib/base/network/HttpUtils.java

@@ -1,9 +1,6 @@
-package org.auioc.mcmod.arnicalib.utils.network;
+package org.auioc.mcmod.arnicalib.base.network;
 
 import java.io.IOException;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParser;
-import com.google.gson.JsonSyntaxException;
 import org.apache.http.HttpEntity;
 import org.apache.http.ParseException;
 import org.apache.http.StatusLine;
@@ -13,6 +10,9 @@
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
+import com.google.gson.JsonSyntaxException;
 
 public interface HttpUtils {
 

src/main/java/org/auioc/mcmod/arnicalib/utils/java/RandomUtils.java → src/main/java/org/auioc/mcmod/arnicalib/base/random/RandomUtils.java

@@ -1,10 +1,11 @@
-package org.auioc.mcmod.arnicalib.utils.java;
+package org.auioc.mcmod.arnicalib.base.random;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+import org.auioc.mcmod.arnicalib.base.validate.Validate;
 
 public class RandomUtils extends org.apache.commons.lang3.RandomUtils {
 

src/main/java/org/auioc/mcmod/arnicalib/utils/java/Validate.java → src/main/java/org/auioc/mcmod/arnicalib/base/validate/Validate.java

@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.utils.java;
+package org.auioc.mcmod.arnicalib.base.validate;
 
 import com.google.common.collect.Range;
 

src/main/java/org/auioc/mcmod/arnicalib/utils/java/WordUtils.java → src/main/java/org/auioc/mcmod/arnicalib/base/validate/WordUtils.java

@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.utils.java;
+package org.auioc.mcmod.arnicalib.base.validate;
 
 import java.util.regex.Pattern;
 

src/main/java/org/auioc/mcmod/arnicalib/utils/java/VersionUtils.java → src/main/java/org/auioc/mcmod/arnicalib/base/version/VersionUtils.java

@@ -1,12 +1,13 @@
-package org.auioc.mcmod.arnicalib.utils.java;
+package org.auioc.mcmod.arnicalib.base.version;
 
 import static org.auioc.mcmod.arnicalib.ArnicaLib.LOGGER;
 import java.util.jar.Attributes;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.logging.log4j.Marker;
-import org.auioc.mcmod.arnicalib.utils.LogUtil;
+import org.auioc.mcmod.arnicalib.base.file.JarUtils;
+import org.auioc.mcmod.arnicalib.base.log.LogUtil;
 
 public class VersionUtils {
 

src/main/java/org/auioc/mcmod/arnicalib/common/command/impl/VersionCommand.java

@@ -5,7 +5,7 @@
 import java.util.function.Function;
 import org.apache.logging.log4j.Marker;
 import org.auioc.mcmod.arnicalib.ArnicaLib;
-import org.auioc.mcmod.arnicalib.utils.LogUtil;
+import org.auioc.mcmod.arnicalib.base.log.LogUtil;
 import org.auioc.mcmod.arnicalib.utils.game.TextUtils;
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.context.CommandContext;

src/main/java/org/auioc/mcmod/arnicalib/server/event/AHServerEventFactory.java

@@ -7,6 +7,7 @@
 import java.util.function.Function;
 import javax.annotation.Nullable;
 import org.apache.logging.log4j.Marker;
+import org.auioc.mcmod.arnicalib.base.log.LogUtil;
 import org.auioc.mcmod.arnicalib.server.event.impl.CatMorningGiftChanceEvent;
 import org.auioc.mcmod.arnicalib.server.event.impl.EyeOfEnderSurvivableEvent;
 import org.auioc.mcmod.arnicalib.server.event.impl.FishingRodCastEvent;
@@ -15,7 +16,6 @@
 import org.auioc.mcmod.arnicalib.server.event.impl.PiglinStanceEvent;
 import org.auioc.mcmod.arnicalib.server.event.impl.ServerLoginEvent;
 import org.auioc.mcmod.arnicalib.server.event.impl.ServerPlayerSendMessageEvent;
-import org.auioc.mcmod.arnicalib.utils.LogUtil;
 import org.auioc.mcmod.arnicalib.utils.game.TextUtils;
 import net.minecraft.network.Connection;
 import net.minecraft.network.chat.ChatType;

src/main/java/org/auioc/mcmod/arnicalib/server/event/AHServerEventHandler.java

@@ -2,9 +2,9 @@
 
 import static org.auioc.mcmod.arnicalib.ArnicaLib.LOGGER;
 import org.apache.logging.log4j.Marker;
+import org.auioc.mcmod.arnicalib.base.log.LogUtil;
 import org.auioc.mcmod.arnicalib.server.command.AHServerCommands;
 import org.auioc.mcmod.arnicalib.server.event.impl.ServerLoginEvent;
-import org.auioc.mcmod.arnicalib.utils.LogUtil;
 import net.minecraft.network.ConnectionProtocol;
 import net.minecraftforge.event.RegisterCommandsEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;

src/main/java/org/auioc/mcmod/arnicalib/server/loot/function/SetCustomEffectsFunction.java

@@ -2,14 +2,14 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import org.auioc.mcmod.arnicalib.base.validate.Validate;
+import org.auioc.mcmod.arnicalib.server.loot.AHLootItemFunctions;
+import org.auioc.mcmod.arnicalib.utils.game.EffectUtils;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSerializationContext;
-import org.auioc.mcmod.arnicalib.server.loot.AHLootItemFunctions;
-import org.auioc.mcmod.arnicalib.utils.game.EffectUtils;
-import org.auioc.mcmod.arnicalib.utils.java.Validate;
 import net.minecraft.util.GsonHelper;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.item.ItemStack;

src/main/java/org/auioc/mcmod/arnicalib/server/loot/function/SetRandomPotionFunction.java

@@ -2,10 +2,10 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import org.auioc.mcmod.arnicalib.base.random.RandomUtils;
+import org.auioc.mcmod.arnicalib.base.validate.Validate;
 import org.auioc.mcmod.arnicalib.server.loot.AHLootItemFunctions;
 import org.auioc.mcmod.arnicalib.utils.game.OrderedForgeRegistries;
-import org.auioc.mcmod.arnicalib.utils.java.RandomUtils;
-import org.auioc.mcmod.arnicalib.utils.java.Validate;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonElement;

src/main/java/org/auioc/mcmod/arnicalib/utils/game/EffectUtils.java

@@ -9,8 +9,8 @@
 import javax.annotation.Nullable;
 import org.auioc.mcmod.arnicalib.api.game.effect.IHMobEffectInstance;
 import org.auioc.mcmod.arnicalib.api.game.registry.RegistryEntryException;
-import org.auioc.mcmod.arnicalib.utils.java.RandomUtils;
-import org.auioc.mcmod.arnicalib.utils.java.Validate;
+import org.auioc.mcmod.arnicalib.base.random.RandomUtils;
+import org.auioc.mcmod.arnicalib.base.validate.Validate;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;

src/main/java/org/auioc/mcmod/arnicalib/utils/game/ItemUtils.java

@@ -6,7 +6,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.auioc.mcmod.arnicalib.api.game.registry.RegistryEntryException;
-import org.auioc.mcmod.arnicalib.utils.java.Validate;
+import org.auioc.mcmod.arnicalib.base.validate.Validate;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSyntaxException;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;

src/main/java/org/auioc/mcmod/arnicalib/utils/game/MessageHelper.java

@@ -1,6 +1,6 @@
 package org.auioc.mcmod.arnicalib.utils.game;
 
-import org.auioc.mcmod.arnicalib.api.java.function.StringToStringFunction;
+import org.auioc.mcmod.arnicalib.base.function.StringToStringFunction;
 import net.minecraft.ChatFormatting;
 import net.minecraft.Util;
 import net.minecraft.network.chat.ChatType;

src/main/java/org/auioc/mcmod/arnicalib/utils/game/OrderedForgeRegistries.java

@@ -7,9 +7,9 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import org.apache.logging.log4j.Marker;
-import org.auioc.mcmod.arnicalib.api.java.holder.LazyObjectHolder;
-import org.auioc.mcmod.arnicalib.utils.LogUtil;
-import org.auioc.mcmod.arnicalib.utils.java.Validate;
+import org.auioc.mcmod.arnicalib.base.holder.LazyObjectHolder;
+import org.auioc.mcmod.arnicalib.base.log.LogUtil;
+import org.auioc.mcmod.arnicalib.base.validate.Validate;
 import net.minecraft.core.particles.ParticleType;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;

src/main/java/org/auioc/mcmod/arnicalib/utils/game/PositionUtils.java

@@ -2,7 +2,7 @@
 
 import java.util.Optional;
 import java.util.Random;
-import org.auioc.mcmod.arnicalib.utils.java.RandomUtils;
+import org.auioc.mcmod.arnicalib.base.random.RandomUtils;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;
 import net.minecraft.core.Direction;

src/main/java/org/auioc/mcmod/arnicalib/utils/game/command/DynamicCommandHandler.java

@@ -3,7 +3,7 @@
 import static org.auioc.mcmod.arnicalib.ArnicaLib.LOGGER;
 import java.lang.reflect.InvocationTargetException;
 import org.apache.logging.log4j.Marker;
-import org.auioc.mcmod.arnicalib.utils.LogUtil;
+import org.auioc.mcmod.arnicalib.base.log.LogUtil;
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;