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 b7bc2ffdd..bcaf12ec5 100644 --- a/src/main/java/vazkii/botania/api/mana/spark/ISparkEntity.java +++ b/src/main/java/vazkii/botania/api/mana/spark/ISparkEntity.java @@ -10,6 +10,8 @@ */ package vazkii.botania.api.mana.spark; +import net.minecraft.item.DyeColor; + import java.util.Collection; /** @@ -53,4 +55,9 @@ public interface ISparkEntity { */ public boolean areIncomingTransfersDone(); + /** + * Gets the network that this spark is on, or the color it's displaying. Sparks may only connect to others + * of the same network. + */ + public DyeColor getNetwork(); } diff --git a/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java b/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java index 0566814fb..f0f65d26b 100644 --- a/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java +++ b/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java @@ -12,15 +12,21 @@ package vazkii.botania.api.mana.spark; import com.google.common.base.Predicates; import net.minecraft.entity.Entity; +import net.minecraft.item.DyeColor; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; import java.util.List; +import java.util.stream.Stream; public final class SparkHelper { public static final int SPARK_SCAN_RANGE = 12; + public static Stream getSparksAround(World world, double x, double y, double z, DyeColor color) { + return getSparksAround(world, x, y, z).stream().filter(s -> s.getNetwork() == color); + } + public static List getSparksAround(World world, double x, double y, double z) { return SparkHelper.getEntitiesAround(ISparkEntity.class, world, x, y, z); } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java index be67b9c42..00ec9ae00 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -35,20 +35,6 @@ public class RenderCorporeaSpark extends RenderSparkBase { return entity.isMaster() ? MiscellaneousIcons.INSTANCE.corporeaWorldIconMaster : MiscellaneousIcons.INSTANCE.corporeaWorldIcon; } - @Override - public void colorSpinningIcon(EntityCorporeaSpark entity, float a) { - int hex = entity.getNetwork().colorValue; - int r = (hex & 0xFF0000) >> 16; - int g = (hex & 0xFF00) >> 8; - int b = hex & 0xFF; - GlStateManager.color4f(r / 255F, g / 255F, b / 255F, a); - } - - @Override - public TextureAtlasSprite getSpinningIcon(EntityCorporeaSpark entity) { - return MiscellaneousIcons.INSTANCE.corporeaIconStar; - } - @Override public void renderCallback(EntityCorporeaSpark entity, float pticks) { int time = entity.getItemDisplayTicks(); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java index 52317a732..ec984accf 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java @@ -24,7 +24,9 @@ public class RenderSpark extends RenderSparkBase { @Override public TextureAtlasSprite getSpinningIcon(EntitySpark entity) { int upgrade = entity.getUpgrade().ordinal() - 1; - return upgrade >= 0 && upgrade < MiscellaneousIcons.INSTANCE.sparkUpgradeIcons.length ? MiscellaneousIcons.INSTANCE.sparkUpgradeIcons[upgrade] : null; + return upgrade >= 0 && upgrade < MiscellaneousIcons.INSTANCE.sparkUpgradeIcons.length + ? MiscellaneousIcons.INSTANCE.sparkUpgradeIcons[upgrade] + : super.getSpinningIcon(entity); } } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java index c1972b566..5365cb1ed 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -24,11 +24,12 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.proxy.ClientProxy; +import vazkii.botania.common.entity.EntitySparkBase; import javax.annotation.Nonnull; import java.util.Random; -public abstract class RenderSparkBase extends EntityRenderer { +public abstract class RenderSparkBase extends EntityRenderer { public RenderSparkBase(EntityRendererManager manager) { super(manager); @@ -64,12 +65,11 @@ public abstract class RenderSparkBase extends EntityRenderer extends EntityRenderer> 16; + int g = (hex & 0xFF00) >> 8; + int b = hex & 0xFF; + GlStateManager.color4f(r / 255F, g / 255F, b / 255F, a); + } protected TextureAtlasSprite getSpinningIcon(T entity) { - return null; + return MiscellaneousIcons.INSTANCE.corporeaIconStar; } protected void renderCallback(T entity, float pticks) {} @Nonnull @Override - protected ResourceLocation getEntityTexture(@Nonnull Entity entity) { + protected ResourceLocation getEntityTexture(@Nonnull EntitySparkBase entity) { return AtlasTexture.LOCATION_BLOCKS_TEXTURE; } @@ -112,7 +118,6 @@ public abstract class RenderSparkBase extends EntityRenderer sparkEntities = SparkHelper.getSparksAround(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); - for(ISparkEntity otherSpark : sparkEntities) { - if(spark == otherSpark) - continue; - - if(otherSpark.getAttachedTile() != null && otherSpark.getAttachedTile() instanceof IManaPool) - otherSpark.registerTransfer(spark); - } + SparkHelper.getSparksAround(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, spark.getNetwork()) + .filter(otherSpark -> spark != otherSpark && otherSpark.getAttachedTile() instanceof IManaPool) + .forEach(os -> os.registerTransfer(spark)); } if(stageTicks % 5 == 0) sync(); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java index 83214da84..3324b4cc5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -93,14 +93,9 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable, ITickab removeMana = false; ISparkEntity spark = getAttachedSpark(); if(spark != null) { - List sparkEntities = SparkHelper.getSparksAround(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); - for(ISparkEntity otherSpark : sparkEntities) { - if(spark == otherSpark) - continue; - - if(otherSpark.getAttachedTile() != null && otherSpark.getAttachedTile() instanceof IManaPool) - otherSpark.registerTransfer(spark); - } + SparkHelper.getSparksAround(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, spark.getNetwork()) + .filter(otherSpark -> spark != otherSpark && otherSpark.getAttachedTile() instanceof IManaPool) + .forEach(os -> os.registerTransfer(spark)); } if(mana > 0) { VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); @@ -126,7 +121,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable, ITickab recieveMana(-1000); } - List getItems() { + private List getItems() { return world.getEntitiesWithinAABB(ItemEntity.class, new AxisAlignedBB(pos, pos.add(1, 1, 1))); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index c8ab3cc1e..50cdbbfd1 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -41,18 +41,15 @@ import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; -public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { +public class EntityCorporeaSpark extends EntitySparkBase implements ICorporeaSpark { @ObjectHolder(LibMisc.MOD_ID + ":corporea_spark") public static EntityType TYPE; private static final int SCAN_RANGE = 8; private static final String TAG_MASTER = "master"; - private static final String TAG_NETWORK = "network"; - private static final String TAG_INVIS = "invis"; private static final DataParameter MASTER = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.BOOLEAN); - private static final DataParameter NETWORK = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.VARINT); private static final DataParameter ITEM_DISPLAY_TICKS = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.VARINT); private static final DataParameter DISPLAY_STACK = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.ITEMSTACK); @@ -71,8 +68,8 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { @Override protected void registerData() { + super.registerData(); dataManager.register(MASTER, false); - dataManager.register(NETWORK, 0); dataManager.register(ITEM_DISPLAY_TICKS, 0); dataManager.register(DISPLAY_STACK, ItemStack.EMPTY); } @@ -83,11 +80,6 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { return isMaster() ? new ItemStack(ModItems.corporeaSparkMaster) : new ItemStack(ModItems.corporeaSpark); } - @Override - public boolean canBeCollidedWith() { - return true; - } - @Override public void tick() { super.tick(); @@ -241,15 +233,6 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { return dataManager.get(MASTER); } - public void setNetwork(DyeColor network) { - dataManager.set(NETWORK, network.getId()); - } - - @Override - public DyeColor getNetwork() { - return DyeColor.byId(dataManager.get(NETWORK)); - } - public int getItemDisplayTicks() { return dataManager.get(ITEM_DISPLAY_TICKS); } @@ -315,16 +298,14 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { @Override protected void readAdditional(@Nonnull CompoundNBT cmp) { + super.readAdditional(cmp); setMaster(cmp.getBoolean(TAG_MASTER)); - setNetwork(DyeColor.byId(cmp.getInt(TAG_NETWORK))); - setInvisible(cmp.getInt(TAG_INVIS) == 1); } @Override protected void writeAdditional(@Nonnull CompoundNBT cmp) { + super.writeAdditional(cmp); cmp.putBoolean(TAG_MASTER, isMaster()); - cmp.putInt(TAG_NETWORK, getNetwork().getId()); - cmp.putInt(TAG_INVIS, isInvisible() ? 1 : 0); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index 03e921031..7f6f5f2e8 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -14,6 +14,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.item.DyeColor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.IPacket; @@ -38,6 +39,7 @@ import vazkii.botania.api.mana.spark.SparkHelper; import vazkii.botania.api.mana.spark.SparkUpgradeType; import vazkii.botania.common.item.ItemSparkUpgrade; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.material.ItemDye; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; @@ -51,14 +53,15 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.WeakHashMap; +import java.util.stream.Collectors; +import java.util.stream.Stream; import javax.annotation.Nonnull; -public class EntitySpark extends Entity implements ISparkEntity { +public class EntitySpark extends EntitySparkBase implements ISparkEntity { @ObjectHolder(LibMisc.MOD_ID + ":spark") public static EntityType TYPE; private static final int TRANSFER_RATE = 1000; private static final String TAG_UPGRADE = "upgrade"; - private static final String TAG_INVIS = "invis"; private static final DataParameter UPGRADE = EntityDataManager.createKey(EntitySpark.class, DataSerializers.VARINT); private final Set transfers = Collections.newSetFromMap(new WeakHashMap<>()); @@ -75,6 +78,7 @@ public class EntitySpark extends Entity implements ISparkEntity { @Override protected void registerData() { + super.registerData(); dataManager.register(UPGRADE, 0); } @@ -98,10 +102,6 @@ public class EntitySpark extends Entity implements ISparkEntity { } SparkUpgradeType upgrade = getUpgrade(); - List allSparks = null; - if(upgrade == SparkUpgradeType.DOMINANT || upgrade == SparkUpgradeType.RECESSIVE) - allSparks = SparkHelper.getSparksAround(world, posX, posY + (getHeight() / 2.0), posZ); - Collection transfers = getTransfers(); switch(upgrade) { @@ -160,29 +160,27 @@ public class EntitySpark extends Entity implements ISparkEntity { break; } case DOMINANT : { - List validSparks = new ArrayList<>(); - for(ISparkEntity spark : allSparks) { - if(spark == this) - continue; - - SparkUpgradeType upgrade_ = spark.getUpgrade(); - if(upgrade_ == SparkUpgradeType.NONE && spark.getAttachedTile() instanceof IManaPool) - validSparks.add(spark); - } + List validSparks = SparkHelper.getSparksAround(world, posX, posY + (getHeight() / 2), posZ, getNetwork()) + .filter(s -> { + SparkUpgradeType otherUpgrade = s.getUpgrade(); + return s != this && otherUpgrade == SparkUpgradeType.NONE && s.getAttachedTile() instanceof IManaPool; + }) + .collect(Collectors.toList()); if(validSparks.size() > 0) validSparks.get(world.rand.nextInt(validSparks.size())).registerTransfer(this); break; } case RECESSIVE : { - for(ISparkEntity spark : allSparks) { - if(spark == this) - continue; - - SparkUpgradeType upgrade_ = spark.getUpgrade(); - if(upgrade_ != SparkUpgradeType.DOMINANT && upgrade_ != SparkUpgradeType.RECESSIVE && upgrade_ != SparkUpgradeType.ISOLATED) - transfers.add(spark); - } + SparkHelper.getSparksAround(world, posX, posY + (getHeight() / 2), posZ, getNetwork()) + .filter(s -> { + SparkUpgradeType otherUpgrade = s.getUpgrade(); + return s != this + && otherUpgrade != SparkUpgradeType.DOMINANT + && otherUpgrade != SparkUpgradeType.RECESSIVE + && otherUpgrade != SparkUpgradeType.ISOLATED; + }) + .forEach(transfers::add); break; } case NONE: @@ -239,18 +237,13 @@ public class EntitySpark extends Entity implements ISparkEntity { remove(); } - @Override - public boolean canBeCollidedWith() { - return true; - } - @Override public boolean processInitialInteract(PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); - if(!removed && !stack.isEmpty()) { + if(isAlive() && !stack.isEmpty()) { if(world.isRemote) { boolean valid = stack.getItem() == ModItems.twigWand || stack.getItem() instanceof ItemSparkUpgrade - || stack.getItem() == ModItems.phantomInk; + || stack.getItem() == ModItems.phantomInk || stack.getItem() instanceof ItemDye; if(valid) player.swingArm(hand); return valid; @@ -268,8 +261,8 @@ public class EntitySpark extends Entity implements ISparkEntity { } else dropAndKill(); return true; } else { - for(ISparkEntity spark : SparkHelper.getSparksAround(world, posX, posY + (getHeight() / 2.0), posZ)) - particleBeam(player, this, (Entity) spark); + SparkHelper.getSparksAround(world, posX, posY + (getHeight() / 2), posZ, getNetwork()) + .forEach(s -> particleBeam(player, this, (Entity) s)); return true; } } else if(stack.getItem() instanceof ItemSparkUpgrade && upgrade == SparkUpgradeType.NONE) { @@ -279,6 +272,13 @@ public class EntitySpark extends Entity implements ISparkEntity { } else if (stack.getItem() == ModItems.phantomInk) { setInvisible(true); return true; + } else if (stack.getItem() instanceof ItemDye) { + DyeColor color = ((ItemDye) stack.getItem()).color; + if(color != getNetwork()) { + setNetwork(color); + stack.shrink(1); + return true; + } } } @@ -293,14 +293,14 @@ public class EntitySpark extends Entity implements ISparkEntity { @Override protected void readAdditional(@Nonnull CompoundNBT cmp) { + super.readAdditional(cmp); setUpgrade(SparkUpgradeType.values()[cmp.getInt(TAG_UPGRADE)]); - setInvisible(cmp.getInt(TAG_INVIS) == 1); } @Override protected void writeAdditional(@Nonnull CompoundNBT cmp) { + super.writeAdditional(cmp); cmp.putInt(TAG_UPGRADE, getUpgrade().ordinal()); - cmp.putInt(TAG_INVIS, isInvisible() ? 1 : 0); } @Override @@ -309,7 +309,7 @@ public class EntitySpark extends Entity implements ISparkEntity { int y = MathHelper.floor(posY) - 1; int z = MathHelper.floor(posZ); TileEntity tile = world.getTileEntity(new BlockPos(x, y, z)); - if(tile != null && tile instanceof ISparkAttachable) + if(tile instanceof ISparkAttachable) return (ISparkAttachable) tile; return null; @@ -323,10 +323,14 @@ public class EntitySpark extends Entity implements ISparkEntity { SparkUpgradeType supgr = spark.getUpgrade(); ISparkAttachable atile = spark.getAttachedTile(); - if(!(spark != this - && !spark.areIncomingTransfersDone() - && atile != null && !atile.isFull() - && (upgr == SparkUpgradeType.NONE && supgr == SparkUpgradeType.DOMINANT || upgr == SparkUpgradeType.RECESSIVE && (supgr == SparkUpgradeType.NONE || supgr == SparkUpgradeType.DISPERSIVE) || !(atile instanceof IManaPool)))) + if(spark == this + || spark.areIncomingTransfersDone() + || getNetwork() != spark.getNetwork() + || atile == null + || atile.isFull() + || !(upgr == SparkUpgradeType.NONE && supgr == SparkUpgradeType.DOMINANT + || upgr == SparkUpgradeType.RECESSIVE && (supgr == SparkUpgradeType.NONE || supgr == SparkUpgradeType.DISPERSIVE) + || !(atile instanceof IManaPool))) iter.remove(); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntitySparkBase.java b/src/main/java/vazkii/botania/common/entity/EntitySparkBase.java new file mode 100644 index 000000000..017980ed0 --- /dev/null +++ b/src/main/java/vazkii/botania/common/entity/EntitySparkBase.java @@ -0,0 +1,50 @@ +package vazkii.botania.common.entity; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityType; +import net.minecraft.item.DyeColor; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.network.datasync.EntityDataManager; +import net.minecraft.world.World; + +public abstract class EntitySparkBase extends Entity { + private static final String TAG_INVIS = "invis"; + private static final String TAG_NETWORK = "network"; + private static final DataParameter NETWORK = EntityDataManager.createKey(EntitySparkBase.class, DataSerializers.VARINT); + + public EntitySparkBase(EntityType type, World world) { + super(type, world); + } + + @Override + protected void registerData() { + dataManager.register(NETWORK, 0); + } + + public DyeColor getNetwork() { + return DyeColor.byId(dataManager.get(NETWORK)); + } + + public void setNetwork(DyeColor color) { + dataManager.set(NETWORK, color.getId()); + } + + @Override + public boolean canBeCollidedWith() { + return true; + } + + @Override + protected void readAdditional(CompoundNBT compound) { + setInvisible(compound.getBoolean(TAG_INVIS)); + setNetwork(DyeColor.byId(compound.getInt(TAG_NETWORK))); + } + + @Override + protected void writeAdditional(CompoundNBT compound) { + compound.putBoolean(TAG_INVIS, isInvisible()); + compound.putInt(TAG_NETWORK, getNetwork().getId()); + } +}