Replace mana network with chunk search for lookups of closest pool/spreader

TheRealWormbo · TheRealWormbo · commit 1fb36c497122 · 2025-10-26T10:38:07.000+01:00
The concept of the "mana network" has been stripped down to only maintain a clientside collection of spreaders for the client display tick logic.
diff --git a/Fabric/src/main/java/vazkii/botania/fabric/FabricCommonInitializer.java b/Fabric/src/main/java/vazkii/botania/fabric/FabricCommonInitializer.java
@@ -422,7 +422,6 @@ private void registerCommands(CommandDispatcher<CommandSourceStack> dispatcher,
 	}
 
 	private void serverStopping(MinecraftServer server) {
-		ManaNetworkHandler.instance.clear();
 		CorporeaIndexBlockEntity.clearIndexCache();
 	}
 
diff --git a/NeoForge/src/main/java/vazkii/botania/neoforge/ForgeCommonInitializer.java b/NeoForge/src/main/java/vazkii/botania/neoforge/ForgeCommonInitializer.java
@@ -656,7 +656,6 @@ private void registerCommands(CommandDispatcher<CommandSourceStack> dispatcher,
 	}
 
 	private void serverStopping(MinecraftServer server) {
-		ManaNetworkHandler.instance.clear();
 		CorporeaIndexBlockEntity.clearIndexCache();
 	}
 
diff --git a/Xplat/src/main/java/vazkii/botania/api/block_entity/BindableSpecialFlowerBlockEntity.java b/Xplat/src/main/java/vazkii/botania/api/block_entity/BindableSpecialFlowerBlockEntity.java
@@ -21,21 +21,27 @@
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.chunk.LevelChunk;
 
 import org.jetbrains.annotations.Nullable;
 
 import vazkii.botania.api.BotaniaAPIClient;
 import vazkii.botania.api.block.Bound;
 import vazkii.botania.api.block.WandBindable;
 import vazkii.botania.api.block.WandHUD;
+import vazkii.botania.api.mana.ManaReceiver;
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.common.helper.MathHelper;
 import vazkii.botania.common.item.BotaniaItems;
+import vazkii.botania.xplat.XplatAbstractions;
 
+import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -76,7 +82,44 @@ public void attemptAutoBinding() {
 	/**
 	 * Returns the BlockPos of the nearest target within the binding radius, or `null` if there aren't any.
 	 */
-	public abstract @Nullable BlockPos findClosestTarget();
+	@Nullable
+	public BlockPos findClosestTarget() {
+		return getClosestManaReceiver(bindClass, getLevel(), getBlockPos(), getBindingRadius());
+	}
+
+	@Nullable
+	protected BlockPos getClosestManaReceiver(Class<T> receiverType, Level level, BlockPos center, int rangeLimit) {
+		long minDist = Long.MAX_VALUE;
+		long limitSquared = (long) rangeLimit * rangeLimit;
+		BlockPos closestPos = null;
+
+		// TODO: if we get around to doing data fixers, using POIs for this would be even more efficient
+		List<ChunkPos> chunkPosList = ChunkPos.rangeClosed(
+				new ChunkPos(center.offset(-rangeLimit, 0, -rangeLimit)),
+				new ChunkPos(center.offset(rangeLimit, 0, rangeLimit))
+		).toList();
+
+		for (ChunkPos chunkPos : chunkPosList) {
+			LevelChunk chunk = level.getChunkSource().getChunkNow(chunkPos.x, chunkPos.z);
+			if (chunk != null) {
+				for (Map.Entry<BlockPos, BlockEntity> entry : chunk.getBlockEntities().entrySet()) {
+					BlockPos pos = entry.getKey();
+					long dist = MathHelper.distSqr(center, pos);
+					if (dist > minDist || dist > limitSquared) {
+						continue;
+					}
+					BlockEntity be = entry.getValue();
+					ManaReceiver manaReceiver = XplatAbstractions.instance().findManaReceiver(be);
+					if (receiverType.isInstance(manaReceiver)) {
+						minDist = dist;
+						closestPos = pos;
+					}
+				}
+			}
+		}
+
+		return closestPos;
+	}
 
 	@Override
 	protected void tickFlower() {
diff --git a/Xplat/src/main/java/vazkii/botania/api/block_entity/FunctionalFlowerBlockEntity.java b/Xplat/src/main/java/vazkii/botania/api/block_entity/FunctionalFlowerBlockEntity.java
@@ -18,10 +18,7 @@
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 
-import org.jetbrains.annotations.Nullable;
-
 import vazkii.botania.api.BotaniaAPI;
-import vazkii.botania.api.internal.ManaNetwork;
 import vazkii.botania.api.mana.ManaPool;
 
 import static vazkii.botania.api.BotaniaAPI.botaniaRL;
@@ -64,14 +61,6 @@ public int getBindingRadius() {
 		return LINK_RANGE;
 	}
 
-	@Nullable
-	@Override
-	public BlockPos findClosestTarget() {
-		ManaNetwork network = BotaniaAPI.instance().getManaNetworkInstance();
-		var closestPool = network.getClosestPool(getBlockPos(), getLevel(), getBindingRadius());
-		return closestPool == null ? null : closestPool.getManaReceiverPos();
-	}
-
 	public void drawManaFromPool() {
 		ManaPool pool = findBoundTile();
 		if (pool != null) {
diff --git a/Xplat/src/main/java/vazkii/botania/api/block_entity/GeneratingFlowerBlockEntity.java b/Xplat/src/main/java/vazkii/botania/api/block_entity/GeneratingFlowerBlockEntity.java
@@ -21,7 +21,6 @@
 import org.jetbrains.annotations.Nullable;
 
 import vazkii.botania.api.BotaniaAPI;
-import vazkii.botania.api.internal.ManaNetwork;
 import vazkii.botania.api.mana.ManaCollector;
 
 import static vazkii.botania.api.BotaniaAPI.botaniaRL;
@@ -78,14 +77,6 @@ public int getBindingRadius() {
 		return LINK_RANGE;
 	}
 
-	@Nullable
-	@Override
-	public BlockPos findClosestTarget() {
-		ManaNetwork network = BotaniaAPI.instance().getManaNetworkInstance();
-		var closestCollector = network.getClosestCollector(getBlockPos(), getLevel(), getBindingRadius());
-		return closestCollector == null ? null : closestCollector.getManaReceiverPos();
-	}
-
 	public void emptyManaIntoCollector() {
 		ManaCollector collector = findBoundTile();
 		if (collector != null && !collector.isFull() && getMana() > 0) {
diff --git a/Xplat/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java b/Xplat/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java
@@ -8,7 +8,6 @@
  */
 package vazkii.botania.api.internal;
 
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 
 import vazkii.botania.api.mana.*;
@@ -23,26 +22,11 @@ public class DummyManaNetwork implements ManaNetwork {
 	@Override
 	public void clear() {}
 
-	@Override
-	public ManaPool getClosestPool(BlockPos pos, Level world, int limit) {
-		return null;
-	}
-
-	@Override
-	public ManaCollector getClosestCollector(BlockPos pos, Level world, int limit) {
-		return null;
-	}
-
 	@Override
 	public Set<ManaCollector> getAllCollectorsInWorld(Level world) {
 		return Collections.emptySet();
 	}
 
-	@Override
-	public Set<ManaPool> getAllPoolsInWorld(Level world) {
-		return Collections.emptySet();
-	}
-
 	@Override
 	public void fireManaNetworkEvent(ManaReceiver thing, ManaBlockType type, ManaNetworkAction action) {
 
diff --git a/Xplat/src/main/java/vazkii/botania/api/internal/ManaNetwork.java b/Xplat/src/main/java/vazkii/botania/api/internal/ManaNetwork.java
@@ -8,11 +8,8 @@
  */
 package vazkii.botania.api.internal;
 
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 
-import org.jetbrains.annotations.Nullable;
-
 import vazkii.botania.api.mana.*;
 
 import java.util.Set;
@@ -28,40 +25,11 @@ public interface ManaNetwork {
 	 */
 	void clear();
 
-	/**
-	 * Gets the closest Mana Collector (eg. Mana Spreader) in the network to the Chunk
-	 * Coordinates passed in, in the given dimension.<br>
-	 * Note that this function *can* get performance intensive, it's reccomended you
-	 * call it sparingly and take cache of the value returned.
-	 * 
-	 * @param limit The maximum distance the closest block can be, if the closest block
-	 *              is farther away than that, null will be returned instead.
-	 */
-	@Nullable
-	ManaCollector getClosestCollector(BlockPos pos, Level world, int limit);
-
-	/**
-	 * Gets the closest Mana Pool in the network to the Chunk Coordinates passed in,
-	 * in the given dimension.<br>
-	 * Note that this function *can* get performance intensive, it's reccomended you
-	 * call it sparingly and take cache of the value returned.
-	 * 
-	 * @param limit The maximum distance the closest block can be, if the closest block
-	 *              is farther away than that, null will be returned instead.
-	 */
-	@Nullable
-	ManaPool getClosestPool(BlockPos pos, Level world, int limit);
-
 	/**
 	 * Gets read-only view of all Mana Collectors (eg. Mana Spreader) in the dimension
 	 * passed in.
 	 */
 	Set<ManaCollector> getAllCollectorsInWorld(Level world);
 
-	/**
-	 * Gets read-only view of all Mana Pools in the dimension passed in.
-	 */
-	Set<ManaPool> getAllPoolsInWorld(Level world);
-
 	void fireManaNetworkEvent(ManaReceiver thing, ManaBlockType type, ManaNetworkAction action);
 }
diff --git a/Xplat/src/main/java/vazkii/botania/api/mana/ManaBlockType.java b/Xplat/src/main/java/vazkii/botania/api/mana/ManaBlockType.java
@@ -1,6 +1,5 @@
 package vazkii.botania.api.mana;
 
 public enum ManaBlockType {
-	POOL,
 	COLLECTOR
 }
diff --git a/Xplat/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java b/Xplat/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java
@@ -10,8 +10,6 @@
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.Level;
 
 import vazkii.botania.common.handler.ManaNetworkHandler;
@@ -33,16 +31,7 @@ public static void onDrawDebugText(List<String> left) {
 			left.add("");
 			String version = XplatAbstractions.INSTANCE.getBotaniaVersion();
 
-			left.add(PREFIX + "(CLIENT) netColl: " + ManaNetworkHandler.instance.getAllCollectorsInWorld(world).size() + ", netPool: " + ManaNetworkHandler.instance.getAllPoolsInWorld(world).size() + ", rv: " + version);
-
-			if (Minecraft.getInstance().hasSingleplayerServer()) {
-				ResourceKey<Level> dim = world.dimension();
-				ResourceLocation dimName = dim.location();
-				if (mc.getSingleplayerServer() != null) {
-					Level serverWorld = mc.getSingleplayerServer().getLevel(dim);
-					left.add(PREFIX + String.format("(INTEGRATED SERVER %s) netColl : %d, netPool: %d", dimName, ManaNetworkHandler.instance.getAllCollectorsInWorld(serverWorld).size(), ManaNetworkHandler.instance.getAllPoolsInWorld(serverWorld).size()));
-				}
-			}
+			left.add(PREFIX + "(CLIENT) netColl: " + ManaNetworkHandler.instance.getAllCollectorsInWorld(world).size() + ", rv: " + version);
 		}
 	}
 
diff --git a/Xplat/src/main/java/vazkii/botania/common/block/block_entity/mana/ManaPoolBlockEntity.java b/Xplat/src/main/java/vazkii/botania/common/block/block_entity/mana/ManaPoolBlockEntity.java
@@ -37,7 +37,6 @@
 import org.jetbrains.annotations.UnknownNullability;
 import org.lwjgl.opengl.GL11;
 
-import vazkii.botania.api.BotaniaAPI;
 import vazkii.botania.api.BotaniaAPIClient;
 import vazkii.botania.api.block.WandHUD;
 import vazkii.botania.api.block.Wandable;
@@ -58,7 +57,6 @@
 import vazkii.botania.common.crafting.BotaniaRecipeTypes;
 import vazkii.botania.common.crafting.StateIngredients;
 import vazkii.botania.common.handler.BotaniaSounds;
-import vazkii.botania.common.handler.ManaNetworkHandler;
 import vazkii.botania.common.helper.EntityHelper;
 import vazkii.botania.common.item.BotaniaItems;
 import vazkii.botania.common.item.ManaTabletItem;
@@ -125,12 +123,6 @@ public void receiveMana(int mana) {
 		}
 	}
 
-	@Override
-	public void setRemoved() {
-		super.setRemoved();
-		BotaniaAPI.instance().getManaNetworkInstance().fireManaNetworkEvent(this, ManaBlockType.POOL, ManaNetworkAction.REMOVE);
-	}
-
 	public static int calculateComparatorLevel(int mana, int max) {
 		int val = (int) ((double) mana / (double) max * 15.0);
 		if (mana > 0) {
@@ -249,9 +241,6 @@ private void initManaCapAndNetwork() {
 		if (getMaxMana() == -1) {
 			manaCap = ((ManaPoolBlock) getBlockState().getBlock()).getManaCapacity();
 		}
-		if (!ManaNetworkHandler.instance.isPoolIn(level, this) && !isRemoved()) {
-			BotaniaAPI.instance().getManaNetworkInstance().fireManaNetworkEvent(this, ManaBlockType.POOL, ManaNetworkAction.ADD);
-		}
 	}
 
 	public static void clientTick(Level level, BlockPos worldPosition, BlockState state, ManaPoolBlockEntity self) {
diff --git a/Xplat/src/main/java/vazkii/botania/common/block/block_entity/mana/ManaSpreaderBlockEntity.java b/Xplat/src/main/java/vazkii/botania/common/block/block_entity/mana/ManaSpreaderBlockEntity.java
@@ -154,14 +154,18 @@ public void receiveMana(int mana) {
 	@Override
 	public void setRemoved() {
 		super.setRemoved();
-		BotaniaAPI.instance().getManaNetworkInstance().fireManaNetworkEvent(this, ManaBlockType.COLLECTOR, ManaNetworkAction.REMOVE);
+		if (getLevel().isClientSide()) {
+			BotaniaAPI.instance().getManaNetworkInstance().fireManaNetworkEvent(this, ManaBlockType.COLLECTOR, ManaNetworkAction.REMOVE);
+		}
 	}
 
 	public static void commonTick(Level level, BlockPos worldPosition, BlockState state, ManaSpreaderBlockEntity self) {
-		boolean inNetwork = ManaNetworkHandler.instance.isCollectorIn(level, self);
-		boolean wasInNetwork = inNetwork;
-		if (!inNetwork && !self.isRemoved()) {
-			BotaniaAPI.instance().getManaNetworkInstance().fireManaNetworkEvent(self, ManaBlockType.COLLECTOR, ManaNetworkAction.ADD);
+		if (level.isClientSide) {
+			boolean inNetwork = ManaNetworkHandler.instance.isCollectorIn(level, self);
+			if (!inNetwork && !self.isRemoved()) {
+				BotaniaAPI.instance().getManaNetworkInstance()
+						.fireManaNetworkEvent(self, ManaBlockType.COLLECTOR, ManaNetworkAction.ADD);
+			}
 		}
 
 		boolean powered = state.getValue(BlockStateProperties.POWERED);
@@ -171,7 +175,7 @@ public static void commonTick(Level level, BlockPos worldPosition, BlockState st
 			if (level.hasChunkAt(relPos)) {
 				var receiverAt = XplatAbstractions.INSTANCE.findManaReceiver(level, relPos, dir.getOpposite());
 				if (receiverAt instanceof ManaPool pool) {
-					if (wasInNetwork && (pool != self.receiver || self.getSpreaderBlock().isRedstoneTriggered())) {
+					if (pool != self.receiver || self.getSpreaderBlock().isRedstoneTriggered()) {
 						if (pool instanceof KeyLocked locked && !locked.getOutputKey().equals(self.getInputKey())) {
 							continue;
 						}
diff --git a/Xplat/src/main/java/vazkii/botania/common/handler/ManaNetworkHandler.java b/Xplat/src/main/java/vazkii/botania/common/handler/ManaNetworkHandler.java
diff --git a/Xplat/src/main/java/vazkii/botania/xplat/XplatAbstractions.java b/Xplat/src/main/java/vazkii/botania/xplat/XplatAbstractions.java
diff --git a/doc/1.21-notes.md b/doc/1.21-notes.md

Original file line number	Diff line number	Diff line change
`@@ -422,7 +422,6 @@ private void registerCommands(CommandDispatcher<CommandSourceStack> dispatcher,`
`422`	`422`	`}`
`423`	`423`
`424`	`424`	`private void serverStopping(MinecraftServer server) {`
`425`		`- ManaNetworkHandler.instance.clear();`
`426`	`425`	`CorporeaIndexBlockEntity.clearIndexCache();`
`427`	`426`	`}`
`428`	`427`
Original file line number	Diff line number	Diff line change
`@@ -656,7 +656,6 @@ private void registerCommands(CommandDispatcher<CommandSourceStack> dispatcher,`
`656`	`656`	`}`
`657`	`657`
`658`	`658`	`private void serverStopping(MinecraftServer server) {`
`659`		`- ManaNetworkHandler.instance.clear();`
`660`	`659`	`CorporeaIndexBlockEntity.clearIndexCache();`
`661`	`660`	`}`
`662`	`661`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`package vazkii.botania.api.mana;`
`2`	`2`
`3`	`3`	`public enum ManaBlockType {`
`4`		`- POOL,`
`5`	`4`	`COLLECTOR`
`6`	`5`	`}`