From 868549c99af7cdf126783de9442cc8f5231a3b83 Mon Sep 17 00:00:00 2001 From: Steveplays28 Date: Sun, 21 Jul 2024 01:02:11 +0200 Subject: [PATCH] refactor: Move server-side events into a centralized package Also moved some `extension` and `util` classes and annotated `WorldChunkExtension`'s methods with `@NotNull`. --- .../extension/world/chunk/WorldChunkExtension.java | 6 ++++-- .../client/gui/WorldGenerationProgressTrackerMixin.java | 2 +- .../mixin/client/gui/hud/DebugHudMixin.java | 2 +- .../world/gen/DHBatchGenerationEnvironmentMixin.java | 2 +- .../mixin/entity/FallingBlockEntityMixin.java | 2 +- .../mixin/server/MinecraftServerMixin.java | 2 +- .../mixin/server/WorldGenerationProgressLoggerMixin.java | 2 +- .../mixin/server/network/ServerPlayerEntityMixin.java | 2 +- .../mixin/server/network/SpawnLocatingMixin.java | 2 +- .../mixin/server/world/ServerChunkManagerMixin.java | 8 ++++---- .../mixin/server/world/ServerEntityManagerMixin.java | 2 +- .../mixin/server/world/ServerWorldMixin.java | 7 +++---- .../noisiumchunkmanager/mixin/world/ChunkRegionMixin.java | 2 +- .../noisiumchunkmanager/mixin/world/WorldMixin.java | 2 +- .../mixin/world/chunk/WorldChunkMixin.java | 5 +++-- .../{world/event => event/world}/ServerTickEvent.java | 2 +- .../event => event/world/chunk}/ServerChunkEvent.java | 2 +- .../event => event/world/entity}/ServerEntityEvent.java | 2 +- .../extension/world}/ServerWorldExtension.java | 2 +- .../server/world/ServerWorldChunkManager.java | 2 +- .../server/world/chunk/tick/ServerWorldChunkTicker.java | 2 +- .../server/world/entity/ServerWorldEntityTracker.java | 4 ++-- .../{world/chunk => }/networking/packet/PacketUtil.java | 2 +- 23 files changed, 34 insertions(+), 32 deletions(-) rename common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/{world/event => event/world}/ServerTickEvent.java (86%) rename common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/{world/chunk/event => event/world/chunk}/ServerChunkEvent.java (97%) rename common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/{world/entity/event => event/world/entity}/ServerEntityEvent.java (88%) rename common/src/main/java/io/github/steveplays28/noisiumchunkmanager/{extension/world/server => server/extension/world}/ServerWorldExtension.java (86%) rename common/src/main/java/io/github/steveplays28/noisiumchunkmanager/util/{world/chunk => }/networking/packet/PacketUtil.java (88%) diff --git a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/extension/world/chunk/WorldChunkExtension.java b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/extension/world/chunk/WorldChunkExtension.java index 31e4ad9..4889872 100644 --- a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/extension/world/chunk/WorldChunkExtension.java +++ b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/extension/world/chunk/WorldChunkExtension.java @@ -1,9 +1,11 @@ package io.github.steveplays28.noisiumchunkmanager.extension.world.chunk; +import org.jetbrains.annotations.NotNull; + import java.util.BitSet; public interface WorldChunkExtension { - BitSet noisiumchunkmanager$getBlockLightBits(); + @NotNull BitSet noisiumchunkmanager$getBlockLightBits(); - BitSet noisiumchunkmanager$getSkyLightBits(); + @NotNull BitSet noisiumchunkmanager$getSkyLightBits(); } diff --git a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/client/gui/WorldGenerationProgressTrackerMixin.java b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/client/gui/WorldGenerationProgressTrackerMixin.java index 057fd47..2752d4b 100644 --- a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/client/gui/WorldGenerationProgressTrackerMixin.java +++ b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/client/gui/WorldGenerationProgressTrackerMixin.java @@ -1,6 +1,6 @@ package io.github.steveplays28.noisiumchunkmanager.mixin.client.gui; -import io.github.steveplays28.noisiumchunkmanager.server.world.chunk.event.ServerChunkEvent; +import io.github.steveplays28.noisiumchunkmanager.server.event.world.chunk.ServerChunkEvent; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.gui.WorldGenerationProgressTracker; diff --git a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/client/gui/hud/DebugHudMixin.java b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/client/gui/hud/DebugHudMixin.java index 16a0d52..9891e4e 100644 --- a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/client/gui/hud/DebugHudMixin.java +++ b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/client/gui/hud/DebugHudMixin.java @@ -1,6 +1,6 @@ package io.github.steveplays28.noisiumchunkmanager.mixin.client.gui.hud; -import io.github.steveplays28.noisiumchunkmanager.extension.world.server.ServerWorldExtension; +import io.github.steveplays28.noisiumchunkmanager.server.extension.world.ServerWorldExtension; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.gui.hud.DebugHud; diff --git a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/compat/distanthorizons/common/wrappers/world/gen/DHBatchGenerationEnvironmentMixin.java b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/compat/distanthorizons/common/wrappers/world/gen/DHBatchGenerationEnvironmentMixin.java index 7c32bb1..6c264ac 100644 --- a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/compat/distanthorizons/common/wrappers/world/gen/DHBatchGenerationEnvironmentMixin.java +++ b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/compat/distanthorizons/common/wrappers/world/gen/DHBatchGenerationEnvironmentMixin.java @@ -1,7 +1,7 @@ package io.github.steveplays28.noisiumchunkmanager.mixin.compat.distanthorizons.common.wrappers.world.gen; import com.llamalad7.mixinextras.sugar.Local; -import io.github.steveplays28.noisiumchunkmanager.extension.world.server.ServerWorldExtension; +import io.github.steveplays28.noisiumchunkmanager.server.extension.world.ServerWorldExtension; import loaderCommon.fabric.com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment; import net.minecraft.server.world.ServerWorld; import net.minecraft.server.world.ThreadedAnvilChunkStorage; diff --git a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/entity/FallingBlockEntityMixin.java b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/entity/FallingBlockEntityMixin.java index 4149f04..e7e1284 100644 --- a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/entity/FallingBlockEntityMixin.java +++ b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/entity/FallingBlockEntityMixin.java @@ -1,6 +1,6 @@ package io.github.steveplays28.noisiumchunkmanager.mixin.entity; -import io.github.steveplays28.noisiumchunkmanager.extension.world.server.ServerWorldExtension; +import io.github.steveplays28.noisiumchunkmanager.server.extension.world.ServerWorldExtension; import net.minecraft.entity.Entity; import net.minecraft.entity.FallingBlockEntity; import net.minecraft.network.packet.Packet; diff --git a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/MinecraftServerMixin.java b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/MinecraftServerMixin.java index 779923e..6c107dc 100644 --- a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/MinecraftServerMixin.java +++ b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/MinecraftServerMixin.java @@ -2,7 +2,7 @@ import com.llamalad7.mixinextras.sugar.Local; import io.github.steveplays28.noisiumchunkmanager.config.NoisiumChunkManagerConfig; -import io.github.steveplays28.noisiumchunkmanager.extension.world.server.ServerWorldExtension; +import io.github.steveplays28.noisiumchunkmanager.server.extension.world.ServerWorldExtension; import net.minecraft.server.MinecraftServer; import net.minecraft.server.WorldGenerationProgressListener; import net.minecraft.server.world.ChunkTicketType; diff --git a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/WorldGenerationProgressLoggerMixin.java b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/WorldGenerationProgressLoggerMixin.java index 92aa96b..66f604a 100644 --- a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/WorldGenerationProgressLoggerMixin.java +++ b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/WorldGenerationProgressLoggerMixin.java @@ -1,6 +1,6 @@ package io.github.steveplays28.noisiumchunkmanager.mixin.server; -import io.github.steveplays28.noisiumchunkmanager.server.world.chunk.event.ServerChunkEvent; +import io.github.steveplays28.noisiumchunkmanager.server.event.world.chunk.ServerChunkEvent; import net.minecraft.server.WorldGenerationProgressLogger; import net.minecraft.util.math.ChunkPos; import net.minecraft.world.chunk.ChunkStatus; diff --git a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/network/ServerPlayerEntityMixin.java b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/network/ServerPlayerEntityMixin.java index 572cd44..6f0564f 100644 --- a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/network/ServerPlayerEntityMixin.java +++ b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/network/ServerPlayerEntityMixin.java @@ -3,7 +3,7 @@ import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import com.mojang.authlib.GameProfile; -import io.github.steveplays28.noisiumchunkmanager.extension.world.server.ServerWorldExtension; +import io.github.steveplays28.noisiumchunkmanager.server.extension.world.ServerWorldExtension; import io.github.steveplays28.noisiumchunkmanager.mixin.accessor.server.network.SpawnLocatingAccessor; import io.github.steveplays28.noisiumchunkmanager.server.world.ServerWorldChunkManager; import net.minecraft.entity.player.PlayerEntity; diff --git a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/network/SpawnLocatingMixin.java b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/network/SpawnLocatingMixin.java index b2d913e..f1ec70d 100644 --- a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/network/SpawnLocatingMixin.java +++ b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/network/SpawnLocatingMixin.java @@ -1,6 +1,6 @@ package io.github.steveplays28.noisiumchunkmanager.mixin.server.network; -import io.github.steveplays28.noisiumchunkmanager.extension.world.server.ServerWorldExtension; +import io.github.steveplays28.noisiumchunkmanager.server.extension.world.ServerWorldExtension; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.server.network.SpawnLocating; diff --git a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/world/ServerChunkManagerMixin.java b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/world/ServerChunkManagerMixin.java index 65216b4..5fe9ccb 100644 --- a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/world/ServerChunkManagerMixin.java +++ b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/world/ServerChunkManagerMixin.java @@ -1,12 +1,12 @@ package io.github.steveplays28.noisiumchunkmanager.mixin.server.world; import com.mojang.datafixers.DataFixer; -import io.github.steveplays28.noisiumchunkmanager.extension.world.server.ServerWorldExtension; +import io.github.steveplays28.noisiumchunkmanager.server.extension.world.ServerWorldExtension; import io.github.steveplays28.noisiumchunkmanager.server.event.world.ticket.ServerWorldTicketEvent; import io.github.steveplays28.noisiumchunkmanager.server.world.ServerWorldChunkManager; -import io.github.steveplays28.noisiumchunkmanager.server.world.chunk.event.ServerChunkEvent; -import io.github.steveplays28.noisiumchunkmanager.server.world.event.ServerTickEvent; -import io.github.steveplays28.noisiumchunkmanager.util.world.chunk.networking.packet.PacketUtil; +import io.github.steveplays28.noisiumchunkmanager.server.event.world.chunk.ServerChunkEvent; +import io.github.steveplays28.noisiumchunkmanager.server.event.world.ServerTickEvent; +import io.github.steveplays28.noisiumchunkmanager.util.networking.packet.PacketUtil; import net.minecraft.entity.Entity; import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.s2c.play.BlockUpdateS2CPacket; diff --git a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/world/ServerEntityManagerMixin.java b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/world/ServerEntityManagerMixin.java index 9d6663e..b3f4b90 100644 --- a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/world/ServerEntityManagerMixin.java +++ b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/world/ServerEntityManagerMixin.java @@ -1,6 +1,6 @@ package io.github.steveplays28.noisiumchunkmanager.mixin.server.world; -import io.github.steveplays28.noisiumchunkmanager.server.world.entity.event.ServerEntityEvent; +import io.github.steveplays28.noisiumchunkmanager.server.event.world.entity.ServerEntityEvent; import net.minecraft.entity.Entity; import net.minecraft.server.world.ServerEntityManager; import net.minecraft.world.entity.EntityLike; diff --git a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/world/ServerWorldMixin.java b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/world/ServerWorldMixin.java index 6e4d971..e9a0530 100644 --- a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/world/ServerWorldMixin.java +++ b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/server/world/ServerWorldMixin.java @@ -7,7 +7,7 @@ import io.github.steveplays28.noisiumchunkmanager.server.world.ServerWorldChunkManager; import io.github.steveplays28.noisiumchunkmanager.server.world.chunk.tick.ServerWorldChunkTicker; import io.github.steveplays28.noisiumchunkmanager.server.world.ticket.ServerWorldTicketTracker; -import io.github.steveplays28.noisiumchunkmanager.util.world.chunk.networking.packet.PacketUtil; +import io.github.steveplays28.noisiumchunkmanager.util.networking.packet.PacketUtil; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.network.packet.Packet; @@ -17,7 +17,6 @@ import net.minecraft.server.WorldGenerationProgressListener; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ChunkLevelType; -import net.minecraft.server.world.ServerChunkManager; import net.minecraft.server.world.ServerEntityManager; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; @@ -39,10 +38,10 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import io.github.steveplays28.noisiumchunkmanager.extension.world.server.ServerWorldExtension; +import io.github.steveplays28.noisiumchunkmanager.server.extension.world.ServerWorldExtension; import io.github.steveplays28.noisiumchunkmanager.server.world.entity.ServerWorldEntityTracker; import io.github.steveplays28.noisiumchunkmanager.server.world.entity.player.ServerWorldPlayerChunkLoader; -import io.github.steveplays28.noisiumchunkmanager.server.world.chunk.event.ServerChunkEvent; +import io.github.steveplays28.noisiumchunkmanager.server.event.world.chunk.ServerChunkEvent; import java.util.List; import java.util.concurrent.Executor; diff --git a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/world/ChunkRegionMixin.java b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/world/ChunkRegionMixin.java index 4d67ca6..fdcf848 100644 --- a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/world/ChunkRegionMixin.java +++ b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/world/ChunkRegionMixin.java @@ -1,6 +1,6 @@ package io.github.steveplays28.noisiumchunkmanager.mixin.world; -import io.github.steveplays28.noisiumchunkmanager.extension.world.server.ServerWorldExtension; +import io.github.steveplays28.noisiumchunkmanager.server.extension.world.ServerWorldExtension; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.fluid.FluidState; diff --git a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/world/WorldMixin.java b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/world/WorldMixin.java index 7b86f40..3d63525 100644 --- a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/world/WorldMixin.java +++ b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/world/WorldMixin.java @@ -1,6 +1,6 @@ package io.github.steveplays28.noisiumchunkmanager.mixin.world; -import io.github.steveplays28.noisiumchunkmanager.extension.world.server.ServerWorldExtension; +import io.github.steveplays28.noisiumchunkmanager.server.extension.world.ServerWorldExtension; import net.minecraft.block.BlockState; import net.minecraft.fluid.FluidState; import net.minecraft.util.math.BlockPos; diff --git a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/world/chunk/WorldChunkMixin.java b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/world/chunk/WorldChunkMixin.java index 21c3166..699285e 100644 --- a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/world/chunk/WorldChunkMixin.java +++ b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/mixin/world/chunk/WorldChunkMixin.java @@ -2,6 +2,7 @@ import io.github.steveplays28.noisiumchunkmanager.extension.world.chunk.WorldChunkExtension; import net.minecraft.world.chunk.WorldChunk; +import org.jetbrains.annotations.NotNull; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; @@ -15,12 +16,12 @@ public class WorldChunkMixin implements WorldChunkExtension { private final BitSet noisiumchunkmanager$skyLightBits = new BitSet(); @Override - public BitSet noisiumchunkmanager$getBlockLightBits() { + public @NotNull BitSet noisiumchunkmanager$getBlockLightBits() { return noisiumchunkmanager$blockLightBits; } @Override - public BitSet noisiumchunkmanager$getSkyLightBits() { + public @NotNull BitSet noisiumchunkmanager$getSkyLightBits() { return noisiumchunkmanager$skyLightBits; } } diff --git a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/world/event/ServerTickEvent.java b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/event/world/ServerTickEvent.java similarity index 86% rename from common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/world/event/ServerTickEvent.java rename to common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/event/world/ServerTickEvent.java index 2cbcd06..d35e2cb 100644 --- a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/world/event/ServerTickEvent.java +++ b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/event/world/ServerTickEvent.java @@ -1,4 +1,4 @@ -package io.github.steveplays28.noisiumchunkmanager.server.world.event; +package io.github.steveplays28.noisiumchunkmanager.server.event.world; import dev.architectury.event.Event; import dev.architectury.event.EventFactory; diff --git a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/world/chunk/event/ServerChunkEvent.java b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/event/world/chunk/ServerChunkEvent.java similarity index 97% rename from common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/world/chunk/event/ServerChunkEvent.java rename to common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/event/world/chunk/ServerChunkEvent.java index 548ee02..f1c8b57 100644 --- a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/world/chunk/event/ServerChunkEvent.java +++ b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/event/world/chunk/ServerChunkEvent.java @@ -1,4 +1,4 @@ -package io.github.steveplays28.noisiumchunkmanager.server.world.chunk.event; +package io.github.steveplays28.noisiumchunkmanager.server.event.world.chunk; import dev.architectury.event.Event; import dev.architectury.event.EventFactory; diff --git a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/world/entity/event/ServerEntityEvent.java b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/event/world/entity/ServerEntityEvent.java similarity index 88% rename from common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/world/entity/event/ServerEntityEvent.java rename to common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/event/world/entity/ServerEntityEvent.java index c615015..9592c83 100644 --- a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/world/entity/event/ServerEntityEvent.java +++ b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/event/world/entity/ServerEntityEvent.java @@ -1,4 +1,4 @@ -package io.github.steveplays28.noisiumchunkmanager.server.world.entity.event; +package io.github.steveplays28.noisiumchunkmanager.server.event.world.entity; import dev.architectury.event.Event; import dev.architectury.event.EventFactory; diff --git a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/extension/world/server/ServerWorldExtension.java b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/extension/world/ServerWorldExtension.java similarity index 86% rename from common/src/main/java/io/github/steveplays28/noisiumchunkmanager/extension/world/server/ServerWorldExtension.java rename to common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/extension/world/ServerWorldExtension.java index 4e386f7..d63fb98 100644 --- a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/extension/world/server/ServerWorldExtension.java +++ b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/extension/world/ServerWorldExtension.java @@ -1,4 +1,4 @@ -package io.github.steveplays28.noisiumchunkmanager.extension.world.server; +package io.github.steveplays28.noisiumchunkmanager.server.extension.world; import io.github.steveplays28.noisiumchunkmanager.server.world.ServerWorldChunkManager; import net.minecraft.network.packet.Packet; diff --git a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/world/ServerWorldChunkManager.java b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/world/ServerWorldChunkManager.java index f3c3441..edd0ab2 100644 --- a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/world/ServerWorldChunkManager.java +++ b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/world/ServerWorldChunkManager.java @@ -7,7 +7,7 @@ import io.github.steveplays28.noisiumchunkmanager.NoisiumChunkManager; import io.github.steveplays28.noisiumchunkmanager.config.NoisiumChunkManagerConfig; import io.github.steveplays28.noisiumchunkmanager.extension.world.chunk.WorldChunkExtension; -import io.github.steveplays28.noisiumchunkmanager.server.world.chunk.event.ServerChunkEvent; +import io.github.steveplays28.noisiumchunkmanager.server.event.world.chunk.ServerChunkEvent; import io.github.steveplays28.noisiumchunkmanager.util.world.chunk.ChunkUtil; import io.github.steveplays28.noisiumchunkmanager.mixin.accessor.util.collection.PackedIntegerArrayAccessor; import io.github.steveplays28.noisiumchunkmanager.mixin.accessor.world.gen.chunk.ChunkGeneratorAccessor; diff --git a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/world/chunk/tick/ServerWorldChunkTicker.java b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/world/chunk/tick/ServerWorldChunkTicker.java index 195c6ae..e7f215d 100644 --- a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/world/chunk/tick/ServerWorldChunkTicker.java +++ b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/world/chunk/tick/ServerWorldChunkTicker.java @@ -1,7 +1,7 @@ package io.github.steveplays28.noisiumchunkmanager.server.world.chunk.tick; import dev.architectury.event.events.common.TickEvent; -import io.github.steveplays28.noisiumchunkmanager.server.world.chunk.event.ServerChunkEvent; +import io.github.steveplays28.noisiumchunkmanager.server.event.world.chunk.ServerChunkEvent; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.ChunkPos; import net.minecraft.world.GameRules; diff --git a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/world/entity/ServerWorldEntityTracker.java b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/world/entity/ServerWorldEntityTracker.java index ea3623c..6f19d47 100644 --- a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/world/entity/ServerWorldEntityTracker.java +++ b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/world/entity/ServerWorldEntityTracker.java @@ -2,8 +2,8 @@ import dev.architectury.event.EventResult; import dev.architectury.event.events.common.EntityEvent; -import io.github.steveplays28.noisiumchunkmanager.server.world.entity.event.ServerEntityEvent; -import io.github.steveplays28.noisiumchunkmanager.server.world.event.ServerTickEvent; +import io.github.steveplays28.noisiumchunkmanager.server.event.world.entity.ServerEntityEvent; +import io.github.steveplays28.noisiumchunkmanager.server.event.world.ServerTickEvent; import net.minecraft.entity.Entity; import net.minecraft.network.packet.Packet; import net.minecraft.server.network.EntityTrackerEntry; diff --git a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/util/world/chunk/networking/packet/PacketUtil.java b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/util/networking/packet/PacketUtil.java similarity index 88% rename from common/src/main/java/io/github/steveplays28/noisiumchunkmanager/util/world/chunk/networking/packet/PacketUtil.java rename to common/src/main/java/io/github/steveplays28/noisiumchunkmanager/util/networking/packet/PacketUtil.java index fbdcce5..5bb53da 100644 --- a/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/util/world/chunk/networking/packet/PacketUtil.java +++ b/common/src/main/java/io/github/steveplays28/noisiumchunkmanager/util/networking/packet/PacketUtil.java @@ -1,4 +1,4 @@ -package io.github.steveplays28.noisiumchunkmanager.util.world.chunk.networking.packet; +package io.github.steveplays28.noisiumchunkmanager.util.networking.packet; import net.minecraft.network.packet.Packet; import net.minecraft.server.network.ServerPlayerEntity;