Skip to content

Commit d7c3c02

Browse files
committed
1 parent 879ebc9 commit d7c3c02

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

src/main/java/blusunrize/immersiveengineering/common/gui/FluidSorterMenu.java

+5-10
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,20 @@
88

99
package blusunrize.immersiveengineering.common.gui;
1010

11-
import blusunrize.immersiveengineering.ImmersiveEngineering;
1211
import blusunrize.immersiveengineering.api.utils.DirectionUtils;
1312
import blusunrize.immersiveengineering.common.blocks.wooden.FluidSorterBlockEntity;
1413
import blusunrize.immersiveengineering.common.gui.sync.GenericContainerData;
1514
import blusunrize.immersiveengineering.common.gui.sync.GenericDataSerializers;
1615
import blusunrize.immersiveengineering.common.gui.sync.GetterAndSetter;
17-
import net.minecraft.client.Minecraft;
1816
import net.minecraft.nbt.CompoundTag;
1917
import net.minecraft.nbt.Tag;
20-
import net.minecraft.server.MinecraftServer;
2118
import net.minecraft.world.entity.player.Inventory;
2219
import net.minecraft.world.entity.player.Player;
2320
import net.minecraft.world.inventory.MenuType;
2421
import net.minecraft.world.inventory.Slot;
2522
import net.minecraft.world.item.ItemStack;
26-
import net.neoforged.fml.LogicalSide;
27-
import net.neoforged.neoforge.common.util.LogicalSidedProvider;
2823
import net.neoforged.neoforge.fluids.FluidStack;
24+
import net.neoforged.neoforge.server.ServerLifecycleHooks;
2925

3026
import javax.annotation.Nonnull;
3127
import java.util.Arrays;
@@ -89,11 +85,10 @@ public void receiveMessageFromScreen(CompoundTag message)
8985
{
9086
int side = message.getInt("filter_side");
9187
int slot = message.getInt("filter_slot");
92-
FluidStack newFilter = FluidStack.parseOptional(
93-
((MinecraftServer)LogicalSidedProvider.WORKQUEUE.get(LogicalSide.SERVER)).overworld()
94-
.registryAccess(),
95-
message.getCompound("filter")
96-
);
88+
var currentServer = ServerLifecycleHooks.getCurrentServer();
89+
if(null == currentServer) return;
90+
var registryAccess = currentServer.overworld().registryAccess();
91+
FluidStack newFilter = FluidStack.parseOptional(registryAccess, message.getCompound("filter"));
9792
if(!newFilter.isEmpty())
9893
newFilter.setAmount(1); // Not strictly necessary, but also doesn't hurt
9994
this.filters.get(side).get(slot).set(newFilter);

0 commit comments

Comments
 (0)