diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/API.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/API.java index 8746f8fd0..97e8af8eb 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/API.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/API.java @@ -245,7 +245,7 @@ public class API implements IRSAPI { @Nonnull public IStorageDisk createDefaultItemDisk(ServerLevel level, int capacity, @Nullable Player owner) { if (level == null) { - throw new IllegalArgumentException("World cannot be null"); + throw new IllegalArgumentException("Level cannot be null"); } return new ItemStorageDisk(level, capacity, owner == null ? null : owner.getGameProfile().getId()); @@ -255,7 +255,7 @@ public class API implements IRSAPI { @Nonnull public IStorageDisk createDefaultFluidDisk(ServerLevel level, int capacity, @Nullable Player owner) { if (level == null) { - throw new IllegalArgumentException("World cannot be null"); + throw new IllegalArgumentException("Level cannot be null"); } return new FluidStorageDisk(level, capacity, owner == null ? null : owner.getGameProfile().getId()); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkListener.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkListener.java index 080c2b645..b3e2a81b5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkListener.java @@ -9,7 +9,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; public class NetworkListener { @SubscribeEvent - public void onWorldTick(TickEvent.WorldTickEvent e) { + public void onLevelTick(TickEvent.WorldTickEvent e) { if (!e.world.isClientSide() && e.phase == TickEvent.Phase.END) { e.world.getProfiler().push("network ticking"); 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 3bf0757bd..5342ec87e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkManager.java @@ -3,7 +3,7 @@ package com.refinedmods.refinedstorage.apiimpl.network; import com.refinedmods.refinedstorage.api.network.INetwork; import com.refinedmods.refinedstorage.api.network.INetworkManager; import com.refinedmods.refinedstorage.api.network.NetworkType; -import com.refinedmods.refinedstorage.apiimpl.util.RSWorldSavedData; +import com.refinedmods.refinedstorage.apiimpl.util.RSSavedData; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; @@ -16,7 +16,7 @@ import javax.annotation.Nullable; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -public class NetworkManager extends RSWorldSavedData implements INetworkManager { +public class NetworkManager extends RSSavedData implements INetworkManager { public static final String NAME = "refinedstorage_networks"; private static final String NBT_NETWORKS = "Networks"; 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 4af6cfc1e..8ac6f8338 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraph.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraph.java @@ -91,7 +91,7 @@ public class NetworkNodeGraph implements INetworkNodeGraph { listeners.forEach(INetworkNodeGraphListener::onChanged); } - protected Level getWorld() { + protected Level getLevel() { return network.getLevel(); } 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 640f78423..5fb43827f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeListener.java @@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.api.network.security.Permission; import com.refinedmods.refinedstorage.api.util.Action; import com.refinedmods.refinedstorage.util.NetworkUtils; import com.refinedmods.refinedstorage.util.PlayerUtils; -import com.refinedmods.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.util.LevelUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.server.level.ServerPlayer; @@ -27,7 +27,7 @@ public class NetworkNodeListener { INetworkNode node = NetworkUtils.getNodeFromBlockEntity(e.getWorld().getBlockEntity(e.getBlockSnapshot().getPos().relative(facing))); if (node != null && node.getNetwork() != null && !node.getNetwork().getSecurityManager().hasPermission(Permission.BUILD, player)) { - WorldUtils.sendNoPermissionMessage(player); + LevelUtils.sendNoPermissionMessage(player); e.setCanceled(true); @@ -63,7 +63,7 @@ public class NetworkNodeListener { INetworkNode node = NetworkUtils.getNodeFromBlockEntity(e.getWorld().getBlockEntity(e.getPos())); if (node != null && node.getNetwork() != null && !node.getNetwork().getSecurityManager().hasPermission(Permission.BUILD, e.getPlayer())) { - WorldUtils.sendNoPermissionMessage(e.getPlayer()); + LevelUtils.sendNoPermissionMessage(e.getPlayer()); e.setCanceled(true); } 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 496210f85..745fbab31 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeManager.java @@ -4,7 +4,7 @@ import com.refinedmods.refinedstorage.api.network.node.INetworkNode; import com.refinedmods.refinedstorage.api.network.node.INetworkNodeFactory; import com.refinedmods.refinedstorage.api.network.node.INetworkNodeManager; import com.refinedmods.refinedstorage.apiimpl.API; -import com.refinedmods.refinedstorage.apiimpl.util.RSWorldSavedData; +import com.refinedmods.refinedstorage.apiimpl.util.RSSavedData; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; @@ -18,7 +18,7 @@ import javax.annotation.Nullable; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; -public class NetworkNodeManager extends RSWorldSavedData implements INetworkNodeManager { +public class NetworkNodeManager extends RSSavedData implements INetworkNodeManager { public static final String NAME = "refinedstorage_nodes"; private static final String NBT_NODES = "Nodes"; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java index f8e9c8a94..28d772011 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java @@ -10,7 +10,7 @@ import com.refinedmods.refinedstorage.blockentity.craftingmonitor.WirelessCrafti import com.refinedmods.refinedstorage.container.factory.CraftingMonitorMenuProvider; import com.refinedmods.refinedstorage.inventory.player.PlayerSlot; import com.refinedmods.refinedstorage.item.WirelessCraftingMonitorItem; -import com.refinedmods.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.util.LevelUtils; import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; @@ -52,7 +52,7 @@ public class WirelessCraftingMonitorNetworkItem implements INetworkItem { if (!network.getSecurityManager().hasPermission(Permission.MODIFY, player) || !network.getSecurityManager().hasPermission(Permission.AUTOCRAFTING, player)) { - WorldUtils.sendNoPermissionMessage(player); + LevelUtils.sendNoPermissionMessage(player); return false; } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessFluidGridNetworkItem.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessFluidGridNetworkItem.java index dfae8f2cb..c25188672 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessFluidGridNetworkItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessFluidGridNetworkItem.java @@ -9,7 +9,7 @@ import com.refinedmods.refinedstorage.apiimpl.API; import com.refinedmods.refinedstorage.apiimpl.network.grid.factory.WirelessFluidGridGridFactory; import com.refinedmods.refinedstorage.inventory.player.PlayerSlot; import com.refinedmods.refinedstorage.item.WirelessFluidGridItem; -import com.refinedmods.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.util.LevelUtils; import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; @@ -49,7 +49,7 @@ public class WirelessFluidGridNetworkItem implements INetworkItem { } if (!network.getSecurityManager().hasPermission(Permission.MODIFY, player)) { - WorldUtils.sendNoPermissionMessage(player); + LevelUtils.sendNoPermissionMessage(player); return false; } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessGridNetworkItem.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessGridNetworkItem.java index 60922f91b..d3d847a7d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessGridNetworkItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessGridNetworkItem.java @@ -9,7 +9,7 @@ import com.refinedmods.refinedstorage.apiimpl.API; import com.refinedmods.refinedstorage.apiimpl.network.grid.factory.WirelessGridGridFactory; import com.refinedmods.refinedstorage.inventory.player.PlayerSlot; import com.refinedmods.refinedstorage.item.WirelessGridItem; -import com.refinedmods.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.util.LevelUtils; import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; @@ -49,7 +49,7 @@ public class WirelessGridNetworkItem implements INetworkItem { } if (!network.getSecurityManager().hasPermission(Permission.MODIFY, player)) { - WorldUtils.sendNoPermissionMessage(player); + LevelUtils.sendNoPermissionMessage(player); return false; } 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 52b8b02d8..cbd443502 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 @@ -15,7 +15,7 @@ import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInvento import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; import com.refinedmods.refinedstorage.item.UpgradeItem; import com.refinedmods.refinedstorage.util.StackUtils; -import com.refinedmods.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.util.LevelUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.PositionImpl; @@ -105,7 +105,7 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable, network.getCraftingManager().request(this, stack, FluidAttributes.BUCKET_VOLUME); } } 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); + FluidUtil.tryPlaceFluid(LevelUtils.getFakePlayer((ServerLevel) level, getOwner()), level, InteractionHand.MAIN_HAND, front, new NetworkFluidHandler(StackUtils.copy(stack, FluidAttributes.BUCKET_VOLUME)), stack); } } @@ -114,7 +114,7 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable, if (!took.isEmpty()) { BlockPlaceContext ctx = new ConstructorBlockItemUseContext( level, - WorldUtils.getFakePlayer((ServerLevel) level, getOwner()), + LevelUtils.getFakePlayer((ServerLevel) level, getOwner()), InteractionHand.MAIN_HAND, took, new BlockHitResult(Vec3.ZERO, getDirection(), pos, false) 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 2c37791ac..362eeb700 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 @@ -13,7 +13,7 @@ import com.refinedmods.refinedstorage.inventory.item.validator.PatternItemValida import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; import com.refinedmods.refinedstorage.item.UpgradeItem; import com.refinedmods.refinedstorage.util.StackUtils; -import com.refinedmods.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.util.LevelUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -260,7 +260,7 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC return null; } - return WorldUtils.getItemHandler(proxy.getFacingBlockEntity(), proxy.getDirection().getOpposite()); + return LevelUtils.getItemHandler(proxy.getFacingBlockEntity(), proxy.getDirection().getOpposite()); } @Nullable @@ -271,7 +271,7 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC return null; } - return WorldUtils.getFluidHandler(proxy.getFacingBlockEntity(), proxy.getDirection().getOpposite()); + return LevelUtils.getFluidHandler(proxy.getFacingBlockEntity(), proxy.getDirection().getOpposite()); } @Override 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 f87972eb3..9facb3b6c 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 @@ -16,7 +16,7 @@ import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInvento import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; import com.refinedmods.refinedstorage.item.UpgradeItem; import com.refinedmods.refinedstorage.util.StackUtils; -import com.refinedmods.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.util.LevelUtils; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; @@ -122,7 +122,7 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I new BlockHitResult(Vec3.ZERO, getDirection().getOpposite(), front, false), level, front, - WorldUtils.getFakePlayer((ServerLevel) level, getOwner()) + LevelUtils.getFakePlayer((ServerLevel) level, getOwner()) ); if (!frontStack.isEmpty() && @@ -133,7 +133,7 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I (ServerLevel) level, front, level.getBlockEntity(front), - WorldUtils.getFakePlayer((ServerLevel) level, getOwner()), + LevelUtils.getFakePlayer((ServerLevel) level, getOwner()), tool ); @@ -143,10 +143,10 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I } } - BlockEvent.BreakEvent e = new BlockEvent.BreakEvent(level, front, frontBlockState, WorldUtils.getFakePlayer((ServerLevel) level, getOwner())); + BlockEvent.BreakEvent e = new BlockEvent.BreakEvent(level, front, frontBlockState, LevelUtils.getFakePlayer((ServerLevel) level, getOwner())); if (!MinecraftForge.EVENT_BUS.post(e)) { - frontBlock.playerWillDestroy(level, front, frontBlockState, WorldUtils.getFakePlayer((ServerLevel) level, getOwner())); + frontBlock.playerWillDestroy(level, front, frontBlockState, LevelUtils.getFakePlayer((ServerLevel) level, getOwner())); level.removeBlock(front, false); 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 583228454..be793264f 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 @@ -16,7 +16,7 @@ import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInvento import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; import com.refinedmods.refinedstorage.item.UpgradeItem; import com.refinedmods.refinedstorage.util.StackUtils; -import com.refinedmods.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.util.LevelUtils; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; @@ -87,7 +87,7 @@ public class ExporterNetworkNode extends NetworkNode implements IComparable, ITy if (canUpdate() && ticks % upgrades.getSpeed() == 0 && level.isLoaded(pos)) { if (type == IType.ITEMS) { - IItemHandler handler = WorldUtils.getItemHandler(getFacingBlockEntity(), getDirection().getOpposite()); + IItemHandler handler = LevelUtils.getItemHandler(getFacingBlockEntity(), getDirection().getOpposite()); if (handler != null) { while (filterSlot + 1 < itemFilters.getSlots() && itemFilters.getStackInSlot(filterSlot).isEmpty()) { @@ -167,7 +167,7 @@ public class ExporterNetworkNode extends NetworkNode implements IComparable, ITy filterSlot = 0; } - IFluidHandler handler = WorldUtils.getFluidHandler(getFacingBlockEntity(), getDirection().getOpposite()); + IFluidHandler handler = LevelUtils.getFluidHandler(getFacingBlockEntity(), getDirection().getOpposite()); if (handler != null) { FluidStack stack = fluids[filterSlot]; 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 68012c32f..c607165da 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 @@ -17,7 +17,7 @@ import com.refinedmods.refinedstorage.blockentity.config.IComparable; import com.refinedmods.refinedstorage.blockentity.config.IType; import com.refinedmods.refinedstorage.blockentity.config.IWhitelistBlacklist; import com.refinedmods.refinedstorage.util.StackUtils; -import com.refinedmods.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.util.LevelUtils; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; @@ -68,7 +68,7 @@ public class ImporterNetworkNode extends NetworkNode implements IComparable, IWh if (type == IType.ITEMS) { BlockEntity facing = getFacingBlockEntity(); - IItemHandler handler = WorldUtils.getItemHandler(facing, getDirection().getOpposite()); + IItemHandler handler = LevelUtils.getItemHandler(facing, getDirection().getOpposite()); if (facing instanceof DiskDriveBlockEntity || handler == null) { return; @@ -100,7 +100,7 @@ public class ImporterNetworkNode extends NetworkNode implements IComparable, IWh } } } else if (type == IType.FLUIDS && ticks % upgrades.getSpeed() == 0) { - IFluidHandler handler = WorldUtils.getFluidHandler(getFacingBlockEntity(), getDirection().getOpposite()); + IFluidHandler handler = LevelUtils.getFluidHandler(getFacingBlockEntity(), getDirection().getOpposite()); if (handler != null) { FluidStack stack = handler.drain(FluidAttributes.BUCKET_VOLUME, IFluidHandler.FluidAction.SIMULATE); 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 8263d20de..5de1057ff 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 @@ -36,8 +36,8 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { // However, due to the memory footprint of worlds and modded minecraft having the tendency to have lots of worlds, // Forge is planning to unload (aka remove) worlds so their instances will change. // This is problematic as this attribute will target the wrong world in that case. - // Idea: possibly change to a getter based on RegistryKey? - // Another note: this attribute isn't the *real* problem. Because network nodes are in WorldSavedData in a tick handler, + // Idea: possibly change to a getter based on RegistryKey? + // Another note: this attribute isn't the *real* problem. Because network nodes are in SavedData in a tick handler, // 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. 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 5a3a0c02d..e3eda5f7f 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 @@ -114,10 +114,10 @@ public class NetworkTransmitterNetworkNode extends NetworkNode { if (canTransmit()) { if (!isSameDimension()) { - Level dimensionWorld = level.getServer().getLevel(receiverDimension); + Level dimensionLevel = level.getServer().getLevel(receiverDimension); - if (dimensionWorld != null && dimensionWorld.getBlockEntity(receiver) instanceof NetworkReceiverBlockEntity) { - operator.apply(dimensionWorld, receiver, null); + if (dimensionLevel != null && dimensionLevel.getBlockEntity(receiver) instanceof NetworkReceiverBlockEntity) { + operator.apply(dimensionLevel, receiver, null); } } else { if (level.getBlockEntity(receiver) instanceof NetworkReceiverBlockEntity) { 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 47d3cc573..02d1eb06e 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 @@ -14,7 +14,7 @@ import com.refinedmods.refinedstorage.blockentity.config.IType; import com.refinedmods.refinedstorage.blockentity.config.RedstoneMode; import com.refinedmods.refinedstorage.util.NetworkUtils; import com.refinedmods.refinedstorage.util.StackUtils; -import com.refinedmods.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.util.LevelUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -46,14 +46,14 @@ public class StorageMonitorNetworkNode extends NetworkNode implements IComparabl .addListener(new NetworkNodeInventoryListener(this)) .addListener((handler, slot, reading) -> { if (!reading) { - WorldUtils.updateBlock(level, pos); + LevelUtils.updateBlock(level, pos); } }); private final FluidInventory fluidFilter = new FluidInventory(1, FluidAttributes.BUCKET_VOLUME) .addListener((handler, slot, reading) -> { if (!reading) { - WorldUtils.updateBlock(level, pos); + LevelUtils.updateBlock(level, pos); } }); private final Map> deposits = new HashMap<>(); @@ -82,7 +82,7 @@ public class StorageMonitorNetworkNode extends NetworkNode implements IComparabl } else if (oldAmount != newAmount) { oldAmount = newAmount; - WorldUtils.updateBlock(level, pos); + LevelUtils.updateBlock(level, pos); } } @@ -249,7 +249,7 @@ public class StorageMonitorNetworkNode extends NetworkNode implements IComparabl public void setCompare(int compare) { this.compare = compare; - WorldUtils.updateBlock(level, pos); + LevelUtils.updateBlock(level, pos); markDirty(); } @@ -325,7 +325,7 @@ public class StorageMonitorNetworkNode extends NetworkNode implements IComparabl public void setType(int type) { this.type = type; - WorldUtils.updateBlock(level, pos); + LevelUtils.updateBlock(level, pos); markDirty(); } 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 6a545fa15..87871e0e0 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 @@ -23,7 +23,7 @@ import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInvento import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; import com.refinedmods.refinedstorage.util.AccessTypeUtils; import com.refinedmods.refinedstorage.util.StackUtils; -import com.refinedmods.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.util.LevelUtils; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; @@ -75,7 +75,7 @@ public class DiskDriveNetworkNode extends NetworkNode implements IStorageProvide } if (!reading) { - WorldUtils.updateBlock(level, pos); + LevelUtils.updateBlock(level, pos); } } }); @@ -125,7 +125,7 @@ public class DiskDriveNetworkNode extends NetworkNode implements IStorageProvide ++ticksSinceBlockUpdateRequested; if (ticksSinceBlockUpdateRequested > DISK_STATE_UPDATE_THROTTLE) { - WorldUtils.updateBlock(level, pos); + LevelUtils.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(level, pos); + LevelUtils.updateBlock(level, pos); } @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 7b5a9582f..2a9fcfee4 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 @@ -22,7 +22,7 @@ import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInvento import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener; import com.refinedmods.refinedstorage.item.UpgradeItem; import com.refinedmods.refinedstorage.util.StackUtils; -import com.refinedmods.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.util.LevelUtils; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; @@ -68,7 +68,7 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab ); if (!reading) { - WorldUtils.updateBlock(level, pos); + LevelUtils.updateBlock(level, pos); } } }); @@ -88,7 +88,7 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab ); if (!reading) { - WorldUtils.updateBlock(level, pos); + LevelUtils.updateBlock(level, pos); } } })); 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 44f6f8dd5..51a62d027 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 @@ -8,7 +8,7 @@ import com.refinedmods.refinedstorage.api.util.Action; import com.refinedmods.refinedstorage.apiimpl.network.node.DiskState; import com.refinedmods.refinedstorage.blockentity.config.IWhitelistBlacklist; import com.refinedmods.refinedstorage.util.StackUtils; -import com.refinedmods.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.util.LevelUtils; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.fluids.FluidStack; @@ -33,7 +33,7 @@ public class StorageDiskFluidManipulatorWrapper implements IStorageDisk { @Override public boolean canProvide(BlockEntity blockEntity, Direction direction) { - return WorldUtils.getFluidHandler(blockEntity, direction.getOpposite()) != null; + return LevelUtils.getFluidHandler(blockEntity, direction.getOpposite()) != null; } @Nonnull @@ -25,7 +25,7 @@ public class FluidExternalStorageProvider implements IExternalStorageProvider { requestModelDataUpdate(); - WorldUtils.updateBlock(level, worldPosition); + LevelUtils.updateBlock(level, worldPosition); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/blockentity/ConstructorBlockEntity.java b/src/main/java/com/refinedmods/refinedstorage/blockentity/ConstructorBlockEntity.java index 95b4d012c..5e383b4e5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/blockentity/ConstructorBlockEntity.java +++ b/src/main/java/com/refinedmods/refinedstorage/blockentity/ConstructorBlockEntity.java @@ -6,7 +6,7 @@ import com.refinedmods.refinedstorage.apiimpl.network.node.cover.CoverManager; import com.refinedmods.refinedstorage.blockentity.config.IComparable; import com.refinedmods.refinedstorage.blockentity.config.IType; import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter; -import com.refinedmods.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.util.LevelUtils; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataSerializers; @@ -69,6 +69,6 @@ public class ConstructorBlockEntity extends NetworkNodeBlockEntity) blockEntity).getNode(); if (node.getNetwork() != null && !node.getNetwork().getSecurityManager().hasPermission(Permission.BUILD, context.getPlayer())) { - WorldUtils.sendNoPermissionMessage(context.getPlayer()); + LevelUtils.sendNoPermissionMessage(context.getPlayer()); return InteractionResult.FAIL; } @@ -143,7 +143,7 @@ public class CoverItem extends Item { if (((ICoverable) node).getCoverManager().setCover(facing, createCover(getItem(stack)))) { context.getPlayer().getItemInHand(context.getHand()).shrink(1); - WorldUtils.updateBlock(level, pos); + LevelUtils.updateBlock(level, pos); API.instance().getNetworkNodeManager((ServerLevel) level).markForSaving(); return InteractionResult.SUCCESS; } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/NetworkItem.java b/src/main/java/com/refinedmods/refinedstorage/item/NetworkItem.java index c1e0062c5..68e5c769c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/NetworkItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/NetworkItem.java @@ -98,13 +98,13 @@ public abstract class NetworkItem extends EnergyItem implements INetworkItemProv return; } - Level nodeWorld = server.getLevel(dimension); - if (nodeWorld == null) { + Level nodeLevel = server.getLevel(dimension); + if (nodeLevel == null) { onError.accept(notFound); return; } - INetwork network = NetworkUtils.getNetworkFromNode(NetworkUtils.getNodeFromBlockEntity(nodeWorld.getBlockEntity(new BlockPos(getX(stack), getY(stack), getZ(stack))))); + INetwork network = NetworkUtils.getNetworkFromNode(NetworkUtils.getNodeFromBlockEntity(nodeLevel.getBlockEntity(new BlockPos(getX(stack), getY(stack), getZ(stack))))); if (network == null) { onError.accept(notFound); return; diff --git a/src/main/java/com/refinedmods/refinedstorage/item/WrenchItem.java b/src/main/java/com/refinedmods/refinedstorage/item/WrenchItem.java index 40321dd1d..9cf0dbca9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/WrenchItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/WrenchItem.java @@ -7,7 +7,7 @@ import com.refinedmods.refinedstorage.api.network.node.INetworkNode; import com.refinedmods.refinedstorage.api.network.security.Permission; import com.refinedmods.refinedstorage.apiimpl.network.node.cover.Cover; import com.refinedmods.refinedstorage.util.NetworkUtils; -import com.refinedmods.refinedstorage.util.WorldUtils; +import com.refinedmods.refinedstorage.util.LevelUtils; import net.minecraft.world.InteractionResult; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; @@ -30,7 +30,7 @@ public class WrenchItem extends Item { INetworkNode node = NetworkUtils.getNodeFromBlockEntity(ctx.getLevel().getBlockEntity(ctx.getClickedPos())); INetwork network = NetworkUtils.getNetworkFromNode(node); if (network != null && !network.getSecurityManager().hasPermission(Permission.BUILD, ctx.getPlayer())) { - WorldUtils.sendNoPermissionMessage(ctx.getPlayer()); + LevelUtils.sendNoPermissionMessage(ctx.getPlayer()); return InteractionResult.FAIL; } diff --git a/src/main/java/com/refinedmods/refinedstorage/util/WorldUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/LevelUtils.java similarity index 98% rename from src/main/java/com/refinedmods/refinedstorage/util/WorldUtils.java rename to src/main/java/com/refinedmods/refinedstorage/util/LevelUtils.java index e58a319b5..d28c95b80 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/WorldUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/LevelUtils.java @@ -30,8 +30,8 @@ import javax.annotation.Nullable; import java.util.Optional; import java.util.UUID; -public final class WorldUtils { - private WorldUtils() { +public final class LevelUtils { + private LevelUtils() { } public static void updateBlock(@Nullable Level level, BlockPos pos) { diff --git a/src/main/java/com/refinedmods/refinedstorage/util/NetworkUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/NetworkUtils.java index 2e2874c0f..452f19f63 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/NetworkUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/NetworkUtils.java @@ -56,7 +56,7 @@ public final class NetworkUtils { if (network != null) { for (Permission permission : permissionsRequired) { if (!network.getSecurityManager().hasPermission(permission, player)) { - WorldUtils.sendNoPermissionMessage(player); + LevelUtils.sendNoPermissionMessage(player); return InteractionResult.SUCCESS; }