Merge remote-tracking branch 'origin/master' into fabric-1.16
# Conflicts: # build.gradle # core/src/main/java/appeng/block/AEBaseBlock.java # core/src/main/java/appeng/block/misc/TinyTNTBlock.java # core/src/main/java/appeng/entity/TinyTNTPrimedRenderer.java # core/src/main/java/appeng/fluids/util/AEFluidStack.java # src/main/java/appeng/core/AEConfig.java # src/main/java/appeng/core/api/definitions/ApiItems.java # src/main/java/appeng/debug/EnergyGeneratorBlockEntity.java # src/main/java/appeng/entity/TinyTNTPrimedEntity.java # src/main/java/appeng/tile/storage/DriveBlockEntity.java
This commit is contained in:
@@ -22,6 +22,7 @@ import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.EnumSet;
|
||||
import java.util.IdentityHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@@ -36,8 +37,8 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.network.PacketByteBuf;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.Identifier;
|
||||
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
|
||||
import appeng.api.AEApi;
|
||||
@@ -111,6 +112,12 @@ public class DriveBlockEntity extends AENetworkInvBlockEntity implements IChestO
|
||||
this.inventoryHandlers = new IdentityHashMap<>();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setOrientation(Direction inForward, Direction inUp) {
|
||||
super.setOrientation(inForward, inUp);
|
||||
this.getProxy().setValidSides(EnumSet.complementOf(EnumSet.of(inForward)));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void writeToStream(final PacketByteBuf data) throws IOException {
|
||||
super.writeToStream(data);
|
||||
|
||||
Reference in New Issue
Block a user