Skip to content

Commit 6d7aa62

Browse files
committed
Make Chunk.read mixin client-side only
1 parent 71405b7 commit 6d7aa62

File tree

3 files changed

+21
-11
lines changed

3 files changed

+21
-11
lines changed

src/main/java/org/dimdev/jeid/mixin/core/MixinChunk.java

-10
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package org.dimdev.jeid.mixin.core;
22

3-
import io.netty.buffer.ByteBuf;
43
import net.minecraft.init.Biomes;
5-
import net.minecraft.network.PacketBuffer;
64
import net.minecraft.util.math.BlockPos;
75
import net.minecraft.world.biome.Biome;
86
import net.minecraft.world.biome.BiomeProvider;
@@ -11,8 +9,6 @@
119
import org.dimdev.jeid.JEID;
1210
import org.spongepowered.asm.mixin.Mixin;
1311
import org.spongepowered.asm.mixin.Overwrite;
14-
import org.spongepowered.asm.mixin.injection.At;
15-
import org.spongepowered.asm.mixin.injection.Redirect;
1612

1713
import java.util.Arrays;
1814

@@ -44,12 +40,6 @@ public byte[] getBiomeArray() {
4440
return arr;
4541
}
4642

47-
@Redirect(method = "read", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/PacketBuffer;readBytes([B)Lio/netty/buffer/ByteBuf;", ordinal = 2))
48-
public ByteBuf readBiomeByteArray(PacketBuffer buf, byte[] dst) {
49-
setIntBiomeArray(buf.readVarIntArray());
50-
return buf;
51-
}
52-
5343
@Overwrite
5444
public Biome getBiome(BlockPos pos, BiomeProvider provider) {
5545
int x = pos.getX() & 15;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package org.dimdev.jeid.mixin.core.client;
2+
3+
import io.netty.buffer.ByteBuf;
4+
import net.minecraft.network.PacketBuffer;
5+
import net.minecraft.world.chunk.Chunk;
6+
import org.dimdev.jeid.INewChunk;
7+
import org.spongepowered.asm.mixin.Mixin;
8+
import org.spongepowered.asm.mixin.injection.At;
9+
import org.spongepowered.asm.mixin.injection.Redirect;
10+
11+
@Mixin(Chunk.class)
12+
public abstract class MixinChunk implements INewChunk {
13+
@Redirect(method = "read", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/PacketBuffer;readBytes([B)Lio/netty/buffer/ByteBuf;", ordinal = 2))
14+
private ByteBuf readBiomeByteArray(PacketBuffer buf, byte[] dst) {
15+
setIntBiomeArray(buf.readVarIntArray());
16+
return buf;
17+
}
18+
}

src/main/resources/mixins.jeid.core.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
"MixinChunkPrimer",
1818
"MixinChunkProviderServer"
1919
],
20-
"client": [],
20+
"client": [
21+
"client.MixinChunk"
22+
],
2123
"injectors": {
2224
"maxShiftBy": 10
2325
}

0 commit comments

Comments
 (0)