From 613e36904d9a7fb4a3edb37797c46e65cf0e1758 Mon Sep 17 00:00:00 2001 From: melontini <104443436+melontini@users.noreply.github.com> Date: Sat, 23 Dec 2023 23:30:32 +0700 Subject: [PATCH] Move more stuff to common. --- src/main/java/me/melontini/andromeda/common/Andromeda.java | 4 ++-- .../melontini/andromeda/common/client/AndromedaClient.java | 2 +- .../andromeda/common/client/ClientSideNetworking.java | 2 +- .../me/melontini/andromeda/common/config/DataConfigs.java | 2 +- .../andromeda/common/registries/AndromedaItemGroup.java | 2 +- .../andromeda/{ => common}/util/AndromedaPackets.java | 2 +- .../andromeda/{ => common}/util/AndromedaTexts.java | 2 +- .../me/melontini/andromeda/{ => common}/util/BlockUtil.java | 2 +- .../melontini/andromeda/{ => common}/util/CrashHandler.java | 5 ++++- .../melontini/andromeda/common/{ => util}/DebugTracker.java | 2 +- .../melontini/andromeda/{ => common}/util/ItemStackUtil.java | 2 +- .../andromeda/{ => common}/util/JsonDataLoader.java | 3 ++- .../me/melontini/andromeda/{ => common}/util/MiscUtil.java | 2 +- .../me/melontini/andromeda/{ => common}/util/TagUtil.java | 2 +- .../me/melontini/andromeda/{ => common}/util/WorldUtil.java | 2 +- .../modules/blocks/bed/safe/mixin/BedBlockMixin.java | 2 +- .../cactus_bottle_filling/mixin/AbstractBlockMixin.java | 4 ++-- .../blocks/cactus_bottle_filling/mixin/CactusBlockMixin.java | 2 +- .../andromeda/modules/blocks/incubator/IncubatorBlock.java | 2 +- .../modules/blocks/incubator/data/EggProcessingData.java | 2 +- .../mixin/FurnaceMinecartIntakeMixin.java | 2 +- .../andromeda/modules/entities/boats/BoatEntities.java | 2 +- .../modules/entities/boats/entities/JukeboxBoatEntity.java | 4 ++-- .../modules/entities/boats/entities/TNTBoatEntity.java | 2 +- .../entities/minecarts/entities/JukeboxMinecartEntity.java | 4 ++-- .../villagers_follow_emeralds/VillagerTemptGoal.java | 2 +- .../modules/entities/zombie/clean_pickup/PickupTag.java | 2 +- .../modules/items/infinite_totem/client/Client.java | 2 +- .../modules/items/infinite_totem/mixin/ItemEntityMixin.java | 4 ++-- .../items/infinite_totem/mixin/LivingEntityMixin.java | 2 +- .../modules/items/tooltips/mixin/compass/ItemMixin.java | 2 +- .../items/tooltips/mixin/recovery_compass/ItemMixin.java | 2 +- .../modules/mechanics/dragon_fight/EnderDragonManager.java | 2 +- .../mechanics/throwable_items/data/BehaviorLoader.java | 2 +- .../modules/mechanics/villager_gifting/GiftTags.java | 2 +- .../andromeda/modules/misc/unknown/RoseOfTheValley.java | 2 +- .../modules/misc/unknown/mixin/wakeup/PlayerEntityMixin.java | 2 +- .../modules/world/crop_temperature/PlantTemperatureData.java | 2 +- .../falling_beenests/mixin/BeehiveBlockEntityMixin.java | 4 ++-- .../world/falling_beenests/mixin/FallingBlockMixin.java | 4 ++-- .../mixin/PersistentProjectileEntityMixin.java | 4 ++-- .../java/me/melontini/andromeda/util/mixin/ErrorHandler.java | 2 +- 42 files changed, 54 insertions(+), 50 deletions(-) rename src/main/java/me/melontini/andromeda/{ => common}/util/AndromedaPackets.java (94%) rename src/main/java/me/melontini/andromeda/{ => common}/util/AndromedaTexts.java (95%) rename src/main/java/me/melontini/andromeda/{ => common}/util/BlockUtil.java (96%) rename src/main/java/me/melontini/andromeda/{ => common}/util/CrashHandler.java (96%) rename src/main/java/me/melontini/andromeda/common/{ => util}/DebugTracker.java (97%) rename src/main/java/me/melontini/andromeda/{ => common}/util/ItemStackUtil.java (98%) rename src/main/java/me/melontini/andromeda/{ => common}/util/JsonDataLoader.java (96%) rename src/main/java/me/melontini/andromeda/{ => common}/util/MiscUtil.java (92%) rename src/main/java/me/melontini/andromeda/{ => common}/util/TagUtil.java (88%) rename src/main/java/me/melontini/andromeda/{ => common}/util/WorldUtil.java (99%) diff --git a/src/main/java/me/melontini/andromeda/common/Andromeda.java b/src/main/java/me/melontini/andromeda/common/Andromeda.java index 3f02736a..b9540b66 100644 --- a/src/main/java/me/melontini/andromeda/common/Andromeda.java +++ b/src/main/java/me/melontini/andromeda/common/Andromeda.java @@ -5,9 +5,9 @@ import me.melontini.andromeda.base.ModuleManager; import me.melontini.andromeda.base.config.Config; import me.melontini.andromeda.common.config.DataConfigs; import me.melontini.andromeda.common.registries.Common; -import me.melontini.andromeda.util.AndromedaPackets; +import me.melontini.andromeda.common.util.AndromedaPackets; +import me.melontini.andromeda.common.util.CrashHandler; import me.melontini.andromeda.util.CommonValues; -import me.melontini.andromeda.util.CrashHandler; import me.melontini.andromeda.util.Debug; import me.melontini.dark_matter.api.base.util.Support; import me.melontini.dark_matter.api.minecraft.util.TextUtil; diff --git a/src/main/java/me/melontini/andromeda/common/client/AndromedaClient.java b/src/main/java/me/melontini/andromeda/common/client/AndromedaClient.java index fc06544b..7ffe2f59 100644 --- a/src/main/java/me/melontini/andromeda/common/client/AndromedaClient.java +++ b/src/main/java/me/melontini/andromeda/common/client/AndromedaClient.java @@ -8,9 +8,9 @@ import me.melontini.andromeda.base.config.Config; import me.melontini.andromeda.common.client.config.AutoConfigScreen; import me.melontini.andromeda.common.client.config.FeatureBlockade; import me.melontini.andromeda.common.registries.AndromedaItemGroup; +import me.melontini.andromeda.common.util.CrashHandler; import me.melontini.andromeda.util.AndromedaLog; import me.melontini.andromeda.util.CommonValues; -import me.melontini.andromeda.util.CrashHandler; import me.melontini.andromeda.util.Debug; import me.melontini.dark_matter.api.base.util.Support; import me.melontini.dark_matter.api.minecraft.util.TextUtil; diff --git a/src/main/java/me/melontini/andromeda/common/client/ClientSideNetworking.java b/src/main/java/me/melontini/andromeda/common/client/ClientSideNetworking.java index 9915e975..e50b7140 100644 --- a/src/main/java/me/melontini/andromeda/common/client/ClientSideNetworking.java +++ b/src/main/java/me/melontini/andromeda/common/client/ClientSideNetworking.java @@ -4,9 +4,9 @@ import me.melontini.andromeda.base.Environment; import me.melontini.andromeda.base.ModuleManager; import me.melontini.andromeda.common.client.sound.PersistentMovingSoundInstance; import me.melontini.andromeda.common.conflicts.CommonRegistries; +import me.melontini.andromeda.common.util.AndromedaPackets; import me.melontini.andromeda.modules.entities.boats.BoatEntities; import me.melontini.andromeda.modules.entities.minecarts.MinecartEntities; -import me.melontini.andromeda.util.AndromedaPackets; import me.melontini.dark_matter.api.base.util.MakeSure; import net.fabricmc.fabric.api.client.networking.v1.ClientLoginNetworking; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; diff --git a/src/main/java/me/melontini/andromeda/common/config/DataConfigs.java b/src/main/java/me/melontini/andromeda/common/config/DataConfigs.java index 4cde70d8..f70d586e 100644 --- a/src/main/java/me/melontini/andromeda/common/config/DataConfigs.java +++ b/src/main/java/me/melontini/andromeda/common/config/DataConfigs.java @@ -7,7 +7,7 @@ import me.melontini.andromeda.base.Module; import me.melontini.andromeda.base.ModuleManager; import me.melontini.andromeda.base.config.BasicConfig; import me.melontini.andromeda.common.registries.Common; -import me.melontini.andromeda.util.JsonDataLoader; +import me.melontini.andromeda.common.util.JsonDataLoader; import me.melontini.dark_matter.api.base.util.MakeSure; import me.melontini.dark_matter.api.base.util.Utilities; import me.melontini.dark_matter.api.base.util.classes.Tuple; diff --git a/src/main/java/me/melontini/andromeda/common/registries/AndromedaItemGroup.java b/src/main/java/me/melontini/andromeda/common/registries/AndromedaItemGroup.java index fe5d3f42..19e22bbe 100644 --- a/src/main/java/me/melontini/andromeda/common/registries/AndromedaItemGroup.java +++ b/src/main/java/me/melontini/andromeda/common/registries/AndromedaItemGroup.java @@ -1,7 +1,7 @@ package me.melontini.andromeda.common.registries; import me.melontini.andromeda.base.Module; -import me.melontini.andromeda.util.AndromedaTexts; +import me.melontini.andromeda.common.util.AndromedaTexts; import me.melontini.dark_matter.api.base.util.MathStuff; import me.melontini.dark_matter.api.content.ContentBuilder; import me.melontini.dark_matter.api.content.interfaces.DarkMatterEntries; diff --git a/src/main/java/me/melontini/andromeda/util/AndromedaPackets.java b/src/main/java/me/melontini/andromeda/common/util/AndromedaPackets.java similarity index 94% rename from src/main/java/me/melontini/andromeda/util/AndromedaPackets.java rename to src/main/java/me/melontini/andromeda/common/util/AndromedaPackets.java index a3577421..0bc2c61d 100644 --- a/src/main/java/me/melontini/andromeda/util/AndromedaPackets.java +++ b/src/main/java/me/melontini/andromeda/common/util/AndromedaPackets.java @@ -1,4 +1,4 @@ -package me.melontini.andromeda.util; +package me.melontini.andromeda.common.util; import net.minecraft.util.Identifier; diff --git a/src/main/java/me/melontini/andromeda/util/AndromedaTexts.java b/src/main/java/me/melontini/andromeda/common/util/AndromedaTexts.java similarity index 95% rename from src/main/java/me/melontini/andromeda/util/AndromedaTexts.java rename to src/main/java/me/melontini/andromeda/common/util/AndromedaTexts.java index da5f3bcb..9873b3f3 100644 --- a/src/main/java/me/melontini/andromeda/util/AndromedaTexts.java +++ b/src/main/java/me/melontini/andromeda/common/util/AndromedaTexts.java @@ -1,4 +1,4 @@ -package me.melontini.andromeda.util; +package me.melontini.andromeda.common.util; import me.melontini.dark_matter.api.minecraft.util.TextUtil; import net.minecraft.text.Text; diff --git a/src/main/java/me/melontini/andromeda/util/BlockUtil.java b/src/main/java/me/melontini/andromeda/common/util/BlockUtil.java similarity index 96% rename from src/main/java/me/melontini/andromeda/util/BlockUtil.java rename to src/main/java/me/melontini/andromeda/common/util/BlockUtil.java index 425e5edc..9583fe9a 100644 --- a/src/main/java/me/melontini/andromeda/util/BlockUtil.java +++ b/src/main/java/me/melontini/andromeda/common/util/BlockUtil.java @@ -1,4 +1,4 @@ -package me.melontini.andromeda.util; +package me.melontini.andromeda.common.util; import net.minecraft.block.Block; import net.minecraft.state.property.IntProperty; diff --git a/src/main/java/me/melontini/andromeda/util/CrashHandler.java b/src/main/java/me/melontini/andromeda/common/util/CrashHandler.java similarity index 96% rename from src/main/java/me/melontini/andromeda/util/CrashHandler.java rename to src/main/java/me/melontini/andromeda/common/util/CrashHandler.java index 47982981..9ddd3ad7 100644 --- a/src/main/java/me/melontini/andromeda/util/CrashHandler.java +++ b/src/main/java/me/melontini/andromeda/common/util/CrashHandler.java @@ -1,9 +1,12 @@ -package me.melontini.andromeda.util; +package me.melontini.andromeda.common.util; import com.google.common.collect.Sets; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import me.melontini.andromeda.base.config.Config; +import me.melontini.andromeda.util.AndromedaLog; +import me.melontini.andromeda.util.CauseFinder; +import me.melontini.andromeda.util.CommonValues; import me.melontini.andromeda.util.exceptions.AndromedaException; import me.melontini.dark_matter.api.analytics.Analytics; import me.melontini.dark_matter.api.analytics.crashes.Crashlytics; diff --git a/src/main/java/me/melontini/andromeda/common/DebugTracker.java b/src/main/java/me/melontini/andromeda/common/util/DebugTracker.java similarity index 97% rename from src/main/java/me/melontini/andromeda/common/DebugTracker.java rename to src/main/java/me/melontini/andromeda/common/util/DebugTracker.java index d0ebd348..de8b1852 100644 --- a/src/main/java/me/melontini/andromeda/common/DebugTracker.java +++ b/src/main/java/me/melontini/andromeda/common/util/DebugTracker.java @@ -1,4 +1,4 @@ -package me.melontini.andromeda.common; +package me.melontini.andromeda.common.util; import me.melontini.andromeda.util.Debug; import me.melontini.dark_matter.api.base.util.Support; diff --git a/src/main/java/me/melontini/andromeda/util/ItemStackUtil.java b/src/main/java/me/melontini/andromeda/common/util/ItemStackUtil.java similarity index 98% rename from src/main/java/me/melontini/andromeda/util/ItemStackUtil.java rename to src/main/java/me/melontini/andromeda/common/util/ItemStackUtil.java index d52770c2..e9d03ae7 100644 --- a/src/main/java/me/melontini/andromeda/util/ItemStackUtil.java +++ b/src/main/java/me/melontini/andromeda/common/util/ItemStackUtil.java @@ -1,4 +1,4 @@ -package me.melontini.andromeda.util; +package me.melontini.andromeda.common.util; import me.melontini.dark_matter.api.base.util.MakeSure; import me.melontini.dark_matter.api.base.util.MathStuff; diff --git a/src/main/java/me/melontini/andromeda/util/JsonDataLoader.java b/src/main/java/me/melontini/andromeda/common/util/JsonDataLoader.java similarity index 96% rename from src/main/java/me/melontini/andromeda/util/JsonDataLoader.java rename to src/main/java/me/melontini/andromeda/common/util/JsonDataLoader.java index 61632e32..08ad5ebe 100644 --- a/src/main/java/me/melontini/andromeda/util/JsonDataLoader.java +++ b/src/main/java/me/melontini/andromeda/common/util/JsonDataLoader.java @@ -1,9 +1,10 @@ -package me.melontini.andromeda.util; +package me.melontini.andromeda.common.util; import com.google.common.collect.Maps; import com.google.gson.Gson; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; +import me.melontini.andromeda.util.AndromedaLog; import net.fabricmc.fabric.api.resource.SimpleResourceReloadListener; import net.fabricmc.fabric.api.resource.conditions.v1.ResourceConditions; import net.minecraft.resource.ResourceManager; diff --git a/src/main/java/me/melontini/andromeda/util/MiscUtil.java b/src/main/java/me/melontini/andromeda/common/util/MiscUtil.java similarity index 92% rename from src/main/java/me/melontini/andromeda/util/MiscUtil.java rename to src/main/java/me/melontini/andromeda/common/util/MiscUtil.java index a555bb42..42a8922e 100644 --- a/src/main/java/me/melontini/andromeda/util/MiscUtil.java +++ b/src/main/java/me/melontini/andromeda/common/util/MiscUtil.java @@ -1,4 +1,4 @@ -package me.melontini.andromeda.util; +package me.melontini.andromeda.common.util; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; diff --git a/src/main/java/me/melontini/andromeda/util/TagUtil.java b/src/main/java/me/melontini/andromeda/common/util/TagUtil.java similarity index 88% rename from src/main/java/me/melontini/andromeda/util/TagUtil.java rename to src/main/java/me/melontini/andromeda/common/util/TagUtil.java index 3c5d7c49..a2ce1351 100644 --- a/src/main/java/me/melontini/andromeda/util/TagUtil.java +++ b/src/main/java/me/melontini/andromeda/common/util/TagUtil.java @@ -1,4 +1,4 @@ -package me.melontini.andromeda.util; +package me.melontini.andromeda.common.util; import net.minecraft.item.Item; import net.minecraft.util.Identifier; diff --git a/src/main/java/me/melontini/andromeda/util/WorldUtil.java b/src/main/java/me/melontini/andromeda/common/util/WorldUtil.java similarity index 99% rename from src/main/java/me/melontini/andromeda/util/WorldUtil.java rename to src/main/java/me/melontini/andromeda/common/util/WorldUtil.java index cac71b7a..bc3fe5d0 100644 --- a/src/main/java/me/melontini/andromeda/util/WorldUtil.java +++ b/src/main/java/me/melontini/andromeda/common/util/WorldUtil.java @@ -1,4 +1,4 @@ -package me.melontini.andromeda.util; +package me.melontini.andromeda.common.util; import me.melontini.andromeda.common.conflicts.CommonRegistries; import me.melontini.dark_matter.api.base.util.MakeSure; diff --git a/src/main/java/me/melontini/andromeda/modules/blocks/bed/safe/mixin/BedBlockMixin.java b/src/main/java/me/melontini/andromeda/modules/blocks/bed/safe/mixin/BedBlockMixin.java index 031959bd..54f91728 100644 --- a/src/main/java/me/melontini/andromeda/modules/blocks/bed/safe/mixin/BedBlockMixin.java +++ b/src/main/java/me/melontini/andromeda/modules/blocks/bed/safe/mixin/BedBlockMixin.java @@ -1,7 +1,7 @@ package me.melontini.andromeda.modules.blocks.bed.safe.mixin; +import me.melontini.andromeda.common.util.AndromedaTexts; import me.melontini.andromeda.modules.blocks.bed.safe.Safe; -import me.melontini.andromeda.util.AndromedaTexts; import net.minecraft.block.BedBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/me/melontini/andromeda/modules/blocks/cactus_bottle_filling/mixin/AbstractBlockMixin.java b/src/main/java/me/melontini/andromeda/modules/blocks/cactus_bottle_filling/mixin/AbstractBlockMixin.java index 6f299b0b..f2c91919 100644 --- a/src/main/java/me/melontini/andromeda/modules/blocks/cactus_bottle_filling/mixin/AbstractBlockMixin.java +++ b/src/main/java/me/melontini/andromeda/modules/blocks/cactus_bottle_filling/mixin/AbstractBlockMixin.java @@ -1,8 +1,8 @@ package me.melontini.andromeda.modules.blocks.cactus_bottle_filling.mixin; +import me.melontini.andromeda.common.util.BlockUtil; +import me.melontini.andromeda.common.util.ItemStackUtil; import me.melontini.andromeda.modules.blocks.cactus_bottle_filling.CactusFiller; -import me.melontini.andromeda.util.BlockUtil; -import me.melontini.andromeda.util.ItemStackUtil; import net.minecraft.block.AbstractBlock; import net.minecraft.block.BlockState; import net.minecraft.block.CactusBlock; diff --git a/src/main/java/me/melontini/andromeda/modules/blocks/cactus_bottle_filling/mixin/CactusBlockMixin.java b/src/main/java/me/melontini/andromeda/modules/blocks/cactus_bottle_filling/mixin/CactusBlockMixin.java index 3ba870cd..a1581dcd 100644 --- a/src/main/java/me/melontini/andromeda/modules/blocks/cactus_bottle_filling/mixin/CactusBlockMixin.java +++ b/src/main/java/me/melontini/andromeda/modules/blocks/cactus_bottle_filling/mixin/CactusBlockMixin.java @@ -1,6 +1,6 @@ package me.melontini.andromeda.modules.blocks.cactus_bottle_filling.mixin; -import me.melontini.andromeda.util.BlockUtil; +import me.melontini.andromeda.common.util.BlockUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.CactusBlock; diff --git a/src/main/java/me/melontini/andromeda/modules/blocks/incubator/IncubatorBlock.java b/src/main/java/me/melontini/andromeda/modules/blocks/incubator/IncubatorBlock.java index 8cf7c480..d6c01b50 100644 --- a/src/main/java/me/melontini/andromeda/modules/blocks/incubator/IncubatorBlock.java +++ b/src/main/java/me/melontini/andromeda/modules/blocks/incubator/IncubatorBlock.java @@ -1,9 +1,9 @@ package me.melontini.andromeda.modules.blocks.incubator; import me.melontini.andromeda.base.ModuleManager; +import me.melontini.andromeda.common.util.AndromedaTexts; import me.melontini.andromeda.modules.blocks.incubator.data.EggProcessingData; import me.melontini.andromeda.modules.misc.unknown.Unknown; -import me.melontini.andromeda.util.AndromedaTexts; import net.minecraft.block.*; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityTicker; diff --git a/src/main/java/me/melontini/andromeda/modules/blocks/incubator/data/EggProcessingData.java b/src/main/java/me/melontini/andromeda/modules/blocks/incubator/data/EggProcessingData.java index d46cd82f..e3c6b084 100644 --- a/src/main/java/me/melontini/andromeda/modules/blocks/incubator/data/EggProcessingData.java +++ b/src/main/java/me/melontini/andromeda/modules/blocks/incubator/data/EggProcessingData.java @@ -3,7 +3,7 @@ package me.melontini.andromeda.modules.blocks.incubator.data; import com.google.gson.Gson; import com.google.gson.JsonObject; import me.melontini.andromeda.common.conflicts.CommonRegistries; -import me.melontini.andromeda.util.JsonDataLoader; +import me.melontini.andromeda.common.util.JsonDataLoader; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; import net.fabricmc.fabric.api.resource.ResourceManagerHelper; import net.minecraft.entity.EntityType; diff --git a/src/main/java/me/melontini/andromeda/modules/entities/better_furnace_minecart/mixin/FurnaceMinecartIntakeMixin.java b/src/main/java/me/melontini/andromeda/modules/entities/better_furnace_minecart/mixin/FurnaceMinecartIntakeMixin.java index c90b4aaa..96dc434c 100644 --- a/src/main/java/me/melontini/andromeda/modules/entities/better_furnace_minecart/mixin/FurnaceMinecartIntakeMixin.java +++ b/src/main/java/me/melontini/andromeda/modules/entities/better_furnace_minecart/mixin/FurnaceMinecartIntakeMixin.java @@ -1,8 +1,8 @@ package me.melontini.andromeda.modules.entities.better_furnace_minecart.mixin; import me.melontini.andromeda.base.ModuleManager; +import me.melontini.andromeda.common.util.ItemStackUtil; import me.melontini.andromeda.modules.entities.better_furnace_minecart.BetterFurnaceMinecart; -import me.melontini.andromeda.util.ItemStackUtil; import me.melontini.dark_matter.api.base.util.Support; import net.fabricmc.fabric.api.registry.FuelRegistry; import net.minecraft.entity.EntityType; diff --git a/src/main/java/me/melontini/andromeda/modules/entities/boats/BoatEntities.java b/src/main/java/me/melontini/andromeda/modules/entities/boats/BoatEntities.java index 87cb8b5d..d8f4bfe8 100644 --- a/src/main/java/me/melontini/andromeda/modules/entities/boats/BoatEntities.java +++ b/src/main/java/me/melontini/andromeda/modules/entities/boats/BoatEntities.java @@ -1,11 +1,11 @@ package me.melontini.andromeda.modules.entities.boats; import me.melontini.andromeda.common.registries.Keeper; +import me.melontini.andromeda.common.util.AndromedaPackets; import me.melontini.andromeda.modules.entities.boats.entities.FurnaceBoatEntity; import me.melontini.andromeda.modules.entities.boats.entities.HopperBoatEntity; import me.melontini.andromeda.modules.entities.boats.entities.JukeboxBoatEntity; import me.melontini.andromeda.modules.entities.boats.entities.TNTBoatEntity; -import me.melontini.andromeda.util.AndromedaPackets; import me.melontini.dark_matter.api.base.util.MakeSure; import me.melontini.dark_matter.api.content.RegistryUtil; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; diff --git a/src/main/java/me/melontini/andromeda/modules/entities/boats/entities/JukeboxBoatEntity.java b/src/main/java/me/melontini/andromeda/modules/entities/boats/entities/JukeboxBoatEntity.java index 0940d64e..ee5c36ee 100644 --- a/src/main/java/me/melontini/andromeda/modules/entities/boats/entities/JukeboxBoatEntity.java +++ b/src/main/java/me/melontini/andromeda/modules/entities/boats/entities/JukeboxBoatEntity.java @@ -1,11 +1,11 @@ package me.melontini.andromeda.modules.entities.boats.entities; import me.melontini.andromeda.common.conflicts.CommonRegistries; +import me.melontini.andromeda.common.util.AndromedaPackets; +import me.melontini.andromeda.common.util.ItemStackUtil; import me.melontini.andromeda.modules.entities.boats.BoatEntities; import me.melontini.andromeda.modules.entities.boats.BoatItems; import me.melontini.andromeda.util.AndromedaLog; -import me.melontini.andromeda.util.AndromedaPackets; -import me.melontini.andromeda.util.ItemStackUtil; import net.fabricmc.fabric.api.networking.v1.PacketByteBufs; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.minecraft.entity.Entity; diff --git a/src/main/java/me/melontini/andromeda/modules/entities/boats/entities/TNTBoatEntity.java b/src/main/java/me/melontini/andromeda/modules/entities/boats/entities/TNTBoatEntity.java index d7382509..fb4038a3 100644 --- a/src/main/java/me/melontini/andromeda/modules/entities/boats/entities/TNTBoatEntity.java +++ b/src/main/java/me/melontini/andromeda/modules/entities/boats/entities/TNTBoatEntity.java @@ -1,9 +1,9 @@ package me.melontini.andromeda.modules.entities.boats.entities; import me.melontini.andromeda.common.conflicts.CommonRegistries; +import me.melontini.andromeda.common.util.AndromedaPackets; import me.melontini.andromeda.modules.entities.boats.BoatEntities; import me.melontini.andromeda.modules.entities.boats.BoatItems; -import me.melontini.andromeda.util.AndromedaPackets; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; import net.fabricmc.fabric.api.networking.v1.PacketByteBufs; import net.minecraft.entity.Entity; diff --git a/src/main/java/me/melontini/andromeda/modules/entities/minecarts/entities/JukeboxMinecartEntity.java b/src/main/java/me/melontini/andromeda/modules/entities/minecarts/entities/JukeboxMinecartEntity.java index c8d58490..947b18a8 100644 --- a/src/main/java/me/melontini/andromeda/modules/entities/minecarts/entities/JukeboxMinecartEntity.java +++ b/src/main/java/me/melontini/andromeda/modules/entities/minecarts/entities/JukeboxMinecartEntity.java @@ -1,10 +1,10 @@ package me.melontini.andromeda.modules.entities.minecarts.entities; +import me.melontini.andromeda.common.util.AndromedaPackets; +import me.melontini.andromeda.common.util.ItemStackUtil; import me.melontini.andromeda.modules.entities.minecarts.MinecartEntities; import me.melontini.andromeda.modules.entities.minecarts.MinecartItems; import me.melontini.andromeda.util.AndromedaLog; -import me.melontini.andromeda.util.AndromedaPackets; -import me.melontini.andromeda.util.ItemStackUtil; import net.fabricmc.fabric.api.networking.v1.PacketByteBufs; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.minecraft.block.BlockState; diff --git a/src/main/java/me/melontini/andromeda/modules/entities/villagers_follow_emeralds/VillagerTemptGoal.java b/src/main/java/me/melontini/andromeda/modules/entities/villagers_follow_emeralds/VillagerTemptGoal.java index b8269fe1..cdab4923 100644 --- a/src/main/java/me/melontini/andromeda/modules/entities/villagers_follow_emeralds/VillagerTemptGoal.java +++ b/src/main/java/me/melontini/andromeda/modules/entities/villagers_follow_emeralds/VillagerTemptGoal.java @@ -1,6 +1,6 @@ package me.melontini.andromeda.modules.entities.villagers_follow_emeralds; -import me.melontini.andromeda.util.TagUtil; +import me.melontini.andromeda.common.util.TagUtil; import net.minecraft.entity.ai.brain.Activity; import net.minecraft.entity.ai.goal.TemptGoal; import net.minecraft.entity.passive.VillagerEntity; diff --git a/src/main/java/me/melontini/andromeda/modules/entities/zombie/clean_pickup/PickupTag.java b/src/main/java/me/melontini/andromeda/modules/entities/zombie/clean_pickup/PickupTag.java index 9eafd56d..b8065503 100644 --- a/src/main/java/me/melontini/andromeda/modules/entities/zombie/clean_pickup/PickupTag.java +++ b/src/main/java/me/melontini/andromeda/modules/entities/zombie/clean_pickup/PickupTag.java @@ -1,6 +1,6 @@ package me.melontini.andromeda.modules.entities.zombie.clean_pickup; -import me.melontini.andromeda.util.TagUtil; +import me.melontini.andromeda.common.util.TagUtil; import net.minecraft.item.Item; import net.minecraft.tag.TagKey; diff --git a/src/main/java/me/melontini/andromeda/modules/items/infinite_totem/client/Client.java b/src/main/java/me/melontini/andromeda/modules/items/infinite_totem/client/Client.java index 6dcfb8a1..1daa80ed 100644 --- a/src/main/java/me/melontini/andromeda/modules/items/infinite_totem/client/Client.java +++ b/src/main/java/me/melontini/andromeda/modules/items/infinite_totem/client/Client.java @@ -1,8 +1,8 @@ package me.melontini.andromeda.modules.items.infinite_totem.client; import me.melontini.andromeda.common.conflicts.CommonRegistries; +import me.melontini.andromeda.common.util.AndromedaPackets; import me.melontini.andromeda.modules.items.infinite_totem.Content; -import me.melontini.andromeda.util.AndromedaPackets; import me.melontini.dark_matter.api.base.util.MakeSure; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry; diff --git a/src/main/java/me/melontini/andromeda/modules/items/infinite_totem/mixin/ItemEntityMixin.java b/src/main/java/me/melontini/andromeda/modules/items/infinite_totem/mixin/ItemEntityMixin.java index 0597f335..08dd8d65 100644 --- a/src/main/java/me/melontini/andromeda/modules/items/infinite_totem/mixin/ItemEntityMixin.java +++ b/src/main/java/me/melontini/andromeda/modules/items/infinite_totem/mixin/ItemEntityMixin.java @@ -1,10 +1,10 @@ package me.melontini.andromeda.modules.items.infinite_totem.mixin; import me.melontini.andromeda.base.ModuleManager; +import me.melontini.andromeda.common.util.BlockUtil; +import me.melontini.andromeda.common.util.WorldUtil; import me.melontini.andromeda.modules.items.infinite_totem.Content; import me.melontini.andromeda.modules.items.infinite_totem.InfiniteTotem; -import me.melontini.andromeda.util.BlockUtil; -import me.melontini.andromeda.util.WorldUtil; import me.melontini.dark_matter.api.base.util.classes.Tuple; import net.fabricmc.fabric.api.networking.v1.PacketByteBufs; import net.fabricmc.fabric.api.networking.v1.PlayerLookup; diff --git a/src/main/java/me/melontini/andromeda/modules/items/infinite_totem/mixin/LivingEntityMixin.java b/src/main/java/me/melontini/andromeda/modules/items/infinite_totem/mixin/LivingEntityMixin.java index 4b5ae9e9..a825172d 100644 --- a/src/main/java/me/melontini/andromeda/modules/items/infinite_totem/mixin/LivingEntityMixin.java +++ b/src/main/java/me/melontini/andromeda/modules/items/infinite_totem/mixin/LivingEntityMixin.java @@ -4,8 +4,8 @@ import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.llamalad7.mixinextras.injector.WrapWithCondition; import com.llamalad7.mixinextras.sugar.Local; import me.melontini.andromeda.common.conflicts.CommonRegistries; +import me.melontini.andromeda.common.util.AndromedaPackets; import me.melontini.andromeda.modules.items.infinite_totem.Content; -import me.melontini.andromeda.util.AndromedaPackets; import me.melontini.dark_matter.api.minecraft.world.PlayerUtil; import net.fabricmc.fabric.api.networking.v1.PacketByteBufs; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; diff --git a/src/main/java/me/melontini/andromeda/modules/items/tooltips/mixin/compass/ItemMixin.java b/src/main/java/me/melontini/andromeda/modules/items/tooltips/mixin/compass/ItemMixin.java index b47d1649..1568906f 100644 --- a/src/main/java/me/melontini/andromeda/modules/items/tooltips/mixin/compass/ItemMixin.java +++ b/src/main/java/me/melontini/andromeda/modules/items/tooltips/mixin/compass/ItemMixin.java @@ -1,8 +1,8 @@ package me.melontini.andromeda.modules.items.tooltips.mixin.compass; import me.melontini.andromeda.base.ModuleManager; +import me.melontini.andromeda.common.util.MiscUtil; import me.melontini.andromeda.modules.items.tooltips.Tooltips; -import me.melontini.andromeda.util.MiscUtil; import me.melontini.dark_matter.api.base.util.MathStuff; import me.melontini.dark_matter.api.minecraft.util.TextUtil; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/me/melontini/andromeda/modules/items/tooltips/mixin/recovery_compass/ItemMixin.java b/src/main/java/me/melontini/andromeda/modules/items/tooltips/mixin/recovery_compass/ItemMixin.java index 2cebb56c..72792967 100644 --- a/src/main/java/me/melontini/andromeda/modules/items/tooltips/mixin/recovery_compass/ItemMixin.java +++ b/src/main/java/me/melontini/andromeda/modules/items/tooltips/mixin/recovery_compass/ItemMixin.java @@ -1,8 +1,8 @@ package me.melontini.andromeda.modules.items.tooltips.mixin.recovery_compass; import me.melontini.andromeda.base.ModuleManager; +import me.melontini.andromeda.common.util.MiscUtil; import me.melontini.andromeda.modules.items.tooltips.Tooltips; -import me.melontini.andromeda.util.MiscUtil; import me.melontini.dark_matter.api.base.util.MathStuff; import me.melontini.dark_matter.api.minecraft.util.TextUtil; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/me/melontini/andromeda/modules/mechanics/dragon_fight/EnderDragonManager.java b/src/main/java/me/melontini/andromeda/modules/mechanics/dragon_fight/EnderDragonManager.java index 06610fc7..bd67e264 100644 --- a/src/main/java/me/melontini/andromeda/modules/mechanics/dragon_fight/EnderDragonManager.java +++ b/src/main/java/me/melontini/andromeda/modules/mechanics/dragon_fight/EnderDragonManager.java @@ -1,8 +1,8 @@ package me.melontini.andromeda.modules.mechanics.dragon_fight; import lombok.Getter; +import me.melontini.andromeda.common.util.MiscUtil; import me.melontini.andromeda.util.AndromedaLog; -import me.melontini.andromeda.util.MiscUtil; import me.melontini.dark_matter.api.base.util.MakeSure; import me.melontini.dark_matter.api.minecraft.world.PersistentStateHelper; import me.melontini.dark_matter.api.minecraft.world.interfaces.DeserializableState; diff --git a/src/main/java/me/melontini/andromeda/modules/mechanics/throwable_items/data/BehaviorLoader.java b/src/main/java/me/melontini/andromeda/modules/mechanics/throwable_items/data/BehaviorLoader.java index 73b83cc6..53b65261 100644 --- a/src/main/java/me/melontini/andromeda/modules/mechanics/throwable_items/data/BehaviorLoader.java +++ b/src/main/java/me/melontini/andromeda/modules/mechanics/throwable_items/data/BehaviorLoader.java @@ -2,7 +2,7 @@ package me.melontini.andromeda.modules.mechanics.throwable_items.data; import com.google.gson.Gson; import com.google.gson.JsonObject; -import me.melontini.andromeda.util.JsonDataLoader; +import me.melontini.andromeda.common.util.JsonDataLoader; import me.melontini.dark_matter.api.base.util.EntrypointRunner; import me.melontini.dark_matter.api.base.util.classes.Tuple; import net.minecraft.item.Item; diff --git a/src/main/java/me/melontini/andromeda/modules/mechanics/villager_gifting/GiftTags.java b/src/main/java/me/melontini/andromeda/modules/mechanics/villager_gifting/GiftTags.java index 40e33752..e500fd71 100644 --- a/src/main/java/me/melontini/andromeda/modules/mechanics/villager_gifting/GiftTags.java +++ b/src/main/java/me/melontini/andromeda/modules/mechanics/villager_gifting/GiftTags.java @@ -1,6 +1,6 @@ package me.melontini.andromeda.modules.mechanics.villager_gifting; -import me.melontini.andromeda.util.TagUtil; +import me.melontini.andromeda.common.util.TagUtil; import net.minecraft.item.Item; import net.minecraft.tag.TagKey; diff --git a/src/main/java/me/melontini/andromeda/modules/misc/unknown/RoseOfTheValley.java b/src/main/java/me/melontini/andromeda/modules/misc/unknown/RoseOfTheValley.java index 26adb53c..5c4c0705 100644 --- a/src/main/java/me/melontini/andromeda/modules/misc/unknown/RoseOfTheValley.java +++ b/src/main/java/me/melontini/andromeda/modules/misc/unknown/RoseOfTheValley.java @@ -1,6 +1,6 @@ package me.melontini.andromeda.modules.misc.unknown; -import me.melontini.andromeda.util.AndromedaTexts; +import me.melontini.andromeda.common.util.AndromedaTexts; import me.melontini.dark_matter.api.glitter.ScreenParticleHelper; import net.minecraft.block.Block; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/me/melontini/andromeda/modules/misc/unknown/mixin/wakeup/PlayerEntityMixin.java b/src/main/java/me/melontini/andromeda/modules/misc/unknown/mixin/wakeup/PlayerEntityMixin.java index a9b623d2..88fc994c 100644 --- a/src/main/java/me/melontini/andromeda/modules/misc/unknown/mixin/wakeup/PlayerEntityMixin.java +++ b/src/main/java/me/melontini/andromeda/modules/misc/unknown/mixin/wakeup/PlayerEntityMixin.java @@ -1,6 +1,6 @@ package me.melontini.andromeda.modules.misc.unknown.mixin.wakeup; -import me.melontini.andromeda.util.WorldUtil; +import me.melontini.andromeda.common.util.WorldUtil; import me.melontini.dark_matter.api.minecraft.data.NbtBuilder; import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.decoration.ArmorStandEntity; diff --git a/src/main/java/me/melontini/andromeda/modules/world/crop_temperature/PlantTemperatureData.java b/src/main/java/me/melontini/andromeda/modules/world/crop_temperature/PlantTemperatureData.java index afcdc2ce..e375d724 100644 --- a/src/main/java/me/melontini/andromeda/modules/world/crop_temperature/PlantTemperatureData.java +++ b/src/main/java/me/melontini/andromeda/modules/world/crop_temperature/PlantTemperatureData.java @@ -4,9 +4,9 @@ import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import me.melontini.andromeda.common.conflicts.CommonRegistries; +import me.melontini.andromeda.common.util.JsonDataLoader; import me.melontini.andromeda.util.AndromedaLog; import me.melontini.andromeda.util.Debug; -import me.melontini.andromeda.util.JsonDataLoader; import me.melontini.dark_matter.api.base.util.MakeSure; import me.melontini.dark_matter.api.base.util.Mapper; import me.melontini.dark_matter.api.base.util.MathStuff; diff --git a/src/main/java/me/melontini/andromeda/modules/world/falling_beenests/mixin/BeehiveBlockEntityMixin.java b/src/main/java/me/melontini/andromeda/modules/world/falling_beenests/mixin/BeehiveBlockEntityMixin.java index 44ffb341..3c5783ca 100644 --- a/src/main/java/me/melontini/andromeda/modules/world/falling_beenests/mixin/BeehiveBlockEntityMixin.java +++ b/src/main/java/me/melontini/andromeda/modules/world/falling_beenests/mixin/BeehiveBlockEntityMixin.java @@ -1,7 +1,7 @@ package me.melontini.andromeda.modules.world.falling_beenests.mixin; +import me.melontini.andromeda.common.util.WorldUtil; import me.melontini.andromeda.modules.world.falling_beenests.CanBeeNestsFall; -import me.melontini.andromeda.util.WorldUtil; import net.minecraft.block.AirBlock; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; @@ -20,7 +20,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static me.melontini.andromeda.util.WorldUtil.trySpawnFallingBeeNest; +import static me.melontini.andromeda.common.util.WorldUtil.trySpawnFallingBeeNest; @Mixin(BeehiveBlockEntity.class) abstract class BeehiveBlockEntityMixin extends BlockEntity { diff --git a/src/main/java/me/melontini/andromeda/modules/world/falling_beenests/mixin/FallingBlockMixin.java b/src/main/java/me/melontini/andromeda/modules/world/falling_beenests/mixin/FallingBlockMixin.java index 129935b7..3719fb94 100644 --- a/src/main/java/me/melontini/andromeda/modules/world/falling_beenests/mixin/FallingBlockMixin.java +++ b/src/main/java/me/melontini/andromeda/modules/world/falling_beenests/mixin/FallingBlockMixin.java @@ -1,8 +1,8 @@ package me.melontini.andromeda.modules.world.falling_beenests.mixin; +import me.melontini.andromeda.common.util.ItemStackUtil; +import me.melontini.andromeda.common.util.WorldUtil; import me.melontini.andromeda.modules.world.falling_beenests.CanBeeNestsFall; -import me.melontini.andromeda.util.ItemStackUtil; -import me.melontini.andromeda.util.WorldUtil; import me.melontini.dark_matter.api.base.util.MathStuff; import me.melontini.dark_matter.api.minecraft.world.PlayerUtil; import net.minecraft.block.BlockState; diff --git a/src/main/java/me/melontini/andromeda/modules/world/falling_beenests/mixin/PersistentProjectileEntityMixin.java b/src/main/java/me/melontini/andromeda/modules/world/falling_beenests/mixin/PersistentProjectileEntityMixin.java index c0ea68ca..f380dd73 100644 --- a/src/main/java/me/melontini/andromeda/modules/world/falling_beenests/mixin/PersistentProjectileEntityMixin.java +++ b/src/main/java/me/melontini/andromeda/modules/world/falling_beenests/mixin/PersistentProjectileEntityMixin.java @@ -1,7 +1,7 @@ package me.melontini.andromeda.modules.world.falling_beenests.mixin; +import me.melontini.andromeda.common.util.WorldUtil; import me.melontini.andromeda.modules.world.falling_beenests.CanBeeNestsFall; -import me.melontini.andromeda.util.WorldUtil; import net.minecraft.block.AirBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -22,7 +22,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import static me.melontini.andromeda.util.WorldUtil.trySpawnFallingBeeNest; +import static me.melontini.andromeda.common.util.WorldUtil.trySpawnFallingBeeNest; @Mixin(PersistentProjectileEntity.class) abstract class PersistentProjectileEntityMixin extends ProjectileEntity { diff --git a/src/main/java/me/melontini/andromeda/util/mixin/ErrorHandler.java b/src/main/java/me/melontini/andromeda/util/mixin/ErrorHandler.java index 5b50ba6e..528766ef 100644 --- a/src/main/java/me/melontini/andromeda/util/mixin/ErrorHandler.java +++ b/src/main/java/me/melontini/andromeda/util/mixin/ErrorHandler.java @@ -2,8 +2,8 @@ package me.melontini.andromeda.util.mixin; import lombok.CustomLog; import me.melontini.andromeda.base.ModuleManager; +import me.melontini.andromeda.common.util.CrashHandler; import me.melontini.andromeda.util.AndromedaLog; -import me.melontini.andromeda.util.CrashHandler; import me.melontini.andromeda.util.Debug; import me.melontini.andromeda.util.exceptions.MixinVerifyError; import net.fabricmc.loader.api.FabricLoader; -- 2.51.2