bug: Fixed 1.19.2 compile errors

Wagers-of-Industrial-Warfare · Jul 15, 2024 · f7f6257 · f7f6257
1 parent d388c09
commit f7f6257
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/common/src/main/java/rbasamoyai/ritchiesprojectilelib/projectile_burst/ProjectileBurst.java b/common/src/main/java/rbasamoyai/ritchiesprojectilelib/projectile_burst/ProjectileBurst.java
@@ -6,7 +6,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.DoubleTag;
 import net.minecraft.nbt.ListTag;
@@ -134,7 +133,7 @@ protected void onSubProjectileHit(HitResult result, SubProjectile subProjectile)
 			this.onSubProjectileHitBlock((BlockHitResult) result, subProjectile);
 		}
 		if (type != HitResult.Type.MISS) {
-			this.gameEvent(GameEvent.PROJECTILE_LAND, null, new BlockPos(subProjectile.displacement[0] + this.getX(),
+			this.level.gameEvent(this, GameEvent.PROJECTILE_LAND, new Vec3(subProjectile.displacement[0] + this.getX(),
 				subProjectile.displacement[1] + this.getY(), subProjectile.displacement[2] + this.getZ()));
 		}
 	}

diff --git a/forge/src/main/java/rbasamoyai/ritchiesprojectilelib/forge/ForgeCameraModifier.java b/forge/src/main/java/rbasamoyai/ritchiesprojectilelib/forge/ForgeCameraModifier.java
@@ -1,13 +1,13 @@
 package rbasamoyai.ritchiesprojectilelib.forge;
 
-import net.minecraftforge.client.event.EntityViewRenderEvent.CameraSetup;
+import net.minecraftforge.client.event.ViewportEvent.ComputeCameraAngles;
 import rbasamoyai.ritchiesprojectilelib.effects.CameraModifier;
 
 public class ForgeCameraModifier implements CameraModifier {
 
-    private final CameraSetup cameraSetup;
+    private final ComputeCameraAngles cameraSetup;
 
-    public ForgeCameraModifier(CameraSetup cameraSetup) {
+    public ForgeCameraModifier(ComputeCameraAngles cameraSetup) {
         this.cameraSetup = cameraSetup;
     }
 

diff --git a/forge/src/main/java/rbasamoyai/ritchiesprojectilelib/forge/RPLForgeClient.java b/forge/src/main/java/rbasamoyai/ritchiesprojectilelib/forge/RPLForgeClient.java
@@ -1,7 +1,7 @@
 package rbasamoyai.ritchiesprojectilelib.forge;
 
 import net.minecraft.client.Minecraft;
-import net.minecraftforge.client.event.EntityViewRenderEvent;
+import net.minecraftforge.client.event.ViewportEvent;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
@@ -25,14 +25,14 @@ public static void onClientGameTick(final TickEvent.ClientTickEvent event) {
         }
     }
 
-    public static void onCameraSetup(final EntityViewRenderEvent.CameraSetup event) {
-        if (RPLClient.onCameraSetup(event.getCamera(), (float) event.getPartialTicks(), new ForgeCameraModifier(event)) && event.isCancelable()) {
+    public static void onCameraSetup(final ViewportEvent.ComputeCameraAngles event) {
+        if (RPLClient.onCameraSetup(event.getCamera(), (float) event.getPartialTick(), new ForgeCameraModifier(event)) && event.isCancelable()) {
             event.setCanceled(true);
         }
     }
 
     public static void onPlayerLogOut(final PlayerEvent.PlayerLoggedOutEvent event) {
-        RPLClient.onPlayerLogout(event.getPlayer());
+        RPLClient.onPlayerLogout(event.getEntity());
     }
 
 }