diff --git a/Common/src/main/java/tschipp/carryon/client/render/CarriedObjectRender.java b/Common/src/main/java/tschipp/carryon/client/render/CarriedObjectRender.java index 44a3353..3114a16 100644 --- a/Common/src/main/java/tschipp/carryon/client/render/CarriedObjectRender.java +++ b/Common/src/main/java/tschipp/carryon/client/render/CarriedObjectRender.java @@ -179,7 +179,7 @@ renderState.submit(matrix, nodeCollector, light, OverlayTexture.NO_OVERLAY, 0); * @param partialticks * @param mat */ - public static void drawThirdPerson(float partialticks, Matrix4f mat,SubmitNodeCollector nodeCollector) { + public static void drawThirdPerson(float partialticks, Matrix4f mat) { Minecraft mc = Minecraft.getInstance(); Level level = mc.level; int perspective = CarryRenderHelper.getPerspective(); diff --git a/Forge/src/main/java/tschipp/carryon/events/CommonEvents.java b/Forge/src/main/java/tschipp/carryon/events/CommonEvents.java index b91d5f9..063aa45 100644 --- a/Forge/src/main/java/tschipp/carryon/events/CommonEvents.java +++ b/Forge/src/main/java/tschipp/carryon/events/CommonEvents.java @@ -30,11 +30,9 @@ import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; import net.minecraft.world.level.ServerLevelAccessor; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.BlockSnapshot; import net.minecraftforge.common.util.Result; import net.minecraftforge.event.*; -import net.minecraftforge.event.TickEvent.Phase; import net.minecraftforge.event.TickEvent.ServerTickEvent; import net.minecraftforge.event.entity.EntityJoinLevelEvent; import net.minecraftforge.event.entity.living.LivingAttackEvent; @@ -50,7 +48,6 @@ import net.minecraftforge.event.level.BlockEvent.EntityPlaceEvent; import net.minecraftforge.eventbus.api.listener.Priority; import net.minecraftforge.eventbus.api.listener.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import oshi.jna.platform.mac.SystemB; import tschipp.carryon.CarryOnCommon; import tschipp.carryon.Constants; import tschipp.carryon.carry.CarryOnDataCapabilityProvider; @@ -74,7 +71,7 @@ public class CommonEvents Level level = event.getLevel(); BlockPos pos = event.getPos(); - if (level.isClientSide) + if (level.isClientSide()) return false; boolean success = false; @@ -122,7 +119,7 @@ public class CommonEvents Level level = event.getLevel(); Entity target = event.getTarget(); - if (level.isClientSide) + if (level.isClientSide()) return false; CarryOnData carry = CarryOnDataManager.getCarryData(player); @@ -173,14 +170,14 @@ public class CommonEvents @SubscribeEvent public static void onServerTick(ServerTickEvent.Post event) { - for (ServerPlayer player : event.getServer().getPlayerList().getPlayers()) + for (ServerPlayer player : event.server().getPlayerList().getPlayers()) CarryOnCommon.onCarryTick(player); } @SubscribeEvent public static void onClone(Clone event) { - if (!event.getOriginal().level().isClientSide) { + if (!event.getOriginal().level().isClientSide()) { Player newPlayer = event.getEntity(); Player oldPlayer = event.getOriginal(); oldPlayer.reviveCaps(); diff --git a/Forge/src/main/java/tschipp/carryon/mixin/ParticleEngineMixin.java b/Forge/src/main/java/tschipp/carryon/mixin/ParticleEngineMixin.java index 44632dc..8eb29fd 100644 --- a/Forge/src/main/java/tschipp/carryon/mixin/ParticleEngineMixin.java +++ b/Forge/src/main/java/tschipp/carryon/mixin/ParticleEngineMixin.java @@ -37,11 +37,11 @@ public class ParticleEngineMixin { //I am injecting into a lambda, lord help me - @Inject(method = "render(Lnet/minecraft/client/Camera;FLnet/minecraft/client/renderer/MultiBufferSource$BufferSource;Lnet/minecraft/client/renderer/culling/Frustum;)V", - at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;endBatch()V", - shift = At.Shift.AFTER)) - private void onRenderLevel(Camera p_107340_, float partialTick, MultiBufferSource.BufferSource p_377798_, Frustum frustum, CallbackInfo ci) - { - CarriedObjectRender.drawThirdPerson(partialTick, new PoseStack().last().pose()); - } + // @Inject(method = "render(Lnet/minecraft/client/Camera;FLnet/minecraft/client/renderer/MultiBufferSource$BufferSource;Lnet/minecraft/client/renderer/culling/Frustum;)V", + // at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;endBatch()V", + // shift = At.Shift.AFTER)) + // private void onRenderLevel(Camera p_107340_, float partialTick, Frustum frustum, CallbackInfo ci) + // { + // CarriedObjectRender.drawThirdPerson(partialTick, new PoseStack().last().pose()); + // } } diff --git a/Forge/src/main/java/tschipp/carryon/platform/ForgePlatformHelper.java b/Forge/src/main/java/tschipp/carryon/platform/ForgePlatformHelper.java index 54d6fbd..bb522eb 100644 --- a/Forge/src/main/java/tschipp/carryon/platform/ForgePlatformHelper.java +++ b/Forge/src/main/java/tschipp/carryon/platform/ForgePlatformHelper.java @@ -129,7 +129,7 @@ public class ForgePlatformHelper implements IPlatformHelper { public void setCarryData(Player player, CarryOnData data) { var cap = player.getCapability(CarryOnDataCapabilityProvider.CARRY_ON_DATA_CAPABILITY).orElse(new CarryOnDataCapability()); cap.setCarryData(data); - if(!player.level().isClientSide) { + if(!player.level().isClientSide()) { sendPacketToAllPlayers(Constants.PACKET_ID_SYNC_SCRIPTS, new ClientboundSyncCarryDataPacket(player.getId(), data), (ServerLevel) player.level()); } }