Update for 1.11. Missing assets, unstable.

This commit is contained in:
mezz committed 2016-12-22 16:47:56 -08:00
1 parent 30d7365518
commit 9611ae08ae
1145 files changed
+15561 -18107

No files matched your search

@@ -5,8 +5,6 @@
******************************************************************************/
package forestry.api.multiblock;
import javax.annotation.Nonnull;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.play.server.SPacketUpdateTileEntity;
@@ -46,8 +44,7 @@ public abstract class MultiblockTileEntityBase<T extends IMultiblockLogic> exten
super.readFromNBT(data);
multiblockLogic.readFromNBT(data);
}
@Nonnull
@Override
public NBTTagCompound writeToNBT(NBTTagCompound data) {
data = super.writeToNBT(data);
@@ -58,30 +55,28 @@ public abstract class MultiblockTileEntityBase<T extends IMultiblockLogic> exten
@Override
public final void invalidate() {
super.invalidate();
multiblockLogic.invalidate(worldObj, this);
multiblockLogic.invalidate(world, this);
}
@Override
public final void onChunkUnload() {
super.onChunkUnload();
multiblockLogic.onChunkUnload(worldObj, this);
multiblockLogic.onChunkUnload(world, this);
}
@Override
public final void validate() {
super.validate();
multiblockLogic.validate(worldObj, this);
multiblockLogic.validate(world, this);
}
/* Network Communication */
@Nonnull
@Override
public SPacketUpdateTileEntity getUpdatePacket() {
return new SPacketUpdateTileEntity(getPos(), 0, getUpdateTag());
}
@Nonnull
@Override
public NBTTagCompound getUpdateTag() {
NBTTagCompound updateTag = super.getUpdateTag();
@@ -99,7 +94,7 @@ public abstract class MultiblockTileEntityBase<T extends IMultiblockLogic> exten
}
@Override
public void handleUpdateTag(@Nonnull NBTTagCompound tag) {
public void handleUpdateTag(NBTTagCompound tag) {
super.handleUpdateTag(tag);
multiblockLogic.decodeDescriptionPacket(tag);
this.decodeDescriptionPacket(tag);