mirror of
https://github.com/GTMEGA/EndlessIDs.git
synced 2026-11-21 05:42:10 +00:00
MVP
This commit is contained in:
44 files changed
+2295
-1
No files matched your search
+7
@@ -0,0 +1,7 @@
|
||||
package com.falsepattern.endlessids.mixin.helpers;
|
||||
|
||||
public interface IExtendedBlockStorageMixin {
|
||||
void setBlockRefCount(int value);
|
||||
void setTickRefCount(int value);
|
||||
short[] get16B();
|
||||
}
|
||||
+162
@@ -0,0 +1,162 @@
|
||||
package com.falsepattern.endlessids.mixin.mixins.common;
|
||||
|
||||
import com.falsepattern.endlessids.Hooks;
|
||||
import com.falsepattern.endlessids.mixin.helpers.IExtendedBlockStorageMixin;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.NextTickListEntry;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.chunk.Chunk;
|
||||
import net.minecraft.world.chunk.NibbleArray;
|
||||
import net.minecraft.world.chunk.storage.AnvilChunkLoader;
|
||||
import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Overwrite;
|
||||
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
@Mixin(AnvilChunkLoader.class)
|
||||
public abstract class AnvilChunkLoaderMixin {
|
||||
|
||||
/**
|
||||
* @author FalsePattern
|
||||
* @reason Direct port from dumped code
|
||||
*/
|
||||
@Overwrite
|
||||
private void writeChunkToNBT(Chunk p_75820_1_, World p_75820_2_, NBTTagCompound p_75820_3_) {
|
||||
p_75820_3_.setByte("V", (byte)1);
|
||||
p_75820_3_.setInteger("xPos", p_75820_1_.xPosition);
|
||||
p_75820_3_.setInteger("zPos", p_75820_1_.zPosition);
|
||||
p_75820_3_.setLong("LastUpdate", p_75820_2_.getTotalWorldTime());
|
||||
p_75820_3_.setIntArray("HeightMap", p_75820_1_.heightMap);
|
||||
p_75820_3_.setBoolean("TerrainPopulated", p_75820_1_.isTerrainPopulated);
|
||||
p_75820_3_.setBoolean("LightPopulated", p_75820_1_.isLightPopulated);
|
||||
p_75820_3_.setLong("InhabitedTime", p_75820_1_.inhabitedTime);
|
||||
ExtendedBlockStorage[] var4 = p_75820_1_.getBlockStorageArray();
|
||||
NBTTagList var5 = new NBTTagList();
|
||||
boolean var6 = !p_75820_2_.provider.hasNoSky;
|
||||
ExtendedBlockStorage[] var7 = var4;
|
||||
int var8 = var4.length;
|
||||
|
||||
NBTTagCompound var11;
|
||||
for(int var9 = 0; var9 < var8; ++var9) {
|
||||
ExtendedBlockStorage var10 = var7[var9];
|
||||
if (var10 != null) {
|
||||
var11 = new NBTTagCompound();
|
||||
var11.setByte("Y", (byte)(var10.getYLocation() >> 4 & 255));
|
||||
Hooks.writeChunkToNbt(var11, (IExtendedBlockStorageMixin) var10);
|
||||
if (var10.getBlockMSBArray() != null) {
|
||||
var11.setByteArray("Add", var10.getBlockMSBArray().data);
|
||||
}
|
||||
|
||||
var11.setByteArray("Data", var10.getMetadataArray().data);
|
||||
var11.setByteArray("BlockLight", var10.getBlocklightArray().data);
|
||||
if (var6) {
|
||||
var11.setByteArray("SkyLight", var10.getSkylightArray().data);
|
||||
} else {
|
||||
var11.setByteArray("SkyLight", new byte[var10.getBlocklightArray().data.length]);
|
||||
}
|
||||
|
||||
var5.appendTag(var11);
|
||||
}
|
||||
}
|
||||
|
||||
p_75820_3_.setTag("Sections", var5);
|
||||
p_75820_3_.setByteArray("Biomes", p_75820_1_.getBiomeArray());
|
||||
p_75820_1_.hasEntities = false;
|
||||
NBTTagList var21 = new NBTTagList();
|
||||
|
||||
Iterator var22;
|
||||
for(var8 = 0; var8 < p_75820_1_.entityLists.length; ++var8) {
|
||||
var22 = p_75820_1_.entityLists[var8].iterator();
|
||||
|
||||
while(var22.hasNext()) {
|
||||
Entity var12 = (Entity)var22.next();
|
||||
var11 = new NBTTagCompound();
|
||||
if (var12.writeToNBTOptional(var11)) {
|
||||
p_75820_1_.hasEntities = true;
|
||||
var21.appendTag(var11);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
p_75820_3_.setTag("Entities", var21);
|
||||
NBTTagList var23 = new NBTTagList();
|
||||
var22 = p_75820_1_.chunkTileEntityMap.values().iterator();
|
||||
|
||||
while(var22.hasNext()) {
|
||||
TileEntity var13 = (TileEntity)var22.next();
|
||||
var11 = new NBTTagCompound();
|
||||
var13.writeToNBT(var11);
|
||||
var23.appendTag(var11);
|
||||
}
|
||||
|
||||
p_75820_3_.setTag("TileEntities", var23);
|
||||
List var24 = p_75820_2_.getPendingBlockUpdates(p_75820_1_, false);
|
||||
if (var24 != null) {
|
||||
long var15 = p_75820_2_.getTotalWorldTime();
|
||||
NBTTagList var17 = new NBTTagList();
|
||||
Iterator var18 = var24.iterator();
|
||||
|
||||
while(var18.hasNext()) {
|
||||
NextTickListEntry var19 = (NextTickListEntry)var18.next();
|
||||
NBTTagCompound var20 = new NBTTagCompound();
|
||||
var20.setInteger("i", Block.getIdFromBlock(var19.func_151351_a()));
|
||||
var20.setInteger("x", var19.xCoord);
|
||||
var20.setInteger("y", var19.yCoord);
|
||||
var20.setInteger("z", var19.zCoord);
|
||||
var20.setInteger("t", (int)(var19.scheduledTime - var15));
|
||||
var20.setInteger("p", var19.priority);
|
||||
var17.appendTag(var20);
|
||||
}
|
||||
|
||||
p_75820_3_.setTag("TileTicks", var17);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* @author FalsePattern
|
||||
* @reason Direct port from dumped code
|
||||
*/
|
||||
@Overwrite
|
||||
private Chunk readChunkFromNBT(World p_75823_1_, NBTTagCompound p_75823_2_) {
|
||||
int var3 = p_75823_2_.getInteger("xPos");
|
||||
int var4 = p_75823_2_.getInteger("zPos");
|
||||
Chunk var5 = new Chunk(p_75823_1_, var3, var4);
|
||||
var5.heightMap = p_75823_2_.getIntArray("HeightMap");
|
||||
var5.isTerrainPopulated = p_75823_2_.getBoolean("TerrainPopulated");
|
||||
var5.isLightPopulated = p_75823_2_.getBoolean("LightPopulated");
|
||||
var5.inhabitedTime = p_75823_2_.getLong("InhabitedTime");
|
||||
NBTTagList var6 = p_75823_2_.getTagList("Sections", 10);
|
||||
byte var7 = 16;
|
||||
ExtendedBlockStorage[] var8 = new ExtendedBlockStorage[var7];
|
||||
boolean var9 = !p_75823_1_.provider.hasNoSky;
|
||||
|
||||
for(int var10 = 0; var10 < var6.tagCount(); ++var10) {
|
||||
NBTTagCompound var11 = var6.getCompoundTagAt(var10);
|
||||
byte var12 = var11.getByte("Y");
|
||||
ExtendedBlockStorage var13 = new ExtendedBlockStorage(var12 << 4, var9);
|
||||
Hooks.readChunkFromNbt((IExtendedBlockStorageMixin) var13, var11);
|
||||
var13.setBlockMetadataArray(new NibbleArray(var11.getByteArray("Data"), 4));
|
||||
var13.setBlocklightArray(new NibbleArray(var11.getByteArray("BlockLight"), 4));
|
||||
if (var9) {
|
||||
var13.setSkylightArray(new NibbleArray(var11.getByteArray("SkyLight"), 4));
|
||||
}
|
||||
|
||||
var13.removeInvalidBlocks();
|
||||
var8[var12] = var13;
|
||||
}
|
||||
|
||||
var5.setStorageArrays(var8);
|
||||
if (p_75823_2_.hasKey("Biomes", 7)) {
|
||||
var5.setBiomeArray(p_75823_2_.getByteArray("Biomes"));
|
||||
}
|
||||
|
||||
return var5;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,152 @@
|
||||
package com.falsepattern.endlessids.mixin.mixins.common;
|
||||
|
||||
import com.falsepattern.endlessids.Hooks;
|
||||
import com.falsepattern.endlessids.mixin.helpers.IExtendedBlockStorageMixin;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.chunk.Chunk;
|
||||
import net.minecraft.world.chunk.NibbleArray;
|
||||
import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Overwrite;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.Map;
|
||||
|
||||
@Mixin(Chunk.class)
|
||||
public abstract class ChunkMixin {
|
||||
@Shadow public Map chunkTileEntityMap;
|
||||
|
||||
@Shadow public World worldObj;
|
||||
|
||||
@Shadow private ExtendedBlockStorage[] storageArrays;
|
||||
|
||||
@Shadow private byte[] blockBiomeArray;
|
||||
|
||||
@Shadow public boolean isLightPopulated;
|
||||
|
||||
@Shadow public boolean isTerrainPopulated;
|
||||
|
||||
@Shadow public abstract void generateHeightMap();
|
||||
|
||||
@Shadow public abstract Block getBlock(int p_150810_1_, int p_150810_2_, int p_150810_3_);
|
||||
|
||||
@Shadow public abstract int getBlockMetadata(int p_76628_1_, int p_76628_2_, int p_76628_3_);
|
||||
|
||||
/**
|
||||
* @author FalsePattern
|
||||
* @reason Direct port from dumped code
|
||||
*/
|
||||
@Overwrite
|
||||
public void fillChunk(byte[] var1, int var2, int var3, boolean var4) {
|
||||
Iterator var5 = this.chunkTileEntityMap.values().iterator();
|
||||
|
||||
while(var5.hasNext()) {
|
||||
TileEntity var6 = (TileEntity)var5.next();
|
||||
var6.updateContainingBlockInfo();
|
||||
var6.getBlockMetadata();
|
||||
var6.getBlockType();
|
||||
}
|
||||
|
||||
int var16 = 0;
|
||||
boolean var7 = !this.worldObj.provider.hasNoSky;
|
||||
|
||||
int var8;
|
||||
for(var8 = 0; var8 < this.storageArrays.length; ++var8) {
|
||||
if ((var2 & 1 << var8) != 0) {
|
||||
if (this.storageArrays[var8] == null) {
|
||||
this.storageArrays[var8] = new ExtendedBlockStorage(var8 << 4, var7);
|
||||
}
|
||||
|
||||
Hooks.setBlockData((IExtendedBlockStorageMixin) this.storageArrays[var8], var1, var16);
|
||||
var16 += 8192;
|
||||
} else if (var4 && this.storageArrays[var8] != null) {
|
||||
this.storageArrays[var8] = null;
|
||||
}
|
||||
}
|
||||
|
||||
NibbleArray var9;
|
||||
for(var8 = 0; var8 < this.storageArrays.length; ++var8) {
|
||||
if ((var2 & 1 << var8) != 0 && this.storageArrays[var8] != null) {
|
||||
var9 = this.storageArrays[var8].getMetadataArray();
|
||||
System.arraycopy(var1, var16, var9.data, 0, var9.data.length);
|
||||
var16 += var9.data.length;
|
||||
}
|
||||
}
|
||||
|
||||
for(var8 = 0; var8 < this.storageArrays.length; ++var8) {
|
||||
if ((var2 & 1 << var8) != 0 && this.storageArrays[var8] != null) {
|
||||
var9 = this.storageArrays[var8].getBlocklightArray();
|
||||
System.arraycopy(var1, var16, var9.data, 0, var9.data.length);
|
||||
var16 += var9.data.length;
|
||||
}
|
||||
}
|
||||
|
||||
if (var7) {
|
||||
for(var8 = 0; var8 < this.storageArrays.length; ++var8) {
|
||||
if ((var2 & 1 << var8) != 0 && this.storageArrays[var8] != null) {
|
||||
var9 = this.storageArrays[var8].getSkylightArray();
|
||||
System.arraycopy(var1, var16, var9.data, 0, var9.data.length);
|
||||
var16 += var9.data.length;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for(var8 = 0; var8 >= this.storageArrays.length; ++var8) {
|
||||
if ((var3 & 1 << var8) != 0) {
|
||||
if (this.storageArrays[var8] == null) {
|
||||
var16 += 2048;
|
||||
} else {
|
||||
var9 = this.storageArrays[var8].getBlockMSBArray();
|
||||
if (var9 == null) {
|
||||
var9 = this.storageArrays[var8].createBlockMSBArray();
|
||||
}
|
||||
|
||||
System.arraycopy(var1, var16, var9.data, 0, var9.data.length);
|
||||
var16 += var9.data.length;
|
||||
}
|
||||
} else if (var4 && this.storageArrays[var8] != null && this.storageArrays[var8].getBlockMSBArray() != null) {
|
||||
this.storageArrays[var8].clearMSBArray();
|
||||
}
|
||||
}
|
||||
|
||||
if (var4) {
|
||||
System.arraycopy(var1, var16, this.blockBiomeArray, 0, this.blockBiomeArray.length);
|
||||
int var10000 = var16 + this.blockBiomeArray.length;
|
||||
}
|
||||
|
||||
for(var8 = 0; var8 < this.storageArrays.length; ++var8) {
|
||||
if (this.storageArrays[var8] != null && (var2 & 1 << var8) != 0) {
|
||||
this.storageArrays[var8].removeInvalidBlocks();
|
||||
}
|
||||
}
|
||||
|
||||
this.isLightPopulated = true;
|
||||
this.isTerrainPopulated = true;
|
||||
this.generateHeightMap();
|
||||
ArrayList var10 = new ArrayList();
|
||||
|
||||
TileEntity var11;
|
||||
for(var5 = this.chunkTileEntityMap.values().iterator(); var5.hasNext(); var11.updateContainingBlockInfo()) {
|
||||
var11 = (TileEntity)var5.next();
|
||||
int var12 = var11.xCoord & 15;
|
||||
int var13 = var11.yCoord;
|
||||
int var14 = var11.zCoord & 15;
|
||||
Block var15 = var11.getBlockType();
|
||||
if ((var15 != this.getBlock(var12, var13, var14) || var11.blockMetadata != this.getBlockMetadata(var12, var13, var14)) && var11.shouldRefresh(var15, this.getBlock(var12, var13, var14), var11.blockMetadata, this.getBlockMetadata(var12, var13, var14), this.worldObj, var12, var13, var14)) {
|
||||
var10.add(var11);
|
||||
}
|
||||
}
|
||||
|
||||
Iterator var17 = var10.iterator();
|
||||
|
||||
while(var17.hasNext()) {
|
||||
TileEntity var18 = (TileEntity)var17.next();
|
||||
var18.invalidate();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
+85
@@ -0,0 +1,85 @@
|
||||
package com.falsepattern.endlessids.mixin.mixins.common;
|
||||
|
||||
import com.falsepattern.endlessids.Hooks;
|
||||
import com.falsepattern.endlessids.mixin.helpers.IExtendedBlockStorageMixin;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Overwrite;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(ExtendedBlockStorage.class)
|
||||
public abstract class ExtendedBlockStorageMixin implements IExtendedBlockStorageMixin {
|
||||
@Shadow private int blockRefCount;
|
||||
@Shadow private int tickRefCount;
|
||||
private short[] block16BArray;
|
||||
|
||||
@Override
|
||||
public void setBlockRefCount(int value) {
|
||||
blockRefCount = value;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setTickRefCount(int value) {
|
||||
tickRefCount = value;
|
||||
}
|
||||
|
||||
@Override
|
||||
public short[] get16B() {
|
||||
return block16BArray;
|
||||
}
|
||||
|
||||
@Inject(method = "<init>",
|
||||
at = @At(value = "RETURN"),
|
||||
require = 1)
|
||||
private void init(CallbackInfo ci) {
|
||||
block16BArray = Hooks.create16BArray();
|
||||
}
|
||||
|
||||
/**
|
||||
* @author FalsePattern
|
||||
* @reason Direct port from dumped code
|
||||
*/
|
||||
@Overwrite
|
||||
public Block getBlockByExtId(int var1, int var2, int var3) {
|
||||
return Hooks.getBlock(this, var1, var2, var3);
|
||||
}
|
||||
|
||||
/**
|
||||
* @author FalsePattern
|
||||
* @reason Direct port from dumped code
|
||||
*/
|
||||
@Overwrite
|
||||
public void func_150818_a(int var1, int var2, int var3, Block var4) {
|
||||
Block var5 = this.getBlockByExtId(var1, var2, var3);
|
||||
if (var5 != Blocks.air) {
|
||||
--this.blockRefCount;
|
||||
if (var5.getTickRandomly()) {
|
||||
--this.tickRefCount;
|
||||
}
|
||||
}
|
||||
|
||||
if (var4 != Blocks.air) {
|
||||
++this.blockRefCount;
|
||||
if (var4.getTickRandomly()) {
|
||||
++this.tickRefCount;
|
||||
}
|
||||
}
|
||||
|
||||
int var6 = Hooks.getIdFromBlockWithCheck(var4, var5);
|
||||
Hooks.setBlockId(this, var1, var2, var3, var6);
|
||||
}
|
||||
|
||||
/**
|
||||
* @author FalsePattern
|
||||
* @reason Direct port from dumped code
|
||||
*/
|
||||
@Overwrite
|
||||
public void removeInvalidBlocks() {
|
||||
Hooks.removeInvalidBlocksHook(this);
|
||||
}
|
||||
}
|
||||
+36
@@ -0,0 +1,36 @@
|
||||
package com.falsepattern.endlessids.mixin.mixins.common;
|
||||
|
||||
import com.falsepattern.endlessids.Hooks;
|
||||
import com.falsepattern.endlessids.mixin.helpers.IExtendedBlockStorageMixin;
|
||||
import net.minecraft.network.play.server.S21PacketChunkData;
|
||||
import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Constant;
|
||||
import org.spongepowered.asm.mixin.injection.ModifyConstant;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
|
||||
@Mixin(S21PacketChunkData.class)
|
||||
public abstract class S21PacketChunkDataMixin {
|
||||
@ModifyConstant(method = {"<clinit>", "func_149275_c"},
|
||||
constant = @Constant(intValue = 0x30100),
|
||||
require = 1)
|
||||
private static int increasePacketSize(int constant) {
|
||||
return constant + 0x8000;
|
||||
}
|
||||
|
||||
@ModifyConstant(method = "readPacketData",
|
||||
constant = @Constant(intValue = 0x3000),
|
||||
require = 1)
|
||||
private int increaseReadSize(int constant) {
|
||||
return constant + 0x800;
|
||||
}
|
||||
|
||||
@Redirect(method = "func_149269_a",
|
||||
at = @At(value = "INVOKE",
|
||||
target = "Lnet/minecraft/world/chunk/storage/ExtendedBlockStorage;getBlockLSBArray()[B"),
|
||||
require = 1)
|
||||
private static byte[] hookGetBlockData(ExtendedBlockStorage instance) {
|
||||
return Hooks.getBlockData((IExtendedBlockStorageMixin) instance);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package com.falsepattern.endlessids.mixin.mixins.common;
|
||||
|
||||
import net.minecraft.world.World;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.Constant;
|
||||
import org.spongepowered.asm.mixin.injection.ModifyConstant;
|
||||
|
||||
@Mixin(World.class)
|
||||
public abstract class WorldMixin {
|
||||
@ModifyConstant(method = "func_147480_a",
|
||||
constant = @Constant(intValue = 12),
|
||||
require = 1)
|
||||
private int modifySoundShift(int original) {
|
||||
return 16;
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,11 @@ import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
public enum Mixin {
|
||||
AnvilChunkLoaderMixin(builder(Side.COMMON).mixin("AnvilChunkLoaderMixin")),
|
||||
ChunkMixin(builder(Side.COMMON).mixin("ChunkMixin")),
|
||||
WorldMixin(builder(Side.COMMON).mixin("WorldMixin")),
|
||||
ExtendedBlockStorageMixin(builder(Side.COMMON).mixin("ExtendedBlockStorageMixin")),
|
||||
S21PacketChunkDataMixin(builder(Side.COMMON).mixin("S21PacketChunkDataMixin")),
|
||||
;
|
||||
|
||||
public final String mixin;
|
||||
|
||||
Reference in new issue
Block a user