R3944Realms/CarryOn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Swear I did fix this

Browse Source
This commit is contained in:
Hanro50 2025-10-15 08:07:18 +02:00
parent eadfba05e8
commit 32db7222b7
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Common/src/main/java/tschipp/carryon/client/render/CarriedObjectRender.java
View File

@ -179,7 +179,7 @@ renderState.submit(matrix, nodeCollector, light, OverlayTexture.NO_OVERLAY, 0);
* @param partialticks * @param partialticks
* @param mat * @param mat
*/ */
public static void drawThirdPerson(float partialticks, Matrix4f mat,SubmitNodeCollector nodeCollector) { public static void drawThirdPerson(float partialticks, Matrix4f mat) {
Minecraft mc = Minecraft.getInstance(); Minecraft mc = Minecraft.getInstance();
Level level = mc.level; Level level = mc.level;
int perspective = CarryRenderHelper.getPerspective(); int perspective = CarryRenderHelper.getPerspective();

11
Forge/src/main/java/tschipp/carryon/events/CommonEvents.java
View File

@ -30,11 +30,9 @@ import net.minecraft.world.entity.Mob;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import net.minecraft.world.level.ServerLevelAccessor; import net.minecraft.world.level.ServerLevelAccessor;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.util.BlockSnapshot; import net.minecraftforge.common.util.BlockSnapshot;
import net.minecraftforge.common.util.Result; import net.minecraftforge.common.util.Result;
import net.minecraftforge.event.*; import net.minecraftforge.event.*;
import net.minecraftforge.event.TickEvent.Phase;
import net.minecraftforge.event.TickEvent.ServerTickEvent; import net.minecraftforge.event.TickEvent.ServerTickEvent;
import net.minecraftforge.event.entity.EntityJoinLevelEvent; import net.minecraftforge.event.entity.EntityJoinLevelEvent;
import net.minecraftforge.event.entity.living.LivingAttackEvent; 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.Priority;
import net.minecraftforge.eventbus.api.listener.SubscribeEvent; import net.minecraftforge.eventbus.api.listener.SubscribeEvent;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import oshi.jna.platform.mac.SystemB;
import tschipp.carryon.CarryOnCommon; import tschipp.carryon.CarryOnCommon;
import tschipp.carryon.Constants; import tschipp.carryon.Constants;
import tschipp.carryon.carry.CarryOnDataCapabilityProvider; import tschipp.carryon.carry.CarryOnDataCapabilityProvider;
@ -74,7 +71,7 @@ public class CommonEvents
Level level = event.getLevel(); Level level = event.getLevel();
BlockPos pos = event.getPos(); BlockPos pos = event.getPos();
if (level.isClientSide) if (level.isClientSide())
return false; return false;
boolean success = false; boolean success = false;
@ -122,7 +119,7 @@ public class CommonEvents
Level level = event.getLevel(); Level level = event.getLevel();
Entity target = event.getTarget(); Entity target = event.getTarget();
if (level.isClientSide) if (level.isClientSide())
return false; return false;
CarryOnData carry = CarryOnDataManager.getCarryData(player); CarryOnData carry = CarryOnDataManager.getCarryData(player);
@ -173,14 +170,14 @@ public class CommonEvents
@SubscribeEvent @SubscribeEvent
public static void onServerTick(ServerTickEvent.Post event) public static void onServerTick(ServerTickEvent.Post event)
{ {
for (ServerPlayer player : event.getServer().getPlayerList().getPlayers()) for (ServerPlayer player : event.server().getPlayerList().getPlayers())
CarryOnCommon.onCarryTick(player); CarryOnCommon.onCarryTick(player);
} }
@SubscribeEvent @SubscribeEvent
public static void onClone(Clone event) public static void onClone(Clone event)
{ {
if (!event.getOriginal().level().isClientSide) { if (!event.getOriginal().level().isClientSide()) {
Player newPlayer = event.getEntity(); Player newPlayer = event.getEntity();
Player oldPlayer = event.getOriginal(); Player oldPlayer = event.getOriginal();
oldPlayer.reviveCaps(); oldPlayer.reviveCaps();

14
Forge/src/main/java/tschipp/carryon/mixin/ParticleEngineMixin.java
View File

@ -37,11 +37,11 @@ public class ParticleEngineMixin
{ {
//I am injecting into a lambda, lord help me //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", // @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", // at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;endBatch()V",
shift = At.Shift.AFTER)) // shift = At.Shift.AFTER))
private void onRenderLevel(Camera p_107340_, float partialTick, MultiBufferSource.BufferSource p_377798_, Frustum frustum, CallbackInfo ci) // private void onRenderLevel(Camera p_107340_, float partialTick, Frustum frustum, CallbackInfo ci)
{ // {
CarriedObjectRender.drawThirdPerson(partialTick, new PoseStack().last().pose()); // CarriedObjectRender.drawThirdPerson(partialTick, new PoseStack().last().pose());
} // }
} }

2
Forge/src/main/java/tschipp/carryon/platform/ForgePlatformHelper.java
View File

@ -129,7 +129,7 @@ public class ForgePlatformHelper implements IPlatformHelper {
public void setCarryData(Player player, CarryOnData data) { public void setCarryData(Player player, CarryOnData data) {
var cap = player.getCapability(CarryOnDataCapabilityProvider.CARRY_ON_DATA_CAPABILITY).orElse(new CarryOnDataCapability()); var cap = player.getCapability(CarryOnDataCapabilityProvider.CARRY_ON_DATA_CAPABILITY).orElse(new CarryOnDataCapability());
cap.setCarryData(data); 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()); sendPacketToAllPlayers(Constants.PACKET_ID_SYNC_SCRIPTS, new ClientboundSyncCarryDataPacket(player.getId(), data), (ServerLevel) player.level());
} }
} }