Checkstyle fixes to patchwork-events-lifecycle and patchwork-events-world

Author: coderbot16

patchwork-events-lifecycle/src/main/java/com/patchworkmc/impl/event/lifecycle/LifecycleEvents.java

@@ -19,21 +19,17 @@
 
 package com.patchworkmc.impl.event.lifecycle;
 
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.fml.LogicalSide;
 
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.world.World;
+
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.event.world.WorldTickCallback;
 
 public class LifecycleEvents implements ModInitializer {
-	@Override
-	public void onInitialize() {
-		WorldTickCallback.EVENT.register(world -> fireWorldTickEvent(TickEvent.Phase.END, world));
-	}
-
 	public static void fireWorldTickEvent(TickEvent.Phase phase, World world) {
 		LogicalSide side = world.isClient() ? LogicalSide.CLIENT : LogicalSide.SERVER;
 		TickEvent.WorldTickEvent event = new TickEvent.WorldTickEvent(side, phase, world);
@@ -48,4 +44,9 @@ public static void onPlayerPreTick(PlayerEntity player) {
 	public static void onPlayerPostTick(PlayerEntity player) {
 		MinecraftForge.EVENT_BUS.post(new TickEvent.PlayerTickEvent(TickEvent.Phase.END, player));
 	}
+
+	@Override
+	public void onInitialize() {
+		WorldTickCallback.EVENT.register(world -> fireWorldTickEvent(TickEvent.Phase.END, world));
+	}
 }

patchwork-events-lifecycle/src/main/java/com/patchworkmc/mixin/event/lifecycle/MixinClientWorld.java

@@ -21,20 +21,21 @@
 
 import java.util.function.BooleanSupplier;
 
-import net.minecraft.client.world.ClientWorld;
-import net.minecraft.world.World;
 import net.minecraftforge.event.TickEvent;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.world.World;
+
 import com.patchworkmc.impl.event.lifecycle.LifecycleEvents;
 
 @Mixin(ClientWorld.class)
 public class MixinClientWorld {
 	@Inject(method = "tick", at = @At("HEAD"))
 	private void tick(BooleanSupplier supplier, CallbackInfo callback) {
-		LifecycleEvents.fireWorldTickEvent(TickEvent.Phase.START, (World)(Object)this);
+		LifecycleEvents.fireWorldTickEvent(TickEvent.Phase.START, (World) (Object) this);
 	}
 }

patchwork-events-lifecycle/src/main/java/com/patchworkmc/mixin/event/lifecycle/MixinPlayerEntity.java

@@ -19,23 +19,24 @@
 
 package com.patchworkmc.mixin.event.lifecycle;
 
-import net.minecraft.entity.player.PlayerEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import net.minecraft.entity.player.PlayerEntity;
+
 import com.patchworkmc.impl.event.lifecycle.LifecycleEvents;
 
 @Mixin(PlayerEntity.class)
 public class MixinPlayerEntity {
 	@Inject(method = "tick", at = @At("HEAD"))
 	public void onPlayerPreTick(CallbackInfo callback) {
-		LifecycleEvents.onPlayerPreTick((PlayerEntity)(Object)this);
+		LifecycleEvents.onPlayerPreTick((PlayerEntity) (Object) this);
 	}
 
 	@Inject(method = "tick", at = @At("TAIL"))
 	public void onPlayerPostTick(CallbackInfo callback) {
-		LifecycleEvents.onPlayerPostTick((PlayerEntity)(Object)this);
+		LifecycleEvents.onPlayerPostTick((PlayerEntity) (Object) this);
 	}
 }

patchwork-events-lifecycle/src/main/java/com/patchworkmc/mixin/event/lifecycle/MixinServerWorld.java

@@ -21,20 +21,21 @@
 
 import java.util.function.BooleanSupplier;
 
-import net.minecraft.server.world.ServerWorld;
-import net.minecraft.world.World;
 import net.minecraftforge.event.TickEvent;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.world.World;
+
 import com.patchworkmc.impl.event.lifecycle.LifecycleEvents;
 
 @Mixin(ServerWorld.class)
 public class MixinServerWorld {
 	@Inject(method = "tick", at = @At("HEAD"))
 	private void tick(BooleanSupplier supplier, CallbackInfo callback) {
-		LifecycleEvents.fireWorldTickEvent(TickEvent.Phase.START, (World)(Object)this);
+		LifecycleEvents.fireWorldTickEvent(TickEvent.Phase.START, (World) (Object) this);
 	}
 }

patchwork-events-lifecycle/src/main/java/net/minecraftforge/event/TickEvent.java

@@ -19,11 +19,12 @@
 
 package net.minecraftforge.event;
 
+import net.minecraftforge.eventbus.api.Event;
+import net.minecraftforge.fml.LogicalSide;
+
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.world.World;
-import net.minecraftforge.eventbus.api.Event;
-import net.minecraftforge.fml.LogicalSide;
 
 public class TickEvent extends Event {
 	public final Type type;
@@ -40,6 +41,7 @@ public TickEvent(Type type, LogicalSide side, Phase phase) {
 		this.side = side;
 		this.phase = phase;
 	}
+
 	public enum Type {
 		WORLD, PLAYER, CLIENT, SERVER, RENDER;
 	}

patchwork-events-lifecycle/src/main/resources/patchwork-events-lifecycle.mixins.json

@@ -4,12 +4,12 @@
   "compatibilityLevel": "JAVA_8",
   "mixins": [
     "MixinPlayerEntity",
-  	"MixinServerWorld"
+    "MixinServerWorld"
   ],
   "client": [
     "MixinClientWorld"
   ],
   "injectors": {
-	"defaultRequire": 1
+    "defaultRequire": 1
   }
 }

…MixinServerPlayerInteractionManager.java …MixinServerPlayerInteractionManager.javapatchwork-events-world/src/main/java/com/patchworkmc/mixin/event.world/MixinServerPlayerInteractionManager.java renamed to patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinServerPlayerInteractionManager.java patchwork-events-world/src/main/java/com/patchworkmc/mixin/event.world/MixinServerPlayerInteractionManager.java renamed to patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinServerPlayerInteractionManager.java

@@ -19,6 +19,14 @@
 
 package com.patchworkmc.mixin.event.world;
 
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.world.BlockEvent;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.client.network.packet.BlockEntityUpdateS2CPacket;
@@ -30,13 +38,6 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.EmptyBlockView;
 import net.minecraft.world.GameMode;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.world.BlockEvent;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(ServerPlayerInteractionManager.class)
 public class MixinServerPlayerInteractionManager {
@@ -52,6 +53,7 @@ private void hookBreakBlock(BlockPos pos, CallbackInfoReturnable<Boolean> callba
 		boolean preCancelEvent = false;
 
 		ItemStack itemstack = player.getMainHandStack();
+
 		if (!itemstack.isEmpty() && !itemstack.getItem().canMine(world.getBlockState(pos), world, pos, player)) {
 			preCancelEvent = true;
 		}
@@ -81,6 +83,7 @@ private void hookBreakBlock(BlockPos pos, CallbackInfoReturnable<Boolean> callba
 
 			// Update any block entity data for this block
 			BlockEntity entity = world.getBlockEntity(pos);
+
 			if (entity != null) {
 				BlockEntityUpdateS2CPacket packet = entity.toUpdatePacket();
 
@@ -90,7 +93,7 @@ private void hookBreakBlock(BlockPos pos, CallbackInfoReturnable<Boolean> callba
 			}
 
 			callback.setReturnValue(false);
-		} else if(event.getExpToDrop() != 0) {
+		} else if (event.getExpToDrop() != 0) {
 			// TODO: Drop experience
 			throw new UnsupportedOperationException("Cannot drop exp from a BreakEvent yet");
 		}

…orld/MixinThreadedAnvilChunkStorage.java …orld/MixinThreadedAnvilChunkStorage.javapatchwork-events-world/src/main/java/com/patchworkmc/mixin/event.world/MixinThreadedAnvilChunkStorage.java renamed to patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinThreadedAnvilChunkStorage.java patchwork-events-world/src/main/java/com/patchworkmc/mixin/event.world/MixinThreadedAnvilChunkStorage.java renamed to patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinThreadedAnvilChunkStorage.java

@@ -19,11 +19,6 @@
 
 package com.patchworkmc.mixin.event.world;
 
-import net.minecraft.network.Packet;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.server.world.ServerWorld;
-import net.minecraft.server.world.ThreadedAnvilChunkStorage;
-import net.minecraft.util.math.ChunkPos;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.world.ChunkWatchEvent;
 import org.spongepowered.asm.mixin.Mixin;
@@ -32,14 +27,20 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import net.minecraft.network.Packet;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.server.world.ThreadedAnvilChunkStorage;
+import net.minecraft.util.math.ChunkPos;
+
 @Mixin(ThreadedAnvilChunkStorage.class)
 public class MixinThreadedAnvilChunkStorage {
 	@Shadow
 	private ServerWorld world;
 
 	@Inject(method = "sendWatchPackets", at = @At("HEAD"))
 	private void fireWatchEvents(ServerPlayerEntity player, ChunkPos pos, Packet<?>[] packets, boolean withinMaxWatchDistance, boolean withinViewDistance, CallbackInfo callback) {
-		if(withinViewDistance && !withinMaxWatchDistance) {
+		if (withinViewDistance && !withinMaxWatchDistance) {
 			ChunkWatchEvent.Watch event = new ChunkWatchEvent.Watch(player, pos, world);
 
 			MinecraftForge.EVENT_BUS.post(event);

patchwork-events-world/src/main/java/net/minecraftforge/event/world/BlockEvent.java

@@ -19,12 +19,13 @@
 
 package net.minecraftforge.event.world;
 
+import net.minecraftforge.eventbus.api.Event;
+
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IWorld;
 import net.minecraft.world.World;
-import net.minecraftforge.eventbus.api.Event;
 
 public class BlockEvent extends Event {
 	private final IWorld world;
@@ -55,12 +56,14 @@ public BlockState getState() {
 	}
 
 	/**
-	 * Event that is fired when an Block is about to be broken by a player
-	 * Canceling this event will prevent the Block from being broken.
+	 * This event is fired when an {@link net.minecraft.block.Block} is about to be broken by a player.
+	 *
+	 * <p>This event is cancellable.
+	 * Cancelling this event will prevent the {@link net.minecraft.block.Block} from being broken.</p>
 	 */
 	public static class BreakEvent extends BlockEvent {
 		/**
-		 * Reference to the Player who broke the block. If no player is available, use an EntityFakePlayer
+		 * Reference to the {@link PlayerEntity} who broke the block. If no player is available, use an {@link EntityFakePlayer}
 		 */
 		private final PlayerEntity player;
 		private int exp;
@@ -77,8 +80,10 @@ public BreakEvent(World world, BlockPos pos, BlockState state, PlayerEntity play
 			this.exp = 0;
 
 			// TODO: BlockState#getExpDrop
-			/*if (state == null || !ForgeHooks.canHarvestBlock(state, player, world, pos)) // Handle empty block or player unable to break block scenario
-			{
+
+			/*
+			// Handle empty block or player unable to break block scenario
+			if (state == null || !ForgeHooks.canHarvestBlock(state, player, world, pos)) {
 				this.exp = 0;
 			} else {
 				int bonusLevel = EnchantmentHelper.getLevel(Enchantments.FORTUNE, player.getHeldItemMainhand());
@@ -92,16 +97,16 @@ public PlayerEntity getPlayer() {
 		}
 
 		/**
-		 * Get the experience dropped by the block after the event has processed
+		 * Gets the experience dropped by the block after the event has processed.
 		 *
-		 * @return The experience to drop or 0 if the event was canceled
+		 * @return The experience to drop or 0 if the event was cancelled
 		 */
 		public int getExpToDrop() {
 			return this.isCanceled() ? 0 : exp;
 		}
 
 		/**
-		 * Set the amount of experience dropped by the block after the event has processed
+		 * Sets the amount of experience dropped by the block after the event has processed.
 		 *
 		 * @param exp 1 or higher to drop experience, else nothing will drop
 		 */

patchwork-events-world/src/main/java/net/minecraftforge/event/world/ChunkWatchEvent.java

@@ -19,10 +19,11 @@
 
 package net.minecraftforge.event.world;
 
+import net.minecraftforge.eventbus.api.Event;
+
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.ChunkPos;
-import net.minecraftforge.eventbus.api.Event;
 
 /**
  * ChunkWatchEvent is fired when an event involving a chunk being watched occurs.<br>
@@ -35,8 +36,8 @@
  * The {@link #player}'s world may not be the same as the world of the chunk
  * when the player is teleporting to another dimension.<br>
  * <br>
- * All children of this event are fired on the {@link MinecraftForge#EVENT_BUS}.<br>
- **/
+ * All children of this event are fired on the {@link net.minecraftforge.common.MinecraftForge#EVENT_BUS}.<br>
+ */
 public class ChunkWatchEvent extends Event {
 	private final ServerWorld world;
 	private final ServerPlayerEntity player;
@@ -66,16 +67,17 @@ public ServerWorld getWorld() {
 	}
 
 	/**
-	 * ChunkWatchEvent.Watch is fired when an EntityPlayer begins watching a chunk.<br>
-	 * This event is fired when a chunk is added to the watched chunks of an EntityPlayer in
-	 * {@link net.minecraft.server.world.PlayerChunkWatchingManager#addPlayer(EntityPlayerMP)} and {@link PlayerChunkMapEntry#sendToPlayers()}. <br>
-	 * <br>
-	 * This event is not cancellable.<br>
-	 * <br>
-	 * This event does not have a result.
-	 * <br>
-	 * This event is fired on the {@link MinecraftForge#EVENT_BUS}.<br>
-	 **/
+	 * This event is fired when an EntityPlayer begins watching a chunk.
+	 *
+	 * <p>This event is fired when a {@link ChunkPos} is added to the watched chunks of an {@link ServerPlayerEntity} in
+	 * {@link net.minecraft.server.world.ThreadedAnvilChunkStorage#sendWatchPackets(ServerPlayerEntity, ChunkPos, net.minecraft.network.Packet[], boolean, boolean)}</p>
+	 *
+	 * <p>This event is not cancellable.</p>
+	 *
+	 * <p>This event does not have a result.</p>
+	 *
+	 * <p>This event is fired on the {@link net.minecraftforge.common.MinecraftForge#EVENT_BUS}.</p>
+	 */
 	public static class Watch extends ChunkWatchEvent {
 		// For EventBus
 		public Watch() {
@@ -88,16 +90,17 @@ public Watch(ServerPlayerEntity player, ChunkPos pos, ServerWorld world) {
 	}
 
 	/**
-	 * ChunkWatchEvent.UnWatch is fired when an EntityPlayer stops watching a chunk.<br>
-	 * This event is fired when a chunk is removed from the watched chunks of an EntityPlayer in
-	 * {@link PlayerChunkMapEntry#removePlayer(EntityPlayerMP)}. <br>
-	 * <br>
-	 * This event is not cancellable.<br>
-	 * <br>
-	 * This event does not have a result.<br>
-	 * <br>
-	 * This event is fired on the {@link MinecraftForge#EVENT_BUS}.<br>
-	 **/
+	 * This event is fired when a {@link ServerPlayerEntity} stops watching a chunk.
+	 *
+	 * <p>This event is fired when a {@link ChunkPos} is removed the watched chunks of an {@link ServerPlayerEntity} in
+	 * {@link net.minecraft.server.world.ThreadedAnvilChunkStorage#sendWatchPackets(ServerPlayerEntity, ChunkPos, net.minecraft.network.Packet[], boolean, boolean)}</p>
+	 *
+	 * <p>This event is not cancellable.</p>
+	 *
+	 * <p>This event does not have a result.</p>
+	 *
+	 * <p>This event is fired on the {@link net.minecraftforge.common.MinecraftForge#EVENT_BUS}.</p>
+	 */
 	/* TODO public static class UnWatch extends ChunkWatchEvent {
 		public UnWatch(ServerPlayerEntity player, ChunkPos pos, ServerWorld world) {
 			super(player, pos, world);