From b0200f457c5c7ddae23f74e96c0b382848bfeaa5 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Thu, 16 Jul 2020 23:53:23 +0200 Subject: [PATCH] Re-added interdimensional networks with the Network Transmitter and Network Receiver. Fixes #2605 --- CHANGELOG.md | 1 + .../apiimpl/network/node/NetworkNode.java | 1 - .../node/NetworkTransmitterNetworkNode.java | 16 ++++++---------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f05376af8..b17f25d58 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ### 1.9.2 - Fixed crash with Forge version 67 (Darkere) - Networks that are in a chunk that isn't loaded will no longer work, they will turn off. Chunkload the Controller to maintain a functioning network over long distances (Darkere/raoulvdberge) +- Re-added interdimensional networks with the Network Transmitter and Network Receiver (raoulvdberge) ### 1.9.1 - Fixed server crash (raoulvdberge) 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 a67352a26..d87654fda 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 @@ -72,7 +72,6 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { @Nonnull @Override public ItemStack getItemStack() { - // TODO This doesn't work crossdim. return new ItemStack(Item.BLOCK_TO_ITEM.get(world.getBlockState(pos).getBlock()), 1); } 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 724bf5fee..052559bb5 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 @@ -120,18 +120,14 @@ public class NetworkTransmitterNetworkNode extends NetworkNode { if (canTransmit()) { if (!isSameDimension()) { - return; - } + World dimensionWorld = world.getServer().getWorld(receiverDimension); - // TODO if (!isSameDimension()) { - // World dimensionWorld = DimensionManager.getWorld(world.getServer(), receiverDimension, true, true); - - //if (dimensionWorld != null) { - // operator.apply(dimensionWorld, receiver, null); - // } - //} else { + if (dimensionWorld != null) { + operator.apply(dimensionWorld, receiver, null); + } + } else { operator.apply(world, receiver, null); - //} + } } } }