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

Some more World -> Level renames

Browse Source
This commit is contained in:
raoulvdberge
2021-12-18 22:12:43 +01:00
parent 2785b2c149
commit 4ef36c24a6
41 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/refinedmods/refinedstorage/apiimpl/API.java
View File

@@ -245,7 +245,7 @@ public class API implements IRSAPI {
@Nonnull
public IStorageDisk<ItemStack> 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<FluidStack> 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());

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

@@ -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");

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

@@ -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";

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

@@ -91,7 +91,7 @@ public class NetworkNodeGraph implements INetworkNodeGraph {
listeners.forEach(INetworkNodeGraphListener::onChanged);
}
protected Level getWorld() {
protected Level getLevel() {
return network.getLevel();
}

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

@@ -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);
}

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

@@ -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";

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

@@ -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;
}

4
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessFluidGridNetworkItem.java
View File

@@ -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;
}

4
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessGridNetworkItem.java
View File

@@ -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;
}

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

@@ -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)

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

@@ -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

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

@@ -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);

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

@@ -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];

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

@@ -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);

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

@@ -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<World>?
// 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<Level>?
// 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.

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

@@ -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) {

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

@@ -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<String, Pair<ItemStack, Long>> 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();
}

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

@@ -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

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

@@ -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);
}
}
}));

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

@@ -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<FluidSta
if (lastState != currentState) {
lastState = currentState;
WorldUtils.updateBlock(diskManipulator.getLevel(), diskManipulator.getPos());
LevelUtils.updateBlock(diskManipulator.getLevel(), diskManipulator.getPos());
}
},
diskManipulator

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

@@ -7,7 +7,7 @@ import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskListener;
import com.refinedmods.refinedstorage.api.util.Action;
import com.refinedmods.refinedstorage.apiimpl.network.node.DiskState;
import com.refinedmods.refinedstorage.blockentity.config.IWhitelistBlacklist;
import com.refinedmods.refinedstorage.util.WorldUtils;
import com.refinedmods.refinedstorage.util.LevelUtils;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.ItemStack;
@@ -33,7 +33,7 @@ public class StorageDiskItemManipulatorWrapper implements IStorageDisk<ItemStack
if (lastState != currentState) {
lastState = currentState;
WorldUtils.updateBlock(diskManipulator.getLevel(), diskManipulator.getPos());
LevelUtils.updateBlock(diskManipulator.getLevel(), diskManipulator.getPos());
}
},
diskManipulator

4
src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskManager.java
View File

@@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskFactory;
import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskManager;
import com.refinedmods.refinedstorage.api.storage.disk.IStorageDiskProvider;
import com.refinedmods.refinedstorage.apiimpl.API;
import com.refinedmods.refinedstorage.apiimpl.util.RSWorldSavedData;
import com.refinedmods.refinedstorage.apiimpl.util.RSSavedData;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListTag;
import net.minecraft.nbt.Tag;
@@ -18,7 +18,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
public class StorageDiskManager extends RSWorldSavedData implements IStorageDiskManager {
public class StorageDiskManager extends RSSavedData implements IStorageDiskManager {
public static final String NAME = "refinedstorage_disks";
private static final String NBT_DISKS = "Disks";

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

@@ -4,7 +4,7 @@ import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStora
import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorageContext;
import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorageProvider;
import com.refinedmods.refinedstorage.blockentity.FluidInterfaceBlockEntity;
import com.refinedmods.refinedstorage.util.WorldUtils;
import com.refinedmods.refinedstorage.util.LevelUtils;
import net.minecraft.core.Direction;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraftforge.fluids.FluidStack;
@@ -14,7 +14,7 @@ import javax.annotation.Nonnull;
public class FluidExternalStorageProvider implements IExternalStorageProvider<FluidStack> {
@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<Fl
return null;
}
return WorldUtils.getFluidHandler(blockEntity, direction.getOpposite());
return LevelUtils.getFluidHandler(blockEntity, direction.getOpposite());
}, blockEntity instanceof FluidInterfaceBlockEntity);
}

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

@@ -7,7 +7,7 @@ import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStora
import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorageProvider;
import com.refinedmods.refinedstorage.blockentity.InterfaceBlockEntity;
import com.refinedmods.refinedstorage.util.NetworkUtils;
import com.refinedmods.refinedstorage.util.WorldUtils;
import com.refinedmods.refinedstorage.util.LevelUtils;
import net.minecraft.core.Direction;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.entity.BlockEntity;
@@ -23,7 +23,7 @@ public class ItemExternalStorageProvider implements IExternalStorageProvider<Ite
return false;
}
return WorldUtils.getItemHandler(blockEntity, direction.getOpposite()) != null;
return LevelUtils.getItemHandler(blockEntity, direction.getOpposite()) != null;
}
@Nonnull
@@ -34,7 +34,7 @@ public class ItemExternalStorageProvider implements IExternalStorageProvider<Ite
return null;
}
return WorldUtils.getItemHandler(blockEntity, direction.getOpposite());
return LevelUtils.getItemHandler(blockEntity, direction.getOpposite());
}, blockEntity instanceof InterfaceBlockEntity);
}

4
src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/tracker/StorageTrackerManager.java
View File

@@ -3,7 +3,7 @@ package com.refinedmods.refinedstorage.apiimpl.storage.tracker;
import com.refinedmods.refinedstorage.api.storage.StorageType;
import com.refinedmods.refinedstorage.api.storage.tracker.IStorageTracker;
import com.refinedmods.refinedstorage.api.storage.tracker.IStorageTrackerManager;
import com.refinedmods.refinedstorage.apiimpl.util.RSWorldSavedData;
import com.refinedmods.refinedstorage.apiimpl.util.RSSavedData;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListTag;
import net.minecraft.nbt.Tag;
@@ -12,7 +12,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
public class StorageTrackerManager extends RSWorldSavedData implements IStorageTrackerManager {
public class StorageTrackerManager extends RSSavedData implements IStorageTrackerManager {
public static final String NAME = "refinedstorage_tracker";
private static final String NBT_TRACKERS = "Tracker";

4
src/main/java/com/refinedmods/refinedstorage/apiimpl/util/RSWorldSavedData.java → src/main/java/com/refinedmods/refinedstorage/apiimpl/util/RSSavedData.java
View File

@@ -11,8 +11,8 @@ import java.io.File;
import java.io.IOException;
public abstract class RSWorldSavedData extends SavedData {
private final Logger LOGGER = LogManager.getLogger(RSWorldSavedData.class);
public abstract class RSSavedData extends SavedData {
private final Logger LOGGER = LogManager.getLogger(RSSavedData.class);
public abstract void load(CompoundTag nbt);

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

@@ -6,7 +6,7 @@ import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider;
import com.refinedmods.refinedstorage.blockentity.StorageMonitorBlockEntity;
import com.refinedmods.refinedstorage.util.BlockUtils;
import com.refinedmods.refinedstorage.util.NetworkUtils;
import com.refinedmods.refinedstorage.util.WorldUtils;
import com.refinedmods.refinedstorage.util.LevelUtils;
import net.minecraft.core.BlockPos;
import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.server.level.ServerPlayer;
@@ -72,7 +72,7 @@ public class StorageMonitorBlock extends NetworkNodeBlock {
super.attack(state, level, pos, player);
if (!level.isClientSide) {
HitResult result = WorldUtils.rayTracePlayer(level, player);
HitResult result = LevelUtils.rayTracePlayer(level, player);
if (!(result instanceof BlockHitResult)) {
return;

4
src/main/java/com/refinedmods/refinedstorage/blockentity/CableBlockEntity.java
View File

@@ -4,7 +4,7 @@ import com.refinedmods.refinedstorage.RSBlockEntities;
import com.refinedmods.refinedstorage.apiimpl.network.node.CableNetworkNode;
import com.refinedmods.refinedstorage.apiimpl.network.node.cover.CoverManager;
import com.refinedmods.refinedstorage.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;
@@ -53,6 +53,6 @@ public class CableBlockEntity extends NetworkNodeBlockEntity<CableNetworkNode> {
requestModelDataUpdate();
WorldUtils.updateBlock(level, worldPosition);
LevelUtils.updateBlock(level, worldPosition);
}
}

4
src/main/java/com/refinedmods/refinedstorage/blockentity/ConstructorBlockEntity.java
View File

@@ -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<ConstructorNe
requestModelDataUpdate();
WorldUtils.updateBlock(level, worldPosition);
LevelUtils.updateBlock(level, worldPosition);
}
}

4
src/main/java/com/refinedmods/refinedstorage/blockentity/DestructorBlockEntity.java
View File

@@ -7,7 +7,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.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;
@@ -72,6 +72,6 @@ public class DestructorBlockEntity extends NetworkNodeBlockEntity<DestructorNetw
requestModelDataUpdate();
WorldUtils.updateBlock(level, worldPosition);
LevelUtils.updateBlock(level, worldPosition);
}
}

4
src/main/java/com/refinedmods/refinedstorage/blockentity/DiskDriveBlockEntity.java
View File

@@ -8,7 +8,7 @@ import com.refinedmods.refinedstorage.apiimpl.network.node.diskdrive.DiskDriveNe
import com.refinedmods.refinedstorage.blockentity.config.*;
import com.refinedmods.refinedstorage.blockentity.data.RSSerializers;
import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter;
import com.refinedmods.refinedstorage.util.WorldUtils;
import com.refinedmods.refinedstorage.util.LevelUtils;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.nbt.CompoundTag;
@@ -127,7 +127,7 @@ public class DiskDriveBlockEntity extends NetworkNodeBlockEntity<DiskDriveNetwor
requestModelDataUpdate();
WorldUtils.updateBlock(level, worldPosition);
LevelUtils.updateBlock(level, worldPosition);
}
@Nonnull

4
src/main/java/com/refinedmods/refinedstorage/blockentity/DiskManipulatorBlockEntity.java
View File

@@ -7,7 +7,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.blockentity.data.BlockEntitySynchronizationParameter;
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;
@@ -84,7 +84,7 @@ public class DiskManipulatorBlockEntity extends NetworkNodeBlockEntity<DiskManip
requestModelDataUpdate();
WorldUtils.updateBlock(level, worldPosition);
LevelUtils.updateBlock(level, worldPosition);
}
@Nonnull

4
src/main/java/com/refinedmods/refinedstorage/blockentity/ExporterBlockEntity.java
View File

@@ -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;
@@ -65,6 +65,6 @@ public class ExporterBlockEntity extends NetworkNodeBlockEntity<ExporterNetworkN
requestModelDataUpdate();
WorldUtils.updateBlock(level, worldPosition);
LevelUtils.updateBlock(level, worldPosition);
}
}

4
src/main/java/com/refinedmods/refinedstorage/blockentity/ExternalStorageBlockEntity.java
View File

@@ -8,7 +8,7 @@ import com.refinedmods.refinedstorage.apiimpl.network.node.cover.CoverManager;
import com.refinedmods.refinedstorage.blockentity.config.*;
import com.refinedmods.refinedstorage.blockentity.data.RSSerializers;
import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter;
import com.refinedmods.refinedstorage.util.WorldUtils;
import com.refinedmods.refinedstorage.util.LevelUtils;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.syncher.EntityDataSerializers;
@@ -99,6 +99,6 @@ public class ExternalStorageBlockEntity extends NetworkNodeBlockEntity<ExternalS
requestModelDataUpdate();
WorldUtils.updateBlock(level, worldPosition);
LevelUtils.updateBlock(level, worldPosition);
}
}

4
src/main/java/com/refinedmods/refinedstorage/blockentity/ImporterBlockEntity.java
View File

@@ -7,7 +7,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.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;
@@ -63,6 +63,6 @@ public class ImporterBlockEntity extends NetworkNodeBlockEntity<ImporterNetworkN
requestModelDataUpdate();
WorldUtils.updateBlock(level, worldPosition);
LevelUtils.updateBlock(level, worldPosition);
}
}

4
src/main/java/com/refinedmods/refinedstorage/blockentity/grid/portable/PortableGridBlockEntity.java
View File

@@ -48,7 +48,7 @@ import com.refinedmods.refinedstorage.item.blockitem.PortableGridBlockItem;
import com.refinedmods.refinedstorage.screen.BaseScreen;
import com.refinedmods.refinedstorage.screen.grid.GridScreen;
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;
@@ -189,7 +189,7 @@ public class PortableGridBlockEntity extends BaseBlockEntity implements IGrid, I
if (!reading) {
updateState();
WorldUtils.updateBlock(level, worldPosition); // Re-send grid type
LevelUtils.updateBlock(level, worldPosition); // Re-send grid type
}
}
});

6
src/main/java/com/refinedmods/refinedstorage/item/CoverItem.java
View File

@@ -10,7 +10,7 @@ import com.refinedmods.refinedstorage.apiimpl.network.node.cover.CoverManager;
import com.refinedmods.refinedstorage.apiimpl.network.node.cover.CoverType;
import com.refinedmods.refinedstorage.block.CableBlock;
import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity;
import com.refinedmods.refinedstorage.util.WorldUtils;
import com.refinedmods.refinedstorage.util.LevelUtils;
import net.minecraft.ChatFormatting;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
@@ -135,7 +135,7 @@ public class CoverItem extends Item {
INetworkNode node = ((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;
}

6
src/main/java/com/refinedmods/refinedstorage/item/NetworkItem.java
View File

@@ -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;

4
src/main/java/com/refinedmods/refinedstorage/item/WrenchItem.java
View File

@@ -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;
}

4
src/main/java/com/refinedmods/refinedstorage/util/WorldUtils.java → src/main/java/com/refinedmods/refinedstorage/util/LevelUtils.java
View File

@@ -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) {

2
src/main/java/com/refinedmods/refinedstorage/util/NetworkUtils.java
View File

@@ -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;
}