From 926b8d864a74043c9eb070aa900c101da70b77ac Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 26 Feb 2020 19:10:50 -0600 Subject: [PATCH] More API cleanup (notably, remove TileSignature) --- .../api/internal/DummyManaNetwork.java | 5 ++- .../botania/api/internal/IManaNetwork.java | 5 ++- .../api/mana/IPoolOverlayProvider.java | 8 +++-- .../botania/api/mana/TileSignature.java | 35 ------------------ .../botania/api/mana/spark/ISparkEntity.java | 11 ------ .../core/handler/ClientTickHandler.java | 9 +---- .../core/handler/ManaNetworkHandler.java | 36 +++++++++---------- 7 files changed, 26 insertions(+), 83 deletions(-) delete mode 100644 src/main/java/vazkii/botania/api/mana/TileSignature.java diff --git a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java index 5f6b0bcd1..11d9dc41c 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java +++ b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java @@ -14,7 +14,6 @@ import com.google.common.collect.ImmutableSet; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import vazkii.botania.api.mana.TileSignature; import java.util.Set; @@ -36,12 +35,12 @@ public class DummyManaNetwork implements IManaNetwork { } @Override - public Set getAllCollectorsInWorld(World world) { + public Set getAllCollectorsInWorld(World world) { return ImmutableSet.of(); } @Override - public Set getAllPoolsInWorld(World world) { + public Set getAllPoolsInWorld(World world) { return ImmutableSet.of(); } diff --git a/src/main/java/vazkii/botania/api/internal/IManaNetwork.java b/src/main/java/vazkii/botania/api/internal/IManaNetwork.java index fde05af44..6e9789d19 100644 --- a/src/main/java/vazkii/botania/api/internal/IManaNetwork.java +++ b/src/main/java/vazkii/botania/api/internal/IManaNetwork.java @@ -13,7 +13,6 @@ package vazkii.botania.api.internal; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import vazkii.botania.api.mana.TileSignature; import java.util.Set; @@ -56,12 +55,12 @@ public interface IManaNetwork { * passed in. Note that this is the actual set and not a copy, make sure to * clone the set if you intend to change it in any way. */ - public Set getAllCollectorsInWorld(World world); + public Set getAllCollectorsInWorld(World world); /** * Gets the set of all Mana Pools in the dimension passed in. Note that this * is the actual set and not a copy, make sure to clone the set if you intend * to change it in any way. */ - public Set getAllPoolsInWorld(World world); + public Set getAllPoolsInWorld(World world); } diff --git a/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java b/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java index c1130ab4c..72c7f9591 100644 --- a/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java +++ b/src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java @@ -17,13 +17,15 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; /** - * A block that implements this can provide an IIcon (block icons only) + * A block that implements this can provide a sprite * to be used as an overlay for the mana pool, similarly to the mana void * and catalysts. */ public interface IPoolOverlayProvider { - + /** + * @return A sprite to render. Must be stitched to the main block/item atlas. + */ @OnlyIn(Dist.CLIENT) - public TextureAtlasSprite getIcon(World world, BlockPos pos); + TextureAtlasSprite getIcon(World world, BlockPos pos); } diff --git a/src/main/java/vazkii/botania/api/mana/TileSignature.java b/src/main/java/vazkii/botania/api/mana/TileSignature.java deleted file mode 100644 index 06261a919..000000000 --- a/src/main/java/vazkii/botania/api/mana/TileSignature.java +++ /dev/null @@ -1,35 +0,0 @@ -package vazkii.botania.api.mana; - -import net.minecraft.tileentity.TileEntity; - -public class TileSignature { - - private final TileEntity tile; - private final boolean remoteWorld; - - public TileSignature(TileEntity tile, boolean remoteWorld) { - this.tile = tile; - this.remoteWorld = remoteWorld; - } - - public TileEntity getTile() { - return tile; - } - - public boolean isRemote() { - return remoteWorld; - } - - @Override - public int hashCode() { - return Boolean.hashCode(remoteWorld) ^ System.identityHashCode(tile); - } - - @Override - public boolean equals(Object o) { - return o instanceof TileSignature - && tile == ((TileSignature) o).tile - && remoteWorld == ((TileSignature) o).remoteWorld; - } - -} diff --git a/src/main/java/vazkii/botania/api/mana/spark/ISparkEntity.java b/src/main/java/vazkii/botania/api/mana/spark/ISparkEntity.java index bcaf12ec5..95444d48a 100644 --- a/src/main/java/vazkii/botania/api/mana/spark/ISparkEntity.java +++ b/src/main/java/vazkii/botania/api/mana/spark/ISparkEntity.java @@ -35,19 +35,8 @@ public interface ISparkEntity { */ public void registerTransfer(ISparkEntity entity); - /** - * Gets which upgrade is in this Spark.
- * 0: None
- * 1: Dispersive
- * 2: Dominant
- * 3: Recessive
- * 4: Isolated - */ public SparkUpgradeType getUpgrade(); - /** - * Sets the upgrade on this Spark. See {@link ISparkEntity#getUpgrade} - */ public void setUpgrade(SparkUpgradeType upgrade); /** diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java index 0ed4102bc..c84ae2cf1 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -21,17 +21,14 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.mana.IManaCollector; -import vazkii.botania.api.mana.TileSignature; import vazkii.botania.client.render.tile.RenderTileRedString; import vazkii.botania.common.block.subtile.functional.SubTileVinculotus; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; -import vazkii.botania.common.lib.LibObfuscation; import vazkii.patchouli.client.book.gui.GuiBook; -import java.lang.invoke.MethodHandle; import java.lang.reflect.Field; @Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID) @@ -91,11 +88,7 @@ public final class ClientTickHandler { PlayerEntity player = Minecraft.getInstance().player; if(player != null) { if(PlayerHelper.hasHeldItemClass(player, ModItems.twigWand)) { - for(TileSignature sig : ImmutableList.copyOf(ManaNetworkHandler.instance.getAllCollectorsInWorld(Minecraft.getInstance().world))) { - if(!sig.isRemote()) - continue; - - TileEntity tile = sig.getTile(); + for(TileEntity tile : ImmutableList.copyOf(ManaNetworkHandler.instance.getAllCollectorsInWorld(Minecraft.getInstance().world))) { if(tile instanceof IManaCollector) ((IManaCollector) tile).onClientDisplayTick(); } diff --git a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java index 6fd467d7c..0a462e335 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java @@ -18,7 +18,6 @@ import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.ManaNetworkEvent; import vazkii.botania.api.mana.ManaNetworkEvent.Action; import vazkii.botania.api.mana.ManaNetworkEvent.ManaBlockType; -import vazkii.botania.api.mana.TileSignature; import java.util.Comparator; import java.util.HashSet; @@ -31,12 +30,12 @@ public final class ManaNetworkHandler implements IManaNetwork { public static final ManaNetworkHandler instance = new ManaNetworkHandler(); - private final WeakHashMap> manaPools = new WeakHashMap<>(); - private final WeakHashMap> manaCollectors = new WeakHashMap<>(); + private final WeakHashMap> manaPools = new WeakHashMap<>(); + private final WeakHashMap> manaCollectors = new WeakHashMap<>(); @SubscribeEvent public void onNetworkEvent(ManaNetworkEvent event) { - Map> map = event.type == ManaBlockType.COLLECTOR ? manaCollectors : manaPools; + Map> map = event.type == ManaBlockType.COLLECTOR ? manaCollectors : manaPools; if(event.action == Action.ADD) add(map, event.tile); else remove(map, event.tile); @@ -70,47 +69,44 @@ public final class ManaNetworkHandler implements IManaNetwork { return isIn(tile, manaPools); } - private boolean isIn(TileEntity tile, Map> map) { - Set set = map.get(tile.getWorld()); - return set != null && set.contains(new TileSignature(tile, tile.getWorld().isRemote)); + private boolean isIn(TileEntity tile, Map> map) { + Set set = map.get(tile.getWorld()); + return set != null && set.contains(tile); } - private TileEntity getClosest(Set tiles, BlockPos pos, boolean remoteCheck, int limit) { + private TileEntity getClosest(Set tiles, BlockPos pos, boolean remoteCheck, int limit) { return tiles.stream() - .filter(ts -> ts.isRemote() == remoteCheck) - .map(TileSignature::getTile) - .filter(t -> !t.isRemoved()) - .filter(t -> t.getPos().distanceSq(pos) <= limit * limit) + .filter(t -> t.getWorld().isRemote == remoteCheck && !t.isRemoved() + && t.getPos().distanceSq(pos) <= limit * limit) .reduce(BinaryOperator.minBy(Comparator.comparing(t -> t.getPos().distanceSq(pos), Double::compare))) .orElse(null); } - private void remove(Map> map, TileEntity tile) { + private void remove(Map> map, TileEntity tile) { World world = tile.getWorld(); if(!map.containsKey(world)) return; - map.get(world).remove(new TileSignature(tile, tile.getWorld().isRemote)); + map.get(world).remove(tile); } - private void add(Map> map, TileEntity tile) { + private void add(Map> map, TileEntity tile) { World world = tile.getWorld(); - map.putIfAbsent(world, new HashSet<>()); - map.get(world).add(new TileSignature(tile, tile.getWorld().isRemote)); + map.computeIfAbsent(world, k -> new HashSet<>()).add(tile); } @Override - public Set getAllCollectorsInWorld(World world) { + public Set getAllCollectorsInWorld(World world) { return getAllInWorld(manaCollectors, world); } @Override - public Set getAllPoolsInWorld(World world) { + public Set getAllPoolsInWorld(World world) { return getAllInWorld(manaPools, world); } - private Set getAllInWorld(Map> map, World world) { + private Set getAllInWorld(Map> map, World world) { return map.getOrDefault(world, new HashSet<>()); }