diff --git a/src/main/java/com/refinedmods/refinedstorage/api/IRSAPI.java b/src/main/java/com/refinedmods/refinedstorage/api/IRSAPI.java index 0fc892c74..b36710c9e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/IRSAPI.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/IRSAPI.java @@ -57,20 +57,20 @@ public interface IRSAPI { INetworkNodeRegistry getNetworkNodeRegistry(); /** - * Gets a network node manager for a given world. + * Gets a network node manager for a given level. * - * @param world world - * @return the network node manager for a given world + * @param level level + * @return the network node manager for a given level */ - INetworkNodeManager getNetworkNodeManager(ServerLevel world); + INetworkNodeManager getNetworkNodeManager(ServerLevel level); /** - * Gets a network manager for a given world. + * Gets a network manager for a given level. * - * @param world world - * @return the network manager for a given world + * @param level level + * @return the network manager for a given level */ - INetworkManager getNetworkManager(ServerLevel world); + INetworkManager getNetworkManager(ServerLevel level); /** * @return the crafting task registry @@ -127,11 +127,11 @@ public interface IRSAPI { IStorageDiskRegistry getStorageDiskRegistry(); /** - * @param anyWorld any world associated with the server + * @param level any level associated with the server * @return the storage disk manager */ @Nonnull - IStorageDiskManager getStorageDiskManager(ServerLevel anyWorld); + IStorageDiskManager getStorageDiskManager(ServerLevel level); /** * @return the storage disk sync manager @@ -143,7 +143,7 @@ public interface IRSAPI { * @return the storage tracker manager */ @Nonnull - IStorageTrackerManager getStorageTrackerManager(ServerLevel anyWorld); + IStorageTrackerManager getStorageTrackerManager(ServerLevel level); /** * Adds an external storage provider for the given storage type. @@ -160,22 +160,22 @@ public interface IRSAPI { Set> getExternalStorageProviders(StorageType type); /** - * @param world the world + * @param level the level * @param capacity the capacity * @param owner the owner or null if no owner * @return a storage disk */ @Nonnull - IStorageDisk createDefaultItemDisk(ServerLevel world, int capacity, @Nullable Player owner); + IStorageDisk createDefaultItemDisk(ServerLevel level, int capacity, @Nullable Player owner); /** - * @param world the world + * @param level the level * @param capacity the capacity in mB * @param owner the owner or null if no owner * @return a fluid storage disk */ @Nonnull - IStorageDisk createDefaultFluidDisk(ServerLevel world, int capacity, @Nullable Player owner); + IStorageDisk createDefaultFluidDisk(ServerLevel level, int capacity, @Nullable Player owner); /** * Creates crafting request info for an item. diff --git a/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternProvider.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternProvider.java index e3be860b4..e74676bac 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternProvider.java @@ -13,11 +13,11 @@ public interface ICraftingPatternProvider { /** * Creates a crafting pattern. * - * @param world the world + * @param level the level * @param stack the pattern stack, the implementor needs to copy it * @param container the {@link ICraftingPatternContainer} where the pattern is in * @return the crafting pattern */ @Nonnull - ICraftingPattern create(Level world, ItemStack stack, ICraftingPatternContainer container); + ICraftingPattern create(Level level, ItemStack stack, ICraftingPatternContainer container); } diff --git a/src/main/java/com/refinedmods/refinedstorage/api/network/INetwork.java b/src/main/java/com/refinedmods/refinedstorage/api/network/INetwork.java index 3b1fe134e..5d61ac0f8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/network/INetwork.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/INetwork.java @@ -242,12 +242,12 @@ public interface INetwork { IStorageTracker getFluidStorageTracker(); /** - * @return the world where this network is in + * @return the level where this network is in */ - Level getWorld(); + Level getLevel(); /** - * @return the position of this network in the world + * @return the position of this network in the level */ BlockPos getPosition(); diff --git a/src/main/java/com/refinedmods/refinedstorage/api/network/INetworkManager.java b/src/main/java/com/refinedmods/refinedstorage/api/network/INetworkManager.java index 09fc3826f..4341d942b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/network/INetworkManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/INetworkManager.java @@ -6,7 +6,7 @@ import javax.annotation.Nullable; import java.util.Collection; /** - * This is a registry for network nodes in the world. + * This is a registry for network nodes in the level. */ public interface INetworkManager { /** diff --git a/src/main/java/com/refinedmods/refinedstorage/api/network/INetworkNodeGraph.java b/src/main/java/com/refinedmods/refinedstorage/api/network/INetworkNodeGraph.java index 047e56ced..9c5aa66f2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/network/INetworkNodeGraph.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/INetworkNodeGraph.java @@ -15,10 +15,10 @@ public interface INetworkNodeGraph { * Rebuilds the network graph. * * @param action whether to perform or simulate - * @param world the origin world + * @param level the origin level * @param origin the origin, usually the network position */ - void invalidate(Action action, Level world, BlockPos origin); + void invalidate(Action action, Level level, BlockPos origin); /** * Runs an action on the network. diff --git a/src/main/java/com/refinedmods/refinedstorage/api/network/INetworkNodeVisitor.java b/src/main/java/com/refinedmods/refinedstorage/api/network/INetworkNodeVisitor.java index 9ec20c9f8..7eb424d69 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/network/INetworkNodeVisitor.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/INetworkNodeVisitor.java @@ -23,15 +23,15 @@ public interface INetworkNodeVisitor { */ interface Operator { /** - * Calling this method in {@link #visit(Operator)} will make the network graph scan the given world and position. + * Calling this method in {@link #visit(Operator)} will make the network graph scan the given level and position. * If there is another {@link INetworkNodeVisitor} at that position, it will call that visitor. * If there is no {@link INetworkNodeVisitor} at that position, it will use a default implementation which scans neighbors. * - * @param world the world + * @param level the level * @param pos the position * @param side the side */ - void apply(Level world, BlockPos pos, @Nullable Direction side); + void apply(Level level, BlockPos pos, @Nullable Direction side); /** * Returns whether the network graph is scanning in simulation mode. diff --git a/src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridFactory.java b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridFactory.java index 32adbc87c..a1db21b6d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridFactory.java @@ -37,12 +37,12 @@ public interface IGridFactory { /** * Returns a possible tile for this grid if {@link #getType()} is BLOCK. * - * @param world the world + * @param level the level * @param pos the position * @return the tile, or null if no tile is required */ @Nullable - BlockEntity getRelevantTile(Level world, BlockPos pos); + BlockEntity getRelevantTile(Level level, BlockPos pos); /** * @return the type diff --git a/src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNode.java index 60417445b..c9c29d747 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNode.java @@ -78,9 +78,9 @@ public interface INetworkNode { BlockPos getPos(); /** - * @return the world of this network node + * @return the level of this network node */ - Level getWorld(); + Level getLevel(); /** * Marks this node as dirty for saving. diff --git a/src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNodeFactory.java b/src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNodeFactory.java index 40f48f8f5..85d559e67 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNodeFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNodeFactory.java @@ -14,10 +14,10 @@ public interface INetworkNodeFactory { * Creates a network node. * * @param tag the tag on disk - * @param world the world + * @param level the level * @param pos the pos * @return the network node */ @Nonnull - INetworkNode create(CompoundTag tag, Level world, BlockPos pos); + INetworkNode create(CompoundTag tag, Level level, BlockPos pos); } diff --git a/src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNodeManager.java b/src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNodeManager.java index 107468546..c19ae8795 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNodeManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/node/INetworkNodeManager.java @@ -6,7 +6,7 @@ import javax.annotation.Nullable; import java.util.Collection; /** - * This is a registry for network nodes in the world. + * This is a registry for network nodes in the level. */ public interface INetworkNodeManager { /** diff --git a/src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskFactory.java b/src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskFactory.java index 0e3775906..be70053fa 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/storage/disk/IStorageDiskFactory.java @@ -16,11 +16,11 @@ public interface IStorageDiskFactory { /** * Creates a storage disk based on NBT. * - * @param world the world + * @param level the level * @param tag the tag * @return the storage disk */ - IStorageDisk createFromNbt(ServerLevel world, CompoundTag tag); + IStorageDisk createFromNbt(ServerLevel level, CompoundTag tag); /** * Creates a storage disk item based on ID. @@ -34,10 +34,10 @@ public interface IStorageDiskFactory { /** * Creates a storage disk on-demand. * - * @param world the world + * @param level the level * @param capacity the capacity * @param owner the owner, or null if no owner * @return the storage disk */ - IStorageDisk create(ServerLevel world, int capacity, @Nullable UUID owner); + IStorageDisk create(ServerLevel level, int capacity, @Nullable UUID owner); } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/API.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/API.java index 02d125fce..8746f8fd0 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/API.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/API.java @@ -128,21 +128,21 @@ public class API implements IRSAPI { } @Override - public INetworkNodeManager getNetworkNodeManager(ServerLevel world) { - return world.getDataStorage().computeIfAbsent(tag -> { - NetworkNodeManager manager = new NetworkNodeManager( world); + public INetworkNodeManager getNetworkNodeManager(ServerLevel level) { + return level.getDataStorage().computeIfAbsent(tag -> { + NetworkNodeManager manager = new NetworkNodeManager(level); manager.load(tag); return manager; - }, () -> new NetworkNodeManager(world), NetworkNodeManager.NAME); + }, () -> new NetworkNodeManager(level), NetworkNodeManager.NAME); } @Override - public INetworkManager getNetworkManager(ServerLevel world) { - return world.getDataStorage().computeIfAbsent(tag -> { - NetworkManager manager = new NetworkManager(world); + public INetworkManager getNetworkManager(ServerLevel level) { + return level.getDataStorage().computeIfAbsent(tag -> { + NetworkManager manager = new NetworkManager(level); manager.load(tag); return manager; - }, () -> new NetworkManager(world), NetworkManager.NAME); + }, () -> new NetworkManager(level), NetworkManager.NAME); } @Override @@ -201,14 +201,14 @@ public class API implements IRSAPI { @Nonnull @Override - public IStorageDiskManager getStorageDiskManager(ServerLevel anyWorld) { - ServerLevel world = anyWorld.getServer().overworld(); // Get the overworld + public IStorageDiskManager getStorageDiskManager(ServerLevel level) { + ServerLevel overworld = level.getServer().overworld(); // Get the overworld - return world.getDataStorage().computeIfAbsent(tag -> { - StorageDiskManager manager = new StorageDiskManager(world); + return overworld.getDataStorage().computeIfAbsent(tag -> { + StorageDiskManager manager = new StorageDiskManager(overworld); manager.load(tag); return manager; - }, () -> new StorageDiskManager( world), StorageDiskManager.NAME); + }, () -> new StorageDiskManager(overworld), StorageDiskManager.NAME); } @Nonnull @@ -219,10 +219,10 @@ public class API implements IRSAPI { @Nonnull @Override - public IStorageTrackerManager getStorageTrackerManager(ServerLevel anyWorld) { - ServerLevel world = anyWorld.getServer().overworld(); // Get the overworld + public IStorageTrackerManager getStorageTrackerManager(ServerLevel level) { + ServerLevel overworld = level.getServer().overworld(); // Get the overworld - return world.getDataStorage().computeIfAbsent(tag -> { + return overworld.getDataStorage().computeIfAbsent(tag -> { StorageTrackerManager manager = new StorageTrackerManager(); manager.load(tag); return manager; @@ -243,22 +243,22 @@ public class API implements IRSAPI { @Override @Nonnull - public IStorageDisk createDefaultItemDisk(ServerLevel world, int capacity, @Nullable Player owner) { - if (world == null) { + public IStorageDisk createDefaultItemDisk(ServerLevel level, int capacity, @Nullable Player owner) { + if (level == null) { throw new IllegalArgumentException("World cannot be null"); } - return new ItemStorageDisk(world, capacity, owner == null ? null : owner.getGameProfile().getId()); + return new ItemStorageDisk(level, capacity, owner == null ? null : owner.getGameProfile().getId()); } @Override @Nonnull - public IStorageDisk createDefaultFluidDisk(ServerLevel world, int capacity, @Nullable Player owner) { - if (world == null) { + public IStorageDisk createDefaultFluidDisk(ServerLevel level, int capacity, @Nullable Player owner) { + if (level == null) { throw new IllegalArgumentException("World cannot be null"); } - return new FluidStorageDisk(world, capacity, owner == null ? null : owner.getGameProfile().getId()); + return new FluidStorageDisk(level, capacity, owner == null ? null : owner.getGameProfile().getId()); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingManager.java index 432399d7d..8c68cdb8c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingManager.java @@ -12,10 +12,10 @@ import com.refinedmods.refinedstorage.apiimpl.API; import com.refinedmods.refinedstorage.apiimpl.autocrafting.task.v6.calculator.CalculationResult; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.Tag; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; -import net.minecraft.nbt.Tag; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.items.IItemHandlerModifiable; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java index a66f6b5a6..3316f98a2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java @@ -24,7 +24,7 @@ import java.util.*; public class CraftingPatternFactory { public static final CraftingPatternFactory INSTANCE = new CraftingPatternFactory(); - public ICraftingPattern create(Level world, ICraftingPatternContainer container, ItemStack stack) { + public ICraftingPattern create(Level level, ICraftingPatternContainer container, ItemStack stack) { CraftingPatternContext context = new CraftingPatternContext(container, stack); boolean processing = PatternItem.isProcessing(stack); @@ -55,7 +55,7 @@ public class CraftingPatternFactory { fillCraftingInputs(inv, stack, inputs, i); } - Optional foundRecipe = world.getRecipeManager().getRecipeFor(RecipeType.CRAFTING, inv, world); + Optional foundRecipe = level.getRecipeManager().getRecipeFor(RecipeType.CRAFTING, inv, level); if (foundRecipe.isPresent()) { recipe = foundRecipe.get(); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTask.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTask.java index 031d8ad2d..5c365fbde 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTask.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTask.java @@ -22,8 +22,8 @@ import com.refinedmods.refinedstorage.apiimpl.storage.disk.factory.FluidStorageD import com.refinedmods.refinedstorage.apiimpl.storage.disk.factory.ItemStorageDiskFactory; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.Tag; import net.minecraft.world.item.ItemStack; -import net.minecraft.nbt.Tag; import net.minecraftforge.fluids.FluidStack; import java.util.ArrayList; @@ -89,7 +89,7 @@ public class CraftingTask implements ICraftingTask, NodeListener { this.requested = API.instance().createCraftingRequestInfo(tag.getCompound(NBT_REQUESTED)); this.quantity = tag.getInt(NBT_QUANTITY); - this.pattern = SerializationUtil.readPatternFromNbt(tag.getCompound(NBT_PATTERN), network.getWorld()); + this.pattern = SerializationUtil.readPatternFromNbt(tag.getCompound(NBT_PATTERN), network.getLevel()); this.id = tag.getUUID(NBT_ID); this.nodes = new NodeList(); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/SerializationUtil.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/SerializationUtil.java index 1c002ba5c..f483790c5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/SerializationUtil.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/SerializationUtil.java @@ -85,16 +85,16 @@ public class SerializationUtil { return tag; } - public static ICraftingPattern readPatternFromNbt(CompoundTag tag, Level world) throws CraftingTaskReadException { + public static ICraftingPattern readPatternFromNbt(CompoundTag tag, Level level) throws CraftingTaskReadException { BlockPos containerPos = BlockPos.of(tag.getLong(NBT_PATTERN_CONTAINER_POS)); - INetworkNode node = API.instance().getNetworkNodeManager((ServerLevel) world).getNode(containerPos); + INetworkNode node = API.instance().getNetworkNodeManager((ServerLevel) level).getNode(containerPos); if (node instanceof ICraftingPatternContainer) { ItemStack stack = ItemStack.of(tag.getCompound(NBT_PATTERN_STACK)); if (stack.getItem() instanceof ICraftingPatternProvider) { - return ((ICraftingPatternProvider) stack.getItem()).create(world, stack, (ICraftingPatternContainer) node); + return ((ICraftingPatternProvider) stack.getItem()).create(level, stack, (ICraftingPatternContainer) node); } else { throw new CraftingTaskReadException("Pattern stack is not a crafting pattern provider"); } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/node/CraftingNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/node/CraftingNode.java index 978bd4096..7687bb58e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/node/CraftingNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/node/CraftingNode.java @@ -11,8 +11,8 @@ import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.core.NonNullList; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.Tag; import net.minecraft.world.item.ItemStack; -import net.minecraft.nbt.Tag; import net.minecraftforge.fluids.FluidStack; public class CraftingNode extends Node { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/node/Node.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/node/Node.java index aaf4aa4f6..f0fd320fe 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/node/Node.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/node/Node.java @@ -29,7 +29,7 @@ public abstract class Node { protected Node(INetwork network, CompoundTag tag) throws CraftingTaskReadException { this.quantity = tag.getInt(NBT_QUANTITY); this.totalQuantity = tag.getInt(NBT_QUANTITY_TOTAL); - this.pattern = SerializationUtil.readPatternFromNbt(tag.getCompound(NBT_PATTERN), network.getWorld()); + this.pattern = SerializationUtil.readPatternFromNbt(tag.getCompound(NBT_PATTERN), network.getLevel()); this.root = tag.getBoolean(NBT_ROOT); this.requirements.readFromNbt(tag); } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/node/ProcessingNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/node/ProcessingNode.java index bab8673e3..b24bc6e44 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/node/ProcessingNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/node/ProcessingNode.java @@ -12,8 +12,8 @@ import com.refinedmods.refinedstorage.apiimpl.API; import com.refinedmods.refinedstorage.apiimpl.autocrafting.task.v6.IoUtil; import com.refinedmods.refinedstorage.apiimpl.autocrafting.task.v6.SerializationUtil; import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.Tag; import net.minecraft.world.item.ItemStack; -import net.minecraft.nbt.Tag; import net.minecraftforge.fluids.FluidStack; public class ProcessingNode extends Node { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java index d61a56045..b046a056a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java @@ -74,7 +74,7 @@ public class Network implements INetwork, IRedstoneConfigurable { private final BaseEnergyStorage energy = new BaseEnergyStorage(RS.SERVER_CONFIG.getController().getCapacity(), RS.SERVER_CONFIG.getController().getMaxTransfer(), 0); private final RootNetworkNode root; private final BlockPos pos; - private final Level world; + private final Level level; private final NetworkType type; private ItemStorageTracker itemStorageTracker; private UUID itemStorageTrackerId; @@ -93,13 +93,13 @@ public class Network implements INetwork, IRedstoneConfigurable { private long[] tickTimes = new long[100]; private int tickCounter = 0; - public Network(Level world, BlockPos pos, NetworkType type) { + public Network(Level level, BlockPos pos, NetworkType type) { this.pos = pos; - this.world = world; + this.level = level; this.type = type; - this.root = new RootNetworkNode(this, world, pos); + this.root = new RootNetworkNode(this, level, pos); this.nodeGraph.addListener(() -> { - BlockEntity tile = world.getBlockEntity(pos); + BlockEntity tile = level.getBlockEntity(pos); if (tile instanceof ControllerTile) { ((ControllerTile) tile).getDataManager().sendParameterToWatchers(ControllerTile.NODES); @@ -160,16 +160,16 @@ public class Network implements INetwork, IRedstoneConfigurable { @Override public void update() { - if (!world.isClientSide) { + if (!level.isClientSide) { long tickStart = Util.getNanos(); if (ticks == 0) { - redstonePowered = world.hasNeighborSignal(pos); + redstonePowered = level.hasNeighborSignal(pos); } ++ticks; - amILoaded = world.isLoaded(pos); + amILoaded = level.isLoaded(pos); updateEnergyUsage(); @@ -203,7 +203,7 @@ public class Network implements INetwork, IRedstoneConfigurable { LOGGER.debug("Network at position {} changed running state to {}, causing an invalidation of the node graph", pos, couldRun); - nodeGraph.invalidate(Action.PERFORM, world, pos); + nodeGraph.invalidate(Action.PERFORM, level, pos); securityManager.invalidate(); } } else { @@ -215,9 +215,9 @@ public class Network implements INetwork, IRedstoneConfigurable { if (lastEnergyType != energyType) { lastEnergyType = energyType; - BlockState state = world.getBlockState(pos); + BlockState state = level.getBlockState(pos); if (state.getBlock() instanceof ControllerBlock) { - world.setBlockAndUpdate(pos, state.setValue(ControllerBlock.ENERGY_TYPE, energyType)); + level.setBlockAndUpdate(pos, state.setValue(ControllerBlock.ENERGY_TYPE, energyType)); } } @@ -248,8 +248,8 @@ public class Network implements INetwork, IRedstoneConfigurable { } nodeGraph.disconnectAll(); - API.instance().getStorageTrackerManager((ServerLevel) getWorld()).remove(itemStorageTrackerId); - API.instance().getStorageTrackerManager((ServerLevel) getWorld()).remove(fluidStorageTrackerId); + API.instance().getStorageTrackerManager((ServerLevel) getLevel()).remove(itemStorageTrackerId); + API.instance().getStorageTrackerManager((ServerLevel) getLevel()).remove(fluidStorageTrackerId); } @Override @@ -483,7 +483,7 @@ public class Network implements INetwork, IRedstoneConfigurable { this.itemStorageTrackerId = UUID.randomUUID(); } - this.itemStorageTracker = (ItemStorageTracker) API.instance().getStorageTrackerManager((ServerLevel) world).getOrCreate(itemStorageTrackerId, StorageType.ITEM); + this.itemStorageTracker = (ItemStorageTracker) API.instance().getStorageTrackerManager((ServerLevel) level).getOrCreate(itemStorageTrackerId, StorageType.ITEM); } return itemStorageTracker; @@ -496,15 +496,15 @@ public class Network implements INetwork, IRedstoneConfigurable { this.fluidStorageTrackerId = UUID.randomUUID(); } - this.fluidStorageTracker = (FluidStorageTracker) API.instance().getStorageTrackerManager((ServerLevel) world).getOrCreate(fluidStorageTrackerId, StorageType.FLUID); + this.fluidStorageTracker = (FluidStorageTracker) API.instance().getStorageTrackerManager((ServerLevel) level).getOrCreate(fluidStorageTrackerId, StorageType.FLUID); } return fluidStorageTracker; } @Override - public Level getWorld() { - return world; + public Level getLevel() { + return level; } @Override @@ -553,7 +553,7 @@ public class Network implements INetwork, IRedstoneConfigurable { @Override public void markDirty() { - API.instance().getNetworkManager((ServerLevel) world).markForSaving(); + API.instance().getNetworkManager((ServerLevel) level).markForSaving(); } public ControllerBlock.EnergyType getEnergyType() { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkManager.java index bf9661c4d..3bf0757bd 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkManager.java @@ -24,14 +24,14 @@ public class NetworkManager extends RSWorldSavedData implements INetworkManager private static final String NBT_DATA = "Data"; private static final String NBT_POS = "Pos"; - private final Level world; + private final Level level; private final Logger logger = LogManager.getLogger(getClass()); private final ConcurrentHashMap networks = new ConcurrentHashMap<>(); - public NetworkManager(Level world) { - this.world = world; + public NetworkManager(Level level) { + this.level = level; } @Override @@ -48,7 +48,7 @@ public class NetworkManager extends RSWorldSavedData implements INetworkManager BlockPos pos = BlockPos.of(networkTag.getLong(NBT_POS)); int type = networkTag.getInt(NBT_TYPE); - INetwork network = new Network(world, pos, NetworkType.values()[type]); + INetwork network = new Network(level, pos, NetworkType.values()[type]); try { network = network.readFromNbt(data); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraph.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraph.java index 89549f810..46d62c150 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraph.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraph.java @@ -27,12 +27,12 @@ public class NetworkNodeGraph implements INetworkNodeGraph { } @Override - public void invalidate(Action action, Level world, BlockPos origin) { + public void invalidate(Action action, Level level, BlockPos origin) { this.invalidating = true; Operator operator = new Operator(action); - INetworkNode originNode = NetworkUtils.getNodeFromTile(world.getBlockEntity(origin)); + INetworkNode originNode = NetworkUtils.getNodeFromTile(level.getBlockEntity(origin)); if (originNode instanceof INetworkNodeVisitor) { ((INetworkNodeVisitor) originNode).visit(operator); } @@ -92,19 +92,19 @@ public class NetworkNodeGraph implements INetworkNodeGraph { } protected Level getWorld() { - return network.getWorld(); + return network.getLevel(); } private static class Visitor implements INetworkNodeVisitor { private final INetworkNode node; - private final Level world; + private final Level level; private final BlockPos pos; private final Direction side; private final BlockEntity tile; - Visitor(INetworkNode node, Level world, BlockPos pos, Direction side, BlockEntity tile) { + Visitor(INetworkNode node, Level level, BlockPos pos, Direction side, BlockEntity tile) { this.node = node; - this.world = world; + this.level = level; this.pos = pos; this.side = side; this.tile = tile; @@ -120,7 +120,7 @@ public class NetworkNodeGraph implements INetworkNodeGraph { INetworkNode nodeOnSide = NetworkUtils.getNodeFromTile(tile); if (nodeOnSide == node) { - operator.apply(world, pos.relative(checkSide), checkSide.getOpposite()); + operator.apply(level, pos.relative(checkSide), checkSide.getOpposite()); } } } @@ -143,8 +143,8 @@ public class NetworkNodeGraph implements INetworkNodeGraph { } @Override - public void apply(Level world, BlockPos pos, @Nullable Direction side) { - BlockEntity tile = world.getBlockEntity(pos); + public void apply(Level level, BlockPos pos, @Nullable Direction side) { + BlockEntity tile = level.getBlockEntity(pos); INetworkNode otherNode = NetworkUtils.getNodeFromTile(tile); if (otherNode != null) { @@ -152,7 +152,7 @@ public class NetworkNodeGraph implements INetworkNodeGraph { if (otherNode.getNetwork() != null && !otherNode.getNetwork().equals(network)) { if (action == Action.PERFORM) { - dropConflictingBlock(world, pos); + dropConflictingBlock(level, pos); } return; @@ -168,16 +168,15 @@ public class NetworkNodeGraph implements INetworkNodeGraph { previousEntries.remove(otherNodeItem); - toCheck.add(new Visitor(otherNode, world, pos, side, tile)); + toCheck.add(new Visitor(otherNode, level, pos, side, tile)); } } } - private void dropConflictingBlock(Level world, BlockPos pos) { + private void dropConflictingBlock(Level level, BlockPos pos) { if (!network.getPosition().equals(pos)) { - Block.dropResources(world.getBlockState(pos), world, pos, world.getBlockEntity(pos)); - - world.removeBlock(pos, false); + Block.dropResources(level.getBlockState(pos), level, pos, level.getBlockEntity(pos)); + level.removeBlock(pos, false); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraphEntry.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraphEntry.java index 36318fe89..cdc570868 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraphEntry.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraphEntry.java @@ -26,7 +26,7 @@ public class NetworkNodeGraphEntry implements INetworkNodeGraphEntry { NetworkNodeGraphEntry otherItem = (NetworkNodeGraphEntry) other; - if (node.getWorld().dimension() != otherItem.node.getWorld().dimension()) { + if (node.getLevel().dimension() != otherItem.node.getLevel().dimension()) { return false; } @@ -36,7 +36,7 @@ public class NetworkNodeGraphEntry implements INetworkNodeGraphEntry { @Override public int hashCode() { int result = node.getPos().hashCode(); - result = 31 * result + node.getWorld().dimension().hashCode(); + result = 31 * result + node.getLevel().dimension().hashCode(); return result; } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeListener.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeListener.java index 862938e90..711057b90 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeListener.java @@ -50,7 +50,7 @@ public class NetworkNodeListener { INetworkNode node = NetworkUtils.getNodeFromTile(world.getBlockEntity(pos.relative(facing))); if (node != null && node.getNetwork() != null) { - node.getNetwork().getNodeGraph().invalidate(Action.PERFORM, node.getNetwork().getWorld(), node.getNetwork().getPosition()); + node.getNetwork().getNodeGraph().invalidate(Action.PERFORM, node.getNetwork().getLevel(), node.getNetwork().getPosition()); return; } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeManager.java index 753cf4ae7..496210f85 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeManager.java @@ -8,9 +8,9 @@ import com.refinedmods.refinedstorage.apiimpl.util.RSWorldSavedData; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.Tag; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.Level; -import net.minecraft.nbt.Tag; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -26,14 +26,14 @@ public class NetworkNodeManager extends RSWorldSavedData implements INetworkNode private static final String NBT_NODE_DATA = "Data"; private static final String NBT_NODE_POS = "Pos"; - private final Level world; + private final Level level; private final Logger logger = LogManager.getLogger(getClass()); private final ConcurrentHashMap nodes = new ConcurrentHashMap<>(); - public NetworkNodeManager(Level world) { - this.world = world; + public NetworkNodeManager(Level level) { + this.level = level; } @Override @@ -56,7 +56,7 @@ public class NetworkNodeManager extends RSWorldSavedData implements INetworkNode INetworkNode node = null; try { - node = factory.create(data, world, pos); + node = factory.create(data, level, pos); } catch (Throwable t) { logger.error("Could not read network node", t); } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/CraftingGridBehavior.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/CraftingGridBehavior.java index dce3e72d0..c0a13f7bb 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/CraftingGridBehavior.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/CraftingGridBehavior.java @@ -287,7 +287,7 @@ public class CraftingGridBehavior implements ICraftingGridBehavior { ItemStack inventoryStack = player.getInventory().getItem(j); if (inventoryStack.getItem() instanceof ICraftingPatternProvider) { - ICraftingPattern pattern = PatternItem.fromCache(network.getWorld(), inventoryStack); + ICraftingPattern pattern = PatternItem.fromCache(network.getLevel(), inventoryStack); if (pattern.isValid()) { for (ItemStack stack : pattern.getOutputs()) { if (!stack.isEmpty()) { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/GridBlockGridFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/GridBlockGridFactory.java index ae7a94ba2..8ef10ae75 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/GridBlockGridFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/GridBlockGridFactory.java @@ -38,8 +38,8 @@ public class GridBlockGridFactory implements IGridFactory { @Nullable @Override - public BlockEntity getRelevantTile(Level world, BlockPos pos) { - return world.getBlockEntity(pos); + public BlockEntity getRelevantTile(Level level, BlockPos pos) { + return level.getBlockEntity(pos); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/PortableGridBlockGridFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/PortableGridBlockGridFactory.java index 06c845a97..7ecb192f5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/PortableGridBlockGridFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/PortableGridBlockGridFactory.java @@ -38,8 +38,8 @@ public class PortableGridBlockGridFactory implements IGridFactory { @Nullable @Override - public BlockEntity getRelevantTile(Level world, BlockPos pos) { - return world.getBlockEntity(pos); + public BlockEntity getRelevantTile(Level level, BlockPos pos) { + return level.getBlockEntity(pos); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/PortableGridGridFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/PortableGridGridFactory.java index d1d5d69bc..09010a4ce 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/PortableGridGridFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/PortableGridGridFactory.java @@ -36,7 +36,7 @@ public class PortableGridGridFactory implements IGridFactory { @Nullable @Override - public BlockEntity getRelevantTile(Level world, BlockPos pos) { + public BlockEntity getRelevantTile(Level level, BlockPos pos) { return null; } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/WirelessFluidGridGridFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/WirelessFluidGridGridFactory.java index 2f05928b9..5cf44273a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/WirelessFluidGridGridFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/WirelessFluidGridGridFactory.java @@ -32,7 +32,7 @@ public class WirelessFluidGridGridFactory implements IGridFactory { @Nullable @Override - public BlockEntity getRelevantTile(Level world, BlockPos pos) { + public BlockEntity getRelevantTile(Level level, BlockPos pos) { return null; } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/WirelessGridGridFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/WirelessGridGridFactory.java index a015138a7..0ecdb8daa 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/WirelessGridGridFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/WirelessGridGridFactory.java @@ -32,7 +32,7 @@ public class WirelessGridGridFactory implements IGridFactory { @Nullable @Override - public BlockEntity getRelevantTile(Level world, BlockPos pos) { + public BlockEntity getRelevantTile(Level level, BlockPos pos) { return null; } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CableNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CableNetworkNode.java index c0864b255..67da14a5f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CableNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CableNetworkNode.java @@ -15,8 +15,8 @@ public class CableNetworkNode extends NetworkNode implements ICoverable { private final CoverManager coverManager; - public CableNetworkNode(Level world, BlockPos pos) { - super(world, pos); + public CableNetworkNode(Level level, BlockPos pos) { + super(level, pos); this.coverManager = new CoverManager(this); } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java index 536d8fc25..07877e861 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java @@ -66,8 +66,8 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable, private int type = IType.ITEMS; private boolean drop = false; - public ConstructorNetworkNode(Level world, BlockPos pos) { - super(world, pos); + public ConstructorNetworkNode(Level level, BlockPos pos) { + super(level, pos); this.coverManager = new CoverManager(this); } @@ -80,7 +80,7 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable, public void update() { super.update(); - if (canUpdate() && ticks % upgrades.getSpeed(BASE_SPEED, 4) == 0 && world.isLoaded(pos)) { + if (canUpdate() && ticks % upgrades.getSpeed(BASE_SPEED, 4) == 0 && level.isLoaded(pos)) { if (type == IType.ITEMS && !itemFilters.getStackInSlot(0).isEmpty()) { ItemStack stack = itemFilters.getStackInSlot(0); @@ -104,8 +104,8 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable, if (upgrades.hasUpgrade(UpgradeItem.Type.CRAFTING)) { network.getCraftingManager().request(this, stack, FluidAttributes.BUCKET_VOLUME); } - } else if (!world.getBlockState(front).getFluidState().isSource()) { - FluidUtil.tryPlaceFluid(WorldUtils.getFakePlayer((ServerLevel) world, getOwner()), world, InteractionHand.MAIN_HAND, front, new NetworkFluidHandler(StackUtils.copy(stack, FluidAttributes.BUCKET_VOLUME)), stack); + } else if (!level.getBlockState(front).getFluidState().isSource()) { + FluidUtil.tryPlaceFluid(WorldUtils.getFakePlayer((ServerLevel) level, getOwner()), level, InteractionHand.MAIN_HAND, front, new NetworkFluidHandler(StackUtils.copy(stack, FluidAttributes.BUCKET_VOLUME)), stack); } } @@ -113,8 +113,8 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable, ItemStack took = network.extractItem(stack, 1, compare, Action.SIMULATE); if (!took.isEmpty()) { BlockPlaceContext ctx = new ConstructorBlockItemUseContext( - world, - WorldUtils.getFakePlayer((ServerLevel) world, getOwner()), + level, + WorldUtils.getFakePlayer((ServerLevel) level, getOwner()), InteractionHand.MAIN_HAND, took, new BlockHitResult(Vec3.ZERO, getDirection(), pos, false) @@ -135,7 +135,7 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable, ItemStack took = network.extractItem(stack, upgrades.getStackInteractCount(), compare, Action.PERFORM); if (!took.isEmpty()) { - DefaultDispenseItemBehavior.spawnItem(world, took, 6, getDirection(), new PositionImpl(getDispensePositionX(), getDispensePositionY(), getDispensePositionZ())); + DefaultDispenseItemBehavior.spawnItem(level, took, 6, getDirection(), new PositionImpl(getDispensePositionX(), getDispensePositionY(), getDispensePositionZ())); } else if (upgrades.hasUpgrade(UpgradeItem.Type.CRAFTING)) { network.getCraftingManager().request(this, stack, 1); } @@ -145,7 +145,7 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable, ItemStack took = network.extractItem(stack, 1, compare, Action.PERFORM); if (!took.isEmpty()) { - world.addFreshEntity(new FireworkRocketEntity(world, getDispensePositionX(), getDispensePositionY(), getDispensePositionZ(), took)); + level.addFreshEntity(new FireworkRocketEntity(level, getDispensePositionX(), getDispensePositionY(), getDispensePositionZ(), took)); } } @@ -257,7 +257,7 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable, @Override public int getType() { - return world.isClientSide ? ConstructorTile.TYPE.getValue() : type; + return level.isClientSide ? ConstructorTile.TYPE.getValue() : type; } @Override @@ -283,8 +283,8 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable, } private static class ConstructorBlockItemUseContext extends BlockPlaceContext { - public ConstructorBlockItemUseContext(Level world, @Nullable Player player, InteractionHand hand, ItemStack stack, BlockHitResult rayTraceResult) { - super(world, player, hand, stack, rayTraceResult); + public ConstructorBlockItemUseContext(Level level, @Nullable Player player, InteractionHand hand, ItemStack stack, BlockHitResult rayTraceResult) { + super(level, player, hand, stack, rayTraceResult); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterManagerNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterManagerNetworkNode.java index cc3f2cf69..035fb2f09 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterManagerNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterManagerNetworkNode.java @@ -20,8 +20,8 @@ public class CrafterManagerNetworkNode extends NetworkNode { private int size = IGrid.SIZE_STRETCH; private int searchBoxMode = IGrid.SEARCH_BOX_MODE_NORMAL; - public CrafterManagerNetworkNode(Level world, BlockPos pos) { - super(world, pos); + public CrafterManagerNetworkNode(Level level, BlockPos pos) { + super(level, pos); } @Override @@ -35,7 +35,7 @@ public class CrafterManagerNetworkNode extends NetworkNode { } public int getSize() { - return world.isClientSide ? CrafterManagerTile.SIZE.getValue() : size; + return level.isClientSide ? CrafterManagerTile.SIZE.getValue() : size; } public void setSize(int size) { @@ -66,7 +66,7 @@ public class CrafterManagerNetworkNode extends NetworkNode { } public int getSearchBoxMode() { - return world.isClientSide ? CrafterManagerTile.SEARCH_BOX_MODE.getValue() : searchBoxMode; + return level.isClientSide ? CrafterManagerTile.SEARCH_BOX_MODE.getValue() : searchBoxMode; } public void setSearchBoxMode(int searchBoxMode) { @@ -74,7 +74,7 @@ public class CrafterManagerNetworkNode extends NetworkNode { } public boolean isActiveOnClient() { - BlockState state = world.getBlockState(pos); + BlockState state = level.getBlockState(pos); if (state.getBlock() instanceof CrafterManagerBlock) { return state.getValue(NetworkNodeBlock.CONNECTED); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java index ea9a5b47d..488cade5a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java @@ -48,7 +48,9 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC private static final String NBT_WAS_POWERED = "WasPowered"; private final List patterns = new ArrayList<>(); private final UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED) - .addListener(new NetworkNodeInventoryListener(this)); private final BaseItemHandler patternsInventory = new BaseItemHandler(9) { + .addListener(new NetworkNodeInventoryListener(this)); + // Used to prevent infinite recursion on getRootContainer() when there's e.g. two crafters facing each other. + private boolean visited = false; private final BaseItemHandler patternsInventory = new BaseItemHandler(9) { @Override public int getSlotLimit(int slot) { return 1; @@ -64,11 +66,11 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC return super.insertItem(slot, stack, simulate); } } - .addValidator(new PatternItemValidator(world)) + .addValidator(new PatternItemValidator(level)) .addListener(new NetworkNodeInventoryListener(this)) .addListener((handler, slot, reading) -> { if (!reading) { - if (!world.isClientSide) { + if (!level.isClientSide) { invalidate(); } @@ -77,8 +79,6 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC } } }); - // Used to prevent infinite recursion on getRootContainer() when there's e.g. two crafters facing each other. - private boolean visited = false; private CrafterMode mode = CrafterMode.IGNORE; private boolean locked = false; private boolean wasPowered; @@ -86,9 +86,8 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC private Component displayName; @Nullable private UUID uuid = null; - - public CrafterNetworkNode(Level world, BlockPos pos) { - super(world, pos); + public CrafterNetworkNode(Level level, BlockPos pos) { + super(level, pos); } private void invalidate() { @@ -98,7 +97,7 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC ItemStack patternStack = patternsInventory.getStackInSlot(i); if (!patternStack.isEmpty()) { - ICraftingPattern pattern = ((ICraftingPatternProvider) patternStack.getItem()).create(world, patternStack, this); + ICraftingPattern pattern = ((ICraftingPatternProvider) patternStack.getItem()).create(level, patternStack, this); if (pattern.isValid()) { patterns.add(pattern); @@ -120,8 +119,8 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC invalidate(); } - if (mode == CrafterMode.PULSE_INSERTS_NEXT_SET && world.isLoaded(pos)) { - if (world.hasNeighborSignal(pos)) { + if (mode == CrafterMode.PULSE_INSERTS_NEXT_SET && level.isLoaded(pos)) { + if (level.hasNeighborSignal(pos)) { this.wasPowered = true; markDirty(); @@ -290,11 +289,11 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC @Override public BlockEntity getFacingTile() { BlockPos facingPos = pos.relative(getDirection()); - if (!world.isLoaded(facingPos)) { + if (!level.isLoaded(facingPos)) { return null; } - return world.getBlockEntity(facingPos); + return level.getBlockEntity(facingPos); } @Override @@ -321,7 +320,7 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC } if (facing != null) { - return new TranslatableComponent(world.getBlockState(facing.getBlockPos()).getBlock().getDescriptionId()); + return new TranslatableComponent(level.getBlockState(facing.getBlockPos()).getBlock().getDescriptionId()); } return DEFAULT_NAME; @@ -369,7 +368,7 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC return null; } - INetworkNode facing = API.instance().getNetworkNodeManager((ServerLevel) world).getNode(pos.relative(getDirection())); + INetworkNode facing = API.instance().getNetworkNodeManager((ServerLevel) level).getNode(pos.relative(getDirection())); if (!(facing instanceof ICraftingPatternContainer) || facing.getNetwork() != network) { return this; } @@ -413,9 +412,9 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC case IGNORE: return false; case SIGNAL_LOCKS_AUTOCRAFTING: - return world.hasNeighborSignal(pos); + return level.hasNeighborSignal(pos); case SIGNAL_UNLOCKS_AUTOCRAFTING: - return !world.hasNeighborSignal(pos); + return !level.hasNeighborSignal(pos); case PULSE_INSERTS_NEXT_SET: return locked; default: @@ -461,4 +460,5 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC + } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CraftingMonitorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CraftingMonitorNetworkNode.java index 532fe0015..15177e428 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CraftingMonitorNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CraftingMonitorNetworkNode.java @@ -35,8 +35,8 @@ public class CraftingMonitorNetworkNode extends NetworkNode implements ICrafting private Optional tabSelected = Optional.empty(); private int tabPage; - public CraftingMonitorNetworkNode(Level world, BlockPos pos) { - super(world, pos); + public CraftingMonitorNetworkNode(Level level, BlockPos pos) { + super(level, pos); } @Override @@ -79,7 +79,7 @@ public class CraftingMonitorNetworkNode extends NetworkNode implements ICrafting @Override public boolean isActiveOnClient() { - BlockState state = world.getBlockState(pos); + BlockState state = level.getBlockState(pos); if (state.getBlock() instanceof CraftingMonitorBlock) { return state.getValue(NetworkNodeBlock.CONNECTED); @@ -119,7 +119,7 @@ public class CraftingMonitorNetworkNode extends NetworkNode implements ICrafting @Override public Optional getTabSelected() { - return world.isClientSide ? CraftingMonitorTile.TAB_SELECTED.getValue() : tabSelected; + return level.isClientSide ? CraftingMonitorTile.TAB_SELECTED.getValue() : tabSelected; } public void setTabSelected(Optional tabSelected) { @@ -128,7 +128,7 @@ public class CraftingMonitorNetworkNode extends NetworkNode implements ICrafting @Override public int getTabPage() { - return world.isClientSide ? CraftingMonitorTile.TAB_PAGE.getValue() : tabPage; + return level.isClientSide ? CraftingMonitorTile.TAB_PAGE.getValue() : tabPage; } public void setTabPage(int tabPage) { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DestructorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DestructorNetworkNode.java index ff01f7e09..f97ac2ccd 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DestructorNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DestructorNetworkNode.java @@ -61,21 +61,17 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I private final BaseItemHandler itemFilters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this)); private final FluidInventory fluidFilters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this)); private final CoverManager coverManager; - private final UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.SILK_TOUCH, UpgradeItem.Type.FORTUNE_1, UpgradeItem.Type.FORTUNE_2, UpgradeItem.Type.FORTUNE_3) + private int compare = IComparer.COMPARE_NBT; private final UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.SILK_TOUCH, UpgradeItem.Type.FORTUNE_1, UpgradeItem.Type.FORTUNE_2, UpgradeItem.Type.FORTUNE_3) .addListener(new NetworkNodeInventoryListener(this)) .addListener((handler, slot, reading) -> tool = createTool()); - private int compare = IComparer.COMPARE_NBT; private int mode = IWhitelistBlacklist.BLACKLIST; private int type = IType.ITEMS; private boolean pickupItem = false; - - public DestructorNetworkNode(Level world, BlockPos pos) { - super(world, pos); + public DestructorNetworkNode(Level level, BlockPos pos) { + super(level, pos); this.coverManager = new CoverManager(this); } - private ItemStack tool = createTool(); - @Override public int getEnergyUsage() { return RS.SERVER_CONFIG.getDestructor().getUsage() + upgrades.getEnergyUsage(); @@ -85,7 +81,7 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I public void update() { super.update(); - if (canUpdate() && ticks % upgrades.getSpeed(BASE_SPEED, 4) == 0 && world.isLoaded(pos)) { + if (canUpdate() && ticks % upgrades.getSpeed(BASE_SPEED, 4) == 0 && level.isLoaded(pos)) { if (type == IType.ITEMS) { if (pickupItem) { pickupItems(); @@ -96,12 +92,12 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I breakFluid(); } } - } + } private ItemStack tool = createTool(); private void pickupItems() { BlockPos front = pos.relative(getDirection()); - List droppedItems = world.getEntitiesOfClass(ItemEntity.class, new AABB(front)); + List droppedItems = level.getEntitiesOfClass(ItemEntity.class, new AABB(front)); for (ItemEntity entity : droppedItems) { ItemStack droppedItem = ((ItemEntity) entity).getItem(); @@ -119,25 +115,25 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I private void breakBlock() { BlockPos front = pos.relative(getDirection()); - BlockState frontBlockState = world.getBlockState(front); + BlockState frontBlockState = level.getBlockState(front); Block frontBlock = frontBlockState.getBlock(); ItemStack frontStack = frontBlock.getCloneItemStack( frontBlockState, new BlockHitResult(Vec3.ZERO, getDirection().getOpposite(), front, false), - world, + level, front, - WorldUtils.getFakePlayer((ServerLevel) world, getOwner()) + WorldUtils.getFakePlayer((ServerLevel) level, getOwner()) ); if (!frontStack.isEmpty() && IWhitelistBlacklist.acceptsItem(itemFilters, mode, compare, frontStack) && - frontBlockState.getDestroySpeed(world, front) != -1.0) { + frontBlockState.getDestroySpeed(level, front) != -1.0) { List drops = Block.getDrops( frontBlockState, - (ServerLevel) world, + (ServerLevel) level, front, - world.getBlockEntity(front), - WorldUtils.getFakePlayer((ServerLevel) world, getOwner()), + level.getBlockEntity(front), + WorldUtils.getFakePlayer((ServerLevel) level, getOwner()), tool ); @@ -147,18 +143,18 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I } } - BlockEvent.BreakEvent e = new BlockEvent.BreakEvent(world, front, frontBlockState, WorldUtils.getFakePlayer((ServerLevel) world, getOwner())); + BlockEvent.BreakEvent e = new BlockEvent.BreakEvent(level, front, frontBlockState, WorldUtils.getFakePlayer((ServerLevel) level, getOwner())); if (!MinecraftForge.EVENT_BUS.post(e)) { - frontBlock.playerWillDestroy(world, front, frontBlockState, WorldUtils.getFakePlayer((ServerLevel) world, getOwner())); + frontBlock.playerWillDestroy(level, front, frontBlockState, WorldUtils.getFakePlayer((ServerLevel) level, getOwner())); - world.removeBlock(front, false); + level.removeBlock(front, false); for (ItemStack drop : drops) { // We check if the controller isn't null here because when a destructor faces a node and removes it // it will essentially remove this block itself from the network without knowing if (network == null) { - Containers.dropItemStack(world, front.getX(), front.getY(), front.getZ(), drop); + Containers.dropItemStack(level, front.getX(), front.getY(), front.getZ(), drop); } else { network.insertItemTracked(drop, drop.getCount()); } @@ -169,7 +165,7 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I private void breakFluid() { BlockPos front = pos.relative(getDirection()); - BlockState frontBlockState = world.getBlockState(front); + BlockState frontBlockState = level.getBlockState(front); Block frontBlock = frontBlockState.getBlock(); if (frontBlock instanceof LiquidBlock) { @@ -183,18 +179,18 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I network.insertFluid(stack, stack.getAmount(), Action.SIMULATE).isEmpty()) { network.insertFluidTracked(stack, stack.getAmount()); - world.setBlock(front, Blocks.AIR.defaultBlockState(), 11); + level.setBlock(front, Blocks.AIR.defaultBlockState(), 11); } } } else if (frontBlock instanceof IFluidBlock) { IFluidBlock fluidBlock = (IFluidBlock) frontBlock; - if (fluidBlock.canDrain(world, front)) { - FluidStack simulatedDrain = fluidBlock.drain(world, front, IFluidHandler.FluidAction.SIMULATE); + if (fluidBlock.canDrain(level, front)) { + FluidStack simulatedDrain = fluidBlock.drain(level, front, IFluidHandler.FluidAction.SIMULATE); if (IWhitelistBlacklist.acceptsFluid(fluidFilters, mode, compare, simulatedDrain) && network.insertFluid(simulatedDrain, simulatedDrain.getAmount(), Action.SIMULATE).isEmpty()) { - FluidStack drained = fluidBlock.drain(world, front, IFluidHandler.FluidAction.EXECUTE); + FluidStack drained = fluidBlock.drain(level, front, IFluidHandler.FluidAction.EXECUTE); network.insertFluidTracked(drained, drained.getAmount()); } @@ -323,7 +319,7 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I @Override public int getType() { - return world.isClientSide ? DestructorTile.TYPE.getValue() : type; + return level.isClientSide ? DestructorTile.TYPE.getValue() : type; } @Override @@ -357,4 +353,8 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I } + + + + } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DetectorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DetectorNetworkNode.java index be634361b..011729819 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DetectorNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DetectorNetworkNode.java @@ -46,8 +46,8 @@ public class DetectorNetworkNode extends NetworkNode implements IComparable, ITy private boolean powered = false; private boolean wasPowered; - public DetectorNetworkNode(Level world, BlockPos pos) { - super(world, pos); + public DetectorNetworkNode(Level level, BlockPos pos) { + super(level, pos); } @Override @@ -59,11 +59,11 @@ public class DetectorNetworkNode extends NetworkNode implements IComparable, ITy public void update() { super.update(); - if (powered != wasPowered && world.isLoaded(pos)) { + if (powered != wasPowered && level.isLoaded(pos)) { wasPowered = powered; - world.setBlockAndUpdate(pos, world.getBlockState(pos).setValue(DetectorBlock.POWERED, powered)); - world.updateNeighborsAt(pos, world.getBlockState(pos).getBlock()); + level.setBlockAndUpdate(pos, level.getBlockState(pos).setValue(DetectorBlock.POWERED, powered)); + level.updateNeighborsAt(pos, level.getBlockState(pos).getBlock()); } if (canUpdate() && ticks % SPEED == 0) { @@ -212,7 +212,7 @@ public class DetectorNetworkNode extends NetworkNode implements IComparable, ITy @Override public int getType() { - return world.isClientSide ? DetectorTile.TYPE.getValue() : type; + return level.isClientSide ? DetectorTile.TYPE.getValue() : type; } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExporterNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExporterNetworkNode.java index 4d2655eb2..6936588c0 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExporterNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExporterNetworkNode.java @@ -38,7 +38,8 @@ public class ExporterNetworkNode extends NetworkNode implements IComparable, ITy private final BaseItemHandler itemFilters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this)); private final FluidInventory fluidFilters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this)); - private final CoverManager coverManager; private final UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.CRAFTING, UpgradeItem.Type.STACK, UpgradeItem.Type.REGULATOR) + private final CoverManager coverManager; + private int compare = IComparer.COMPARE_NBT; private final UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.CRAFTING, UpgradeItem.Type.STACK, UpgradeItem.Type.REGULATOR) .addListener(new NetworkNodeInventoryListener(this)) .addListener((handler, slot, reading) -> { if (!reading && !getUpgrades().hasUpgrade(UpgradeItem.Type.REGULATOR)) { @@ -67,13 +68,11 @@ public class ExporterNetworkNode extends NetworkNode implements IComparable, ITy } } }); - private int compare = IComparer.COMPARE_NBT; private int type = IType.ITEMS; - private int filterSlot; - public ExporterNetworkNode(Level world, BlockPos pos) { - super(world, pos); + public ExporterNetworkNode(Level level, BlockPos pos) { + super(level, pos); this.coverManager = new CoverManager(this); } @@ -86,7 +85,7 @@ public class ExporterNetworkNode extends NetworkNode implements IComparable, ITy public void update() { super.update(); - if (canUpdate() && ticks % upgrades.getSpeed() == 0 && world.isLoaded(pos)) { + if (canUpdate() && ticks % upgrades.getSpeed() == 0 && level.isLoaded(pos)) { if (type == IType.ITEMS) { IItemHandler handler = WorldUtils.getItemHandler(getFacingTile(), getDirection().getOpposite()); @@ -307,7 +306,7 @@ public class ExporterNetworkNode extends NetworkNode implements IComparable, ITy @Override public int getType() { - return world.isClientSide ? ExporterTile.TYPE.getValue() : type; + return level.isClientSide ? ExporterTile.TYPE.getValue() : type; } @Override @@ -333,4 +332,6 @@ public class ExporterNetworkNode extends NetworkNode implements IComparable, ITy } + + } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExternalStorageNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExternalStorageNetworkNode.java index 3af8b58ae..9125c2230 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExternalStorageNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExternalStorageNetworkNode.java @@ -64,8 +64,8 @@ public class ExternalStorageNetworkNode extends NetworkNode implements IStorageP private AccessType accessType = AccessType.INSERT_EXTRACT; private int networkTicks; - public ExternalStorageNetworkNode(Level world, BlockPos pos) { - super(world, pos); + public ExternalStorageNetworkNode(Level level, BlockPos pos) { + super(level, pos); this.coverManager = new CoverManager(this); } @@ -87,7 +87,7 @@ public class ExternalStorageNetworkNode extends NetworkNode implements IStorageP public void update() { super.update(); - if (canUpdate() && world.isLoaded(pos)) { + if (canUpdate() && level.isLoaded(pos)) { if (networkTicks++ == 0) { updateStorage(network, InvalidateCause.INITIAL_TICK_INVALIDATION); @@ -290,7 +290,7 @@ public class ExternalStorageNetworkNode extends NetworkNode implements IStorageP @Override public int getType() { - return world.isClientSide ? ExternalStorageTile.TYPE.getValue() : type; + return level.isClientSide ? ExternalStorageTile.TYPE.getValue() : type; } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/FluidInterfaceNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/FluidInterfaceNetworkNode.java index 799bfb230..b84dd0b28 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/FluidInterfaceNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/FluidInterfaceNetworkNode.java @@ -45,8 +45,8 @@ public class FluidInterfaceNetworkNode extends NetworkNode { protected void onContentsChanged() { super.onContentsChanged(); - if (!world.isClientSide) { - ((FluidInterfaceTile) world.getBlockEntity(pos)).getDataManager().sendParameterToWatchers(FluidInterfaceTile.TANK_IN); + if (!level.isClientSide) { + ((FluidInterfaceTile) level.getBlockEntity(pos)).getDataManager().sendParameterToWatchers(FluidInterfaceTile.TANK_IN); } markDirty(); @@ -61,8 +61,8 @@ public class FluidInterfaceNetworkNode extends NetworkNode { private final UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.STACK, UpgradeItem.Type.CRAFTING).addListener(new NetworkNodeInventoryListener(this)); - public FluidInterfaceNetworkNode(Level world, BlockPos pos) { - super(world, pos); + public FluidInterfaceNetworkNode(Level level, BlockPos pos) { + super(level, pos); } @Override @@ -155,7 +155,7 @@ public class FluidInterfaceNetworkNode extends NetworkNode { private boolean isActingAsStorage() { for (Direction facing : Direction.values()) { - INetworkNode facingNode = API.instance().getNetworkNodeManager((ServerLevel) world).getNode(pos.relative(facing)); + INetworkNode facingNode = API.instance().getNetworkNodeManager((ServerLevel) level).getNode(pos.relative(facing)); if (facingNode instanceof ExternalStorageNetworkNode && facingNode.isActive() && @@ -250,8 +250,8 @@ public class FluidInterfaceNetworkNode extends NetworkNode { } private void onTankOutChanged() { - if (!world.isClientSide && world.isLoaded(pos)) { - ((FluidInterfaceTile) world.getBlockEntity(pos)).getDataManager().sendParameterToWatchers(FluidInterfaceTile.TANK_OUT); + if (!level.isClientSide && level.isLoaded(pos)) { + ((FluidInterfaceTile) level.getBlockEntity(pos)).getDataManager().sendParameterToWatchers(FluidInterfaceTile.TANK_OUT); } markDirty(); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java index 6863f5b7c..628525ace 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java @@ -80,7 +80,14 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I private static final String NBT_PROCESSING_MATRIX_FLUIDS = "ProcessingMatrixFluids"; private static final String NBT_ALLOWED_TAGS = "AllowedTags"; private final AllowedTagList allowedTagList = new AllowedTagList(this::updateAllowedTags, PROCESSING_MATRIX_SIZE); - private final ResultContainer result = new ResultContainer(); private final AbstractContainerMenu craftingContainer = new AbstractContainerMenu(MenuType.CRAFTING, 0) { + private final ResultContainer result = new ResultContainer(); + private final BaseItemHandler processingMatrix = new BaseItemHandler(PROCESSING_MATRIX_SIZE * 2) + .addListener(new NetworkNodeInventoryListener(this)) + .addListener((handler, slot, reading) -> { + if (!reading && slot < PROCESSING_MATRIX_SIZE) { + allowedTagList.clearItemTags(slot); + } + }); private final AbstractContainerMenu craftingContainer = new AbstractContainerMenu(MenuType.CRAFTING, 0) { @Override public boolean stillValid(Player player) { return false; @@ -88,31 +95,27 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I @Override public void slotsChanged(Container inventory) { - if (!world.isClientSide) { + if (!level.isClientSide) { onCraftingMatrixChanged(); } } }; - private final BaseItemHandler processingMatrix = new BaseItemHandler(PROCESSING_MATRIX_SIZE * 2) - .addListener(new NetworkNodeInventoryListener(this)) - .addListener((handler, slot, reading) -> { - if (!reading && slot < PROCESSING_MATRIX_SIZE) { - allowedTagList.clearItemTags(slot); - } - }); private final FluidInventory processingMatrixFluids = new FluidInventory(PROCESSING_MATRIX_SIZE * 2, FluidAttributes.BUCKET_VOLUME * 64) .addListener(new NetworkNodeFluidInventoryListener(this)) .addListener((handler, slot, reading) -> { if (!reading && slot < PROCESSING_MATRIX_SIZE) { allowedTagList.clearFluidTags(slot); } - }); private final CraftingContainer matrix = new CraftingContainer(craftingContainer, 3, 3); + }); private final Set craftingListeners = new HashSet<>(); - private final List filters = new ArrayList<>(); + private final List filters = new ArrayList<>(); private final CraftingContainer matrix = new CraftingContainer(craftingContainer, 3, 3); private final List tabs = new ArrayList<>(); private final FilterItemHandler filter = (FilterItemHandler) new FilterItemHandler(filters, tabs).addListener(new NetworkNodeInventoryListener(this)); private final GridType type; - private CraftingRecipe currentRecipe; private final BaseItemHandler patterns = new BaseItemHandler(2) { + private CraftingRecipe currentRecipe; + private boolean readingInventory; + private int viewType = VIEW_TYPE_NORMAL; + private int sortingDirection = SORTING_DIRECTION_DESCENDING; private final BaseItemHandler patterns = new BaseItemHandler(2) { @Override public int getSlotLimit(int slot) { return slot == 1 ? 1 : super.getSlotLimit(slot); @@ -165,9 +168,6 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I markDirty(); } })); - private boolean readingInventory; - private int viewType = VIEW_TYPE_NORMAL; - private int sortingDirection = SORTING_DIRECTION_DESCENDING; private int sortingType = SORTING_TYPE_QUANTITY; private int searchBoxMode = SEARCH_BOX_MODE_NORMAL; private int size = SIZE_STRETCH; @@ -176,9 +176,8 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I private boolean exactPattern = true; private boolean processingPattern = false; private int processingType = IType.ITEMS; - - public GridNetworkNode(Level world, BlockPos pos, GridType type) { - super(world, pos); + public GridNetworkNode(Level level, BlockPos pos, GridType type) { + super(level, pos); this.type = type; } @@ -205,7 +204,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I private void updateAllowedTags() { markDirty(); - BlockEntity tile = world.getBlockEntity(pos); + BlockEntity tile = level.getBlockEntity(pos); if (tile instanceof GridTile) { ((GridTile) tile).getDataManager().sendParameterToWatchers(GridTile.ALLOWED_ITEM_TAGS); @@ -238,7 +237,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I } public boolean isProcessingPattern() { - return world.isClientSide ? GridTile.PROCESSING_PATTERN.getValue() : processingPattern; + return level.isClientSide ? GridTile.PROCESSING_PATTERN.getValue() : processingPattern; } public void setProcessingPattern(boolean processingPattern) { @@ -340,8 +339,8 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I @Override public void onCraftingMatrixChanged() { - if (currentRecipe == null || !currentRecipe.matches(matrix, world)) { - currentRecipe = world.getRecipeManager().getRecipeFor(RecipeType.CRAFTING, matrix, world).orElse(null); + if (currentRecipe == null || !currentRecipe.matches(matrix, level)) { + currentRecipe = level.getRecipeManager().getRecipeFor(RecipeType.CRAFTING, matrix, level).orElse(null); } if (currentRecipe == null) { @@ -383,7 +382,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I @Override public boolean isGridActive() { - BlockState state = world.getBlockState(pos); + BlockState state = level.getBlockState(pos); if (state.getBlock() instanceof GridBlock) { return state.getValue(NetworkNodeBlock.CONNECTED); @@ -528,7 +527,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I @Override public int getViewType() { - return world.isClientSide ? GridTile.VIEW_TYPE.getValue() : viewType; + return level.isClientSide ? GridTile.VIEW_TYPE.getValue() : viewType; } public void setViewType(int viewType) { @@ -537,7 +536,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I @Override public int getSortingDirection() { - return world.isClientSide ? GridTile.SORTING_DIRECTION.getValue() : sortingDirection; + return level.isClientSide ? GridTile.SORTING_DIRECTION.getValue() : sortingDirection; } public void setSortingDirection(int sortingDirection) { @@ -546,7 +545,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I @Override public int getSortingType() { - return world.isClientSide ? GridTile.SORTING_TYPE.getValue() : sortingType; + return level.isClientSide ? GridTile.SORTING_TYPE.getValue() : sortingType; } public void setSortingType(int sortingType) { @@ -555,7 +554,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I @Override public int getSearchBoxMode() { - return world.isClientSide ? GridTile.SEARCH_BOX_MODE.getValue() : searchBoxMode; + return level.isClientSide ? GridTile.SEARCH_BOX_MODE.getValue() : searchBoxMode; } public void setSearchBoxMode(int searchBoxMode) { @@ -564,7 +563,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I @Override public int getSize() { - return world.isClientSide ? GridTile.SIZE.getValue() : size; + return level.isClientSide ? GridTile.SIZE.getValue() : size; } public void setSize(int size) { @@ -573,7 +572,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I @Override public int getTabSelected() { - return world.isClientSide ? GridTile.TAB_SELECTED.getValue() : tabSelected; + return level.isClientSide ? GridTile.TAB_SELECTED.getValue() : tabSelected; } public void setTabSelected(int tabSelected) { @@ -582,7 +581,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I @Override public int getTabPage() { - return world.isClientSide ? GridTile.TAB_PAGE.getValue() : Math.min(tabPage, getTotalTabPages()); + return level.isClientSide ? GridTile.TAB_PAGE.getValue() : Math.min(tabPage, getTotalTabPages()); } public void setTabPage(int page) { @@ -633,7 +632,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I @Override public int getType() { - return world.isClientSide ? GridTile.PROCESSING_TYPE.getValue() : processingType; + return level.isClientSide ? GridTile.PROCESSING_TYPE.getValue() : processingType; } @Override @@ -777,4 +776,6 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I + + } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ImporterNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ImporterNetworkNode.java index 6d71670bd..009755a3e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ImporterNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ImporterNetworkNode.java @@ -48,8 +48,8 @@ public class ImporterNetworkNode extends NetworkNode implements IComparable, IWh private int type = IType.ITEMS; private int currentSlot; - public ImporterNetworkNode(Level world, BlockPos pos) { - super(world, pos); + public ImporterNetworkNode(Level level, BlockPos pos) { + super(level, pos); this.coverManager = new CoverManager(this); } @@ -62,7 +62,7 @@ public class ImporterNetworkNode extends NetworkNode implements IComparable, IWh public void update() { super.update(); - if (!canUpdate() || !world.isLoaded(pos)) { + if (!canUpdate() || !level.isLoaded(pos)) { return; } @@ -223,7 +223,7 @@ public class ImporterNetworkNode extends NetworkNode implements IComparable, IWh @Override public int getType() { - return world.isClientSide ? ImporterTile.TYPE.getValue() : type; + return level.isClientSide ? ImporterTile.TYPE.getValue() : type; } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/InterfaceNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/InterfaceNetworkNode.java index d5f1342e7..e39a8685d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/InterfaceNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/InterfaceNetworkNode.java @@ -43,8 +43,8 @@ public class InterfaceNetworkNode extends NetworkNode implements IComparable { private int currentSlot = 0; - public InterfaceNetworkNode(Level world, BlockPos pos) { - super(world, pos); + public InterfaceNetworkNode(Level level, BlockPos pos) { + super(level, pos); } @Override @@ -129,7 +129,7 @@ public class InterfaceNetworkNode extends NetworkNode implements IComparable { private boolean isActingAsStorage() { for (Direction facing : Direction.values()) { - INetworkNode facingNode = API.instance().getNetworkNodeManager((ServerLevel) world).getNode(pos.relative(facing)); + INetworkNode facingNode = API.instance().getNetworkNodeManager((ServerLevel) level).getNode(pos.relative(facing)); if (facingNode instanceof ExternalStorageNetworkNode && facingNode.isActive() && diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkNode.java index 30ea1c062..e71aefffa 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkNode.java @@ -41,7 +41,7 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { // new instances of network nodes will be created when the world refreshes (causing this field to be different too). // However, network nodes in the network graph *AREN'T* recreated when the world refreshes, causing the graph to have the incorrect instance, and even worse, // having multiple different instances of the same network node. - protected Level world; + protected Level level; protected BlockPos pos; protected int ticks; protected RedstoneMode redstoneMode = RedstoneMode.IGNORE; @@ -61,12 +61,12 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { private boolean couldUpdate; private int ticksSinceUpdateChanged; - protected NetworkNode(Level world, BlockPos pos) { - if (world == null) { + protected NetworkNode(Level level, BlockPos pos) { + if (level == null) { throw new IllegalArgumentException("World cannot be null"); } - this.world = world; + this.level = level; this.pos = pos; } @@ -83,7 +83,7 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { @Nonnull @Override public ItemStack getItemStack() { - return new ItemStack(Item.BY_BLOCK.get(world.getBlockState(pos).getBlock()), 1); + return new ItemStack(Item.BY_BLOCK.get(level.getBlockState(pos).getBlock()), 1); } @Override @@ -106,8 +106,8 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { @Override public void markDirty() { - if (!world.isClientSide) { - API.instance().getNetworkNodeManager((ServerLevel) world).markForSaving(); + if (!level.isClientSide) { + API.instance().getNetworkNodeManager((ServerLevel) level).markForSaving(); } } @@ -139,7 +139,7 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { @Override public void update() { if (ticks == 0) { - redstonePowered = world.hasNeighborSignal(pos); + redstonePowered = level.hasNeighborSignal(pos); } ++ticks; @@ -154,17 +154,17 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { couldUpdate = canUpdate; throttlingDisabled = false; - BlockState blockState = world.getBlockState(pos); + BlockState blockState = level.getBlockState(pos); if (blockState.getBlock() instanceof NetworkNodeBlock && ((NetworkNodeBlock) blockState.getBlock()).hasConnectedState()) { - world.setBlockAndUpdate(pos, world.getBlockState(pos).setValue(NetworkNodeBlock.CONNECTED, canUpdate)); + level.setBlockAndUpdate(pos, level.getBlockState(pos).setValue(NetworkNodeBlock.CONNECTED, canUpdate)); } if (network != null) { onConnectedStateChange(network, canUpdate, ConnectivityStateChangeCause.REDSTONE_MODE_OR_NETWORK_ENERGY_CHANGE); if (shouldRebuildGraphOnChange()) { - network.getNodeGraph().invalidate(Action.PERFORM, network.getWorld(), network.getPosition()); + network.getNodeGraph().invalidate(Action.PERFORM, network.getLevel(), network.getPosition()); } } } @@ -220,11 +220,10 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { } @Override - public Level getWorld() { - return world; + public Level getLevel() { + return level; } - @Override public boolean canConduct(Direction direction) { return true; @@ -233,24 +232,24 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { @Override public void visit(Operator operator) { for (Direction facing : Direction.values()) { - INetworkNode oppositeNode = NetworkUtils.getNodeFromTile(world.getBlockEntity(pos.relative(facing))); + INetworkNode oppositeNode = NetworkUtils.getNodeFromTile(level.getBlockEntity(pos.relative(facing))); if (oppositeNode == null) { continue; } if (canConduct(facing) && oppositeNode.canReceive(facing.getOpposite())) { - operator.apply(world, pos.relative(facing), facing.getOpposite()); + operator.apply(level, pos.relative(facing), facing.getOpposite()); } } } @Nullable public BlockEntity getFacingTile() { - return world.getBlockEntity(pos.relative(getDirection())); + return level.getBlockEntity(pos.relative(getDirection())); } public Direction getDirection() { if (direction == null) { - BlockState state = world.getBlockState(pos); + BlockState state = level.getBlockState(pos); if (state.getBlock() instanceof BaseBlock) { direction = state.getValue(((BaseBlock) state.getBlock()).getDirection().getProperty()); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkReceiverNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkReceiverNetworkNode.java index f6b054482..56e7d8727 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkReceiverNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkReceiverNetworkNode.java @@ -8,8 +8,8 @@ import net.minecraft.world.level.Level; public class NetworkReceiverNetworkNode extends NetworkNode { public static final ResourceLocation ID = new ResourceLocation(RS.ID, "network_receiver"); - public NetworkReceiverNetworkNode(Level world, BlockPos pos) { - super(world, pos); + public NetworkReceiverNetworkNode(Level level, BlockPos pos) { + super(level, pos); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java index 9f81b0d02..c4a660be1 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java @@ -39,12 +39,12 @@ public class NetworkTransmitterNetworkNode extends NetworkNode { } if (network != null) { - network.getNodeGraph().invalidate(Action.PERFORM, network.getWorld(), network.getPosition()); + network.getNodeGraph().invalidate(Action.PERFORM, network.getLevel(), network.getPosition()); } }); - public NetworkTransmitterNetworkNode(Level world, BlockPos pos) { - super(world, pos); + public NetworkTransmitterNetworkNode(Level level, BlockPos pos) { + super(level, pos); } @Override @@ -96,7 +96,7 @@ public class NetworkTransmitterNetworkNode extends NetworkNode { } public boolean isSameDimension() { - return world.dimension() == receiverDimension; + return level.dimension() == receiverDimension; } private boolean canTransmit() { @@ -114,14 +114,14 @@ public class NetworkTransmitterNetworkNode extends NetworkNode { if (canTransmit()) { if (!isSameDimension()) { - Level dimensionWorld = world.getServer().getLevel(receiverDimension); + Level dimensionWorld = level.getServer().getLevel(receiverDimension); if (dimensionWorld != null && dimensionWorld.getBlockEntity(receiver) instanceof NetworkReceiverTile) { operator.apply(dimensionWorld, receiver, null); } } else { - if (world.getBlockEntity(receiver) instanceof NetworkReceiverTile) { - operator.apply(world, receiver, null); + if (level.getBlockEntity(receiver) instanceof NetworkReceiverTile) { + operator.apply(level, receiver, null); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RelayNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RelayNetworkNode.java index ffbe0a983..d961b8cae 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RelayNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RelayNetworkNode.java @@ -10,9 +10,8 @@ import net.minecraft.world.level.Level; public class RelayNetworkNode extends NetworkNode { public static final ResourceLocation ID = new ResourceLocation(RS.ID, "relay"); - public RelayNetworkNode(Level world, BlockPos pos) { - super(world, pos); - + public RelayNetworkNode(Level level, BlockPos pos) { + super(level, pos); this.redstoneMode = RedstoneMode.LOW; } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RootNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RootNetworkNode.java index a52cbd9c5..8f5665328 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RootNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RootNetworkNode.java @@ -18,12 +18,12 @@ import java.util.UUID; public class RootNetworkNode implements INetworkNode, INetworkNodeVisitor { private final INetwork network; - private final Level world; + private final Level level; private final BlockPos pos; - public RootNetworkNode(INetwork network, Level world, BlockPos pos) { + public RootNetworkNode(INetwork network, Level level, BlockPos pos) { this.network = network; - this.world = world; + this.level = level; this.pos = pos; } @@ -51,7 +51,7 @@ public class RootNetworkNode implements INetworkNode, INetworkNodeVisitor { @Nonnull @Override public ItemStack getItemStack() { - BlockState state = world.getBlockState(pos); + BlockState state = level.getBlockState(pos); @SuppressWarnings("deprecation") Item item = Item.byBlock(state.getBlock()); @@ -95,8 +95,8 @@ public class RootNetworkNode implements INetworkNode, INetworkNodeVisitor { } @Override - public Level getWorld() { - return world; + public Level getLevel() { + return level; } @Override @@ -107,7 +107,7 @@ public class RootNetworkNode implements INetworkNode, INetworkNodeVisitor { @Override public void visit(Operator operator) { for (Direction facing : Direction.values()) { - operator.apply(world, pos.relative(facing), facing.getOpposite()); + operator.apply(level, pos.relative(facing), facing.getOpposite()); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/SecurityManagerNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/SecurityManagerNetworkNode.java index 5ff7b4ba3..fa69d419d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/SecurityManagerNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/SecurityManagerNetworkNode.java @@ -32,11 +32,14 @@ public class SecurityManagerNetworkNode extends NetworkNode implements ISecurity private final BaseItemHandler editCard = new BaseItemHandler(1) .addValidator(new ItemValidator(RSItems.SECURITY_CARD.get())) .addListener(new NetworkNodeInventoryListener(this)); - private ISecurityCard globalCard; private final BaseItemHandler cardsInv = new BaseItemHandler(9 * 2) + private ISecurityCard globalCard; + public SecurityManagerNetworkNode(Level level, BlockPos pos) { + super(level, pos); + } private final BaseItemHandler cardsInv = new BaseItemHandler(9 * 2) .addValidator(new ItemValidator(RSItems.SECURITY_CARD.get())) .addListener(new NetworkNodeInventoryListener(this)) .addListener(((handler, slot, reading) -> { - if (!world.isClientSide) { + if (!level.isClientSide) { invalidate(); } @@ -45,10 +48,6 @@ public class SecurityManagerNetworkNode extends NetworkNode implements ISecurity } })); - public SecurityManagerNetworkNode(Level world, BlockPos pos) { - super(world, pos); - } - @Override public int getEnergyUsage() { int usage = RS.SERVER_CONFIG.getSecurityManager().getUsage(); @@ -165,4 +164,6 @@ public class SecurityManagerNetworkNode extends NetworkNode implements ISecurity } + + } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/StorageMonitorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/StorageMonitorNetworkNode.java index 61f6b68c1..b370dcb2e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/StorageMonitorNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/StorageMonitorNetworkNode.java @@ -46,14 +46,14 @@ public class StorageMonitorNetworkNode extends NetworkNode implements IComparabl .addListener(new NetworkNodeInventoryListener(this)) .addListener((handler, slot, reading) -> { if (!reading) { - WorldUtils.updateBlock(world, pos); + WorldUtils.updateBlock(level, pos); } }); private final FluidInventory fluidFilter = new FluidInventory(1, FluidAttributes.BUCKET_VOLUME) .addListener((handler, slot, reading) -> { if (!reading) { - WorldUtils.updateBlock(world, pos); + WorldUtils.updateBlock(level, pos); } }); private final Map> deposits = new HashMap<>(); @@ -63,8 +63,8 @@ public class StorageMonitorNetworkNode extends NetworkNode implements IComparabl private int oldAmount = -1; - public StorageMonitorNetworkNode(Level world, BlockPos pos) { - super(world, pos); + public StorageMonitorNetworkNode(Level level, BlockPos pos) { + super(level, pos); } @Override @@ -82,7 +82,7 @@ public class StorageMonitorNetworkNode extends NetworkNode implements IComparabl } else if (oldAmount != newAmount) { oldAmount = newAmount; - WorldUtils.updateBlock(world, pos); + WorldUtils.updateBlock(level, pos); } } @@ -199,7 +199,7 @@ public class StorageMonitorNetworkNode extends NetworkNode implements IComparabl ItemStack result = network.extractItem(filter, toExtract, compare, Action.PERFORM); if (!result.isEmpty() && !player.getInventory().add(result.copy())) { - Containers.dropItemStack(world, player.getX(), player.getY(), player.getZ(), result); + Containers.dropItemStack(level, player.getX(), player.getY(), player.getZ(), result); } } } @@ -249,7 +249,7 @@ public class StorageMonitorNetworkNode extends NetworkNode implements IComparabl public void setCompare(int compare) { this.compare = compare; - WorldUtils.updateBlock(world, pos); + WorldUtils.updateBlock(level, pos); markDirty(); } @@ -318,14 +318,14 @@ public class StorageMonitorNetworkNode extends NetworkNode implements IComparabl @Override public int getType() { - return world.isClientSide ? StorageMonitorTile.TYPE.getValue() : type; + return level.isClientSide ? StorageMonitorTile.TYPE.getValue() : type; } @Override public void setType(int type) { this.type = type; - WorldUtils.updateBlock(world, pos); + WorldUtils.updateBlock(level, pos); markDirty(); } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/WirelessTransmitterNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/WirelessTransmitterNetworkNode.java index b12bcf6a1..8ccd18b8b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/WirelessTransmitterNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/WirelessTransmitterNetworkNode.java @@ -20,8 +20,8 @@ public class WirelessTransmitterNetworkNode extends NetworkNode implements IWire private final UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.RANGE).addListener(new NetworkNodeInventoryListener(this)); - public WirelessTransmitterNetworkNode(Level world, BlockPos pos) { - super(world, pos); + public WirelessTransmitterNetworkNode(Level level, BlockPos pos) { + super(level, pos); } @Override @@ -62,7 +62,7 @@ public class WirelessTransmitterNetworkNode extends NetworkNode implements IWire @Override public ResourceKey getDimension() { - return world.dimension(); + return level.dimension(); } public BaseItemHandler getUpgrades() { @@ -81,6 +81,6 @@ public class WirelessTransmitterNetworkNode extends NetworkNode implements IWire @Override public void visit(Operator operator) { - operator.apply(world, pos.relative(Direction.DOWN), Direction.UP); + operator.apply(level, pos.relative(Direction.DOWN), Direction.UP); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/cover/CoverManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/cover/CoverManager.java index 8a6ec56bb..5b7c70c87 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/cover/CoverManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/cover/CoverManager.java @@ -113,7 +113,7 @@ public class CoverManager { node.markDirty(); if (node.getNetwork() != null) { - node.getNetwork().getNodeGraph().invalidate(Action.PERFORM, node.getNetwork().getWorld(), node.getNetwork().getPosition()); + node.getNetwork().getNodeGraph().invalidate(Action.PERFORM, node.getNetwork().getLevel(), node.getNetwork().getPosition()); } return true; @@ -130,7 +130,7 @@ public class CoverManager { node.markDirty(); if (node.getNetwork() != null) { - node.getNetwork().getNodeGraph().invalidate(Action.PERFORM, node.getNetwork().getWorld(), node.getNetwork().getPosition()); + node.getNetwork().getNodeGraph().invalidate(Action.PERFORM, node.getNetwork().getLevel(), node.getNetwork().getPosition()); } return cover; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java index 83fcf2496..a924a57a5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java @@ -58,9 +58,9 @@ public class DiskDriveNetworkNode extends NetworkNode implements IStorageProvide .addValidator(new StorageDiskItemValidator()) .addListener(new NetworkNodeInventoryListener(this)) .addListener((handler, slot, reading) -> { - if (!world.isClientSide) { + if (!level.isClientSide) { StackUtils.createStorages( - (ServerLevel) world, + (ServerLevel) level, handler.getStackInSlot(slot), slot, itemDisks, @@ -75,7 +75,7 @@ public class DiskDriveNetworkNode extends NetworkNode implements IStorageProvide } if (!reading) { - WorldUtils.updateBlock(world, pos); + WorldUtils.updateBlock(level, pos); } } }); @@ -87,8 +87,8 @@ public class DiskDriveNetworkNode extends NetworkNode implements IStorageProvide private int mode = IWhitelistBlacklist.BLACKLIST; private int type = IType.ITEMS; - public DiskDriveNetworkNode(Level world, BlockPos pos) { - super(world, pos); + public DiskDriveNetworkNode(Level level, BlockPos pos) { + super(level, pos); } public IStorageDisk[] getItemDisks() { @@ -125,7 +125,7 @@ public class DiskDriveNetworkNode extends NetworkNode implements IStorageProvide ++ticksSinceBlockUpdateRequested; if (ticksSinceBlockUpdateRequested > DISK_STATE_UPDATE_THROTTLE) { - WorldUtils.updateBlock(world, pos); + WorldUtils.updateBlock(level, pos); this.blockUpdateRequested = false; this.ticksSinceBlockUpdateRequested = 0; @@ -148,7 +148,7 @@ public class DiskDriveNetworkNode extends NetworkNode implements IStorageProvide network.getNodeGraph().runActionWhenPossible(ItemStorageCache.INVALIDATE_ACTION.apply(InvalidateCause.CONNECTED_STATE_CHANGED)); network.getNodeGraph().runActionWhenPossible(FluidStorageCache.INVALIDATE_ACTION.apply(InvalidateCause.CONNECTED_STATE_CHANGED)); - WorldUtils.updateBlock(world, pos); + WorldUtils.updateBlock(level, pos); } @Override @@ -323,7 +323,7 @@ public class DiskDriveNetworkNode extends NetworkNode implements IStorageProvide @Override public int getType() { - return world.isClientSide ? DiskDriveTile.TYPE.getValue() : type; + return level.isClientSide ? DiskDriveTile.TYPE.getValue() : type; } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/DiskManipulatorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/DiskManipulatorNetworkNode.java index 9f4129254..864c05a21 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/DiskManipulatorNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/DiskManipulatorNetworkNode.java @@ -56,9 +56,9 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab .addValidator(new StorageDiskItemValidator()) .addListener(new NetworkNodeInventoryListener(this)) .addListener((handler, slot, reading) -> { - if (!world.isClientSide) { + if (!level.isClientSide) { StackUtils.createStorages( - (ServerLevel) world, + (ServerLevel) level, handler.getStackInSlot(slot), slot, itemDisks, @@ -68,7 +68,7 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab ); if (!reading) { - WorldUtils.updateBlock(world, pos); + WorldUtils.updateBlock(level, pos); } } }); @@ -76,9 +76,9 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab .addValidator(new StorageDiskItemValidator()) .addListener(new NetworkNodeInventoryListener(this)) .addListener(((handler, slot, reading) -> { - if (!world.isClientSide) { + if (!level.isClientSide) { StackUtils.createStorages( - (ServerLevel) world, + (ServerLevel) level, handler.getStackInSlot(slot), 3 + slot, itemDisks, @@ -88,7 +88,7 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab ); if (!reading) { - WorldUtils.updateBlock(world, pos); + WorldUtils.updateBlock(level, pos); } } })); @@ -112,8 +112,8 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab }.addListener(new NetworkNodeInventoryListener(this)); private int ioMode = IO_MODE_INSERT; - public DiskManipulatorNetworkNode(Level world, BlockPos pos) { - super(world, pos); + public DiskManipulatorNetworkNode(Level level, BlockPos pos) { + super(level, pos); } @Override @@ -413,7 +413,7 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab @Override public int getType() { - return world.isClientSide ? DiskManipulatorTile.TYPE.getValue() : type; + return level.isClientSide ? DiskManipulatorTile.TYPE.getValue() : type; } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskFluidManipulatorWrapper.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskFluidManipulatorWrapper.java index bbb7d21d7..125e2a8aa 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskFluidManipulatorWrapper.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskFluidManipulatorWrapper.java @@ -33,7 +33,7 @@ public class StorageDiskFluidManipulatorWrapper implements IStorageDisk storage; - public FluidStorageNetworkNode(Level world, BlockPos pos, FluidStorageType type) { - super(world, pos); + public FluidStorageNetworkNode(Level level, BlockPos pos, FluidStorageType type) { + super(level, pos); this.type = type; } @@ -154,13 +154,13 @@ public class FluidStorageNetworkNode extends NetworkNode implements IStorageScre } public void loadStorage(@Nullable Player owner) { - IStorageDisk disk = API.instance().getStorageDiskManager((ServerLevel) world).get(storageId); + IStorageDisk disk = API.instance().getStorageDiskManager((ServerLevel) level).get(storageId); if (disk == null) { - disk = API.instance().createDefaultFluidDisk((ServerLevel) world, type.getCapacity(), owner); + disk = API.instance().createDefaultFluidDisk((ServerLevel) level, type.getCapacity(), owner); - API.instance().getStorageDiskManager((ServerLevel) world).set(storageId, disk); - API.instance().getStorageDiskManager((ServerLevel) world).markForSaving(); + API.instance().getStorageDiskManager((ServerLevel) level).set(storageId, disk); + API.instance().getStorageDiskManager((ServerLevel) level).markForSaving(); } this.storage = new FluidStorageWrapperStorageDisk(this, disk); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/StorageNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/StorageNetworkNode.java index df74a0582..9b58b9d4e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/StorageNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/StorageNetworkNode.java @@ -64,8 +64,8 @@ public class StorageNetworkNode extends NetworkNode implements IStorageScreen, I private UUID storageId = UUID.randomUUID(); private IStorageDisk storage; - public StorageNetworkNode(Level world, BlockPos pos, ItemStorageType type) { - super(world, pos); + public StorageNetworkNode(Level level, BlockPos pos, ItemStorageType type) { + super(level, pos); this.type = type; } @@ -154,13 +154,13 @@ public class StorageNetworkNode extends NetworkNode implements IStorageScreen, I } public void loadStorage(@Nullable Player owner) { - IStorageDisk disk = API.instance().getStorageDiskManager((ServerLevel) world).get(storageId); + IStorageDisk disk = API.instance().getStorageDiskManager((ServerLevel) level).get(storageId); if (disk == null) { - disk = API.instance().createDefaultItemDisk((ServerLevel) world, type.getCapacity(), owner); + disk = API.instance().createDefaultItemDisk((ServerLevel) level, type.getCapacity(), owner); - API.instance().getStorageDiskManager((ServerLevel) world).set(storageId, disk); - API.instance().getStorageDiskManager((ServerLevel) world).markForSaving(); + API.instance().getStorageDiskManager((ServerLevel) level).set(storageId, disk); + API.instance().getStorageDiskManager((ServerLevel) level).markForSaving(); } this.storage = new ItemStorageWrapperStorageDisk(this, disk); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/FluidStorageDisk.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/FluidStorageDisk.java index 4211e82b9..c692e8d70 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/FluidStorageDisk.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/FluidStorageDisk.java @@ -30,7 +30,7 @@ public class FluidStorageDisk implements IStorageDisk { public static final int VERSION = 1; @Nullable - private final ServerLevel world; + private final ServerLevel level; private final int capacity; private final Multimap stacks = ArrayListMultimap.create(); private final UUID owner; @@ -39,8 +39,8 @@ public class FluidStorageDisk implements IStorageDisk { private IStorageDiskListener listener; private IStorageDiskContainerContext context; - public FluidStorageDisk(@Nullable ServerLevel world, int capacity, @Nullable UUID owner) { - this.world = world; + public FluidStorageDisk(@Nullable ServerLevel level, int capacity, @Nullable UUID owner) { + this.level = level; this.capacity = capacity; this.owner = owner; } @@ -216,8 +216,8 @@ public class FluidStorageDisk implements IStorageDisk { listener.onChanged(); } - if (world != null) { - API.instance().getStorageDiskManager(world).markForSaving(); + if (level != null) { + API.instance().getStorageDiskManager(level).markForSaving(); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/ItemStorageDisk.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/ItemStorageDisk.java index 1e1ec93d7..27b30daa9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/ItemStorageDisk.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/ItemStorageDisk.java @@ -31,7 +31,7 @@ public class ItemStorageDisk implements IStorageDisk { public static final int VERSION = 1; @Nullable - private final ServerLevel world; + private final ServerLevel level; private final int capacity; private final Multimap stacks = ArrayListMultimap.create(); private final UUID owner; @@ -41,8 +41,8 @@ public class ItemStorageDisk implements IStorageDisk { private IStorageDiskListener listener; private IStorageDiskContainerContext context; - public ItemStorageDisk(@Nullable ServerLevel world, int capacity, @Nullable UUID owner) { - this.world = world; + public ItemStorageDisk(@Nullable ServerLevel level, int capacity, @Nullable UUID owner) { + this.level = level; this.capacity = capacity; this.owner = owner; } @@ -222,8 +222,8 @@ public class ItemStorageDisk implements IStorageDisk { listener.onChanged(); } - if (world != null) { - API.instance().getStorageDiskManager(world).markForSaving(); + if (level != null) { + API.instance().getStorageDiskManager(level).markForSaving(); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskManager.java index 2e1461939..d7820feb5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskManager.java @@ -8,10 +8,10 @@ import com.refinedmods.refinedstorage.apiimpl.API; import com.refinedmods.refinedstorage.apiimpl.util.RSWorldSavedData; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.Tag; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.item.ItemStack; -import net.minecraft.nbt.Tag; import javax.annotation.Nullable; import java.util.HashMap; @@ -27,10 +27,10 @@ public class StorageDiskManager extends RSWorldSavedData implements IStorageDisk private static final String NBT_DISK_DATA = "Data"; private final Map disks = new HashMap<>(); - private final ServerLevel world; + private final ServerLevel level; - public StorageDiskManager(ServerLevel world) { - this.world = world; + public StorageDiskManager(ServerLevel level) { + this.level = level; } @Override @@ -105,7 +105,7 @@ public class StorageDiskManager extends RSWorldSavedData implements IStorageDisk IStorageDiskFactory factory = API.instance().getStorageDiskRegistry().get(new ResourceLocation(type)); if (factory != null) { - disks.put(id, factory.createFromNbt(world, data)); + disks.put(id, factory.createFromNbt(level, data)); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/factory/FluidStorageDiskFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/factory/FluidStorageDiskFactory.java index 64ab87421..bb04a1ec7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/factory/FluidStorageDiskFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/factory/FluidStorageDiskFactory.java @@ -9,10 +9,10 @@ import com.refinedmods.refinedstorage.apiimpl.storage.disk.FluidStorageDisk; import com.refinedmods.refinedstorage.item.FluidStorageDiskItem; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.Tag; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.item.ItemStack; -import net.minecraft.nbt.Tag; import net.minecraftforge.fluids.FluidStack; import javax.annotation.Nullable; @@ -22,9 +22,9 @@ public class FluidStorageDiskFactory implements IStorageDiskFactory public static final ResourceLocation ID = new ResourceLocation(RS.ID, "fluid"); @Override - public IStorageDisk createFromNbt(ServerLevel world, CompoundTag tag) { + public IStorageDisk createFromNbt(ServerLevel level, CompoundTag tag) { FluidStorageDisk disk = new FluidStorageDisk( - world, + level, tag.getInt(FluidStorageDisk.NBT_CAPACITY), tag.contains(FluidStorageDisk.NBT_OWNER) ? tag.getUUID(FluidStorageDisk.NBT_OWNER) : null ); @@ -69,7 +69,7 @@ public class FluidStorageDiskFactory implements IStorageDiskFactory } @Override - public IStorageDisk create(ServerLevel world, int capacity, @Nullable UUID owner) { - return new FluidStorageDisk(world, capacity, owner); + public IStorageDisk create(ServerLevel level, int capacity, @Nullable UUID owner) { + return new FluidStorageDisk(level, capacity, owner); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/factory/ItemStorageDiskFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/factory/ItemStorageDiskFactory.java index b7219ae64..265ae6f8f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/factory/ItemStorageDiskFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/factory/ItemStorageDiskFactory.java @@ -10,10 +10,10 @@ import com.refinedmods.refinedstorage.item.StorageDiskItem; import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.Tag; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.item.ItemStack; -import net.minecraft.nbt.Tag; import javax.annotation.Nullable; import java.util.UUID; @@ -22,9 +22,9 @@ public class ItemStorageDiskFactory implements IStorageDiskFactory { public static final ResourceLocation ID = new ResourceLocation(RS.ID, "item"); @Override - public IStorageDisk createFromNbt(ServerLevel world, CompoundTag tag) { + public IStorageDisk createFromNbt(ServerLevel level, CompoundTag tag) { ItemStorageDisk disk = new ItemStorageDisk( - world, + level, tag.getInt(ItemStorageDisk.NBT_CAPACITY), tag.contains(ItemStorageDisk.NBT_OWNER) ? tag.getUUID(ItemStorageDisk.NBT_OWNER) : null ); @@ -71,7 +71,7 @@ public class ItemStorageDiskFactory implements IStorageDiskFactory { } @Override - public IStorageDisk create(ServerLevel world, int capacity, @Nullable UUID owner) { - return new ItemStorageDisk(world, capacity, owner); + public IStorageDisk create(ServerLevel level, int capacity, @Nullable UUID owner) { + return new ItemStorageDisk(level, capacity, owner); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/block/BaseBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/BaseBlock.java index 58ceac17b..eb46027b2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/BaseBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/BaseBlock.java @@ -30,23 +30,23 @@ public abstract class BaseBlock extends Block { return super.rotate(state, rot); } - protected void onDirectionChanged(Level world, BlockPos pos, Direction newDirection) { + protected void onDirectionChanged(Level level, BlockPos pos, Direction newDirection) { // NO OP } @Override @SuppressWarnings("deprecation") - public void onRemove(BlockState state, Level world, BlockPos pos, BlockState newState, boolean isMoving) { - super.onRemove(state, world, pos, newState, isMoving); + public void onRemove(BlockState state, Level level, BlockPos pos, BlockState newState, boolean isMoving) { + super.onRemove(state, level, pos, newState, isMoving); - checkIfDirectionHasChanged(state, world, pos, newState); + checkIfDirectionHasChanged(state, level, pos, newState); } - protected void checkIfDirectionHasChanged(BlockState state, Level world, BlockPos pos, BlockState newState) { + protected void checkIfDirectionHasChanged(BlockState state, Level level, BlockPos pos, BlockState newState) { if (getDirection() != BlockDirection.NONE && state.getBlock() == newState.getBlock() && state.getValue(getDirection().getProperty()) != newState.getValue(getDirection().getProperty())) { - onDirectionChanged(world, pos, newState.getValue(getDirection().getProperty())); + onDirectionChanged(level, pos, newState.getValue(getDirection().getProperty())); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/block/CableBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/CableBlock.java index b07ff7620..3a2ecc71a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/CableBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/CableBlock.java @@ -9,7 +9,6 @@ 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.tile.CrafterTile; import com.refinedmods.refinedstorage.util.BlockUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -134,7 +133,7 @@ public class CableBlock extends NetworkNodeBlock implements SimpleWaterloggedBlo } @Override - protected void onDirectionChanged(Level world, BlockPos pos, Direction newDirection) { + protected void onDirectionChanged(Level level, BlockPos pos, Direction newDirection) { // rotate() in BaseBlock "stupidly" changes the direction without checking if our cable connections are still valid. // You'd expect that cable connections are not changing when simply changing the direction. // But they need to. For example, when rotating a constructor to connect to a neighboring cable, the connection to that neighbor @@ -142,25 +141,25 @@ public class CableBlock extends NetworkNodeBlock implements SimpleWaterloggedBlo // This is already checked in hasNode(). // But since rotate() doesn't invalidate that connection, we need to do it here. // Ideally, this code would be in rotate(). But rotate() doesn't have any data about the position and world, so we need to do it here. - world.setBlockAndUpdate(pos, getState(world.getBlockState(pos), world, pos)); + level.setBlockAndUpdate(pos, getState(level.getBlockState(pos), level, pos)); //when rotating skip rotations blocked by covers BlockDirection dir = getDirection(); if (dir != BlockDirection.NONE) { - if (isSideCovered(world.getBlockEntity(pos), newDirection)) { - BlockState newState = rotate(world.getBlockState(pos), Rotation.CLOCKWISE_90); - world.setBlockAndUpdate(pos, newState); + if (isSideCovered(level.getBlockEntity(pos), newDirection)) { + BlockState newState = rotate(level.getBlockState(pos), Rotation.CLOCKWISE_90); + level.setBlockAndUpdate(pos, newState); } } - super.onDirectionChanged(world, pos, newDirection); + super.onDirectionChanged(level, pos, newDirection); } @Override - public void neighborChanged(BlockState state, Level world, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving) { - super.neighborChanged(state, world, pos, blockIn, fromPos, isMoving); - world.setBlockAndUpdate(pos, getState(world.getBlockState(pos), world, pos)); + public void neighborChanged(BlockState state, Level level, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving) { + super.neighborChanged(state, level, pos, blockIn, fromPos, isMoving); + level.setBlockAndUpdate(pos, getState(level.getBlockState(pos), level, pos)); } @Nullable diff --git a/src/main/java/com/refinedmods/refinedstorage/block/ColoredNetworkBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ColoredNetworkBlock.java index 8a5f2eeab..149d17235 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/ColoredNetworkBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ColoredNetworkBlock.java @@ -11,11 +11,11 @@ public abstract class ColoredNetworkBlock extends NetworkNodeBlock { // Don't do block drops if we change the color. @Override - public void onRemove(BlockState state, Level world, BlockPos pos, BlockState newState, boolean isMoving) { + public void onRemove(BlockState state, Level level, BlockPos pos, BlockState newState, boolean isMoving) { if (state.getBlock().getClass().equals(newState.getBlock().getClass())) { - checkIfDirectionHasChanged(state, world, pos, newState); + checkIfDirectionHasChanged(state, level, pos, newState); } else { - super.onRemove(state, world, pos, newState, isMoving); + super.onRemove(state, level, pos, newState, isMoving); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/block/ConstructorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ConstructorBlock.java index 038191607..966201bf5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/ConstructorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ConstructorBlock.java @@ -25,8 +25,6 @@ import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.network.NetworkHooks; -import javax.annotation.Nullable; - public class ConstructorBlock extends CableBlock { private static final VoxelShape HEAD_NORTH = Shapes.or(box(2, 2, 0, 14, 14, 2), HOLDER_NORTH); private static final VoxelShape HEAD_EAST = Shapes.or(box(14, 2, 2, 16, 14, 14), HOLDER_EAST); @@ -92,9 +90,9 @@ public class ConstructorBlock extends CableBlock { @Override @SuppressWarnings("deprecation") - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { - if (!world.isClientSide && CollisionUtils.isInBounds(getHeadShape(state), pos, hit.getLocation())) { - return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { + if (!level.isClientSide && CollisionUtils.isInBounds(getHeadShape(state), pos, hit.getLocation())) { + return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui( (ServerPlayer) player, new PositionalTileContainerProvider( new TranslatableComponent("gui.refinedstorage.constructor"), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/ControllerBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ControllerBlock.java index e4ed0557c..29151b13c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/ControllerBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ControllerBlock.java @@ -61,12 +61,12 @@ public class ControllerBlock extends BaseBlock implements EntityBlock { } @Override - public void setPlacedBy(Level world, BlockPos pos, BlockState state, @Nullable LivingEntity entity, ItemStack stack) { - super.setPlacedBy(world, pos, state, entity, stack); + public void setPlacedBy(Level level, BlockPos pos, BlockState state, @Nullable LivingEntity entity, ItemStack stack) { + super.setPlacedBy(level, pos, state, entity, stack); - if (!world.isClientSide) { + if (!level.isClientSide) { stack.getCapability(CapabilityEnergy.ENERGY).ifPresent(energyFromStack -> { - BlockEntity tile = world.getBlockEntity(pos); + BlockEntity tile = level.getBlockEntity(pos); if (tile != null) { tile.getCapability(CapabilityEnergy.ENERGY).ifPresent(energyFromTile -> energyFromTile.receiveEnergy(energyFromStack.getEnergyStored(), false)); @@ -77,21 +77,21 @@ public class ControllerBlock extends BaseBlock implements EntityBlock { @Override @SuppressWarnings("deprecation") - public void neighborChanged(BlockState state, Level world, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving) { - super.neighborChanged(state, world, pos, blockIn, fromPos, isMoving); + public void neighborChanged(BlockState state, Level level, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving) { + super.neighborChanged(state, level, pos, blockIn, fromPos, isMoving); - if (!world.isClientSide) { - INetwork network = API.instance().getNetworkManager((ServerLevel) world).getNetwork(pos); + if (!level.isClientSide) { + INetwork network = API.instance().getNetworkManager((ServerLevel) level).getNetwork(pos); if (network instanceof Network) { - ((Network) network).setRedstonePowered(world.hasNeighborSignal(pos)); + ((Network) network).setRedstonePowered(level.hasNeighborSignal(pos)); } } } @Override @SuppressWarnings("deprecation") - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { - InteractionResult result = super.use(state, world, pos, player, hand, hit); + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { + InteractionResult result = super.use(state, level, pos, player, hand, hit); if (result != InteractionResult.PASS) { return result; } @@ -102,11 +102,11 @@ public class ControllerBlock extends BaseBlock implements EntityBlock { if (color != null && !state.getBlock().equals(colorMap.get(color).get())) { BlockState newState = colorMap.get(color).get().defaultBlockState().setValue(ENERGY_TYPE, state.getValue(ENERGY_TYPE)); - return RSBlocks.CONTROLLER.setBlockState(newState, player.getItemInHand(hand), world, pos, player); + return RSBlocks.CONTROLLER.setBlockState(newState, player.getItemInHand(hand), level, pos, player); } - if (!world.isClientSide) { - return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( + if (!level.isClientSide) { + return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui( (ServerPlayer) player, new MenuProvider() { @Override @@ -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) world.getBlockEntity(pos), player, i); + return new ControllerContainer((ControllerTile) level.getBlockEntity(pos), player, i); } }, pos @@ -127,11 +127,11 @@ public class ControllerBlock extends BaseBlock implements EntityBlock { } @Override - public void onRemove(BlockState state, Level world, BlockPos pos, BlockState newState, boolean isMoving) { + public void onRemove(BlockState state, Level level, BlockPos pos, BlockState newState, boolean isMoving) { if (newState.getBlock() instanceof ControllerBlock) { return; } - super.onRemove(state, world, pos, newState, isMoving); + super.onRemove(state, level, pos, newState, isMoving); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/block/CrafterBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/CrafterBlock.java index 6035c300a..c1e1c305f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/CrafterBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/CrafterBlock.java @@ -33,11 +33,11 @@ public class CrafterBlock extends ColoredNetworkBlock { } @Override - public void setPlacedBy(Level world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) { - super.setPlacedBy(world, pos, state, placer, stack); + public void setPlacedBy(Level level, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) { + super.setPlacedBy(level, pos, state, placer, stack); - if (!world.isClientSide) { - BlockEntity tile = world.getBlockEntity(pos); + if (!level.isClientSide) { + BlockEntity tile = level.getBlockEntity(pos); if (tile instanceof CrafterTile && stack.hasCustomHoverName()) { ((CrafterTile) tile).getNode().setDisplayName(stack.getHoverName()); @@ -48,17 +48,17 @@ public class CrafterBlock extends ColoredNetworkBlock { @Override @SuppressWarnings("deprecation") - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { - InteractionResult result = RSBlocks.CRAFTER.changeBlockColor(state, player.getItemInHand(hand), world, pos, player); + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { + InteractionResult result = RSBlocks.CRAFTER.changeBlockColor(state, player.getItemInHand(hand), level, pos, player); if (result != InteractionResult.PASS) { return result; } - if (!world.isClientSide) { - return NetworkUtils.attempt(world, pos, player, () -> NetworkHooks.openGui( + if (!level.isClientSide) { + return NetworkUtils.attempt(level, pos, player, () -> NetworkHooks.openGui( (ServerPlayer) player, new PositionalTileContainerProvider( - ((CrafterTile) world.getBlockEntity(pos)).getNode().getName(), + ((CrafterTile) level.getBlockEntity(pos)).getNode().getName(), (tile, windowId, inventory, p) -> new CrafterContainer(tile, player, windowId), pos ), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/CrafterManagerBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/CrafterManagerBlock.java index 3a1bb1981..a73262909 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/CrafterManagerBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/CrafterManagerBlock.java @@ -34,17 +34,17 @@ public class CrafterManagerBlock extends ColoredNetworkBlock { @Override @SuppressWarnings("deprecation") - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { - InteractionResult result = RSBlocks.CRAFTER_MANAGER.changeBlockColor(state, player.getItemInHand(hand), world, pos, player); + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { + InteractionResult result = RSBlocks.CRAFTER_MANAGER.changeBlockColor(state, player.getItemInHand(hand), level, pos, player); if (result != InteractionResult.PASS) { return result; } - if (!world.isClientSide) { - return NetworkUtils.attempt(world, pos, player, () -> NetworkHooks.openGui( + if (!level.isClientSide) { + return NetworkUtils.attempt(level, pos, player, () -> NetworkHooks.openGui( (ServerPlayer) player, - new CrafterManagerContainerProvider((CrafterManagerTile) world.getBlockEntity(pos)), - buf -> CrafterManagerContainerProvider.writeToBuffer(buf, world, pos) + new CrafterManagerContainerProvider((CrafterManagerTile) level.getBlockEntity(pos)), + buf -> CrafterManagerContainerProvider.writeToBuffer(buf, level, pos) ), Permission.MODIFY, Permission.AUTOCRAFTING); } diff --git a/src/main/java/com/refinedmods/refinedstorage/block/CraftingMonitorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/CraftingMonitorBlock.java index c720755c1..69d696c1a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/CraftingMonitorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/CraftingMonitorBlock.java @@ -35,16 +35,16 @@ public class CraftingMonitorBlock extends ColoredNetworkBlock { @Override @SuppressWarnings("deprecation") - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { - InteractionResult result = RSBlocks.CRAFTING_MONITOR.changeBlockColor(state, player.getItemInHand(hand), world, pos, player); + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { + InteractionResult result = RSBlocks.CRAFTING_MONITOR.changeBlockColor(state, player.getItemInHand(hand), level, pos, player); if (result != InteractionResult.PASS) { return result; } - if (!world.isClientSide) { - CraftingMonitorTile tile = (CraftingMonitorTile) world.getBlockEntity(pos); + if (!level.isClientSide) { + CraftingMonitorTile tile = (CraftingMonitorTile) level.getBlockEntity(pos); - return NetworkUtils.attempt(world, pos, player, () -> NetworkHooks.openGui( + return NetworkUtils.attempt(level, pos, player, () -> NetworkHooks.openGui( (ServerPlayer) player, new CraftingMonitorContainerProvider(RSContainers.CRAFTING_MONITOR, tile.getNode(), tile), pos diff --git a/src/main/java/com/refinedmods/refinedstorage/block/DestructorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/DestructorBlock.java index 99fefed63..36a91ea9f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/DestructorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/DestructorBlock.java @@ -90,9 +90,9 @@ public class DestructorBlock extends CableBlock { @Override @SuppressWarnings("deprecation") - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { - if (!world.isClientSide && CollisionUtils.isInBounds(getHeadShape(state), pos, hit.getLocation())) { - return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { + if (!level.isClientSide && CollisionUtils.isInBounds(getHeadShape(state), pos, hit.getLocation())) { + return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui( (ServerPlayer) player, new PositionalTileContainerProvider( new TranslatableComponent("gui.refinedstorage.destructor"), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/DetectorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/DetectorBlock.java index 4c3c9970d..98d3491fa 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/DetectorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/DetectorBlock.java @@ -3,7 +3,6 @@ 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.CrafterTile; import com.refinedmods.refinedstorage.tile.DetectorTile; import com.refinedmods.refinedstorage.util.BlockUtils; import com.refinedmods.refinedstorage.util.ColorMap; @@ -28,8 +27,6 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.network.NetworkHooks; -import javax.annotation.Nullable; - public class DetectorBlock extends ColoredNetworkBlock { public static final BooleanProperty POWERED = BooleanProperty.create("powered"); @@ -70,18 +67,18 @@ public class DetectorBlock extends ColoredNetworkBlock { @Override @SuppressWarnings("deprecation") - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { ColorMap colorMap = RSBlocks.DETECTOR; DyeColor color = DyeColor.getColor(player.getItemInHand(hand)); if (color != null && !state.getBlock().equals(colorMap.get(color).get())) { BlockState newState = colorMap.get(color).get().defaultBlockState().setValue(POWERED, state.getValue(POWERED)); - return RSBlocks.DETECTOR.setBlockState(newState, player.getItemInHand(hand), world, pos, player); + return RSBlocks.DETECTOR.setBlockState(newState, player.getItemInHand(hand), level, pos, player); } - if (!world.isClientSide) { - return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( + if (!level.isClientSide) { + return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui( (ServerPlayer) player, new PositionalTileContainerProvider( new TranslatableComponent("gui.refinedstorage.detector"), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/DiskDriveBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/DiskDriveBlock.java index 8f28525b6..d47738a9c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/DiskDriveBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/DiskDriveBlock.java @@ -2,7 +2,6 @@ package com.refinedmods.refinedstorage.block; import com.refinedmods.refinedstorage.container.DiskDriveContainer; import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider; -import com.refinedmods.refinedstorage.tile.CrafterTile; import com.refinedmods.refinedstorage.tile.DiskDriveTile; import com.refinedmods.refinedstorage.util.BlockUtils; import com.refinedmods.refinedstorage.util.NetworkUtils; @@ -12,15 +11,12 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; import net.minecraftforge.network.NetworkHooks; -import javax.annotation.Nullable; - public class DiskDriveBlock extends NetworkNodeBlock { public DiskDriveBlock() { super(BlockUtils.DEFAULT_ROCK_PROPERTIES); @@ -38,9 +34,9 @@ public class DiskDriveBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult rayTraceResult) { - if (!world.isClientSide) { - return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult rayTraceResult) { + if (!level.isClientSide) { + return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui( (ServerPlayer) player, new PositionalTileContainerProvider( new TranslatableComponent("gui.refinedstorage.disk_drive"), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/DiskManipulatorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/DiskManipulatorBlock.java index 75d7c2c53..276cbc17a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/DiskManipulatorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/DiskManipulatorBlock.java @@ -3,7 +3,6 @@ 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.CrafterTile; import com.refinedmods.refinedstorage.tile.DiskManipulatorTile; import com.refinedmods.refinedstorage.util.BlockUtils; import com.refinedmods.refinedstorage.util.NetworkUtils; @@ -13,15 +12,12 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; import net.minecraftforge.network.NetworkHooks; -import javax.annotation.Nullable; - public class DiskManipulatorBlock extends ColoredNetworkBlock { public DiskManipulatorBlock() { super(BlockUtils.DEFAULT_ROCK_PROPERTIES); @@ -34,14 +30,14 @@ public class DiskManipulatorBlock extends ColoredNetworkBlock { @Override @SuppressWarnings("deprecation") - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult rayTraceResult) { - InteractionResult result = RSBlocks.DISK_MANIPULATOR.changeBlockColor(state, player.getItemInHand(hand), world, pos, player); + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult rayTraceResult) { + InteractionResult result = RSBlocks.DISK_MANIPULATOR.changeBlockColor(state, player.getItemInHand(hand), level, pos, player); if (result != InteractionResult.PASS) { return result; } - if (!world.isClientSide) { - return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( + if (!level.isClientSide) { + return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui( (ServerPlayer) player, new PositionalTileContainerProvider( new TranslatableComponent("gui.refinedstorage.disk_manipulator"), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/ExporterBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ExporterBlock.java index 2beaa6881..ec52d731e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/ExporterBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ExporterBlock.java @@ -114,9 +114,9 @@ public class ExporterBlock extends CableBlock { @Override @SuppressWarnings("deprecation") - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { - if (!world.isClientSide && CollisionUtils.isInBounds(getLineShape(state), pos, hit.getLocation())) { - return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { + if (!level.isClientSide && CollisionUtils.isInBounds(getLineShape(state), pos, hit.getLocation())) { + return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui( (ServerPlayer) player, new PositionalTileContainerProvider( new TranslatableComponent("gui.refinedstorage.exporter"), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/ExternalStorageBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ExternalStorageBlock.java index fd6253146..789cee03c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/ExternalStorageBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ExternalStorageBlock.java @@ -7,7 +7,6 @@ import com.refinedmods.refinedstorage.block.shape.ShapeCache; import com.refinedmods.refinedstorage.container.ExternalStorageContainer; import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider; import com.refinedmods.refinedstorage.render.ConstantsCable; -import com.refinedmods.refinedstorage.tile.CrafterTile; import com.refinedmods.refinedstorage.tile.ExternalStorageTile; import com.refinedmods.refinedstorage.util.BlockUtils; import com.refinedmods.refinedstorage.util.CollisionUtils; @@ -30,8 +29,6 @@ import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.network.NetworkHooks; -import javax.annotation.Nullable; - public class ExternalStorageBlock extends CableBlock { private static final VoxelShape HEAD_NORTH = Shapes.or(box(3, 3, 0, 13, 13, 2), HOLDER_NORTH); private static final VoxelShape HEAD_EAST = Shapes.or(box(14, 3, 3, 16, 13, 13), HOLDER_EAST); @@ -97,9 +94,9 @@ public class ExternalStorageBlock extends CableBlock { @Override @SuppressWarnings("deprecation") - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { - if (!world.isClientSide && CollisionUtils.isInBounds(getHeadShape(state), pos, hit.getLocation())) { - return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { + if (!level.isClientSide && CollisionUtils.isInBounds(getHeadShape(state), pos, hit.getLocation())) { + return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui( (ServerPlayer) player, new PositionalTileContainerProvider( new TranslatableComponent("gui.refinedstorage.external_storage"), @@ -115,11 +112,11 @@ public class ExternalStorageBlock extends CableBlock { @Override @SuppressWarnings("deprecation") - public void neighborChanged(BlockState state, Level world, BlockPos pos, Block block, BlockPos fromPos, boolean isMoving) { - super.neighborChanged(state, world, pos, block, fromPos, isMoving); + public void neighborChanged(BlockState state, Level level, BlockPos pos, Block block, BlockPos fromPos, boolean isMoving) { + super.neighborChanged(state, level, pos, block, fromPos, isMoving); - if (!world.isClientSide) { - INetworkNode node = NetworkUtils.getNodeFromTile(world.getBlockEntity(pos)); + if (!level.isClientSide) { + INetworkNode node = NetworkUtils.getNodeFromTile(level.getBlockEntity(pos)); if (node instanceof ExternalStorageNetworkNode && node.getNetwork() != null && diff --git a/src/main/java/com/refinedmods/refinedstorage/block/FluidInterfaceBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/FluidInterfaceBlock.java index 046cedb83..e3a9003d7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/FluidInterfaceBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/FluidInterfaceBlock.java @@ -3,7 +3,6 @@ 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.CrafterTile; import com.refinedmods.refinedstorage.tile.FluidInterfaceTile; import com.refinedmods.refinedstorage.util.BlockUtils; import com.refinedmods.refinedstorage.util.NetworkUtils; @@ -13,15 +12,12 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; import net.minecraftforge.network.NetworkHooks; -import javax.annotation.Nullable; - public class FluidInterfaceBlock extends NetworkNodeBlock { public FluidInterfaceBlock() { super(BlockUtils.DEFAULT_ROCK_PROPERTIES); @@ -34,9 +30,9 @@ public class FluidInterfaceBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { - if (!world.isClientSide) { - return NetworkUtils.attempt(world, pos, player, () -> NetworkHooks.openGui( + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { + if (!level.isClientSide) { + return NetworkUtils.attempt(level, pos, player, () -> NetworkHooks.openGui( (ServerPlayer) player, new PositionalTileContainerProvider( new TranslatableComponent("gui.refinedstorage.fluid_interface"), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/FluidStorageBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/FluidStorageBlock.java index 42b9cca4e..191115229 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/FluidStorageBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/FluidStorageBlock.java @@ -34,9 +34,9 @@ public class FluidStorageBlock extends NetworkNodeBlock { } @Override - public void setPlacedBy(Level world, BlockPos pos, BlockState state, LivingEntity player, ItemStack stack) { - if (!world.isClientSide) { - FluidStorageNetworkNode storage = ((FluidStorageTile) world.getBlockEntity(pos)).getNode(); + public void setPlacedBy(Level level, BlockPos pos, BlockState state, LivingEntity player, ItemStack stack) { + if (!level.isClientSide) { + FluidStorageNetworkNode storage = ((FluidStorageTile) level.getBlockEntity(pos)).getNode(); if (stack.hasTag() && stack.getTag().hasUUID(FluidStorageNetworkNode.NBT_ID)) { storage.setStorageId(stack.getTag().getUUID(FluidStorageNetworkNode.NBT_ID)); @@ -46,7 +46,7 @@ public class FluidStorageBlock extends NetworkNodeBlock { } // Call this after loading the storage, so the network discovery can use the loaded storage. - super.setPlacedBy(world, pos, state, player, stack); + super.setPlacedBy(level, pos, state, player, stack); } @Override @@ -56,10 +56,10 @@ public class FluidStorageBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { - if (!world.isClientSide) { - return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui((ServerPlayer) player, new PositionalTileContainerProvider( - ((FluidStorageTile) world.getBlockEntity(pos)).getNode().getTitle(), + 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) level.getBlockEntity(pos)).getNode().getTitle(), (tile, windowId, inventory, p) -> new FluidStorageContainer(tile, player, windowId), pos ), pos)); diff --git a/src/main/java/com/refinedmods/refinedstorage/block/GridBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/GridBlock.java index dd9ce0a23..503088022 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/GridBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/GridBlock.java @@ -4,7 +4,6 @@ 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.CrafterTile; import com.refinedmods.refinedstorage.tile.grid.GridTile; import com.refinedmods.refinedstorage.util.BlockUtils; import com.refinedmods.refinedstorage.util.ColorMap; @@ -14,14 +13,11 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; -import javax.annotation.Nullable; - public class GridBlock extends ColoredNetworkBlock { private final GridType type; @@ -48,7 +44,7 @@ public class GridBlock extends ColoredNetworkBlock { @Override @SuppressWarnings("deprecation") - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { ColorMap map; switch (type) { case FLUID: @@ -67,13 +63,13 @@ public class GridBlock extends ColoredNetworkBlock { throw new IllegalStateException("Unexpected value: " + type); } - InteractionResult result = map.changeBlockColor(state, player.getItemInHand(hand), world, pos, player); + InteractionResult result = map.changeBlockColor(state, player.getItemInHand(hand), level, pos, player); if (result != InteractionResult.PASS) { return result; } - if (!world.isClientSide) { - return NetworkUtils.attemptModify(world, pos, player, () -> API.instance().getGridManager().openGrid(GridBlockGridFactory.ID, (ServerPlayer) player, pos)); + if (!level.isClientSide) { + return NetworkUtils.attemptModify(level, pos, player, () -> API.instance().getGridManager().openGrid(GridBlockGridFactory.ID, (ServerPlayer) player, pos)); } return InteractionResult.SUCCESS; diff --git a/src/main/java/com/refinedmods/refinedstorage/block/ImporterBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ImporterBlock.java index baa660301..53d816fbd 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/ImporterBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ImporterBlock.java @@ -4,7 +4,6 @@ import com.refinedmods.refinedstorage.block.shape.ShapeCache; import com.refinedmods.refinedstorage.container.ImporterContainer; import com.refinedmods.refinedstorage.container.factory.PositionalTileContainerProvider; import com.refinedmods.refinedstorage.render.ConstantsCable; -import com.refinedmods.refinedstorage.tile.CrafterTile; import com.refinedmods.refinedstorage.tile.ImporterTile; import com.refinedmods.refinedstorage.util.BlockUtils; import com.refinedmods.refinedstorage.util.CollisionUtils; @@ -26,8 +25,6 @@ import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.network.NetworkHooks; -import javax.annotation.Nullable; - public class ImporterBlock extends CableBlock { private static final VoxelShape LINE_NORTH_1 = box(6, 6, 4, 10, 10, 6); private static final VoxelShape LINE_NORTH_2 = box(5, 5, 2, 11, 11, 4); @@ -116,9 +113,9 @@ public class ImporterBlock extends CableBlock { @Override @SuppressWarnings("deprecation") - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { - if (!world.isClientSide && CollisionUtils.isInBounds(getLineShape(state), pos, hit.getLocation())) { - return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { + if (!level.isClientSide && CollisionUtils.isInBounds(getLineShape(state), pos, hit.getLocation())) { + return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui( (ServerPlayer) player, new PositionalTileContainerProvider( new TranslatableComponent("gui.refinedstorage.importer"), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/InterfaceBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/InterfaceBlock.java index 5c5081d82..5d2a4f6a1 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/InterfaceBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/InterfaceBlock.java @@ -3,7 +3,6 @@ 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.CrafterTile; import com.refinedmods.refinedstorage.tile.InterfaceTile; import com.refinedmods.refinedstorage.util.BlockUtils; import com.refinedmods.refinedstorage.util.NetworkUtils; @@ -13,15 +12,12 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; import net.minecraftforge.network.NetworkHooks; -import javax.annotation.Nullable; - public class InterfaceBlock extends NetworkNodeBlock { public InterfaceBlock() { super(BlockUtils.DEFAULT_ROCK_PROPERTIES); @@ -34,9 +30,9 @@ public class InterfaceBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { - if (!world.isClientSide) { - return NetworkUtils.attempt(world, pos, player, () -> NetworkHooks.openGui( + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { + if (!level.isClientSide) { + return NetworkUtils.attempt(level, pos, player, () -> NetworkHooks.openGui( (ServerPlayer) player, new PositionalTileContainerProvider( new TranslatableComponent("gui.refinedstorage.interface"), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/NetworkNodeBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/NetworkNodeBlock.java index 8e76fdfe8..1593457b4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/NetworkNodeBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/NetworkNodeBlock.java @@ -34,22 +34,22 @@ public abstract class NetworkNodeBlock extends BaseBlock implements EntityBlock @Override @SuppressWarnings("deprecation") - public void neighborChanged(BlockState state, Level world, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving) { - super.neighborChanged(state, world, pos, blockIn, fromPos, isMoving); + public void neighborChanged(BlockState state, Level level, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving) { + super.neighborChanged(state, level, pos, blockIn, fromPos, isMoving); - if (!world.isClientSide) { - INetworkNode node = API.instance().getNetworkNodeManager((ServerLevel) world).getNode(pos); + if (!level.isClientSide) { + INetworkNode node = API.instance().getNetworkNodeManager((ServerLevel) level).getNode(pos); if (node instanceof NetworkNode) { - ((NetworkNode) node).setRedstonePowered(world.hasNeighborSignal(pos)); + ((NetworkNode) node).setRedstonePowered(level.hasNeighborSignal(pos)); } } } @Override @SuppressWarnings("deprecation") - public void onRemove(BlockState state, Level world, BlockPos pos, BlockState newState, boolean isMoving) { + public void onRemove(BlockState state, Level level, BlockPos pos, BlockState newState, boolean isMoving) { if (state.getBlock() != newState.getBlock()) { - BlockEntity tile = world.getBlockEntity(pos); + BlockEntity tile = level.getBlockEntity(pos); if (tile instanceof NetworkNodeTile) { IItemHandler handler = ((NetworkNodeTile) tile).getNode().getDrops(); @@ -61,20 +61,20 @@ public abstract class NetworkNodeBlock extends BaseBlock implements EntityBlock drops.add(handler.getStackInSlot(i)); } - Containers.dropContents(world, pos, drops); + Containers.dropContents(level, pos, drops); } } } // Call onReplaced after the drops check so the tile still exists - super.onRemove(state, world, pos, newState, isMoving); + super.onRemove(state, level, pos, newState, isMoving); } @Override - protected void onDirectionChanged(Level world, BlockPos pos, Direction newDirection) { - super.onDirectionChanged(world, pos, newDirection); + protected void onDirectionChanged(Level level, BlockPos pos, Direction newDirection) { + super.onDirectionChanged(level, pos, newDirection); - BlockEntity tile = world.getBlockEntity(pos); + BlockEntity tile = level.getBlockEntity(pos); if (tile instanceof INetworkNodeProxy) { INetworkNode node = ((INetworkNodeProxy) tile).getNode(); diff --git a/src/main/java/com/refinedmods/refinedstorage/block/NetworkReceiverBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/NetworkReceiverBlock.java index c133e3eeb..77249cd50 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/NetworkReceiverBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/NetworkReceiverBlock.java @@ -1,21 +1,17 @@ package com.refinedmods.refinedstorage.block; import com.refinedmods.refinedstorage.RSBlocks; -import com.refinedmods.refinedstorage.tile.CrafterTile; import com.refinedmods.refinedstorage.tile.NetworkReceiverTile; import com.refinedmods.refinedstorage.util.BlockUtils; import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; -import javax.annotation.Nullable; - public class NetworkReceiverBlock extends ColoredNetworkBlock { public NetworkReceiverBlock() { super(BlockUtils.DEFAULT_ROCK_PROPERTIES); @@ -32,7 +28,8 @@ public class NetworkReceiverBlock extends ColoredNetworkBlock { } @Override - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { - return RSBlocks.NETWORK_RECEIVER.changeBlockColor(state, player.getItemInHand(hand), world, pos, player); + @SuppressWarnings("deprecation") + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { + return RSBlocks.NETWORK_RECEIVER.changeBlockColor(state, player.getItemInHand(hand), level, pos, player); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/block/NetworkTransmitterBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/NetworkTransmitterBlock.java index 2a8b54592..5f18b18bf 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/NetworkTransmitterBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/NetworkTransmitterBlock.java @@ -30,14 +30,14 @@ public class NetworkTransmitterBlock extends ColoredNetworkBlock { @Override @SuppressWarnings("deprecation") - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { - InteractionResult result = RSBlocks.NETWORK_TRANSMITTER.changeBlockColor(state, player.getItemInHand(hand), world, pos, player); + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { + InteractionResult result = RSBlocks.NETWORK_TRANSMITTER.changeBlockColor(state, player.getItemInHand(hand), level, pos, player); if (result != InteractionResult.PASS) { return result; } - if (!world.isClientSide) { - return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( + if (!level.isClientSide) { + return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui( (ServerPlayer) player, new PositionalTileContainerProvider( new TranslatableComponent("gui.refinedstorage.network_transmitter"), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/PortableGridBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/PortableGridBlock.java index 1f7482d6c..6e181c4d8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/PortableGridBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/PortableGridBlock.java @@ -83,23 +83,23 @@ public class PortableGridBlock extends BaseBlock implements EntityBlock { @Override @SuppressWarnings("deprecation") - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { - if (!world.isClientSide) { + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { + if (!level.isClientSide) { API.instance().getGridManager().openGrid(PortableGridBlockGridFactory.ID, (ServerPlayer) player, pos); - ((PortableGridTile) world.getBlockEntity(pos)).onOpened(); + ((PortableGridTile) level.getBlockEntity(pos)).onOpened(); } return InteractionResult.SUCCESS; } @Override - public void setPlacedBy(Level world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) { - super.setPlacedBy(world, pos, state, placer, stack); + public void setPlacedBy(Level level, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) { + super.setPlacedBy(level, pos, state, placer, stack); - if (!world.isClientSide) { - ((PortableGridTile) world.getBlockEntity(pos)).applyDataFromItemToTile(stack); - ((PortableGridTile) world.getBlockEntity(pos)).updateState(); + if (!level.isClientSide) { + ((PortableGridTile) level.getBlockEntity(pos)).applyDataFromItemToTile(stack); + ((PortableGridTile) level.getBlockEntity(pos)).updateState(); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/block/RelayBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/RelayBlock.java index a14fc659b..3b2829f96 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/RelayBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/RelayBlock.java @@ -3,7 +3,6 @@ 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.CrafterTile; import com.refinedmods.refinedstorage.tile.RelayTile; import com.refinedmods.refinedstorage.util.BlockUtils; import com.refinedmods.refinedstorage.util.NetworkUtils; @@ -13,15 +12,12 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; import net.minecraftforge.network.NetworkHooks; -import javax.annotation.Nullable; - public class RelayBlock extends ColoredNetworkBlock { public RelayBlock() { super(BlockUtils.DEFAULT_ROCK_PROPERTIES); @@ -34,14 +30,14 @@ public class RelayBlock extends ColoredNetworkBlock { @Override @SuppressWarnings("deprecation") - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { - InteractionResult result = RSBlocks.RELAY.changeBlockColor(state, player.getItemInHand(hand), world, pos, player); + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { + InteractionResult result = RSBlocks.RELAY.changeBlockColor(state, player.getItemInHand(hand), level, pos, player); if (result != InteractionResult.PASS) { return result; } - if (!world.isClientSide) { - return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( + if (!level.isClientSide) { + return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui( (ServerPlayer) player, new PositionalTileContainerProvider( new TranslatableComponent("gui.refinedstorage.relay"), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/SecurityManagerBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/SecurityManagerBlock.java index 152f78944..b7e5e064e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/SecurityManagerBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/SecurityManagerBlock.java @@ -31,13 +31,13 @@ public class SecurityManagerBlock extends ColoredNetworkBlock { @Override @SuppressWarnings("deprecation") - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { - InteractionResult result = RSBlocks.SECURITY_MANAGER.changeBlockColor(state, player.getItemInHand(hand), world, pos, player); + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { + InteractionResult result = RSBlocks.SECURITY_MANAGER.changeBlockColor(state, player.getItemInHand(hand), level, pos, player); if (result != InteractionResult.PASS) { return result; } - if (!world.isClientSide) { + if (!level.isClientSide) { Runnable action = () -> NetworkHooks.openGui( (ServerPlayer) player, new PositionalTileContainerProvider( @@ -48,10 +48,10 @@ public class SecurityManagerBlock extends ColoredNetworkBlock { pos ); - if (player.getGameProfile().getId().equals(((SecurityManagerTile) world.getBlockEntity(pos)).getNode().getOwner())) { + if (player.getGameProfile().getId().equals(((SecurityManagerTile) level.getBlockEntity(pos)).getNode().getOwner())) { action.run(); } else { - return NetworkUtils.attempt(world, pos, player, action, Permission.MODIFY, Permission.SECURITY); + return NetworkUtils.attempt(level, pos, player, action, Permission.MODIFY, Permission.SECURITY); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/block/StorageBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/StorageBlock.java index f919bfb6c..1adeba847 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/StorageBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/StorageBlock.java @@ -4,7 +4,6 @@ import com.refinedmods.refinedstorage.apiimpl.network.node.storage.StorageNetwor 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.CrafterTile; import com.refinedmods.refinedstorage.tile.StorageTile; import com.refinedmods.refinedstorage.util.BlockUtils; import com.refinedmods.refinedstorage.util.NetworkUtils; @@ -15,7 +14,6 @@ import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; @@ -38,9 +36,9 @@ public class StorageBlock extends NetworkNodeBlock { } @Override - public void setPlacedBy(Level world, BlockPos pos, BlockState state, @Nullable LivingEntity entity, ItemStack stack) { - if (!world.isClientSide) { - StorageNetworkNode storage = ((StorageTile) world.getBlockEntity(pos)).getNode(); + public void setPlacedBy(Level level, BlockPos pos, BlockState state, @Nullable LivingEntity entity, ItemStack stack) { + if (!level.isClientSide) { + StorageNetworkNode storage = ((StorageTile) level.getBlockEntity(pos)).getNode(); if (stack.hasTag() && stack.getTag().hasUUID(StorageNetworkNode.NBT_ID)) { storage.setStorageId(stack.getTag().getUUID(StorageNetworkNode.NBT_ID)); @@ -50,7 +48,7 @@ public class StorageBlock extends NetworkNodeBlock { } // Call this after loading the storage, so the network discovery can use the loaded storage. - super.setPlacedBy(world, pos, state, entity, stack); + super.setPlacedBy(level, pos, state, entity, stack); } @Override @@ -60,10 +58,10 @@ public class StorageBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { - if (!world.isClientSide) { - return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui((ServerPlayer) player, new PositionalTileContainerProvider( - ((StorageTile) world.getBlockEntity(pos)).getNode().getTitle(), + 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) level.getBlockEntity(pos)).getNode().getTitle(), (tile, windowId, inventory, p) -> new StorageContainer(tile, player, windowId), pos ), pos)); diff --git a/src/main/java/com/refinedmods/refinedstorage/block/StorageMonitorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/StorageMonitorBlock.java index 604ac1347..a1b318e54 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/StorageMonitorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/StorageMonitorBlock.java @@ -3,7 +3,6 @@ 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.CrafterTile; import com.refinedmods.refinedstorage.tile.StorageMonitorTile; import com.refinedmods.refinedstorage.util.BlockUtils; import com.refinedmods.refinedstorage.util.NetworkUtils; @@ -15,7 +14,6 @@ import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; @@ -23,8 +21,6 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; import net.minecraftforge.network.NetworkHooks; -import javax.annotation.Nullable; - public class StorageMonitorBlock extends NetworkNodeBlock { public StorageMonitorBlock() { super(BlockUtils.DEFAULT_ROCK_PROPERTIES); @@ -42,12 +38,12 @@ public class StorageMonitorBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { - if (!world.isClientSide) { + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) { + if (!level.isClientSide) { ItemStack held = player.containerMenu.getCarried(); if (player.isCrouching()) { - return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( + return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui( (ServerPlayer) player, new PositionalTileContainerProvider( new TranslatableComponent("gui.refinedstorage.storage_monitor"), @@ -57,7 +53,7 @@ public class StorageMonitorBlock extends NetworkNodeBlock { pos )); } else { - StorageMonitorNetworkNode storageMonitor = ((StorageMonitorTile) world.getBlockEntity(pos)).getNode(); + StorageMonitorNetworkNode storageMonitor = ((StorageMonitorTile) level.getBlockEntity(pos)).getNode(); if (!held.isEmpty()) { return storageMonitor.deposit(player, held); @@ -72,17 +68,17 @@ public class StorageMonitorBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public void attack(BlockState state, Level world, BlockPos pos, Player player) { - super.attack(state, world, pos, player); + public void attack(BlockState state, Level level, BlockPos pos, Player player) { + super.attack(state, level, pos, player); - if (!world.isClientSide) { - HitResult result = WorldUtils.rayTracePlayer(world, player); + if (!level.isClientSide) { + HitResult result = WorldUtils.rayTracePlayer(level, player); if (!(result instanceof BlockHitResult)) { return; } - ((StorageMonitorTile) world.getBlockEntity(pos)).getNode().extract(player, ((BlockHitResult) result).getDirection()); + ((StorageMonitorTile) level.getBlockEntity(pos)).getNode().extract(player, ((BlockHitResult) result).getDirection()); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/block/WirelessTransmitterBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/WirelessTransmitterBlock.java index 8e85e1fc1..7f56c236d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/WirelessTransmitterBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/WirelessTransmitterBlock.java @@ -72,14 +72,14 @@ public class WirelessTransmitterBlock extends ColoredNetworkBlock { @Override @SuppressWarnings("deprecation") - public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { - InteractionResult result = RSBlocks.WIRELESS_TRANSMITTER.changeBlockColor(state, player.getItemInHand(hand), world, pos, player); + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { + InteractionResult result = RSBlocks.WIRELESS_TRANSMITTER.changeBlockColor(state, player.getItemInHand(hand), level, pos, player); if (result != InteractionResult.PASS) { return result; } - if (!world.isClientSide) { - return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( + if (!level.isClientSide) { + return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui( (ServerPlayer) player, new PositionalTileContainerProvider( new TranslatableComponent("gui.refinedstorage.wireless_transmitter"), diff --git a/src/main/java/com/refinedmods/refinedstorage/command/network/ListNetworkCommand.java b/src/main/java/com/refinedmods/refinedstorage/command/network/ListNetworkCommand.java index 48f791f6a..5d4921018 100644 --- a/src/main/java/com/refinedmods/refinedstorage/command/network/ListNetworkCommand.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/network/ListNetworkCommand.java @@ -60,9 +60,9 @@ public class ListNetworkCommand implements Command { @Override public int run(CommandContext context) throws CommandSyntaxException { - ServerLevel world = DimensionArgument.getDimension(context, "dimension"); + ServerLevel level = DimensionArgument.getDimension(context, "dimension"); - API.instance().getNetworkManager(world) + API.instance().getNetworkManager(level) .all() .stream() .map(NetworkInList::new) diff --git a/src/main/java/com/refinedmods/refinedstorage/command/network/NetworkCommand.java b/src/main/java/com/refinedmods/refinedstorage/command/network/NetworkCommand.java index da500f6ca..2c77481dd 100644 --- a/src/main/java/com/refinedmods/refinedstorage/command/network/NetworkCommand.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/network/NetworkCommand.java @@ -15,10 +15,10 @@ import net.minecraft.server.level.ServerLevel; public abstract class NetworkCommand implements Command { @Override public int run(CommandContext context) throws CommandSyntaxException { - ServerLevel world = DimensionArgument.getDimension(context, "dimension"); + ServerLevel level = DimensionArgument.getDimension(context, "dimension"); BlockPos pos = BlockPosArgument.getLoadedBlockPos(context, "pos"); - INetwork network = API.instance().getNetworkManager(world).getNetwork(pos); + INetwork network = API.instance().getNetworkManager(level).getNetwork(pos); if (network == null) { context.getSource().sendFailure(new TranslatableComponent("commands.refinedstorage.network.get.error.not_found")); diff --git a/src/main/java/com/refinedmods/refinedstorage/command/network/NetworkPositionSuggestionProvider.java b/src/main/java/com/refinedmods/refinedstorage/command/network/NetworkPositionSuggestionProvider.java index d5a4f4103..f9fa9c744 100644 --- a/src/main/java/com/refinedmods/refinedstorage/command/network/NetworkPositionSuggestionProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/network/NetworkPositionSuggestionProvider.java @@ -15,9 +15,9 @@ import java.util.concurrent.CompletableFuture; public class NetworkPositionSuggestionProvider implements SuggestionProvider { @Override public CompletableFuture getSuggestions(CommandContext context, SuggestionsBuilder builder) throws CommandSyntaxException { - ServerLevel world = DimensionArgument.getDimension(context, "dimension"); + ServerLevel level = DimensionArgument.getDimension(context, "dimension"); - API.instance().getNetworkManager(world).all().forEach(network -> builder.suggest(network.getPosition().getX() + " " + network.getPosition().getY() + " " + network.getPosition().getZ())); + API.instance().getNetworkManager(level).all().forEach(network -> builder.suggest(network.getPosition().getX() + " " + network.getPosition().getY() + " " + network.getPosition().getZ())); return builder.buildFuture(); } diff --git a/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/AutocraftingIdSuggestionProvider.java b/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/AutocraftingIdSuggestionProvider.java index 7702c19cf..fb8eeabe6 100644 --- a/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/AutocraftingIdSuggestionProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/AutocraftingIdSuggestionProvider.java @@ -18,9 +18,9 @@ import java.util.concurrent.CompletableFuture; public class AutocraftingIdSuggestionProvider implements SuggestionProvider { @Override public CompletableFuture getSuggestions(CommandContext context, SuggestionsBuilder builder) throws CommandSyntaxException { - ServerLevel world = DimensionArgument.getDimension(context, "dimension"); + ServerLevel level = DimensionArgument.getDimension(context, "dimension"); BlockPos pos = BlockPosArgument.getLoadedBlockPos(context, "pos"); - INetwork network = API.instance().getNetworkManager(world).getNetwork(pos); + INetwork network = API.instance().getNetworkManager(level).getNetwork(pos); if (network != null) { network.getCraftingManager().getTasks().forEach(task -> builder.suggest(task.getId().toString())); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/CrafterManagerContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/CrafterManagerContainer.java index 40bf93208..8d72a1d1f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/CrafterManagerContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/CrafterManagerContainer.java @@ -116,7 +116,7 @@ public class CrafterManagerContainer extends BaseContainer { if (stack.isEmpty()) { visible = false; } else { - ICraftingPattern pattern = PatternItem.fromCache(crafterManager.getWorld(), stack); + ICraftingPattern pattern = PatternItem.fromCache(crafterManager.getLevel(), stack); visible = false; diff --git a/src/main/java/com/refinedmods/refinedstorage/container/GridContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/GridContainer.java index 05cc7c74f..ae2828d15 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/GridContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/GridContainer.java @@ -20,7 +20,6 @@ import com.refinedmods.refinedstorage.screen.IScreenInfoProvider; import com.refinedmods.refinedstorage.tile.BaseTile; import com.refinedmods.refinedstorage.tile.config.IType; import com.refinedmods.refinedstorage.tile.grid.portable.IPortableGrid; -import net.minecraft.network.protocol.game.ClientboundContainerSetContentPacket; import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; diff --git a/src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerFactory.java b/src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerFactory.java index 7894ba768..077f224e2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerFactory.java @@ -6,7 +6,7 @@ import com.refinedmods.refinedstorage.tile.CrafterManagerTile; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Inventory; -import net.minecraftforge.network.IContainerFactory; +import net.minecraftforge.network.IContainerFactory; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerProvider.java b/src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerProvider.java index bea3e93d8..ad13899f7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerProvider.java @@ -25,10 +25,10 @@ public class CrafterManagerContainerProvider implements MenuProvider { this.tile = tile; } - public static void writeToBuffer(FriendlyByteBuf buf, Level world, BlockPos pos) { + public static void writeToBuffer(FriendlyByteBuf buf, Level level, BlockPos pos) { buf.writeBlockPos(pos); - Map> containerData = ((CrafterManagerTile) world.getBlockEntity(pos)).getNode().getNetwork().getCraftingManager().getNamedContainers(); + Map> containerData = ((CrafterManagerTile) level.getBlockEntity(pos)).getNode().getNetwork().getCraftingManager().getNamedContainers(); buf.writeInt(containerData.size()); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/factory/GridContainerFactory.java b/src/main/java/com/refinedmods/refinedstorage/container/factory/GridContainerFactory.java index eb88a8b26..1fc99302a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/factory/GridContainerFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/factory/GridContainerFactory.java @@ -11,7 +11,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraftforge.network.IContainerFactory; +import net.minecraftforge.network.IContainerFactory; import org.apache.commons.lang3.tuple.Pair; public class GridContainerFactory implements IContainerFactory { diff --git a/src/main/java/com/refinedmods/refinedstorage/container/factory/PositionalTileContainerFactory.java b/src/main/java/com/refinedmods/refinedstorage/container/factory/PositionalTileContainerFactory.java index c1732b036..244b4d61c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/factory/PositionalTileContainerFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/factory/PositionalTileContainerFactory.java @@ -5,7 +5,7 @@ import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraftforge.network.IContainerFactory; +import net.minecraftforge.network.IContainerFactory; public class PositionalTileContainerFactory implements IContainerFactory { private final Factory factory; diff --git a/src/main/java/com/refinedmods/refinedstorage/container/factory/PositionalTileContainerProvider.java b/src/main/java/com/refinedmods/refinedstorage/container/factory/PositionalTileContainerProvider.java index 494c2af2b..5b2f1fb93 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/factory/PositionalTileContainerProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/factory/PositionalTileContainerProvider.java @@ -14,6 +14,7 @@ public class PositionalTileContainerProvider implements M private final Component name; private final Provider provider; private final BlockPos pos; + public PositionalTileContainerProvider(Component name, Provider provider, BlockPos pos) { this.name = name; this.provider = provider; diff --git a/src/main/java/com/refinedmods/refinedstorage/container/factory/WirelessCraftingMonitorContainerFactory.java b/src/main/java/com/refinedmods/refinedstorage/container/factory/WirelessCraftingMonitorContainerFactory.java index dcbf303f6..16b5351e8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/factory/WirelessCraftingMonitorContainerFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/factory/WirelessCraftingMonitorContainerFactory.java @@ -7,7 +7,7 @@ import com.refinedmods.refinedstorage.tile.craftingmonitor.WirelessCraftingMonit import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.item.ItemStack; -import net.minecraftforge.network.IContainerFactory; +import net.minecraftforge.network.IContainerFactory; public class WirelessCraftingMonitorContainerFactory implements IContainerFactory { @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/inventory/item/validator/PatternItemValidator.java b/src/main/java/com/refinedmods/refinedstorage/inventory/item/validator/PatternItemValidator.java index 05096c3a9..c1f61f4f9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/inventory/item/validator/PatternItemValidator.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/item/validator/PatternItemValidator.java @@ -9,17 +9,17 @@ import net.minecraft.world.level.Level; import java.util.function.Predicate; public class PatternItemValidator implements Predicate { - private final Level world; + private final Level level; - public PatternItemValidator(Level world) { - this.world = world; + public PatternItemValidator(Level level) { + this.level = level; } @Override public boolean test(ItemStack stack) { if (stack.getItem() == RSItems.PATTERN.get()) { - return PatternItem.fromCache(world, stack).isValid(); + return PatternItem.fromCache(level, stack).isValid(); } - return stack.getItem() instanceof ICraftingPatternProvider && ((ICraftingPatternProvider) stack.getItem()).create(world, stack, null).isValid(); + return stack.getItem() instanceof ICraftingPatternProvider && ((ICraftingPatternProvider) stack.getItem()).create(level, stack, null).isValid(); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/CoverItem.java b/src/main/java/com/refinedmods/refinedstorage/item/CoverItem.java index 66895d2ee..01a20dc20 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/CoverItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/CoverItem.java @@ -62,8 +62,8 @@ public class CoverItem extends Item { } @Override - public void appendHoverText(ItemStack stack, @Nullable Level worldIn, List tooltip, TooltipFlag flagIn) { - super.appendHoverText(stack, worldIn, tooltip, flagIn); + public void appendHoverText(ItemStack stack, @Nullable Level level, List tooltip, TooltipFlag flag) { + super.appendHoverText(stack, level, tooltip, flag); ItemStack item = getItem(stack); if (!item.isEmpty()) { @@ -111,23 +111,23 @@ public class CoverItem extends Item { public InteractionResult useOn(UseOnContext context) { BlockPos pos = context.getClickedPos(); Direction facing = context.getClickedFace(); - Level world = context.getLevel(); + Level level = context.getLevel(); ItemStack stack = context.getPlayer().getItemInHand(context.getHand()); - BlockEntity tile = world.getBlockEntity(pos); + BlockEntity tile = level.getBlockEntity(pos); // Support placing on the bottom side without too much hassle. - if (!canPlaceOn(world, pos, facing)) { + if (!canPlaceOn(level, pos, facing)) { pos = pos.above(); facing = Direction.DOWN; - tile = world.getBlockEntity(pos); + tile = level.getBlockEntity(pos); } - if (canPlaceOn(world, pos, facing)) { - if (world.isClientSide) { + if (canPlaceOn(level, pos, facing)) { + if (level.isClientSide) { ModelDataManager.requestModelDataRefresh(tile); return InteractionResult.SUCCESS; } @@ -143,8 +143,8 @@ public class CoverItem extends Item { if (((ICoverable) node).getCoverManager().setCover(facing, createCover(getItem(stack)))) { context.getPlayer().getItemInHand(context.getHand()).shrink(1); - WorldUtils.updateBlock(world, pos); - API.instance().getNetworkNodeManager((ServerLevel) world).markForSaving(); + WorldUtils.updateBlock(level, pos); + API.instance().getNetworkNodeManager((ServerLevel) level).markForSaving(); return InteractionResult.SUCCESS; } @@ -155,8 +155,10 @@ public class CoverItem extends Item { } - private boolean canPlaceOn(Level world, BlockPos pos, Direction facing) { - return world.getBlockEntity(pos) instanceof NetworkNodeTile && ((NetworkNodeTile) world.getBlockEntity(pos)).getNode() instanceof ICoverable && !CableBlock.hasVisualConnectionOnSide(world.getBlockState(pos), facing); + private boolean canPlaceOn(Level level, BlockPos pos, Direction facing) { + return level.getBlockEntity(pos) instanceof NetworkNodeTile + && ((NetworkNodeTile) level.getBlockEntity(pos)).getNode() instanceof ICoverable + && !CableBlock.hasVisualConnectionOnSide(level.getBlockState(pos), facing); } protected Cover createCover(ItemStack stack) { diff --git a/src/main/java/com/refinedmods/refinedstorage/item/EnergyItem.java b/src/main/java/com/refinedmods/refinedstorage/item/EnergyItem.java index 16feccdaf..6002b6370 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/EnergyItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/EnergyItem.java @@ -59,11 +59,12 @@ public abstract class EnergyItem extends Item { } @Override - public void appendHoverText(ItemStack stack, @Nullable Level world, List tooltip, TooltipFlag flag) { - super.appendHoverText(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, @Nullable Level level, List tooltip, TooltipFlag flag) { + super.appendHoverText(stack, level, tooltip, flag); if (!creative) { - stack.getCapability(CapabilityEnergy.ENERGY, null).ifPresent(energy -> tooltip.add(new TranslatableComponent("misc.refinedstorage.energy_stored", energy.getEnergyStored(), energy.getMaxEnergyStored()).setStyle(Styles.GRAY))); + stack.getCapability(CapabilityEnergy.ENERGY, null) + .ifPresent(energy -> tooltip.add(new TranslatableComponent("misc.refinedstorage.energy_stored", energy.getEnergyStored(), energy.getMaxEnergyStored()).setStyle(Styles.GRAY))); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/FilterItem.java b/src/main/java/com/refinedmods/refinedstorage/item/FilterItem.java index 2d95dd239..dbf84e26f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/FilterItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/FilterItem.java @@ -135,10 +135,10 @@ public class FilterItem extends Item { } @Override - public InteractionResultHolder use(Level world, Player player, InteractionHand hand) { + public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { ItemStack stack = player.getItemInHand(hand); - if (!world.isClientSide) { + if (!level.isClientSide) { if (player.isCrouching()) { return new InteractionResultHolder<>(InteractionResult.SUCCESS, new ItemStack(RSItems.FILTER.get())); } @@ -160,8 +160,8 @@ public class FilterItem extends Item { } @Override - public void appendHoverText(ItemStack stack, @Nullable Level world, List tooltip, TooltipFlag flag) { - super.appendHoverText(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, @Nullable Level level, List tooltip, TooltipFlag flag) { + super.appendHoverText(stack, level, tooltip, flag); tooltip.add(new TranslatableComponent("sidebutton.refinedstorage.mode." + (getMode(stack) == IFilter.MODE_WHITELIST ? "whitelist" : "blacklist")).setStyle(Styles.YELLOW)); diff --git a/src/main/java/com/refinedmods/refinedstorage/item/FluidStorageDiskItem.java b/src/main/java/com/refinedmods/refinedstorage/item/FluidStorageDiskItem.java index 61e25da2c..94bc0e8e5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/FluidStorageDiskItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/FluidStorageDiskItem.java @@ -41,22 +41,22 @@ public class FluidStorageDiskItem extends Item implements IStorageDiskProvider { } @Override - public void inventoryTick(ItemStack stack, Level world, Entity entity, int slot, boolean selected) { - super.inventoryTick(stack, world, entity, slot, selected); + public void inventoryTick(ItemStack stack, Level level, Entity entity, int slot, boolean selected) { + super.inventoryTick(stack, level, entity, slot, selected); - if (!world.isClientSide && !stack.hasTag() && entity instanceof Player) { + if (!level.isClientSide && !stack.hasTag() && entity instanceof Player) { UUID id = UUID.randomUUID(); - API.instance().getStorageDiskManager((ServerLevel) world).set(id, API.instance().createDefaultFluidDisk((ServerLevel) world, getCapacity(stack), (Player) entity)); - API.instance().getStorageDiskManager((ServerLevel) world).markForSaving(); + API.instance().getStorageDiskManager((ServerLevel) level).set(id, API.instance().createDefaultFluidDisk((ServerLevel) level, getCapacity(stack), (Player) entity)); + API.instance().getStorageDiskManager((ServerLevel) level).markForSaving(); setId(stack, id); } } @Override - public void appendHoverText(ItemStack stack, @Nullable Level world, List tooltip, TooltipFlag flag) { - super.appendHoverText(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, @Nullable Level level, List tooltip, TooltipFlag flag) { + super.appendHoverText(stack, level, tooltip, flag); if (isValid(stack)) { UUID id = getId(stack); @@ -79,21 +79,21 @@ public class FluidStorageDiskItem extends Item implements IStorageDiskProvider { } @Override - public InteractionResultHolder use(Level world, Player player, InteractionHand hand) { + public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { ItemStack diskStack = player.getItemInHand(hand); - if (!world.isClientSide && player.isCrouching() && type != FluidStorageType.CREATIVE) { - IStorageDisk disk = API.instance().getStorageDiskManager((ServerLevel) world).getByStack(diskStack); + if (!level.isClientSide && player.isCrouching() && type != FluidStorageType.CREATIVE) { + IStorageDisk disk = API.instance().getStorageDiskManager((ServerLevel) level).getByStack(diskStack); if (disk != null && disk.getStored() == 0) { ItemStack storagePart = new ItemStack(FluidStoragePartItem.getByType(type), diskStack.getCount()); if (!player.getInventory().add(storagePart.copy())) { - Containers.dropItemStack(world, player.getX(), player.getY(), player.getZ(), storagePart); + Containers.dropItemStack(level, player.getX(), player.getY(), player.getZ(), storagePart); } - API.instance().getStorageDiskManager((ServerLevel) world).remove(getId(diskStack)); - API.instance().getStorageDiskManager((ServerLevel) world).markForSaving(); + API.instance().getStorageDiskManager((ServerLevel) level).remove(getId(diskStack)); + API.instance().getStorageDiskManager((ServerLevel) level).markForSaving(); return new InteractionResultHolder<>(InteractionResult.SUCCESS, new ItemStack(RSItems.STORAGE_HOUSING.get())); } @@ -103,7 +103,7 @@ public class FluidStorageDiskItem extends Item implements IStorageDiskProvider { } @Override - public int getEntityLifespan(ItemStack stack, Level world) { + public int getEntityLifespan(ItemStack stack, Level level) { return Integer.MAX_VALUE; } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/NetworkCardItem.java b/src/main/java/com/refinedmods/refinedstorage/item/NetworkCardItem.java index fe2fabc57..a84bd90bd 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/NetworkCardItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/NetworkCardItem.java @@ -82,8 +82,8 @@ public class NetworkCardItem extends Item { } @Override - public void appendHoverText(ItemStack stack, @Nullable Level world, List tooltip, TooltipFlag flag) { - super.appendHoverText(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, @Nullable Level level, List tooltip, TooltipFlag flag) { + super.appendHoverText(stack, level, tooltip, flag); BlockPos pos = getReceiver(stack); ResourceKey type = getDimension(stack); diff --git a/src/main/java/com/refinedmods/refinedstorage/item/NetworkItem.java b/src/main/java/com/refinedmods/refinedstorage/item/NetworkItem.java index 50ca8c1b8..2b8cddbd4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/NetworkItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/NetworkItem.java @@ -74,11 +74,11 @@ public abstract class NetworkItem extends EnergyItem implements INetworkItemProv } @Override - public InteractionResultHolder use(Level world, Player player, InteractionHand hand) { + public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { ItemStack stack = player.getItemInHand(hand); - if (!world.isClientSide) { - applyNetwork(world.getServer(), stack, n -> n.getNetworkItemManager().open(player, player.getItemInHand(hand), PlayerSlot.getSlotForHand(player, hand)), err -> player.sendMessage(err, player.getUUID())); + if (!level.isClientSide) { + applyNetwork(level.getServer(), stack, n -> n.getNetworkItemManager().open(player, player.getItemInHand(hand), PlayerSlot.getSlotForHand(player, hand)), err -> player.sendMessage(err, player.getUUID())); } return InteractionResultHolder.success(stack); @@ -114,8 +114,8 @@ public abstract class NetworkItem extends EnergyItem implements INetworkItemProv } @Override - public void appendHoverText(ItemStack stack, @Nullable Level world, List tooltip, TooltipFlag flag) { - super.appendHoverText(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, @Nullable Level level, List tooltip, TooltipFlag flag) { + super.appendHoverText(stack, level, tooltip, flag); if (isValid(stack)) { tooltip.add(new TranslatableComponent("misc.refinedstorage.network_item.tooltip", getX(stack), getY(stack), getZ(stack)).setStyle(Styles.GRAY)); diff --git a/src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java b/src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java index 7d43f612b..2d1174a29 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java @@ -64,22 +64,10 @@ public class PatternItem extends Item implements ICraftingPatternProvider, IItem super(new Item.Properties().tab(RS.MAIN_GROUP)); } - @Override - public void initializeClient(Consumer consumer) { - super.initializeClient(consumer); - - consumer.accept(new IItemRenderProperties() { - @Override - public BlockEntityWithoutLevelRenderer getItemStackRenderer() { - return renderer.get(); - } - }); - } - - public static ICraftingPattern fromCache(Level world, ItemStack stack) { + public static ICraftingPattern fromCache(Level level, ItemStack stack) { ICraftingPattern pattern = CACHE.computeIfAbsent( new ItemStackKey(stack), - s -> CraftingPatternFactory.INSTANCE.create(world, null, s.getStack()) + s -> CraftingPatternFactory.INSTANCE.create(level, null, s.getStack()) ); // A number that is not too crazy but hopefully is not normally reachable, @@ -223,14 +211,26 @@ public class PatternItem extends Item implements ICraftingPatternProvider, IItem } @Override - public void appendHoverText(ItemStack stack, @Nullable Level world, List tooltip, TooltipFlag flag) { - super.appendHoverText(stack, world, tooltip, flag); + public void initializeClient(Consumer consumer) { + super.initializeClient(consumer); + + consumer.accept(new IItemRenderProperties() { + @Override + public BlockEntityWithoutLevelRenderer getItemStackRenderer() { + return renderer.get(); + } + }); + } + + @Override + public void appendHoverText(ItemStack stack, @Nullable Level level, List tooltip, TooltipFlag flag) { + super.appendHoverText(stack, level, tooltip, flag); if (!stack.hasTag()) { return; } - ICraftingPattern pattern = fromCache(world, stack); + ICraftingPattern pattern = fromCache(level, stack); if (pattern.isValid()) { if (Screen.hasShiftDown() || isProcessing(stack)) { @@ -289,8 +289,8 @@ public class PatternItem extends Item implements ICraftingPatternProvider, IItem } @Override - public InteractionResultHolder use(Level world, Player player, InteractionHand hand) { - if (!world.isClientSide && player.isCrouching()) { + public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { + if (!level.isClientSide && player.isCrouching()) { return new InteractionResultHolder<>(InteractionResult.SUCCESS, new ItemStack(RSItems.PATTERN.get(), player.getItemInHand(hand).getCount())); } @@ -299,7 +299,7 @@ public class PatternItem extends Item implements ICraftingPatternProvider, IItem @Override @Nonnull - public ICraftingPattern create(Level world, ItemStack stack, ICraftingPatternContainer container) { - return CraftingPatternFactory.INSTANCE.create(world, container, stack); + public ICraftingPattern create(Level level, ItemStack stack, ICraftingPatternContainer container) { + return CraftingPatternFactory.INSTANCE.create(level, container, stack); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/SecurityCardItem.java b/src/main/java/com/refinedmods/refinedstorage/item/SecurityCardItem.java index 9ae9eff35..93bd9db75 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/SecurityCardItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/SecurityCardItem.java @@ -60,10 +60,10 @@ public class SecurityCardItem extends Item { } @Override - public InteractionResultHolder use(Level world, Player player, InteractionHand hand) { + public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { ItemStack stack = player.getItemInHand(hand); - if (!world.isClientSide) { + if (!level.isClientSide) { stack.setTag(new CompoundTag()); stack.getTag().putString(NBT_OWNER, player.getGameProfile().getId().toString()); @@ -74,8 +74,8 @@ public class SecurityCardItem extends Item { } @Override - public void appendHoverText(ItemStack stack, @Nullable Level world, List tooltip, TooltipFlag flag) { - super.appendHoverText(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, @Nullable Level level, List tooltip, TooltipFlag flag) { + super.appendHoverText(stack, level, tooltip, flag); if (stack.hasTag() && stack.getTag().contains(NBT_OWNER_NAME)) { tooltip.add(new TranslatableComponent("item.refinedstorage.security_card.owner", stack.getTag().getString(NBT_OWNER_NAME)).setStyle(Styles.GRAY)); diff --git a/src/main/java/com/refinedmods/refinedstorage/item/StorageDiskItem.java b/src/main/java/com/refinedmods/refinedstorage/item/StorageDiskItem.java index c5ab35390..c3607d36a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/StorageDiskItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/StorageDiskItem.java @@ -41,22 +41,22 @@ public class StorageDiskItem extends Item implements IStorageDiskProvider { } @Override - public void inventoryTick(ItemStack stack, Level world, Entity entity, int slot, boolean selected) { - super.inventoryTick(stack, world, entity, slot, selected); + public void inventoryTick(ItemStack stack, Level level, Entity entity, int slot, boolean selected) { + super.inventoryTick(stack, level, entity, slot, selected); - if (!world.isClientSide && !stack.hasTag() && entity instanceof Player) { + if (!level.isClientSide && !stack.hasTag() && entity instanceof Player) { UUID id = UUID.randomUUID(); - API.instance().getStorageDiskManager((ServerLevel) world).set(id, API.instance().createDefaultItemDisk((ServerLevel) world, getCapacity(stack), (Player) entity)); - API.instance().getStorageDiskManager((ServerLevel) world).markForSaving(); + API.instance().getStorageDiskManager((ServerLevel) level).set(id, API.instance().createDefaultItemDisk((ServerLevel) level, getCapacity(stack), (Player) entity)); + API.instance().getStorageDiskManager((ServerLevel) level).markForSaving(); setId(stack, id); } } @Override - public void appendHoverText(ItemStack stack, @Nullable Level world, List tooltip, TooltipFlag flag) { - super.appendHoverText(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, @Nullable Level level, List tooltip, TooltipFlag flag) { + super.appendHoverText(stack, level, tooltip, flag); if (isValid(stack)) { UUID id = getId(stack); @@ -79,21 +79,21 @@ public class StorageDiskItem extends Item implements IStorageDiskProvider { } @Override - public InteractionResultHolder use(Level world, Player player, InteractionHand hand) { + public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { ItemStack diskStack = player.getItemInHand(hand); - if (!world.isClientSide && player.isCrouching() && type != ItemStorageType.CREATIVE) { - IStorageDisk disk = API.instance().getStorageDiskManager((ServerLevel) world).getByStack(diskStack); + if (!level.isClientSide && player.isCrouching() && type != ItemStorageType.CREATIVE) { + IStorageDisk disk = API.instance().getStorageDiskManager((ServerLevel) level).getByStack(diskStack); if (disk != null && disk.getStored() == 0) { ItemStack storagePart = new ItemStack(StoragePartItem.getByType(type), diskStack.getCount()); if (!player.getInventory().add(storagePart.copy())) { - Containers.dropItemStack(world, player.getX(), player.getY(), player.getZ(), storagePart); + Containers.dropItemStack(level, player.getX(), player.getY(), player.getZ(), storagePart); } - API.instance().getStorageDiskManager((ServerLevel) world).remove(getId(diskStack)); - API.instance().getStorageDiskManager((ServerLevel) world).markForSaving(); + API.instance().getStorageDiskManager((ServerLevel) level).remove(getId(diskStack)); + API.instance().getStorageDiskManager((ServerLevel) level).markForSaving(); return new InteractionResultHolder<>(InteractionResult.SUCCESS, new ItemStack(RSItems.STORAGE_HOUSING.get())); } @@ -103,7 +103,7 @@ public class StorageDiskItem extends Item implements IStorageDiskProvider { } @Override - public int getEntityLifespan(ItemStack stack, Level world) { + public int getEntityLifespan(ItemStack stack, Level level) { return Integer.MAX_VALUE; } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/UpgradeItem.java b/src/main/java/com/refinedmods/refinedstorage/item/UpgradeItem.java index e7e409836..4b506ab29 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/UpgradeItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/UpgradeItem.java @@ -22,8 +22,8 @@ public class UpgradeItem extends Item { } @Override - public void appendHoverText(ItemStack stack, @Nullable Level world, List tooltip, TooltipFlag flag) { - super.appendHoverText(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, @Nullable Level level, List tooltip, TooltipFlag flag) { + super.appendHoverText(stack, level, tooltip, flag); if (type.getFortuneLevel() > 0) { tooltip.add( diff --git a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/EnergyBlockItem.java b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/EnergyBlockItem.java index d969507be..117112979 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/EnergyBlockItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/EnergyBlockItem.java @@ -60,8 +60,8 @@ public abstract class EnergyBlockItem extends BaseBlockItem { } @Override - public void appendHoverText(ItemStack stack, @Nullable Level world, List tooltip, TooltipFlag flag) { - super.appendHoverText(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, @Nullable Level level, List tooltip, TooltipFlag flag) { + super.appendHoverText(stack, level, tooltip, flag); if (!creative) { stack.getCapability(CapabilityEnergy.ENERGY, null).ifPresent(energy -> tooltip.add(new TranslatableComponent("misc.refinedstorage.energy_stored", energy.getEnergyStored(), energy.getMaxEnergyStored()).setStyle(Styles.GRAY))); diff --git a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/FluidStorageBlockItem.java b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/FluidStorageBlockItem.java index b3bedb917..d42bae55c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/FluidStorageBlockItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/FluidStorageBlockItem.java @@ -41,8 +41,8 @@ public class FluidStorageBlockItem extends BaseBlockItem { } @Override - public void appendHoverText(ItemStack stack, @Nullable Level world, List tooltip, TooltipFlag flag) { - super.appendHoverText(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, @Nullable Level level, List tooltip, TooltipFlag flag) { + super.appendHoverText(stack, level, tooltip, flag); if (isValid(stack)) { UUID id = getId(stack); @@ -65,16 +65,16 @@ public class FluidStorageBlockItem extends BaseBlockItem { } @Override - public InteractionResultHolder use(Level world, Player player, InteractionHand hand) { + public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { ItemStack storageStack = player.getItemInHand(hand); - if (!world.isClientSide && player.isCrouching() && type != FluidStorageType.CREATIVE) { + if (!level.isClientSide && player.isCrouching() && type != FluidStorageType.CREATIVE) { UUID diskId = null; IStorageDisk disk = null; if (isValid(storageStack)) { diskId = getId(storageStack); - disk = API.instance().getStorageDiskManager((ServerLevel) world).get(diskId); + disk = API.instance().getStorageDiskManager((ServerLevel) level).get(diskId); } // Newly created fluid storages won't have a tag yet, so allow invalid disks as well. @@ -82,24 +82,24 @@ public class FluidStorageBlockItem extends BaseBlockItem { ItemStack fluidStoragePart = new ItemStack(FluidStoragePartItem.getByType(type)); if (!player.getInventory().add(fluidStoragePart.copy())) { - Containers.dropItemStack(world, player.getX(), player.getY(), player.getZ(), fluidStoragePart); + Containers.dropItemStack(level, player.getX(), player.getY(), player.getZ(), fluidStoragePart); } ItemStack processor = new ItemStack(RSItems.PROCESSORS.get(ProcessorItem.Type.BASIC).get()); if (!player.getInventory().add(processor.copy())) { - Containers.dropItemStack(world, player.getX(), player.getY(), player.getZ(), processor); + Containers.dropItemStack(level, player.getX(), player.getY(), player.getZ(), processor); } ItemStack bucket = new ItemStack(Items.BUCKET); if (!player.getInventory().add(bucket.copy())) { - Containers.dropItemStack(world, player.getX(), player.getY(), player.getZ(), bucket); + Containers.dropItemStack(level, player.getX(), player.getY(), player.getZ(), bucket); } if (disk != null) { - API.instance().getStorageDiskManager((ServerLevel) world).remove(diskId); - API.instance().getStorageDiskManager((ServerLevel) world).markForSaving(); + API.instance().getStorageDiskManager((ServerLevel) level).remove(diskId); + API.instance().getStorageDiskManager((ServerLevel) level).markForSaving(); } return new InteractionResultHolder<>(InteractionResult.SUCCESS, new ItemStack(RSBlocks.MACHINE_CASING.get())); @@ -110,7 +110,7 @@ public class FluidStorageBlockItem extends BaseBlockItem { } @Override - public int getEntityLifespan(ItemStack stack, Level world) { + public int getEntityLifespan(ItemStack stack, Level level) { return Integer.MAX_VALUE; } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/PortableGridBlockItem.java b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/PortableGridBlockItem.java index 3dd2aa067..35383634e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/PortableGridBlockItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/PortableGridBlockItem.java @@ -42,10 +42,10 @@ public class PortableGridBlockItem extends EnergyBlockItem { } @Override - public InteractionResultHolder use(Level world, Player player, InteractionHand hand) { + public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { ItemStack stack = player.getItemInHand(hand); - if (!world.isClientSide) { + if (!level.isClientSide) { API.instance().getGridManager().openGrid(PortableGridGridFactory.ID, (ServerPlayer) player, stack, PlayerSlot.getSlotForHand(player, hand)); } @@ -53,8 +53,8 @@ public class PortableGridBlockItem extends EnergyBlockItem { } @Override - public void appendHoverText(ItemStack stack, @Nullable Level world, List tooltip, TooltipFlag flag) { - super.appendHoverText(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, @Nullable Level level, List tooltip, TooltipFlag flag) { + super.appendHoverText(stack, level, tooltip, flag); tooltip.add(new TranslatableComponent("block.refinedstorage.portable_grid.tooltip").setStyle(Styles.GRAY)); } @@ -80,7 +80,7 @@ public class PortableGridBlockItem extends EnergyBlockItem { } @Override - public int getEntityLifespan(ItemStack stack, Level world) { + public int getEntityLifespan(ItemStack stack, Level level) { return Integer.MAX_VALUE; } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/StorageBlockItem.java b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/StorageBlockItem.java index 0a384c1a0..9d52901bb 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/StorageBlockItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/StorageBlockItem.java @@ -38,8 +38,8 @@ public class StorageBlockItem extends BaseBlockItem { } @Override - public void appendHoverText(ItemStack stack, @Nullable Level world, List tooltip, TooltipFlag flag) { - super.appendHoverText(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, @Nullable Level level, List tooltip, TooltipFlag flag) { + super.appendHoverText(stack, level, tooltip, flag); if (isValid(stack)) { UUID id = getId(stack); @@ -62,17 +62,17 @@ public class StorageBlockItem extends BaseBlockItem { } @Override - public InteractionResultHolder use(Level world, Player player, InteractionHand hand) { + public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { ItemStack storageStack = player.getItemInHand(hand); int count = storageStack.getCount(); - if (!world.isClientSide && player.isCrouching() && type != ItemStorageType.CREATIVE) { + if (!level.isClientSide && player.isCrouching() && type != ItemStorageType.CREATIVE) { UUID diskId = null; IStorageDisk disk = null; if (isValid(storageStack)) { diskId = getId(storageStack); - disk = API.instance().getStorageDiskManager((ServerLevel) world).get(diskId); + disk = API.instance().getStorageDiskManager((ServerLevel) level).get(diskId); } // Newly created storages won't have a tag yet, so allow invalid disks as well. @@ -81,12 +81,12 @@ public class StorageBlockItem extends BaseBlockItem { storagePart.setCount(count); if (!player.getInventory().add(storagePart.copy())) { - Containers.dropItemStack(world, player.getX(), player.getY(), player.getZ(), storagePart); + Containers.dropItemStack(level, player.getX(), player.getY(), player.getZ(), storagePart); } if (disk != null) { - API.instance().getStorageDiskManager((ServerLevel) world).remove(diskId); - API.instance().getStorageDiskManager((ServerLevel) world).markForSaving(); + API.instance().getStorageDiskManager((ServerLevel) level).remove(diskId); + API.instance().getStorageDiskManager((ServerLevel) level).markForSaving(); } ItemStack stack = new ItemStack(RSBlocks.MACHINE_CASING.get()); @@ -99,7 +99,7 @@ public class StorageBlockItem extends BaseBlockItem { } @Override - public int getEntityLifespan(ItemStack stack, Level world) { + public int getEntityLifespan(ItemStack stack, Level level) { return Integer.MAX_VALUE; } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/property/ControllerItemPropertyGetter.java b/src/main/java/com/refinedmods/refinedstorage/item/property/ControllerItemPropertyGetter.java index 5d9a36398..46fce94f3 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/property/ControllerItemPropertyGetter.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/property/ControllerItemPropertyGetter.java @@ -13,7 +13,7 @@ import javax.annotation.Nullable; public class ControllerItemPropertyGetter implements ItemPropertyFunction { @Override - public float call(ItemStack stack, @Nullable ClientLevel world, @Nullable LivingEntity entity, int p) { + public float call(ItemStack stack, @Nullable ClientLevel level, @Nullable LivingEntity entity, int p) { IEnergyStorage storage = stack.getCapability(CapabilityEnergy.ENERGY).orElse(null); if (storage != null) { return Network.getEnergyType(storage.getEnergyStored(), storage.getMaxEnergyStored()).ordinal(); diff --git a/src/main/java/com/refinedmods/refinedstorage/item/property/NetworkItemPropertyGetter.java b/src/main/java/com/refinedmods/refinedstorage/item/property/NetworkItemPropertyGetter.java index 7bd59efd9..8d11052c8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/property/NetworkItemPropertyGetter.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/property/NetworkItemPropertyGetter.java @@ -10,7 +10,7 @@ import javax.annotation.Nullable; public class NetworkItemPropertyGetter implements ItemPropertyFunction { @Override - public float call(ItemStack stack, @Nullable ClientLevel world, @Nullable LivingEntity entity, int p) { + public float call(ItemStack stack, @Nullable ClientLevel level, @Nullable LivingEntity entity, int p) { return entity != null && NetworkItem.isValid(stack) ? 1.0f : 0.0f; } } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/property/SecurityCardItemPropertyGetter.java b/src/main/java/com/refinedmods/refinedstorage/item/property/SecurityCardItemPropertyGetter.java index b47c19a53..5ba5ebe85 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/property/SecurityCardItemPropertyGetter.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/property/SecurityCardItemPropertyGetter.java @@ -10,7 +10,7 @@ import javax.annotation.Nullable; public class SecurityCardItemPropertyGetter implements ItemPropertyFunction { @Override - public float call(ItemStack stack, @Nullable ClientLevel world, @Nullable LivingEntity entity, int p) { + public float call(ItemStack stack, @Nullable ClientLevel level, @Nullable LivingEntity entity, int p) { return entity != null && SecurityCardItem.isValid(stack) ? 1.0f : 0.0f; } } diff --git a/src/main/java/com/refinedmods/refinedstorage/recipe/CoverRecipe.java b/src/main/java/com/refinedmods/refinedstorage/recipe/CoverRecipe.java index cd9ae132e..656731b67 100644 --- a/src/main/java/com/refinedmods/refinedstorage/recipe/CoverRecipe.java +++ b/src/main/java/com/refinedmods/refinedstorage/recipe/CoverRecipe.java @@ -58,7 +58,7 @@ public class CoverRecipe extends CustomRecipe { } @Override - public boolean matches(CraftingContainer inv, Level worldIn) { + public boolean matches(CraftingContainer inv, Level level) { List list = Lists.newArrayList(); int ingots = 0; for (int i = 0; i < inv.getContainerSize(); ++i) { diff --git a/src/main/java/com/refinedmods/refinedstorage/recipe/HollowCoverRecipe.java b/src/main/java/com/refinedmods/refinedstorage/recipe/HollowCoverRecipe.java index 7b2d52b8f..3e9a02d78 100644 --- a/src/main/java/com/refinedmods/refinedstorage/recipe/HollowCoverRecipe.java +++ b/src/main/java/com/refinedmods/refinedstorage/recipe/HollowCoverRecipe.java @@ -46,7 +46,7 @@ public class HollowCoverRecipe extends CustomRecipe { } @Override - public boolean matches(CraftingContainer inv, Level worldIn) { + public boolean matches(CraftingContainer inv, Level level) { List list = Lists.newArrayList(); for (int i = 0; i < inv.getContainerSize(); ++i) { ItemStack itemstack = inv.getItem(i); diff --git a/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java b/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java index d5019aff2..499065dc7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java +++ b/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java @@ -47,8 +47,8 @@ public class UpgradeWithEnchantedBookRecipe extends ShapedRecipe { } @Override - public boolean matches(CraftingContainer inv, Level world) { - if (super.matches(inv, world)) { + public boolean matches(CraftingContainer inv, Level level) { + if (super.matches(inv, level)) { ListTag enchantments = EnchantedBookItem.getEnchantments(inv.getItem(1)); for (int i = 0; i < enchantments.size(); ++i) { diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/BakedModelCover.java b/src/main/java/com/refinedmods/refinedstorage/render/model/BakedModelCover.java index 6818916c4..d1dcc7899 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/BakedModelCover.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/BakedModelCover.java @@ -37,6 +37,7 @@ public class BakedModelCover extends BakedModelCableCover { }); private ItemStack stack; private CoverType type; + public BakedModelCover(ItemStack stack, CoverType type) { super(null); @@ -59,7 +60,7 @@ public class BakedModelCover extends BakedModelCableCover { public ItemOverrides getOverrides() { return new ItemOverrides() { @Override - public BakedModel resolve(BakedModel originalModel, ItemStack stack, @Nullable ClientLevel world, @Nullable LivingEntity entity, int p) { + public BakedModel resolve(BakedModel originalModel, ItemStack stack, @Nullable ClientLevel level, @Nullable LivingEntity entity, int p) { return new BakedModelCover(stack, type); } }; diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/FullbrightBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/FullbrightBakedModel.java index e540211b6..506d77482 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/FullbrightBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/FullbrightBakedModel.java @@ -24,6 +24,7 @@ public class FullbrightBakedModel extends DelegateBakedModel { }); private final Set textures; private final boolean doCaching; + public FullbrightBakedModel(BakedModel base, boolean doCaching, ResourceLocation... textures) { super(base); diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/PatternBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/PatternBakedModel.java index 713cd5d9d..bb4a61790 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/PatternBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/PatternBakedModel.java @@ -36,18 +36,18 @@ public class PatternBakedModel extends DelegateBakedModel { return new ItemOverrides() { @Nullable @Override - public BakedModel resolve(BakedModel model, ItemStack stack, @Nullable ClientLevel world, @Nullable LivingEntity entity, int p) { + public BakedModel resolve(BakedModel model, ItemStack stack, @Nullable ClientLevel level, @Nullable LivingEntity entity, int p) { if (entity != null) { ICraftingPattern pattern = PatternItem.fromCache(entity.level, stack); if (canDisplayOutput(stack, pattern)) { ItemStack outputToRender = pattern.getOutputs().get(0); - return Minecraft.getInstance().getItemRenderer().getModel(outputToRender, world, entity, p); + return Minecraft.getInstance().getItemRenderer().getModel(outputToRender, level, entity, p); } } - return super.resolve(model, stack, world, entity, p); + return super.resolve(model, stack, level, entity, p); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridBakedModel.java index 615975925..43fc2ed16 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridBakedModel.java @@ -138,7 +138,7 @@ public class PortableGridBakedModel extends DelegateBakedModel { private class CustomItemOverrideList extends ItemOverrides { @Nullable @Override - public BakedModel resolve(BakedModel model, ItemStack stack, @Nullable ClientLevel world, @Nullable LivingEntity entity, int p) { + public BakedModel resolve(BakedModel model, ItemStack stack, @Nullable ClientLevel level, @Nullable LivingEntity entity, int p) { PortableGrid portableGrid = new PortableGrid(null, stack, new PlayerSlot(-1)); if (portableGrid.isGridActive()) { diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java index 30f2c821a..ea05a652d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java @@ -41,20 +41,15 @@ import java.util.stream.Collectors; public abstract class BaseScreen extends AbstractContainerScreen { public static final int Z_LEVEL_ITEMS = 100; - public static final int Z_LEVEL_TOOLTIPS = 500; public static final int Z_LEVEL_QTY = 300; private static final Map TEXTURE_CACHE = new HashMap<>(); private static final Map> ACTIONS = new HashMap<>(); private static final Component ALTERNATIVES_TEXT = new TranslatableComponent("gui.refinedstorage.alternatives"); - - private final List sideButtons = new ArrayList<>(); - - private final Logger logger = LogManager.getLogger(getClass()); - protected final Inventory inventory; - + private final List sideButtons = new ArrayList<>(); + private final Logger logger = LogManager.getLogger(getClass()); private int sideButtonY; protected BaseScreen(T container, int xSize, int ySize, Inventory inventory, Component title) { diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/CableTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/CableTile.java index a5a4d1ba7..185d3a546 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/CableTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/CableTile.java @@ -26,8 +26,8 @@ public class CableTile extends NetworkNodeTile { @Override @Nonnull - public CableNetworkNode createNode(Level world, BlockPos pos) { - return new CableNetworkNode(world, pos); + public CableNetworkNode createNode(Level level, BlockPos pos) { + return new CableNetworkNode(level, pos); } @Nonnull diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/ConstructorTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/ConstructorTile.java index b89494357..e5c206d3b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/ConstructorTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/ConstructorTile.java @@ -42,8 +42,8 @@ public class ConstructorTile extends NetworkNodeTile { @Override @Nonnull - public ConstructorNetworkNode createNode(Level world, BlockPos pos) { - return new ConstructorNetworkNode(world, pos); + public ConstructorNetworkNode createNode(Level level, BlockPos pos) { + return new ConstructorNetworkNode(level, pos); } @Nonnull diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/CrafterManagerTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/CrafterManagerTile.java index 26a248ab7..3164b1c17 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/CrafterManagerTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/CrafterManagerTile.java @@ -12,29 +12,29 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; public class CrafterManagerTile extends NetworkNodeTile { - public static final TileDataParameter SIZE = new TileDataParameter<>(EntityDataSerializers.INT, IGrid.SIZE_STRETCH, t -> t.getNode().getSize(), (t, v) -> { + public CrafterManagerTile(BlockPos pos, BlockState state) { + super(RSTiles.CRAFTER_MANAGER, pos, state); + + dataManager.addWatchedParameter(SIZE); + dataManager.addWatchedParameter(SEARCH_BOX_MODE); + } public static final TileDataParameter SIZE = new TileDataParameter<>(EntityDataSerializers.INT, IGrid.SIZE_STRETCH, t -> t.getNode().getSize(), (t, v) -> { if (IGrid.isValidSize(v)) { t.getNode().setSize(v); t.getNode().markDirty(); } }, (initial, p) -> BaseScreen.executeLater(CrafterManagerScreen.class, BaseScreen::init)); - public static final TileDataParameter SEARCH_BOX_MODE = new TileDataParameter<>(EntityDataSerializers.INT, 0, t -> t.getNode().getSearchBoxMode(), (t, v) -> { + @Override + public CrafterManagerNetworkNode createNode(Level level, BlockPos pos) { + return new CrafterManagerNetworkNode(level, pos); + } public static final TileDataParameter SEARCH_BOX_MODE = new TileDataParameter<>(EntityDataSerializers.INT, 0, t -> t.getNode().getSearchBoxMode(), (t, v) -> { if (IGrid.isValidSearchBoxMode(v)) { t.getNode().setSearchBoxMode(v); t.getNode().markDirty(); } }, (initial, p) -> BaseScreen.executeLater(CrafterManagerScreen.class, crafterManager -> crafterManager.getSearchField().setMode(p))); - public CrafterManagerTile(BlockPos pos, BlockState state) { - super(RSTiles.CRAFTER_MANAGER, pos, state); - dataManager.addWatchedParameter(SIZE); - dataManager.addWatchedParameter(SEARCH_BOX_MODE); - } - @Override - public CrafterManagerNetworkNode createNode(Level world, BlockPos pos) { - return new CrafterManagerNetworkNode(world, pos); - } + } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/CrafterTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/CrafterTile.java index 7ac3bace1..7be79ceb5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/CrafterTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/CrafterTile.java @@ -32,8 +32,8 @@ public class CrafterTile extends NetworkNodeTile { @Override @Nonnull - public CrafterNetworkNode createNode(Level world, BlockPos pos) { - return new CrafterNetworkNode(world, pos); + public CrafterNetworkNode createNode(Level level, BlockPos pos) { + return new CrafterNetworkNode(level, pos); } @Nonnull diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/DestructorTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/DestructorTile.java index 9f6fdf49d..99f49c01d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/DestructorTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/DestructorTile.java @@ -45,8 +45,8 @@ public class DestructorTile extends NetworkNodeTile { @Override @Nonnull - public DestructorNetworkNode createNode(Level world, BlockPos pos) { - return new DestructorNetworkNode(world, pos); + public DestructorNetworkNode createNode(Level level, BlockPos pos) { + return new DestructorNetworkNode(level, pos); } @Nonnull diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/DetectorTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/DetectorTile.java index 36a281ce9..15e743edd 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/DetectorTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/DetectorTile.java @@ -58,7 +58,7 @@ public class DetectorTile extends NetworkNodeTile { @Override @Nonnull - public DetectorNetworkNode createNode(Level world, BlockPos pos) { - return new DetectorNetworkNode(world, pos); + public DetectorNetworkNode createNode(Level level, BlockPos pos) { + return new DetectorNetworkNode(level, pos); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/DiskDriveTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/DiskDriveTile.java index b1e967705..5c7d3bcca 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/DiskDriveTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/DiskDriveTile.java @@ -148,7 +148,7 @@ public class DiskDriveTile extends NetworkNodeTile { @Override @Nonnull - public DiskDriveNetworkNode createNode(Level world, BlockPos pos) { - return new DiskDriveNetworkNode(world, pos); + public DiskDriveNetworkNode createNode(Level level, BlockPos pos) { + return new DiskDriveNetworkNode(level, pos); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/DiskManipulatorTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/DiskManipulatorTile.java index 5eee75b7f..c8a948fcd 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/DiskManipulatorTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/DiskManipulatorTile.java @@ -105,7 +105,7 @@ public class DiskManipulatorTile extends NetworkNodeTile { @Override @Nonnull - public ExporterNetworkNode createNode(Level world, BlockPos pos) { - return new ExporterNetworkNode(world, pos); + public ExporterNetworkNode createNode(Level level, BlockPos pos) { + return new ExporterNetworkNode(level, pos); } @Nonnull diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/ExternalStorageTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/ExternalStorageTile.java index 70c4b7f00..83169fa81 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/ExternalStorageTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/ExternalStorageTile.java @@ -72,8 +72,8 @@ public class ExternalStorageTile extends NetworkNodeTile { @Override @Nonnull - public FluidStorageNetworkNode createNode(Level world, BlockPos pos) { - return new FluidStorageNetworkNode(world, pos, type); + public FluidStorageNetworkNode createNode(Level level, BlockPos pos) { + return new FluidStorageNetworkNode(level, pos, type); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/ImporterTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/ImporterTile.java index 75438f9c3..341ff6285 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/ImporterTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/ImporterTile.java @@ -36,8 +36,8 @@ public class ImporterTile extends NetworkNodeTile { @Override @Nonnull - public ImporterNetworkNode createNode(Level world, BlockPos pos) { - return new ImporterNetworkNode(world, pos); + public ImporterNetworkNode createNode(Level level, BlockPos pos) { + return new ImporterNetworkNode(level, pos); } @Nonnull diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/InterfaceTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/InterfaceTile.java index 672e7cb11..f7b21f247 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/InterfaceTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/InterfaceTile.java @@ -39,7 +39,7 @@ public class InterfaceTile extends NetworkNodeTile { @Override @Nonnull - public InterfaceNetworkNode createNode(Level world, BlockPos pos) { - return new InterfaceNetworkNode(world, pos); + public InterfaceNetworkNode createNode(Level level, BlockPos pos) { + return new InterfaceNetworkNode(level, pos); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/NetworkNodeTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/NetworkNodeTile.java index a411953d3..fc2f1a942 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/NetworkNodeTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/NetworkNodeTile.java @@ -98,7 +98,7 @@ public abstract class NetworkNodeTile extends BaseTile im manager.markForSaving(); if (node != null && node.getNetwork() != null) { - node.getNetwork().getNodeGraph().invalidate(Action.PERFORM, node.getNetwork().getWorld(), node.getNetwork().getPosition()); + node.getNetwork().getNodeGraph().invalidate(Action.PERFORM, node.getNetwork().getLevel(), node.getNetwork().getPosition()); } } } @@ -107,7 +107,7 @@ public abstract class NetworkNodeTile extends BaseTile im return removedNode; } - public abstract N createNode(Level world, BlockPos pos); + public abstract N createNode(Level level, BlockPos pos); @Nonnull @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/NetworkReceiverTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/NetworkReceiverTile.java index afb2d8cb5..74eed4a4d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/NetworkReceiverTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/NetworkReceiverTile.java @@ -15,7 +15,7 @@ public class NetworkReceiverTile extends NetworkNodeTile { @Override @Nonnull - public RelayNetworkNode createNode(Level world, BlockPos pos) { - return new RelayNetworkNode(world, pos); + public RelayNetworkNode createNode(Level level, BlockPos pos) { + return new RelayNetworkNode(level, pos); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/SecurityManagerTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/SecurityManagerTile.java index bdffc98c0..af3990495 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/SecurityManagerTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/SecurityManagerTile.java @@ -15,7 +15,7 @@ public class SecurityManagerTile extends NetworkNodeTile { @Override @Nonnull - public StorageNetworkNode createNode(Level world, BlockPos pos) { - return new StorageNetworkNode(world, pos, type); + public StorageNetworkNode createNode(Level level, BlockPos pos) { + return new StorageNetworkNode(level, pos, type); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/WirelessTransmitterTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/WirelessTransmitterTile.java index 88bfe2d97..e6afab23b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/WirelessTransmitterTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/WirelessTransmitterTile.java @@ -21,7 +21,7 @@ public class WirelessTransmitterTile extends NetworkNodeTile { - public static final TileDataParameter, CraftingMonitorTile> TAB_SELECTED = new TileDataParameter<>(EntityDataSerializers.OPTIONAL_UUID, Optional.empty(), t -> t.getNode().getTabSelected(), (t, v) -> { + public CraftingMonitorTile(BlockPos pos, BlockState state) { + super(RSTiles.CRAFTING_MONITOR, pos, state); + + dataManager.addWatchedParameter(TAB_SELECTED); + dataManager.addWatchedParameter(TAB_PAGE); + } public static final TileDataParameter, CraftingMonitorTile> TAB_SELECTED = new TileDataParameter<>(EntityDataSerializers.OPTIONAL_UUID, Optional.empty(), t -> t.getNode().getTabSelected(), (t, v) -> { if (v.isPresent() && t.getNode().getTabSelected().isPresent() && v.get().equals(t.getNode().getTabSelected().get())) { t.getNode().setTabSelected(Optional.empty()); } else { @@ -23,23 +28,19 @@ public class CraftingMonitorTile extends NetworkNodeTile TAB_PAGE = new TileDataParameter<>(EntityDataSerializers.INT, 0, t -> t.getNode().getTabPage(), (t, v) -> { + + @Override + @Nonnull + public CraftingMonitorNetworkNode createNode(Level level, BlockPos pos) { + return new CraftingMonitorNetworkNode(level, pos); + } public static final TileDataParameter TAB_PAGE = new TileDataParameter<>(EntityDataSerializers.INT, 0, t -> t.getNode().getTabPage(), (t, v) -> { if (v >= 0) { t.getNode().setTabPage(v); t.getNode().markDirty(); } }); - public CraftingMonitorTile(BlockPos pos, BlockState state) { - super(RSTiles.CRAFTING_MONITOR, pos, state); - dataManager.addWatchedParameter(TAB_SELECTED); - dataManager.addWatchedParameter(TAB_PAGE); - } - @Override - @Nonnull - public CraftingMonitorNetworkNode createNode(Level world, BlockPos pos) { - return new CraftingMonitorNetworkNode(world, pos); - } + } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java b/src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java index 8e82b14cd..b7dc5e692 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java @@ -98,11 +98,10 @@ public class WirelessCraftingMonitor implements ICraftingMonitor { } private INetwork getNetwork() { - Level world = server.getLevel(nodeDimension); - if (world != null) { - return NetworkUtils.getNetworkFromNode(NetworkUtils.getNodeFromTile(world.getBlockEntity(nodePos))); + Level level = server.getLevel(nodeDimension); + if (level != null) { + return NetworkUtils.getNetworkFromNode(NetworkUtils.getNodeFromTile(level.getBlockEntity(nodePos))); } - return null; } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/grid/GridTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/GridTile.java index 60ca0ae2d..325316c50 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/grid/GridTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/GridTile.java @@ -33,57 +33,26 @@ public class GridTile extends NetworkNodeTile { t.getNode().setExactPattern(v); t.getNode().markDirty(); }, (initial, p) -> BaseScreen.executeLater(GridScreen.class, grid -> grid.updateExactPattern(p))); - public static final TileDataParameter VIEW_TYPE = new TileDataParameter<>(EntityDataSerializers.INT, 0, t -> t.getNode().getViewType(), (t, v) -> { + public static final TileDataParameter PROCESSING_TYPE = IType.createParameter((initial, p) -> BaseScreen.executeLater(GridScreen.class, BaseScreen::init)); public static final TileDataParameter VIEW_TYPE = new TileDataParameter<>(EntityDataSerializers.INT, 0, t -> t.getNode().getViewType(), (t, v) -> { if (IGrid.isValidViewType(v)) { t.getNode().setViewType(v); t.getNode().markDirty(); } }, (initial, p) -> trySortGrid(initial)); - public static final TileDataParameter PROCESSING_TYPE = IType.createParameter((initial, p) -> BaseScreen.executeLater(GridScreen.class, BaseScreen::init)); - public static final TileDataParameter SORTING_DIRECTION = new TileDataParameter<>(EntityDataSerializers.INT, 0, t -> t.getNode().getSortingDirection(), (t, v) -> { + public static final TileDataParameter>, GridTile> ALLOWED_ITEM_TAGS = new TileDataParameter<>(RSSerializers.LIST_OF_SET_SERIALIZER, new ArrayList<>(), t -> t.getNode().getAllowedTagList().getAllowedItemTags(), (t, v) -> t.getNode().getAllowedTagList().setAllowedItemTags(v)); + public static final TileDataParameter>, GridTile> ALLOWED_FLUID_TAGS = new TileDataParameter<>(RSSerializers.LIST_OF_SET_SERIALIZER, new ArrayList<>(), t -> t.getNode().getAllowedTagList().getAllowedFluidTags(), (t, v) -> t.getNode().getAllowedTagList().setAllowedFluidTags(v)); public static final TileDataParameter SORTING_DIRECTION = new TileDataParameter<>(EntityDataSerializers.INT, 0, t -> t.getNode().getSortingDirection(), (t, v) -> { if (IGrid.isValidSortingDirection(v)) { t.getNode().setSortingDirection(v); t.getNode().markDirty(); } }, (initial, p) -> trySortGrid(initial)); - public static final TileDataParameter>, GridTile> ALLOWED_ITEM_TAGS = new TileDataParameter<>(RSSerializers.LIST_OF_SET_SERIALIZER, new ArrayList<>(), t -> t.getNode().getAllowedTagList().getAllowedItemTags(), (t, v) -> t.getNode().getAllowedTagList().setAllowedItemTags(v)); - public static final TileDataParameter SORTING_TYPE = new TileDataParameter<>(EntityDataSerializers.INT, 0, t -> t.getNode().getSortingType(), (t, v) -> { + private final GridType type; + private final LazyOptional diskCapability = LazyOptional.of(() -> getNode().getPatterns()); public static final TileDataParameter SORTING_TYPE = new TileDataParameter<>(EntityDataSerializers.INT, 0, t -> t.getNode().getSortingType(), (t, v) -> { if (IGrid.isValidSortingType(v)) { t.getNode().setSortingType(v); t.getNode().markDirty(); } }, (initial, p) -> trySortGrid(initial)); - public static final TileDataParameter>, GridTile> ALLOWED_FLUID_TAGS = new TileDataParameter<>(RSSerializers.LIST_OF_SET_SERIALIZER, new ArrayList<>(), t -> t.getNode().getAllowedTagList().getAllowedFluidTags(), (t, v) -> t.getNode().getAllowedTagList().setAllowedFluidTags(v)); - public static final TileDataParameter SEARCH_BOX_MODE = new TileDataParameter<>(EntityDataSerializers.INT, 0, t -> t.getNode().getSearchBoxMode(), (t, v) -> { - if (IGrid.isValidSearchBoxMode(v)) { - t.getNode().setSearchBoxMode(v); - t.getNode().markDirty(); - } - }, (initial, p) -> BaseScreen.executeLater(GridScreen.class, grid -> grid.getSearchField().setMode(p))); - private final GridType type; - public static final TileDataParameter SIZE = new TileDataParameter<>(EntityDataSerializers.INT, 0, t -> t.getNode().getSize(), (t, v) -> { - if (IGrid.isValidSize(v)) { - t.getNode().setSize(v); - t.getNode().markDirty(); - } - }, (initial, p) -> BaseScreen.executeLater(GridScreen.class, grid -> grid.resize(grid.getMinecraft(), grid.width, grid.height))); - private final LazyOptional diskCapability = LazyOptional.of(() -> getNode().getPatterns()); - public static final TileDataParameter TAB_SELECTED = new TileDataParameter<>(EntityDataSerializers.INT, 0, t -> t.getNode().getTabSelected(), (t, v) -> { - t.getNode().setTabSelected(v == t.getNode().getTabSelected() ? -1 : v); - t.getNode().markDirty(); - }, (initial, p) -> BaseScreen.executeLater(GridScreen.class, grid -> grid.getView().sort())); - public static final TileDataParameter TAB_PAGE = new TileDataParameter<>(EntityDataSerializers.INT, 0, t -> t.getNode().getTabPage(), (t, v) -> { - if (v >= 0 && v <= t.getNode().getTotalTabPages()) { - t.getNode().setTabPage(v); - t.getNode().markDirty(); - } - }); - public static final TileDataParameter PROCESSING_PATTERN = new TileDataParameter<>(EntityDataSerializers.BOOLEAN, false, t -> t.getNode().isProcessingPattern(), (t, v) -> { - t.getNode().setProcessingPattern(v); - t.getNode().clearMatrix(); - t.getNode().markDirty(); - }, (initial, p) -> BaseScreen.executeLater(GridScreen.class, BaseScreen::init)); - public GridTile(GridType type, BlockPos pos, BlockState state) { super(getType(type), pos, state); @@ -103,12 +72,16 @@ public class GridTile extends NetworkNodeTile { dataManager.addParameter(ALLOWED_FLUID_TAGS); } - public static void trySortGrid(boolean initial) { if (!initial) { BaseScreen.executeLater(GridScreen.class, grid -> grid.getView().sort()); } - } + } public static final TileDataParameter SEARCH_BOX_MODE = new TileDataParameter<>(EntityDataSerializers.INT, 0, t -> t.getNode().getSearchBoxMode(), (t, v) -> { + if (IGrid.isValidSearchBoxMode(v)) { + t.getNode().setSearchBoxMode(v); + t.getNode().markDirty(); + } + }, (initial, p) -> BaseScreen.executeLater(GridScreen.class, grid -> grid.getSearchField().setMode(p))); public static BlockEntityType getType(GridType type) { switch (type) { @@ -127,9 +100,14 @@ public class GridTile extends NetworkNodeTile { @Override @Nonnull - public GridNetworkNode createNode(Level world, BlockPos pos) { - return new GridNetworkNode(world, pos, type); - } + public GridNetworkNode createNode(Level level, BlockPos pos) { + return new GridNetworkNode(level, pos, type); + } public static final TileDataParameter SIZE = new TileDataParameter<>(EntityDataSerializers.INT, 0, t -> t.getNode().getSize(), (t, v) -> { + if (IGrid.isValidSize(v)) { + t.getNode().setSize(v); + t.getNode().markDirty(); + } + }, (initial, p) -> BaseScreen.executeLater(GridScreen.class, grid -> grid.resize(grid.getMinecraft(), grid.width, grid.height))); @Nonnull @Override @@ -140,4 +118,30 @@ public class GridTile extends NetworkNodeTile { return super.getCapability(cap, direction); } + public static final TileDataParameter TAB_SELECTED = new TileDataParameter<>(EntityDataSerializers.INT, 0, t -> t.getNode().getTabSelected(), (t, v) -> { + t.getNode().setTabSelected(v == t.getNode().getTabSelected() ? -1 : v); + t.getNode().markDirty(); + }, (initial, p) -> BaseScreen.executeLater(GridScreen.class, grid -> grid.getView().sort())); + public static final TileDataParameter TAB_PAGE = new TileDataParameter<>(EntityDataSerializers.INT, 0, t -> t.getNode().getTabPage(), (t, v) -> { + if (v >= 0 && v <= t.getNode().getTotalTabPages()) { + t.getNode().setTabPage(v); + t.getNode().markDirty(); + } + }); + public static final TileDataParameter PROCESSING_PATTERN = new TileDataParameter<>(EntityDataSerializers.BOOLEAN, false, t -> t.getNode().isProcessingPattern(), (t, v) -> { + t.getNode().setProcessingPattern(v); + t.getNode().clearMatrix(); + t.getNode().markDirty(); + }, (initial, p) -> BaseScreen.executeLater(GridScreen.class, BaseScreen::init)); + + + + + + + + + + + } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessFluidGrid.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessFluidGrid.java index b9192e4ce..d6c3e4274 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessFluidGrid.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessFluidGrid.java @@ -92,11 +92,10 @@ public class WirelessFluidGrid implements INetworkAwareGrid { @Override @Nullable public INetwork getNetwork() { - Level world = server.getLevel(nodeDimension); - if (world != null) { - return NetworkUtils.getNetworkFromNode(NetworkUtils.getNodeFromTile(world.getBlockEntity(nodePos))); + Level level = server.getLevel(nodeDimension); + if (level != null) { + return NetworkUtils.getNetworkFromNode(NetworkUtils.getNodeFromTile(level.getBlockEntity(nodePos))); } - return null; } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessGrid.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessGrid.java index 743a0f210..e8b299331 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessGrid.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessGrid.java @@ -94,11 +94,10 @@ public class WirelessGrid implements INetworkAwareGrid { @Override @Nullable public INetwork getNetwork() { - Level world = server.getLevel(nodeDimension); - if (world != null) { - return NetworkUtils.getNetworkFromNode(NetworkUtils.getNodeFromTile(world.getBlockEntity(nodePos))); + Level level = server.getLevel(nodeDimension); + if (level != null) { + return NetworkUtils.getNetworkFromNode(NetworkUtils.getNodeFromTile(level.getBlockEntity(nodePos))); } - return null; } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGrid.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGrid.java index ccc256365..7d5e83b9e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGrid.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGrid.java @@ -128,6 +128,10 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer StackUtils.readItems(disk, 4, stack.getTag()); StackUtils.readItems(filter, 0, stack.getTag()); + } + + public void onOpen() { + drainEnergy(RS.SERVER_CONFIG.getPortableGrid().getOpenUsage()); } private final BaseItemHandler disk = new BaseItemHandler(1) .addValidator(new StorageDiskItemValidator()) .addListener(((handler, slot, reading) -> { @@ -166,10 +170,6 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer } })); - public void onOpen() { - drainEnergy(RS.SERVER_CONFIG.getPortableGrid().getOpenUsage()); - } - public ItemStack getStack() { return stack; } @@ -510,4 +510,6 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer } + + } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java index 728cada38..eddfe9954 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java @@ -1,128 +1,55 @@ package com.refinedmods.refinedstorage.tile.grid.portable; -import com.refinedmods.refinedstorage.RS; -import com.refinedmods.refinedstorage.RSTiles; -import com.refinedmods.refinedstorage.api.network.grid.GridType; -import com.refinedmods.refinedstorage.api.network.grid.ICraftingGridListener; import com.refinedmods.refinedstorage.api.network.grid.IGrid; -import com.refinedmods.refinedstorage.api.network.grid.IGridTab; -import com.refinedmods.refinedstorage.api.network.grid.handler.IFluidGridHandler; -import com.refinedmods.refinedstorage.api.network.grid.handler.IItemGridHandler; -import com.refinedmods.refinedstorage.api.storage.AccessType; -import com.refinedmods.refinedstorage.api.storage.StorageType; -import com.refinedmods.refinedstorage.api.storage.cache.IStorageCache; -import com.refinedmods.refinedstorage.api.storage.cache.IStorageCacheListener; -import com.refinedmods.refinedstorage.api.storage.cache.InvalidateCause; -import com.refinedmods.refinedstorage.api.storage.disk.IStorageDisk; import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskContainerContext; -import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskProvider; -import com.refinedmods.refinedstorage.api.storage.tracker.IStorageTracker; -import com.refinedmods.refinedstorage.api.util.IFilter; -import com.refinedmods.refinedstorage.api.util.IStackList; -import com.refinedmods.refinedstorage.apiimpl.API; -import com.refinedmods.refinedstorage.apiimpl.network.grid.handler.PortableFluidGridHandler; -import com.refinedmods.refinedstorage.apiimpl.network.grid.handler.PortableItemGridHandler; -import com.refinedmods.refinedstorage.apiimpl.network.node.DiskState; -import com.refinedmods.refinedstorage.apiimpl.network.node.GridNetworkNode; -import com.refinedmods.refinedstorage.apiimpl.storage.cache.PortableFluidStorageCache; -import com.refinedmods.refinedstorage.apiimpl.storage.cache.PortableItemStorageCache; -import com.refinedmods.refinedstorage.apiimpl.storage.cache.listener.PortableFluidGridStorageCacheListener; -import com.refinedmods.refinedstorage.apiimpl.storage.cache.listener.PortableItemGridStorageCacheListener; -import com.refinedmods.refinedstorage.apiimpl.storage.disk.PortableFluidStorageDisk; -import com.refinedmods.refinedstorage.apiimpl.storage.disk.PortableItemStorageDisk; -import com.refinedmods.refinedstorage.apiimpl.storage.tracker.FluidStorageTracker; -import com.refinedmods.refinedstorage.apiimpl.storage.tracker.ItemStorageTracker; -import com.refinedmods.refinedstorage.block.PortableGridBlock; -import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; -import com.refinedmods.refinedstorage.inventory.item.FilterItemHandler; -import com.refinedmods.refinedstorage.inventory.item.validator.StorageDiskItemValidator; -import com.refinedmods.refinedstorage.inventory.listener.TileInventoryListener; -import com.refinedmods.refinedstorage.item.WirelessGridItem; -import com.refinedmods.refinedstorage.item.blockitem.PortableGridBlockItem; import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.screen.grid.GridScreen; import com.refinedmods.refinedstorage.tile.BaseTile; import com.refinedmods.refinedstorage.tile.config.IRedstoneConfigurable; import com.refinedmods.refinedstorage.tile.config.RedstoneMode; -import com.refinedmods.refinedstorage.tile.data.TileDataManager; import com.refinedmods.refinedstorage.tile.data.TileDataParameter; import com.refinedmods.refinedstorage.tile.grid.GridTile; -import com.refinedmods.refinedstorage.util.StackUtils; -import com.refinedmods.refinedstorage.util.WorldUtils; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListTag; -import net.minecraft.nbt.Tag; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.network.syncher.EntityDataSerializers; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.CraftingContainer; -import net.minecraft.world.inventory.ResultContainer; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.energy.CapabilityEnergy; -import net.minecraftforge.energy.EnergyStorage; -import net.minecraftforge.energy.IEnergyStorage; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.items.IItemHandlerModifiable; -import net.minecraftforge.server.ServerLifecycleHooks; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; public class PortableGridTile extends BaseTile implements IGrid, IPortableGrid, IRedstoneConfigurable, IStorageDiskContainerContext { public static final TileDataParameter REDSTONE_MODE = RedstoneMode.createParameter(); - private static final TileDataParameter SORTING_DIRECTION = new TileDataParameter<>(EntityDataSerializers.INT, 0, PortableGridTile::getSortingDirection, (t, v) -> { + private static final String NBT_ITEM_STORAGE_TRACKER_ID = "ItemStorageTrackerId"; private static final TileDataParameter SORTING_DIRECTION = new TileDataParameter<>(EntityDataSerializers.INT, 0, PortableGridTile::getSortingDirection, (t, v) -> { if (IGrid.isValidSortingDirection(v)) { t.setSortingDirection(v); t.setChanged(); } }, (initial, p) -> GridTile.trySortGrid(initial)); - private static final TileDataParameter SORTING_TYPE = new TileDataParameter<>(EntityDataSerializers.INT, 0, PortableGridTile::getSortingType, (t, v) -> { + private static final String NBT_FLUID_STORAGE_TRACKER_ID = "FluidStorageTrackerId"; private static final TileDataParameter SORTING_TYPE = new TileDataParameter<>(EntityDataSerializers.INT, 0, PortableGridTile::getSortingType, (t, v) -> { if (IGrid.isValidSortingType(v)) { t.setSortingType(v); t.setChanged(); } }, (initial, p) -> GridTile.trySortGrid(initial)); - private static final TileDataParameter SEARCH_BOX_MODE = new TileDataParameter<>(EntityDataSerializers.INT, 0, PortableGridTile::getSearchBoxMode, (t, v) -> { + private static final String NBT_TYPE = "Type"; private static final TileDataParameter SEARCH_BOX_MODE = new TileDataParameter<>(EntityDataSerializers.INT, 0, PortableGridTile::getSearchBoxMode, (t, v) -> { if (IGrid.isValidSearchBoxMode(v)) { t.setSearchBoxMode(v); t.setChanged(); } }, (initial, p) -> BaseScreen.executeLater(GridScreen.class, grid -> grid.getSearchField().setMode(p))); - private static final TileDataParameter SIZE = new TileDataParameter<>(EntityDataSerializers.INT, 0, PortableGridTile::getSize, (t, v) -> { + private static final String NBT_ENERGY = "Energy"; private static final TileDataParameter SIZE = new TileDataParameter<>(EntityDataSerializers.INT, 0, PortableGridTile::getSize, (t, v) -> { if (IGrid.isValidSize(v)) { t.setSize(v); t.setChanged(); } }, (initial, p) -> BaseScreen.executeLater(GridScreen.class, BaseScreen::init)); - private static final TileDataParameter TAB_SELECTED = new TileDataParameter<>(EntityDataSerializers.INT, 0, PortableGridTile::getTabSelected, (t, v) -> { + private static final String NBT_ENCHANTMENTS = "Enchantments"; // @Volatile: Minecraft specific nbt key, see EnchantmentHelper private static final TileDataParameter TAB_SELECTED = new TileDataParameter<>(EntityDataSerializers.INT, 0, PortableGridTile::getTabSelected, (t, v) -> { t.setTabSelected(v == t.getTabSelected() ? -1 : v); t.setChanged(); }, (initial, p) -> BaseScreen.executeLater(GridScreen.class, grid -> grid.getView().sort())); - private static final TileDataParameter TAB_PAGE = new TileDataParameter<>(EntityDataSerializers.INT, 0, PortableGridTile::getTabPage, (t, v) -> { + private final PortableGridBlockItem.Type type; private static final TileDataParameter TAB_PAGE = new TileDataParameter<>(EntityDataSerializers.INT, 0, PortableGridTile::getTabPage, (t, v) -> { if (v >= 0 && v <= t.getTotalTabPages()) { t.setTabPage(v); t.setChanged(); } }); - - private static final String NBT_ITEM_STORAGE_TRACKER_ID = "ItemStorageTrackerId"; - private static final String NBT_FLUID_STORAGE_TRACKER_ID = "FluidStorageTrackerId"; - private static final String NBT_TYPE = "Type"; - private static final String NBT_ENERGY = "Energy"; - private static final String NBT_ENCHANTMENTS = "Enchantments"; // @Volatile: Minecraft specific nbt key, see EnchantmentHelper - - private final PortableGridBlockItem.Type type; private final List filters = new ArrayList<>(); private final List tabs = new ArrayList<>(); private final FilterItemHandler filter = (FilterItemHandler) new FilterItemHandler(filters, tabs).addListener(new TileInventoryListener(this)); @@ -145,26 +72,11 @@ public class PortableGridTile extends BaseTile implements IGrid, IPortableGrid, private PortableGridDiskState diskState = PortableGridDiskState.NONE; private boolean active; private ItemStorageTracker itemStorageTracker; - private final BaseItemHandler disk = new BaseItemHandler(1) - .addValidator(new StorageDiskItemValidator()) - .addListener(new TileInventoryListener(this)) - .addListener((handler, slot, reading) -> { - if (level != null && !level.isClientSide) { - loadStorage(); - - if (!reading) { - updateState(); - - WorldUtils.updateBlock(level, worldPosition); // Re-send grid type - } - } - }); private UUID itemStorageTrackerId; private FluidStorageTracker fluidStorageTracker; private UUID fluidStorageTrackerId; private ListTag enchants = null; private boolean loadNextTick; - public PortableGridTile(PortableGridBlockItem.Type type, BlockPos pos, BlockState state) { super(type == PortableGridBlockItem.Type.CREATIVE ? RSTiles.CREATIVE_PORTABLE_GRID : RSTiles.PORTABLE_GRID, pos, state); @@ -179,6 +91,27 @@ public class PortableGridTile extends BaseTile implements IGrid, IPortableGrid, dataManager.addWatchedParameter(TAB_PAGE); } + public static void serverTick(PortableGridTile tile) { + if (tile.loadNextTick) { + tile.active = tile.isGridActive(); + tile.diskState = tile.getDiskState(); + tile.loadNextTick = false; + } + } private final BaseItemHandler disk = new BaseItemHandler(1) + .addValidator(new StorageDiskItemValidator()) + .addListener(new TileInventoryListener(this)) + .addListener((handler, slot, reading) -> { + if (level != null && !level.isClientSide) { + loadStorage(); + + if (!reading) { + updateState(); + + WorldUtils.updateBlock(level, worldPosition); // Re-send grid type + } + } + }); + private void loadStorage() { ItemStack diskStack = getDiskInventory().getStackInSlot(0); @@ -760,11 +693,17 @@ public class PortableGridTile extends BaseTile implements IGrid, IPortableGrid, return AccessType.INSERT_EXTRACT; } - public static void serverTick(PortableGridTile tile) { - if (tile.loadNextTick) { - tile.active = tile.isGridActive(); - tile.diskState = tile.getDiskState(); - tile.loadNextTick = false; - } - } + + + + + + + + + + + + + } diff --git a/src/main/java/com/refinedmods/refinedstorage/util/ColorMap.java b/src/main/java/com/refinedmods/refinedstorage/util/ColorMap.java index f3d604037..3e2589da9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/ColorMap.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/ColorMap.java @@ -102,13 +102,13 @@ public class ColorMap> { ); } - public InteractionResult changeBlockColor(BlockState state, ItemStack heldItem, Level world, BlockPos pos, Player player) { + public InteractionResult changeBlockColor(BlockState state, ItemStack heldItem, Level level, BlockPos pos, Player player) { DyeColor color = DyeColor.getColor(heldItem); if (color == null || state.getBlock().equals(map.get(color).get())) { return InteractionResult.PASS; } - return setBlockState(getNewState((RegistryObject) map.get(color), state), heldItem, world, pos, player); + return setBlockState(getNewState((RegistryObject) map.get(color), state), heldItem, level, pos, player); } private BlockState getNewState(RegistryObject block, BlockState state) { @@ -124,9 +124,9 @@ public class ColorMap> { return newState; } - public InteractionResult setBlockState(BlockState newState, ItemStack heldItem, Level world, BlockPos pos, Player player) { - if (!world.isClientSide) { - world.setBlockAndUpdate(pos, newState); + public InteractionResult setBlockState(BlockState newState, ItemStack heldItem, Level level, BlockPos pos, Player player) { + if (!level.isClientSide) { + level.setBlockAndUpdate(pos, newState); if (((ServerPlayer) player).gameMode.getGameModeForPlayer() != GameType.CREATIVE) { heldItem.shrink(1); } diff --git a/src/main/java/com/refinedmods/refinedstorage/util/NetworkUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/NetworkUtils.java index ec9e7ca52..3f17d3053 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/NetworkUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/NetworkUtils.java @@ -42,16 +42,16 @@ public final class NetworkUtils { return null; } - public static InteractionResult attemptModify(Level world, BlockPos pos, Player player, Runnable action) { - return attempt(world, pos, player, action, Permission.MODIFY); + public static InteractionResult attemptModify(Level level, BlockPos pos, Player player, Runnable action) { + return attempt(level, pos, player, action, Permission.MODIFY); } - public static InteractionResult attempt(Level world, BlockPos pos, Player player, Runnable action, Permission... permissionsRequired) { - if (world.isClientSide) { + public static InteractionResult attempt(Level level, BlockPos pos, Player player, Runnable action, Permission... permissionsRequired) { + if (level.isClientSide) { return InteractionResult.SUCCESS; } - INetwork network = getNetworkFromNode(getNodeFromTile(world.getBlockEntity(pos))); + INetwork network = getNetworkFromNode(getNodeFromTile(level.getBlockEntity(pos))); if (network != null) { for (Permission permission : permissionsRequired) { diff --git a/src/main/java/com/refinedmods/refinedstorage/util/StackUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/StackUtils.java index 1c4aa32fe..61d881ae4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/StackUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/StackUtils.java @@ -10,6 +10,7 @@ import com.refinedmods.refinedstorage.screen.grid.stack.FluidGridStack; import com.refinedmods.refinedstorage.screen.grid.stack.ItemGridStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.Tag; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; @@ -17,7 +18,6 @@ import net.minecraft.world.Container; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; -import net.minecraft.nbt.Tag; import net.minecraftforge.fluids.FluidAttributes; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; @@ -170,12 +170,12 @@ public final class StackUtils { } @SuppressWarnings("unchecked") - public static void createStorages(ServerLevel world, ItemStack diskStack, int slot, IStorageDisk[] itemDisks, IStorageDisk[] fluidDisks, Function, IStorageDisk> itemDiskWrapper, Function, IStorageDisk> fluidDiskWrapper) { + public static void createStorages(ServerLevel level, ItemStack diskStack, int slot, IStorageDisk[] itemDisks, IStorageDisk[] fluidDisks, Function, IStorageDisk> itemDiskWrapper, Function, IStorageDisk> fluidDiskWrapper) { if (diskStack.isEmpty()) { itemDisks[slot] = null; fluidDisks[slot] = null; } else { - IStorageDisk disk = API.instance().getStorageDiskManager(world).getByStack(diskStack); + IStorageDisk disk = API.instance().getStorageDiskManager(level).getByStack(diskStack); if (disk != null) { StorageType type = ((IStorageDiskProvider) diskStack.getItem()).getType(); diff --git a/src/main/java/com/refinedmods/refinedstorage/util/WorldUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/WorldUtils.java index f8b223709..ff48b7da6 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/WorldUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/WorldUtils.java @@ -34,11 +34,11 @@ public final class WorldUtils { private WorldUtils() { } - public static void updateBlock(@Nullable Level world, BlockPos pos) { - if (world != null && world.isLoaded(pos)) { - BlockState state = world.getBlockState(pos); + public static void updateBlock(@Nullable Level level, BlockPos pos) { + if (level != null && level.isLoaded(pos)) { + BlockState state = level.getBlockState(pos); - world.sendBlockUpdated(pos, state, state, 1 | 2); + level.sendBlockUpdated(pos, state, state, 1 | 2); } } @@ -67,31 +67,31 @@ public final class WorldUtils { return null; } - public static FakePlayer getFakePlayer(ServerLevel world, @Nullable UUID owner) { + public static FakePlayer getFakePlayer(ServerLevel level, @Nullable UUID owner) { if (owner != null) { - GameProfileCache profileCache = world.getServer().getProfileCache(); + GameProfileCache profileCache = level.getServer().getProfileCache(); Optional profile = profileCache.get(owner); if (profile.isPresent()) { - return FakePlayerFactory.get(world, profile.get()); + return FakePlayerFactory.get(level, profile.get()); } } - return FakePlayerFactory.getMinecraft(world); + return FakePlayerFactory.getMinecraft(level); } public static void sendNoPermissionMessage(Player player) { player.sendMessage(new TranslatableComponent("misc.refinedstorage.security.no_permission").setStyle(Styles.RED), player.getUUID()); } - public static HitResult rayTracePlayer(Level world, Player player) { + public static HitResult rayTracePlayer(Level level, Player player) { double reachDistance = player.getAttribute(ForgeMod.REACH_DISTANCE.get()).getValue(); Vec3 base = player.getEyePosition(1.0F); Vec3 look = player.getLookAngle(); Vec3 target = base.add(look.x * reachDistance, look.y * reachDistance, look.z * reachDistance); - return world.clip(new ClipContext(base, target, ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, player)); + return level.clip(new ClipContext(base, target, ClipContext.Block.OUTLINE, ClipContext.Fluid.NONE, player)); } }