From c6ad29eef395f1220ec5790059ca6f0894fe8437 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 27 Aug 2023 01:03:17 +0100 Subject: [PATCH] Move MeteorlogicalUtil to the util package --- .../com/minelittlepony/unicopia/entity/SpellbookEntity.java | 2 +- .../unicopia/entity/effect/SunBlindnessStatusEffect.java | 2 +- .../com/minelittlepony/unicopia/entity/player/SpawnLocator.java | 2 ++ .../minelittlepony/unicopia/server/world/WeatherConditions.java | 2 +- .../unicopia/{entity/player => util}/MeteorlogicalUtil.java | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) rename src/main/java/com/minelittlepony/unicopia/{entity/player => util}/MeteorlogicalUtil.java (98%) diff --git a/src/main/java/com/minelittlepony/unicopia/entity/SpellbookEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/SpellbookEntity.java index 47087135..ff07c0a1 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/SpellbookEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/SpellbookEntity.java @@ -7,11 +7,11 @@ import com.minelittlepony.unicopia.USounds; import com.minelittlepony.unicopia.UTags; import com.minelittlepony.unicopia.container.SpellbookScreenHandler; import com.minelittlepony.unicopia.container.SpellbookState; -import com.minelittlepony.unicopia.entity.player.MeteorlogicalUtil; import com.minelittlepony.unicopia.item.UItems; import com.minelittlepony.unicopia.network.Channel; import com.minelittlepony.unicopia.network.MsgSpellbookStateChanged; import com.minelittlepony.unicopia.server.world.Altar; +import com.minelittlepony.unicopia.util.MeteorlogicalUtil; import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory; import net.fabricmc.fabric.api.util.TriState; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/effect/SunBlindnessStatusEffect.java b/src/main/java/com/minelittlepony/unicopia/entity/effect/SunBlindnessStatusEffect.java index 2ef2627d..fbe61222 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/effect/SunBlindnessStatusEffect.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/effect/SunBlindnessStatusEffect.java @@ -6,9 +6,9 @@ import com.minelittlepony.unicopia.EquinePredicates; import com.minelittlepony.unicopia.UTags; import com.minelittlepony.unicopia.entity.Living; import com.minelittlepony.unicopia.entity.damage.UDamageTypes; -import com.minelittlepony.unicopia.entity.player.MeteorlogicalUtil; import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.trinkets.TrinketsDelegate; +import com.minelittlepony.unicopia.util.MeteorlogicalUtil; import net.minecraft.entity.Entity; import net.minecraft.entity.EquipmentSlot; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/SpawnLocator.java b/src/main/java/com/minelittlepony/unicopia/entity/player/SpawnLocator.java index f69e48ac..4c49f017 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/player/SpawnLocator.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/player/SpawnLocator.java @@ -2,6 +2,8 @@ package com.minelittlepony.unicopia.entity.player; import java.util.Optional; +import com.minelittlepony.unicopia.util.MeteorlogicalUtil; + import net.minecraft.entity.ai.FuzzyPositions; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.network.SpawnLocating; diff --git a/src/main/java/com/minelittlepony/unicopia/server/world/WeatherConditions.java b/src/main/java/com/minelittlepony/unicopia/server/world/WeatherConditions.java index 4779e602..a0eff03e 100644 --- a/src/main/java/com/minelittlepony/unicopia/server/world/WeatherConditions.java +++ b/src/main/java/com/minelittlepony/unicopia/server/world/WeatherConditions.java @@ -7,7 +7,7 @@ import java.util.UUID; import com.minelittlepony.unicopia.Unicopia; import com.minelittlepony.unicopia.entity.StormCloudEntity; -import com.minelittlepony.unicopia.entity.player.MeteorlogicalUtil; +import com.minelittlepony.unicopia.util.MeteorlogicalUtil; import com.minelittlepony.unicopia.util.Tickable; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/MeteorlogicalUtil.java b/src/main/java/com/minelittlepony/unicopia/util/MeteorlogicalUtil.java similarity index 98% rename from src/main/java/com/minelittlepony/unicopia/entity/player/MeteorlogicalUtil.java rename to src/main/java/com/minelittlepony/unicopia/util/MeteorlogicalUtil.java index b5d028e2..5a9380fb 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/player/MeteorlogicalUtil.java +++ b/src/main/java/com/minelittlepony/unicopia/util/MeteorlogicalUtil.java @@ -1,4 +1,4 @@ -package com.minelittlepony.unicopia.entity.player; +package com.minelittlepony.unicopia.util; import net.minecraft.entity.Entity; import net.minecraft.util.hit.HitResult.Type;