mirror of
https://github.com/GTMEGA/EndlessIDs.git
synced 2026-11-17 22:45:04 +00:00
eid$ prefix for SubChunkBlockHook
This commit is contained in:
7 files changed
+129
-114
No files matched your search
@@ -27,7 +27,6 @@ import com.falsepattern.chunk.api.ArrayUtil;
|
||||
import com.falsepattern.chunk.api.DataManager;
|
||||
import com.falsepattern.endlessids.Tags;
|
||||
import com.falsepattern.endlessids.mixin.helpers.SubChunkBlockHook;
|
||||
import com.falsepattern.endlessids.util.DataUtil;
|
||||
import lombok.val;
|
||||
import lombok.var;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
@@ -73,24 +72,24 @@ public class BlockIDManager implements DataManager.PacketDataManager, DataManage
|
||||
}
|
||||
val subChunk = (SubChunkBlockHook) subChunkList[i];
|
||||
|
||||
storageFlags |= subChunk.getBlockMask() << (i * 2);
|
||||
storageFlags |= subChunk.eid$getBlockMask() << (i * 2);
|
||||
|
||||
val b1 = subChunk.getB1();
|
||||
val b1 = subChunk.eid$getB1();
|
||||
data.put(b1);
|
||||
|
||||
val b2Low = subChunk.getB2Low();
|
||||
val b2Low = subChunk.eid$getB2Low();
|
||||
if (b2Low == null) {
|
||||
continue;
|
||||
}
|
||||
data.put(b2Low.data);
|
||||
|
||||
val b2High = subChunk.getB2High();
|
||||
val b2High = subChunk.eid$getB2High();
|
||||
if (b2High == null) {
|
||||
continue;
|
||||
}
|
||||
data.put(b2High.data);
|
||||
|
||||
val b3 = subChunk.getB3();
|
||||
val b3 = subChunk.eid$getB3();
|
||||
if (b3 != null) {
|
||||
data.put(b3);
|
||||
}
|
||||
@@ -108,36 +107,36 @@ public class BlockIDManager implements DataManager.PacketDataManager, DataManage
|
||||
}
|
||||
val subChunk = (SubChunkBlockHook) subChunkList[i];
|
||||
val storageFlag = (storageFlags >>> (i * 2)) & 3;
|
||||
val b1 = subChunk.getB1();
|
||||
val b1 = subChunk.eid$getB1();
|
||||
buffer.get(b1);
|
||||
if (storageFlag == 0b00) {
|
||||
subChunk.setB2Low(null);
|
||||
subChunk.setB2High(null);
|
||||
subChunk.setB3(null);
|
||||
subChunk.eid$setB2Low(null);
|
||||
subChunk.eid$setB2High(null);
|
||||
subChunk.eid$setB3(null);
|
||||
continue;
|
||||
}
|
||||
var b2Low = subChunk.getB2Low();
|
||||
var b2Low = subChunk.eid$getB2Low();
|
||||
if (b2Low == null) {
|
||||
b2Low = subChunk.createB2Low();
|
||||
b2Low = subChunk.eid$createB2Low();
|
||||
}
|
||||
buffer.get(b2Low.data);
|
||||
if (storageFlag == 0b01) {
|
||||
subChunk.setB2High(null);
|
||||
subChunk.setB3(null);
|
||||
subChunk.eid$setB2High(null);
|
||||
subChunk.eid$setB3(null);
|
||||
continue;
|
||||
}
|
||||
var b2High = subChunk.getB2High();
|
||||
var b2High = subChunk.eid$getB2High();
|
||||
if (b2High == null) {
|
||||
b2High = subChunk.createB2High();
|
||||
b2High = subChunk.eid$createB2High();
|
||||
}
|
||||
buffer.get(b2High.data);
|
||||
if (storageFlag == 0b10) {
|
||||
subChunk.setB3(null);
|
||||
subChunk.eid$setB3(null);
|
||||
continue;
|
||||
}
|
||||
var b3 = subChunk.getB3();
|
||||
var b3 = subChunk.eid$getB3();
|
||||
if (b3 == null) {
|
||||
b3 = subChunk.createB3();
|
||||
b3 = subChunk.eid$createB3();
|
||||
}
|
||||
buffer.get(b3);
|
||||
}
|
||||
@@ -152,10 +151,10 @@ public class BlockIDManager implements DataManager.PacketDataManager, DataManage
|
||||
@Override
|
||||
public void writeSubChunkToNBT(Chunk chunk, ExtendedBlockStorage subChunkVanilla, NBTTagCompound nbt) {
|
||||
val subChunk = (SubChunkBlockHook) subChunkVanilla;
|
||||
val b1 = subChunk.getB1();
|
||||
val b2Low = subChunk.getB2Low();
|
||||
val b2High = subChunk.getB2High();
|
||||
val b3 = subChunk.getB3();
|
||||
val b1 = subChunk.eid$getB1();
|
||||
val b2Low = subChunk.eid$getB2Low();
|
||||
val b2High = subChunk.eid$getB2High();
|
||||
val b3 = subChunk.eid$getB3();
|
||||
nbt.setByteArray("Blocks", b1);
|
||||
if (b2Low != null) {
|
||||
nbt.setByteArray("Add", b2Low.data);
|
||||
@@ -184,9 +183,9 @@ public class BlockIDManager implements DataManager.PacketDataManager, DataManage
|
||||
b2L[nI] |= (byte) (((s & 0x0F00) >>> 8) << mI);
|
||||
b2H[nI] |= (byte) (((s & 0xF000) >>> 12) << mI);
|
||||
}
|
||||
subChunk.setB1(b1);
|
||||
subChunk.setB2Low(new NibbleArray(b2L, 4));
|
||||
subChunk.setB2High(new NibbleArray(b2H, 4));
|
||||
subChunk.eid$setB1(b1);
|
||||
subChunk.eid$setB2Low(new NibbleArray(b2L, 4));
|
||||
subChunk.eid$setB2High(new NibbleArray(b2H, 4));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -202,10 +201,10 @@ public class BlockIDManager implements DataManager.PacketDataManager, DataManage
|
||||
final byte[] b2High = nbt.hasKey("BlocksB2Hi") ? nbt.getByteArray("BlocksB2Hi") : null;
|
||||
final byte[] b3 = nbt.hasKey("BlocksB3") ? nbt.getByteArray("BlocksB3") : null;
|
||||
|
||||
subChunk.setB1(ensureSubChunkByteArray(b1));
|
||||
subChunk.setB2Low(ensureSubChunkNibbleArray(b2Low));
|
||||
subChunk.setB2High(ensureSubChunkNibbleArray(b2High));
|
||||
subChunk.setB3(ensureSubChunkByteArray(b3));
|
||||
subChunk.eid$setB1(ensureSubChunkByteArray(b1));
|
||||
subChunk.eid$setB2Low(ensureSubChunkNibbleArray(b2Low));
|
||||
subChunk.eid$setB2High(ensureSubChunkNibbleArray(b2High));
|
||||
subChunk.eid$setB3(ensureSubChunkByteArray(b3));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -213,10 +212,10 @@ public class BlockIDManager implements DataManager.PacketDataManager, DataManage
|
||||
val from = (SubChunkBlockHook) fromVanilla;
|
||||
val to = (SubChunkBlockHook) toVanilla;
|
||||
|
||||
to.setB1(ArrayUtil.copyArray(from.getB1(), to.getB1()));
|
||||
to.setB2Low(ArrayUtil.copyArray(from.getB2Low(), to.getB2Low()));
|
||||
to.setB2High(ArrayUtil.copyArray(from.getB2High(), to.getB2High()));
|
||||
to.setB3(ArrayUtil.copyArray(from.getB3(), to.getB3()));
|
||||
to.eid$setB1(ArrayUtil.copyArray(from.eid$getB1(), to.eid$getB1()));
|
||||
to.eid$setB2Low(ArrayUtil.copyArray(from.eid$getB2Low(), to.eid$getB2Low()));
|
||||
to.eid$setB2High(ArrayUtil.copyArray(from.eid$getB2High(), to.eid$getB2High()));
|
||||
to.eid$setB3(ArrayUtil.copyArray(from.eid$getB3(), to.eid$getB3()));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user