mirror of
https://github.com/GTMEGA/EndlessIDs.git
synced 2026-11-21 05:42:10 +00:00
begin porting over BIDE code (https://github.com/TCLProject/Biome-ID-Extender)
This commit is contained in:
6 files changed
+419
No files matched your search
@@ -0,0 +1,6 @@
|
||||
package com.falsepattern.endlessids.mixin.helpers;
|
||||
|
||||
public interface IChunkMixin {
|
||||
short[] getBiomeShortArray();
|
||||
void setBiomeShortArray(short[] data);
|
||||
}
|
||||
+17
@@ -0,0 +1,17 @@
|
||||
package com.falsepattern.endlessids.mixin.mixins.common.vanilla.misc;
|
||||
|
||||
import com.falsepattern.endlessids.constants.biome.ExtendedConstants;
|
||||
import com.falsepattern.endlessids.constants.biome.VanillaConstants;
|
||||
import net.minecraft.world.biome.BiomeGenBase;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.Constant;
|
||||
import org.spongepowered.asm.mixin.injection.ModifyConstant;
|
||||
|
||||
@Mixin(BiomeGenBase.class)
|
||||
public abstract class BiomeGenBaseMixin {
|
||||
@ModifyConstant(method = "<clinit>",
|
||||
constant = @Constant(intValue = VanillaConstants.BIOME_ID_COUNT))
|
||||
private static int extendBiomeList(int constant) {
|
||||
return ExtendedConstants.BIOME_ID_COUNT;
|
||||
}
|
||||
}
|
||||
+172
@@ -0,0 +1,172 @@
|
||||
package com.falsepattern.endlessids.mixin.mixins.common.vanilla.storage;
|
||||
|
||||
import com.falsepattern.endlessids.biome.BiomeUtils;
|
||||
import com.falsepattern.endlessids.mixin.helpers.IChunkMixin;
|
||||
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 org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Iterator;
|
||||
import java.util.Map;
|
||||
|
||||
@Mixin(Chunk.class)
|
||||
public abstract class ChunkMixin implements IChunkMixin {
|
||||
@Shadow public Map chunkTileEntityMap;
|
||||
@Shadow public World worldObj;
|
||||
@Shadow private ExtendedBlockStorage[] storageArrays;
|
||||
@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_);
|
||||
|
||||
@Shadow private byte[] blockBiomeArray;
|
||||
private short[] blockBiomeArrayExtended;
|
||||
|
||||
@Inject(method = "<init>(Lnet/minecraft/world/World;II)V",
|
||||
at = @At(value = "RETURN"),
|
||||
require = 1)
|
||||
private void setupNewBiomeArray(World p_i1995_1_, int p_i1995_2_, int p_i1995_3_, CallbackInfo ci) {
|
||||
blockBiomeArrayExtended = new short[256];
|
||||
Arrays.fill(blockBiomeArrayExtended, (short) -1);
|
||||
blockBiomeArray = null;
|
||||
}
|
||||
|
||||
/**
|
||||
* @author HRudyPlayZ
|
||||
* @reason Direct copy from decompiled code
|
||||
*/
|
||||
@Overwrite
|
||||
public void fillChunk(byte[] var1, int var2, int var3, boolean var4) {
|
||||
Iterator<TileEntity> var5 = this.chunkTileEntityMap.values().iterator();
|
||||
|
||||
while(var5.hasNext()) {
|
||||
TileEntity var6 = var5.next();
|
||||
var6.updateContainingBlockInfo();
|
||||
var6.getBlockMetadata();
|
||||
var6.getBlockType();
|
||||
}
|
||||
|
||||
int var16 = 0;
|
||||
boolean var7 = !worldObj.provider.hasNoSky;
|
||||
|
||||
int var8;
|
||||
for(var8 = 0; var8 < storageArrays.length; ++var8) {
|
||||
if ((var2 & 1 << var8) != 0) {
|
||||
if (storageArrays[var8] == null) {
|
||||
storageArrays[var8] = new ExtendedBlockStorage(var8 << 4, var7);
|
||||
}
|
||||
|
||||
BiomeUtils.setBlockData(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) {
|
||||
var16 += BiomeUtils.readBiomeArrayFromPacket((Chunk) (Object) this, var1, var16);
|
||||
int var10000 = var16 + this.blockBiomeArrayExtended.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();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public short[] getBiomeShortArray() {
|
||||
return blockBiomeArrayExtended;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setBiomeShortArray(short[] data) {
|
||||
blockBiomeArrayExtended = data;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user