Fix several bugs with fluids (null vs. EMPTY).
Fix IAEFluidStack NBT serialization. Fix fluid export bus not exporting. Fix fluid formation planes. Fix fluid annihilation planes.
This commit is contained in:
@@ -71,7 +71,6 @@ public class PacketCompressedNBT extends AppEngPacket {
|
||||
}
|
||||
}
|
||||
|
||||
// FIXME: this is pointless, PacketBuffer.writeNBT will already compress
|
||||
// api
|
||||
public PacketCompressedNBT(final CompoundNBT din) throws IOException {
|
||||
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
|
||||
package appeng.core.sync.packets;
|
||||
|
||||
import java.util.EnumSet;
|
||||
|
||||
import io.netty.buffer.Unpooled;
|
||||
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
@@ -25,8 +27,12 @@ import net.minecraft.entity.player.ServerPlayerEntity;
|
||||
import net.minecraft.network.PacketBuffer;
|
||||
|
||||
import appeng.api.config.Settings;
|
||||
import appeng.api.util.IConfigManager;
|
||||
import appeng.api.util.IConfigurableObject;
|
||||
import appeng.container.AEBaseContainer;
|
||||
import appeng.core.sync.AppEngPacket;
|
||||
import appeng.core.sync.network.INetworkInfo;
|
||||
import appeng.util.EnumCycler;
|
||||
|
||||
public final class PacketConfigButton extends AppEngPacket {
|
||||
private final Settings option;
|
||||
@@ -54,18 +60,16 @@ public final class PacketConfigButton extends AppEngPacket {
|
||||
@Override
|
||||
public void serverPacketData(final INetworkInfo manager, final PlayerEntity player) {
|
||||
final ServerPlayerEntity sender = (ServerPlayerEntity) player;
|
||||
// FIXME if( sender.openContainer instanceof AEBaseContainer )
|
||||
// FIXME {
|
||||
// FIXME final AEBaseContainer baseContainer = (AEBaseContainer)
|
||||
// sender.openContainer;
|
||||
// FIXME if( baseContainer.getTarget() instanceof IConfigurableObject )
|
||||
// FIXME {
|
||||
// FIXME final IConfigManager cm = ( (IConfigurableObject)
|
||||
// baseContainer.getTarget() ).getConfigManager();
|
||||
// FIXME final Enum<?> newState = EnumCycler.rotateEnum( cm.getSetting(
|
||||
// this.option ), this.rotationDirection, this.option.getPossibleValues() );
|
||||
// FIXME cm.putSetting( this.option, newState );
|
||||
// FIXME }
|
||||
// FIXME }
|
||||
if (sender.openContainer instanceof AEBaseContainer) {
|
||||
final AEBaseContainer baseContainer = (AEBaseContainer) sender.openContainer;
|
||||
if (baseContainer.getTarget() instanceof IConfigurableObject) {
|
||||
final IConfigManager cm = ((IConfigurableObject) baseContainer.getTarget()).getConfigManager();
|
||||
Enum setting = cm.getSetting(this.option);
|
||||
Enum newState = EnumCycler.rotateEnum(setting, this.rotationDirection,
|
||||
(EnumSet) this.option.getPossibleValues());
|
||||
cm.putSetting(this.option, newState);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -24,6 +24,7 @@ import java.io.OutputStream;
|
||||
import java.nio.BufferOverflowException;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.zip.DeflaterOutputStream;
|
||||
import java.util.zip.GZIPInputStream;
|
||||
import java.util.zip.GZIPOutputStream;
|
||||
|
||||
|
||||
@@ -23,10 +23,10 @@ import io.netty.buffer.Unpooled;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.network.PacketBuffer;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
|
||||
import appeng.client.render.effects.MatterCannonFX;
|
||||
import appeng.core.sync.AppEngPacket;
|
||||
import appeng.core.sync.network.INetworkInfo;
|
||||
|
||||
@@ -82,14 +82,9 @@ public class PacketMatterCannon extends AppEngPacket {
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void clientPacketData(final INetworkInfo network, final PlayerEntity player) {
|
||||
try {
|
||||
|
||||
final World world = Minecraft.getInstance().world;
|
||||
for (int a = 1; a < this.len; a++) {
|
||||
// FIXME final MatterCannonFX fx = new MatterCannonFX( world, this.x + this.dx *
|
||||
// a, this.y + this.dy * a, this.z + this.dz * a, new ItemStack( Items.DIAMOND )
|
||||
// );
|
||||
|
||||
// FIXME Minecraft.getInstance().particles.addEffect( fx );
|
||||
Minecraft.getInstance().particles.addParticle(MatterCannonFX.TYPE, this.x + this.dx * a,
|
||||
this.y + this.dy * a, this.z + this.dz * a, 0, 0, 0);
|
||||
}
|
||||
} catch (final Exception ignored) {
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user