refactor: Move server-side events into a centralized package

Also moved some `extension` and `util` classes and annotated `WorldChunkExtension`'s methods with `@NotNull`.

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();
 }

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
  }
 }

common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/world/event/ServerTickEvent.java → 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;

common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/world/chunk/event/ServerChunkEvent.java → 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;

common/src/main/java/io/github/steveplays28/noisiumchunkmanager/server/world/entity/event/ServerEntityEvent.java → 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;

common/src/main/java/io/github/steveplays28/noisiumchunkmanager/extension/world/server/ServerWorldExtension.java → 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;

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;

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;

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;

common/src/main/java/io/github/steveplays28/noisiumchunkmanager/util/world/chunk/networking/packet/PacketUtil.java → 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;