dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename tile -> block entity

Browse Source
This commit is contained in:
raoulvdberge
2021-12-13 10:50:58 +01:00
parent 77e1162c53
commit 5c1aa6ae1f
241 changed files with 1780 additions and 1719 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/refinedmods/refinedstorage/RS.java
View File

@@ -46,7 +46,7 @@ public final class RS {
RSLootFunctions.register();
FMLJavaModLoadingContext.get().getModEventBus().addListener(commonSetup::onCommonSetup);
FMLJavaModLoadingContext.get().getModEventBus().addGenericListener(BlockEntityType.class, commonSetup::onRegisterTiles);
FMLJavaModLoadingContext.get().getModEventBus().addGenericListener(BlockEntityType.class, commonSetup::onRegisterBlockEntities);
FMLJavaModLoadingContext.get().getModEventBus().addGenericListener(RecipeSerializer.class, commonSetup::onRegisterRecipeSerializers);
FMLJavaModLoadingContext.get().getModEventBus().addGenericListener(MenuType.class, commonSetup::onRegisterContainers);
FMLJavaModLoadingContext.get().getModEventBus().addListener(commonSetup::onRegisterCapabilities);

91
src/main/java/com/refinedmods/refinedstorage/RSBlockEntities.java Normal file
View File

@@ -0,0 +1,91 @@
package com.refinedmods.refinedstorage;
import com.refinedmods.refinedstorage.blockentity.*;
import com.refinedmods.refinedstorage.blockentity.craftingmonitor.CraftingMonitorBlockEntity;
import com.refinedmods.refinedstorage.blockentity.grid.GridBlockEntity;
import com.refinedmods.refinedstorage.blockentity.grid.portable.PortableGridBlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraftforge.registries.ObjectHolder;
@ObjectHolder(RS.ID)
public final class RSBlockEntities {
@ObjectHolder("controller")
public static final BlockEntityType<ControllerBlockEntity> CONTROLLER = null;
@ObjectHolder("creative_controller")
public static final BlockEntityType<ControllerBlockEntity> CREATIVE_CONTROLLER = null;
@ObjectHolder("detector")
public static final BlockEntityType<DetectorBlockEntity> DETECTOR = null;
@ObjectHolder("disk_drive")
public static final BlockEntityType<DiskDriveBlockEntity> DISK_DRIVE = null;
@ObjectHolder("exporter")
public static final BlockEntityType<ExporterBlockEntity> EXPORTER = null;
@ObjectHolder("external_storage")
public static final BlockEntityType<ExternalStorageBlockEntity> EXTERNAL_STORAGE = null;
@ObjectHolder("grid")
public static final BlockEntityType<GridBlockEntity> GRID = null;
@ObjectHolder("crafting_grid")
public static final BlockEntityType<GridBlockEntity> CRAFTING_GRID = null;
@ObjectHolder("pattern_grid")
public static final BlockEntityType<GridBlockEntity> PATTERN_GRID = null;
@ObjectHolder("fluid_grid")
public static final BlockEntityType<GridBlockEntity> FLUID_GRID = null;
@ObjectHolder("importer")
public static final BlockEntityType<ImporterBlockEntity> IMPORTER = null;
@ObjectHolder("network_transmitter")
public static final BlockEntityType<NetworkTransmitterBlockEntity> NETWORK_TRANSMITTER = null;
@ObjectHolder("network_receiver")
public static final BlockEntityType<NetworkReceiverBlockEntity> NETWORK_RECEIVER = null;
@ObjectHolder("relay")
public static final BlockEntityType<RelayBlockEntity> RELAY = null;
@ObjectHolder("cable")
public static final BlockEntityType<CableBlockEntity> CABLE = null;
@ObjectHolder("1k_storage_block")
public static final BlockEntityType<StorageBlockEntity> ONE_K_STORAGE_BLOCK = null;
@ObjectHolder("4k_storage_block")
public static final BlockEntityType<StorageBlockEntity> FOUR_K_STORAGE_BLOCK = null;
@ObjectHolder("16k_storage_block")
public static final BlockEntityType<StorageBlockEntity> SIXTEEN_K_STORAGE_BLOCK = null;
@ObjectHolder("64k_storage_block")
public static final BlockEntityType<StorageBlockEntity> SIXTY_FOUR_K_STORAGE_BLOCK = null;
@ObjectHolder("creative_storage_block")
public static final BlockEntityType<StorageBlockEntity> CREATIVE_STORAGE_BLOCK = null;
@ObjectHolder("64k_fluid_storage_block")
public static final BlockEntityType<FluidStorageBlockEntity> SIXTY_FOUR_K_FLUID_STORAGE_BLOCK = null;
@ObjectHolder("256k_fluid_storage_block")
public static final BlockEntityType<FluidStorageBlockEntity> TWO_HUNDRED_FIFTY_SIX_K_FLUID_STORAGE_BLOCK = null;
@ObjectHolder("1024k_fluid_storage_block")
public static final BlockEntityType<FluidStorageBlockEntity> THOUSAND_TWENTY_FOUR_K_FLUID_STORAGE_BLOCK = null;
@ObjectHolder("4096k_fluid_storage_block")
public static final BlockEntityType<FluidStorageBlockEntity> FOUR_THOUSAND_NINETY_SIX_K_FLUID_STORAGE_BLOCK = null;
@ObjectHolder("creative_fluid_storage_block")
public static final BlockEntityType<FluidStorageBlockEntity> CREATIVE_FLUID_STORAGE_BLOCK = null;
@ObjectHolder("security_manager")
public static final BlockEntityType<SecurityManagerBlockEntity> SECURITY_MANAGER = null;
@ObjectHolder("interface")
public static final BlockEntityType<InterfaceBlockEntity> INTERFACE = null;
@ObjectHolder("fluid_interface")
public static final BlockEntityType<FluidInterfaceBlockEntity> FLUID_INTERFACE = null;
@ObjectHolder("wireless_transmitter")
public static final BlockEntityType<WirelessTransmitterBlockEntity> WIRELESS_TRANSMITTER = null;
@ObjectHolder("storage_monitor")
public static final BlockEntityType<StorageMonitorBlockEntity> STORAGE_MONITOR = null;
@ObjectHolder("constructor")
public static final BlockEntityType<ConstructorBlockEntity> CONSTRUCTOR = null;
@ObjectHolder("destructor")
public static final BlockEntityType<DestructorBlockEntity> DESTRUCTOR = null;
@ObjectHolder("disk_manipulator")
public static final BlockEntityType<DiskManipulatorBlockEntity> DISK_MANIPULATOR = null;
@ObjectHolder("portable_grid")
public static final BlockEntityType<PortableGridBlockEntity> PORTABLE_GRID = null;
@ObjectHolder("creative_portable_grid")
public static final BlockEntityType<PortableGridBlockEntity> CREATIVE_PORTABLE_GRID = null;
@ObjectHolder("crafter")
public static final BlockEntityType<CrafterBlockEntity> CRAFTER = null;
@ObjectHolder("crafter_manager")
public static final BlockEntityType<CrafterManagerBlockEntity> CRAFTER_MANAGER = null;
@ObjectHolder("crafting_monitor")
public static final BlockEntityType<CraftingMonitorBlockEntity> CRAFTING_MONITOR = null;
private RSBlockEntities() {
}
}

91
src/main/java/com/refinedmods/refinedstorage/RSTiles.java
View File

@@ -1,91 +0,0 @@
package com.refinedmods.refinedstorage;
import com.refinedmods.refinedstorage.tile.*;
import com.refinedmods.refinedstorage.tile.craftingmonitor.CraftingMonitorTile;
import com.refinedmods.refinedstorage.tile.grid.GridTile;
import com.refinedmods.refinedstorage.tile.grid.portable.PortableGridTile;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraftforge.registries.ObjectHolder;
@ObjectHolder(RS.ID)
public final class RSTiles {
@ObjectHolder("controller")
public static final BlockEntityType<ControllerTile> CONTROLLER = null;
@ObjectHolder("creative_controller")
public static final BlockEntityType<ControllerTile> CREATIVE_CONTROLLER = null;
@ObjectHolder("detector")
public static final BlockEntityType<DetectorTile> DETECTOR = null;
@ObjectHolder("disk_drive")
public static final BlockEntityType<DiskDriveTile> DISK_DRIVE = null;
@ObjectHolder("exporter")
public static final BlockEntityType<ExporterTile> EXPORTER = null;
@ObjectHolder("external_storage")
public static final BlockEntityType<ExternalStorageTile> EXTERNAL_STORAGE = null;
@ObjectHolder("grid")
public static final BlockEntityType<GridTile> GRID = null;
@ObjectHolder("crafting_grid")
public static final BlockEntityType<GridTile> CRAFTING_GRID = null;
@ObjectHolder("pattern_grid")
public static final BlockEntityType<GridTile> PATTERN_GRID = null;
@ObjectHolder("fluid_grid")
public static final BlockEntityType<GridTile> FLUID_GRID = null;
@ObjectHolder("importer")
public static final BlockEntityType<ImporterTile> IMPORTER = null;
@ObjectHolder("network_transmitter")
public static final BlockEntityType<NetworkTransmitterTile> NETWORK_TRANSMITTER = null;
@ObjectHolder("network_receiver")
public static final BlockEntityType<NetworkReceiverTile> NETWORK_RECEIVER = null;
@ObjectHolder("relay")
public static final BlockEntityType<RelayTile> RELAY = null;
@ObjectHolder("cable")
public static final BlockEntityType<CableTile> CABLE = null;
@ObjectHolder("1k_storage_block")
public static final BlockEntityType<StorageTile> ONE_K_STORAGE_BLOCK = null;
@ObjectHolder("4k_storage_block")
public static final BlockEntityType<StorageTile> FOUR_K_STORAGE_BLOCK = null;
@ObjectHolder("16k_storage_block")
public static final BlockEntityType<StorageTile> SIXTEEN_K_STORAGE_BLOCK = null;
@ObjectHolder("64k_storage_block")
public static final BlockEntityType<StorageTile> SIXTY_FOUR_K_STORAGE_BLOCK = null;
@ObjectHolder("creative_storage_block")
public static final BlockEntityType<StorageTile> CREATIVE_STORAGE_BLOCK = null;
@ObjectHolder("64k_fluid_storage_block")
public static final BlockEntityType<FluidStorageTile> SIXTY_FOUR_K_FLUID_STORAGE_BLOCK = null;
@ObjectHolder("256k_fluid_storage_block")
public static final BlockEntityType<FluidStorageTile> TWO_HUNDRED_FIFTY_SIX_K_FLUID_STORAGE_BLOCK = null;
@ObjectHolder("1024k_fluid_storage_block")
public static final BlockEntityType<FluidStorageTile> THOUSAND_TWENTY_FOUR_K_FLUID_STORAGE_BLOCK = null;
@ObjectHolder("4096k_fluid_storage_block")
public static final BlockEntityType<FluidStorageTile> FOUR_THOUSAND_NINETY_SIX_K_FLUID_STORAGE_BLOCK = null;
@ObjectHolder("creative_fluid_storage_block")
public static final BlockEntityType<FluidStorageTile> CREATIVE_FLUID_STORAGE_BLOCK = null;
@ObjectHolder("security_manager")
public static final BlockEntityType<SecurityManagerTile> SECURITY_MANAGER = null;
@ObjectHolder("interface")
public static final BlockEntityType<InterfaceTile> INTERFACE = null;
@ObjectHolder("fluid_interface")
public static final BlockEntityType<FluidInterfaceTile> FLUID_INTERFACE = null;
@ObjectHolder("wireless_transmitter")
public static final BlockEntityType<WirelessTransmitterTile> WIRELESS_TRANSMITTER = null;
@ObjectHolder("storage_monitor")
public static final BlockEntityType<StorageMonitorTile> STORAGE_MONITOR = null;
@ObjectHolder("constructor")
public static final BlockEntityType<ConstructorTile> CONSTRUCTOR = null;
@ObjectHolder("destructor")
public static final BlockEntityType<DestructorTile> DESTRUCTOR = null;
@ObjectHolder("disk_manipulator")
public static final BlockEntityType<DiskManipulatorTile> DISK_MANIPULATOR = null;
@ObjectHolder("portable_grid")
public static final BlockEntityType<PortableGridTile> PORTABLE_GRID = null;
@ObjectHolder("creative_portable_grid")
public static final BlockEntityType<PortableGridTile> CREATIVE_PORTABLE_GRID = null;
@ObjectHolder("crafter")
public static final BlockEntityType<CrafterTile> CRAFTER = null;
@ObjectHolder("crafter_manager")
public static final BlockEntityType<CrafterManagerTile> CRAFTER_MANAGER = null;
@ObjectHolder("crafting_monitor")
public static final BlockEntityType<CraftingMonitorTile> CRAFTING_MONITOR = null;
private RSTiles() {
}
}

10
src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternContainer.java
View File

@@ -59,18 +59,18 @@ public interface ICraftingPatternContainer {
IFluidHandler getConnectedFluidInventory();
/**
* @return the tile that this container is connected to, or null if no tile is present
* @return the block entity that this container is connected to, or null if no block entity is present
*/
@Nullable
BlockEntity getConnectedTile();
BlockEntity getConnectedBlockEntity();
/**
* @return the tile that this container is facing
* @return the block entity that this container is facing
*/
BlockEntity getFacingTile();
BlockEntity getFacingBlockEntity();
/**
* @return the direction to the facing tile
* @return the direction to the facing block entity
*/
Direction getDirection();

6
src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridFactory.java
View File

@@ -35,14 +35,14 @@ public interface IGridFactory {
IGrid createFromBlock(Player player, BlockPos pos);
/**
* Returns a possible tile for this grid if {@link #getType()} is BLOCK.
* Returns a possible block entity for this grid if {@link #getType()} is BLOCK.
*
* @param level the level
* @param pos the position
* @return the tile, or null if no tile is required
* @return the block entity, or null if no block entity is required
*/
@Nullable
BlockEntity getRelevantTile(Level level, BlockPos pos);
BlockEntity getRelevantBlockEntity(Level level, BlockPos pos);
/**
* @return the type

14
src/main/java/com/refinedmods/refinedstorage/api/storage/externalstorage/IExternalStorageProvider.java
View File

@@ -12,20 +12,20 @@ import javax.annotation.Nonnull;
*/
public interface IExternalStorageProvider<T> {
/**
* @param tile the tile
* @param direction the direction of the external storage
* @param blockEntity the block entity
* @param direction the direction of the external storage
* @return true if the provider can provide, false otherwise
*/
boolean canProvide(BlockEntity tile, Direction direction);
boolean canProvide(BlockEntity blockEntity, Direction direction);
/**
* @param context the context of the external storage
* @param tile the tile
* @param direction the direction of the external storage
* @param context the context of the external storage
* @param blockEntity the block entity
* @param direction the direction of the external storage
* @return the external storage handler
*/
@Nonnull
IExternalStorage<T> provide(IExternalStorageContext context, BlockEntity tile, Direction direction);
IExternalStorage<T> provide(IExternalStorageContext context, BlockEntity blockEntity, Direction direction);
/**
* Returns the priority of this external storage provider.

12
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java
View File

@@ -31,9 +31,9 @@ import com.refinedmods.refinedstorage.apiimpl.storage.tracker.FluidStorageTracke
import com.refinedmods.refinedstorage.apiimpl.storage.tracker.ItemStorageTracker;
import com.refinedmods.refinedstorage.block.ControllerBlock;
import com.refinedmods.refinedstorage.energy.BaseEnergyStorage;
import com.refinedmods.refinedstorage.tile.ControllerTile;
import com.refinedmods.refinedstorage.tile.config.IRedstoneConfigurable;
import com.refinedmods.refinedstorage.tile.config.RedstoneMode;
import com.refinedmods.refinedstorage.blockentity.ControllerBlockEntity;
import com.refinedmods.refinedstorage.blockentity.config.IRedstoneConfigurable;
import com.refinedmods.refinedstorage.blockentity.config.RedstoneMode;
import com.refinedmods.refinedstorage.util.StackUtils;
import net.minecraft.Util;
import net.minecraft.core.BlockPos;
@@ -99,10 +99,10 @@ public class Network implements INetwork, IRedstoneConfigurable {
this.type = type;
this.root = new RootNetworkNode(this, level, pos);
this.nodeGraph.addListener(() -> {
BlockEntity tile = level.getBlockEntity(pos);
BlockEntity blockEntity = level.getBlockEntity(pos);
if (tile instanceof ControllerTile) {
((ControllerTile) tile).getDataManager().sendParameterToWatchers(ControllerTile.NODES);
if (blockEntity instanceof ControllerBlockEntity) {
((ControllerBlockEntity) blockEntity).getDataManager().sendParameterToWatchers(ControllerBlockEntity.NODES);
}
});
}

16
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraph.java
View File

@@ -32,7 +32,7 @@ public class NetworkNodeGraph implements INetworkNodeGraph {
Operator operator = new Operator(action);
INetworkNode originNode = NetworkUtils.getNodeFromTile(level.getBlockEntity(origin));
INetworkNode originNode = NetworkUtils.getNodeFromBlockEntity(level.getBlockEntity(origin));
if (originNode instanceof INetworkNodeVisitor) {
((INetworkNodeVisitor) originNode).visit(operator);
}
@@ -100,14 +100,14 @@ public class NetworkNodeGraph implements INetworkNodeGraph {
private final Level level;
private final BlockPos pos;
private final Direction side;
private final BlockEntity tile;
private final BlockEntity blockEntity;
Visitor(INetworkNode node, Level level, BlockPos pos, Direction side, BlockEntity tile) {
Visitor(INetworkNode node, Level level, BlockPos pos, Direction side, BlockEntity blockEntity) {
this.node = node;
this.level = level;
this.pos = pos;
this.side = side;
this.tile = tile;
this.blockEntity = blockEntity;
}
@Override
@@ -117,7 +117,7 @@ public class NetworkNodeGraph implements INetworkNodeGraph {
} else {
for (Direction checkSide : Direction.values()) {
if (checkSide != side) { // Avoid going backward
INetworkNode nodeOnSide = NetworkUtils.getNodeFromTile(tile);
INetworkNode nodeOnSide = NetworkUtils.getNodeFromBlockEntity(blockEntity);
if (nodeOnSide == node) {
operator.apply(level, pos.relative(checkSide), checkSide.getOpposite());
@@ -144,9 +144,9 @@ public class NetworkNodeGraph implements INetworkNodeGraph {
@Override
public void apply(Level level, BlockPos pos, @Nullable Direction side) {
BlockEntity tile = level.getBlockEntity(pos);
BlockEntity blockEntity = level.getBlockEntity(pos);
INetworkNode otherNode = NetworkUtils.getNodeFromTile(tile);
INetworkNode otherNode = NetworkUtils.getNodeFromBlockEntity(blockEntity);
if (otherNode != null) {
NetworkNodeGraphEntry otherNodeItem = new NetworkNodeGraphEntry(otherNode);
@@ -168,7 +168,7 @@ public class NetworkNodeGraph implements INetworkNodeGraph {
previousEntries.remove(otherNodeItem);
toCheck.add(new Visitor(otherNode, level, pos, side, tile));
toCheck.add(new Visitor(otherNode, level, pos, side, blockEntity));
}
}
}

8
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeListener.java
View File

@@ -20,11 +20,11 @@ public class NetworkNodeListener {
if (!e.getWorld().isClientSide() && e.getEntity() instanceof Player) {
Player player = (Player) e.getEntity();
INetworkNode placed = NetworkUtils.getNodeFromTile(e.getWorld().getBlockEntity(e.getPos()));
INetworkNode placed = NetworkUtils.getNodeFromBlockEntity(e.getWorld().getBlockEntity(e.getPos()));
if (placed != null) {
for (Direction facing : Direction.values()) {
INetworkNode node = NetworkUtils.getNodeFromTile(e.getWorld().getBlockEntity(e.getBlockSnapshot().getPos().relative(facing)));
INetworkNode node = NetworkUtils.getNodeFromBlockEntity(e.getWorld().getBlockEntity(e.getBlockSnapshot().getPos().relative(facing)));
if (node != null && node.getNetwork() != null && !node.getNetwork().getSecurityManager().hasPermission(Permission.BUILD, player)) {
WorldUtils.sendNoPermissionMessage(player);
@@ -47,7 +47,7 @@ public class NetworkNodeListener {
private void discoverNode(LevelAccessor world, BlockPos pos) {
for (Direction facing : Direction.values()) {
INetworkNode node = NetworkUtils.getNodeFromTile(world.getBlockEntity(pos.relative(facing)));
INetworkNode node = NetworkUtils.getNodeFromBlockEntity(world.getBlockEntity(pos.relative(facing)));
if (node != null && node.getNetwork() != null) {
node.getNetwork().getNodeGraph().invalidate(Action.PERFORM, node.getNetwork().getLevel(), node.getNetwork().getPosition());
@@ -60,7 +60,7 @@ public class NetworkNodeListener {
@SubscribeEvent
public void onBlockBreak(BlockEvent.BreakEvent e) {
if (!e.getWorld().isClientSide()) {
INetworkNode node = NetworkUtils.getNodeFromTile(e.getWorld().getBlockEntity(e.getPos()));
INetworkNode node = NetworkUtils.getNodeFromBlockEntity(e.getWorld().getBlockEntity(e.getPos()));
if (node != null && node.getNetwork() != null && !node.getNetwork().getSecurityManager().hasPermission(Permission.BUILD, e.getPlayer())) {
WorldUtils.sendNoPermissionMessage(e.getPlayer());

8
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridManager.java
View File

@@ -4,7 +4,7 @@ import com.refinedmods.refinedstorage.api.network.grid.GridFactoryType;
import com.refinedmods.refinedstorage.api.network.grid.IGrid;
import com.refinedmods.refinedstorage.api.network.grid.IGridFactory;
import com.refinedmods.refinedstorage.api.network.grid.IGridManager;
import com.refinedmods.refinedstorage.container.factory.GridContainerProvider;
import com.refinedmods.refinedstorage.container.factory.GridMenuProvider;
import com.refinedmods.refinedstorage.inventory.player.PlayerSlot;
import net.minecraft.core.BlockPos;
import net.minecraft.resources.ResourceLocation;
@@ -43,7 +43,7 @@ public class GridManager implements IGridManager {
return;
}
NetworkHooks.openGui(player, new GridContainerProvider(grid.getLeft(), grid.getRight()), buf -> {
NetworkHooks.openGui(player, new GridMenuProvider(grid.getLeft(), grid.getRight()), buf -> {
buf.writeResourceLocation(id);
buf.writeBoolean(pos != null);
@@ -70,7 +70,7 @@ public class GridManager implements IGridManager {
}
IGrid grid = null;
BlockEntity tile = factory.getRelevantTile(player.level, pos);
BlockEntity blockEntity = factory.getRelevantBlockEntity(player.level, pos);
if (factory.getType() == GridFactoryType.STACK) {
grid = factory.createFromStack(player, stack, slot);
@@ -82,6 +82,6 @@ public class GridManager implements IGridManager {
return null;
}
return Pair.of(grid, tile);
return Pair.of(grid, blockEntity);
}
}

10
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/GridBlockGridFactory.java
View File

@@ -4,8 +4,8 @@ import com.refinedmods.refinedstorage.RS;
import com.refinedmods.refinedstorage.api.network.grid.GridFactoryType;
import com.refinedmods.refinedstorage.api.network.grid.IGrid;
import com.refinedmods.refinedstorage.api.network.grid.IGridFactory;
import com.refinedmods.refinedstorage.blockentity.grid.GridBlockEntity;
import com.refinedmods.refinedstorage.inventory.player.PlayerSlot;
import com.refinedmods.refinedstorage.tile.grid.GridTile;
import net.minecraft.core.BlockPos;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.player.Player;
@@ -27,10 +27,10 @@ public class GridBlockGridFactory implements IGridFactory {
@Override
@Nullable
public IGrid createFromBlock(Player player, BlockPos pos) {
BlockEntity tile = getRelevantTile(player.getCommandSenderWorld(), pos);
BlockEntity blockEntity = getRelevantBlockEntity(player.getCommandSenderWorld(), pos);
if (tile instanceof GridTile) {
return ((GridTile) tile).getNode();
if (blockEntity instanceof GridBlockEntity) {
return ((GridBlockEntity) blockEntity).getNode();
}
return null;
@@ -38,7 +38,7 @@ public class GridBlockGridFactory implements IGridFactory {
@Nullable
@Override
public BlockEntity getRelevantTile(Level level, BlockPos pos) {
public BlockEntity getRelevantBlockEntity(Level level, BlockPos pos) {
return level.getBlockEntity(pos);
}

10
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/PortableGridBlockGridFactory.java
View File

@@ -4,8 +4,8 @@ import com.refinedmods.refinedstorage.RS;
import com.refinedmods.refinedstorage.api.network.grid.GridFactoryType;
import com.refinedmods.refinedstorage.api.network.grid.IGrid;
import com.refinedmods.refinedstorage.api.network.grid.IGridFactory;
import com.refinedmods.refinedstorage.blockentity.grid.portable.PortableGridBlockEntity;
import com.refinedmods.refinedstorage.inventory.player.PlayerSlot;
import com.refinedmods.refinedstorage.tile.grid.portable.PortableGridTile;
import net.minecraft.core.BlockPos;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.player.Player;
@@ -27,10 +27,10 @@ public class PortableGridBlockGridFactory implements IGridFactory {
@Override
@Nullable
public IGrid createFromBlock(Player player, BlockPos pos) {
BlockEntity tile = getRelevantTile(player.level, pos);
BlockEntity blockEntity = getRelevantBlockEntity(player.level, pos);
if (tile instanceof PortableGridTile) {
return (PortableGridTile) tile;
if (blockEntity instanceof PortableGridBlockEntity) {
return (PortableGridBlockEntity) blockEntity;
}
return null;
@@ -38,7 +38,7 @@ public class PortableGridBlockGridFactory implements IGridFactory {
@Nullable
@Override
public BlockEntity getRelevantTile(Level level, BlockPos pos) {
public BlockEntity getRelevantBlockEntity(Level level, BlockPos pos) {
return level.getBlockEntity(pos);
}

4
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/PortableGridGridFactory.java
View File

@@ -4,8 +4,8 @@ import com.refinedmods.refinedstorage.RS;
import com.refinedmods.refinedstorage.api.network.grid.GridFactoryType;
import com.refinedmods.refinedstorage.api.network.grid.IGrid;
import com.refinedmods.refinedstorage.api.network.grid.IGridFactory;
import com.refinedmods.refinedstorage.blockentity.grid.portable.PortableGrid;
import com.refinedmods.refinedstorage.inventory.player.PlayerSlot;
import com.refinedmods.refinedstorage.tile.grid.portable.PortableGrid;
import net.minecraft.core.BlockPos;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.player.Player;
@@ -36,7 +36,7 @@ public class PortableGridGridFactory implements IGridFactory {
@Nullable
@Override
public BlockEntity getRelevantTile(Level level, BlockPos pos) {
public BlockEntity getRelevantBlockEntity(Level level, BlockPos pos) {
return null;
}

4
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/WirelessFluidGridGridFactory.java
View File

@@ -4,8 +4,8 @@ import com.refinedmods.refinedstorage.RS;
import com.refinedmods.refinedstorage.api.network.grid.GridFactoryType;
import com.refinedmods.refinedstorage.api.network.grid.IGrid;
import com.refinedmods.refinedstorage.api.network.grid.IGridFactory;
import com.refinedmods.refinedstorage.blockentity.grid.WirelessFluidGrid;
import com.refinedmods.refinedstorage.inventory.player.PlayerSlot;
import com.refinedmods.refinedstorage.tile.grid.WirelessFluidGrid;
import net.minecraft.core.BlockPos;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.player.Player;
@@ -32,7 +32,7 @@ public class WirelessFluidGridGridFactory implements IGridFactory {
@Nullable
@Override
public BlockEntity getRelevantTile(Level level, BlockPos pos) {
public BlockEntity getRelevantBlockEntity(Level level, BlockPos pos) {
return null;
}

4
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/WirelessGridGridFactory.java
View File

@@ -4,8 +4,8 @@ import com.refinedmods.refinedstorage.RS;
import com.refinedmods.refinedstorage.api.network.grid.GridFactoryType;
import com.refinedmods.refinedstorage.api.network.grid.IGrid;
import com.refinedmods.refinedstorage.api.network.grid.IGridFactory;
import com.refinedmods.refinedstorage.blockentity.grid.WirelessGrid;
import com.refinedmods.refinedstorage.inventory.player.PlayerSlot;
import com.refinedmods.refinedstorage.tile.grid.WirelessGrid;
import net.minecraft.core.BlockPos;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.player.Player;
@@ -32,7 +32,7 @@ public class WirelessGridGridFactory implements IGridFactory {
@Nullable
@Override
public BlockEntity getRelevantTile(Level level, BlockPos pos) {
public BlockEntity getRelevantBlockEntity(Level level, BlockPos pos) {
return null;
}

2
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableFluidGridHandler.java
View File

@@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.api.network.grid.handler.IFluidGridHandler
import com.refinedmods.refinedstorage.api.util.Action;
import com.refinedmods.refinedstorage.api.util.IComparer;
import com.refinedmods.refinedstorage.apiimpl.API;
import com.refinedmods.refinedstorage.tile.grid.portable.IPortableGrid;
import com.refinedmods.refinedstorage.blockentity.grid.portable.IPortableGrid;
import com.refinedmods.refinedstorage.util.StackUtils;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.Containers;

2
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java
View File

@@ -6,7 +6,7 @@ import com.refinedmods.refinedstorage.api.network.grid.handler.IItemGridHandler;
import com.refinedmods.refinedstorage.api.util.Action;
import com.refinedmods.refinedstorage.api.util.IComparer;
import com.refinedmods.refinedstorage.apiimpl.API;
import com.refinedmods.refinedstorage.tile.grid.portable.IPortableGrid;
import com.refinedmods.refinedstorage.blockentity.grid.portable.IPortableGrid;
import net.minecraft.core.Direction;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.item.ItemStack;

6
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java
View File

@@ -6,10 +6,10 @@ import com.refinedmods.refinedstorage.api.network.INetwork;
import com.refinedmods.refinedstorage.api.network.item.INetworkItem;
import com.refinedmods.refinedstorage.api.network.item.INetworkItemManager;
import com.refinedmods.refinedstorage.api.network.security.Permission;
import com.refinedmods.refinedstorage.container.factory.CraftingMonitorContainerProvider;
import com.refinedmods.refinedstorage.blockentity.craftingmonitor.WirelessCraftingMonitor;
import com.refinedmods.refinedstorage.container.factory.CraftingMonitorMenuProvider;
import com.refinedmods.refinedstorage.inventory.player.PlayerSlot;
import com.refinedmods.refinedstorage.item.WirelessCraftingMonitorItem;
import com.refinedmods.refinedstorage.tile.craftingmonitor.WirelessCraftingMonitor;
import com.refinedmods.refinedstorage.util.WorldUtils;
import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.server.level.ServerPlayer;
@@ -61,7 +61,7 @@ public class WirelessCraftingMonitorNetworkItem implements INetworkItem {
NetworkHooks.openGui(
(ServerPlayer) player,
new CraftingMonitorContainerProvider(RSContainers.WIRELESS_CRAFTING_MONITOR, wirelessCraftingMonitor, null), slot::writePlayerSlot);
new CraftingMonitorMenuProvider(RSContainers.WIRELESS_CRAFTING_MONITOR, wirelessCraftingMonitor, null), slot::writePlayerSlot);
drainEnergy(RS.SERVER_CONFIG.getWirelessCraftingMonitor().getOpenUsage());

8
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java
View File

@@ -5,15 +5,15 @@ import com.refinedmods.refinedstorage.api.network.node.ICoverable;
import com.refinedmods.refinedstorage.api.util.Action;
import com.refinedmods.refinedstorage.api.util.IComparer;
import com.refinedmods.refinedstorage.apiimpl.network.node.cover.CoverManager;
import com.refinedmods.refinedstorage.blockentity.ConstructorBlockEntity;
import com.refinedmods.refinedstorage.blockentity.config.IComparable;
import com.refinedmods.refinedstorage.blockentity.config.IType;
import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory;
import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler;
import com.refinedmods.refinedstorage.inventory.item.UpgradeItemHandler;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener;
import com.refinedmods.refinedstorage.item.UpgradeItem;
import com.refinedmods.refinedstorage.tile.ConstructorTile;
import com.refinedmods.refinedstorage.tile.config.IComparable;
import com.refinedmods.refinedstorage.tile.config.IType;
import com.refinedmods.refinedstorage.util.StackUtils;
import com.refinedmods.refinedstorage.util.WorldUtils;
import net.minecraft.core.BlockPos;
@@ -257,7 +257,7 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable,
@Override
public int getType() {
return level.isClientSide ? ConstructorTile.TYPE.getValue() : type;
return level.isClientSide ? ConstructorBlockEntity.TYPE.getValue() : type;
}
@Override

6
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterManagerNetworkNode.java
View File

@@ -4,7 +4,7 @@ import com.refinedmods.refinedstorage.RS;
import com.refinedmods.refinedstorage.api.network.grid.IGrid;
import com.refinedmods.refinedstorage.block.CrafterManagerBlock;
import com.refinedmods.refinedstorage.block.NetworkNodeBlock;
import com.refinedmods.refinedstorage.tile.CrafterManagerTile;
import com.refinedmods.refinedstorage.blockentity.CrafterManagerBlockEntity;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.resources.ResourceLocation;
@@ -35,7 +35,7 @@ public class CrafterManagerNetworkNode extends NetworkNode {
}
public int getSize() {
return level.isClientSide ? CrafterManagerTile.SIZE.getValue() : size;
return level.isClientSide ? CrafterManagerBlockEntity.SIZE.getValue() : size;
}
public void setSize(int size) {
@@ -66,7 +66,7 @@ public class CrafterManagerNetworkNode extends NetworkNode {
}
public int getSearchBoxMode() {
return level.isClientSide ? CrafterManagerTile.SEARCH_BOX_MODE.getValue() : searchBoxMode;
return level.isClientSide ? CrafterManagerBlockEntity.SEARCH_BOX_MODE.getValue() : searchBoxMode;
}
public void setSearchBoxMode(int searchBoxMode) {

21
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java
View File

@@ -260,7 +260,7 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC
return null;
}
return WorldUtils.getItemHandler(proxy.getFacingTile(), proxy.getDirection().getOpposite());
return WorldUtils.getItemHandler(proxy.getFacingBlockEntity(), proxy.getDirection().getOpposite());
}
@Nullable
@@ -271,29 +271,18 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC
return null;
}
return WorldUtils.getFluidHandler(proxy.getFacingTile(), proxy.getDirection().getOpposite());
return WorldUtils.getFluidHandler(proxy.getFacingBlockEntity(), proxy.getDirection().getOpposite());
}
@Override
@Nullable
public BlockEntity getConnectedTile() {
public BlockEntity getConnectedBlockEntity() {
ICraftingPatternContainer proxy = getRootContainer();
if (proxy == null) {
return null;
}
return proxy.getFacingTile();
}
@Nullable
@Override
public BlockEntity getFacingTile() {
BlockPos facingPos = pos.relative(getDirection());
if (!level.isLoaded(facingPos)) {
return null;
}
return level.getBlockEntity(facingPos);
return proxy.getFacingBlockEntity();
}
@Override
@@ -313,7 +302,7 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC
return displayName;
}
BlockEntity facing = getConnectedTile();
BlockEntity facing = getConnectedBlockEntity();
if (facing instanceof Nameable && ((Nameable) facing).getName() != null) {
return ((Nameable) facing).getName();

22
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CraftingMonitorNetworkNode.java
View File

@@ -5,11 +5,11 @@ import com.refinedmods.refinedstorage.api.autocrafting.ICraftingManager;
import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTask;
import com.refinedmods.refinedstorage.block.CraftingMonitorBlock;
import com.refinedmods.refinedstorage.block.NetworkNodeBlock;
import com.refinedmods.refinedstorage.tile.NetworkNodeTile;
import com.refinedmods.refinedstorage.tile.craftingmonitor.CraftingMonitorTile;
import com.refinedmods.refinedstorage.tile.craftingmonitor.ICraftingMonitor;
import com.refinedmods.refinedstorage.tile.data.TileDataManager;
import com.refinedmods.refinedstorage.tile.data.TileDataParameter;
import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity;
import com.refinedmods.refinedstorage.blockentity.craftingmonitor.CraftingMonitorBlockEntity;
import com.refinedmods.refinedstorage.blockentity.craftingmonitor.ICraftingMonitor;
import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationManager;
import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
@@ -62,8 +62,8 @@ public class CraftingMonitorNetworkNode extends NetworkNode implements ICrafting
}
@Override
public TileDataParameter<Integer, ?> getRedstoneModeParameter() {
return NetworkNodeTile.REDSTONE_MODE;
public BlockEntitySynchronizationParameter<Integer, ?> getRedstoneModeParameter() {
return NetworkNodeBlockEntity.REDSTONE_MODE;
}
@Override
@@ -119,7 +119,7 @@ public class CraftingMonitorNetworkNode extends NetworkNode implements ICrafting
@Override
public Optional<UUID> getTabSelected() {
return level.isClientSide ? CraftingMonitorTile.TAB_SELECTED.getValue() : tabSelected;
return level.isClientSide ? CraftingMonitorBlockEntity.TAB_SELECTED.getValue() : tabSelected;
}
public void setTabSelected(Optional<UUID> tabSelected) {
@@ -128,7 +128,7 @@ public class CraftingMonitorNetworkNode extends NetworkNode implements ICrafting
@Override
public int getTabPage() {
return level.isClientSide ? CraftingMonitorTile.TAB_PAGE.getValue() : tabPage;
return level.isClientSide ? CraftingMonitorBlockEntity.TAB_PAGE.getValue() : tabPage;
}
public void setTabPage(int tabPage) {
@@ -137,13 +137,13 @@ public class CraftingMonitorNetworkNode extends NetworkNode implements ICrafting
@Override
public void onTabSelectionChanged(Optional<UUID> tab) {
TileDataManager.setParameter(CraftingMonitorTile.TAB_SELECTED, tab);
BlockEntitySynchronizationManager.setParameter(CraftingMonitorBlockEntity.TAB_SELECTED, tab);
}
@Override
public void onTabPageChanged(int page) {
if (page >= 0) {
TileDataManager.setParameter(CraftingMonitorTile.TAB_PAGE, page);
BlockEntitySynchronizationManager.setParameter(CraftingMonitorBlockEntity.TAB_PAGE, page);
}
}

10
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DestructorNetworkNode.java
View File

@@ -5,16 +5,16 @@ import com.refinedmods.refinedstorage.api.network.node.ICoverable;
import com.refinedmods.refinedstorage.api.util.Action;
import com.refinedmods.refinedstorage.api.util.IComparer;
import com.refinedmods.refinedstorage.apiimpl.network.node.cover.CoverManager;
import com.refinedmods.refinedstorage.blockentity.DestructorBlockEntity;
import com.refinedmods.refinedstorage.blockentity.config.IComparable;
import com.refinedmods.refinedstorage.blockentity.config.IType;
import com.refinedmods.refinedstorage.blockentity.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory;
import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler;
import com.refinedmods.refinedstorage.inventory.item.UpgradeItemHandler;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener;
import com.refinedmods.refinedstorage.item.UpgradeItem;
import com.refinedmods.refinedstorage.tile.DestructorTile;
import com.refinedmods.refinedstorage.tile.config.IComparable;
import com.refinedmods.refinedstorage.tile.config.IType;
import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.util.StackUtils;
import com.refinedmods.refinedstorage.util.WorldUtils;
import net.minecraft.core.BlockPos;
@@ -319,7 +319,7 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I
@Override
public int getType() {
return level.isClientSide ? DestructorTile.TYPE.getValue() : type;
return level.isClientSide ? DestructorBlockEntity.TYPE.getValue() : type;
}
@Override

10
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DetectorNetworkNode.java
View File

@@ -4,14 +4,14 @@ import com.refinedmods.refinedstorage.RS;
import com.refinedmods.refinedstorage.api.network.INetwork;
import com.refinedmods.refinedstorage.api.util.IComparer;
import com.refinedmods.refinedstorage.block.DetectorBlock;
import com.refinedmods.refinedstorage.blockentity.DetectorBlockEntity;
import com.refinedmods.refinedstorage.blockentity.config.IComparable;
import com.refinedmods.refinedstorage.blockentity.config.IType;
import com.refinedmods.refinedstorage.blockentity.config.RedstoneMode;
import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory;
import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener;
import com.refinedmods.refinedstorage.tile.DetectorTile;
import com.refinedmods.refinedstorage.tile.config.IComparable;
import com.refinedmods.refinedstorage.tile.config.IType;
import com.refinedmods.refinedstorage.tile.config.RedstoneMode;
import com.refinedmods.refinedstorage.util.StackUtils;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
@@ -212,7 +212,7 @@ public class DetectorNetworkNode extends NetworkNode implements IComparable, ITy
@Override
public int getType() {
return level.isClientSide ? DetectorTile.TYPE.getValue() : type;
return level.isClientSide ? DetectorBlockEntity.TYPE.getValue() : type;
}
@Override

12
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExporterNetworkNode.java
View File

@@ -6,15 +6,15 @@ import com.refinedmods.refinedstorage.api.util.Action;
import com.refinedmods.refinedstorage.api.util.IComparer;
import com.refinedmods.refinedstorage.apiimpl.API;
import com.refinedmods.refinedstorage.apiimpl.network.node.cover.CoverManager;
import com.refinedmods.refinedstorage.blockentity.ExporterBlockEntity;
import com.refinedmods.refinedstorage.blockentity.config.IComparable;
import com.refinedmods.refinedstorage.blockentity.config.IType;
import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory;
import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler;
import com.refinedmods.refinedstorage.inventory.item.UpgradeItemHandler;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener;
import com.refinedmods.refinedstorage.item.UpgradeItem;
import com.refinedmods.refinedstorage.tile.ExporterTile;
import com.refinedmods.refinedstorage.tile.config.IComparable;
import com.refinedmods.refinedstorage.tile.config.IType;
import com.refinedmods.refinedstorage.util.StackUtils;
import com.refinedmods.refinedstorage.util.WorldUtils;
import net.minecraft.core.BlockPos;
@@ -87,7 +87,7 @@ public class ExporterNetworkNode extends NetworkNode implements IComparable, ITy
if (canUpdate() && ticks % upgrades.getSpeed() == 0 && level.isLoaded(pos)) {
if (type == IType.ITEMS) {
IItemHandler handler = WorldUtils.getItemHandler(getFacingTile(), getDirection().getOpposite());
IItemHandler handler = WorldUtils.getItemHandler(getFacingBlockEntity(), getDirection().getOpposite());
if (handler != null) {
while (filterSlot + 1 < itemFilters.getSlots() && itemFilters.getStackInSlot(filterSlot).isEmpty()) {
@@ -167,7 +167,7 @@ public class ExporterNetworkNode extends NetworkNode implements IComparable, ITy
filterSlot = 0;
}
IFluidHandler handler = WorldUtils.getFluidHandler(getFacingTile(), getDirection().getOpposite());
IFluidHandler handler = WorldUtils.getFluidHandler(getFacingBlockEntity(), getDirection().getOpposite());
if (handler != null) {
FluidStack stack = fluids[filterSlot];
@@ -306,7 +306,7 @@ public class ExporterNetworkNode extends NetworkNode implements IComparable, ITy
@Override
public int getType() {
return level.isClientSide ? ExporterTile.TYPE.getValue() : type;
return level.isClientSide ? ExporterBlockEntity.TYPE.getValue() : type;
}
@Override

16
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExternalStorageNetworkNode.java
View File

@@ -20,8 +20,8 @@ import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory;
import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener;
import com.refinedmods.refinedstorage.tile.ExternalStorageTile;
import com.refinedmods.refinedstorage.tile.config.*;
import com.refinedmods.refinedstorage.blockentity.ExternalStorageBlockEntity;
import com.refinedmods.refinedstorage.blockentity.config.*;
import com.refinedmods.refinedstorage.util.AccessTypeUtils;
import com.refinedmods.refinedstorage.util.StackUtils;
import net.minecraft.core.BlockPos;
@@ -210,13 +210,13 @@ public class ExternalStorageNetworkNode extends NetworkNode implements IStorageP
itemStorages.clear();
fluidStorages.clear();
BlockEntity facing = getFacingTile();
BlockEntity facing = getFacingBlockEntity();
if (facing != null) {
if (type == IType.ITEMS) {
for (IExternalStorageProvider<ItemStack> provider : API.instance().<ItemStack>getExternalStorageProviders(StorageType.ITEM)) {
if (provider.canProvide(facing, getDirection())) {
itemStorages.add(provider.provide(this, getFacingTile(), getDirection()));
itemStorages.add(provider.provide(this, getFacingBlockEntity(), getDirection()));
break;
}
@@ -224,7 +224,7 @@ public class ExternalStorageNetworkNode extends NetworkNode implements IStorageP
} else if (type == IType.FLUIDS) {
for (IExternalStorageProvider<FluidStack> provider : API.instance().<FluidStack>getExternalStorageProviders(StorageType.FLUID)) {
if (provider.canProvide(facing, getDirection())) {
fluidStorages.add(provider.provide(this, getFacingTile(), getDirection()));
fluidStorages.add(provider.provide(this, getFacingBlockEntity(), getDirection()));
break;
}
@@ -253,12 +253,12 @@ public class ExternalStorageNetworkNode extends NetworkNode implements IStorageP
@Override
public long getStored() {
return ExternalStorageTile.STORED.getValue();
return ExternalStorageBlockEntity.STORED.getValue();
}
@Override
public long getCapacity() {
return ExternalStorageTile.CAPACITY.getValue();
return ExternalStorageBlockEntity.CAPACITY.getValue();
}
@Override
@@ -290,7 +290,7 @@ public class ExternalStorageNetworkNode extends NetworkNode implements IStorageP
@Override
public int getType() {
return level.isClientSide ? ExternalStorageTile.TYPE.getValue() : type;
return level.isClientSide ? ExternalStorageBlockEntity.TYPE.getValue() : type;
}
@Override

8
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/FluidInterfaceNetworkNode.java
View File

@@ -13,8 +13,8 @@ import com.refinedmods.refinedstorage.inventory.item.UpgradeItemHandler;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener;
import com.refinedmods.refinedstorage.item.UpgradeItem;
import com.refinedmods.refinedstorage.tile.FluidInterfaceTile;
import com.refinedmods.refinedstorage.tile.config.IType;
import com.refinedmods.refinedstorage.blockentity.FluidInterfaceBlockEntity;
import com.refinedmods.refinedstorage.blockentity.config.IType;
import com.refinedmods.refinedstorage.util.StackUtils;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
@@ -46,7 +46,7 @@ public class FluidInterfaceNetworkNode extends NetworkNode {
super.onContentsChanged();
if (!level.isClientSide) {
((FluidInterfaceTile) level.getBlockEntity(pos)).getDataManager().sendParameterToWatchers(FluidInterfaceTile.TANK_IN);
((FluidInterfaceBlockEntity) level.getBlockEntity(pos)).getDataManager().sendParameterToWatchers(FluidInterfaceBlockEntity.TANK_IN);
}
markDirty();
@@ -251,7 +251,7 @@ public class FluidInterfaceNetworkNode extends NetworkNode {
private void onTankOutChanged() {
if (!level.isClientSide && level.isLoaded(pos)) {
((FluidInterfaceTile) level.getBlockEntity(pos)).getDataManager().sendParameterToWatchers(FluidInterfaceTile.TANK_OUT);
((FluidInterfaceBlockEntity) level.getBlockEntity(pos)).getDataManager().sendParameterToWatchers(FluidInterfaceBlockEntity.TANK_OUT);
}
markDirty();

46
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java
View File

@@ -24,9 +24,9 @@ import com.refinedmods.refinedstorage.inventory.item.validator.ItemValidator;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener;
import com.refinedmods.refinedstorage.item.PatternItem;
import com.refinedmods.refinedstorage.tile.config.IType;
import com.refinedmods.refinedstorage.tile.data.TileDataManager;
import com.refinedmods.refinedstorage.tile.grid.GridTile;
import com.refinedmods.refinedstorage.blockentity.config.IType;
import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationManager;
import com.refinedmods.refinedstorage.blockentity.grid.GridBlockEntity;
import com.refinedmods.refinedstorage.util.StackUtils;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
@@ -204,11 +204,11 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I
private void updateAllowedTags() {
markDirty();
BlockEntity tile = level.getBlockEntity(pos);
BlockEntity blockEntity = level.getBlockEntity(pos);
if (tile instanceof GridTile) {
((GridTile) tile).getDataManager().sendParameterToWatchers(GridTile.ALLOWED_ITEM_TAGS);
((GridTile) tile).getDataManager().sendParameterToWatchers(GridTile.ALLOWED_FLUID_TAGS);
if (blockEntity instanceof GridBlockEntity) {
((GridBlockEntity) blockEntity).getDataManager().sendParameterToWatchers(GridBlockEntity.ALLOWED_ITEM_TAGS);
((GridBlockEntity) blockEntity).getDataManager().sendParameterToWatchers(GridBlockEntity.ALLOWED_FLUID_TAGS);
}
}
@@ -237,7 +237,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I
}
public boolean isProcessingPattern() {
return level.isClientSide ? GridTile.PROCESSING_PATTERN.getValue() : processingPattern;
return level.isClientSide ? GridBlockEntity.PROCESSING_PATTERN.getValue() : processingPattern;
}
public void setProcessingPattern(boolean processingPattern) {
@@ -527,7 +527,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I
@Override
public int getViewType() {
return level.isClientSide ? GridTile.VIEW_TYPE.getValue() : viewType;
return level.isClientSide ? GridBlockEntity.VIEW_TYPE.getValue() : viewType;
}
public void setViewType(int viewType) {
@@ -536,7 +536,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I
@Override
public int getSortingDirection() {
return level.isClientSide ? GridTile.SORTING_DIRECTION.getValue() : sortingDirection;
return level.isClientSide ? GridBlockEntity.SORTING_DIRECTION.getValue() : sortingDirection;
}
public void setSortingDirection(int sortingDirection) {
@@ -545,7 +545,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I
@Override
public int getSortingType() {
return level.isClientSide ? GridTile.SORTING_TYPE.getValue() : sortingType;
return level.isClientSide ? GridBlockEntity.SORTING_TYPE.getValue() : sortingType;
}
public void setSortingType(int sortingType) {
@@ -554,7 +554,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I
@Override
public int getSearchBoxMode() {
return level.isClientSide ? GridTile.SEARCH_BOX_MODE.getValue() : searchBoxMode;
return level.isClientSide ? GridBlockEntity.SEARCH_BOX_MODE.getValue() : searchBoxMode;
}
public void setSearchBoxMode(int searchBoxMode) {
@@ -563,7 +563,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I
@Override
public int getSize() {
return level.isClientSide ? GridTile.SIZE.getValue() : size;
return level.isClientSide ? GridBlockEntity.SIZE.getValue() : size;
}
public void setSize(int size) {
@@ -572,7 +572,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I
@Override
public int getTabSelected() {
return level.isClientSide ? GridTile.TAB_SELECTED.getValue() : tabSelected;
return level.isClientSide ? GridBlockEntity.TAB_SELECTED.getValue() : tabSelected;
}
public void setTabSelected(int tabSelected) {
@@ -581,7 +581,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I
@Override
public int getTabPage() {
return level.isClientSide ? GridTile.TAB_PAGE.getValue() : Math.min(tabPage, getTotalTabPages());
return level.isClientSide ? GridBlockEntity.TAB_PAGE.getValue() : Math.min(tabPage, getTotalTabPages());
}
public void setTabPage(int page) {
@@ -595,44 +595,44 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I
@Override
public void onViewTypeChanged(int type) {
TileDataManager.setParameter(GridTile.VIEW_TYPE, type);
BlockEntitySynchronizationManager.setParameter(GridBlockEntity.VIEW_TYPE, type);
}
@Override
public void onSortingTypeChanged(int type) {
TileDataManager.setParameter(GridTile.SORTING_TYPE, type);
BlockEntitySynchronizationManager.setParameter(GridBlockEntity.SORTING_TYPE, type);
}
@Override
public void onSortingDirectionChanged(int direction) {
TileDataManager.setParameter(GridTile.SORTING_DIRECTION, direction);
BlockEntitySynchronizationManager.setParameter(GridBlockEntity.SORTING_DIRECTION, direction);
}
@Override
public void onSearchBoxModeChanged(int searchBoxMode) {
TileDataManager.setParameter(GridTile.SEARCH_BOX_MODE, searchBoxMode);
BlockEntitySynchronizationManager.setParameter(GridBlockEntity.SEARCH_BOX_MODE, searchBoxMode);
}
@Override
public void onSizeChanged(int size) {
TileDataManager.setParameter(GridTile.SIZE, size);
BlockEntitySynchronizationManager.setParameter(GridBlockEntity.SIZE, size);
}
@Override
public void onTabSelectionChanged(int tab) {
TileDataManager.setParameter(GridTile.TAB_SELECTED, tab);
BlockEntitySynchronizationManager.setParameter(GridBlockEntity.TAB_SELECTED, tab);
}
@Override
public void onTabPageChanged(int page) {
if (page >= 0 && page <= getTotalTabPages()) {
TileDataManager.setParameter(GridTile.TAB_PAGE, page);
BlockEntitySynchronizationManager.setParameter(GridBlockEntity.TAB_PAGE, page);
}
}
@Override
public int getType() {
return level.isClientSide ? GridTile.PROCESSING_TYPE.getValue() : processingType;
return level.isClientSide ? GridBlockEntity.PROCESSING_TYPE.getValue() : processingType;
}
@Override

18
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ImporterNetworkNode.java
View File

@@ -11,11 +11,11 @@ import com.refinedmods.refinedstorage.inventory.item.UpgradeItemHandler;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener;
import com.refinedmods.refinedstorage.item.UpgradeItem;
import com.refinedmods.refinedstorage.tile.DiskDriveTile;
import com.refinedmods.refinedstorage.tile.ImporterTile;
import com.refinedmods.refinedstorage.tile.config.IComparable;
import com.refinedmods.refinedstorage.tile.config.IType;
import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.blockentity.DiskDriveBlockEntity;
import com.refinedmods.refinedstorage.blockentity.ImporterBlockEntity;
import com.refinedmods.refinedstorage.blockentity.config.IComparable;
import com.refinedmods.refinedstorage.blockentity.config.IType;
import com.refinedmods.refinedstorage.blockentity.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.util.StackUtils;
import com.refinedmods.refinedstorage.util.WorldUtils;
import net.minecraft.core.BlockPos;
@@ -67,10 +67,10 @@ public class ImporterNetworkNode extends NetworkNode implements IComparable, IWh
}
if (type == IType.ITEMS) {
BlockEntity facing = getFacingTile();
BlockEntity facing = getFacingBlockEntity();
IItemHandler handler = WorldUtils.getItemHandler(facing, getDirection().getOpposite());
if (facing instanceof DiskDriveTile || handler == null) {
if (facing instanceof DiskDriveBlockEntity || handler == null) {
return;
}
@@ -100,7 +100,7 @@ public class ImporterNetworkNode extends NetworkNode implements IComparable, IWh
}
}
} else if (type == IType.FLUIDS && ticks % upgrades.getSpeed() == 0) {
IFluidHandler handler = WorldUtils.getFluidHandler(getFacingTile(), getDirection().getOpposite());
IFluidHandler handler = WorldUtils.getFluidHandler(getFacingBlockEntity(), getDirection().getOpposite());
if (handler != null) {
FluidStack stack = handler.drain(FluidAttributes.BUCKET_VOLUME, IFluidHandler.FluidAction.SIMULATE);
@@ -223,7 +223,7 @@ public class ImporterNetworkNode extends NetworkNode implements IComparable, IWh
@Override
public int getType() {
return level.isClientSide ? ImporterTile.TYPE.getValue() : type;
return level.isClientSide ? ImporterBlockEntity.TYPE.getValue() : type;
}
@Override

4
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/InterfaceNetworkNode.java
View File

@@ -11,8 +11,8 @@ import com.refinedmods.refinedstorage.inventory.item.ProxyItemHandler;
import com.refinedmods.refinedstorage.inventory.item.UpgradeItemHandler;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener;
import com.refinedmods.refinedstorage.item.UpgradeItem;
import com.refinedmods.refinedstorage.tile.config.IComparable;
import com.refinedmods.refinedstorage.tile.config.IType;
import com.refinedmods.refinedstorage.blockentity.config.IComparable;
import com.refinedmods.refinedstorage.blockentity.config.IType;
import com.refinedmods.refinedstorage.util.StackUtils;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;

13
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkNode.java
View File

@@ -7,7 +7,7 @@ import com.refinedmods.refinedstorage.api.util.Action;
import com.refinedmods.refinedstorage.apiimpl.API;
import com.refinedmods.refinedstorage.block.BaseBlock;
import com.refinedmods.refinedstorage.block.NetworkNodeBlock;
import com.refinedmods.refinedstorage.tile.config.RedstoneMode;
import com.refinedmods.refinedstorage.blockentity.config.RedstoneMode;
import com.refinedmods.refinedstorage.util.NetworkUtils;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
@@ -232,7 +232,7 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor {
@Override
public void visit(Operator operator) {
for (Direction facing : Direction.values()) {
INetworkNode oppositeNode = NetworkUtils.getNodeFromTile(level.getBlockEntity(pos.relative(facing)));
INetworkNode oppositeNode = NetworkUtils.getNodeFromBlockEntity(level.getBlockEntity(pos.relative(facing)));
if (oppositeNode == null) {
continue;
}
@@ -243,8 +243,13 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor {
}
@Nullable
public BlockEntity getFacingTile() {
return level.getBlockEntity(pos.relative(getDirection()));
public BlockEntity getFacingBlockEntity() {
BlockPos facingPos = pos.relative(getDirection());
if (!level.isLoaded(facingPos)) {
return null;
}
return level.getBlockEntity(facingPos);
}
public Direction getDirection() {

6
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java
View File

@@ -8,7 +8,7 @@ import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler;
import com.refinedmods.refinedstorage.inventory.item.validator.ItemValidator;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener;
import com.refinedmods.refinedstorage.item.NetworkCardItem;
import com.refinedmods.refinedstorage.tile.NetworkReceiverTile;
import com.refinedmods.refinedstorage.blockentity.NetworkReceiverBlockEntity;
import com.refinedmods.refinedstorage.util.StackUtils;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
@@ -116,11 +116,11 @@ public class NetworkTransmitterNetworkNode extends NetworkNode {
if (!isSameDimension()) {
Level dimensionWorld = level.getServer().getLevel(receiverDimension);
if (dimensionWorld != null && dimensionWorld.getBlockEntity(receiver) instanceof NetworkReceiverTile) {
if (dimensionWorld != null && dimensionWorld.getBlockEntity(receiver) instanceof NetworkReceiverBlockEntity) {
operator.apply(dimensionWorld, receiver, null);
}
} else {
if (level.getBlockEntity(receiver) instanceof NetworkReceiverTile) {
if (level.getBlockEntity(receiver) instanceof NetworkReceiverBlockEntity) {
operator.apply(level, receiver, null);
}
}

2
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RelayNetworkNode.java
View File

@@ -1,7 +1,7 @@
package com.refinedmods.refinedstorage.apiimpl.network.node;
import com.refinedmods.refinedstorage.RS;
import com.refinedmods.refinedstorage.tile.config.RedstoneMode;
import com.refinedmods.refinedstorage.blockentity.config.RedstoneMode;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceLocation;

10
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/StorageMonitorNetworkNode.java
View File

@@ -8,10 +8,10 @@ import com.refinedmods.refinedstorage.apiimpl.API;
import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory;
import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener;
import com.refinedmods.refinedstorage.tile.StorageMonitorTile;
import com.refinedmods.refinedstorage.tile.config.IComparable;
import com.refinedmods.refinedstorage.tile.config.IType;
import com.refinedmods.refinedstorage.tile.config.RedstoneMode;
import com.refinedmods.refinedstorage.blockentity.StorageMonitorBlockEntity;
import com.refinedmods.refinedstorage.blockentity.config.IComparable;
import com.refinedmods.refinedstorage.blockentity.config.IType;
import com.refinedmods.refinedstorage.blockentity.config.RedstoneMode;
import com.refinedmods.refinedstorage.util.NetworkUtils;
import com.refinedmods.refinedstorage.util.StackUtils;
import com.refinedmods.refinedstorage.util.WorldUtils;
@@ -318,7 +318,7 @@ public class StorageMonitorNetworkNode extends NetworkNode implements IComparabl
@Override
public int getType() {
return level.isClientSide ? StorageMonitorTile.TYPE.getValue() : type;
return level.isClientSide ? StorageMonitorBlockEntity.TYPE.getValue() : type;
}
@Override

6
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java
View File

@@ -14,13 +14,13 @@ import com.refinedmods.refinedstorage.apiimpl.network.node.DiskState;
import com.refinedmods.refinedstorage.apiimpl.network.node.NetworkNode;
import com.refinedmods.refinedstorage.apiimpl.storage.cache.FluidStorageCache;
import com.refinedmods.refinedstorage.apiimpl.storage.cache.ItemStorageCache;
import com.refinedmods.refinedstorage.blockentity.DiskDriveBlockEntity;
import com.refinedmods.refinedstorage.blockentity.config.*;
import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory;
import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler;
import com.refinedmods.refinedstorage.inventory.item.validator.StorageDiskItemValidator;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener;
import com.refinedmods.refinedstorage.tile.DiskDriveTile;
import com.refinedmods.refinedstorage.tile.config.*;
import com.refinedmods.refinedstorage.util.AccessTypeUtils;
import com.refinedmods.refinedstorage.util.StackUtils;
import com.refinedmods.refinedstorage.util.WorldUtils;
@@ -323,7 +323,7 @@ public class DiskDriveNetworkNode extends NetworkNode implements IStorageProvide
@Override
public int getType() {
return level.isClientSide ? DiskDriveTile.TYPE.getValue() : type;
return level.isClientSide ? DiskDriveBlockEntity.TYPE.getValue() : type;
}
@Override

2
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/FluidDriveWrapperStorageDisk.java
View File

@@ -6,7 +6,7 @@ import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskContainerCont
import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskListener;
import com.refinedmods.refinedstorage.api.util.Action;
import com.refinedmods.refinedstorage.apiimpl.network.node.DiskState;
import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.blockentity.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.util.StackUtils;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.resources.ResourceLocation;

2
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/ItemDriveWrapperStorageDisk.java
View File

@@ -6,7 +6,7 @@ import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskContainerCont
import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskListener;
import com.refinedmods.refinedstorage.api.util.Action;
import com.refinedmods.refinedstorage.apiimpl.network.node.DiskState;
import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.blockentity.config.IWhitelistBlacklist;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.ItemStack;

10
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/DiskManipulatorNetworkNode.java
View File

@@ -9,6 +9,10 @@ import com.refinedmods.refinedstorage.api.util.IComparer;
import com.refinedmods.refinedstorage.api.util.StackListEntry;
import com.refinedmods.refinedstorage.apiimpl.network.node.DiskState;
import com.refinedmods.refinedstorage.apiimpl.network.node.NetworkNode;
import com.refinedmods.refinedstorage.blockentity.DiskManipulatorBlockEntity;
import com.refinedmods.refinedstorage.blockentity.config.IComparable;
import com.refinedmods.refinedstorage.blockentity.config.IType;
import com.refinedmods.refinedstorage.blockentity.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory;
import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler;
import com.refinedmods.refinedstorage.inventory.item.ProxyItemHandler;
@@ -17,10 +21,6 @@ import com.refinedmods.refinedstorage.inventory.item.validator.StorageDiskItemVa
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener;
import com.refinedmods.refinedstorage.item.UpgradeItem;
import com.refinedmods.refinedstorage.tile.DiskManipulatorTile;
import com.refinedmods.refinedstorage.tile.config.IComparable;
import com.refinedmods.refinedstorage.tile.config.IType;
import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.util.StackUtils;
import com.refinedmods.refinedstorage.util.WorldUtils;
import net.minecraft.core.BlockPos;
@@ -413,7 +413,7 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab
@Override
public int getType() {
return level.isClientSide ? DiskManipulatorTile.TYPE.getValue() : type;
return level.isClientSide ? DiskManipulatorBlockEntity.TYPE.getValue() : type;
}
@Override

2
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskFluidManipulatorWrapper.java
View File

@@ -6,7 +6,7 @@ import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskContainerCont
import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskListener;
import com.refinedmods.refinedstorage.api.util.Action;
import com.refinedmods.refinedstorage.apiimpl.network.node.DiskState;
import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.blockentity.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.util.StackUtils;
import com.refinedmods.refinedstorage.util.WorldUtils;
import net.minecraft.nbt.CompoundTag;

2
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskItemManipulatorWrapper.java
View File

@@ -6,7 +6,7 @@ import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskContainerCont
import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskListener;
import com.refinedmods.refinedstorage.api.util.Action;
import com.refinedmods.refinedstorage.apiimpl.network.node.DiskState;
import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.blockentity.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.util.WorldUtils;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.resources.ResourceLocation;

12
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/FluidStorageNetworkNode.java
View File

@@ -15,13 +15,13 @@ import com.refinedmods.refinedstorage.apiimpl.network.node.IStorageScreen;
import com.refinedmods.refinedstorage.apiimpl.network.node.NetworkNode;
import com.refinedmods.refinedstorage.apiimpl.storage.FluidStorageType;
import com.refinedmods.refinedstorage.apiimpl.storage.cache.FluidStorageCache;
import com.refinedmods.refinedstorage.blockentity.FluidStorageBlockEntity;
import com.refinedmods.refinedstorage.blockentity.config.IAccessType;
import com.refinedmods.refinedstorage.blockentity.config.IComparable;
import com.refinedmods.refinedstorage.blockentity.config.IPrioritizable;
import com.refinedmods.refinedstorage.blockentity.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInventoryListener;
import com.refinedmods.refinedstorage.tile.FluidStorageTile;
import com.refinedmods.refinedstorage.tile.config.IAccessType;
import com.refinedmods.refinedstorage.tile.config.IComparable;
import com.refinedmods.refinedstorage.tile.config.IPrioritizable;
import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.util.AccessTypeUtils;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
@@ -252,7 +252,7 @@ public class FluidStorageNetworkNode extends NetworkNode implements IStorageScre
@Override
public long getStored() {
return FluidStorageTile.STORED.getValue();
return FluidStorageBlockEntity.STORED.getValue();
}
@Override

2
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/FluidStorageWrapperStorageDisk.java
View File

@@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk;
import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskContainerContext;
import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskListener;
import com.refinedmods.refinedstorage.api.util.Action;
import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.blockentity.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.util.StackUtils;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.resources.ResourceLocation;

2
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/ItemStorageWrapperStorageDisk.java
View File

@@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk;
import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskContainerContext;
import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskListener;
import com.refinedmods.refinedstorage.api.util.Action;
import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.blockentity.config.IWhitelistBlacklist;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.ItemStack;

12
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/StorageNetworkNode.java
View File

@@ -15,13 +15,13 @@ import com.refinedmods.refinedstorage.apiimpl.network.node.IStorageScreen;
import com.refinedmods.refinedstorage.apiimpl.network.node.NetworkNode;
import com.refinedmods.refinedstorage.apiimpl.storage.ItemStorageType;
import com.refinedmods.refinedstorage.apiimpl.storage.cache.ItemStorageCache;
import com.refinedmods.refinedstorage.blockentity.StorageBlockEntity;
import com.refinedmods.refinedstorage.blockentity.config.IAccessType;
import com.refinedmods.refinedstorage.blockentity.config.IComparable;
import com.refinedmods.refinedstorage.blockentity.config.IPrioritizable;
import com.refinedmods.refinedstorage.blockentity.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler;
import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener;
import com.refinedmods.refinedstorage.tile.StorageTile;
import com.refinedmods.refinedstorage.tile.config.IAccessType;
import com.refinedmods.refinedstorage.tile.config.IComparable;
import com.refinedmods.refinedstorage.tile.config.IPrioritizable;
import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.util.AccessTypeUtils;
import com.refinedmods.refinedstorage.util.StackUtils;
import net.minecraft.core.BlockPos;
@@ -251,7 +251,7 @@ public class StorageNetworkNode extends NetworkNode implements IStorageScreen, I
@Override
public long getStored() {
return StorageTile.STORED.getValue();
return StorageBlockEntity.STORED.getValue();
}
@Override

2
src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/PortableFluidStorageCache.java vendored
View File

@@ -7,7 +7,7 @@ import com.refinedmods.refinedstorage.api.storage.cache.InvalidateCause;
import com.refinedmods.refinedstorage.api.util.IStackList;
import com.refinedmods.refinedstorage.api.util.StackListResult;
import com.refinedmods.refinedstorage.apiimpl.API;
import com.refinedmods.refinedstorage.tile.grid.portable.IPortableGrid;
import com.refinedmods.refinedstorage.blockentity.grid.portable.IPortableGrid;
import net.minecraftforge.fluids.FluidStack;
import javax.annotation.Nonnull;

2
src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/PortableItemStorageCache.java vendored
View File

@@ -7,7 +7,7 @@ import com.refinedmods.refinedstorage.api.storage.cache.InvalidateCause;
import com.refinedmods.refinedstorage.api.util.IStackList;
import com.refinedmods.refinedstorage.api.util.StackListResult;
import com.refinedmods.refinedstorage.apiimpl.API;
import com.refinedmods.refinedstorage.tile.grid.portable.IPortableGrid;
import com.refinedmods.refinedstorage.blockentity.grid.portable.IPortableGrid;
import net.minecraft.world.item.ItemStack;
import javax.annotation.Nonnull;

2
src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/PortableFluidGridStorageCacheListener.java vendored
View File

@@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.api.storage.cache.IStorageCacheListener;
import com.refinedmods.refinedstorage.api.util.StackListResult;
import com.refinedmods.refinedstorage.network.grid.PortableGridFluidDeltaMessage;
import com.refinedmods.refinedstorage.network.grid.PortableGridFluidUpdateMessage;
import com.refinedmods.refinedstorage.tile.grid.portable.IPortableGrid;
import com.refinedmods.refinedstorage.blockentity.grid.portable.IPortableGrid;
import net.minecraft.server.level.ServerPlayer;
import net.minecraftforge.fluids.FluidStack;

2
src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/PortableItemGridStorageCacheListener.java vendored
View File

@@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.api.storage.cache.IStorageCacheListener;
import com.refinedmods.refinedstorage.api.util.StackListResult;
import com.refinedmods.refinedstorage.network.grid.PortableGridItemDeltaMessage;
import com.refinedmods.refinedstorage.network.grid.PortableGridItemUpdateMessage;
import com.refinedmods.refinedstorage.tile.grid.portable.IPortableGrid;
import com.refinedmods.refinedstorage.blockentity.grid.portable.IPortableGrid;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.item.ItemStack;

2
src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/PortableFluidStorageDisk.java
View File

@@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk;
import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskContainerContext;
import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskListener;
import com.refinedmods.refinedstorage.api.util.Action;
import com.refinedmods.refinedstorage.tile.grid.portable.IPortableGrid;
import com.refinedmods.refinedstorage.blockentity.grid.portable.IPortableGrid;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.fluids.FluidStack;

2
src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/PortableItemStorageDisk.java
View File

@@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk;
import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskContainerContext;
import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskListener;
import com.refinedmods.refinedstorage.api.util.Action;
import com.refinedmods.refinedstorage.tile.grid.portable.IPortableGrid;
import com.refinedmods.refinedstorage.blockentity.grid.portable.IPortableGrid;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.ItemStack;

14
src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageProvider.java
View File

@@ -3,7 +3,7 @@ package com.refinedmods.refinedstorage.apiimpl.storage.externalstorage;
import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorage;
import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorageContext;
import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorageProvider;
import com.refinedmods.refinedstorage.tile.FluidInterfaceTile;
import com.refinedmods.refinedstorage.blockentity.FluidInterfaceBlockEntity;
import com.refinedmods.refinedstorage.util.WorldUtils;
import net.minecraft.core.Direction;
import net.minecraft.world.level.block.entity.BlockEntity;
@@ -13,20 +13,20 @@ import javax.annotation.Nonnull;
public class FluidExternalStorageProvider implements IExternalStorageProvider<FluidStack> {
@Override
public boolean canProvide(BlockEntity tile, Direction direction) {
return WorldUtils.getFluidHandler(tile, direction.getOpposite()) != null;
public boolean canProvide(BlockEntity blockEntity, Direction direction) {
return WorldUtils.getFluidHandler(blockEntity, direction.getOpposite()) != null;
}
@Nonnull
@Override
public IExternalStorage<FluidStack> provide(IExternalStorageContext context, BlockEntity tile, Direction direction) {
public IExternalStorage<FluidStack> provide(IExternalStorageContext context, BlockEntity blockEntity, Direction direction) {
return new FluidExternalStorage(context, () -> {
if (!tile.getLevel().isLoaded(tile.getBlockPos())) {
if (!blockEntity.getLevel().isLoaded(blockEntity.getBlockPos())) {
return null;
}
return WorldUtils.getFluidHandler(tile, direction.getOpposite());
}, tile instanceof FluidInterfaceTile);
return WorldUtils.getFluidHandler(blockEntity, direction.getOpposite());
}, blockEntity instanceof FluidInterfaceBlockEntity);
}
@Override

16
src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorageProvider.java
View File

@@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.api.storage.IStorageProvider;
import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorage;
import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorageContext;
import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorageProvider;
import com.refinedmods.refinedstorage.tile.InterfaceTile;
import com.refinedmods.refinedstorage.blockentity.InterfaceBlockEntity;
import com.refinedmods.refinedstorage.util.NetworkUtils;
import com.refinedmods.refinedstorage.util.WorldUtils;
import net.minecraft.core.Direction;
@@ -16,26 +16,26 @@ import javax.annotation.Nonnull;
public class ItemExternalStorageProvider implements IExternalStorageProvider<ItemStack> {
@Override
public boolean canProvide(BlockEntity tile, Direction direction) {
INetworkNode node = NetworkUtils.getNodeFromTile(tile);
public boolean canProvide(BlockEntity blockEntity, Direction direction) {
INetworkNode node = NetworkUtils.getNodeFromBlockEntity(blockEntity);
if (node instanceof IStorageProvider) {
return false;
}
return WorldUtils.getItemHandler(tile, direction.getOpposite()) != null;
return WorldUtils.getItemHandler(blockEntity, direction.getOpposite()) != null;
}
@Nonnull
@Override
public IExternalStorage<ItemStack> provide(IExternalStorageContext context, BlockEntity tile, Direction direction) {
public IExternalStorage<ItemStack> provide(IExternalStorageContext context, BlockEntity blockEntity, Direction direction) {
return new ItemExternalStorage(context, () -> {
if (!tile.getLevel().isLoaded(tile.getBlockPos())) {
if (!blockEntity.getLevel().isLoaded(blockEntity.getBlockPos())) {
return null;
}
return WorldUtils.getItemHandler(tile, direction.getOpposite());
}, tile instanceof InterfaceTile);
return WorldUtils.getItemHandler(blockEntity, direction.getOpposite());
}, blockEntity instanceof InterfaceBlockEntity);
}
@Override

18
src/main/java/com/refinedmods/refinedstorage/block/CableBlock.java
View File

@@ -8,7 +8,7 @@ import com.refinedmods.refinedstorage.apiimpl.network.node.cover.CoverType;
import com.refinedmods.refinedstorage.block.shape.ShapeCache;
import com.refinedmods.refinedstorage.capability.NetworkNodeProxyCapability;
import com.refinedmods.refinedstorage.render.ConstantsCable;
import com.refinedmods.refinedstorage.tile.CableTile;
import com.refinedmods.refinedstorage.blockentity.CableBlockEntity;
import com.refinedmods.refinedstorage.util.BlockUtils;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
@@ -190,22 +190,22 @@ public class CableBlock extends NetworkNodeBlock implements SimpleWaterloggedBlo
return false;
}
BlockEntity tile = world.getBlockEntity(pos);
if (tile == null) {
BlockEntity blockEntity = world.getBlockEntity(pos);
if (blockEntity == null) {
return false;
}
return tile.getCapability(NetworkNodeProxyCapability.NETWORK_NODE_PROXY_CAPABILITY, direction).isPresent()
&& !isSideCovered(tile, direction)
return blockEntity.getCapability(NetworkNodeProxyCapability.NETWORK_NODE_PROXY_CAPABILITY, direction).isPresent()
&& !isSideCovered(blockEntity, direction)
&& !isSideCovered(world.getBlockEntity(pos.relative(direction)), direction.getOpposite());
}
private boolean isSideCovered(BlockEntity tile, Direction direction) {
if (tile == null) {
private boolean isSideCovered(BlockEntity blockEntity, Direction direction) {
if (blockEntity == null) {
return false;
}
Optional<INetworkNode> node = tile.getCapability(NetworkNodeProxyCapability.NETWORK_NODE_PROXY_CAPABILITY, direction).map(INetworkNodeProxy::getNode);
Optional<INetworkNode> node = blockEntity.getCapability(NetworkNodeProxyCapability.NETWORK_NODE_PROXY_CAPABILITY, direction).map(INetworkNodeProxy::getNode);
if (node.isPresent() && node.get() instanceof ICoverable) {
Cover cover = ((ICoverable) node.get()).getCoverManager().getCover(direction);
@@ -238,7 +238,7 @@ public class CableBlock extends NetworkNodeBlock implements SimpleWaterloggedBlo
@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new CableTile(pos, state);
return new CableBlockEntity(pos, state);
}
@Override

10
src/main/java/com/refinedmods/refinedstorage/block/ConstructorBlock.java
View File

@@ -2,9 +2,9 @@ package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.block.shape.ShapeCache;
import com.refinedmods.refinedstorage.container.ConstructorContainer;
import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider;
import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider;
import com.refinedmods.refinedstorage.render.ConstantsCable;
import com.refinedmods.refinedstorage.tile.ConstructorTile;
import com.refinedmods.refinedstorage.blockentity.ConstructorBlockEntity;
import com.refinedmods.refinedstorage.util.BlockUtils;
import com.refinedmods.refinedstorage.util.CollisionUtils;
import com.refinedmods.refinedstorage.util.NetworkUtils;
@@ -44,7 +44,7 @@ public class ConstructorBlock extends CableBlock {
@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new ConstructorTile(pos, state);
return new ConstructorBlockEntity(pos, state);
}
@Override
@@ -94,9 +94,9 @@ public class ConstructorBlock extends CableBlock {
if (!level.isClientSide && CollisionUtils.isInBounds(getHeadShape(state), pos, hit.getLocation())) {
return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui(
(ServerPlayer) player,
new PositionalTileContainerProvider<ConstructorTile>(
new BlockEntityMenuProvider<ConstructorBlockEntity>(
new TranslatableComponent("gui.refinedstorage.constructor"),
(tile, windowId, inventory, p) -> new ConstructorContainer(tile, player, windowId),
(blockEntity, windowId, inventory, p) -> new ConstructorContainer(blockEntity, player, windowId),
pos
),
pos

12
src/main/java/com/refinedmods/refinedstorage/block/ControllerBlock.java
View File

@@ -6,7 +6,7 @@ import com.refinedmods.refinedstorage.api.network.NetworkType;
import com.refinedmods.refinedstorage.apiimpl.API;
import com.refinedmods.refinedstorage.apiimpl.network.Network;
import com.refinedmods.refinedstorage.container.ControllerContainer;
import com.refinedmods.refinedstorage.tile.ControllerTile;
import com.refinedmods.refinedstorage.blockentity.ControllerBlockEntity;
import com.refinedmods.refinedstorage.util.BlockUtils;
import com.refinedmods.refinedstorage.util.ColorMap;
import com.refinedmods.refinedstorage.util.NetworkUtils;
@@ -66,10 +66,10 @@ public class ControllerBlock extends BaseBlock implements EntityBlock {
if (!level.isClientSide) {
stack.getCapability(CapabilityEnergy.ENERGY).ifPresent(energyFromStack -> {
BlockEntity tile = level.getBlockEntity(pos);
BlockEntity blockEntity = level.getBlockEntity(pos);
if (tile != null) {
tile.getCapability(CapabilityEnergy.ENERGY).ifPresent(energyFromTile -> energyFromTile.receiveEnergy(energyFromStack.getEnergyStored(), false));
if (blockEntity != null) {
blockEntity.getCapability(CapabilityEnergy.ENERGY).ifPresent(energyFromBlockEntity -> energyFromBlockEntity.receiveEnergy(energyFromStack.getEnergyStored(), false));
}
});
}
@@ -116,7 +116,7 @@ public class ControllerBlock extends BaseBlock implements EntityBlock {
@Override
public AbstractContainerMenu createMenu(int i, Inventory playerInventory, Player player) {
return new ControllerContainer((ControllerTile) level.getBlockEntity(pos), player, i);
return new ControllerContainer((ControllerBlockEntity) level.getBlockEntity(pos), player, i);
}
},
pos
@@ -136,7 +136,7 @@ public class ControllerBlock extends BaseBlock implements EntityBlock {
@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new ControllerTile(type, pos, state);
return new ControllerBlockEntity(type, pos, state);
}
public enum EnergyType implements StringRepresentable {

20
src/main/java/com/refinedmods/refinedstorage/block/CrafterBlock.java
View File

@@ -3,8 +3,8 @@ package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.RSBlocks;
import com.refinedmods.refinedstorage.api.network.security.Permission;
import com.refinedmods.refinedstorage.container.CrafterContainer;
import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider;
import com.refinedmods.refinedstorage.tile.CrafterTile;
import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider;
import com.refinedmods.refinedstorage.blockentity.CrafterBlockEntity;
import com.refinedmods.refinedstorage.util.BlockUtils;
import com.refinedmods.refinedstorage.util.NetworkUtils;
import net.minecraft.core.BlockPos;
@@ -37,11 +37,11 @@ public class CrafterBlock extends ColoredNetworkBlock {
super.setPlacedBy(level, pos, state, placer, stack);
if (!level.isClientSide) {
BlockEntity tile = level.getBlockEntity(pos);
BlockEntity blockEntity = level.getBlockEntity(pos);
if (tile instanceof CrafterTile && stack.hasCustomHoverName()) {
((CrafterTile) tile).getNode().setDisplayName(stack.getHoverName());
((CrafterTile) tile).getNode().markDirty();
if (blockEntity instanceof CrafterBlockEntity && stack.hasCustomHoverName()) {
((CrafterBlockEntity) blockEntity).getNode().setDisplayName(stack.getHoverName());
((CrafterBlockEntity) blockEntity).getNode().markDirty();
}
}
}
@@ -57,9 +57,9 @@ public class CrafterBlock extends ColoredNetworkBlock {
if (!level.isClientSide) {
return NetworkUtils.attempt(level, pos, player, () -> NetworkHooks.openGui(
(ServerPlayer) player,
new PositionalTileContainerProvider<CrafterTile>(
((CrafterTile) level.getBlockEntity(pos)).getNode().getName(),
(tile, windowId, inventory, p) -> new CrafterContainer(tile, player, windowId),
new BlockEntityMenuProvider<CrafterBlockEntity>(
((CrafterBlockEntity) level.getBlockEntity(pos)).getNode().getName(),
(blockEntity, windowId, inventory, p) -> new CrafterContainer(blockEntity, player, windowId),
pos
),
pos
@@ -76,6 +76,6 @@ public class CrafterBlock extends ColoredNetworkBlock {
@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new CrafterTile(pos, state);
return new CrafterBlockEntity(pos, state);
}
}

10
src/main/java/com/refinedmods/refinedstorage/block/CrafterManagerBlock.java
View File

@@ -2,8 +2,8 @@ package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.RSBlocks;
import com.refinedmods.refinedstorage.api.network.security.Permission;
import com.refinedmods.refinedstorage.container.factory.CrafterManagerContainerProvider;
import com.refinedmods.refinedstorage.tile.CrafterManagerTile;
import com.refinedmods.refinedstorage.container.factory.CrafterManagerMenuProvider;
import com.refinedmods.refinedstorage.blockentity.CrafterManagerBlockEntity;
import com.refinedmods.refinedstorage.util.BlockUtils;
import com.refinedmods.refinedstorage.util.NetworkUtils;
import net.minecraft.core.BlockPos;
@@ -29,7 +29,7 @@ public class CrafterManagerBlock extends ColoredNetworkBlock {
@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new CrafterManagerTile(pos, state);
return new CrafterManagerBlockEntity(pos, state);
}
@Override
@@ -43,8 +43,8 @@ public class CrafterManagerBlock extends ColoredNetworkBlock {
if (!level.isClientSide) {
return NetworkUtils.attempt(level, pos, player, () -> NetworkHooks.openGui(
(ServerPlayer) player,
new CrafterManagerContainerProvider((CrafterManagerTile) level.getBlockEntity(pos)),
buf -> CrafterManagerContainerProvider.writeToBuffer(buf, level, pos)
new CrafterManagerMenuProvider((CrafterManagerBlockEntity) level.getBlockEntity(pos)),
buf -> CrafterManagerMenuProvider.writeToBuffer(buf, level, pos)
), Permission.MODIFY, Permission.AUTOCRAFTING);
}

10
src/main/java/com/refinedmods/refinedstorage/block/CraftingMonitorBlock.java
View File

@@ -3,8 +3,8 @@ package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.RSBlocks;
import com.refinedmods.refinedstorage.RSContainers;
import com.refinedmods.refinedstorage.api.network.security.Permission;
import com.refinedmods.refinedstorage.container.factory.CraftingMonitorContainerProvider;
import com.refinedmods.refinedstorage.tile.craftingmonitor.CraftingMonitorTile;
import com.refinedmods.refinedstorage.container.factory.CraftingMonitorMenuProvider;
import com.refinedmods.refinedstorage.blockentity.craftingmonitor.CraftingMonitorBlockEntity;
import com.refinedmods.refinedstorage.util.BlockUtils;
import com.refinedmods.refinedstorage.util.NetworkUtils;
import net.minecraft.core.BlockPos;
@@ -30,7 +30,7 @@ public class CraftingMonitorBlock extends ColoredNetworkBlock {
@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new CraftingMonitorTile(pos, state);
return new CraftingMonitorBlockEntity(pos, state);
}
@Override
@@ -42,11 +42,11 @@ public class CraftingMonitorBlock extends ColoredNetworkBlock {
}
if (!level.isClientSide) {
CraftingMonitorTile tile = (CraftingMonitorTile) level.getBlockEntity(pos);
CraftingMonitorBlockEntity blockEntity = (CraftingMonitorBlockEntity) level.getBlockEntity(pos);
return NetworkUtils.attempt(level, pos, player, () -> NetworkHooks.openGui(
(ServerPlayer) player,
new CraftingMonitorContainerProvider(RSContainers.CRAFTING_MONITOR, tile.getNode(), tile),
new CraftingMonitorMenuProvider(RSContainers.CRAFTING_MONITOR, blockEntity.getNode(), blockEntity),
pos
), Permission.MODIFY, Permission.AUTOCRAFTING);
}

10
src/main/java/com/refinedmods/refinedstorage/block/DestructorBlock.java
View File

@@ -2,9 +2,9 @@ package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.block.shape.ShapeCache;
import com.refinedmods.refinedstorage.container.DestructorContainer;
import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider;
import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider;
import com.refinedmods.refinedstorage.render.ConstantsCable;
import com.refinedmods.refinedstorage.tile.DestructorTile;
import com.refinedmods.refinedstorage.blockentity.DestructorBlockEntity;
import com.refinedmods.refinedstorage.util.BlockUtils;
import com.refinedmods.refinedstorage.util.CollisionUtils;
import com.refinedmods.refinedstorage.util.NetworkUtils;
@@ -44,7 +44,7 @@ public class DestructorBlock extends CableBlock {
@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new DestructorTile(pos, state);
return new DestructorBlockEntity(pos, state);
}
@Override
@@ -94,9 +94,9 @@ public class DestructorBlock extends CableBlock {
if (!level.isClientSide && CollisionUtils.isInBounds(getHeadShape(state), pos, hit.getLocation())) {
return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui(
(ServerPlayer) player,
new PositionalTileContainerProvider<DestructorTile>(
new BlockEntityMenuProvider<DestructorBlockEntity>(
new TranslatableComponent("gui.refinedstorage.destructor"),
(tile, windowId, inventory, p) -> new DestructorContainer(tile, player, windowId),
(blockEntity, windowId, inventory, p) -> new DestructorContainer(blockEntity, player, windowId),
pos
),
pos

14
src/main/java/com/refinedmods/refinedstorage/block/DetectorBlock.java
View File

@@ -2,8 +2,8 @@ package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.RSBlocks;
import com.refinedmods.refinedstorage.container.DetectorContainer;
import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider;
import com.refinedmods.refinedstorage.tile.DetectorTile;
import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider;
import com.refinedmods.refinedstorage.blockentity.DetectorBlockEntity;
import com.refinedmods.refinedstorage.util.BlockUtils;
import com.refinedmods.refinedstorage.util.ColorMap;
import com.refinedmods.refinedstorage.util.NetworkUtils;
@@ -60,9 +60,9 @@ public class DetectorBlock extends ColoredNetworkBlock {
@Override
@SuppressWarnings("deprecation")
public int getSignal(BlockState state, BlockGetter world, BlockPos pos, Direction side) {
BlockEntity tile = world.getBlockEntity(pos);
BlockEntity blockEntity = world.getBlockEntity(pos);
return (tile instanceof DetectorTile && ((DetectorTile) tile).getNode().isPowered()) ? 15 : 0;
return (blockEntity instanceof DetectorBlockEntity && ((DetectorBlockEntity) blockEntity).getNode().isPowered()) ? 15 : 0;
}
@Override
@@ -80,9 +80,9 @@ public class DetectorBlock extends ColoredNetworkBlock {
if (!level.isClientSide) {
return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui(
(ServerPlayer) player,
new PositionalTileContainerProvider<DetectorTile>(
new BlockEntityMenuProvider<DetectorBlockEntity>(
new TranslatableComponent("gui.refinedstorage.detector"),
(tile, windowId, inventory, p) -> new DetectorContainer(tile, player, windowId),
(blockEntity, windowId, inventory, p) -> new DetectorContainer(blockEntity, player, windowId),
pos
),
pos
@@ -94,6 +94,6 @@ public class DetectorBlock extends ColoredNetworkBlock {
@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new DetectorTile(pos, state);
return new DetectorBlockEntity(pos, state);
}
}

10
src/main/java/com/refinedmods/refinedstorage/block/DiskDriveBlock.java
View File

@@ -1,8 +1,8 @@
package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.container.DiskDriveContainer;
import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider;
import com.refinedmods.refinedstorage.tile.DiskDriveTile;
import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider;
import com.refinedmods.refinedstorage.blockentity.DiskDriveBlockEntity;
import com.refinedmods.refinedstorage.util.BlockUtils;
import com.refinedmods.refinedstorage.util.NetworkUtils;
import net.minecraft.core.BlockPos;
@@ -29,7 +29,7 @@ public class DiskDriveBlock extends NetworkNodeBlock {
@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new DiskDriveTile(pos, state);
return new DiskDriveBlockEntity(pos, state);
}
@Override
@@ -38,9 +38,9 @@ public class DiskDriveBlock extends NetworkNodeBlock {
if (!level.isClientSide) {
return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui(
(ServerPlayer) player,
new PositionalTileContainerProvider<DiskDriveTile>(
new BlockEntityMenuProvider<DiskDriveBlockEntity>(
new TranslatableComponent("gui.refinedstorage.disk_drive"),
(tile, windowId, inventory, p) -> new DiskDriveContainer(tile, p, windowId),
(blockEntity, windowId, inventory, p) -> new DiskDriveContainer(blockEntity, p, windowId),
pos
),
pos

10
src/main/java/com/refinedmods/refinedstorage/block/DiskManipulatorBlock.java
View File

@@ -2,8 +2,8 @@ package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.RSBlocks;
import com.refinedmods.refinedstorage.container.DiskManipulatorContainer;
import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider;
import com.refinedmods.refinedstorage.tile.DiskManipulatorTile;
import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider;
import com.refinedmods.refinedstorage.blockentity.DiskManipulatorBlockEntity;
import com.refinedmods.refinedstorage.util.BlockUtils;
import com.refinedmods.refinedstorage.util.NetworkUtils;
import net.minecraft.core.BlockPos;
@@ -25,7 +25,7 @@ public class DiskManipulatorBlock extends ColoredNetworkBlock {
@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new DiskManipulatorTile(pos, state);
return new DiskManipulatorBlockEntity(pos, state);
}
@Override
@@ -39,9 +39,9 @@ public class DiskManipulatorBlock extends ColoredNetworkBlock {
if (!level.isClientSide) {
return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui(
(ServerPlayer) player,
new PositionalTileContainerProvider<DiskManipulatorTile>(
new BlockEntityMenuProvider<DiskManipulatorBlockEntity>(
new TranslatableComponent("gui.refinedstorage.disk_manipulator"),
(tile, windowId, inventory, p) -> new DiskManipulatorContainer(tile, p, windowId),
(blockEntity, windowId, inventory, p) -> new DiskManipulatorContainer(blockEntity, p, windowId),
pos
),
pos

10
src/main/java/com/refinedmods/refinedstorage/block/ExporterBlock.java
View File

@@ -2,9 +2,9 @@ package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.block.shape.ShapeCache;
import com.refinedmods.refinedstorage.container.ExporterContainer;
import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider;
import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider;
import com.refinedmods.refinedstorage.render.ConstantsCable;
import com.refinedmods.refinedstorage.tile.ExporterTile;
import com.refinedmods.refinedstorage.blockentity.ExporterBlockEntity;
import com.refinedmods.refinedstorage.util.BlockUtils;
import com.refinedmods.refinedstorage.util.CollisionUtils;
import com.refinedmods.refinedstorage.util.NetworkUtils;
@@ -109,7 +109,7 @@ public class ExporterBlock extends CableBlock {
@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new ExporterTile(pos, state);
return new ExporterBlockEntity(pos, state);
}
@Override
@@ -118,9 +118,9 @@ public class ExporterBlock extends CableBlock {
if (!level.isClientSide && CollisionUtils.isInBounds(getLineShape(state), pos, hit.getLocation())) {
return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui(
(ServerPlayer) player,
new PositionalTileContainerProvider<ExporterTile>(
new BlockEntityMenuProvider<ExporterBlockEntity>(
new TranslatableComponent("gui.refinedstorage.exporter"),
(tile, windowId, inventory, p) -> new ExporterContainer(tile, player, windowId),
(blockEntity, windowId, inventory, p) -> new ExporterContainer(blockEntity, player, windowId),
pos
),
pos

12
src/main/java/com/refinedmods/refinedstorage/block/ExternalStorageBlock.java
View File

@@ -5,9 +5,9 @@ import com.refinedmods.refinedstorage.api.storage.cache.InvalidateCause;
import com.refinedmods.refinedstorage.apiimpl.network.node.ExternalStorageNetworkNode;
import com.refinedmods.refinedstorage.block.shape.ShapeCache;
import com.refinedmods.refinedstorage.container.ExternalStorageContainer;
import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider;
import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider;
import com.refinedmods.refinedstorage.render.ConstantsCable;
import com.refinedmods.refinedstorage.tile.ExternalStorageTile;
import com.refinedmods.refinedstorage.blockentity.ExternalStorageBlockEntity;
import com.refinedmods.refinedstorage.util.BlockUtils;
import com.refinedmods.refinedstorage.util.CollisionUtils;
import com.refinedmods.refinedstorage.util.NetworkUtils;
@@ -89,7 +89,7 @@ public class ExternalStorageBlock extends CableBlock {
@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new ExternalStorageTile(pos, state);
return new ExternalStorageBlockEntity(pos, state);
}
@Override
@@ -98,9 +98,9 @@ public class ExternalStorageBlock extends CableBlock {
if (!level.isClientSide && CollisionUtils.isInBounds(getHeadShape(state), pos, hit.getLocation())) {
return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui(
(ServerPlayer) player,
new PositionalTileContainerProvider<ExternalStorageTile>(
new BlockEntityMenuProvider<ExternalStorageBlockEntity>(
new TranslatableComponent("gui.refinedstorage.external_storage"),
(tile, windowId, inventory, p) -> new ExternalStorageContainer(tile, player, windowId),
(blockEntity, windowId, inventory, p) -> new ExternalStorageContainer(blockEntity, player, windowId),
pos
),
pos
@@ -116,7 +116,7 @@ public class ExternalStorageBlock extends CableBlock {
super.neighborChanged(state, level, pos, block, fromPos, isMoving);
if (!level.isClientSide) {
INetworkNode node = NetworkUtils.getNodeFromTile(level.getBlockEntity(pos));
INetworkNode node = NetworkUtils.getNodeFromBlockEntity(level.getBlockEntity(pos));
if (node instanceof ExternalStorageNetworkNode &&
node.getNetwork() != null &&

10
src/main/java/com/refinedmods/refinedstorage/block/FluidInterfaceBlock.java
View File

@@ -2,8 +2,8 @@ package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.api.network.security.Permission;
import com.refinedmods.refinedstorage.container.FluidInterfaceContainer;
import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider;
import com.refinedmods.refinedstorage.tile.FluidInterfaceTile;
import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider;
import com.refinedmods.refinedstorage.blockentity.FluidInterfaceBlockEntity;
import com.refinedmods.refinedstorage.util.BlockUtils;
import com.refinedmods.refinedstorage.util.NetworkUtils;
import net.minecraft.core.BlockPos;
@@ -25,7 +25,7 @@ public class FluidInterfaceBlock extends NetworkNodeBlock {
@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new FluidInterfaceTile(pos, state);
return new FluidInterfaceBlockEntity(pos, state);
}
@Override
@@ -34,9 +34,9 @@ public class FluidInterfaceBlock extends NetworkNodeBlock {
if (!level.isClientSide) {
return NetworkUtils.attempt(level, pos, player, () -> NetworkHooks.openGui(
(ServerPlayer) player,
new PositionalTileContainerProvider<FluidInterfaceTile>(
new BlockEntityMenuProvider<FluidInterfaceBlockEntity>(
new TranslatableComponent("gui.refinedstorage.fluid_interface"),
(tile, windowId, inventory, p) -> new FluidInterfaceContainer(tile, player, windowId),
(blockEntity, windowId, inventory, p) -> new FluidInterfaceContainer(blockEntity, player, windowId),
pos
),
pos

14
src/main/java/com/refinedmods/refinedstorage/block/FluidStorageBlock.java
View File

@@ -3,8 +3,8 @@ package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.apiimpl.network.node.storage.FluidStorageNetworkNode;
import com.refinedmods.refinedstorage.apiimpl.storage.FluidStorageType;
import com.refinedmods.refinedstorage.container.FluidStorageContainer;
import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider;
import com.refinedmods.refinedstorage.tile.FluidStorageTile;
import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider;
import com.refinedmods.refinedstorage.blockentity.FluidStorageBlockEntity;
import com.refinedmods.refinedstorage.util.BlockUtils;
import com.refinedmods.refinedstorage.util.NetworkUtils;
import net.minecraft.core.BlockPos;
@@ -36,7 +36,7 @@ public class FluidStorageBlock extends NetworkNodeBlock {
@Override
public void setPlacedBy(Level level, BlockPos pos, BlockState state, LivingEntity player, ItemStack stack) {
if (!level.isClientSide) {
FluidStorageNetworkNode storage = ((FluidStorageTile) level.getBlockEntity(pos)).getNode();
FluidStorageNetworkNode storage = ((FluidStorageBlockEntity) level.getBlockEntity(pos)).getNode();
if (stack.hasTag() && stack.getTag().hasUUID(FluidStorageNetworkNode.NBT_ID)) {
storage.setStorageId(stack.getTag().getUUID(FluidStorageNetworkNode.NBT_ID));
@@ -51,16 +51,16 @@ public class FluidStorageBlock extends NetworkNodeBlock {
@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new FluidStorageTile(type, pos, state);
return new FluidStorageBlockEntity(type, pos, state);
}
@Override
@SuppressWarnings("deprecation")
public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) {
if (!level.isClientSide) {
return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui((ServerPlayer) player, new PositionalTileContainerProvider<FluidStorageTile>(
((FluidStorageTile) level.getBlockEntity(pos)).getNode().getTitle(),
(tile, windowId, inventory, p) -> new FluidStorageContainer(tile, player, windowId),
return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui((ServerPlayer) player, new BlockEntityMenuProvider<FluidStorageBlockEntity>(
((FluidStorageBlockEntity) level.getBlockEntity(pos)).getNode().getTitle(),
(blockEntity, windowId, inventory, p) -> new FluidStorageContainer(blockEntity, player, windowId),
pos
), pos));
}

4
src/main/java/com/refinedmods/refinedstorage/block/GridBlock.java
View File

@@ -4,7 +4,7 @@ import com.refinedmods.refinedstorage.RSBlocks;
import com.refinedmods.refinedstorage.api.network.grid.GridType;
import com.refinedmods.refinedstorage.apiimpl.API;
import com.refinedmods.refinedstorage.apiimpl.network.grid.factory.GridBlockGridFactory;
import com.refinedmods.refinedstorage.tile.grid.GridTile;
import com.refinedmods.refinedstorage.blockentity.grid.GridBlockEntity;
import com.refinedmods.refinedstorage.util.BlockUtils;
import com.refinedmods.refinedstorage.util.ColorMap;
import com.refinedmods.refinedstorage.util.NetworkUtils;
@@ -39,7 +39,7 @@ public class GridBlock extends ColoredNetworkBlock {
@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new GridTile(type, pos, state);
return new GridBlockEntity(type, pos, state);
}
@Override

10
src/main/java/com/refinedmods/refinedstorage/block/ImporterBlock.java
View File

@@ -2,9 +2,9 @@ package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.block.shape.ShapeCache;
import com.refinedmods.refinedstorage.container.ImporterContainer;
import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider;
import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider;
import com.refinedmods.refinedstorage.render.ConstantsCable;
import com.refinedmods.refinedstorage.tile.ImporterTile;
import com.refinedmods.refinedstorage.blockentity.ImporterBlockEntity;
import com.refinedmods.refinedstorage.util.BlockUtils;
import com.refinedmods.refinedstorage.util.CollisionUtils;
import com.refinedmods.refinedstorage.util.NetworkUtils;
@@ -108,7 +108,7 @@ public class ImporterBlock extends CableBlock {
@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new ImporterTile(pos, state);
return new ImporterBlockEntity(pos, state);
}
@Override
@@ -117,9 +117,9 @@ public class ImporterBlock extends CableBlock {
if (!level.isClientSide && CollisionUtils.isInBounds(getLineShape(state), pos, hit.getLocation())) {
return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui(
(ServerPlayer) player,
new PositionalTileContainerProvider<ImporterTile>(
new BlockEntityMenuProvider<ImporterBlockEntity>(
new TranslatableComponent("gui.refinedstorage.importer"),
(tile, windowId, inventory, p) -> new ImporterContainer(tile, player, windowId),
(blockEntity, windowId, inventory, p) -> new ImporterContainer(blockEntity, player, windowId),
pos
),
pos

10
src/main/java/com/refinedmods/refinedstorage/block/InterfaceBlock.java
View File

@@ -2,8 +2,8 @@ package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.api.network.security.Permission;
import com.refinedmods.refinedstorage.container.InterfaceContainer;
import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider;
import com.refinedmods.refinedstorage.tile.InterfaceTile;
import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider;
import com.refinedmods.refinedstorage.blockentity.InterfaceBlockEntity;
import com.refinedmods.refinedstorage.util.BlockUtils;
import com.refinedmods.refinedstorage.util.NetworkUtils;
import net.minecraft.core.BlockPos;
@@ -25,7 +25,7 @@ public class InterfaceBlock extends NetworkNodeBlock {
@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new InterfaceTile(pos, state);
return new InterfaceBlockEntity(pos, state);
}
@Override
@@ -34,9 +34,9 @@ public class InterfaceBlock extends NetworkNodeBlock {
if (!level.isClientSide) {
return NetworkUtils.attempt(level, pos, player, () -> NetworkHooks.openGui(
(ServerPlayer) player,
new PositionalTileContainerProvider<InterfaceTile>(
new BlockEntityMenuProvider<InterfaceBlockEntity>(
new TranslatableComponent("gui.refinedstorage.interface"),
(tile, windowId, inventory, p) -> new InterfaceContainer(tile, player, windowId),
(blockEntity, windowId, inventory, p) -> new InterfaceContainer(blockEntity, player, windowId),
pos
),
pos

14
src/main/java/com/refinedmods/refinedstorage/block/NetworkNodeBlock.java
View File

@@ -4,7 +4,7 @@ import com.refinedmods.refinedstorage.api.network.node.INetworkNode;
import com.refinedmods.refinedstorage.api.network.node.INetworkNodeProxy;
import com.refinedmods.refinedstorage.apiimpl.API;
import com.refinedmods.refinedstorage.apiimpl.network.node.NetworkNode;
import com.refinedmods.refinedstorage.tile.NetworkNodeTile;
import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.NonNullList;
@@ -49,10 +49,10 @@ public abstract class NetworkNodeBlock extends BaseBlock implements EntityBlock
@SuppressWarnings("deprecation")
public void onRemove(BlockState state, Level level, BlockPos pos, BlockState newState, boolean isMoving) {
if (state.getBlock() != newState.getBlock()) {
BlockEntity tile = level.getBlockEntity(pos);
BlockEntity blockEntity = level.getBlockEntity(pos);
if (tile instanceof NetworkNodeTile) {
IItemHandler handler = ((NetworkNodeTile) tile).getNode().getDrops();
if (blockEntity instanceof NetworkNodeBlockEntity) {
IItemHandler handler = ((NetworkNodeBlockEntity) blockEntity).getNode().getDrops();
if (handler != null) {
NonNullList<ItemStack> drops = NonNullList.create();
@@ -74,9 +74,9 @@ public abstract class NetworkNodeBlock extends BaseBlock implements EntityBlock
protected void onDirectionChanged(Level level, BlockPos pos, Direction newDirection) {
super.onDirectionChanged(level, pos, newDirection);
BlockEntity tile = level.getBlockEntity(pos);
if (tile instanceof INetworkNodeProxy) {
INetworkNode node = ((INetworkNodeProxy) tile).getNode();
BlockEntity blockEntity = level.getBlockEntity(pos);
if (blockEntity instanceof INetworkNodeProxy) {
INetworkNode node = ((INetworkNodeProxy) blockEntity).getNode();
if (node instanceof NetworkNode) {
((NetworkNode) node).onDirectionChanged(newDirection);

4
src/main/java/com/refinedmods/refinedstorage/block/NetworkReceiverBlock.java
View File

@@ -1,7 +1,7 @@
package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.RSBlocks;
import com.refinedmods.refinedstorage.tile.NetworkReceiverTile;
import com.refinedmods.refinedstorage.blockentity.NetworkReceiverBlockEntity;
import com.refinedmods.refinedstorage.util.BlockUtils;
import net.minecraft.core.BlockPos;
import net.minecraft.world.InteractionHand;
@@ -19,7 +19,7 @@ public class NetworkReceiverBlock extends ColoredNetworkBlock {
@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new NetworkReceiverTile(pos, state);
return new NetworkReceiverBlockEntity(pos, state);
}
@Override

10
src/main/java/com/refinedmods/refinedstorage/block/NetworkTransmitterBlock.java
View File

@@ -2,8 +2,8 @@ package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.RSBlocks;
import com.refinedmods.refinedstorage.container.NetworkTransmitterContainer;
import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider;
import com.refinedmods.refinedstorage.tile.NetworkTransmitterTile;
import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider;
import com.refinedmods.refinedstorage.blockentity.NetworkTransmitterBlockEntity;
import com.refinedmods.refinedstorage.util.BlockUtils;
import com.refinedmods.refinedstorage.util.NetworkUtils;
import net.minecraft.core.BlockPos;
@@ -25,7 +25,7 @@ public class NetworkTransmitterBlock extends ColoredNetworkBlock {
@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new NetworkTransmitterTile(pos, state);
return new NetworkTransmitterBlockEntity(pos, state);
}
@Override
@@ -39,9 +39,9 @@ public class NetworkTransmitterBlock extends ColoredNetworkBlock {
if (!level.isClientSide) {
return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui(
(ServerPlayer) player,
new PositionalTileContainerProvider<NetworkTransmitterTile>(
new BlockEntityMenuProvider<NetworkTransmitterBlockEntity>(
new TranslatableComponent("gui.refinedstorage.network_transmitter"),
(tile, windowId, inventory, p) -> new NetworkTransmitterContainer(tile, player, windowId),
(blockEntity, windowId, inventory, p) -> new NetworkTransmitterContainer(blockEntity, player, windowId),
pos
),
pos

18
src/main/java/com/refinedmods/refinedstorage/block/PortableGridBlock.java
View File

@@ -2,9 +2,9 @@ package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.apiimpl.API;
import com.refinedmods.refinedstorage.apiimpl.network.grid.factory.PortableGridBlockGridFactory;
import com.refinedmods.refinedstorage.blockentity.grid.portable.PortableGridBlockEntity;
import com.refinedmods.refinedstorage.blockentity.grid.portable.PortableGridDiskState;
import com.refinedmods.refinedstorage.item.blockitem.PortableGridBlockItem;
import com.refinedmods.refinedstorage.tile.grid.portable.PortableGridDiskState;
import com.refinedmods.refinedstorage.tile.grid.portable.PortableGridTile;
import com.refinedmods.refinedstorage.util.BlockUtils;
import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerPlayer;
@@ -66,16 +66,16 @@ public class PortableGridBlock extends BaseBlock implements EntityBlock {
@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new PortableGridTile(type, pos, state);
return new PortableGridBlockEntity(type, pos, state);
}
@Override
public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, BlockState state, BlockEntityType<T> type) {
return level.isClientSide ? null : new BlockEntityTicker<T>() {
@Override
public void tick(Level level, BlockPos pos, BlockState state, T tile) {
if (tile instanceof PortableGridTile) {
PortableGridTile.serverTick((PortableGridTile) tile);
public void tick(Level level, BlockPos pos, BlockState state, T blockEntity) {
if (blockEntity instanceof PortableGridBlockEntity) {
PortableGridBlockEntity.serverTick((PortableGridBlockEntity) blockEntity);
}
}
};
@@ -87,7 +87,7 @@ public class PortableGridBlock extends BaseBlock implements EntityBlock {
if (!level.isClientSide) {
API.instance().getGridManager().openGrid(PortableGridBlockGridFactory.ID, (ServerPlayer) player, pos);
((PortableGridTile) level.getBlockEntity(pos)).onOpened();
((PortableGridBlockEntity) level.getBlockEntity(pos)).onOpened();
}
return InteractionResult.SUCCESS;
@@ -98,8 +98,8 @@ public class PortableGridBlock extends BaseBlock implements EntityBlock {
super.setPlacedBy(level, pos, state, placer, stack);
if (!level.isClientSide) {
((PortableGridTile) level.getBlockEntity(pos)).applyDataFromItemToTile(stack);
((PortableGridTile) level.getBlockEntity(pos)).updateState();
((PortableGridBlockEntity) level.getBlockEntity(pos)).applyDataFromItemToBlockEntity(stack);
((PortableGridBlockEntity) level.getBlockEntity(pos)).updateState();
}
}
}

10
src/main/java/com/refinedmods/refinedstorage/block/RelayBlock.java
View File

@@ -2,8 +2,8 @@ package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.RSBlocks;
import com.refinedmods.refinedstorage.container.RelayContainer;
import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider;
import com.refinedmods.refinedstorage.tile.RelayTile;
import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider;
import com.refinedmods.refinedstorage.blockentity.RelayBlockEntity;
import com.refinedmods.refinedstorage.util.BlockUtils;
import com.refinedmods.refinedstorage.util.NetworkUtils;
import net.minecraft.core.BlockPos;
@@ -25,7 +25,7 @@ public class RelayBlock extends ColoredNetworkBlock {
@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new RelayTile(pos, state);
return new RelayBlockEntity(pos, state);
}
@Override
@@ -39,9 +39,9 @@ public class RelayBlock extends ColoredNetworkBlock {
if (!level.isClientSide) {
return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui(
(ServerPlayer) player,
new PositionalTileContainerProvider<RelayTile>(
new BlockEntityMenuProvider<RelayBlockEntity>(
new TranslatableComponent("gui.refinedstorage.relay"),
(tile, windowId, inventory, p) -> new RelayContainer(tile, player, windowId),
(blockEntity, windowId, inventory, p) -> new RelayContainer(blockEntity, player, windowId),
pos
),
pos

12
src/main/java/com/refinedmods/refinedstorage/block/SecurityManagerBlock.java
View File

@@ -3,8 +3,8 @@ package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.RSBlocks;
import com.refinedmods.refinedstorage.api.network.security.Permission;
import com.refinedmods.refinedstorage.container.SecurityManagerContainer;
import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider;
import com.refinedmods.refinedstorage.tile.SecurityManagerTile;
import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider;
import com.refinedmods.refinedstorage.blockentity.SecurityManagerBlockEntity;
import com.refinedmods.refinedstorage.util.BlockUtils;
import com.refinedmods.refinedstorage.util.NetworkUtils;
import net.minecraft.core.BlockPos;
@@ -40,15 +40,15 @@ public class SecurityManagerBlock extends ColoredNetworkBlock {
if (!level.isClientSide) {
Runnable action = () -> NetworkHooks.openGui(
(ServerPlayer) player,
new PositionalTileContainerProvider<SecurityManagerTile>(
new BlockEntityMenuProvider<SecurityManagerBlockEntity>(
new TranslatableComponent("gui.refinedstorage.security_manager"),
(tile, windowId, inventory, p) -> new SecurityManagerContainer(tile, player, windowId),
(blockEntity, windowId, inventory, p) -> new SecurityManagerContainer(blockEntity, player, windowId),
pos
),
pos
);
if (player.getGameProfile().getId().equals(((SecurityManagerTile) level.getBlockEntity(pos)).getNode().getOwner())) {
if (player.getGameProfile().getId().equals(((SecurityManagerBlockEntity) level.getBlockEntity(pos)).getNode().getOwner())) {
action.run();
} else {
return NetworkUtils.attempt(level, pos, player, action, Permission.MODIFY, Permission.SECURITY);
@@ -60,7 +60,7 @@ public class SecurityManagerBlock extends ColoredNetworkBlock {
@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new SecurityManagerTile(pos, state);
return new SecurityManagerBlockEntity(pos, state);
}
@Override

14
src/main/java/com/refinedmods/refinedstorage/block/StorageBlock.java
View File

@@ -3,8 +3,8 @@ package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.apiimpl.network.node.storage.StorageNetworkNode;
import com.refinedmods.refinedstorage.apiimpl.storage.ItemStorageType;
import com.refinedmods.refinedstorage.container.StorageContainer;
import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider;
import com.refinedmods.refinedstorage.tile.StorageTile;
import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider;
import com.refinedmods.refinedstorage.blockentity.StorageBlockEntity;
import com.refinedmods.refinedstorage.util.BlockUtils;
import com.refinedmods.refinedstorage.util.NetworkUtils;
import net.minecraft.core.BlockPos;
@@ -38,7 +38,7 @@ public class StorageBlock extends NetworkNodeBlock {
@Override
public void setPlacedBy(Level level, BlockPos pos, BlockState state, @Nullable LivingEntity entity, ItemStack stack) {
if (!level.isClientSide) {
StorageNetworkNode storage = ((StorageTile) level.getBlockEntity(pos)).getNode();
StorageNetworkNode storage = ((StorageBlockEntity) level.getBlockEntity(pos)).getNode();
if (stack.hasTag() && stack.getTag().hasUUID(StorageNetworkNode.NBT_ID)) {
storage.setStorageId(stack.getTag().getUUID(StorageNetworkNode.NBT_ID));
@@ -53,16 +53,16 @@ public class StorageBlock extends NetworkNodeBlock {
@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new StorageTile(type, pos, state);
return new StorageBlockEntity(type, pos, state);
}
@Override
@SuppressWarnings("deprecation")
public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) {
if (!level.isClientSide) {
return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui((ServerPlayer) player, new PositionalTileContainerProvider<StorageTile>(
((StorageTile) level.getBlockEntity(pos)).getNode().getTitle(),
(tile, windowId, inventory, p) -> new StorageContainer(tile, player, windowId),
return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui((ServerPlayer) player, new BlockEntityMenuProvider<StorageBlockEntity>(
((StorageBlockEntity) level.getBlockEntity(pos)).getNode().getTitle(),
(blockEntity, windowId, inventory, p) -> new StorageContainer(blockEntity, player, windowId),
pos
), pos));
}

14
src/main/java/com/refinedmods/refinedstorage/block/StorageMonitorBlock.java
View File

@@ -2,8 +2,8 @@ package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.apiimpl.network.node.StorageMonitorNetworkNode;
import com.refinedmods.refinedstorage.container.StorageMonitorContainer;
import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider;
import com.refinedmods.refinedstorage.tile.StorageMonitorTile;
import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider;
import com.refinedmods.refinedstorage.blockentity.StorageMonitorBlockEntity;
import com.refinedmods.refinedstorage.util.BlockUtils;
import com.refinedmods.refinedstorage.util.NetworkUtils;
import com.refinedmods.refinedstorage.util.WorldUtils;
@@ -33,7 +33,7 @@ public class StorageMonitorBlock extends NetworkNodeBlock {
@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new StorageMonitorTile(pos, state);
return new StorageMonitorBlockEntity(pos, state);
}
@Override
@@ -45,15 +45,15 @@ public class StorageMonitorBlock extends NetworkNodeBlock {
if (player.isCrouching()) {
return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui(
(ServerPlayer) player,
new PositionalTileContainerProvider<StorageMonitorTile>(
new BlockEntityMenuProvider<StorageMonitorBlockEntity>(
new TranslatableComponent("gui.refinedstorage.storage_monitor"),
(tile, windowId, inventory, p) -> new StorageMonitorContainer(tile, player, windowId),
(blockEntity, windowId, inventory, p) -> new StorageMonitorContainer(blockEntity, player, windowId),
pos
),
pos
));
} else {
StorageMonitorNetworkNode storageMonitor = ((StorageMonitorTile) level.getBlockEntity(pos)).getNode();
StorageMonitorNetworkNode storageMonitor = ((StorageMonitorBlockEntity) level.getBlockEntity(pos)).getNode();
if (!held.isEmpty()) {
return storageMonitor.deposit(player, held);
@@ -78,7 +78,7 @@ public class StorageMonitorBlock extends NetworkNodeBlock {
return;
}
((StorageMonitorTile) level.getBlockEntity(pos)).getNode().extract(player, ((BlockHitResult) result).getDirection());
((StorageMonitorBlockEntity) level.getBlockEntity(pos)).getNode().extract(player, ((BlockHitResult) result).getDirection());
}
}

10
src/main/java/com/refinedmods/refinedstorage/block/WirelessTransmitterBlock.java
View File

@@ -2,8 +2,8 @@ package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.RSBlocks;
import com.refinedmods.refinedstorage.container.WirelessTransmitterContainer;
import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider;
import com.refinedmods.refinedstorage.tile.WirelessTransmitterTile;
import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider;
import com.refinedmods.refinedstorage.blockentity.WirelessTransmitterBlockEntity;
import com.refinedmods.refinedstorage.util.BlockUtils;
import com.refinedmods.refinedstorage.util.NetworkUtils;
import net.minecraft.core.BlockPos;
@@ -46,7 +46,7 @@ public class WirelessTransmitterBlock extends ColoredNetworkBlock {
@Override
public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new WirelessTransmitterTile(pos, state);
return new WirelessTransmitterBlockEntity(pos, state);
}
@Override
@@ -81,9 +81,9 @@ public class WirelessTransmitterBlock extends ColoredNetworkBlock {
if (!level.isClientSide) {
return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui(
(ServerPlayer) player,
new PositionalTileContainerProvider<WirelessTransmitterTile>(
new BlockEntityMenuProvider<WirelessTransmitterBlockEntity>(
new TranslatableComponent("gui.refinedstorage.wireless_transmitter"),
(tile, windowId, inventory, p) -> new WirelessTransmitterContainer(tile, player, windowId),
(blockEntity, windowId, inventory, p) -> new WirelessTransmitterContainer(blockEntity, player, windowId),
pos
),
pos

12
src/main/java/com/refinedmods/refinedstorage/tile/BaseTile.java → src/main/java/com/refinedmods/refinedstorage/blockentity/BaseBlockEntity.java
View File

@@ -1,6 +1,6 @@
package com.refinedmods.refinedstorage.tile;
package com.refinedmods.refinedstorage.blockentity;
import com.refinedmods.refinedstorage.tile.data.TileDataManager;
import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationManager;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.Connection;
@@ -9,14 +9,14 @@ import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
public abstract class BaseTile extends BlockEntity {
protected final TileDataManager dataManager = new TileDataManager(this);
public abstract class BaseBlockEntity extends BlockEntity {
protected final BlockEntitySynchronizationManager dataManager = new BlockEntitySynchronizationManager(this);
public BaseTile(BlockEntityType<?> type, BlockPos pos, BlockState state) {
public BaseBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
super(type, pos, state);
}
public TileDataManager getDataManager() {
public BlockEntitySynchronizationManager getDataManager() {
return dataManager;
}

14
src/main/java/com/refinedmods/refinedstorage/tile/CableTile.java → src/main/java/com/refinedmods/refinedstorage/blockentity/CableBlockEntity.java
View File

@@ -1,9 +1,9 @@
package com.refinedmods.refinedstorage.tile;
package com.refinedmods.refinedstorage.blockentity;
import com.refinedmods.refinedstorage.RSTiles;
import com.refinedmods.refinedstorage.RSBlockEntities;
import com.refinedmods.refinedstorage.apiimpl.network.node.CableNetworkNode;
import com.refinedmods.refinedstorage.apiimpl.network.node.cover.CoverManager;
import com.refinedmods.refinedstorage.tile.data.TileDataParameter;
import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter;
import com.refinedmods.refinedstorage.util.WorldUtils;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
@@ -15,12 +15,12 @@ import net.minecraftforge.client.model.data.ModelDataMap;
import javax.annotation.Nonnull;
public class CableTile extends NetworkNodeTile<CableNetworkNode> {
public static final TileDataParameter<CompoundTag, CableTile> COVER_MANAGER = new TileDataParameter<>(EntityDataSerializers.COMPOUND_TAG, new CompoundTag(), t -> t.getNode().getCoverManager().writeToNbt(), (t, v) -> t.getNode().getCoverManager().readFromNbt(v), (initial, p) -> {
public class CableBlockEntity extends NetworkNodeBlockEntity<CableNetworkNode> {
public static final BlockEntitySynchronizationParameter<CompoundTag, CableBlockEntity> COVER_MANAGER = new BlockEntitySynchronizationParameter<>(EntityDataSerializers.COMPOUND_TAG, new CompoundTag(), t -> t.getNode().getCoverManager().writeToNbt(), (t, v) -> t.getNode().getCoverManager().readFromNbt(v), (initial, p) -> {
});
public CableTile(BlockPos pos, BlockState state) {
super(RSTiles.CABLE, pos, state);
public CableBlockEntity(BlockPos pos, BlockState state) {
super(RSBlockEntities.CABLE, pos, state);
dataManager.addWatchedParameter(COVER_MANAGER);
}

2
src/main/java/com/refinedmods/refinedstorage/tile/ClientNode.java → src/main/java/com/refinedmods/refinedstorage/blockentity/ClientNode.java
View File

@@ -1,4 +1,4 @@
package com.refinedmods.refinedstorage.tile;
package com.refinedmods.refinedstorage.blockentity;
import com.refinedmods.refinedstorage.apiimpl.API;
import net.minecraft.world.item.ItemStack;

24
src/main/java/com/refinedmods/refinedstorage/tile/ConstructorTile.java → src/main/java/com/refinedmods/refinedstorage/blockentity/ConstructorBlockEntity.java
View File

@@ -1,11 +1,11 @@
package com.refinedmods.refinedstorage.tile;
package com.refinedmods.refinedstorage.blockentity;
import com.refinedmods.refinedstorage.RSTiles;
import com.refinedmods.refinedstorage.RSBlockEntities;
import com.refinedmods.refinedstorage.apiimpl.network.node.ConstructorNetworkNode;
import com.refinedmods.refinedstorage.apiimpl.network.node.cover.CoverManager;
import com.refinedmods.refinedstorage.tile.config.IComparable;
import com.refinedmods.refinedstorage.tile.config.IType;
import com.refinedmods.refinedstorage.tile.data.TileDataParameter;
import com.refinedmods.refinedstorage.blockentity.config.IComparable;
import com.refinedmods.refinedstorage.blockentity.config.IType;
import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter;
import com.refinedmods.refinedstorage.util.WorldUtils;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
@@ -17,22 +17,22 @@ import net.minecraftforge.client.model.data.ModelDataMap;
import javax.annotation.Nonnull;
public class ConstructorTile extends NetworkNodeTile<ConstructorNetworkNode> {
public static final TileDataParameter<Integer, ConstructorTile> COMPARE = IComparable.createParameter();
public static final TileDataParameter<Integer, ConstructorTile> TYPE = IType.createParameter();
public static final TileDataParameter<Boolean, ConstructorTile> DROP = new TileDataParameter<>(EntityDataSerializers.BOOLEAN, false, t -> t.getNode().isDrop(), (t, v) -> {
public class ConstructorBlockEntity extends NetworkNodeBlockEntity<ConstructorNetworkNode> {
public static final BlockEntitySynchronizationParameter<Integer, ConstructorBlockEntity> COMPARE = IComparable.createParameter();
public static final BlockEntitySynchronizationParameter<Integer, ConstructorBlockEntity> TYPE = IType.createParameter();
public static final BlockEntitySynchronizationParameter<Boolean, ConstructorBlockEntity> DROP = new BlockEntitySynchronizationParameter<>(EntityDataSerializers.BOOLEAN, false, t -> t.getNode().isDrop(), (t, v) -> {
t.getNode().setDrop(v);
t.getNode().markDirty();
});
public static final TileDataParameter<CompoundTag, ConstructorTile> COVER_MANAGER = new TileDataParameter<>(EntityDataSerializers.COMPOUND_TAG, new CompoundTag(),
public static final BlockEntitySynchronizationParameter<CompoundTag, ConstructorBlockEntity> COVER_MANAGER = new BlockEntitySynchronizationParameter<>(EntityDataSerializers.COMPOUND_TAG, new CompoundTag(),
t -> t.getNode().getCoverManager().writeToNbt(),
(t, v) -> t.getNode().getCoverManager().readFromNbt(v),
(initial, p) -> {
});
public ConstructorTile(BlockPos pos, BlockState state) {
super(RSTiles.CONSTRUCTOR, pos, state);
public ConstructorBlockEntity(BlockPos pos, BlockState state) {
super(RSBlockEntities.CONSTRUCTOR, pos, state);
dataManager.addWatchedParameter(COMPARE);
dataManager.addWatchedParameter(TYPE);

32
src/main/java/com/refinedmods/refinedstorage/tile/ControllerTile.java → src/main/java/com/refinedmods/refinedstorage/blockentity/ControllerBlockEntity.java
View File

@@ -1,6 +1,6 @@
package com.refinedmods.refinedstorage.tile;
package com.refinedmods.refinedstorage.blockentity;
import com.refinedmods.refinedstorage.RSTiles;
import com.refinedmods.refinedstorage.RSBlockEntities;
import com.refinedmods.refinedstorage.api.network.INetwork;
import com.refinedmods.refinedstorage.api.network.INetworkManager;
import com.refinedmods.refinedstorage.api.network.INetworkNodeGraphEntry;
@@ -10,10 +10,10 @@ import com.refinedmods.refinedstorage.apiimpl.API;
import com.refinedmods.refinedstorage.apiimpl.network.Network;
import com.refinedmods.refinedstorage.apiimpl.network.node.RootNetworkNode;
import com.refinedmods.refinedstorage.capability.NetworkNodeProxyCapability;
import com.refinedmods.refinedstorage.tile.config.IRedstoneConfigurable;
import com.refinedmods.refinedstorage.tile.config.RedstoneMode;
import com.refinedmods.refinedstorage.tile.data.RSSerializers;
import com.refinedmods.refinedstorage.tile.data.TileDataParameter;
import com.refinedmods.refinedstorage.blockentity.config.IRedstoneConfigurable;
import com.refinedmods.refinedstorage.blockentity.config.RedstoneMode;
import com.refinedmods.refinedstorage.blockentity.data.RSSerializers;
import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.network.syncher.EntityDataSerializers;
@@ -30,12 +30,12 @@ import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
public class ControllerTile extends BaseTile implements INetworkNodeProxy<RootNetworkNode>, IRedstoneConfigurable {
public static final TileDataParameter<Integer, ControllerTile> REDSTONE_MODE = RedstoneMode.createParameter();
public static final TileDataParameter<Integer, ControllerTile> ENERGY_USAGE = new TileDataParameter<>(EntityDataSerializers.INT, 0, t -> t.getNetwork().getEnergyUsage());
public static final TileDataParameter<Integer, ControllerTile> ENERGY_STORED = new TileDataParameter<>(EntityDataSerializers.INT, 0, t -> t.getNetwork().getEnergyStorage().getEnergyStored());
public static final TileDataParameter<Integer, ControllerTile> ENERGY_CAPACITY = new TileDataParameter<>(EntityDataSerializers.INT, 0, t -> t.getNetwork().getEnergyStorage().getMaxEnergyStored());
public static final TileDataParameter<List<ClientNode>, ControllerTile> NODES = new TileDataParameter<>(RSSerializers.CLIENT_NODE_SERIALIZER, new ArrayList<>(), ControllerTile::collectClientNodes);
public class ControllerBlockEntity extends BaseBlockEntity implements INetworkNodeProxy<RootNetworkNode>, IRedstoneConfigurable {
public static final BlockEntitySynchronizationParameter<Integer, ControllerBlockEntity> REDSTONE_MODE = RedstoneMode.createParameter();
public static final BlockEntitySynchronizationParameter<Integer, ControllerBlockEntity> ENERGY_USAGE = new BlockEntitySynchronizationParameter<>(EntityDataSerializers.INT, 0, t -> t.getNetwork().getEnergyUsage());
public static final BlockEntitySynchronizationParameter<Integer, ControllerBlockEntity> ENERGY_STORED = new BlockEntitySynchronizationParameter<>(EntityDataSerializers.INT, 0, t -> t.getNetwork().getEnergyStorage().getEnergyStored());
public static final BlockEntitySynchronizationParameter<Integer, ControllerBlockEntity> ENERGY_CAPACITY = new BlockEntitySynchronizationParameter<>(EntityDataSerializers.INT, 0, t -> t.getNetwork().getEnergyStorage().getMaxEnergyStored());
public static final BlockEntitySynchronizationParameter<List<ClientNode>, ControllerBlockEntity> NODES = new BlockEntitySynchronizationParameter<>(RSSerializers.CLIENT_NODE_SERIALIZER, new ArrayList<>(), ControllerBlockEntity::collectClientNodes);
private final LazyOptional<INetworkNodeProxy<RootNetworkNode>> networkNodeProxyCap = LazyOptional.of(() -> this);
private final NetworkType type;
@@ -43,8 +43,8 @@ public class ControllerTile extends BaseTile implements INetworkNodeProxy<RootNe
private Network dummyNetwork;
private final LazyOptional<IEnergyStorage> energyProxyCap = LazyOptional.of(() -> getNetwork().getEnergyStorage());
public ControllerTile(NetworkType type, BlockPos pos, BlockState state) {
super(type == NetworkType.CREATIVE ? RSTiles.CREATIVE_CONTROLLER : RSTiles.CONTROLLER, pos, state);
public ControllerBlockEntity(NetworkType type, BlockPos pos, BlockState state) {
super(type == NetworkType.CREATIVE ? RSBlockEntities.CREATIVE_CONTROLLER : RSBlockEntities.CONTROLLER, pos, state);
dataManager.addWatchedParameter(REDSTONE_MODE);
dataManager.addWatchedParameter(ENERGY_USAGE);
@@ -55,10 +55,10 @@ public class ControllerTile extends BaseTile implements INetworkNodeProxy<RootNe
this.type = type;
}
private static List<ClientNode> collectClientNodes(ControllerTile tile) {
private static List<ClientNode> collectClientNodes(ControllerBlockEntity blockEntity) {
List<ClientNode> nodes = new ArrayList<>();
for (INetworkNodeGraphEntry entry : tile.getNetwork().getNodeGraph().all()) {
for (INetworkNodeGraphEntry entry : blockEntity.getNetwork().getNodeGraph().all()) {
if (entry.getNode().isActive()) {
ItemStack stack = entry.getNode().getItemStack();

18
src/main/java/com/refinedmods/refinedstorage/tile/CrafterTile.java → src/main/java/com/refinedmods/refinedstorage/blockentity/CrafterBlockEntity.java
View File

@@ -1,9 +1,9 @@
package com.refinedmods.refinedstorage.tile;
package com.refinedmods.refinedstorage.blockentity;
import com.refinedmods.refinedstorage.RSTiles;
import com.refinedmods.refinedstorage.RSBlockEntities;
import com.refinedmods.refinedstorage.apiimpl.network.node.CrafterNetworkNode;
import com.refinedmods.refinedstorage.screen.CrafterTileDataParameterClientListener;
import com.refinedmods.refinedstorage.tile.data.TileDataParameter;
import com.refinedmods.refinedstorage.screen.CrafterBlockEntitySynchronizationClientListener;
import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.network.syncher.EntityDataSerializers;
@@ -17,14 +17,14 @@ import net.minecraftforge.items.IItemHandler;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
public class CrafterTile extends NetworkNodeTile<CrafterNetworkNode> {
public static final TileDataParameter<Integer, CrafterTile> MODE = new TileDataParameter<>(EntityDataSerializers.INT, CrafterNetworkNode.CrafterMode.IGNORE.ordinal(), t -> t.getNode().getMode().ordinal(), (t, v) -> t.getNode().setMode(CrafterNetworkNode.CrafterMode.getById(v)));
private static final TileDataParameter<Boolean, CrafterTile> HAS_ROOT = new TileDataParameter<>(EntityDataSerializers.BOOLEAN, false, t -> t.getNode().getRootContainerNotSelf().isPresent(), null, (t, v) -> new CrafterTileDataParameterClientListener().onChanged(t, v));
public class CrafterBlockEntity extends NetworkNodeBlockEntity<CrafterNetworkNode> {
public static final BlockEntitySynchronizationParameter<Integer, CrafterBlockEntity> MODE = new BlockEntitySynchronizationParameter<>(EntityDataSerializers.INT, CrafterNetworkNode.CrafterMode.IGNORE.ordinal(), t -> t.getNode().getMode().ordinal(), (t, v) -> t.getNode().setMode(CrafterNetworkNode.CrafterMode.getById(v)));
private static final BlockEntitySynchronizationParameter<Boolean, CrafterBlockEntity> HAS_ROOT = new BlockEntitySynchronizationParameter<>(EntityDataSerializers.BOOLEAN, false, t -> t.getNode().getRootContainerNotSelf().isPresent(), null, (t, v) -> new CrafterBlockEntitySynchronizationClientListener().onChanged(t, v));
private final LazyOptional<IItemHandler> patternsCapability = LazyOptional.of(() -> getNode().getPatternInventory());
public CrafterTile(BlockPos pos, BlockState state) {
super(RSTiles.CRAFTER, pos, state);
public CrafterBlockEntity(BlockPos pos, BlockState state) {
super(RSBlockEntities.CRAFTER, pos, state);
dataManager.addWatchedParameter(MODE);
dataManager.addParameter(HAS_ROOT);

16
src/main/java/com/refinedmods/refinedstorage/tile/CrafterManagerTile.java → src/main/java/com/refinedmods/refinedstorage/blockentity/CrafterManagerBlockEntity.java
View File

@@ -1,23 +1,23 @@
package com.refinedmods.refinedstorage.tile;
package com.refinedmods.refinedstorage.blockentity;
import com.refinedmods.refinedstorage.RSTiles;
import com.refinedmods.refinedstorage.RSBlockEntities;
import com.refinedmods.refinedstorage.api.network.grid.IGrid;
import com.refinedmods.refinedstorage.apiimpl.network.node.CrafterManagerNetworkNode;
import com.refinedmods.refinedstorage.screen.BaseScreen;
import com.refinedmods.refinedstorage.screen.CrafterManagerScreen;
import com.refinedmods.refinedstorage.tile.data.TileDataParameter;
import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter;
import net.minecraft.core.BlockPos;
import net.minecraft.network.syncher.EntityDataSerializers;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.state.BlockState;
public class CrafterManagerTile extends NetworkNodeTile<CrafterManagerNetworkNode> {
public CrafterManagerTile(BlockPos pos, BlockState state) {
super(RSTiles.CRAFTER_MANAGER, pos, state);
public class CrafterManagerBlockEntity extends NetworkNodeBlockEntity<CrafterManagerNetworkNode> {
public CrafterManagerBlockEntity(BlockPos pos, BlockState state) {
super(RSBlockEntities.CRAFTER_MANAGER, pos, state);
dataManager.addWatchedParameter(SIZE);
dataManager.addWatchedParameter(SEARCH_BOX_MODE);
} public static final TileDataParameter<Integer, CrafterManagerTile> SIZE = new TileDataParameter<>(EntityDataSerializers.INT, IGrid.SIZE_STRETCH, t -> t.getNode().getSize(), (t, v) -> {
} public static final BlockEntitySynchronizationParameter<Integer, CrafterManagerBlockEntity> SIZE = new BlockEntitySynchronizationParameter<>(EntityDataSerializers.INT, IGrid.SIZE_STRETCH, t -> t.getNode().getSize(), (t, v) -> {
if (IGrid.isValidSize(v)) {
t.getNode().setSize(v);
t.getNode().markDirty();
@@ -27,7 +27,7 @@ public class CrafterManagerTile extends NetworkNodeTile<CrafterManagerNetworkNod
@Override
public CrafterManagerNetworkNode createNode(Level level, BlockPos pos) {
return new CrafterManagerNetworkNode(level, pos);
} public static final TileDataParameter<Integer, CrafterManagerTile> SEARCH_BOX_MODE = new TileDataParameter<>(EntityDataSerializers.INT, 0, t -> t.getNode().getSearchBoxMode(), (t, v) -> {
} public static final BlockEntitySynchronizationParameter<Integer, CrafterManagerBlockEntity> SEARCH_BOX_MODE = new BlockEntitySynchronizationParameter<>(EntityDataSerializers.INT, 0, t -> t.getNode().getSearchBoxMode(), (t, v) -> {
if (IGrid.isValidSearchBoxMode(v)) {
t.getNode().setSearchBoxMode(v);
t.getNode().markDirty();

28
src/main/java/com/refinedmods/refinedstorage/tile/DestructorTile.java → src/main/java/com/refinedmods/refinedstorage/blockentity/DestructorBlockEntity.java
View File

@@ -1,12 +1,12 @@
package com.refinedmods.refinedstorage.tile;
package com.refinedmods.refinedstorage.blockentity;
import com.refinedmods.refinedstorage.RSTiles;
import com.refinedmods.refinedstorage.RSBlockEntities;
import com.refinedmods.refinedstorage.apiimpl.network.node.DestructorNetworkNode;
import com.refinedmods.refinedstorage.apiimpl.network.node.cover.CoverManager;
import com.refinedmods.refinedstorage.tile.config.IComparable;
import com.refinedmods.refinedstorage.tile.config.IType;
import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.tile.data.TileDataParameter;
import com.refinedmods.refinedstorage.blockentity.config.IComparable;
import com.refinedmods.refinedstorage.blockentity.config.IType;
import com.refinedmods.refinedstorage.blockentity.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter;
import com.refinedmods.refinedstorage.util.WorldUtils;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
@@ -18,23 +18,23 @@ import net.minecraftforge.client.model.data.ModelDataMap;
import javax.annotation.Nonnull;
public class DestructorTile extends NetworkNodeTile<DestructorNetworkNode> {
public static final TileDataParameter<Integer, DestructorTile> COMPARE = IComparable.createParameter();
public static final TileDataParameter<Integer, DestructorTile> WHITELIST_BLACKLIST = IWhitelistBlacklist.createParameter();
public static final TileDataParameter<Integer, DestructorTile> TYPE = IType.createParameter();
public static final TileDataParameter<Boolean, DestructorTile> PICKUP = new TileDataParameter<>(EntityDataSerializers.BOOLEAN, false, t -> t.getNode().isPickupItem(), (t, v) -> {
public class DestructorBlockEntity extends NetworkNodeBlockEntity<DestructorNetworkNode> {
public static final BlockEntitySynchronizationParameter<Integer, DestructorBlockEntity> COMPARE = IComparable.createParameter();
public static final BlockEntitySynchronizationParameter<Integer, DestructorBlockEntity> WHITELIST_BLACKLIST = IWhitelistBlacklist.createParameter();
public static final BlockEntitySynchronizationParameter<Integer, DestructorBlockEntity> TYPE = IType.createParameter();
public static final BlockEntitySynchronizationParameter<Boolean, DestructorBlockEntity> PICKUP = new BlockEntitySynchronizationParameter<>(EntityDataSerializers.BOOLEAN, false, t -> t.getNode().isPickupItem(), (t, v) -> {
t.getNode().setPickupItem(v);
t.getNode().markDirty();
});
public static final TileDataParameter<CompoundTag, DestructorTile> COVER_MANAGER = new TileDataParameter<>(EntityDataSerializers.COMPOUND_TAG, new CompoundTag(),
public static final BlockEntitySynchronizationParameter<CompoundTag, DestructorBlockEntity> COVER_MANAGER = new BlockEntitySynchronizationParameter<>(EntityDataSerializers.COMPOUND_TAG, new CompoundTag(),
t -> t.getNode().getCoverManager().writeToNbt(),
(t, v) -> t.getNode().getCoverManager().readFromNbt(v),
(initial, p) -> {
});
public DestructorTile(BlockPos pos, BlockState state) {
super(RSTiles.DESTRUCTOR, pos, state);
public DestructorBlockEntity(BlockPos pos, BlockState state) {
super(RSBlockEntities.DESTRUCTOR, pos, state);
dataManager.addWatchedParameter(COMPARE);
dataManager.addWatchedParameter(WHITELIST_BLACKLIST);

24
src/main/java/com/refinedmods/refinedstorage/tile/DetectorTile.java → src/main/java/com/refinedmods/refinedstorage/blockentity/DetectorBlockEntity.java
View File

@@ -1,12 +1,12 @@
package com.refinedmods.refinedstorage.tile;
package com.refinedmods.refinedstorage.blockentity;
import com.refinedmods.refinedstorage.RSTiles;
import com.refinedmods.refinedstorage.RSBlockEntities;
import com.refinedmods.refinedstorage.apiimpl.network.node.DetectorNetworkNode;
import com.refinedmods.refinedstorage.screen.BaseScreen;
import com.refinedmods.refinedstorage.screen.DetectorScreen;
import com.refinedmods.refinedstorage.tile.config.IComparable;
import com.refinedmods.refinedstorage.tile.config.IType;
import com.refinedmods.refinedstorage.tile.data.TileDataParameter;
import com.refinedmods.refinedstorage.blockentity.config.IComparable;
import com.refinedmods.refinedstorage.blockentity.config.IType;
import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataSerializers;
@@ -15,24 +15,24 @@ import net.minecraft.world.level.block.state.BlockState;
import javax.annotation.Nonnull;
public class DetectorTile extends NetworkNodeTile<DetectorNetworkNode> {
public static final TileDataParameter<Integer, DetectorTile> COMPARE = IComparable.createParameter();
public static final TileDataParameter<Integer, DetectorTile> TYPE = IType.createParameter();
public static final TileDataParameter<Integer, DetectorTile> MODE = new TileDataParameter<>(EntityDataSerializers.INT, 0, t -> t.getNode().getMode(), (t, v) -> {
public class DetectorBlockEntity extends NetworkNodeBlockEntity<DetectorNetworkNode> {
public static final BlockEntitySynchronizationParameter<Integer, DetectorBlockEntity> COMPARE = IComparable.createParameter();
public static final BlockEntitySynchronizationParameter<Integer, DetectorBlockEntity> TYPE = IType.createParameter();
public static final BlockEntitySynchronizationParameter<Integer, DetectorBlockEntity> MODE = new BlockEntitySynchronizationParameter<>(EntityDataSerializers.INT, 0, t -> t.getNode().getMode(), (t, v) -> {
if (v == DetectorNetworkNode.MODE_UNDER || v == DetectorNetworkNode.MODE_EQUAL || v == DetectorNetworkNode.MODE_ABOVE) {
t.getNode().setMode(v);
t.getNode().markDirty();
}
});
public static final TileDataParameter<Integer, DetectorTile> AMOUNT = new TileDataParameter<>(EntityDataSerializers.INT, 0, t -> t.getNode().getAmount(), (t, v) -> {
public static final BlockEntitySynchronizationParameter<Integer, DetectorBlockEntity> AMOUNT = new BlockEntitySynchronizationParameter<>(EntityDataSerializers.INT, 0, t -> t.getNode().getAmount(), (t, v) -> {
t.getNode().setAmount(v);
t.getNode().markDirty();
}, (initial, value) -> BaseScreen.executeLater(DetectorScreen.class, detectorScreen -> detectorScreen.updateAmountField(value)));
private static final String NBT_POWERED = "Powered";
public DetectorTile(BlockPos pos, BlockState state) {
super(RSTiles.DETECTOR, pos, state);
public DetectorBlockEntity(BlockPos pos, BlockState state) {
super(RSBlockEntities.DETECTOR, pos, state);
dataManager.addWatchedParameter(COMPARE);
dataManager.addWatchedParameter(TYPE);

30
src/main/java/com/refinedmods/refinedstorage/tile/DiskDriveTile.java → src/main/java/com/refinedmods/refinedstorage/blockentity/DiskDriveBlockEntity.java
View File

@@ -1,13 +1,13 @@
package com.refinedmods.refinedstorage.tile;
package com.refinedmods.refinedstorage.blockentity;
import com.refinedmods.refinedstorage.RSTiles;
import com.refinedmods.refinedstorage.RSBlockEntities;
import com.refinedmods.refinedstorage.api.storage.AccessType;
import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk;
import com.refinedmods.refinedstorage.apiimpl.network.node.DiskState;
import com.refinedmods.refinedstorage.apiimpl.network.node.diskdrive.DiskDriveNetworkNode;
import com.refinedmods.refinedstorage.tile.config.*;
import com.refinedmods.refinedstorage.tile.data.RSSerializers;
import com.refinedmods.refinedstorage.tile.data.TileDataParameter;
import com.refinedmods.refinedstorage.blockentity.config.*;
import com.refinedmods.refinedstorage.blockentity.data.RSSerializers;
import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter;
import com.refinedmods.refinedstorage.util.WorldUtils;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
@@ -29,13 +29,13 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.Arrays;
public class DiskDriveTile extends NetworkNodeTile<DiskDriveNetworkNode> {
public static final TileDataParameter<Integer, DiskDriveTile> PRIORITY = IPrioritizable.createParameter();
public static final TileDataParameter<Integer, DiskDriveTile> COMPARE = IComparable.createParameter();
public static final TileDataParameter<Integer, DiskDriveTile> WHITELIST_BLACKLIST = IWhitelistBlacklist.createParameter();
public static final TileDataParameter<Integer, DiskDriveTile> TYPE = IType.createParameter();
public static final TileDataParameter<AccessType, DiskDriveTile> ACCESS_TYPE = IAccessType.createParameter();
public static final TileDataParameter<Long, DiskDriveTile> STORED = new TileDataParameter<>(RSSerializers.LONG_SERIALIZER, 0L, t -> {
public class DiskDriveBlockEntity extends NetworkNodeBlockEntity<DiskDriveNetworkNode> {
public static final BlockEntitySynchronizationParameter<Integer, DiskDriveBlockEntity> PRIORITY = IPrioritizable.createParameter();
public static final BlockEntitySynchronizationParameter<Integer, DiskDriveBlockEntity> COMPARE = IComparable.createParameter();
public static final BlockEntitySynchronizationParameter<Integer, DiskDriveBlockEntity> WHITELIST_BLACKLIST = IWhitelistBlacklist.createParameter();
public static final BlockEntitySynchronizationParameter<Integer, DiskDriveBlockEntity> TYPE = IType.createParameter();
public static final BlockEntitySynchronizationParameter<AccessType, DiskDriveBlockEntity> ACCESS_TYPE = IAccessType.createParameter();
public static final BlockEntitySynchronizationParameter<Long, DiskDriveBlockEntity> STORED = new BlockEntitySynchronizationParameter<>(RSSerializers.LONG_SERIALIZER, 0L, t -> {
long stored = 0;
for (IStorageDisk storage : t.getNode().getItemDisks()) {
@@ -52,7 +52,7 @@ public class DiskDriveTile extends NetworkNodeTile<DiskDriveNetworkNode> {
return stored;
});
public static final TileDataParameter<Long, DiskDriveTile> CAPACITY = new TileDataParameter<>(RSSerializers.LONG_SERIALIZER, 0L, t -> {
public static final BlockEntitySynchronizationParameter<Long, DiskDriveBlockEntity> CAPACITY = new BlockEntitySynchronizationParameter<>(RSSerializers.LONG_SERIALIZER, 0L, t -> {
long capacity = 0;
for (IStorageDisk storage : t.getNode().getItemDisks()) {
@@ -86,8 +86,8 @@ public class DiskDriveTile extends NetworkNodeTile<DiskDriveNetworkNode> {
private final DiskState[] diskState = new DiskState[8];
public DiskDriveTile(BlockPos pos, BlockState state) {
super(RSTiles.DISK_DRIVE, pos, state);
public DiskDriveBlockEntity(BlockPos pos, BlockState state) {
super(RSBlockEntities.DISK_DRIVE, pos, state);
dataManager.addWatchedParameter(PRIORITY);
dataManager.addWatchedParameter(COMPARE);

26
src/main/java/com/refinedmods/refinedstorage/tile/DiskManipulatorTile.java → src/main/java/com/refinedmods/refinedstorage/blockentity/DiskManipulatorBlockEntity.java
View File

@@ -1,12 +1,12 @@
package com.refinedmods.refinedstorage.tile;
package com.refinedmods.refinedstorage.blockentity;
import com.refinedmods.refinedstorage.RSTiles;
import com.refinedmods.refinedstorage.RSBlockEntities;
import com.refinedmods.refinedstorage.apiimpl.network.node.DiskState;
import com.refinedmods.refinedstorage.apiimpl.network.node.diskmanipulator.DiskManipulatorNetworkNode;
import com.refinedmods.refinedstorage.tile.config.IComparable;
import com.refinedmods.refinedstorage.tile.config.IType;
import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.tile.data.TileDataParameter;
import com.refinedmods.refinedstorage.blockentity.config.IComparable;
import com.refinedmods.refinedstorage.blockentity.config.IType;
import com.refinedmods.refinedstorage.blockentity.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter;
import com.refinedmods.refinedstorage.util.WorldUtils;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
@@ -29,11 +29,11 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.Arrays;
public class DiskManipulatorTile extends NetworkNodeTile<DiskManipulatorNetworkNode> {
public static final TileDataParameter<Integer, DiskManipulatorTile> COMPARE = IComparable.createParameter();
public static final TileDataParameter<Integer, DiskManipulatorTile> WHITELIST_BLACKLIST = IWhitelistBlacklist.createParameter();
public static final TileDataParameter<Integer, DiskManipulatorTile> TYPE = IType.createParameter();
public static final TileDataParameter<Integer, DiskManipulatorTile> IO_MODE = new TileDataParameter<>(EntityDataSerializers.INT, DiskManipulatorNetworkNode.IO_MODE_INSERT, t -> t.getNode().getIoMode(), (t, v) -> {
public class DiskManipulatorBlockEntity extends NetworkNodeBlockEntity<DiskManipulatorNetworkNode> {
public static final BlockEntitySynchronizationParameter<Integer, DiskManipulatorBlockEntity> COMPARE = IComparable.createParameter();
public static final BlockEntitySynchronizationParameter<Integer, DiskManipulatorBlockEntity> WHITELIST_BLACKLIST = IWhitelistBlacklist.createParameter();
public static final BlockEntitySynchronizationParameter<Integer, DiskManipulatorBlockEntity> TYPE = IType.createParameter();
public static final BlockEntitySynchronizationParameter<Integer, DiskManipulatorBlockEntity> IO_MODE = new BlockEntitySynchronizationParameter<>(EntityDataSerializers.INT, DiskManipulatorNetworkNode.IO_MODE_INSERT, t -> t.getNode().getIoMode(), (t, v) -> {
t.getNode().setIoMode(v);
t.getNode().markDirty();
});
@@ -46,8 +46,8 @@ public class DiskManipulatorTile extends NetworkNodeTile<DiskManipulatorNetworkN
private final DiskState[] diskState = new DiskState[6];
public DiskManipulatorTile(BlockPos pos, BlockState state) {
super(RSTiles.DISK_MANIPULATOR, pos, state);
public DiskManipulatorBlockEntity(BlockPos pos, BlockState state) {
super(RSBlockEntities.DISK_MANIPULATOR, pos, state);
dataManager.addWatchedParameter(COMPARE);
dataManager.addWatchedParameter(WHITELIST_BLACKLIST);

22
src/main/java/com/refinedmods/refinedstorage/tile/ExporterTile.java → src/main/java/com/refinedmods/refinedstorage/blockentity/ExporterBlockEntity.java
View File

@@ -1,11 +1,11 @@
package com.refinedmods.refinedstorage.tile;
package com.refinedmods.refinedstorage.blockentity;
import com.refinedmods.refinedstorage.RSTiles;
import com.refinedmods.refinedstorage.RSBlockEntities;
import com.refinedmods.refinedstorage.apiimpl.network.node.ExporterNetworkNode;
import com.refinedmods.refinedstorage.apiimpl.network.node.cover.CoverManager;
import com.refinedmods.refinedstorage.tile.config.IComparable;
import com.refinedmods.refinedstorage.tile.config.IType;
import com.refinedmods.refinedstorage.tile.data.TileDataParameter;
import com.refinedmods.refinedstorage.blockentity.config.IComparable;
import com.refinedmods.refinedstorage.blockentity.config.IType;
import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter;
import com.refinedmods.refinedstorage.util.WorldUtils;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
@@ -17,19 +17,19 @@ import net.minecraftforge.client.model.data.ModelDataMap;
import javax.annotation.Nonnull;
public class ExporterTile extends NetworkNodeTile<ExporterNetworkNode> {
public class ExporterBlockEntity extends NetworkNodeBlockEntity<ExporterNetworkNode> {
public static final TileDataParameter<CompoundTag, ExporterTile> COVER_MANAGER = new TileDataParameter<>(EntityDataSerializers.COMPOUND_TAG, new CompoundTag(),
public static final BlockEntitySynchronizationParameter<CompoundTag, ExporterBlockEntity> COVER_MANAGER = new BlockEntitySynchronizationParameter<>(EntityDataSerializers.COMPOUND_TAG, new CompoundTag(),
t -> t.getNode().getCoverManager().writeToNbt(),
(t, v) -> t.getNode().getCoverManager().readFromNbt(v),
(initial, p) -> {
});
public static final TileDataParameter<Integer, ExporterTile> COMPARE = IComparable.createParameter();
public static final TileDataParameter<Integer, ExporterTile> TYPE = IType.createParameter();
public static final BlockEntitySynchronizationParameter<Integer, ExporterBlockEntity> COMPARE = IComparable.createParameter();
public static final BlockEntitySynchronizationParameter<Integer, ExporterBlockEntity> TYPE = IType.createParameter();
public ExporterTile(BlockPos pos, BlockState state) {
super(RSTiles.EXPORTER, pos, state);
public ExporterBlockEntity(BlockPos pos, BlockState state) {
super(RSBlockEntities.EXPORTER, pos, state);
dataManager.addWatchedParameter(COMPARE);
dataManager.addWatchedParameter(TYPE);

32
src/main/java/com/refinedmods/refinedstorage/tile/ExternalStorageTile.java → src/main/java/com/refinedmods/refinedstorage/blockentity/ExternalStorageBlockEntity.java
View File

@@ -1,13 +1,13 @@
package com.refinedmods.refinedstorage.tile;
package com.refinedmods.refinedstorage.blockentity;
import com.refinedmods.refinedstorage.RSTiles;
import com.refinedmods.refinedstorage.RSBlockEntities;
import com.refinedmods.refinedstorage.api.storage.AccessType;
import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorage;
import com.refinedmods.refinedstorage.apiimpl.network.node.ExternalStorageNetworkNode;
import com.refinedmods.refinedstorage.apiimpl.network.node.cover.CoverManager;
import com.refinedmods.refinedstorage.tile.config.*;
import com.refinedmods.refinedstorage.tile.data.RSSerializers;
import com.refinedmods.refinedstorage.tile.data.TileDataParameter;
import com.refinedmods.refinedstorage.blockentity.config.*;
import com.refinedmods.refinedstorage.blockentity.data.RSSerializers;
import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter;
import com.refinedmods.refinedstorage.util.WorldUtils;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
@@ -21,13 +21,13 @@ import net.minecraftforge.fluids.FluidStack;
import javax.annotation.Nonnull;
public class ExternalStorageTile extends NetworkNodeTile<ExternalStorageNetworkNode> {
public static final TileDataParameter<Integer, ExternalStorageTile> PRIORITY = IPrioritizable.createParameter();
public static final TileDataParameter<Integer, ExternalStorageTile> COMPARE = IComparable.createParameter();
public static final TileDataParameter<Integer, ExternalStorageTile> WHITELIST_BLACKLIST = IWhitelistBlacklist.createParameter();
public static final TileDataParameter<Integer, ExternalStorageTile> TYPE = IType.createParameter();
public static final TileDataParameter<AccessType, ExternalStorageTile> ACCESS_TYPE = IAccessType.createParameter();
public static final TileDataParameter<Long, ExternalStorageTile> STORED = new TileDataParameter<>(RSSerializers.LONG_SERIALIZER, 0L, t -> {
public class ExternalStorageBlockEntity extends NetworkNodeBlockEntity<ExternalStorageNetworkNode> {
public static final BlockEntitySynchronizationParameter<Integer, ExternalStorageBlockEntity> PRIORITY = IPrioritizable.createParameter();
public static final BlockEntitySynchronizationParameter<Integer, ExternalStorageBlockEntity> COMPARE = IComparable.createParameter();
public static final BlockEntitySynchronizationParameter<Integer, ExternalStorageBlockEntity> WHITELIST_BLACKLIST = IWhitelistBlacklist.createParameter();
public static final BlockEntitySynchronizationParameter<Integer, ExternalStorageBlockEntity> TYPE = IType.createParameter();
public static final BlockEntitySynchronizationParameter<AccessType, ExternalStorageBlockEntity> ACCESS_TYPE = IAccessType.createParameter();
public static final BlockEntitySynchronizationParameter<Long, ExternalStorageBlockEntity> STORED = new BlockEntitySynchronizationParameter<>(RSSerializers.LONG_SERIALIZER, 0L, t -> {
long stored = 0;
for (IExternalStorage<ItemStack> storage : t.getNode().getItemStorages()) {
@@ -40,7 +40,7 @@ public class ExternalStorageTile extends NetworkNodeTile<ExternalStorageNetworkN
return stored;
});
public static final TileDataParameter<Long, ExternalStorageTile> CAPACITY = new TileDataParameter<>(RSSerializers.LONG_SERIALIZER, 0L, t -> {
public static final BlockEntitySynchronizationParameter<Long, ExternalStorageBlockEntity> CAPACITY = new BlockEntitySynchronizationParameter<>(RSSerializers.LONG_SERIALIZER, 0L, t -> {
long capacity = 0;
for (IExternalStorage<ItemStack> storage : t.getNode().getItemStorages()) {
@@ -54,11 +54,11 @@ public class ExternalStorageTile extends NetworkNodeTile<ExternalStorageNetworkN
return capacity;
});
public static final TileDataParameter<CompoundTag, ExternalStorageTile> COVER_MANAGER = new TileDataParameter<>(EntityDataSerializers.COMPOUND_TAG, new CompoundTag(), t -> t.getNode().getCoverManager().writeToNbt(), (t, v) -> t.getNode().getCoverManager().readFromNbt(v), (initial, p) -> {
public static final BlockEntitySynchronizationParameter<CompoundTag, ExternalStorageBlockEntity> COVER_MANAGER = new BlockEntitySynchronizationParameter<>(EntityDataSerializers.COMPOUND_TAG, new CompoundTag(), t -> t.getNode().getCoverManager().writeToNbt(), (t, v) -> t.getNode().getCoverManager().readFromNbt(v), (initial, p) -> {
});
public ExternalStorageTile(BlockPos pos, BlockState state) {
super(RSTiles.EXTERNAL_STORAGE, pos, state);
public ExternalStorageBlockEntity(BlockPos pos, BlockState state) {
super(RSBlockEntities.EXTERNAL_STORAGE, pos, state);
dataManager.addWatchedParameter(PRIORITY);
dataManager.addWatchedParameter(COMPARE);

18
src/main/java/com/refinedmods/refinedstorage/tile/FluidInterfaceTile.java → src/main/java/com/refinedmods/refinedstorage/blockentity/FluidInterfaceBlockEntity.java
View File

@@ -1,9 +1,9 @@
package com.refinedmods.refinedstorage.tile;
package com.refinedmods.refinedstorage.blockentity;
import com.refinedmods.refinedstorage.RSTiles;
import com.refinedmods.refinedstorage.RSBlockEntities;
import com.refinedmods.refinedstorage.apiimpl.network.node.FluidInterfaceNetworkNode;
import com.refinedmods.refinedstorage.tile.data.RSSerializers;
import com.refinedmods.refinedstorage.tile.data.TileDataParameter;
import com.refinedmods.refinedstorage.blockentity.data.RSSerializers;
import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.world.level.Level;
@@ -19,15 +19,15 @@ import net.minecraftforge.items.IItemHandler;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
public class FluidInterfaceTile extends NetworkNodeTile<FluidInterfaceNetworkNode> {
public static final TileDataParameter<FluidStack, FluidInterfaceTile> TANK_IN = new TileDataParameter<>(RSSerializers.FLUID_STACK_SERIALIZER, FluidStack.EMPTY, t -> t.getNode().getTankIn().getFluid());
public static final TileDataParameter<FluidStack, FluidInterfaceTile> TANK_OUT = new TileDataParameter<>(RSSerializers.FLUID_STACK_SERIALIZER, FluidStack.EMPTY, t -> t.getNode().getTankOut().getFluid());
public class FluidInterfaceBlockEntity extends NetworkNodeBlockEntity<FluidInterfaceNetworkNode> {
public static final BlockEntitySynchronizationParameter<FluidStack, FluidInterfaceBlockEntity> TANK_IN = new BlockEntitySynchronizationParameter<>(RSSerializers.FLUID_STACK_SERIALIZER, FluidStack.EMPTY, t -> t.getNode().getTankIn().getFluid());
public static final BlockEntitySynchronizationParameter<FluidStack, FluidInterfaceBlockEntity> TANK_OUT = new BlockEntitySynchronizationParameter<>(RSSerializers.FLUID_STACK_SERIALIZER, FluidStack.EMPTY, t -> t.getNode().getTankOut().getFluid());
private final LazyOptional<IFluidHandler> tankCapability = LazyOptional.of(() -> getNode().getTank());
private final LazyOptional<IItemHandler> inCapability = LazyOptional.of(() -> getNode().getIn());
public FluidInterfaceTile(BlockPos pos, BlockState state) {
super(RSTiles.FLUID_INTERFACE, pos, state);
public FluidInterfaceBlockEntity(BlockPos pos, BlockState state) {
super(RSBlockEntities.FLUID_INTERFACE, pos, state);
dataManager.addParameter(TANK_IN);
dataManager.addParameter(TANK_OUT);

68
src/main/java/com/refinedmods/refinedstorage/blockentity/FluidStorageBlockEntity.java Normal file
View File

@@ -0,0 +1,68 @@
package com.refinedmods.refinedstorage.blockentity;
import com.refinedmods.refinedstorage.RSBlockEntities;
import com.refinedmods.refinedstorage.api.storage.AccessType;
import com.refinedmods.refinedstorage.apiimpl.network.node.storage.FluidStorageNetworkNode;
import com.refinedmods.refinedstorage.apiimpl.storage.FluidStorageType;
import com.refinedmods.refinedstorage.blockentity.config.IAccessType;
import com.refinedmods.refinedstorage.blockentity.config.IComparable;
import com.refinedmods.refinedstorage.blockentity.config.IPrioritizable;
import com.refinedmods.refinedstorage.blockentity.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.blockentity.data.RSSerializers;
import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
import javax.annotation.Nonnull;
public class FluidStorageBlockEntity extends NetworkNodeBlockEntity<FluidStorageNetworkNode> {
public static final BlockEntitySynchronizationParameter<Integer, FluidStorageBlockEntity> PRIORITY = IPrioritizable.createParameter();
public static final BlockEntitySynchronizationParameter<Integer, FluidStorageBlockEntity> COMPARE = IComparable.createParameter();
public static final BlockEntitySynchronizationParameter<Integer, FluidStorageBlockEntity> WHITELIST_BLACKLIST = IWhitelistBlacklist.createParameter();
public static final BlockEntitySynchronizationParameter<AccessType, FluidStorageBlockEntity> ACCESS_TYPE = IAccessType.createParameter();
public static final BlockEntitySynchronizationParameter<Long, FluidStorageBlockEntity> STORED = new BlockEntitySynchronizationParameter<>(RSSerializers.LONG_SERIALIZER, 0L, t -> t.getNode().getStorage() != null ? (long) t.getNode().getStorage().getStored() : 0);
private final FluidStorageType type;
public FluidStorageBlockEntity(FluidStorageType type, BlockPos pos, BlockState state) {
super(getType(type), pos, state);
this.type = type;
dataManager.addWatchedParameter(PRIORITY);
dataManager.addWatchedParameter(COMPARE);
dataManager.addWatchedParameter(WHITELIST_BLACKLIST);
dataManager.addWatchedParameter(STORED);
dataManager.addWatchedParameter(ACCESS_TYPE);
}
public static BlockEntityType<FluidStorageBlockEntity> getType(FluidStorageType type) {
switch (type) {
case SIXTY_FOUR_K:
return RSBlockEntities.SIXTY_FOUR_K_FLUID_STORAGE_BLOCK;
case TWO_HUNDRED_FIFTY_SIX_K:
return RSBlockEntities.TWO_HUNDRED_FIFTY_SIX_K_FLUID_STORAGE_BLOCK;
case THOUSAND_TWENTY_FOUR_K:
return RSBlockEntities.THOUSAND_TWENTY_FOUR_K_FLUID_STORAGE_BLOCK;
case FOUR_THOUSAND_NINETY_SIX_K:
return RSBlockEntities.FOUR_THOUSAND_NINETY_SIX_K_FLUID_STORAGE_BLOCK;
case CREATIVE:
return RSBlockEntities.CREATIVE_FLUID_STORAGE_BLOCK;
default:
throw new IllegalArgumentException("Unknown storage type " + type);
}
}
public FluidStorageType getFluidStorageType() {
return type;
}
@Override
@Nonnull
public FluidStorageNetworkNode createNode(Level level, BlockPos pos) {
return new FluidStorageNetworkNode(level, pos, type);
}
}

26
src/main/java/com/refinedmods/refinedstorage/tile/ImporterTile.java → src/main/java/com/refinedmods/refinedstorage/blockentity/ImporterBlockEntity.java
View File

@@ -1,12 +1,12 @@
package com.refinedmods.refinedstorage.tile;
package com.refinedmods.refinedstorage.blockentity;
import com.refinedmods.refinedstorage.RSTiles;
import com.refinedmods.refinedstorage.RSBlockEntities;
import com.refinedmods.refinedstorage.apiimpl.network.node.ImporterNetworkNode;
import com.refinedmods.refinedstorage.apiimpl.network.node.cover.CoverManager;
import com.refinedmods.refinedstorage.tile.config.IComparable;
import com.refinedmods.refinedstorage.tile.config.IType;
import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.tile.data.TileDataParameter;
import com.refinedmods.refinedstorage.blockentity.config.IComparable;
import com.refinedmods.refinedstorage.blockentity.config.IType;
import com.refinedmods.refinedstorage.blockentity.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter;
import com.refinedmods.refinedstorage.util.WorldUtils;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
@@ -18,15 +18,15 @@ import net.minecraftforge.client.model.data.ModelDataMap;
import javax.annotation.Nonnull;
public class ImporterTile extends NetworkNodeTile<ImporterNetworkNode> {
public static final TileDataParameter<Integer, ImporterTile> COMPARE = IComparable.createParameter();
public static final TileDataParameter<Integer, ImporterTile> WHITELIST_BLACKLIST = IWhitelistBlacklist.createParameter();
public static final TileDataParameter<Integer, ImporterTile> TYPE = IType.createParameter();
public static final TileDataParameter<CompoundTag, ImporterTile> COVER_MANAGER = new TileDataParameter<>(EntityDataSerializers.COMPOUND_TAG, new CompoundTag(), t -> t.getNode().getCoverManager().writeToNbt(), (t, v) -> t.getNode().getCoverManager().readFromNbt(v), (initial, p) -> {
public class ImporterBlockEntity extends NetworkNodeBlockEntity<ImporterNetworkNode> {
public static final BlockEntitySynchronizationParameter<Integer, ImporterBlockEntity> COMPARE = IComparable.createParameter();
public static final BlockEntitySynchronizationParameter<Integer, ImporterBlockEntity> WHITELIST_BLACKLIST = IWhitelistBlacklist.createParameter();
public static final BlockEntitySynchronizationParameter<Integer, ImporterBlockEntity> TYPE = IType.createParameter();
public static final BlockEntitySynchronizationParameter<CompoundTag, ImporterBlockEntity> COVER_MANAGER = new BlockEntitySynchronizationParameter<>(EntityDataSerializers.COMPOUND_TAG, new CompoundTag(), t -> t.getNode().getCoverManager().writeToNbt(), (t, v) -> t.getNode().getCoverManager().readFromNbt(v), (initial, p) -> {
});
public ImporterTile(BlockPos pos, BlockState state) {
super(RSTiles.IMPORTER, pos, state);
public ImporterBlockEntity(BlockPos pos, BlockState state) {
super(RSBlockEntities.IMPORTER, pos, state);
dataManager.addWatchedParameter(COMPARE);
dataManager.addWatchedParameter(WHITELIST_BLACKLIST);

16
src/main/java/com/refinedmods/refinedstorage/tile/InterfaceTile.java → src/main/java/com/refinedmods/refinedstorage/blockentity/InterfaceBlockEntity.java
View File

@@ -1,9 +1,9 @@
package com.refinedmods.refinedstorage.tile;
package com.refinedmods.refinedstorage.blockentity;
import com.refinedmods.refinedstorage.RSTiles;
import com.refinedmods.refinedstorage.RSBlockEntities;
import com.refinedmods.refinedstorage.apiimpl.network.node.InterfaceNetworkNode;
import com.refinedmods.refinedstorage.tile.config.IComparable;
import com.refinedmods.refinedstorage.tile.data.TileDataParameter;
import com.refinedmods.refinedstorage.blockentity.config.IComparable;
import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.world.level.Level;
@@ -16,13 +16,13 @@ import net.minecraftforge.items.IItemHandler;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
public class InterfaceTile extends NetworkNodeTile<InterfaceNetworkNode> {
public static final TileDataParameter<Integer, InterfaceTile> COMPARE = IComparable.createParameter();
public class InterfaceBlockEntity extends NetworkNodeBlockEntity<InterfaceNetworkNode> {
public static final BlockEntitySynchronizationParameter<Integer, InterfaceBlockEntity> COMPARE = IComparable.createParameter();
private final LazyOptional<IItemHandler> itemsCapability = LazyOptional.of(() -> getNode().getItems());
public InterfaceTile(BlockPos pos, BlockState state) {
super(RSTiles.INTERFACE, pos, state);
public InterfaceBlockEntity(BlockPos pos, BlockState state) {
super(RSBlockEntities.INTERFACE, pos, state);
dataManager.addWatchedParameter(COMPARE);
}

16
src/main/java/com/refinedmods/refinedstorage/tile/NetworkNodeTile.java → src/main/java/com/refinedmods/refinedstorage/blockentity/NetworkNodeBlockEntity.java
View File

@@ -1,4 +1,4 @@
package com.refinedmods.refinedstorage.tile;
package com.refinedmods.refinedstorage.blockentity;
import com.refinedmods.refinedstorage.api.network.node.INetworkNode;
import com.refinedmods.refinedstorage.api.network.node.INetworkNodeManager;
@@ -7,9 +7,9 @@ import com.refinedmods.refinedstorage.api.util.Action;
import com.refinedmods.refinedstorage.apiimpl.API;
import com.refinedmods.refinedstorage.apiimpl.network.node.NetworkNode;
import com.refinedmods.refinedstorage.capability.NetworkNodeProxyCapability;
import com.refinedmods.refinedstorage.tile.config.IRedstoneConfigurable;
import com.refinedmods.refinedstorage.tile.config.RedstoneMode;
import com.refinedmods.refinedstorage.tile.data.TileDataParameter;
import com.refinedmods.refinedstorage.blockentity.config.IRedstoneConfigurable;
import com.refinedmods.refinedstorage.blockentity.config.RedstoneMode;
import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.server.level.ServerLevel;
@@ -22,14 +22,14 @@ import net.minecraftforge.common.util.LazyOptional;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
public abstract class NetworkNodeTile<N extends NetworkNode> extends BaseTile implements INetworkNodeProxy<N>, IRedstoneConfigurable {
public static final TileDataParameter<Integer, NetworkNodeTile> REDSTONE_MODE = RedstoneMode.createParameter();
public abstract class NetworkNodeBlockEntity<N extends NetworkNode> extends BaseBlockEntity implements INetworkNodeProxy<N>, IRedstoneConfigurable {
public static final BlockEntitySynchronizationParameter<Integer, NetworkNodeBlockEntity> REDSTONE_MODE = RedstoneMode.createParameter();
private final LazyOptional<INetworkNodeProxy<N>> networkNodeProxy = LazyOptional.of(() -> this);
private N clientNode;
private N removedNode;
protected NetworkNodeTile(BlockEntityType<?> tileType, BlockPos pos, BlockState state) {
super(tileType, pos, state);
protected NetworkNodeBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
super(type, pos, state);
dataManager.addWatchedParameter(REDSTONE_MODE);
}

10
src/main/java/com/refinedmods/refinedstorage/tile/NetworkReceiverTile.java → src/main/java/com/refinedmods/refinedstorage/blockentity/NetworkReceiverBlockEntity.java
View File

@@ -1,6 +1,6 @@
package com.refinedmods.refinedstorage.tile;
package com.refinedmods.refinedstorage.blockentity;
import com.refinedmods.refinedstorage.RSTiles;
import com.refinedmods.refinedstorage.RSBlockEntities;
import com.refinedmods.refinedstorage.apiimpl.network.node.NetworkReceiverNetworkNode;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.Level;
@@ -8,9 +8,9 @@ import net.minecraft.world.level.block.state.BlockState;
import javax.annotation.Nonnull;
public class NetworkReceiverTile extends NetworkNodeTile<NetworkReceiverNetworkNode> {
public NetworkReceiverTile(BlockPos pos, BlockState state) {
super(RSTiles.NETWORK_RECEIVER, pos, state);
public class NetworkReceiverBlockEntity extends NetworkNodeBlockEntity<NetworkReceiverNetworkNode> {
public NetworkReceiverBlockEntity(BlockPos pos, BlockState state) {
super(RSBlockEntities.NETWORK_RECEIVER, pos, state);
}
@Override

18
src/main/java/com/refinedmods/refinedstorage/tile/NetworkTransmitterTile.java → src/main/java/com/refinedmods/refinedstorage/blockentity/NetworkTransmitterBlockEntity.java
View File

@@ -1,9 +1,9 @@
package com.refinedmods.refinedstorage.tile;
package com.refinedmods.refinedstorage.blockentity;
import com.refinedmods.refinedstorage.RSTiles;
import com.refinedmods.refinedstorage.RSBlockEntities;
import com.refinedmods.refinedstorage.apiimpl.network.node.NetworkTransmitterNetworkNode;
import com.refinedmods.refinedstorage.tile.data.RSSerializers;
import com.refinedmods.refinedstorage.tile.data.TileDataParameter;
import com.refinedmods.refinedstorage.blockentity.data.RSSerializers;
import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.network.syncher.EntityDataSerializers;
@@ -19,9 +19,9 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.Optional;
public class NetworkTransmitterTile extends NetworkNodeTile<NetworkTransmitterNetworkNode> {
public static final TileDataParameter<Integer, NetworkTransmitterTile> DISTANCE = new TileDataParameter<>(EntityDataSerializers.INT, 0, t -> t.getNode().getDistance());
public static final TileDataParameter<Optional<ResourceLocation>, NetworkTransmitterTile> RECEIVER_DIMENSION = new TileDataParameter<>(RSSerializers.OPTIONAL_RESOURCE_LOCATION_SERIALIZER, Optional.empty(), t -> {
public class NetworkTransmitterBlockEntity extends NetworkNodeBlockEntity<NetworkTransmitterNetworkNode> {
public static final BlockEntitySynchronizationParameter<Integer, NetworkTransmitterBlockEntity> DISTANCE = new BlockEntitySynchronizationParameter<>(EntityDataSerializers.INT, 0, t -> t.getNode().getDistance());
public static final BlockEntitySynchronizationParameter<Optional<ResourceLocation>, NetworkTransmitterBlockEntity> RECEIVER_DIMENSION = new BlockEntitySynchronizationParameter<>(RSSerializers.OPTIONAL_RESOURCE_LOCATION_SERIALIZER, Optional.empty(), t -> {
if (t.getNode().getReceiverDimension() != null) {
return Optional.of(t.getNode().getReceiverDimension().location());
}
@@ -31,8 +31,8 @@ public class NetworkTransmitterTile extends NetworkNodeTile<NetworkTransmitterNe
private final LazyOptional<IItemHandler> networkCardCapability = LazyOptional.of(() -> getNode().getNetworkCard());
public NetworkTransmitterTile(BlockPos pos, BlockState state) {
super(RSTiles.NETWORK_TRANSMITTER, pos, state);
public NetworkTransmitterBlockEntity(BlockPos pos, BlockState state) {
super(RSBlockEntities.NETWORK_TRANSMITTER, pos, state);
dataManager.addWatchedParameter(DISTANCE);
dataManager.addWatchedParameter(RECEIVER_DIMENSION);

10
src/main/java/com/refinedmods/refinedstorage/tile/RelayTile.java → src/main/java/com/refinedmods/refinedstorage/blockentity/RelayBlockEntity.java
View File

@@ -1,6 +1,6 @@
package com.refinedmods.refinedstorage.tile;
package com.refinedmods.refinedstorage.blockentity;
import com.refinedmods.refinedstorage.RSTiles;
import com.refinedmods.refinedstorage.RSBlockEntities;
import com.refinedmods.refinedstorage.apiimpl.network.node.RelayNetworkNode;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.Level;
@@ -8,9 +8,9 @@ import net.minecraft.world.level.block.state.BlockState;
import javax.annotation.Nonnull;
public class RelayTile extends NetworkNodeTile<RelayNetworkNode> {
public RelayTile(BlockPos pos, BlockState state) {
super(RSTiles.RELAY, pos, state);
public class RelayBlockEntity extends NetworkNodeBlockEntity<RelayNetworkNode> {
public RelayBlockEntity(BlockPos pos, BlockState state) {
super(RSBlockEntities.RELAY, pos, state);
}
@Override

10
src/main/java/com/refinedmods/refinedstorage/tile/SecurityManagerTile.java → src/main/java/com/refinedmods/refinedstorage/blockentity/SecurityManagerBlockEntity.java
View File

@@ -1,6 +1,6 @@
package com.refinedmods.refinedstorage.tile;
package com.refinedmods.refinedstorage.blockentity;
import com.refinedmods.refinedstorage.RSTiles;
import com.refinedmods.refinedstorage.RSBlockEntities;
import com.refinedmods.refinedstorage.apiimpl.network.node.SecurityManagerNetworkNode;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.Level;
@@ -8,9 +8,9 @@ import net.minecraft.world.level.block.state.BlockState;
import javax.annotation.Nonnull;
public class SecurityManagerTile extends NetworkNodeTile<SecurityManagerNetworkNode> {
public SecurityManagerTile(BlockPos pos, BlockState state) {
super(RSTiles.SECURITY_MANAGER, pos, state);
public class SecurityManagerBlockEntity extends NetworkNodeBlockEntity<SecurityManagerNetworkNode> {
public SecurityManagerBlockEntity(BlockPos pos, BlockState state) {
super(RSBlockEntities.SECURITY_MANAGER, pos, state);
}
@Override

Some files were not shown because too many files have changed in this diff Show More