From 2814f1b2d545fdab3cc2462a66d289b35c4e88bc Mon Sep 17 00:00:00 2001 From: WakelessSloth56 Date: Wed, 6 Apr 2022 18:02:05 +0800 Subject: [PATCH] fix: fix package name --- .../{mods => mcmod}/arnicalib/ArnicaLib.java | 6 ++--- .../arnicalib/Initialization.java | 22 +++++++++---------- .../arnicalib/api/game/alchemy/HPotion.java | 2 +- .../api/game/block/HBlockMaterial.java | 2 +- .../api/game/event/ServerPlayerEvent.java | 2 +- .../api/game/item/HArmorMaterial.java | 2 +- .../api/game/network/HPacketHandler.java | 2 +- .../arnicalib/api/game/network/IHPacket.java | 2 +- .../api/game/network/IHPacketHandler.java | 2 +- .../api/game/registry/IHRegistry.java | 4 ++++ .../game/registry/OrderedForgeRegistries.java | 8 +++---- .../arnicalib/api/game/screen/HScreen.java | 2 +- .../api/java/exception/HSimpleException.java | 2 +- .../java/function/FailableTriPredicate.java | 2 +- .../api/java/holder/BooleanHolder.java | 2 +- .../api/java/holder/IntegerHolder.java | 2 +- .../api/java/holder/ObjectHolder.java | 2 +- .../common/IMixinCommandSourceStack.java | 2 +- .../mixin/common/IMixinCreativeModeTab.java | 2 +- .../mixin/common/IMixinMobEffectInstance.java | 2 +- .../api/mixin/server/IMixinEyeOfEnder.java | 2 +- .../client/command/AHClientCommands.java | 2 +- .../argument/LanguageInfoArgument.java | 6 ++--- .../arnicalib/client/config/ClientConfig.java | 2 +- .../client/event/ClientEventHandler.java | 6 ++--- .../event/handler/TooltipEventHandler.java | 4 ++-- .../client/gui/screen/SimpleScreen.java | 8 +++---- .../common/command/AHCommandArguments.java | 12 +++++----- .../argument/CreativeModeTabArgument.java | 8 +++---- .../argument/DamageSourceArgument.java | 6 ++--- .../argument/EntityDamageSourceArgument.java | 2 +- .../IndirectEntityDamageSourceArgument.java | 2 +- .../common/command/impl/VersionCommand.java | 10 ++++----- .../common/event/CommonEventFactory.java | 6 ++--- .../event/impl/PistonAddBlockLineEvent.java | 2 +- .../event/impl/PistonCheckPushableEvent.java | 2 +- .../common/itemgroup/AHCreativeModeTabs.java | 4 ++-- .../itemgroup/impl/TabVanillaHiddenItems.java | 6 ++--- .../common/network/AHPacketHandler.java | 8 +++---- .../mixin/common/MixinCommandSourceStack.java | 4 ++-- .../mixin/common/MixinCreativeModeTab.java | 4 ++-- .../mixin/common/MixinMobEffectInstance.java | 4 ++-- .../mixin/common/MixinPistonBaseBlock.java | 4 ++-- .../mixin/server/MixinEnderEyeItem.java | 6 ++--- .../mixin/server/MixinEyeOfEnder.java | 4 ++-- .../mixin/server/MixinLivingEntity.java | 8 +++---- .../mixin/server/MixinLootContext.java | 4 ++-- .../server/MixinServerLifecycleHooks.java | 4 ++-- .../mixin/server/MixinServerPlayer.java | 4 ++-- .../server/command/AHServerCommands.java | 6 ++--- .../server/event/ServerEventFactory.java | 14 ++++++------ .../server/event/ServerEventHandler.java | 10 ++++----- .../event/impl/LivingEatAddEffectEvent.java | 2 +- .../server/event/impl/ServerLoginEvent.java | 2 +- .../impl/ServerPlayerSendMessageEvent.java | 4 ++-- .../impl/SetEyeOfEnderSurvivableEvent.java | 4 ++-- .../server/loot/AHGlobalLootModifiers.java | 6 ++--- .../server/loot/AHLootItemConditions.java | 6 ++--- .../server/loot/AHLootItemFunctions.java | 8 +++---- .../function/SetCustomEffectsFunction.java | 8 +++---- .../function/SetRandomPotionFunction.java | 10 ++++----- .../loot/modifier/LootTableInjector.java | 2 +- .../loot/predicate/ModLoadedCondition.java | 4 ++-- .../arnicalib/utils/LogUtil.java | 2 +- .../arnicalib/utils/Loggers.java | 2 +- .../arnicalib/utils/game/AddrUtils.java | 2 +- .../arnicalib/utils/game/CommandUtils.java | 10 ++++----- .../arnicalib/utils/game/EffectUtils.java | 10 ++++----- .../arnicalib/utils/game/EnchUtils.java | 2 +- .../arnicalib/utils/game/EntityUtils.java | 2 +- .../arnicalib/utils/game/I18nUtils.java | 2 +- .../arnicalib/utils/game/ItemUtils.java | 4 ++-- .../arnicalib/utils/game/LanguageUtils.java | 2 +- .../arnicalib/utils/game/MCTimeUtils.java | 2 +- .../arnicalib/utils/game/PlayerUtils.java | 2 +- .../arnicalib/utils/game/RegistryUtils.java | 6 ++--- .../arnicalib/utils/game/SoundUtils.java | 2 +- .../arnicalib/utils/game/TextUtils.java | 2 +- .../arnicalib/utils/java/FileUtils.java | 6 ++--- .../arnicalib/utils/java/JarUtils.java | 6 ++--- .../arnicalib/utils/java/RandomUtils.java | 2 +- .../arnicalib/utils/java/Validate.java | 2 +- .../arnicalib/utils/java/VersionUtils.java | 6 ++--- .../arnicalib/utils/network/AddressUtils.java | 6 ++--- .../arnicalib/utils/network/HttpUtils.java | 2 +- .../api/game/registry/IHRegistry.java | 4 ---- src/main/resources/arnicalib.mixin.json | 2 +- 87 files changed, 195 insertions(+), 195 deletions(-) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/ArnicaLib.java (89%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/Initialization.java (81%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/api/game/alchemy/HPotion.java (98%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/api/game/block/HBlockMaterial.java (97%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/api/game/event/ServerPlayerEvent.java (88%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/api/game/item/HArmorMaterial.java (98%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/api/game/network/HPacketHandler.java (97%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/api/game/network/IHPacket.java (90%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/api/game/network/IHPacketHandler.java (90%) create mode 100644 src/main/java/org/auioc/mcmod/arnicalib/api/game/registry/IHRegistry.java rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/api/game/registry/OrderedForgeRegistries.java (95%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/api/game/screen/HScreen.java (96%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/api/java/exception/HSimpleException.java (70%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/api/java/function/FailableTriPredicate.java (93%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/api/java/holder/BooleanHolder.java (79%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/api/java/holder/IntegerHolder.java (72%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/api/java/holder/ObjectHolder.java (87%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/api/mixin/common/IMixinCommandSourceStack.java (70%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/api/mixin/common/IMixinCreativeModeTab.java (57%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/api/mixin/common/IMixinMobEffectInstance.java (78%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/api/mixin/server/IMixinEyeOfEnder.java (80%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/client/command/AHClientCommands.java (95%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/client/command/argument/LanguageInfoArgument.java (92%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/client/config/ClientConfig.java (94%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/client/event/ClientEventHandler.java (77%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/client/event/handler/TooltipEventHandler.java (95%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/client/gui/screen/SimpleScreen.java (96%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/common/command/AHCommandArguments.java (72%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/common/command/argument/CreativeModeTabArgument.java (89%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/common/command/argument/DamageSourceArgument.java (95%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/common/command/argument/EntityDamageSourceArgument.java (96%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/common/command/argument/IndirectEntityDamageSourceArgument.java (96%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/common/command/impl/VersionCommand.java (91%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/common/event/CommonEventFactory.java (76%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/common/event/impl/PistonAddBlockLineEvent.java (95%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/common/event/impl/PistonCheckPushableEvent.java (93%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/common/itemgroup/AHCreativeModeTabs.java (63%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/common/itemgroup/impl/TabVanillaHiddenItems.java (83%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/common/network/AHPacketHandler.java (71%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/mixin/common/MixinCommandSourceStack.java (80%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/mixin/common/MixinCreativeModeTab.java (77%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/mixin/common/MixinMobEffectInstance.java (79%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/mixin/common/MixinPistonBaseBlock.java (92%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/mixin/server/MixinEnderEyeItem.java (91%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/mixin/server/MixinEyeOfEnder.java (92%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/mixin/server/MixinLivingEntity.java (82%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/mixin/server/MixinLootContext.java (83%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/mixin/server/MixinServerLifecycleHooks.java (91%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/mixin/server/MixinServerPlayer.java (90%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/server/command/AHServerCommands.java (88%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/server/event/ServerEventFactory.java (85%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/server/event/ServerEventHandler.java (76%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/server/event/impl/LivingEatAddEffectEvent.java (93%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/server/event/impl/ServerLoginEvent.java (95%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/server/event/impl/ServerPlayerSendMessageEvent.java (87%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/server/event/impl/SetEyeOfEnderSurvivableEvent.java (88%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/server/loot/AHGlobalLootModifiers.java (79%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/server/loot/AHLootItemConditions.java (84%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/server/loot/AHLootItemFunctions.java (81%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/server/loot/function/SetCustomEffectsFunction.java (90%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/server/loot/function/SetRandomPotionFunction.java (91%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/server/loot/modifier/LootTableInjector.java (98%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/server/loot/predicate/ModLoadedCondition.java (91%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/utils/LogUtil.java (97%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/utils/Loggers.java (96%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/utils/game/AddrUtils.java (94%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/utils/game/CommandUtils.java (95%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/utils/game/EffectUtils.java (95%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/utils/game/EnchUtils.java (97%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/utils/game/EntityUtils.java (99%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/utils/game/I18nUtils.java (90%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/utils/game/ItemUtils.java (98%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/utils/game/LanguageUtils.java (95%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/utils/game/MCTimeUtils.java (96%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/utils/game/PlayerUtils.java (98%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/utils/game/RegistryUtils.java (89%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/utils/game/SoundUtils.java (95%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/utils/game/TextUtils.java (97%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/utils/java/FileUtils.java (95%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/utils/java/JarUtils.java (85%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/utils/java/RandomUtils.java (98%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/utils/java/Validate.java (99%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/utils/java/VersionUtils.java (93%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/utils/network/AddressUtils.java (89%) rename src/main/java/org/auioc/{mods => mcmod}/arnicalib/utils/network/HttpUtils.java (97%) delete mode 100644 src/main/java/org/auioc/mods/arnicalib/api/game/registry/IHRegistry.java diff --git a/src/main/java/org/auioc/mods/arnicalib/ArnicaLib.java b/src/main/java/org/auioc/mcmod/arnicalib/ArnicaLib.java similarity index 89% rename from src/main/java/org/auioc/mods/arnicalib/ArnicaLib.java rename to src/main/java/org/auioc/mcmod/arnicalib/ArnicaLib.java index 8d768471..65a58eb3 100644 --- a/src/main/java/org/auioc/mods/arnicalib/ArnicaLib.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/ArnicaLib.java @@ -1,10 +1,10 @@ -package org.auioc.mods.arnicalib; +package org.auioc.mcmod.arnicalib; import org.apache.commons.lang3.tuple.Pair; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Marker; -import org.auioc.mods.arnicalib.utils.LogUtil; -import org.auioc.mods.arnicalib.utils.java.VersionUtils; +import org.auioc.mcmod.arnicalib.utils.LogUtil; +import org.auioc.mcmod.arnicalib.utils.java.VersionUtils; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.fml.common.Mod; diff --git a/src/main/java/org/auioc/mods/arnicalib/Initialization.java b/src/main/java/org/auioc/mcmod/arnicalib/Initialization.java similarity index 81% rename from src/main/java/org/auioc/mods/arnicalib/Initialization.java rename to src/main/java/org/auioc/mcmod/arnicalib/Initialization.java index e1711edd..2e17504e 100644 --- a/src/main/java/org/auioc/mods/arnicalib/Initialization.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/Initialization.java @@ -1,14 +1,14 @@ -package org.auioc.mods.arnicalib; - -import org.auioc.mods.arnicalib.client.config.ClientConfig; -import org.auioc.mods.arnicalib.client.event.ClientEventHandler; -import org.auioc.mods.arnicalib.common.command.AHCommandArguments; -import org.auioc.mods.arnicalib.common.itemgroup.AHCreativeModeTabs; -import org.auioc.mods.arnicalib.common.network.AHPacketHandler; -import org.auioc.mods.arnicalib.server.event.ServerEventHandler; -import org.auioc.mods.arnicalib.server.loot.AHGlobalLootModifiers; -import org.auioc.mods.arnicalib.server.loot.AHLootItemConditions; -import org.auioc.mods.arnicalib.server.loot.AHLootItemFunctions; +package org.auioc.mcmod.arnicalib; + +import org.auioc.mcmod.arnicalib.client.config.ClientConfig; +import org.auioc.mcmod.arnicalib.client.event.ClientEventHandler; +import org.auioc.mcmod.arnicalib.common.command.AHCommandArguments; +import org.auioc.mcmod.arnicalib.common.itemgroup.AHCreativeModeTabs; +import org.auioc.mcmod.arnicalib.common.network.AHPacketHandler; +import org.auioc.mcmod.arnicalib.server.event.ServerEventHandler; +import org.auioc.mcmod.arnicalib.server.loot.AHGlobalLootModifiers; +import org.auioc.mcmod.arnicalib.server.loot.AHLootItemConditions; +import org.auioc.mcmod.arnicalib.server.loot.AHLootItemFunctions; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.eventbus.api.IEventBus; diff --git a/src/main/java/org/auioc/mods/arnicalib/api/game/alchemy/HPotion.java b/src/main/java/org/auioc/mcmod/arnicalib/api/game/alchemy/HPotion.java similarity index 98% rename from src/main/java/org/auioc/mods/arnicalib/api/game/alchemy/HPotion.java rename to src/main/java/org/auioc/mcmod/arnicalib/api/game/alchemy/HPotion.java index ef068538..0f2bad9b 100644 --- a/src/main/java/org/auioc/mods/arnicalib/api/game/alchemy/HPotion.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/api/game/alchemy/HPotion.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.api.game.alchemy; +package org.auioc.mcmod.arnicalib.api.game.alchemy; import java.util.ArrayList; import java.util.function.Supplier; diff --git a/src/main/java/org/auioc/mods/arnicalib/api/game/block/HBlockMaterial.java b/src/main/java/org/auioc/mcmod/arnicalib/api/game/block/HBlockMaterial.java similarity index 97% rename from src/main/java/org/auioc/mods/arnicalib/api/game/block/HBlockMaterial.java rename to src/main/java/org/auioc/mcmod/arnicalib/api/game/block/HBlockMaterial.java index a58976b1..9d496d9b 100644 --- a/src/main/java/org/auioc/mods/arnicalib/api/game/block/HBlockMaterial.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/api/game/block/HBlockMaterial.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.api.game.block; +package org.auioc.mcmod.arnicalib.api.game.block; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; diff --git a/src/main/java/org/auioc/mods/arnicalib/api/game/event/ServerPlayerEvent.java b/src/main/java/org/auioc/mcmod/arnicalib/api/game/event/ServerPlayerEvent.java similarity index 88% rename from src/main/java/org/auioc/mods/arnicalib/api/game/event/ServerPlayerEvent.java rename to src/main/java/org/auioc/mcmod/arnicalib/api/game/event/ServerPlayerEvent.java index 1875f003..ef043b4f 100644 --- a/src/main/java/org/auioc/mods/arnicalib/api/game/event/ServerPlayerEvent.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/api/game/event/ServerPlayerEvent.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.api.game.event; +package org.auioc.mcmod.arnicalib.api.game.event; import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.event.entity.living.LivingEvent; diff --git a/src/main/java/org/auioc/mods/arnicalib/api/game/item/HArmorMaterial.java b/src/main/java/org/auioc/mcmod/arnicalib/api/game/item/HArmorMaterial.java similarity index 98% rename from src/main/java/org/auioc/mods/arnicalib/api/game/item/HArmorMaterial.java rename to src/main/java/org/auioc/mcmod/arnicalib/api/game/item/HArmorMaterial.java index 22cb6a09..2d4d6922 100644 --- a/src/main/java/org/auioc/mods/arnicalib/api/game/item/HArmorMaterial.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/api/game/item/HArmorMaterial.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.api.game.item; +package org.auioc.mcmod.arnicalib.api.game.item; import java.util.function.Supplier; import net.minecraft.sounds.SoundEvent; diff --git a/src/main/java/org/auioc/mods/arnicalib/api/game/network/HPacketHandler.java b/src/main/java/org/auioc/mcmod/arnicalib/api/game/network/HPacketHandler.java similarity index 97% rename from src/main/java/org/auioc/mods/arnicalib/api/game/network/HPacketHandler.java rename to src/main/java/org/auioc/mcmod/arnicalib/api/game/network/HPacketHandler.java index 9d429b4d..d6b260f1 100644 --- a/src/main/java/org/auioc/mods/arnicalib/api/game/network/HPacketHandler.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/api/game/network/HPacketHandler.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.api.game.network; +package org.auioc.mcmod.arnicalib.api.game.network; import java.util.Optional; import java.util.function.Function; diff --git a/src/main/java/org/auioc/mods/arnicalib/api/game/network/IHPacket.java b/src/main/java/org/auioc/mcmod/arnicalib/api/game/network/IHPacket.java similarity index 90% rename from src/main/java/org/auioc/mods/arnicalib/api/game/network/IHPacket.java rename to src/main/java/org/auioc/mcmod/arnicalib/api/game/network/IHPacket.java index c7a307b5..7eb156d5 100644 --- a/src/main/java/org/auioc/mods/arnicalib/api/game/network/IHPacket.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/api/game/network/IHPacket.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.api.game.network; +package org.auioc.mcmod.arnicalib.api.game.network; import java.util.function.Supplier; import net.minecraft.network.FriendlyByteBuf; diff --git a/src/main/java/org/auioc/mods/arnicalib/api/game/network/IHPacketHandler.java b/src/main/java/org/auioc/mcmod/arnicalib/api/game/network/IHPacketHandler.java similarity index 90% rename from src/main/java/org/auioc/mods/arnicalib/api/game/network/IHPacketHandler.java rename to src/main/java/org/auioc/mcmod/arnicalib/api/game/network/IHPacketHandler.java index a42597c6..416d0c87 100644 --- a/src/main/java/org/auioc/mods/arnicalib/api/game/network/IHPacketHandler.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/api/game/network/IHPacketHandler.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.api.game.network; +package org.auioc.mcmod.arnicalib.api.game.network; import java.util.function.Function; import net.minecraft.network.FriendlyByteBuf; diff --git a/src/main/java/org/auioc/mcmod/arnicalib/api/game/registry/IHRegistry.java b/src/main/java/org/auioc/mcmod/arnicalib/api/game/registry/IHRegistry.java new file mode 100644 index 00000000..acc597f1 --- /dev/null +++ b/src/main/java/org/auioc/mcmod/arnicalib/api/game/registry/IHRegistry.java @@ -0,0 +1,4 @@ +package org.auioc.mcmod.arnicalib.api.game.registry; + +public interface IHRegistry { +} diff --git a/src/main/java/org/auioc/mods/arnicalib/api/game/registry/OrderedForgeRegistries.java b/src/main/java/org/auioc/mcmod/arnicalib/api/game/registry/OrderedForgeRegistries.java similarity index 95% rename from src/main/java/org/auioc/mods/arnicalib/api/game/registry/OrderedForgeRegistries.java rename to src/main/java/org/auioc/mcmod/arnicalib/api/game/registry/OrderedForgeRegistries.java index 0c7728ca..a249331b 100644 --- a/src/main/java/org/auioc/mods/arnicalib/api/game/registry/OrderedForgeRegistries.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/api/game/registry/OrderedForgeRegistries.java @@ -1,14 +1,14 @@ -package org.auioc.mods.arnicalib.api.game.registry; +package org.auioc.mcmod.arnicalib.api.game.registry; -import static org.auioc.mods.arnicalib.ArnicaLib.LOGGER; +import static org.auioc.mcmod.arnicalib.ArnicaLib.LOGGER; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; import org.apache.logging.log4j.Marker; -import org.auioc.mods.arnicalib.utils.LogUtil; -import org.auioc.mods.arnicalib.utils.java.Validate; +import org.auioc.mcmod.arnicalib.utils.LogUtil; +import org.auioc.mcmod.arnicalib.utils.java.Validate; import net.minecraft.core.particles.ParticleType; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/org/auioc/mods/arnicalib/api/game/screen/HScreen.java b/src/main/java/org/auioc/mcmod/arnicalib/api/game/screen/HScreen.java similarity index 96% rename from src/main/java/org/auioc/mods/arnicalib/api/game/screen/HScreen.java rename to src/main/java/org/auioc/mcmod/arnicalib/api/game/screen/HScreen.java index 9e4b4566..42007b48 100644 --- a/src/main/java/org/auioc/mods/arnicalib/api/game/screen/HScreen.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/api/game/screen/HScreen.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.api.game.screen; +package org.auioc.mcmod.arnicalib.api.game.screen; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; diff --git a/src/main/java/org/auioc/mods/arnicalib/api/java/exception/HSimpleException.java b/src/main/java/org/auioc/mcmod/arnicalib/api/java/exception/HSimpleException.java similarity index 70% rename from src/main/java/org/auioc/mods/arnicalib/api/java/exception/HSimpleException.java rename to src/main/java/org/auioc/mcmod/arnicalib/api/java/exception/HSimpleException.java index 741a52eb..02e3b578 100644 --- a/src/main/java/org/auioc/mods/arnicalib/api/java/exception/HSimpleException.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/api/java/exception/HSimpleException.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.api.java.exception; +package org.auioc.mcmod.arnicalib.api.java.exception; public class HSimpleException extends Exception { diff --git a/src/main/java/org/auioc/mods/arnicalib/api/java/function/FailableTriPredicate.java b/src/main/java/org/auioc/mcmod/arnicalib/api/java/function/FailableTriPredicate.java similarity index 93% rename from src/main/java/org/auioc/mods/arnicalib/api/java/function/FailableTriPredicate.java rename to src/main/java/org/auioc/mcmod/arnicalib/api/java/function/FailableTriPredicate.java index d9daeb73..b186a264 100644 --- a/src/main/java/org/auioc/mods/arnicalib/api/java/function/FailableTriPredicate.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/api/java/function/FailableTriPredicate.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.api.java.function; +package org.auioc.mcmod.arnicalib.api.java.function; import java.util.Objects; diff --git a/src/main/java/org/auioc/mods/arnicalib/api/java/holder/BooleanHolder.java b/src/main/java/org/auioc/mcmod/arnicalib/api/java/holder/BooleanHolder.java similarity index 79% rename from src/main/java/org/auioc/mods/arnicalib/api/java/holder/BooleanHolder.java rename to src/main/java/org/auioc/mcmod/arnicalib/api/java/holder/BooleanHolder.java index 8c1cc343..b92fe52e 100644 --- a/src/main/java/org/auioc/mods/arnicalib/api/java/holder/BooleanHolder.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/api/java/holder/BooleanHolder.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.api.java.holder; +package org.auioc.mcmod.arnicalib.api.java.holder; public class BooleanHolder extends ObjectHolder { diff --git a/src/main/java/org/auioc/mods/arnicalib/api/java/holder/IntegerHolder.java b/src/main/java/org/auioc/mcmod/arnicalib/api/java/holder/IntegerHolder.java similarity index 72% rename from src/main/java/org/auioc/mods/arnicalib/api/java/holder/IntegerHolder.java rename to src/main/java/org/auioc/mcmod/arnicalib/api/java/holder/IntegerHolder.java index 3b016118..65af787c 100644 --- a/src/main/java/org/auioc/mods/arnicalib/api/java/holder/IntegerHolder.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/api/java/holder/IntegerHolder.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.api.java.holder; +package org.auioc.mcmod.arnicalib.api.java.holder; public class IntegerHolder extends ObjectHolder { diff --git a/src/main/java/org/auioc/mods/arnicalib/api/java/holder/ObjectHolder.java b/src/main/java/org/auioc/mcmod/arnicalib/api/java/holder/ObjectHolder.java similarity index 87% rename from src/main/java/org/auioc/mods/arnicalib/api/java/holder/ObjectHolder.java rename to src/main/java/org/auioc/mcmod/arnicalib/api/java/holder/ObjectHolder.java index c9868a60..5d2241e3 100644 --- a/src/main/java/org/auioc/mods/arnicalib/api/java/holder/ObjectHolder.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/api/java/holder/ObjectHolder.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.api.java.holder; +package org.auioc.mcmod.arnicalib.api.java.holder; public class ObjectHolder { diff --git a/src/main/java/org/auioc/mods/arnicalib/api/mixin/common/IMixinCommandSourceStack.java b/src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinCommandSourceStack.java similarity index 70% rename from src/main/java/org/auioc/mods/arnicalib/api/mixin/common/IMixinCommandSourceStack.java rename to src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinCommandSourceStack.java index 98ad23f0..a0df2c19 100644 --- a/src/main/java/org/auioc/mods/arnicalib/api/mixin/common/IMixinCommandSourceStack.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinCommandSourceStack.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.api.mixin.common; +package org.auioc.mcmod.arnicalib.api.mixin.common; import net.minecraft.commands.CommandSource; diff --git a/src/main/java/org/auioc/mods/arnicalib/api/mixin/common/IMixinCreativeModeTab.java b/src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinCreativeModeTab.java similarity index 57% rename from src/main/java/org/auioc/mods/arnicalib/api/mixin/common/IMixinCreativeModeTab.java rename to src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinCreativeModeTab.java index f67bea74..50335574 100644 --- a/src/main/java/org/auioc/mods/arnicalib/api/mixin/common/IMixinCreativeModeTab.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinCreativeModeTab.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.api.mixin.common; +package org.auioc.mcmod.arnicalib.api.mixin.common; public interface IMixinCreativeModeTab { diff --git a/src/main/java/org/auioc/mods/arnicalib/api/mixin/common/IMixinMobEffectInstance.java b/src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinMobEffectInstance.java similarity index 78% rename from src/main/java/org/auioc/mods/arnicalib/api/mixin/common/IMixinMobEffectInstance.java rename to src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinMobEffectInstance.java index bcdff55d..eb46dffd 100644 --- a/src/main/java/org/auioc/mods/arnicalib/api/mixin/common/IMixinMobEffectInstance.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/api/mixin/common/IMixinMobEffectInstance.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.api.mixin.common; +package org.auioc.mcmod.arnicalib.api.mixin.common; import javax.annotation.Nullable; import net.minecraft.world.effect.MobEffectInstance; diff --git a/src/main/java/org/auioc/mods/arnicalib/api/mixin/server/IMixinEyeOfEnder.java b/src/main/java/org/auioc/mcmod/arnicalib/api/mixin/server/IMixinEyeOfEnder.java similarity index 80% rename from src/main/java/org/auioc/mods/arnicalib/api/mixin/server/IMixinEyeOfEnder.java rename to src/main/java/org/auioc/mcmod/arnicalib/api/mixin/server/IMixinEyeOfEnder.java index b3e6ae47..54479311 100644 --- a/src/main/java/org/auioc/mods/arnicalib/api/mixin/server/IMixinEyeOfEnder.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/api/mixin/server/IMixinEyeOfEnder.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.api.mixin.server; +package org.auioc.mcmod.arnicalib.api.mixin.server; import java.util.Random; import java.util.function.Function; diff --git a/src/main/java/org/auioc/mods/arnicalib/client/command/AHClientCommands.java b/src/main/java/org/auioc/mcmod/arnicalib/client/command/AHClientCommands.java similarity index 95% rename from src/main/java/org/auioc/mods/arnicalib/client/command/AHClientCommands.java rename to src/main/java/org/auioc/mcmod/arnicalib/client/command/AHClientCommands.java index f7990edf..6e3e237f 100644 --- a/src/main/java/org/auioc/mods/arnicalib/client/command/AHClientCommands.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/client/command/AHClientCommands.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.client.command; +package org.auioc.mcmod.arnicalib.client.command; import static net.minecraft.commands.Commands.literal; import java.util.List; diff --git a/src/main/java/org/auioc/mods/arnicalib/client/command/argument/LanguageInfoArgument.java b/src/main/java/org/auioc/mcmod/arnicalib/client/command/argument/LanguageInfoArgument.java similarity index 92% rename from src/main/java/org/auioc/mods/arnicalib/client/command/argument/LanguageInfoArgument.java rename to src/main/java/org/auioc/mcmod/arnicalib/client/command/argument/LanguageInfoArgument.java index 4ba07e05..eb997a12 100644 --- a/src/main/java/org/auioc/mods/arnicalib/client/command/argument/LanguageInfoArgument.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/client/command/argument/LanguageInfoArgument.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.client.command.argument; +package org.auioc.mcmod.arnicalib.client.command.argument; import java.util.concurrent.CompletableFuture; import java.util.stream.Stream; @@ -9,8 +9,8 @@ import com.mojang.brigadier.exceptions.DynamicCommandExceptionType; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; -import org.auioc.mods.arnicalib.ArnicaLib; -import org.auioc.mods.arnicalib.utils.game.TextUtils; +import org.auioc.mcmod.arnicalib.ArnicaLib; +import org.auioc.mcmod.arnicalib.utils.game.TextUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.language.LanguageInfo; import net.minecraft.commands.SharedSuggestionProvider; diff --git a/src/main/java/org/auioc/mods/arnicalib/client/config/ClientConfig.java b/src/main/java/org/auioc/mcmod/arnicalib/client/config/ClientConfig.java similarity index 94% rename from src/main/java/org/auioc/mods/arnicalib/client/config/ClientConfig.java rename to src/main/java/org/auioc/mcmod/arnicalib/client/config/ClientConfig.java index 9e61d777..5c1b0eb8 100644 --- a/src/main/java/org/auioc/mods/arnicalib/client/config/ClientConfig.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/client/config/ClientConfig.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.client.config; +package org.auioc.mcmod.arnicalib.client.config; import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.common.ForgeConfigSpec.BooleanValue; diff --git a/src/main/java/org/auioc/mods/arnicalib/client/event/ClientEventHandler.java b/src/main/java/org/auioc/mcmod/arnicalib/client/event/ClientEventHandler.java similarity index 77% rename from src/main/java/org/auioc/mods/arnicalib/client/event/ClientEventHandler.java rename to src/main/java/org/auioc/mcmod/arnicalib/client/event/ClientEventHandler.java index 534550be..e7cfbebe 100644 --- a/src/main/java/org/auioc/mods/arnicalib/client/event/ClientEventHandler.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/client/event/ClientEventHandler.java @@ -1,7 +1,7 @@ -package org.auioc.mods.arnicalib.client.event; +package org.auioc.mcmod.arnicalib.client.event; -import org.auioc.mods.arnicalib.client.command.AHClientCommands; -import org.auioc.mods.arnicalib.client.event.handler.TooltipEventHandler; +import org.auioc.mcmod.arnicalib.client.command.AHClientCommands; +import org.auioc.mcmod.arnicalib.client.event.handler.TooltipEventHandler; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.RegisterClientCommandsEvent; diff --git a/src/main/java/org/auioc/mods/arnicalib/client/event/handler/TooltipEventHandler.java b/src/main/java/org/auioc/mcmod/arnicalib/client/event/handler/TooltipEventHandler.java similarity index 95% rename from src/main/java/org/auioc/mods/arnicalib/client/event/handler/TooltipEventHandler.java rename to src/main/java/org/auioc/mcmod/arnicalib/client/event/handler/TooltipEventHandler.java index 48e1e3e3..2eba2dfe 100644 --- a/src/main/java/org/auioc/mods/arnicalib/client/event/handler/TooltipEventHandler.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/client/event/handler/TooltipEventHandler.java @@ -1,7 +1,7 @@ -package org.auioc.mods.arnicalib.client.event.handler; +package org.auioc.mcmod.arnicalib.client.event.handler; import com.mojang.blaze3d.platform.InputConstants; -import org.auioc.mods.arnicalib.client.config.ClientConfig; +import org.auioc.mcmod.arnicalib.client.config.ClientConfig; import org.lwjgl.glfw.GLFW; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; diff --git a/src/main/java/org/auioc/mods/arnicalib/client/gui/screen/SimpleScreen.java b/src/main/java/org/auioc/mcmod/arnicalib/client/gui/screen/SimpleScreen.java similarity index 96% rename from src/main/java/org/auioc/mods/arnicalib/client/gui/screen/SimpleScreen.java rename to src/main/java/org/auioc/mcmod/arnicalib/client/gui/screen/SimpleScreen.java index 10e2752b..f7a4baf2 100644 --- a/src/main/java/org/auioc/mods/arnicalib/client/gui/screen/SimpleScreen.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/client/gui/screen/SimpleScreen.java @@ -1,10 +1,10 @@ -package org.auioc.mods.arnicalib.client.gui.screen; +package org.auioc.mcmod.arnicalib.client.gui.screen; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; -import org.auioc.mods.arnicalib.ArnicaLib; -import org.auioc.mods.arnicalib.api.game.screen.HScreen; -import org.auioc.mods.arnicalib.utils.game.TextUtils; +import org.auioc.mcmod.arnicalib.ArnicaLib; +import org.auioc.mcmod.arnicalib.api.game.screen.HScreen; +import org.auioc.mcmod.arnicalib.utils.game.TextUtils; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/org/auioc/mods/arnicalib/common/command/AHCommandArguments.java b/src/main/java/org/auioc/mcmod/arnicalib/common/command/AHCommandArguments.java similarity index 72% rename from src/main/java/org/auioc/mods/arnicalib/common/command/AHCommandArguments.java rename to src/main/java/org/auioc/mcmod/arnicalib/common/command/AHCommandArguments.java index 44807521..1f0db669 100644 --- a/src/main/java/org/auioc/mods/arnicalib/common/command/AHCommandArguments.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/common/command/AHCommandArguments.java @@ -1,11 +1,11 @@ -package org.auioc.mods.arnicalib.common.command; +package org.auioc.mcmod.arnicalib.common.command; import com.mojang.brigadier.arguments.ArgumentType; -import org.auioc.mods.arnicalib.ArnicaLib; -import org.auioc.mods.arnicalib.common.command.argument.CreativeModeTabArgument; -import org.auioc.mods.arnicalib.common.command.argument.DamageSourceArgument; -import org.auioc.mods.arnicalib.common.command.argument.EntityDamageSourceArgument; -import org.auioc.mods.arnicalib.common.command.argument.IndirectEntityDamageSourceArgument; +import org.auioc.mcmod.arnicalib.ArnicaLib; +import org.auioc.mcmod.arnicalib.common.command.argument.CreativeModeTabArgument; +import org.auioc.mcmod.arnicalib.common.command.argument.DamageSourceArgument; +import org.auioc.mcmod.arnicalib.common.command.argument.EntityDamageSourceArgument; +import org.auioc.mcmod.arnicalib.common.command.argument.IndirectEntityDamageSourceArgument; import net.minecraft.commands.synchronization.ArgumentSerializer; import net.minecraft.commands.synchronization.ArgumentTypes; import net.minecraft.commands.synchronization.EmptyArgumentSerializer; diff --git a/src/main/java/org/auioc/mods/arnicalib/common/command/argument/CreativeModeTabArgument.java b/src/main/java/org/auioc/mcmod/arnicalib/common/command/argument/CreativeModeTabArgument.java similarity index 89% rename from src/main/java/org/auioc/mods/arnicalib/common/command/argument/CreativeModeTabArgument.java rename to src/main/java/org/auioc/mcmod/arnicalib/common/command/argument/CreativeModeTabArgument.java index 7988bfce..c12b3c72 100644 --- a/src/main/java/org/auioc/mods/arnicalib/common/command/argument/CreativeModeTabArgument.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/common/command/argument/CreativeModeTabArgument.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.common.command.argument; +package org.auioc.mcmod.arnicalib.common.command.argument; import java.util.Arrays; import java.util.concurrent.CompletableFuture; @@ -10,9 +10,9 @@ import com.mojang.brigadier.exceptions.DynamicCommandExceptionType; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; -import org.auioc.mods.arnicalib.ArnicaLib; -import org.auioc.mods.arnicalib.api.mixin.common.IMixinCreativeModeTab; -import org.auioc.mods.arnicalib.utils.game.TextUtils; +import org.auioc.mcmod.arnicalib.ArnicaLib; +import org.auioc.mcmod.arnicalib.api.mixin.common.IMixinCreativeModeTab; +import org.auioc.mcmod.arnicalib.utils.game.TextUtils; import net.minecraft.commands.SharedSuggestionProvider; import net.minecraft.world.item.CreativeModeTab; diff --git a/src/main/java/org/auioc/mods/arnicalib/common/command/argument/DamageSourceArgument.java b/src/main/java/org/auioc/mcmod/arnicalib/common/command/argument/DamageSourceArgument.java similarity index 95% rename from src/main/java/org/auioc/mods/arnicalib/common/command/argument/DamageSourceArgument.java rename to src/main/java/org/auioc/mcmod/arnicalib/common/command/argument/DamageSourceArgument.java index 0939d2d2..ad3297f4 100644 --- a/src/main/java/org/auioc/mods/arnicalib/common/command/argument/DamageSourceArgument.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/common/command/argument/DamageSourceArgument.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.common.command.argument; +package org.auioc.mcmod.arnicalib.common.command.argument; import java.util.HashMap; import java.util.concurrent.CompletableFuture; @@ -9,8 +9,8 @@ import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; -import org.auioc.mods.arnicalib.ArnicaLib; -import org.auioc.mods.arnicalib.utils.game.TextUtils; +import org.auioc.mcmod.arnicalib.ArnicaLib; +import org.auioc.mcmod.arnicalib.utils.game.TextUtils; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.SharedSuggestionProvider; import net.minecraft.world.damagesource.DamageSource; diff --git a/src/main/java/org/auioc/mods/arnicalib/common/command/argument/EntityDamageSourceArgument.java b/src/main/java/org/auioc/mcmod/arnicalib/common/command/argument/EntityDamageSourceArgument.java similarity index 96% rename from src/main/java/org/auioc/mods/arnicalib/common/command/argument/EntityDamageSourceArgument.java rename to src/main/java/org/auioc/mcmod/arnicalib/common/command/argument/EntityDamageSourceArgument.java index 908336ba..0a127197 100644 --- a/src/main/java/org/auioc/mods/arnicalib/common/command/argument/EntityDamageSourceArgument.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/common/command/argument/EntityDamageSourceArgument.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.common.command.argument; +package org.auioc.mcmod.arnicalib.common.command.argument; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/src/main/java/org/auioc/mods/arnicalib/common/command/argument/IndirectEntityDamageSourceArgument.java b/src/main/java/org/auioc/mcmod/arnicalib/common/command/argument/IndirectEntityDamageSourceArgument.java similarity index 96% rename from src/main/java/org/auioc/mods/arnicalib/common/command/argument/IndirectEntityDamageSourceArgument.java rename to src/main/java/org/auioc/mcmod/arnicalib/common/command/argument/IndirectEntityDamageSourceArgument.java index e8fbe8d8..4c52fa95 100644 --- a/src/main/java/org/auioc/mods/arnicalib/common/command/argument/IndirectEntityDamageSourceArgument.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/common/command/argument/IndirectEntityDamageSourceArgument.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.common.command.argument; +package org.auioc.mcmod.arnicalib.common.command.argument; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/src/main/java/org/auioc/mods/arnicalib/common/command/impl/VersionCommand.java b/src/main/java/org/auioc/mcmod/arnicalib/common/command/impl/VersionCommand.java similarity index 91% rename from src/main/java/org/auioc/mods/arnicalib/common/command/impl/VersionCommand.java rename to src/main/java/org/auioc/mcmod/arnicalib/common/command/impl/VersionCommand.java index a82eb937..1d1a25c1 100644 --- a/src/main/java/org/auioc/mods/arnicalib/common/command/impl/VersionCommand.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/common/command/impl/VersionCommand.java @@ -1,7 +1,7 @@ -package org.auioc.mods.arnicalib.common.command.impl; +package org.auioc.mcmod.arnicalib.common.command.impl; import static net.minecraft.commands.Commands.literal; -import static org.auioc.mods.arnicalib.ArnicaLib.LOGGER; +import static org.auioc.mcmod.arnicalib.ArnicaLib.LOGGER; import java.util.function.Function; import com.mojang.brigadier.Command; import com.mojang.brigadier.context.CommandContext; @@ -9,9 +9,9 @@ import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; import com.mojang.brigadier.tree.CommandNode; import org.apache.logging.log4j.Marker; -import org.auioc.mods.arnicalib.ArnicaLib; -import org.auioc.mods.arnicalib.utils.LogUtil; -import org.auioc.mods.arnicalib.utils.game.TextUtils; +import org.auioc.mcmod.arnicalib.ArnicaLib; +import org.auioc.mcmod.arnicalib.utils.LogUtil; +import org.auioc.mcmod.arnicalib.utils.game.TextUtils; import net.minecraft.ChatFormatting; import net.minecraft.commands.CommandSourceStack; import net.minecraft.network.chat.MutableComponent; diff --git a/src/main/java/org/auioc/mods/arnicalib/common/event/CommonEventFactory.java b/src/main/java/org/auioc/mcmod/arnicalib/common/event/CommonEventFactory.java similarity index 76% rename from src/main/java/org/auioc/mods/arnicalib/common/event/CommonEventFactory.java rename to src/main/java/org/auioc/mcmod/arnicalib/common/event/CommonEventFactory.java index 221cfa66..a5e74da9 100644 --- a/src/main/java/org/auioc/mods/arnicalib/common/event/CommonEventFactory.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/common/event/CommonEventFactory.java @@ -1,6 +1,6 @@ -package org.auioc.mods.arnicalib.common.event; +package org.auioc.mcmod.arnicalib.common.event; -import org.auioc.mods.arnicalib.common.event.impl.PistonCheckPushableEvent; +import org.auioc.mcmod.arnicalib.common.event.impl.PistonCheckPushableEvent; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.Level; @@ -14,7 +14,7 @@ public final class CommonEventFactory { @Deprecated(since = "3.1.1") public static boolean postPistonAddBlockLineEvent(BlockState blockState, Level level, BlockPos blockPos, Direction direction) { - return forgeEventBus.post(new org.auioc.mods.arnicalib.common.event.impl.PistonAddBlockLineEvent(blockState, level, blockPos, direction)); + return forgeEventBus.post(new org.auioc.mcmod.arnicalib.common.event.impl.PistonAddBlockLineEvent(blockState, level, blockPos, direction)); } public static boolean firePistonCheckPushableEvent(BlockState blockState, Level level, BlockPos blockPos, Direction pushDirection, boolean p_60209_, Direction p_60210_) { diff --git a/src/main/java/org/auioc/mods/arnicalib/common/event/impl/PistonAddBlockLineEvent.java b/src/main/java/org/auioc/mcmod/arnicalib/common/event/impl/PistonAddBlockLineEvent.java similarity index 95% rename from src/main/java/org/auioc/mods/arnicalib/common/event/impl/PistonAddBlockLineEvent.java rename to src/main/java/org/auioc/mcmod/arnicalib/common/event/impl/PistonAddBlockLineEvent.java index 0f479bda..898778c9 100644 --- a/src/main/java/org/auioc/mods/arnicalib/common/event/impl/PistonAddBlockLineEvent.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/common/event/impl/PistonAddBlockLineEvent.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.common.event.impl; +package org.auioc.mcmod.arnicalib.common.event.impl; import net.minecraft.core.BlockPos; diff --git a/src/main/java/org/auioc/mods/arnicalib/common/event/impl/PistonCheckPushableEvent.java b/src/main/java/org/auioc/mcmod/arnicalib/common/event/impl/PistonCheckPushableEvent.java similarity index 93% rename from src/main/java/org/auioc/mods/arnicalib/common/event/impl/PistonCheckPushableEvent.java rename to src/main/java/org/auioc/mcmod/arnicalib/common/event/impl/PistonCheckPushableEvent.java index 9d991ea0..1e2684d7 100644 --- a/src/main/java/org/auioc/mods/arnicalib/common/event/impl/PistonCheckPushableEvent.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/common/event/impl/PistonCheckPushableEvent.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.common.event.impl; +package org.auioc.mcmod.arnicalib.common.event.impl; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/org/auioc/mods/arnicalib/common/itemgroup/AHCreativeModeTabs.java b/src/main/java/org/auioc/mcmod/arnicalib/common/itemgroup/AHCreativeModeTabs.java similarity index 63% rename from src/main/java/org/auioc/mods/arnicalib/common/itemgroup/AHCreativeModeTabs.java rename to src/main/java/org/auioc/mcmod/arnicalib/common/itemgroup/AHCreativeModeTabs.java index 1bafa58d..08f0af46 100644 --- a/src/main/java/org/auioc/mods/arnicalib/common/itemgroup/AHCreativeModeTabs.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/common/itemgroup/AHCreativeModeTabs.java @@ -1,6 +1,6 @@ -package org.auioc.mods.arnicalib.common.itemgroup; +package org.auioc.mcmod.arnicalib.common.itemgroup; -import org.auioc.mods.arnicalib.common.itemgroup.impl.TabVanillaHiddenItems; +import org.auioc.mcmod.arnicalib.common.itemgroup.impl.TabVanillaHiddenItems; import net.minecraft.world.item.CreativeModeTab; public final class AHCreativeModeTabs { diff --git a/src/main/java/org/auioc/mods/arnicalib/common/itemgroup/impl/TabVanillaHiddenItems.java b/src/main/java/org/auioc/mcmod/arnicalib/common/itemgroup/impl/TabVanillaHiddenItems.java similarity index 83% rename from src/main/java/org/auioc/mods/arnicalib/common/itemgroup/impl/TabVanillaHiddenItems.java rename to src/main/java/org/auioc/mcmod/arnicalib/common/itemgroup/impl/TabVanillaHiddenItems.java index aa3ee930..a1d4e3e0 100644 --- a/src/main/java/org/auioc/mods/arnicalib/common/itemgroup/impl/TabVanillaHiddenItems.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/common/itemgroup/impl/TabVanillaHiddenItems.java @@ -1,7 +1,7 @@ -package org.auioc.mods.arnicalib.common.itemgroup.impl; +package org.auioc.mcmod.arnicalib.common.itemgroup.impl; -import org.auioc.mods.arnicalib.utils.game.ItemUtils; -import org.auioc.mods.arnicalib.utils.game.RegistryUtils; +import org.auioc.mcmod.arnicalib.utils.game.ItemUtils; +import org.auioc.mcmod.arnicalib.utils.game.RegistryUtils; import net.minecraft.core.NonNullList; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/org/auioc/mods/arnicalib/common/network/AHPacketHandler.java b/src/main/java/org/auioc/mcmod/arnicalib/common/network/AHPacketHandler.java similarity index 71% rename from src/main/java/org/auioc/mods/arnicalib/common/network/AHPacketHandler.java rename to src/main/java/org/auioc/mcmod/arnicalib/common/network/AHPacketHandler.java index 73c31838..ba4600e7 100644 --- a/src/main/java/org/auioc/mods/arnicalib/common/network/AHPacketHandler.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/common/network/AHPacketHandler.java @@ -1,8 +1,8 @@ -package org.auioc.mods.arnicalib.common.network; +package org.auioc.mcmod.arnicalib.common.network; -import org.auioc.mods.arnicalib.ArnicaLib; -import org.auioc.mods.arnicalib.api.game.network.HPacketHandler; -import org.auioc.mods.arnicalib.api.game.network.IHPacket; +import org.auioc.mcmod.arnicalib.ArnicaLib; +import org.auioc.mcmod.arnicalib.api.game.network.HPacketHandler; +import org.auioc.mcmod.arnicalib.api.game.network.IHPacket; import net.minecraft.server.level.ServerPlayer; public final class AHPacketHandler { diff --git a/src/main/java/org/auioc/mods/arnicalib/mixin/common/MixinCommandSourceStack.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinCommandSourceStack.java similarity index 80% rename from src/main/java/org/auioc/mods/arnicalib/mixin/common/MixinCommandSourceStack.java rename to src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinCommandSourceStack.java index 641a0fb4..61039087 100644 --- a/src/main/java/org/auioc/mods/arnicalib/mixin/common/MixinCommandSourceStack.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinCommandSourceStack.java @@ -1,6 +1,6 @@ -package org.auioc.mods.arnicalib.mixin.common; +package org.auioc.mcmod.arnicalib.mixin.common; -import org.auioc.mods.arnicalib.api.mixin.common.IMixinCommandSourceStack; +import org.auioc.mcmod.arnicalib.api.mixin.common.IMixinCommandSourceStack; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/org/auioc/mods/arnicalib/mixin/common/MixinCreativeModeTab.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinCreativeModeTab.java similarity index 77% rename from src/main/java/org/auioc/mods/arnicalib/mixin/common/MixinCreativeModeTab.java rename to src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinCreativeModeTab.java index 7658a5a0..4c1f321a 100644 --- a/src/main/java/org/auioc/mods/arnicalib/mixin/common/MixinCreativeModeTab.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinCreativeModeTab.java @@ -1,6 +1,6 @@ -package org.auioc.mods.arnicalib.mixin.common; +package org.auioc.mcmod.arnicalib.mixin.common; -import org.auioc.mods.arnicalib.api.mixin.common.IMixinCreativeModeTab; +import org.auioc.mcmod.arnicalib.api.mixin.common.IMixinCreativeModeTab; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/org/auioc/mods/arnicalib/mixin/common/MixinMobEffectInstance.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinMobEffectInstance.java similarity index 79% rename from src/main/java/org/auioc/mods/arnicalib/mixin/common/MixinMobEffectInstance.java rename to src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinMobEffectInstance.java index 4a59b8a3..b2ff64a0 100644 --- a/src/main/java/org/auioc/mods/arnicalib/mixin/common/MixinMobEffectInstance.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinMobEffectInstance.java @@ -1,7 +1,7 @@ -package org.auioc.mods.arnicalib.mixin.common; +package org.auioc.mcmod.arnicalib.mixin.common; import javax.annotation.Nullable; -import org.auioc.mods.arnicalib.api.mixin.common.IMixinMobEffectInstance; +import org.auioc.mcmod.arnicalib.api.mixin.common.IMixinMobEffectInstance; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import net.minecraft.world.effect.MobEffectInstance; diff --git a/src/main/java/org/auioc/mods/arnicalib/mixin/common/MixinPistonBaseBlock.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinPistonBaseBlock.java similarity index 92% rename from src/main/java/org/auioc/mods/arnicalib/mixin/common/MixinPistonBaseBlock.java rename to src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinPistonBaseBlock.java index 834c301e..90f3d5e7 100644 --- a/src/main/java/org/auioc/mods/arnicalib/mixin/common/MixinPistonBaseBlock.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/mixin/common/MixinPistonBaseBlock.java @@ -1,6 +1,6 @@ -package org.auioc.mods.arnicalib.mixin.common; +package org.auioc.mcmod.arnicalib.mixin.common; -import org.auioc.mods.arnicalib.common.event.CommonEventFactory; +import org.auioc.mcmod.arnicalib.common.event.CommonEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/src/main/java/org/auioc/mods/arnicalib/mixin/server/MixinEnderEyeItem.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinEnderEyeItem.java similarity index 91% rename from src/main/java/org/auioc/mods/arnicalib/mixin/server/MixinEnderEyeItem.java rename to src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinEnderEyeItem.java index a8771125..eb9e41f6 100644 --- a/src/main/java/org/auioc/mods/arnicalib/mixin/server/MixinEnderEyeItem.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinEnderEyeItem.java @@ -1,7 +1,7 @@ -package org.auioc.mods.arnicalib.mixin.server; +package org.auioc.mcmod.arnicalib.mixin.server; -import org.auioc.mods.arnicalib.api.mixin.server.IMixinEyeOfEnder; -import org.auioc.mods.arnicalib.server.event.ServerEventFactory; +import org.auioc.mcmod.arnicalib.api.mixin.server.IMixinEyeOfEnder; +import org.auioc.mcmod.arnicalib.server.event.ServerEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/src/main/java/org/auioc/mods/arnicalib/mixin/server/MixinEyeOfEnder.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinEyeOfEnder.java similarity index 92% rename from src/main/java/org/auioc/mods/arnicalib/mixin/server/MixinEyeOfEnder.java rename to src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinEyeOfEnder.java index 289ee2e4..0654a0b0 100644 --- a/src/main/java/org/auioc/mods/arnicalib/mixin/server/MixinEyeOfEnder.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinEyeOfEnder.java @@ -1,8 +1,8 @@ -package org.auioc.mods.arnicalib.mixin.server; +package org.auioc.mcmod.arnicalib.mixin.server; import java.util.Random; import java.util.function.Function; -import org.auioc.mods.arnicalib.api.mixin.server.IMixinEyeOfEnder; +import org.auioc.mcmod.arnicalib.api.mixin.server.IMixinEyeOfEnder; import org.objectweb.asm.Opcodes; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/org/auioc/mods/arnicalib/mixin/server/MixinLivingEntity.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinLivingEntity.java similarity index 82% rename from src/main/java/org/auioc/mods/arnicalib/mixin/server/MixinLivingEntity.java rename to src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinLivingEntity.java index a3af3f65..4484010c 100644 --- a/src/main/java/org/auioc/mods/arnicalib/mixin/server/MixinLivingEntity.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinLivingEntity.java @@ -1,9 +1,9 @@ -package org.auioc.mods.arnicalib.mixin.server; +package org.auioc.mcmod.arnicalib.mixin.server; import java.util.ArrayList; import java.util.List; import com.mojang.datafixers.util.Pair; -import org.auioc.mods.arnicalib.server.event.ServerEventFactory; +import org.auioc.mcmod.arnicalib.server.event.ServerEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import net.minecraft.world.effect.MobEffectInstance; @@ -18,8 +18,8 @@ public abstract class MixinLivingEntity { /** * @author WakelessSloth56 * @reason LivingEatAddEffectEvent - * @see org.auioc.mods.arnicalib.server.event.ServerEventFactory#fireLivingEatAddEffectEvent - * @see org.auioc.mods.arnicalib.server.event.impl.LivingEatAddEffectEvent + * @see org.auioc.mcmod.arnicalib.server.event.ServerEventFactory#fireLivingEatAddEffectEvent + * @see org.auioc.mcmod.arnicalib.server.event.impl.LivingEatAddEffectEvent */ // @org.spongepowered.asm.mixin.Debug(export = true, print = true) @Overwrite() diff --git a/src/main/java/org/auioc/mods/arnicalib/mixin/server/MixinLootContext.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinLootContext.java similarity index 83% rename from src/main/java/org/auioc/mods/arnicalib/mixin/server/MixinLootContext.java rename to src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinLootContext.java index 58c4aec9..c812d44d 100644 --- a/src/main/java/org/auioc/mods/arnicalib/mixin/server/MixinLootContext.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinLootContext.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.mixin.server; +package org.auioc.mcmod.arnicalib.mixin.server; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; @@ -15,7 +15,7 @@ public abstract class MixinLootContext { /** * @author WakelessSloth56 * @reason LootTableInjector - * @see org.auioc.mods.arnicalib.server.loot.modifier.LootTableInjector#getItemStacks + * @see org.auioc.mcmod.arnicalib.server.loot.modifier.LootTableInjector#getItemStacks */ // @org.spongepowered.asm.mixin.Debug(export = true, print = true) @Overwrite(remap = false) diff --git a/src/main/java/org/auioc/mods/arnicalib/mixin/server/MixinServerLifecycleHooks.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinServerLifecycleHooks.java similarity index 91% rename from src/main/java/org/auioc/mods/arnicalib/mixin/server/MixinServerLifecycleHooks.java rename to src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinServerLifecycleHooks.java index 326b5075..efa68582 100644 --- a/src/main/java/org/auioc/mods/arnicalib/mixin/server/MixinServerLifecycleHooks.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinServerLifecycleHooks.java @@ -1,6 +1,6 @@ -package org.auioc.mods.arnicalib.mixin.server; +package org.auioc.mcmod.arnicalib.mixin.server; -import org.auioc.mods.arnicalib.server.event.ServerEventFactory; +import org.auioc.mcmod.arnicalib.server.event.ServerEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/src/main/java/org/auioc/mods/arnicalib/mixin/server/MixinServerPlayer.java b/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinServerPlayer.java similarity index 90% rename from src/main/java/org/auioc/mods/arnicalib/mixin/server/MixinServerPlayer.java rename to src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinServerPlayer.java index 11ca2b89..1df4fde4 100644 --- a/src/main/java/org/auioc/mods/arnicalib/mixin/server/MixinServerPlayer.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/mixin/server/MixinServerPlayer.java @@ -1,7 +1,7 @@ -package org.auioc.mods.arnicalib.mixin.server; +package org.auioc.mcmod.arnicalib.mixin.server; import java.util.UUID; -import org.auioc.mods.arnicalib.server.event.ServerEventFactory; +import org.auioc.mcmod.arnicalib.server.event.ServerEventFactory; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/src/main/java/org/auioc/mods/arnicalib/server/command/AHServerCommands.java b/src/main/java/org/auioc/mcmod/arnicalib/server/command/AHServerCommands.java similarity index 88% rename from src/main/java/org/auioc/mods/arnicalib/server/command/AHServerCommands.java rename to src/main/java/org/auioc/mcmod/arnicalib/server/command/AHServerCommands.java index a27da305..eab85c80 100644 --- a/src/main/java/org/auioc/mods/arnicalib/server/command/AHServerCommands.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/server/command/AHServerCommands.java @@ -1,12 +1,12 @@ -package org.auioc.mods.arnicalib.server.command; +package org.auioc.mcmod.arnicalib.server.command; import static net.minecraft.commands.Commands.literal; import java.util.List; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.tree.CommandNode; -import org.auioc.mods.arnicalib.ArnicaLib; -import org.auioc.mods.arnicalib.common.command.impl.VersionCommand; +import org.auioc.mcmod.arnicalib.ArnicaLib; +import org.auioc.mcmod.arnicalib.common.command.impl.VersionCommand; import net.minecraft.commands.CommandSourceStack; public final class AHServerCommands { diff --git a/src/main/java/org/auioc/mods/arnicalib/server/event/ServerEventFactory.java b/src/main/java/org/auioc/mcmod/arnicalib/server/event/ServerEventFactory.java similarity index 85% rename from src/main/java/org/auioc/mods/arnicalib/server/event/ServerEventFactory.java rename to src/main/java/org/auioc/mcmod/arnicalib/server/event/ServerEventFactory.java index 3d249130..4871bafc 100644 --- a/src/main/java/org/auioc/mods/arnicalib/server/event/ServerEventFactory.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/server/event/ServerEventFactory.java @@ -1,16 +1,16 @@ -package org.auioc.mods.arnicalib.server.event; +package org.auioc.mcmod.arnicalib.server.event; -import static org.auioc.mods.arnicalib.ArnicaLib.LOGGER; +import static org.auioc.mcmod.arnicalib.ArnicaLib.LOGGER; import java.util.List; import java.util.Random; import java.util.UUID; import java.util.function.Function; import org.apache.logging.log4j.Marker; -import org.auioc.mods.arnicalib.server.event.impl.LivingEatAddEffectEvent; -import org.auioc.mods.arnicalib.server.event.impl.ServerLoginEvent; -import org.auioc.mods.arnicalib.server.event.impl.ServerPlayerSendMessageEvent; -import org.auioc.mods.arnicalib.server.event.impl.SetEyeOfEnderSurvivableEvent; -import org.auioc.mods.arnicalib.utils.LogUtil; +import org.auioc.mcmod.arnicalib.server.event.impl.LivingEatAddEffectEvent; +import org.auioc.mcmod.arnicalib.server.event.impl.ServerLoginEvent; +import org.auioc.mcmod.arnicalib.server.event.impl.ServerPlayerSendMessageEvent; +import org.auioc.mcmod.arnicalib.server.event.impl.SetEyeOfEnderSurvivableEvent; +import org.auioc.mcmod.arnicalib.utils.LogUtil; import net.minecraft.network.Connection; import net.minecraft.network.chat.ChatType; import net.minecraft.network.chat.Component; diff --git a/src/main/java/org/auioc/mods/arnicalib/server/event/ServerEventHandler.java b/src/main/java/org/auioc/mcmod/arnicalib/server/event/ServerEventHandler.java similarity index 76% rename from src/main/java/org/auioc/mods/arnicalib/server/event/ServerEventHandler.java rename to src/main/java/org/auioc/mcmod/arnicalib/server/event/ServerEventHandler.java index 75de9f6b..687f2686 100644 --- a/src/main/java/org/auioc/mods/arnicalib/server/event/ServerEventHandler.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/server/event/ServerEventHandler.java @@ -1,10 +1,10 @@ -package org.auioc.mods.arnicalib.server.event; +package org.auioc.mcmod.arnicalib.server.event; -import static org.auioc.mods.arnicalib.ArnicaLib.LOGGER; +import static org.auioc.mcmod.arnicalib.ArnicaLib.LOGGER; import org.apache.logging.log4j.Marker; -import org.auioc.mods.arnicalib.server.command.AHServerCommands; -import org.auioc.mods.arnicalib.server.event.impl.ServerLoginEvent; -import org.auioc.mods.arnicalib.utils.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; diff --git a/src/main/java/org/auioc/mods/arnicalib/server/event/impl/LivingEatAddEffectEvent.java b/src/main/java/org/auioc/mcmod/arnicalib/server/event/impl/LivingEatAddEffectEvent.java similarity index 93% rename from src/main/java/org/auioc/mods/arnicalib/server/event/impl/LivingEatAddEffectEvent.java rename to src/main/java/org/auioc/mcmod/arnicalib/server/event/impl/LivingEatAddEffectEvent.java index 0be92b29..e8579a18 100644 --- a/src/main/java/org/auioc/mods/arnicalib/server/event/impl/LivingEatAddEffectEvent.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/server/event/impl/LivingEatAddEffectEvent.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.server.event.impl; +package org.auioc.mcmod.arnicalib.server.event.impl; import java.util.List; import net.minecraft.world.effect.MobEffectInstance; diff --git a/src/main/java/org/auioc/mods/arnicalib/server/event/impl/ServerLoginEvent.java b/src/main/java/org/auioc/mcmod/arnicalib/server/event/impl/ServerLoginEvent.java similarity index 95% rename from src/main/java/org/auioc/mods/arnicalib/server/event/impl/ServerLoginEvent.java rename to src/main/java/org/auioc/mcmod/arnicalib/server/event/impl/ServerLoginEvent.java index 0ff4230c..7f38dfb1 100644 --- a/src/main/java/org/auioc/mods/arnicalib/server/event/impl/ServerLoginEvent.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/server/event/impl/ServerLoginEvent.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.server.event.impl; +package org.auioc.mcmod.arnicalib.server.event.impl; import net.minecraft.network.Connection; import net.minecraft.network.protocol.handshake.ClientIntentionPacket; diff --git a/src/main/java/org/auioc/mods/arnicalib/server/event/impl/ServerPlayerSendMessageEvent.java b/src/main/java/org/auioc/mcmod/arnicalib/server/event/impl/ServerPlayerSendMessageEvent.java similarity index 87% rename from src/main/java/org/auioc/mods/arnicalib/server/event/impl/ServerPlayerSendMessageEvent.java rename to src/main/java/org/auioc/mcmod/arnicalib/server/event/impl/ServerPlayerSendMessageEvent.java index 6c8602fe..9fb16814 100644 --- a/src/main/java/org/auioc/mods/arnicalib/server/event/impl/ServerPlayerSendMessageEvent.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/server/event/impl/ServerPlayerSendMessageEvent.java @@ -1,7 +1,7 @@ -package org.auioc.mods.arnicalib.server.event.impl; +package org.auioc.mcmod.arnicalib.server.event.impl; import java.util.UUID; -import org.auioc.mods.arnicalib.api.game.event.ServerPlayerEvent; +import org.auioc.mcmod.arnicalib.api.game.event.ServerPlayerEvent; import net.minecraft.network.chat.ChatType; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; diff --git a/src/main/java/org/auioc/mods/arnicalib/server/event/impl/SetEyeOfEnderSurvivableEvent.java b/src/main/java/org/auioc/mcmod/arnicalib/server/event/impl/SetEyeOfEnderSurvivableEvent.java similarity index 88% rename from src/main/java/org/auioc/mods/arnicalib/server/event/impl/SetEyeOfEnderSurvivableEvent.java rename to src/main/java/org/auioc/mcmod/arnicalib/server/event/impl/SetEyeOfEnderSurvivableEvent.java index 5825dc91..714633a1 100644 --- a/src/main/java/org/auioc/mods/arnicalib/server/event/impl/SetEyeOfEnderSurvivableEvent.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/server/event/impl/SetEyeOfEnderSurvivableEvent.java @@ -1,8 +1,8 @@ -package org.auioc.mods.arnicalib.server.event.impl; +package org.auioc.mcmod.arnicalib.server.event.impl; import java.util.Random; import java.util.function.Function; -import org.auioc.mods.arnicalib.api.game.event.ServerPlayerEvent; +import org.auioc.mcmod.arnicalib.api.game.event.ServerPlayerEvent; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.projectile.EyeOfEnder; diff --git a/src/main/java/org/auioc/mods/arnicalib/server/loot/AHGlobalLootModifiers.java b/src/main/java/org/auioc/mcmod/arnicalib/server/loot/AHGlobalLootModifiers.java similarity index 79% rename from src/main/java/org/auioc/mods/arnicalib/server/loot/AHGlobalLootModifiers.java rename to src/main/java/org/auioc/mcmod/arnicalib/server/loot/AHGlobalLootModifiers.java index 2ff09380..777866ee 100644 --- a/src/main/java/org/auioc/mods/arnicalib/server/loot/AHGlobalLootModifiers.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/server/loot/AHGlobalLootModifiers.java @@ -1,7 +1,7 @@ -package org.auioc.mods.arnicalib.server.loot; +package org.auioc.mcmod.arnicalib.server.loot; -import org.auioc.mods.arnicalib.ArnicaLib; -import org.auioc.mods.arnicalib.server.loot.modifier.LootTableInjector; +import org.auioc.mcmod.arnicalib.ArnicaLib; +import org.auioc.mcmod.arnicalib.server.loot.modifier.LootTableInjector; import net.minecraftforge.common.loot.GlobalLootModifierSerializer; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; diff --git a/src/main/java/org/auioc/mods/arnicalib/server/loot/AHLootItemConditions.java b/src/main/java/org/auioc/mcmod/arnicalib/server/loot/AHLootItemConditions.java similarity index 84% rename from src/main/java/org/auioc/mods/arnicalib/server/loot/AHLootItemConditions.java rename to src/main/java/org/auioc/mcmod/arnicalib/server/loot/AHLootItemConditions.java index 6cf5c89d..4b105f1c 100644 --- a/src/main/java/org/auioc/mods/arnicalib/server/loot/AHLootItemConditions.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/server/loot/AHLootItemConditions.java @@ -1,7 +1,7 @@ -package org.auioc.mods.arnicalib.server.loot; +package org.auioc.mcmod.arnicalib.server.loot; -import org.auioc.mods.arnicalib.ArnicaLib; -import org.auioc.mods.arnicalib.server.loot.predicate.ModLoadedCondition; +import org.auioc.mcmod.arnicalib.ArnicaLib; +import org.auioc.mcmod.arnicalib.server.loot.predicate.ModLoadedCondition; import net.minecraft.core.Registry; import net.minecraft.world.level.storage.loot.Serializer; import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; diff --git a/src/main/java/org/auioc/mods/arnicalib/server/loot/AHLootItemFunctions.java b/src/main/java/org/auioc/mcmod/arnicalib/server/loot/AHLootItemFunctions.java similarity index 81% rename from src/main/java/org/auioc/mods/arnicalib/server/loot/AHLootItemFunctions.java rename to src/main/java/org/auioc/mcmod/arnicalib/server/loot/AHLootItemFunctions.java index 38759b0d..c10f4772 100644 --- a/src/main/java/org/auioc/mods/arnicalib/server/loot/AHLootItemFunctions.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/server/loot/AHLootItemFunctions.java @@ -1,8 +1,8 @@ -package org.auioc.mods.arnicalib.server.loot; +package org.auioc.mcmod.arnicalib.server.loot; -import org.auioc.mods.arnicalib.ArnicaLib; -import org.auioc.mods.arnicalib.server.loot.function.SetCustomEffectsFunction; -import org.auioc.mods.arnicalib.server.loot.function.SetRandomPotionFunction; +import org.auioc.mcmod.arnicalib.ArnicaLib; +import org.auioc.mcmod.arnicalib.server.loot.function.SetCustomEffectsFunction; +import org.auioc.mcmod.arnicalib.server.loot.function.SetRandomPotionFunction; import net.minecraft.core.Registry; import net.minecraft.world.level.storage.loot.Serializer; import net.minecraft.world.level.storage.loot.functions.LootItemFunction; diff --git a/src/main/java/org/auioc/mods/arnicalib/server/loot/function/SetCustomEffectsFunction.java b/src/main/java/org/auioc/mcmod/arnicalib/server/loot/function/SetCustomEffectsFunction.java similarity index 90% rename from src/main/java/org/auioc/mods/arnicalib/server/loot/function/SetCustomEffectsFunction.java rename to src/main/java/org/auioc/mcmod/arnicalib/server/loot/function/SetCustomEffectsFunction.java index 4f4c9890..111b6909 100644 --- a/src/main/java/org/auioc/mods/arnicalib/server/loot/function/SetCustomEffectsFunction.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/server/loot/function/SetCustomEffectsFunction.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.server.loot.function; +package org.auioc.mcmod.arnicalib.server.loot.function; import java.util.ArrayList; import java.util.List; @@ -7,9 +7,9 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; -import org.auioc.mods.arnicalib.server.loot.AHLootItemFunctions; -import org.auioc.mods.arnicalib.utils.game.EffectUtils; -import org.auioc.mods.arnicalib.utils.java.Validate; +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; diff --git a/src/main/java/org/auioc/mods/arnicalib/server/loot/function/SetRandomPotionFunction.java b/src/main/java/org/auioc/mcmod/arnicalib/server/loot/function/SetRandomPotionFunction.java similarity index 91% rename from src/main/java/org/auioc/mods/arnicalib/server/loot/function/SetRandomPotionFunction.java rename to src/main/java/org/auioc/mcmod/arnicalib/server/loot/function/SetRandomPotionFunction.java index 0d13b8f0..aa0f72eb 100644 --- a/src/main/java/org/auioc/mods/arnicalib/server/loot/function/SetRandomPotionFunction.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/server/loot/function/SetRandomPotionFunction.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.server.loot.function; +package org.auioc.mcmod.arnicalib.server.loot.function; import java.util.ArrayList; import java.util.List; @@ -7,10 +7,10 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; -import org.auioc.mods.arnicalib.api.game.registry.OrderedForgeRegistries; -import org.auioc.mods.arnicalib.server.loot.AHLootItemFunctions; -import org.auioc.mods.arnicalib.utils.java.RandomUtils; -import org.auioc.mods.arnicalib.utils.java.Validate; +import org.auioc.mcmod.arnicalib.api.game.registry.OrderedForgeRegistries; +import org.auioc.mcmod.arnicalib.server.loot.AHLootItemFunctions; +import org.auioc.mcmod.arnicalib.utils.java.RandomUtils; +import org.auioc.mcmod.arnicalib.utils.java.Validate; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.GsonHelper; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/org/auioc/mods/arnicalib/server/loot/modifier/LootTableInjector.java b/src/main/java/org/auioc/mcmod/arnicalib/server/loot/modifier/LootTableInjector.java similarity index 98% rename from src/main/java/org/auioc/mods/arnicalib/server/loot/modifier/LootTableInjector.java rename to src/main/java/org/auioc/mcmod/arnicalib/server/loot/modifier/LootTableInjector.java index 466d085c..5960638b 100644 --- a/src/main/java/org/auioc/mods/arnicalib/server/loot/modifier/LootTableInjector.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/server/loot/modifier/LootTableInjector.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.server.loot.modifier; +package org.auioc.mcmod.arnicalib.server.loot.modifier; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/org/auioc/mods/arnicalib/server/loot/predicate/ModLoadedCondition.java b/src/main/java/org/auioc/mcmod/arnicalib/server/loot/predicate/ModLoadedCondition.java similarity index 91% rename from src/main/java/org/auioc/mods/arnicalib/server/loot/predicate/ModLoadedCondition.java rename to src/main/java/org/auioc/mcmod/arnicalib/server/loot/predicate/ModLoadedCondition.java index 00ff4fdd..835c6748 100644 --- a/src/main/java/org/auioc/mods/arnicalib/server/loot/predicate/ModLoadedCondition.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/server/loot/predicate/ModLoadedCondition.java @@ -1,9 +1,9 @@ -package org.auioc.mods.arnicalib.server.loot.predicate; +package org.auioc.mcmod.arnicalib.server.loot.predicate; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; -import org.auioc.mods.arnicalib.server.loot.AHLootItemConditions; +import org.auioc.mcmod.arnicalib.server.loot.AHLootItemConditions; import net.minecraft.util.GsonHelper; import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/LogUtil.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/LogUtil.java similarity index 97% rename from src/main/java/org/auioc/mods/arnicalib/utils/LogUtil.java rename to src/main/java/org/auioc/mcmod/arnicalib/utils/LogUtil.java index 352cb113..c73892cd 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/LogUtil.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/LogUtil.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.utils; +package org.auioc.mcmod.arnicalib.utils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/Loggers.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/Loggers.java similarity index 96% rename from src/main/java/org/auioc/mods/arnicalib/utils/Loggers.java rename to src/main/java/org/auioc/mcmod/arnicalib/utils/Loggers.java index 85eafa86..b44edb71 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/Loggers.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/Loggers.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.utils; +package org.auioc.mcmod.arnicalib.utils; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/game/AddrUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/AddrUtils.java similarity index 94% rename from src/main/java/org/auioc/mods/arnicalib/utils/game/AddrUtils.java rename to src/main/java/org/auioc/mcmod/arnicalib/utils/game/AddrUtils.java index d6efd3e3..967aab8d 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/game/AddrUtils.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/AddrUtils.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.utils.game; +package org.auioc.mcmod.arnicalib.utils.game; import java.net.InetSocketAddress; import java.net.SocketAddress; diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/game/CommandUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/CommandUtils.java similarity index 95% rename from src/main/java/org/auioc/mods/arnicalib/utils/game/CommandUtils.java rename to src/main/java/org/auioc/mcmod/arnicalib/utils/game/CommandUtils.java index 42d3ec86..a7ac108d 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/game/CommandUtils.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/CommandUtils.java @@ -1,8 +1,8 @@ -package org.auioc.mods.arnicalib.utils.game; +package org.auioc.mcmod.arnicalib.utils.game; -import static org.auioc.mods.arnicalib.ArnicaLib.i18n; -import static org.auioc.mods.arnicalib.utils.game.TextUtils.EmptyText; -import static org.auioc.mods.arnicalib.utils.game.TextUtils.I18nText; +import static org.auioc.mcmod.arnicalib.ArnicaLib.i18n; +import static org.auioc.mcmod.arnicalib.utils.game.TextUtils.EmptyText; +import static org.auioc.mcmod.arnicalib.utils.game.TextUtils.I18nText; import java.lang.reflect.Field; import java.util.List; import java.util.function.Function; @@ -13,7 +13,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; import com.mojang.brigadier.tree.LiteralCommandNode; -import org.auioc.mods.arnicalib.api.mixin.common.IMixinCommandSourceStack; +import org.auioc.mcmod.arnicalib.api.mixin.common.IMixinCommandSourceStack; import net.minecraft.client.player.LocalPlayer; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/game/EffectUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/EffectUtils.java similarity index 95% rename from src/main/java/org/auioc/mods/arnicalib/utils/game/EffectUtils.java rename to src/main/java/org/auioc/mcmod/arnicalib/utils/game/EffectUtils.java index c7e865a8..51c12683 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/game/EffectUtils.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/EffectUtils.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.utils.game; +package org.auioc.mcmod.arnicalib.utils.game; import java.util.ArrayList; import java.util.Collection; @@ -8,10 +8,10 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import org.auioc.mods.arnicalib.api.game.registry.OrderedForgeRegistries; -import org.auioc.mods.arnicalib.api.mixin.common.IMixinMobEffectInstance; -import org.auioc.mods.arnicalib.utils.java.RandomUtils; -import org.auioc.mods.arnicalib.utils.java.Validate; +import org.auioc.mcmod.arnicalib.api.game.registry.OrderedForgeRegistries; +import org.auioc.mcmod.arnicalib.api.mixin.common.IMixinMobEffectInstance; +import org.auioc.mcmod.arnicalib.utils.java.RandomUtils; +import org.auioc.mcmod.arnicalib.utils.java.Validate; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.GsonHelper; diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/game/EnchUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/EnchUtils.java similarity index 97% rename from src/main/java/org/auioc/mods/arnicalib/utils/game/EnchUtils.java rename to src/main/java/org/auioc/mcmod/arnicalib/utils/game/EnchUtils.java index d715d6d4..da9fb6a4 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/game/EnchUtils.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/EnchUtils.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.utils.game; +package org.auioc.mcmod.arnicalib.utils.game; import org.apache.commons.lang3.RandomUtils; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/game/EntityUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/EntityUtils.java similarity index 99% rename from src/main/java/org/auioc/mods/arnicalib/utils/game/EntityUtils.java rename to src/main/java/org/auioc/mcmod/arnicalib/utils/game/EntityUtils.java index 14f6dee9..9626d5e5 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/game/EntityUtils.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/EntityUtils.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.utils.game; +package org.auioc.mcmod.arnicalib.utils.game; import java.util.Optional; import java.util.function.Function; diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/game/I18nUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/I18nUtils.java similarity index 90% rename from src/main/java/org/auioc/mods/arnicalib/utils/game/I18nUtils.java rename to src/main/java/org/auioc/mcmod/arnicalib/utils/game/I18nUtils.java index 04b296f9..59ff604b 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/game/I18nUtils.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/I18nUtils.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.utils.game; +package org.auioc.mcmod.arnicalib.utils.game; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TranslatableComponent; diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/game/ItemUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/ItemUtils.java similarity index 98% rename from src/main/java/org/auioc/mods/arnicalib/utils/game/ItemUtils.java rename to src/main/java/org/auioc/mcmod/arnicalib/utils/game/ItemUtils.java index 4bf7ab20..962c5dd0 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/game/ItemUtils.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/ItemUtils.java @@ -1,10 +1,10 @@ -package org.auioc.mods.arnicalib.utils.game; +package org.auioc.mcmod.arnicalib.utils.game; import java.util.function.Predicate; import javax.annotation.Nullable; import com.google.gson.JsonObject; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import org.auioc.mods.arnicalib.utils.java.Validate; +import org.auioc.mcmod.arnicalib.utils.java.Validate; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.TagParser; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/game/LanguageUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/LanguageUtils.java similarity index 95% rename from src/main/java/org/auioc/mods/arnicalib/utils/game/LanguageUtils.java rename to src/main/java/org/auioc/mcmod/arnicalib/utils/game/LanguageUtils.java index d762efee..702857f7 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/game/LanguageUtils.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/LanguageUtils.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.utils.game; +package org.auioc.mcmod.arnicalib.utils.game; import java.util.List; import net.minecraft.client.Minecraft; diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/game/MCTimeUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/MCTimeUtils.java similarity index 96% rename from src/main/java/org/auioc/mods/arnicalib/utils/game/MCTimeUtils.java rename to src/main/java/org/auioc/mcmod/arnicalib/utils/game/MCTimeUtils.java index 011efb6b..4fbb5b2d 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/game/MCTimeUtils.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/MCTimeUtils.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.utils.game; +package org.auioc.mcmod.arnicalib.utils.game; import net.minecraft.world.level.Level; diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/game/PlayerUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/PlayerUtils.java similarity index 98% rename from src/main/java/org/auioc/mods/arnicalib/utils/game/PlayerUtils.java rename to src/main/java/org/auioc/mcmod/arnicalib/utils/game/PlayerUtils.java index b3df2b4d..bdc14c99 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/game/PlayerUtils.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/PlayerUtils.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.utils.game; +package org.auioc.mcmod.arnicalib.utils.game; import javax.annotation.Nullable; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/game/RegistryUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/RegistryUtils.java similarity index 89% rename from src/main/java/org/auioc/mods/arnicalib/utils/game/RegistryUtils.java rename to src/main/java/org/auioc/mcmod/arnicalib/utils/game/RegistryUtils.java index 77627d76..ab6a3b94 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/game/RegistryUtils.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/RegistryUtils.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.utils.game; +package org.auioc.mcmod.arnicalib.utils.game; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Predicate; -import org.auioc.mods.arnicalib.api.game.registry.IHRegistry; +import org.auioc.mcmod.arnicalib.api.game.registry.IHRegistry; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistryEntry; import net.minecraftforge.registries.IForgeRegistryEntry; @@ -25,7 +25,7 @@ public static > List getAllRegistryObjects(D /** * For special use only, - * please use {@link org.auioc.mods.arnicalib.utils.game.RegistryUtils#getAllRegistryObjects(DeferredRegister)} instead generally. + * please use {@link org.auioc.mcmod.arnicalib.utils.game.RegistryUtils#getAllRegistryObjects(DeferredRegister)} instead generally. */ @SuppressWarnings("unchecked") public static > List getAllRegistryObjects(Class clazz, Class type) { diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/game/SoundUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/SoundUtils.java similarity index 95% rename from src/main/java/org/auioc/mods/arnicalib/utils/game/SoundUtils.java rename to src/main/java/org/auioc/mcmod/arnicalib/utils/game/SoundUtils.java index 01a67798..de5e610c 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/game/SoundUtils.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/SoundUtils.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.utils.game; +package org.auioc.mcmod.arnicalib.utils.game; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/game/TextUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/TextUtils.java similarity index 97% rename from src/main/java/org/auioc/mods/arnicalib/utils/game/TextUtils.java rename to src/main/java/org/auioc/mcmod/arnicalib/utils/game/TextUtils.java index 3c981d32..7e178eb0 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/game/TextUtils.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/TextUtils.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.utils.game; +package org.auioc.mcmod.arnicalib.utils.game; import net.minecraft.Util; import net.minecraft.network.chat.Component; diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/java/FileUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/java/FileUtils.java similarity index 95% rename from src/main/java/org/auioc/mods/arnicalib/utils/java/FileUtils.java rename to src/main/java/org/auioc/mcmod/arnicalib/utils/java/FileUtils.java index 517f875e..a095b099 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/java/FileUtils.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/java/FileUtils.java @@ -1,6 +1,6 @@ -package org.auioc.mods.arnicalib.utils.java; +package org.auioc.mcmod.arnicalib.utils.java; -import static org.auioc.mods.arnicalib.ArnicaLib.LOGGER; +import static org.auioc.mcmod.arnicalib.ArnicaLib.LOGGER; import java.io.BufferedWriter; import java.io.File; import java.io.FileNotFoundException; @@ -8,7 +8,7 @@ import java.io.IOException; import java.nio.charset.Charset; import org.apache.logging.log4j.Marker; -import org.auioc.mods.arnicalib.utils.LogUtil; +import org.auioc.mcmod.arnicalib.utils.LogUtil; public class FileUtils extends org.apache.commons.io.FileUtils { diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/java/JarUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/java/JarUtils.java similarity index 85% rename from src/main/java/org/auioc/mods/arnicalib/utils/java/JarUtils.java rename to src/main/java/org/auioc/mcmod/arnicalib/utils/java/JarUtils.java index 8420eddf..143f300f 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/java/JarUtils.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/java/JarUtils.java @@ -1,13 +1,13 @@ -package org.auioc.mods.arnicalib.utils.java; +package org.auioc.mcmod.arnicalib.utils.java; -import static org.auioc.mods.arnicalib.ArnicaLib.LOGGER; +import static org.auioc.mcmod.arnicalib.ArnicaLib.LOGGER; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; import java.util.jar.Attributes; import java.util.jar.Manifest; import org.apache.logging.log4j.Marker; -import org.auioc.mods.arnicalib.utils.LogUtil; +import org.auioc.mcmod.arnicalib.utils.LogUtil; public interface JarUtils { diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/java/RandomUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/java/RandomUtils.java similarity index 98% rename from src/main/java/org/auioc/mods/arnicalib/utils/java/RandomUtils.java rename to src/main/java/org/auioc/mcmod/arnicalib/utils/java/RandomUtils.java index 77db849f..9c15feda 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/java/RandomUtils.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/java/RandomUtils.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.utils.java; +package org.auioc.mcmod.arnicalib.utils.java; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/java/Validate.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/java/Validate.java similarity index 99% rename from src/main/java/org/auioc/mods/arnicalib/utils/java/Validate.java rename to src/main/java/org/auioc/mcmod/arnicalib/utils/java/Validate.java index 6e8298e7..c4a8112c 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/java/Validate.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/java/Validate.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.utils.java; +package org.auioc.mcmod.arnicalib.utils.java; import com.google.common.collect.Range; diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/java/VersionUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/java/VersionUtils.java similarity index 93% rename from src/main/java/org/auioc/mods/arnicalib/utils/java/VersionUtils.java rename to src/main/java/org/auioc/mcmod/arnicalib/utils/java/VersionUtils.java index 9864d21b..d8baddae 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/java/VersionUtils.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/java/VersionUtils.java @@ -1,12 +1,12 @@ -package org.auioc.mods.arnicalib.utils.java; +package org.auioc.mcmod.arnicalib.utils.java; -import static org.auioc.mods.arnicalib.ArnicaLib.LOGGER; +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.mods.arnicalib.utils.LogUtil; +import org.auioc.mcmod.arnicalib.utils.LogUtil; public class VersionUtils { diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/network/AddressUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/network/AddressUtils.java similarity index 89% rename from src/main/java/org/auioc/mods/arnicalib/utils/network/AddressUtils.java rename to src/main/java/org/auioc/mcmod/arnicalib/utils/network/AddressUtils.java index 96480ce6..9e6483f4 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/network/AddressUtils.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/network/AddressUtils.java @@ -1,12 +1,12 @@ -package org.auioc.mods.arnicalib.utils.network; +package org.auioc.mcmod.arnicalib.utils.network; -import static org.auioc.mods.arnicalib.ArnicaLib.LOGGER; +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.mods.arnicalib.utils.LogUtil; +import org.auioc.mcmod.arnicalib.utils.LogUtil; public interface AddressUtils { diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/network/HttpUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/network/HttpUtils.java similarity index 97% rename from src/main/java/org/auioc/mods/arnicalib/utils/network/HttpUtils.java rename to src/main/java/org/auioc/mcmod/arnicalib/utils/network/HttpUtils.java index e6e90370..5bd7c915 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/network/HttpUtils.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/network/HttpUtils.java @@ -1,4 +1,4 @@ -package org.auioc.mods.arnicalib.utils.network; +package org.auioc.mcmod.arnicalib.utils.network; import java.io.IOException; import com.google.gson.JsonElement; diff --git a/src/main/java/org/auioc/mods/arnicalib/api/game/registry/IHRegistry.java b/src/main/java/org/auioc/mods/arnicalib/api/game/registry/IHRegistry.java deleted file mode 100644 index 10f10537..00000000 --- a/src/main/java/org/auioc/mods/arnicalib/api/game/registry/IHRegistry.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.auioc.mods.arnicalib.api.game.registry; - -public interface IHRegistry { -} diff --git a/src/main/resources/arnicalib.mixin.json b/src/main/resources/arnicalib.mixin.json index a9dcff73..98a12d81 100644 --- a/src/main/resources/arnicalib.mixin.json +++ b/src/main/resources/arnicalib.mixin.json @@ -1,6 +1,6 @@ { "required": true, - "package": "org.auioc.mods.arnicalib.mixin", + "package": "org.auioc.mcmod.arnicalib.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ "common.MixinPistonBaseBlock",