Mirror von
https://github.com/IntellectualSites/FastAsyncWorldEdit.git
synchronisiert 2024-12-24 18:10:08 +01:00
Implement FMP compatibility
Dieser Commit ist enthalten in:
Ursprung
10776f27a8
Commit
7271cca89f
@ -26,8 +26,12 @@ import com.sk89q.worldedit.WorldVector;
|
|||||||
import com.sk89q.worldedit.blocks.BaseItemStack;
|
import com.sk89q.worldedit.blocks.BaseItemStack;
|
||||||
import com.sk89q.worldedit.event.platform.PlatformReadyEvent;
|
import com.sk89q.worldedit.event.platform.PlatformReadyEvent;
|
||||||
import com.sk89q.worldedit.extension.platform.Platform;
|
import com.sk89q.worldedit.extension.platform.Platform;
|
||||||
|
import com.sk89q.worldedit.forge.compat.ForgeMultipartCompat;
|
||||||
|
import com.sk89q.worldedit.forge.compat.ForgeMultipartExistsCompat;
|
||||||
|
import com.sk89q.worldedit.forge.compat.NoForgeMultipartCompat;
|
||||||
import com.sk89q.worldedit.internal.LocalWorldAdapter;
|
import com.sk89q.worldedit.internal.LocalWorldAdapter;
|
||||||
import cpw.mods.fml.common.FMLCommonHandler;
|
import cpw.mods.fml.common.FMLCommonHandler;
|
||||||
|
import cpw.mods.fml.common.Loader;
|
||||||
import cpw.mods.fml.common.Mod;
|
import cpw.mods.fml.common.Mod;
|
||||||
import cpw.mods.fml.common.Mod.EventHandler;
|
import cpw.mods.fml.common.Mod.EventHandler;
|
||||||
import cpw.mods.fml.common.Mod.Instance;
|
import cpw.mods.fml.common.Mod.Instance;
|
||||||
@ -76,6 +80,7 @@ public class ForgeWorldEdit {
|
|||||||
private ForgePlatform platform;
|
private ForgePlatform platform;
|
||||||
private ForgeConfiguration config;
|
private ForgeConfiguration config;
|
||||||
private File workingDir;
|
private File workingDir;
|
||||||
|
private ForgeMultipartCompat compat = new NoForgeMultipartCompat();
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void preInit(FMLPreInitializationEvent event) {
|
public void preInit(FMLPreInitializationEvent event) {
|
||||||
@ -87,6 +92,10 @@ public class ForgeWorldEdit {
|
|||||||
config = new ForgeConfiguration(this);
|
config = new ForgeConfiguration(this);
|
||||||
config.load();
|
config.load();
|
||||||
|
|
||||||
|
if (Loader.isModLoaded("ForgeMultipart")) {
|
||||||
|
compat = new ForgeMultipartExistsCompat();
|
||||||
|
}
|
||||||
|
|
||||||
FMLCommonHandler.instance().bus().register(ThreadSafeCache.getInstance());
|
FMLCommonHandler.instance().bus().register(ThreadSafeCache.getInstance());
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -260,6 +269,10 @@ public class ForgeWorldEdit {
|
|||||||
return this.workingDir;
|
return this.workingDir;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ForgeMultipartCompat getFMPCompat() {
|
||||||
|
return compat;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the version of the WorldEdit-for-Forge implementation.
|
* Get the version of the WorldEdit-for-Forge implementation.
|
||||||
*
|
*
|
||||||
|
@ -81,9 +81,10 @@ final class TileEntityUtils {
|
|||||||
tileEntity.readFromNBT(tag);
|
tileEntity.readFromNBT(tag);
|
||||||
}
|
}
|
||||||
|
|
||||||
world.setTileEntity(position.getBlockX(), position.getBlockY(), position.getBlockZ(), tileEntity);
|
tileEntity = ForgeWorldEdit.inst.getFMPCompat().overrideTileEntity(world, tag, tileEntity);
|
||||||
}
|
|
||||||
|
|
||||||
|
setTileEntity(world, position, tileEntity);
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* Set a tile entity at the given location using the tile entity ID from
|
* Set a tile entity at the given location using the tile entity ID from
|
||||||
* the tag.
|
* the tag.
|
||||||
@ -95,12 +96,26 @@ final class TileEntityUtils {
|
|||||||
static void setTileEntity(World world, Vector position, @Nullable NBTTagCompound tag) {
|
static void setTileEntity(World world, Vector position, @Nullable NBTTagCompound tag) {
|
||||||
if (tag != null) {
|
if (tag != null) {
|
||||||
updateForSet(tag, position);
|
updateForSet(tag, position);
|
||||||
TileEntity tileEntity = TileEntity.createAndLoadEntity(tag);
|
TileEntity tileEntity = makeTileEntity(world, position, tag);
|
||||||
if (tileEntity != null) {
|
if (tileEntity != null) {
|
||||||
world.setTileEntity(position.getBlockX(), position.getBlockY(), position.getBlockZ(), tileEntity);
|
setTileEntity(world, position, tileEntity);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static TileEntity makeTileEntity(World world, Vector position,
|
||||||
|
NBTTagCompound tag) {
|
||||||
|
TileEntity normal = TileEntity.createAndLoadEntity(tag);
|
||||||
|
return ForgeWorldEdit.inst.getFMPCompat().overrideTileEntity(world, tag,
|
||||||
|
normal);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void setTileEntity(World world, Vector position,
|
||||||
|
TileEntity tileEntity) {
|
||||||
|
world.setTileEntity(position.getBlockX(), position.getBlockY(),
|
||||||
|
position.getBlockZ(), tileEntity);
|
||||||
|
ForgeWorldEdit.inst.getFMPCompat().sendDescPacket(world, tileEntity);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Construct a tile entity from the given class.
|
* Construct a tile entity from the given class.
|
||||||
@ -139,5 +154,4 @@ final class TileEntityUtils {
|
|||||||
return genericTE;
|
return genericTE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,15 @@
|
|||||||
|
package com.sk89q.worldedit.forge.compat;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
import net.minecraft.tileentity.TileEntity;
|
||||||
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
|
public interface ForgeMultipartCompat {
|
||||||
|
|
||||||
|
TileEntity overrideTileEntity(World world, @Nullable NBTTagCompound tag,
|
||||||
|
TileEntity normal);
|
||||||
|
|
||||||
|
void sendDescPacket(World world, TileEntity entity);
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,33 @@
|
|||||||
|
package com.sk89q.worldedit.forge.compat;
|
||||||
|
|
||||||
|
import codechicken.multipart.MultipartHelper;
|
||||||
|
import codechicken.multipart.TileMultipart;
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
import net.minecraft.tileentity.TileEntity;
|
||||||
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
|
public class ForgeMultipartExistsCompat implements ForgeMultipartCompat {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public TileEntity overrideTileEntity(World world,
|
||||||
|
@Nullable NBTTagCompound tag, TileEntity normal) {
|
||||||
|
if (tag == null) {
|
||||||
|
return normal;
|
||||||
|
}
|
||||||
|
TileEntity tile = MultipartHelper.createTileFromNBT(world, tag);
|
||||||
|
if (tile == null) {
|
||||||
|
return normal;
|
||||||
|
}
|
||||||
|
return tile;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void sendDescPacket(World world, TileEntity entity) {
|
||||||
|
if (entity instanceof TileMultipart) {
|
||||||
|
TileMultipart multi = (TileMultipart) entity;
|
||||||
|
MultipartHelper.sendDescPacket(world, multi);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,19 @@
|
|||||||
|
package com.sk89q.worldedit.forge.compat;
|
||||||
|
|
||||||
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
import net.minecraft.tileentity.TileEntity;
|
||||||
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
|
public class NoForgeMultipartCompat implements ForgeMultipartCompat {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public TileEntity overrideTileEntity(World world, NBTTagCompound tag,
|
||||||
|
TileEntity normal) {
|
||||||
|
return normal;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void sendDescPacket(World world, TileEntity entity) {
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -14,7 +14,8 @@
|
|||||||
"Forge@[${forgeVersion},)"
|
"Forge@[${forgeVersion},)"
|
||||||
],
|
],
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
"Forge@[${forgeVersion},)"
|
"Forge@[${forgeVersion},)",
|
||||||
|
"ForgeMultipart"
|
||||||
],
|
],
|
||||||
"dependants": []
|
"dependants": []
|
||||||
}]
|
}]
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren