281 lines
12 KiB
Diff
281 lines
12 KiB
Diff
--- ../src-base/minecraft/net/minecraft/tileentity/TileEntity.java
|
|
+++ ../src-work/minecraft/net/minecraft/tileentity/TileEntity.java
|
|
@@ -21,10 +21,10 @@
|
|
import org.apache.logging.log4j.LogManager;
|
|
import org.apache.logging.log4j.Logger;
|
|
|
|
-public abstract class TileEntity
|
|
+public abstract class TileEntity implements net.minecraftforge.common.capabilities.ICapabilitySerializable<NBTTagCompound>
|
|
{
|
|
private static final Logger field_145852_a = LogManager.getLogger();
|
|
- private static final RegistryNamespaced < ResourceLocation, Class <? extends TileEntity >> field_190562_f = new RegistryNamespaced();
|
|
+ private static final RegistryNamespaced < ResourceLocation, Class <? extends TileEntity >> field_190562_f = net.minecraftforge.fml.common.registry.GameData.getTileEntityRegistry();
|
|
protected World field_145850_b;
|
|
protected BlockPos field_174879_c = BlockPos.field_177992_a;
|
|
protected boolean field_145846_f;
|
|
@@ -60,6 +60,8 @@
|
|
public void func_145839_a(NBTTagCompound p_145839_1_)
|
|
{
|
|
this.field_174879_c = new BlockPos(p_145839_1_.func_74762_e("x"), p_145839_1_.func_74762_e("y"), p_145839_1_.func_74762_e("z"));
|
|
+ if (p_145839_1_.func_74764_b("ForgeData")) this.customTileData = p_145839_1_.func_74775_l("ForgeData");
|
|
+ if (this.capabilities != null && p_145839_1_.func_74764_b("ForgeCaps")) this.capabilities.deserializeNBT(p_145839_1_.func_74775_l("ForgeCaps"));
|
|
}
|
|
|
|
public NBTTagCompound func_189515_b(NBTTagCompound p_189515_1_)
|
|
@@ -81,6 +83,8 @@
|
|
p_189516_1_.func_74768_a("x", this.field_174879_c.func_177958_n());
|
|
p_189516_1_.func_74768_a("y", this.field_174879_c.func_177956_o());
|
|
p_189516_1_.func_74768_a("z", this.field_174879_c.func_177952_p());
|
|
+ if (this.customTileData != null) p_189516_1_.func_74782_a("ForgeData", this.customTileData);
|
|
+ if (this.capabilities != null) p_189516_1_.func_74782_a("ForgeCaps", this.capabilities.serializeNBT());
|
|
return p_189516_1_;
|
|
}
|
|
}
|
|
@@ -90,10 +94,11 @@
|
|
{
|
|
TileEntity tileentity = null;
|
|
String s = p_190200_1_.func_74779_i("id");
|
|
+ Class <? extends TileEntity > oclass = null;
|
|
|
|
try
|
|
{
|
|
- Class <? extends TileEntity > oclass = (Class)field_190562_f.func_82594_a(new ResourceLocation(s));
|
|
+ oclass = (Class)field_190562_f.func_82594_a(new ResourceLocation(s));
|
|
|
|
if (oclass != null)
|
|
{
|
|
@@ -103,6 +108,9 @@
|
|
catch (Throwable throwable1)
|
|
{
|
|
field_145852_a.error("Failed to create block entity {}", new Object[] {s, throwable1});
|
|
+ net.minecraftforge.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, throwable1,
|
|
+ "A TileEntity %s(%s) has thrown an exception during loading, its state cannot be restored. Report this to the mod author",
|
|
+ s, oclass.getName());
|
|
}
|
|
|
|
if (tileentity != null)
|
|
@@ -115,6 +123,9 @@
|
|
catch (Throwable throwable)
|
|
{
|
|
field_145852_a.error("Failed to load data for block entity {}", new Object[] {s, throwable});
|
|
+ net.minecraftforge.fml.common.FMLLog.log(org.apache.logging.log4j.Level.ERROR, throwable,
|
|
+ "A TileEntity %s(%s) has thrown an exception during loading, its state cannot be restored. Report this to the mod author",
|
|
+ s, oclass.getName());
|
|
tileentity = null;
|
|
}
|
|
}
|
|
@@ -156,7 +167,6 @@
|
|
}
|
|
}
|
|
|
|
- @SideOnly(Side.CLIENT)
|
|
public double func_145835_a(double p_145835_1_, double p_145835_3_, double p_145835_5_)
|
|
{
|
|
double d0 = (double)this.field_174879_c.func_177958_n() + 0.5D - p_145835_1_;
|
|
@@ -303,6 +313,205 @@
|
|
{
|
|
}
|
|
|
|
+ // -- BEGIN FORGE PATCHES --
|
|
+ /**
|
|
+ * Called when you receive a TileEntityData packet for the location this
|
|
+ * TileEntity is currently in. On the client, the NetworkManager will always
|
|
+ * be the remote server. On the server, it will be whomever is responsible for
|
|
+ * sending the packet.
|
|
+ *
|
|
+ * @param net The NetworkManager the packet originated from
|
|
+ * @param pkt The data packet
|
|
+ */
|
|
+ public void onDataPacket(net.minecraft.network.NetworkManager net, net.minecraft.network.play.server.SPacketUpdateTileEntity pkt)
|
|
+ {
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Called when the chunk's TE update tag, gotten from {@link #getUpdateTag()}, is received on the client.
|
|
+ * <p>
|
|
+ * Used to handle this tag in a special way. By default this simply calls {@link #readFromNBT(NBTTagCompound)}.
|
|
+ *
|
|
+ * @param tag The {@link NBTTagCompound} sent from {@link #getUpdateTag()}
|
|
+ */
|
|
+ public void handleUpdateTag(NBTTagCompound tag)
|
|
+ {
|
|
+ this.func_145839_a(tag);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Called when the chunk this TileEntity is on is Unloaded.
|
|
+ */
|
|
+ public void onChunkUnload()
|
|
+ {
|
|
+ }
|
|
+
|
|
+ private boolean isVanilla = getClass().getName().startsWith("net.minecraft.");
|
|
+ /**
|
|
+ * Called from Chunk.setBlockIDWithMetadata and Chunk.fillChunk, determines if this tile entity should be re-created when the ID, or Metadata changes.
|
|
+ * Use with caution as this will leave straggler TileEntities, or create conflicts with other TileEntities if not used properly.
|
|
+ *
|
|
+ * @param world Current world
|
|
+ * @param pos Tile's world position
|
|
+ * @param oldState The old ID of the block
|
|
+ * @param newState The new ID of the block (May be the same)
|
|
+ * @return true forcing the invalidation of the existing TE, false not to invalidate the existing TE
|
|
+ */
|
|
+ public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newSate)
|
|
+ {
|
|
+ return isVanilla ? (oldState.func_177230_c() != newSate.func_177230_c()) : oldState != newSate;
|
|
+ }
|
|
+
|
|
+ public boolean shouldRenderInPass(int pass)
|
|
+ {
|
|
+ return pass == 0;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Sometimes default render bounding box: infinite in scope. Used to control rendering on {@link TileEntitySpecialRenderer}.
|
|
+ */
|
|
+ public static final net.minecraft.util.math.AxisAlignedBB INFINITE_EXTENT_AABB = new net.minecraft.util.math.AxisAlignedBB(Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY);
|
|
+ /**
|
|
+ * Return an {@link AxisAlignedBB} that controls the visible scope of a {@link TileEntitySpecialRenderer} associated with this {@link TileEntity}
|
|
+ * Defaults to the collision bounding box {@link Block#getCollisionBoundingBoxFromPool(World, int, int, int)} associated with the block
|
|
+ * at this location.
|
|
+ *
|
|
+ * @return an appropriately size {@link AxisAlignedBB} for the {@link TileEntity}
|
|
+ */
|
|
+ @SideOnly(Side.CLIENT)
|
|
+ public net.minecraft.util.math.AxisAlignedBB getRenderBoundingBox()
|
|
+ {
|
|
+ net.minecraft.util.math.AxisAlignedBB bb = INFINITE_EXTENT_AABB;
|
|
+ Block type = func_145838_q();
|
|
+ BlockPos pos = func_174877_v();
|
|
+ if (type == Blocks.field_150381_bn)
|
|
+ {
|
|
+ bb = new net.minecraft.util.math.AxisAlignedBB(pos, pos.func_177982_a(1, 1, 1));
|
|
+ }
|
|
+ else if (type == Blocks.field_150486_ae || type == Blocks.field_150447_bR)
|
|
+ {
|
|
+ bb = new net.minecraft.util.math.AxisAlignedBB(pos.func_177982_a(-1, 0, -1), pos.func_177982_a(2, 2, 2));
|
|
+ }
|
|
+ else if (type == Blocks.field_185779_df)
|
|
+ {
|
|
+ bb = INFINITE_EXTENT_AABB;
|
|
+ }
|
|
+ else if (type != null && type != Blocks.field_150461_bJ)
|
|
+ {
|
|
+ net.minecraft.util.math.AxisAlignedBB cbb = null;
|
|
+ try
|
|
+ {
|
|
+ cbb = field_145850_b.func_180495_p(func_174877_v()).func_185890_d(field_145850_b, pos).func_72321_a(pos.func_177958_n(), pos.func_177956_o(), pos.func_177952_p());
|
|
+ }
|
|
+ catch (Exception e)
|
|
+ {
|
|
+ // We have to capture any exceptions that may occur here because BUKKIT servers like to send
|
|
+ // the tile entity data BEFORE the chunk data, you know, the OPPOSITE of what vanilla does!
|
|
+ // So we can not GARENTEE that the world state is the real state for the block...
|
|
+ // So, once again in the long line of US having to accommodate BUKKIT breaking things,
|
|
+ // here it is, assume that the TE is only 1 cubic block. Problem with this is that it may
|
|
+ // cause the TileEntity renderer to error further down the line! But alas, nothing we can do.
|
|
+ cbb = new net.minecraft.util.math.AxisAlignedBB(func_174877_v().func_177982_a(-1, 0, -1), func_174877_v().func_177982_a(1, 1, 1));
|
|
+ }
|
|
+ if (cbb != null) bb = cbb;
|
|
+ }
|
|
+ return bb;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Checks if this tile entity knows how to render its 'breaking' overlay effect.
|
|
+ * If this returns true, The TileEntitySpecialRenderer will be called again with break progress set.
|
|
+ * @return True to re-render tile with breaking effect.
|
|
+ */
|
|
+ public boolean canRenderBreaking()
|
|
+ {
|
|
+ Block block = this.func_145838_q();
|
|
+ return (block instanceof net.minecraft.block.BlockChest ||
|
|
+ block instanceof net.minecraft.block.BlockEnderChest ||
|
|
+ block instanceof net.minecraft.block.BlockSign ||
|
|
+ block instanceof net.minecraft.block.BlockSkull);
|
|
+ }
|
|
+
|
|
+ private NBTTagCompound customTileData;
|
|
+
|
|
+ /**
|
|
+ * Gets a {@link NBTTagCompound} that can be used to store custom data for this tile entity.
|
|
+ * It will be written, and read from disc, so it persists over world saves.
|
|
+ *
|
|
+ * @return A compound tag for custom data
|
|
+ */
|
|
+ public NBTTagCompound getTileData()
|
|
+ {
|
|
+ if (this.customTileData == null)
|
|
+ {
|
|
+ this.customTileData = new NBTTagCompound();
|
|
+ }
|
|
+ return this.customTileData;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Determines if the player can overwrite the NBT data of this tile entity while they place it using a ItemStack.
|
|
+ * Added as a fix for MC-75630 - Exploit with signs and command blocks
|
|
+ * @return True to prevent NBT copy, false to allow.
|
|
+ */
|
|
+ public boolean restrictNBTCopy()
|
|
+ {
|
|
+ return this instanceof TileEntityCommandBlock ||
|
|
+ this instanceof TileEntityMobSpawner ||
|
|
+ this instanceof TileEntitySign;
|
|
+ }
|
|
+
|
|
+
|
|
+ /**
|
|
+ * Called from the Chunk when this is first added to the world. Override instead of adding
|
|
+ * if (firstTick) stuff in update. Happens after validate and after it has been placed into the Chunk tileEntity
|
|
+ * map.
|
|
+ */
|
|
+ public void onLoad()
|
|
+ {
|
|
+ // NOOP
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * If the TileEntitySpecialRenderer associated with this TileEntity can be batched in with another renderers, and won't access the GL state.
|
|
+ * If TileEntity returns true, then TESR should have the same functionality as (and probably extend) the FastTESR class.
|
|
+ */
|
|
+ public boolean hasFastRenderer()
|
|
+ {
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ private net.minecraftforge.common.capabilities.CapabilityDispatcher capabilities;
|
|
+ public TileEntity()
|
|
+ {
|
|
+ capabilities = net.minecraftforge.event.ForgeEventFactory.gatherCapabilities(this);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean hasCapability(net.minecraftforge.common.capabilities.Capability<?> capability, @Nullable net.minecraft.util.EnumFacing facing)
|
|
+ {
|
|
+ return capabilities == null ? false : capabilities.hasCapability(capability, facing);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ @Nullable
|
|
+ public <T> T getCapability(net.minecraftforge.common.capabilities.Capability<T> capability, @Nullable net.minecraft.util.EnumFacing facing)
|
|
+ {
|
|
+ return capabilities == null ? null : capabilities.getCapability(capability, facing);
|
|
+ }
|
|
+
|
|
+ public void deserializeNBT(NBTTagCompound nbt)
|
|
+ {
|
|
+ this.func_145839_a(nbt);
|
|
+ }
|
|
+
|
|
+ public NBTTagCompound serializeNBT()
|
|
+ {
|
|
+ NBTTagCompound ret = new NBTTagCompound();
|
|
+ this.func_189515_b(ret);
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
static
|
|
{
|
|
func_190560_a("furnace", TileEntityFurnace.class);
|