Mirror von
https://github.com/IntellectualSites/FastAsyncWorldEdit.git
synchronisiert 2024-09-06 16:12:51 +02:00
Use ATs for accessing fields.
Dieser Commit ist enthalten in:
Ursprung
633e734b70
Commit
ea4dafe9af
@ -55,7 +55,8 @@ processResources {
|
|||||||
jar {
|
jar {
|
||||||
manifest {
|
manifest {
|
||||||
attributes("Class-Path": "truezip.jar WorldEdit/truezip.jar js.jar WorldEdit/js.jar",
|
attributes("Class-Path": "truezip.jar WorldEdit/truezip.jar js.jar WorldEdit/js.jar",
|
||||||
"WorldEdit-Version": version)
|
"WorldEdit-Version": version,
|
||||||
|
"FMLAT": "worldedit_at.cfg")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -40,6 +40,14 @@ import com.sk89q.worldedit.world.AbstractWorld;
|
|||||||
import com.sk89q.worldedit.world.biome.BaseBiome;
|
import com.sk89q.worldedit.world.biome.BaseBiome;
|
||||||
import com.sk89q.worldedit.world.registry.WorldData;
|
import com.sk89q.worldedit.world.registry.WorldData;
|
||||||
|
|
||||||
|
import java.lang.ref.WeakReference;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Random;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.logging.Level;
|
||||||
|
import java.util.logging.Logger;
|
||||||
|
import javax.annotation.Nullable;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.BlockLeaves;
|
import net.minecraft.block.BlockLeaves;
|
||||||
import net.minecraft.block.BlockOldLeaf;
|
import net.minecraft.block.BlockOldLeaf;
|
||||||
@ -56,7 +64,6 @@ import net.minecraft.nbt.NBTTagCompound;
|
|||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.util.BlockPos;
|
import net.minecraft.util.BlockPos;
|
||||||
import net.minecraft.util.ClassInheritanceMultiMap;
|
import net.minecraft.util.ClassInheritanceMultiMap;
|
||||||
import net.minecraft.util.LongHashMap;
|
|
||||||
import net.minecraft.world.ChunkCoordIntPair;
|
import net.minecraft.world.ChunkCoordIntPair;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraft.world.WorldServer;
|
import net.minecraft.world.WorldServer;
|
||||||
@ -77,16 +84,6 @@ import net.minecraft.world.gen.feature.WorldGenTaiga2;
|
|||||||
import net.minecraft.world.gen.feature.WorldGenTrees;
|
import net.minecraft.world.gen.feature.WorldGenTrees;
|
||||||
import net.minecraft.world.gen.feature.WorldGenerator;
|
import net.minecraft.world.gen.feature.WorldGenerator;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
|
||||||
|
|
||||||
import java.lang.ref.WeakReference;
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Random;
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.logging.Level;
|
|
||||||
import java.util.logging.Logger;
|
|
||||||
|
|
||||||
import static com.google.common.base.Preconditions.checkNotNull;
|
import static com.google.common.base.Preconditions.checkNotNull;
|
||||||
|
|
||||||
@ -276,38 +273,7 @@ public class ForgeWorld extends AbstractWorld {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
ChunkProviderServer chunkServer = (ChunkProviderServer) provider;
|
ChunkProviderServer chunkServer = (ChunkProviderServer) provider;
|
||||||
Field u;
|
IChunkProvider chunkProvider = chunkServer.serverChunkGenerator;
|
||||||
try {
|
|
||||||
u = ChunkProviderServer.class.getDeclaredField("field_73248_b"); // chunksToUnload
|
|
||||||
} catch(NoSuchFieldException e) {
|
|
||||||
u = ChunkProviderServer.class.getDeclaredField("chunksToUnload");
|
|
||||||
}
|
|
||||||
u.setAccessible(true);
|
|
||||||
Set<?> unloadQueue = (Set<?>) u.get(chunkServer);
|
|
||||||
Field m;
|
|
||||||
try {
|
|
||||||
m = ChunkProviderServer.class.getDeclaredField("field_73244_f"); // loadedChunkHashMap
|
|
||||||
} catch(NoSuchFieldException e) {
|
|
||||||
m = ChunkProviderServer.class.getDeclaredField("loadedChunkHashMap");
|
|
||||||
}
|
|
||||||
m.setAccessible(true);
|
|
||||||
LongHashMap loadedMap = (LongHashMap) m.get(chunkServer);
|
|
||||||
Field lc;
|
|
||||||
try {
|
|
||||||
lc = ChunkProviderServer.class.getDeclaredField("field_73245_g"); // loadedChunkHashMap
|
|
||||||
} catch(NoSuchFieldException e) {
|
|
||||||
lc = ChunkProviderServer.class.getDeclaredField("loadedChunks");
|
|
||||||
}
|
|
||||||
lc.setAccessible(true);
|
|
||||||
@SuppressWarnings("unchecked") List<Chunk> loaded = (List<Chunk>) lc.get(chunkServer);
|
|
||||||
Field p;
|
|
||||||
try {
|
|
||||||
p = ChunkProviderServer.class.getDeclaredField("field_73246_d"); // currentChunkProvider
|
|
||||||
} catch(NoSuchFieldException e) {
|
|
||||||
p = ChunkProviderServer.class.getDeclaredField("currentChunkProvider");
|
|
||||||
}
|
|
||||||
p.setAccessible(true);
|
|
||||||
IChunkProvider chunkProvider = (IChunkProvider) p.get(chunkServer);
|
|
||||||
|
|
||||||
for (Vector2D coord : chunks) {
|
for (Vector2D coord : chunks) {
|
||||||
long pos = ChunkCoordIntPair.chunkXZ2Int(coord.getBlockX(), coord.getBlockZ());
|
long pos = ChunkCoordIntPair.chunkXZ2Int(coord.getBlockX(), coord.getBlockZ());
|
||||||
@ -316,11 +282,11 @@ public class ForgeWorld extends AbstractWorld {
|
|||||||
mcChunk = chunkServer.loadChunk(coord.getBlockX(), coord.getBlockZ());
|
mcChunk = chunkServer.loadChunk(coord.getBlockX(), coord.getBlockZ());
|
||||||
mcChunk.onChunkUnload();
|
mcChunk.onChunkUnload();
|
||||||
}
|
}
|
||||||
unloadQueue.remove(pos);
|
chunkServer.droppedChunksSet.remove(pos);
|
||||||
loadedMap.remove(pos);
|
chunkServer.id2ChunkMap.remove(pos);
|
||||||
mcChunk = chunkProvider.provideChunk(coord.getBlockX(), coord.getBlockZ());
|
mcChunk = chunkProvider.provideChunk(coord.getBlockX(), coord.getBlockZ());
|
||||||
loadedMap.add(pos, mcChunk);
|
chunkServer.id2ChunkMap.add(pos, mcChunk);
|
||||||
loaded.add(mcChunk);
|
chunkServer.loadedChunks.add(mcChunk);
|
||||||
if (mcChunk != null) {
|
if (mcChunk != null) {
|
||||||
mcChunk.onChunkLoad();
|
mcChunk.onChunkLoad();
|
||||||
mcChunk.populateChunk(chunkProvider, chunkProvider, coord.getBlockX(), coord.getBlockZ());
|
mcChunk.populateChunk(chunkProvider, chunkProvider, coord.getBlockX(), coord.getBlockZ());
|
||||||
|
4
worldedit-forge/src/main/resources/META-INF/worldedit_at.cfg
Normale Datei
4
worldedit-forge/src/main/resources/META-INF/worldedit_at.cfg
Normale Datei
@ -0,0 +1,4 @@
|
|||||||
|
public net.minecraft.world.gen.ChunkProviderServer field_73248_b # droppedChunksSet
|
||||||
|
public net.minecraft.world.gen.ChunkProviderServer field_73244_f # id2ChunkMap
|
||||||
|
public net.minecraft.world.gen.ChunkProviderServer field_73245_g # loadedChunks
|
||||||
|
public net.minecraft.world.gen.ChunkProviderServer field_73246_d # serverChunkGenerator
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren