Added LocalWorld.fixLighting(Set<BlockVector2D>)

This method redos lighting in the given chunks.
BukkitWorld's current implementation introduces some slight errors and doesn't redo torch light, but it's better than nothing.
Dieser Commit ist enthalten in:
TomyLobo 2011-10-17 05:57:08 +02:00 committet von TomyLobo
Ursprung ef88c04550
Commit e8dcee1acf
2 geänderte Dateien mit 63 neuen und 0 gelöschten Zeilen

Datei anzeigen

@ -325,4 +325,6 @@ public abstract class LocalWorld {
public int getHeight() { public int getHeight() {
return 127; return 127;
} }
public void fixLighting(Iterable<BlockVector2D> chunks) {}
} }

Datei anzeigen

@ -19,6 +19,9 @@
package com.sk89q.worldedit.bukkit; package com.sk89q.worldedit.bukkit;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;
import org.bukkit.block.Furnace; import org.bukkit.block.Furnace;
@ -39,10 +42,13 @@ import org.bukkit.entity.TNTPrimed;
import org.bukkit.entity.Wolf; import org.bukkit.entity.Wolf;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.TreeType; import org.bukkit.TreeType;
import org.bukkit.World; import org.bukkit.World;
import com.sk89q.worldedit.BlockVector2D;
import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.EditSession;
import com.sk89q.worldedit.LocalWorld; import com.sk89q.worldedit.LocalWorld;
import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector;
@ -704,4 +710,59 @@ public class BukkitWorld extends LocalWorld {
public int getHeight() { public int getHeight() {
return world.getMaxHeight() - 1; return world.getMaxHeight() - 1;
} }
@Override
public void fixLighting(Iterable<BlockVector2D> chunks) {
if (!fastLighting) {
return;
}
try {
Object notchWorld = CraftWorld_getHandle.invoke(this.world);
for (BlockVector2D chunkPos : chunks) {
int x = chunkPos.getBlockX();
int z = chunkPos.getBlockZ();
System.out.println(x+"/"+z);
Object chunk = World_getChunkFromChunkCoords.invoke(notchWorld, x, z);
int length = ((byte[])Chunk_b.get(chunk)).length;
Chunk_h.set(chunk, NibbleArray_ctor.newInstance(length, 7));
//Chunk_i.set(chunk, NibbleArray_ctor.newInstance(length, 7));
Chunk_generateSkylightMap.invoke(chunk);
}
}
catch (Exception e) {
System.out.println("Fast Mode: Could not fix lighting. Probably an incompatible version of CraftBukkit.");
e.printStackTrace();
}
}
private static boolean fastLighting = false;
private static Method CraftWorld_getHandle;
private static Method World_getChunkFromChunkCoords;
private static Method Chunk_generateSkylightMap;
private static Field Chunk_b;
private static Field Chunk_h;
//private static Field Chunk_i;
private static Constructor<?> NibbleArray_ctor;
static {
if (Bukkit.getServer().getName().equalsIgnoreCase("CraftBukkit")) {
try {
CraftWorld_getHandle = Class.forName("org.bukkit.craftbukkit.CraftWorld").getMethod("getHandle");
World_getChunkFromChunkCoords = Class.forName("net.minecraft.server.World").getMethod("getChunkAt", int.class, int.class);
Chunk_generateSkylightMap = Class.forName("net.minecraft.server.Chunk").getMethod("initLighting");
Chunk_b = Class.forName("net.minecraft.server.Chunk").getField("b");
Chunk_h = Class.forName("net.minecraft.server.Chunk").getField("h");
//Chunk_i = Class.forName("net.minecraft.server.Chunk").getField("i");
NibbleArray_ctor = Class.forName("net.minecraft.server.NibbleArray").getConstructor(int.class, int.class);
fastLighting = true;
}
catch (Throwable e) {
}
}
}
} }