Merge remote-tracking branch 'origin/master' into fabric/master

# Conflicts: # gradle.properties # src/main/java/appeng/client/gui/Size1Slot.java # src/main/java/appeng/client/me/SlotFluidME.java # src/main/java/appeng/client/me/SlotME.java # src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java # src/main/java/appeng/client/render/cablebus/CableBusModelLoader.java # src/main/java/appeng/core/sync/packets/MEFluidInventoryUpdatePacket.java # src/main/java/appeng/core/sync/packets/MEInterfaceUpdatePacket.java # src/main/java/appeng/core/sync/packets/MEInventoryUpdatePacket.java # src/main/java/appeng/datagen/providers/loot/BlockDropProvider.java # src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java # src/main/java/appeng/fluids/container/FluidConfigurableContainer.java # src/main/java/appeng/fluids/helper/FluidCellConfig.java # src/main/resources/META-INF/mods.toml
2020-09-02 02:45:31 +02:00
parent 0ac918c363 b756d68be1
commit e34126458b
15 changed files with 214 additions and 330 deletions
@@ -45,7 +45,7 @@ import appeng.api.networking.security.IActionHost;
 import appeng.container.AEBaseContainer;
 import appeng.container.ContainerLocator;
 import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.CompressedNBTPacket;
+import appeng.core.sync.packets.MEInterfaceUpdatePacket;
 import appeng.helpers.DualityInterface;
 import appeng.helpers.IInterfaceHost;
 import appeng.helpers.InventoryAction;
@@ -177,7 +177,7 @@ public final class InterfaceTerminalContainer extends AEBaseContainer {

        if (!this.data.isEmpty()) {
            try {
-                NetworkHandler.instance().sendTo(new CompressedNBTPacket(this.data),
+                NetworkHandler.instance().sendTo(new MEInterfaceUpdatePacket(this.data),
                        (ServerPlayerEntity) this.getPlayerInv().player);
            } catch (final IOException e) {
                // :P