fixing more stuff

src/main/java/net/splatcraft/forge/Splatcraft.java

@@ -58,7 +58,7 @@ public Splatcraft() {
         MinecraftForge.EVENT_BUS.register(this);
         MinecraftForge.EVENT_BUS.register(FMLJavaModLoadingContext.get().getModEventBus());
 
-        //addBuiltinPack("classic_weapons", new TextComponent("Splatcraft - Classic Weapons"));
+        //addBuiltinPack("classic_weapons", Component.literal("Splatcraft - Classic Weapons"));
 
     }
 

src/main/java/net/splatcraft/forge/client/gui/SuperJumpSelectorScreen.java

@@ -3,26 +3,21 @@
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture;
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.UUID;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Gui;
-import net.minecraft.client.gui.GuiComponent;
-import net.minecraft.client.gui.spectator.SpectatorMenuItem;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.resources.DefaultPlayerSkin;
+import net.minecraft.core.UUIDUtil;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 import net.splatcraft.forge.client.handlers.JumpLureHudHandler;
 import net.splatcraft.forge.registries.SplatcraftItems;
 
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.UUID;
-
-public class SuperJumpSelectorScreen extends GuiComponent
+public class SuperJumpSelectorScreen
 {
 
 
@@ -32,7 +27,7 @@ public SuperJumpSelectorScreen()
 
 	private static final Minecraft mc = Minecraft.getInstance();
 
-	public void render(PoseStack stack, float partialTicks, JumpLureHudHandler.SuperJumpTargets targets, double scrollDelta)
+	public void render(GuiGraphics graphics, float partialTicks, JumpLureHudHandler.SuperJumpTargets targets, double scrollDelta)
 	{
 
 		ArrayList<UUID> playerUuids = new ArrayList<>(targets.playerTargetUuids);
@@ -42,25 +37,25 @@ public void render(PoseStack stack, float partialTicks, JumpLureHudHandler.Super
 		ArrayList<MenuItem> options = new ArrayList<>(playerUuids.stream().map(uuid -> new PlayerMenuItem(mc.getConnection().getPlayerInfo(uuid).getProfile())).toList());
 
 		if(targets.canTargetSpawn)
-			options.add(0, new ItemStackMenuItem(new ItemStack(SplatcraftItems.spawnPad.get()), new TextComponent("Go to Spawn")));
-		options.add(0, new ItemStackMenuItem(new ItemStack(Items.BARRIER), new TextComponent("Cancel")));
+			options.add(0, new ItemStackMenuItem(new ItemStack(SplatcraftItems.spawnPad.get()), Component.literal("Go to Spawn")));
+		options.add(0, new ItemStackMenuItem(new ItemStack(Items.BARRIER), Component.literal("Cancel")));
 
 		int screenWidth = mc.getWindow().getGuiScaledWidth();
 		int screenHeight = mc.getWindow().getGuiScaledHeight();
 
 		for(int i = -Math.min(entryCount / 2, 4); i <= Math.min(entryCount / 2, 4); i++)
 		{
-			options.get(Math.floorMod((i + index), entryCount)).renderIcon(stack, screenWidth / 2 - 10 + i * 20, 10, partialTicks, 1);
+			options.get(Math.floorMod((i + index), entryCount)).renderIcon(graphics, screenWidth / 2 - 10 + i * 20, 10, partialTicks, 1);
 		}
 
-		drawCenteredString(stack, mc.font, options.get(index).getName(), screenWidth / 2, 32, 0xFFFFFF);
+        graphics.drawCenteredString(mc.font, options.get(index).getName(), screenWidth / 2, 32, 0xFFFFFF);
 
 	}
 
 	interface MenuItem
 	{
 		Component getName();
-		void renderIcon(PoseStack poseStack, int x, int y, float partialTicks, float alpha);
+		void renderIcon(GuiGraphics graphics, int x, int y, float partialTicks, float alpha);
 	}
 
 	static class ItemStackMenuItem implements MenuItem
@@ -80,10 +75,10 @@ public Component getName() {
 		}
 
 		@Override
-		public void renderIcon(PoseStack poseStack, int x, int y, float partialTicks, float alpha)
+		public void renderIcon(GuiGraphics graphics, int x, int y, float partialTicks, float alpha)
 		{
 			RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, alpha);
-			mc.getItemRenderer().renderGuiItem(this.stack, x, y);
+			graphics.renderItem(this.stack, x, y);
 			RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1);
 		}
 	}
@@ -101,10 +96,10 @@ public PlayerMenuItem(GameProfile profile) {
 			if (map.containsKey(MinecraftProfileTexture.Type.SKIN)) {
 				this.location = minecraft.getSkinManager().registerTexture(map.get(MinecraftProfileTexture.Type.SKIN), MinecraftProfileTexture.Type.SKIN);
 			} else {
-				this.location = DefaultPlayerSkin.getDefaultSkin(Player.createPlayerUUID(profile));
+				this.location = DefaultPlayerSkin.getDefaultSkin(UUIDUtil.getOrCreatePlayerUUID(profile));
 			}
 
-			this.name = new TextComponent(profile.getName());
+			this.name = Component.literal(profile.getName());
 		}
 
 		@Override
@@ -113,12 +108,11 @@ public Component getName() {
 		}
 
 		@Override
-		public void renderIcon(PoseStack poseStack, int x, int y, float partialTicks, float alpha)
+		public void renderIcon(GuiGraphics graphics, int x, int y, float partialTicks, float alpha)
 		{
-			RenderSystem.setShaderTexture(0, this.location);
 			RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, alpha);
-			GuiComponent.blit(poseStack, x, y, 16, 16, 8.0F, 8.0F, 8, 8, 64, 64);
-			GuiComponent.blit(poseStack, x, y, 16, 16, 40.0F, 8.0F, 8, 8, 64, 64);
+            graphics.blit(location, x, y, 16, 16, 8.0F, 8.0F, 8, 8, 64, 64);
+            graphics.blit(location, x, y, 16, 16, 40.0F, 8.0F, 8, 8, 64, 64);
 			RenderSystem.setShaderColor(1, 1, 1, 1);
 		}
 	}

src/main/java/net/splatcraft/forge/client/gui/WeaponWorkbenchScreen.java

@@ -430,7 +430,7 @@ protected void renderLabels(PoseStack matrixStack, int mouseX, int mouseY)
     }
 
     protected static Component getDisplayName(ItemStack stack) {
-        MutableComponent iformattabletextcomponent = (new TextComponent("")).append(stack.getHoverName());
+        MutableComponent iformattabletextcomponent = (Component.literal("")).append(stack.getHoverName());
         if (stack.hasCustomHoverName())
             iformattabletextcomponent.withStyle(ChatFormatting.ITALIC);
 

src/main/java/net/splatcraft/forge/client/gui/stagepad/StageActionsScreen.java

@@ -3,6 +3,7 @@
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.core.BlockPos;
@@ -55,22 +56,24 @@ public void onStagesUpdate()
 	}
 
 	@Override
-	public void handleWidgets(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) {
+	public void handleWidgets(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
 
 	}
 
 	@Override
-	public void renderBackground(PoseStack poseStack)
+	public void renderBackground(GuiGraphics graphics)
 	{
-		super.renderBackground(poseStack);
+		super.renderBackground(graphics);
 
 		RenderSystem.setShaderColor(1, 1, 1, 1);
 		RenderSystem.setShaderTexture(0, TEXTURES);
 
 		int x = (width - imageWidth) / 2;
 		int y = (height - imageHeight) / 2;
 
-		blit(poseStack, x, y, 0, 0, imageWidth, imageHeight);
+        graphics.blitNineSliced();
+
+		graphics.blit(TEXTURES, x, y, 0, 0, imageWidth, imageHeight);
 
 	}
 }

src/main/java/net/splatcraft/forge/client/gui/stagepad/StageCreationScreen.java

@@ -78,7 +78,7 @@ public StageCreationScreen(Component label, @Nullable Screen parent, String save
 		{
 			if(canCreate())
 			{
-				SplatcraftPacketHandler.sendToServer(new CreateOrEditStagePacket(stageId, new TextComponent(this.stageName.getValue()), corner1, corner2, dimension));
+				SplatcraftPacketHandler.sendToServer(new CreateOrEditStagePacket(stageId, Component.literal(this.stageName.getValue()), corner1, corner2, dimension));
 
 				buttons.forEach(button -> button.active = false);
 				this.stageName.setFocus(false);

src/main/java/net/splatcraft/forge/client/gui/stagepad/StageRulesScreen.java

@@ -169,7 +169,7 @@ public RuleNameLabel(GameRules.Key<GameRules.BooleanValue> rule)
 
 				ArrayList<FormattedCharSequence> lines = new ArrayList<>(font.split(Component.translatable(rule.getDescriptionId()), 150));
 
-				lines.add(new TextComponent(rule.getId().replace(Splatcraft.MODID + ".", "")).withStyle(ChatFormatting.YELLOW).getVisualOrderText());
+				lines.add(Component.literal(rule.getId().replace(Splatcraft.MODID + ".", "")).withStyle(ChatFormatting.YELLOW).getVisualOrderText());
 
 				String descriptionKey = rule.getDescriptionId() + ".description";
 

src/main/java/net/splatcraft/forge/client/gui/stagepad/StageSettingsScreen.java

@@ -130,7 +130,7 @@ public void removed()
 	private void saveChanges()
 	{
 		if(!stage.getStageName().toString().equals(stageName.getValue()))
-			SplatcraftPacketHandler.sendToServer(new CreateOrEditStagePacket(stage.id, new TextComponent(stageName.getValue()), stage.cornerA, stage.cornerB, stage.dimID));
+			SplatcraftPacketHandler.sendToServer(new CreateOrEditStagePacket(stage.id, Component.literal(stageName.getValue()), stage.cornerA, stage.cornerB, stage.dimID));
 	}
 
 	@Override

src/main/java/net/splatcraft/forge/client/handlers/ClientSetupHandler.java

@@ -7,17 +7,14 @@
 import net.minecraft.client.color.item.ItemColors;
 import net.minecraft.client.gui.screens.MenuScreens;
 import net.minecraft.core.BlockPos;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.inventory.InventoryMenu;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.ColorHandlerEvent;
-import net.minecraftforge.client.event.TextureStitchEvent;
+import net.minecraftforge.client.event.RegisterColorHandlersEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.splatcraft.forge.Splatcraft;
@@ -26,7 +23,6 @@
 import net.splatcraft.forge.client.gui.WeaponWorkbenchScreen;
 import net.splatcraft.forge.data.SplatcraftTags;
 import net.splatcraft.forge.data.capabilities.playerinfo.PlayerInfoCapability;
-import net.splatcraft.forge.items.SquidBumperItem;
 import net.splatcraft.forge.registries.SplatcraftBlocks;
 import net.splatcraft.forge.registries.SplatcraftItems;
 import net.splatcraft.forge.registries.SplatcraftTileEntities;
@@ -38,6 +34,7 @@
 public class ClientSetupHandler
 {
 
+    /*
     @SubscribeEvent
     public static void onTextureStitch(TextureStitchEvent.Pre event)
     {
@@ -57,6 +54,7 @@ public static void onTextureStitch(TextureStitchEvent.Pre event)
         while(Minecraft.getInstance().getResourceManager().hasResource(new ResourceLocation(Splatcraft.MODID, "textures/blocks/glitter"+i+".png")))
             event.addSprite(new ResourceLocation(Splatcraft.MODID, "blocks/glitter"+(i++)));
     }
+    */
 
     public static void bindScreenContainers()
     {
@@ -66,7 +64,8 @@ public static void bindScreenContainers()
 
 
     @SubscribeEvent
-    public static void initItemColors(ColorHandlerEvent.Item event) {
+    public static void initItemColors(RegisterColorHandlersEvent.Item event)
+    {
         ItemColors colors = event.getItemColors();
 
         SplatcraftItems.inkColoredItems.add(SplatcraftItems.splatfestBand.get());
@@ -77,7 +76,7 @@ public static void initItemColors(ColorHandlerEvent.Item event) {
     }
 
     @SubscribeEvent
-    public static void initBlockColors(ColorHandlerEvent.Block event)
+    public static void initBlockColors(RegisterColorHandlersEvent.Block event)
     {
         BlockColors colors = event.getBlockColors();
 

src/main/java/net/splatcraft/forge/client/handlers/GuiOverlayHandler.java

@@ -0,0 +1,17 @@
+package net.splatcraft.forge.client.handlers;
+
+import net.minecraftforge.client.event.RegisterGuiOverlaysEvent;
+import net.minecraftforge.client.gui.overlay.VanillaGuiOverlay;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
+
+@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD)
+public class GuiOverlayHandler
+{
+    @SubscribeEvent
+    public static void registerGuiOverlays(RegisterGuiOverlaysEvent event)
+    {
+        event.registerAbove(VanillaGuiOverlay.CROSSHAIR.id(), "splatcraft_overlay", RendererHandler::renderGui);
+        event.registerAbove(VanillaGuiOverlay.HOTBAR.id(), "splatcraft_jump_lure", JumpLureHudHandler::renderGui);
+    }
+}

src/main/java/net/splatcraft/forge/client/handlers/JumpLureHudHandler.java

@@ -1,12 +1,15 @@
 package net.splatcraft.forge.client.handlers;
 
+import java.util.ArrayList;
+import java.util.UUID;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.event.InputEvent;
-import net.minecraftforge.client.event.RenderGameOverlayEvent;
+import net.minecraftforge.client.gui.overlay.ForgeGui;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
@@ -16,9 +19,6 @@
 import net.splatcraft.forge.network.c2s.UseJumpLurePacket;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
-import java.util.UUID;
-
 @OnlyIn(Dist.CLIENT)
 @Mod.EventBusSubscriber(Dist.CLIENT)
 public class JumpLureHudHandler
@@ -29,21 +29,20 @@ public class JumpLureHudHandler
 
 	private static final SuperJumpSelectorScreen selectorGui = new SuperJumpSelectorScreen();
 
-	@SubscribeEvent
-	public static void renderGui(RenderGameOverlayEvent.Pre event)
+	public static void renderGui(ForgeGui gui, GuiGraphics guiGraphics, float partialTick, int screenWidth, int screenHeight)
 	{
 		LocalPlayer player = Minecraft.getInstance().player;
 
-		if(!event.getType().equals(RenderGameOverlayEvent.ElementType.LAYER) || player == null ||
+		if(player == null ||
 		!(player.getUseItem().getItem() instanceof JumpLureItem) || targets == null)
 			return;
 
-		selectorGui.render(event.getMatrixStack(), event.getPartialTicks(), targets, scrollDelta);
+		selectorGui.render(guiGraphics, partialTick, targets, scrollDelta);
 	}
 
 
 	@SubscribeEvent
-	public static void onMouseScroll(InputEvent.MouseScrollEvent event)
+	public static void onMouseScroll(InputEvent.MouseScrollingEvent event)
 	{
 		LocalPlayer player = Minecraft.getInstance().player;
 		if(player == null)

src/main/java/net/splatcraft/forge/client/handlers/PlayerMovementHandler.java

@@ -1,5 +1,6 @@
 package net.splatcraft.forge.client.handlers;
 
+import java.util.UUID;
 import net.minecraft.client.player.Input;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.world.effect.MobEffects;
@@ -23,8 +24,6 @@
 import net.splatcraft.forge.util.InkBlockUtils;
 import net.splatcraft.forge.util.PlayerCooldown;
 
-import java.util.UUID;
-
 
 @Mod.EventBusSubscriber(value = Dist.CLIENT)
 public class PlayerMovementHandler
@@ -79,7 +78,7 @@ else if(useStack.isEmpty())
 
         if (PlayerInfoCapability.isSquid(player))
         {
-            if (InkBlockUtils.canSquidSwim(player) && !speedAttribute.hasModifier(INK_SWIM_SPEED) && player.isOnGround())
+            if (InkBlockUtils.canSquidSwim(player) && !speedAttribute.hasModifier(INK_SWIM_SPEED) && player.onGround())
                 speedAttribute.addTransientModifier(INK_SWIM_SPEED);
             if (!swimAttribute.hasModifier(SQUID_SWIM_SPEED))
                 swimAttribute.addTransientModifier(SQUID_SWIM_SPEED);
@@ -94,7 +93,7 @@ else if(useStack.isEmpty())
         if (!player.getAbilities().flying)
         {
             if (speedAttribute.hasModifier(INK_SWIM_SPEED))
-                player.moveRelative((float) player.getAttributeValue(SplatcraftAttributes.inkSwimSpeed.get()) * (player.isOnGround() ? 1 : 0.75f), new Vec3(player.xxa, 0.0f, player.zza).normalize());
+                player.moveRelative((float) player.getAttributeValue(SplatcraftAttributes.inkSwimSpeed.get()) * (player.onGround() ? 1 : 0.75f), new Vec3(player.xxa, 0.0f, player.zza).normalize());
 
         }
     }
@@ -104,7 +103,7 @@ public static void onInputUpdate(net.minecraftforge.client.event.MovementInputUp
     {
 
         Input input = event.getInput();
-        Player player = event.getPlayer();
+        Player player = event.getEntity();
 
         float speedMod = !input.shiftKeyDown ? PlayerInfoCapability.isSquid(player) && InkBlockUtils.canSquidHide(player) ? 30f : 2f : 1f;
 

src/main/java/net/splatcraft/forge/client/handlers/RendererHandler.java

@@ -361,7 +361,7 @@ public static void renderNameplate(RenderNameplateEvent event)
 
     public static Component getDisplayName(PlayerInfo info)
     {
-        return info.getTabListDisplayName() != null ? info.getTabListDisplayName().copy() : PlayerTeam.formatNameForTeam(info.getTeam(), new TextComponent(info.getProfile().getName()));
+        return info.getTabListDisplayName() != null ? info.getTabListDisplayName().copy() : PlayerTeam.formatNameForTeam(info.getTeam(), Component.literal(info.getProfile().getName()));
     }