fix: fix server crashing

Author: Kamefrede

src/main/java/vazkii/psi/client/core/handler/ClientTickHandler.java

@@ -1,6 +1,6 @@
 /*
  * This class is distributed as part of the Psi Mod.
- * Get the Source Code in github:
+ * Get the Source Code in GitHub:
  * https://github.com/Vazkii/Psi
  *
  * Psi is Open Source and distributed under the
@@ -35,47 +35,43 @@ public class ClientTickHandler {
 
 	public ClientTickHandler() {}
 
-	@OnlyIn(Dist.CLIENT)
 	private static void calcDelta() {
 		float oldTotal = total;
 		total = (float) ticksInGame + partialTicks;
 		delta = total - oldTotal;
 	}
 
 	@SubscribeEvent
-	@OnlyIn(Dist.CLIENT)
 	public static void renderTick(RenderFrameEvent.Pre event) {
 		partialTicks = event.getPartialTick().getGameTimeDeltaPartialTick(false);
 
 	}
 
 	@SubscribeEvent
-	@OnlyIn(Dist.CLIENT)
 	public static void renderTick(RenderFrameEvent.Post event) {
 		calcDelta();
 	}
 
 	@SubscribeEvent
 	public static void clientTick(ClientTickEvent.Pre event) {
-
 		Minecraft mc = Minecraft.getInstance();
-
 		boolean pressed = mc.options.keyJump.consumeClick();
+
 		if(mc.player != null && pressed && (!lastJumpKeyState && !mc.player.onGround())) {
 			PsiArmorEvent.post(new PsiArmorEvent(mc.player, PsiArmorEvent.JUMP));
 			MessageRegister.sendToServer(new MessageTriggerJumpSpell());
 		}
+
 		lastJumpKeyState = pressed;
 	}
 
 	@SubscribeEvent
 	public static void clientTick(ClientTickEvent.Post event) {
-
 		Minecraft mc = Minecraft.getInstance();
 
 		HUDHandler.tick();
-
 		Screen gui = mc.screen;
+
 		if(gui == null && KeybindHandler.keybind.isDown()) {
 			KeybindHandler.keyDown();
 		}
@@ -84,6 +80,7 @@ public static void clientTick(ClientTickEvent.Post event) {
 			++ticksInGame;
 			partialTicks = 0.0F;
 		}
+
 		calcDelta();
 	}
 

src/main/java/vazkii/psi/client/core/handler/ColorHandler.java

@@ -1,6 +1,6 @@
 /*
  * This class is distributed as part of the Psi Mod.
- * Get the Source Code in github:
+ * Get the Source Code in GitHub:
  * https://github.com/Vazkii/Psi
  *
  * Psi is Open Source and distributed under the
@@ -9,6 +9,8 @@
 package vazkii.psi.client.core.handler;
 
 import net.minecraft.util.Mth;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.api.distmarker.OnlyIn;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.neoforge.client.event.RegisterColorHandlersEvent;
@@ -20,7 +22,8 @@
 import vazkii.psi.common.item.component.ItemCADColorizer;
 import vazkii.psi.common.lib.LibMisc;
 
-@EventBusSubscriber(modid = LibMisc.MOD_ID)
+@OnlyIn(Dist.CLIENT)
+@EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID)
 public class ColorHandler {
 
 	@SubscribeEvent
@@ -48,14 +51,6 @@ public static int slideColor(int[] color, float speed) {
 		return slideColorTime(color[phase], color[nextPhase], (float) (dt * Math.PI));
 	}
 
-	public static int slideColor(int color, int secondColor, double speed) {
-		return slideColorTime(color, secondColor, (float) (ClientTickHandler.total * speed));
-	}
-
-	public static int pulseColor(int source) {
-		return pulseColor(source, 1f, 0.2f, 24);
-	}
-
 	public static int pulseColor(int source, float speed, int magnitude) {
 		return pulseColor(source, 1f, speed, magnitude);
 	}

src/main/java/vazkii/psi/client/core/handler/HUDHandler.java

@@ -1,6 +1,6 @@
 /*
  * This class is distributed as part of the Psi Mod.
- * Get the Source Code in github:
+ * Get the Source Code in GitHub:
  * https://github.com/Vazkii/Psi
  *
  * Psi is Open Source and distributed under the
@@ -46,7 +46,7 @@
 
 import java.util.regex.Pattern;
 
-@EventBusSubscriber(modid = LibMisc.MOD_ID)
+@EventBusSubscriber(modid = LibMisc.MOD_ID, value = Dist.CLIENT)
 public final class HUDHandler {
 
 	public static final LayeredDraw.Layer SOCKETABLE_EQUIPPED_NAME = (graphics, deltatracker) -> {
@@ -88,21 +88,22 @@ public static void register(RegisterGuiLayersEvent event) {
 	}
 
 	public static void tick() {
-
-		if(remainingTime > 0) {
-			--remainingTime;
+		if(remainingTime < 0) {
+			return;
 		}
+
+		--remainingTime;
 	}
 
 	private static boolean showsBar(PlayerData data, ItemStack stack) {
 		if(stack.isEmpty()) {
 			return false;
-		} else {
-			IPsiBarDisplay display = stack.getCapability(PsiAPI.PSI_BAR_DISPLAY_CAPABILITY);
-			if(display != null)
-				return display.shouldShow(data);
-			return false;
 		}
+
+		IPsiBarDisplay display = stack.getCapability(PsiAPI.PSI_BAR_DISPLAY_CAPABILITY);
+		if(display != null)
+			return display.shouldShow(data);
+		return false;
 	}
 
 	@OnlyIn(Dist.CLIENT)
@@ -250,99 +251,104 @@ public static void drawPsiBar(GuiGraphics graphics, DeltaTracker deltatracker) {
 	@OnlyIn(Dist.CLIENT)
 	private static void renderSocketableEquippedName(GuiGraphics graphics, DeltaTracker deltatracker) {
 		Minecraft mc = Minecraft.getInstance();
+		if(mc.player == null || mc.gui.toolHighlightTimer - 10 <= 0) {
+			return;
+		}
+
 		ItemStack stack = mc.player.getItemInHand(InteractionHand.MAIN_HAND);
 		if(!ISocketable.isSocketable(stack)) {
 			return;
 		}
+
 		String name = ISocketable.getSocketedItemName(stack, "").getString();
 		if(stack.isEmpty() || name.trim().isEmpty()) {
 			return;
 		}
 
-		int ticks = mc.gui.toolHighlightTimer;
-		ticks -= 10;
+		ISocketable socketable = ISocketable.socketable(stack);
+		ItemStack bullet = socketable.getSelectedBullet();
+
+		int ticks = mc.gui.toolHighlightTimer - 10;
+		int alpha = Math.min(255, (int) ((ticks - deltatracker.getGameTimeDeltaPartialTick(false)) * 256.0F / 10.0F));
+		int color = ICADColorizer.DEFAULT_SPELL_COLOR + (alpha << 24);
+		int x = graphics.guiWidth() / 2 - mc.font.width(name) / 2;
+		int y = graphics.guiHeight() - 71;
+		int w = mc.font.width(name);
+		if(mc.player.isCreative()) {
+			y += 14;
+		}
 
-		if(ticks > 0) {
-			ISocketable socketable = ISocketable.socketable(stack);
-			ItemStack bullet = socketable.getSelectedBullet();
+		graphics.drawString(mc.font, name, x, y, color, true);
+		graphics.pose().pushPose();
+		graphics.pose().translate(x + w, y - 6, 0);
+		graphics.pose().scale(alpha / 255F, 1F, 1);
+		graphics.renderFakeItem(bullet, 0, 0);
+		graphics.pose().popPose();
+	}
 
-			int alpha = Math.min(255, (int) ((ticks - deltatracker.getGameTimeDeltaPartialTick(false)) * 256.0F / 10.0F));
-			int color = ICADColorizer.DEFAULT_SPELL_COLOR + (alpha << 24);
+	@OnlyIn(Dist.CLIENT)
+	private static void renderRemainingItems(GuiGraphics graphics, DeltaTracker deltatracker) {
+		if(remainingTime <= 0 || remainingDisplayStack.isEmpty()) {
+			return;
+		}
 
-			int x = graphics.guiWidth() / 2 - mc.font.width(name) / 2;
-			int y = graphics.guiHeight() - 71;
-			if(mc.player.isCreative()) {
-				y += 14;
-			}
+		int pos = maxRemainingTicks - remainingTime;
+		Minecraft mc = Minecraft.getInstance();
+		int remainingLeaveTicks = 20;
+		int x = graphics.guiWidth() / 2 + 10 + Math.max(0, pos - remainingLeaveTicks);
+		int y = graphics.guiHeight() / 2;
 
-			graphics.drawString(mc.font, name, x, y, color, true);
+		int start = maxRemainingTicks - remainingLeaveTicks;
+		float alpha = remainingTime + deltatracker.getGameTimeDeltaPartialTick(false) > start ? 1F : (remainingTime + deltatracker.getGameTimeDeltaPartialTick(false)) / start;
 
-			int w = mc.font.width(name);
-			graphics.pose().pushPose();
-			graphics.pose().translate(x + w, y - 6, 0);
-			graphics.pose().scale(alpha / 255F, 1F, 1);
-			graphics.renderFakeItem(bullet, 0, 0);
-			graphics.pose().popPose();
-		}
-	}
+		RenderSystem.setShaderColor(1F, 1F, 1F, alpha);
+		int xp = x + (int) (16F * (1F - alpha));
+		graphics.pose().pushPose();
+		graphics.pose().translate(xp, y, 0F);
+		graphics.pose().scale(alpha, 1F, 1F);
+		graphics.renderFakeItem(remainingDisplayStack, 0, 0);
+		graphics.pose().scale(1F / alpha, 1F, 1F);
+		graphics.pose().translate(-xp, -y, 0F);
+		RenderSystem.setShaderColor(1F, 1F, 1F, 1F);
 
-	@OnlyIn(Dist.CLIENT)
-	private static void renderRemainingItems(GuiGraphics graphics, DeltaTracker deltatracker) {
-		if(remainingTime > 0 && !remainingDisplayStack.isEmpty()) {
-			int pos = maxRemainingTicks - remainingTime;
-			Minecraft mc = Minecraft.getInstance();
-			int remainingLeaveTicks = 20;
-			int x = graphics.guiWidth() / 2 + 10 + Math.max(0, pos - remainingLeaveTicks);
-			int y = graphics.guiHeight() / 2;
-
-			int start = maxRemainingTicks - remainingLeaveTicks;
-			float alpha = remainingTime + deltatracker.getGameTimeDeltaPartialTick(false) > start ? 1F : (remainingTime + deltatracker.getGameTimeDeltaPartialTick(false)) / start;
-
-			RenderSystem.setShaderColor(1F, 1F, 1F, alpha);
-			int xp = x + (int) (16F * (1F - alpha));
-			graphics.pose().pushPose();
-			graphics.pose().translate(xp, y, 0F);
-			graphics.pose().scale(alpha, 1F, 1F);
-			graphics.renderFakeItem(remainingDisplayStack, 0, 0);
-			graphics.pose().scale(1F / alpha, 1F, 1F);
-			graphics.pose().translate(-xp, -y, 0F);
-			RenderSystem.setShaderColor(1F, 1F, 1F, 1F);
-
-			String text = remainingDisplayStack.getHoverName().plainCopy().withStyle(ChatFormatting.GREEN).getString();
-			if(remainingCount >= 0) {
-				int max = remainingDisplayStack.getMaxStackSize();
-				int stacks = remainingCount / max;
-				int rem = remainingCount % max;
-
-				if(stacks == 0) {
-					text = "" + remainingCount;
-				} else {
-					text = remainingCount + " (" + ChatFormatting.AQUA + stacks + ChatFormatting.RESET + "*"
-							+ ChatFormatting.GRAY + max + ChatFormatting.RESET + "+" + ChatFormatting.YELLOW + rem
-							+ ChatFormatting.RESET + ")";
-				}
-			} else if(remainingCount == -1) {
-				text = "∞";
+		String text = remainingDisplayStack.getHoverName().plainCopy().withStyle(ChatFormatting.GREEN).getString();
+		if(remainingCount >= 0) {
+			int max = remainingDisplayStack.getMaxStackSize();
+			int stacks = remainingCount / max;
+			int rem = remainingCount % max;
+
+			if(stacks == 0) {
+				text = "" + remainingCount;
+			} else {
+				text = remainingCount + " (" + ChatFormatting.AQUA + stacks + ChatFormatting.RESET + "*"
+						+ ChatFormatting.GRAY + max + ChatFormatting.RESET + "+" + ChatFormatting.YELLOW + rem
+						+ ChatFormatting.RESET + ")";
 			}
+		} else if(remainingCount == -1) {
+			text = "∞";
+		}
 
-			int color = 0x00FFFFFF | (int) (alpha * 0xFF) << 24;
-			graphics.drawString(mc.font, text, x + 20, y + 6, color, true);
+		int color = 0x00FFFFFF | (int) (alpha * 0xFF) << 24;
 
-			graphics.pose().popPose();
-		}
+		graphics.drawString(mc.font, text, x + 20, y + 6, color, true);
+		graphics.pose().popPose();
 	}
 
 	@OnlyIn(Dist.CLIENT)
 	private static void renderHUDItem(GuiGraphics graphics, DeltaTracker deltatracker) {
 		Minecraft mc = Minecraft.getInstance();
+		if(mc.player == null) {
+			return;
+		}
+
 		ItemStack stack = mc.player.getMainHandItem();
-		if(!stack.isEmpty() && stack.getItem() instanceof IHUDItem) {
-			((IHUDItem) stack.getItem()).drawHUD(graphics, deltatracker.getGameTimeDeltaPartialTick(false), graphics.guiWidth(), graphics.guiHeight(), stack);
+		if(!stack.isEmpty() && stack.getItem() instanceof IHUDItem hudItem) {
+			hudItem.drawHUD(graphics, deltatracker.getGameTimeDeltaPartialTick(false), graphics.guiWidth(), graphics.guiHeight(), stack);
 		}
 
 		stack = mc.player.getOffhandItem();
-		if(!stack.isEmpty() && stack.getItem() instanceof IHUDItem) {
-			((IHUDItem) stack.getItem()).drawHUD(graphics, deltatracker.getGameTimeDeltaPartialTick(false), graphics.guiWidth(), graphics.guiHeight(), stack);
+		if(!stack.isEmpty() && stack.getItem() instanceof IHUDItem hudItem) {
+			hudItem.drawHUD(graphics, deltatracker.getGameTimeDeltaPartialTick(false), graphics.guiWidth(), graphics.guiHeight(), stack);
 		}
 	}
 
@@ -356,7 +362,11 @@ public static void setRemaining(Player player, ItemStack displayStack, Pattern p
 		int count = 0;
 		for(int i = 0; i < player.getInventory().getContainerSize(); i++) {
 			ItemStack stack = player.getInventory().getItem(i);
-			if(!stack.isEmpty() && (pattern == null ? ItemStack.isSameItem(displayStack, stack) : pattern.matcher(stack.getDescriptionId()).find())) {
+			if(stack.isEmpty()) {
+				continue;
+			}
+
+			if(pattern == null ? ItemStack.isSameItem(displayStack, stack) : pattern.matcher(stack.getDescriptionId()).find()) {
 				count += stack.getCount();
 			}
 		}