DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update preprocessor

Browse Source
This commit is contained in:
Jonas Herzig
2024-07-08 15:43:17 +02:00
parent 9f5a8c3d0f
commit 73fe633819
8 changed files with 16 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/replaymod/core/versions/Patterns.java
View File

@@ -47,7 +47,6 @@ import org.lwjgl.opengl.GL11;
//#if MC>=11600
import net.minecraft.client.render.VertexConsumer;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.client.util.math.Vector3f;
import net.minecraft.util.math.Matrix4f;
import net.minecraft.util.math.Quaternion;
@@ -606,20 +605,6 @@ class Patterns {
//#endif
}
// FIXME preprocessor bug: there are mappings for this, not sure why it doesn't remap by itself
//#if MC>=11600
@Pattern
private static Matrix4f getPositionMatrix(MatrixStack.Entry stack) {
//#if MC>=11800
//$$ return stack.getPositionMatrix();
//#else
return stack.getModel();
//#endif
}
//#else
//$$ private static void getPositionMatrix() {}
//#endif
@SuppressWarnings("rawtypes") // preprocessor bug: doesn't work with generics
@Pattern
private static void Futures_addCallback(ListenableFuture future, FutureCallback callback) {

17
src/main/java/com/replaymod/replay/FullReplaySender.java
View File

@@ -403,12 +403,7 @@ public class FullReplaySender extends ChannelInboundHandlerAdapter implements Re
if (mc.world != null) {
for (PlayerEntity playerEntity : mc.world.getPlayers()) {
if (!playerEntity.updateNeeded && playerEntity instanceof OtherClientPlayerEntity) {
// FIXME preprocessor should (and used to) be able to map this
//#if MC>=11400
playerEntity.tickMovement();
//#else
//$$ playerEntity.onLivingUpdate();
//#endif
}
}
}
@@ -1383,11 +1378,7 @@ public class FullReplaySender extends ChannelInboundHandlerAdapter implements Re
//#if MC>=11400
ClientWorld world = mc.world;
ChunkManager chunkProvider = world.getChunkManager();
WorldChunk chunk = chunkProvider.getWorldChunk(x, z
//#if MC<11500
//$$ , false
//#endif
);
WorldChunk chunk = chunkProvider.getWorldChunk(x, z);
if (chunk != null) {
//#else
//$$ World world = mc.world;
@@ -1425,11 +1416,7 @@ public class FullReplaySender extends ChannelInboundHandlerAdapter implements Re
// Entity has left the chunk
chunk.remove(entity, entity.chunkY);
}
WorldChunk newChunk = chunkProvider.getWorldChunk(chunkX, chunkZ
//#if MC<11500
//$$ , false
//#endif
);
WorldChunk newChunk = chunkProvider.getWorldChunk(chunkX, chunkZ);
if (newChunk != null) {
newChunk.addEntity(entity);
} else {