From f0993c20a4731a3ee20de05998dbc5167366c1d3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 14 Sep 2019 18:16:13 -0500 Subject: [PATCH] Prep for moving to vanilla particle system --- .../client/core/proxy/ClientProxy.java | 22 ---- .../vazkii/botania/client/fx/FXSparkle.java | 2 - .../java/vazkii/botania/client/fx/FXWisp.java | 14 ++- .../botania/client/fx/ModParticles.java | 25 +++++ .../botania/client/fx/ParticleData.java | 100 ++++++++++++++++++ .../client/fx/ParticleRenderDispatcher.java | 12 +++ .../client/fx/SparkleParticleType.java | 14 +++ .../botania/client/fx/WispParticleType.java | 14 +++ .../jei/manapool/ManaPoolRecipeCategory.java | 2 +- .../common/block/subtile/SubTileManastar.java | 12 ++- .../block/subtile/SubTilePureDaisy.java | 4 +- .../subtile/functional/SubTileDaffomill.java | 15 +-- .../generating/SubTileHydroangeas.java | 17 ++- .../subtile/generating/SubTileThermalily.java | 9 +- .../common/block/tile/TileAlfPortal.java | 12 +-- .../common/block/tile/TileBrewery.java | 16 ++- .../common/block/tile/TileIncensePlate.java | 13 ++- .../common/block/tile/TileLightRelay.java | 4 +- .../common/block/tile/TileManaFlame.java | 7 +- .../botania/common/block/tile/TilePylon.java | 19 ++-- .../common/block/tile/TileRuneAltar.java | 13 +-- .../common/block/tile/TileSpawnerClaw.java | 15 +-- .../common/block/tile/TileSpiritShrine.java | 8 +- .../common/block/tile/mana/TilePool.java | 7 +- .../botania/common/core/proxy/IProxy.java | 23 +--- .../common/core/proxy/ServerProxy.java | 10 -- .../common/entity/EntityBabylonWeapon.java | 8 +- .../common/entity/EntityDoppleganger.java | 24 ++--- .../common/entity/EntityFlameRing.java | 13 ++- .../common/entity/EntityMagicLandmine.java | 16 +-- .../common/entity/EntityManaBurst.java | 27 ++--- .../common/entity/EntityPoolMinecart.java | 8 +- .../common/entity/EntitySignalFlare.java | 16 +-- .../botania/common/item/ItemCraftingHalo.java | 32 +----- .../botania/common/item/ItemFertilizer.java | 14 +-- .../botania/common/item/ItemGrassSeeds.java | 24 ++--- .../botania/common/item/ItemSextant.java | 12 ++- .../botania/common/item/ItemSpawnerMover.java | 21 +--- .../botania/common/item/ItemTwigWand.java | 10 +- .../item/equipment/bauble/ItemItemFinder.java | 11 +- .../equipment/bauble/ItemUnholyCloak.java | 9 +- .../botania/common/item/lens/LensFlare.java | 8 +- .../common/item/relic/ItemFlugelEye.java | 20 ++-- .../common/item/rod/ItemDiviningRod.java | 9 +- .../common/item/rod/ItemGravityRod.java | 19 +--- .../botania/common/item/rod/ItemSmeltRod.java | 13 +-- .../common/item/rod/ItemTornadoRod.java | 20 ++-- .../common/network/PacketBotaniaEffect.java | 32 +++--- .../assets/botania/particles/sparkle.json | 2 + .../assets/botania/particles/wisp.json | 2 + .../botania/textures/particle/sparkle_0.png | Bin 0 -> 1408 bytes .../textures/particle/sparkle_0.png.mcmeta | 5 + .../botania/textures/particle/sparkle_1.png | Bin 0 -> 1299 bytes .../textures/particle/sparkle_1.png.mcmeta | 5 + .../botania/textures/particle/sparkle_2.png | Bin 0 -> 1179 bytes .../textures/particle/sparkle_2.png.mcmeta | 5 + .../botania/textures/particle/sparkle_3.png | Bin 0 -> 1291 bytes .../textures/particle/sparkle_3.png.mcmeta | 5 + .../assets/botania/textures/particle/wisp.png | Bin 0 -> 885 bytes .../botania/textures/particle/wisp.png.mcmeta | 6 ++ 60 files changed, 452 insertions(+), 353 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/fx/ModParticles.java create mode 100644 src/main/java/vazkii/botania/client/fx/ParticleData.java create mode 100644 src/main/java/vazkii/botania/client/fx/SparkleParticleType.java create mode 100644 src/main/java/vazkii/botania/client/fx/WispParticleType.java create mode 100644 src/main/resources/assets/botania/particles/sparkle.json create mode 100644 src/main/resources/assets/botania/particles/wisp.json create mode 100644 src/main/resources/assets/botania/textures/particle/sparkle_0.png create mode 100644 src/main/resources/assets/botania/textures/particle/sparkle_0.png.mcmeta create mode 100644 src/main/resources/assets/botania/textures/particle/sparkle_1.png create mode 100644 src/main/resources/assets/botania/textures/particle/sparkle_1.png.mcmeta create mode 100644 src/main/resources/assets/botania/textures/particle/sparkle_2.png create mode 100644 src/main/resources/assets/botania/textures/particle/sparkle_2.png.mcmeta create mode 100644 src/main/resources/assets/botania/textures/particle/sparkle_3.png create mode 100644 src/main/resources/assets/botania/textures/particle/sparkle_3.png.mcmeta create mode 100644 src/main/resources/assets/botania/textures/particle/wisp.png create mode 100644 src/main/resources/assets/botania/textures/particle/wisp.png.mcmeta diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 743988a9f..0a26ba6b6 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -25,7 +25,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.client.settings.KeyConflictContext; import net.minecraftforge.common.MinecraftForge; @@ -58,7 +57,6 @@ import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.fx.FXLightning; import vazkii.botania.client.fx.FXSparkle; -import vazkii.botania.client.fx.FXWisp; import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; import vazkii.botania.client.gui.lexicon.GuiLexiconIndex; @@ -292,26 +290,6 @@ public class ClientProxy implements IProxy { private static boolean distanceLimit = true; private static boolean depthTest = true; - @Override - public void setWispFXDistanceLimit(boolean limit) { - distanceLimit = limit; - } - - @Override - public void setWispFXDepthTest(boolean test) { - depthTest = test; - } - - @Override - public void wispFX(double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz, float maxAgeMul) { - if(!doParticle()) - return; - - FXWisp wisp = new FXWisp(Minecraft.getInstance().world, x, y, z, size, r, g, b, distanceLimit, depthTest, maxAgeMul); - wisp.setSpeed(motionx, motiony, motionz); - Minecraft.getInstance().particles.addEffect(wisp); - } - private boolean doParticle() { if(Thread.currentThread().getThreadGroup() == SidedThreadGroups.SERVER) return false; diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index b5682c059..186b15c99 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -54,11 +54,9 @@ public class FXSparkle extends Particle { public FXSparkle(World world, double x, double y, double z, float size, float red, float green, float blue, int m) { super(world, x, y, z, 0.0D, 0.0D, 0.0D); - particleRed = red; particleGreen = green; particleBlue = blue; - particleAlpha = 0.5F; // So MC renders us on the alpha layer, value not actually used particleGravity = 0; motionX = motionY = motionZ = 0; particleScale *= size; diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index a348e16a5..bef2843d8 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -47,14 +47,17 @@ public class FXWisp extends Particle { private float f4; private float f5; - public FXWisp(World world, double d, double d1, double d2, float size, float red, float green, float blue, boolean distanceLimit, boolean depthTest, float maxAgeMul) { - super(world, d, d1, d2, 0.0D, 0.0D, 0.0D); + public FXWisp(World world, double d, double d1, double d2, double xSpeed, double ySpeed, double zSpeed, + float size, float red, float green, float blue, boolean depthTest, float maxAgeMul) { + super(world, d, d1, d2, 0, 0, 0); + // super applies wiggle to motion so set it here instead + motionX = xSpeed; + motionY = ySpeed; + motionZ = zSpeed; particleRed = red; particleGreen = green; particleBlue = blue; - particleAlpha = 0.5F; // So MC renders us on the alpha layer, value not actually used particleGravity = 0; - motionX = motionY = motionZ = 0; particleScale *= size; moteParticleScale = particleScale; maxAge = (int)(28D / (Math.random() * 0.3D + 0.7D) * maxAgeMul); @@ -64,7 +67,8 @@ public class FXWisp extends Particle { setSize(0.01F, 0.01F); Entity renderentity = Minecraft.getInstance().getRenderViewEntity(); - if(distanceLimit) { + // todo 1.14 + if(false) { int visibleDistance = 50; if (!Minecraft.getInstance().gameSettings.fancyGraphics) visibleDistance = 25; diff --git a/src/main/java/vazkii/botania/client/fx/ModParticles.java b/src/main/java/vazkii/botania/client/fx/ModParticles.java new file mode 100644 index 000000000..6acd01520 --- /dev/null +++ b/src/main/java/vazkii/botania/client/fx/ModParticles.java @@ -0,0 +1,25 @@ +package vazkii.botania.client.fx; + +import net.minecraft.particles.ParticleType; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.registries.ObjectHolder; +import vazkii.botania.common.lib.LibMisc; + +import static vazkii.botania.common.block.ModBlocks.register; + +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) +public class ModParticles { + @ObjectHolder(LibMisc.MOD_ID + ":wisp") + public static ParticleType WISP; + + @ObjectHolder(LibMisc.MOD_ID + ":sparkle") + public static ParticleType SPARKLE; + + @SubscribeEvent + public static void registerParticles(RegistryEvent.Register> evt) { + register(evt.getRegistry(), new WispParticleType(), "wisp"); + register(evt.getRegistry(), new SparkleParticleType(), "sparkle"); + } +} diff --git a/src/main/java/vazkii/botania/client/fx/ParticleData.java b/src/main/java/vazkii/botania/client/fx/ParticleData.java new file mode 100644 index 000000000..a38b07da8 --- /dev/null +++ b/src/main/java/vazkii/botania/client/fx/ParticleData.java @@ -0,0 +1,100 @@ +package vazkii.botania.client.fx; + +import com.mojang.brigadier.StringReader; +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import net.minecraft.network.PacketBuffer; +import net.minecraft.particles.IParticleData; +import net.minecraft.particles.ParticleType; + +import javax.annotation.Nonnull; +import java.util.Locale; + +public class ParticleData implements IParticleData { + private final ParticleType type; + public final float size; + public final float r, g, b; + public final float maxAgeMul; + public final boolean depthTest; + + public static ParticleData wisp(float size, float r, float g, float b) { + return wisp(size, r, g, b, 1); + } + + public static ParticleData wisp(float size, float r, float g, float b, float maxAgeMul) { + return wisp(size, r, g, b, maxAgeMul, true); + } + + public static ParticleData wisp(float size, float r, float g, float b, boolean depth) { + return wisp(size, r, g, b, 1, depth); + } + + public static ParticleData wisp(float size, float r, float g, float b, float maxAgeMul, boolean depthTest) { + return new ParticleData(ModParticles.WISP, size, r, g, b, maxAgeMul, depthTest); + } + + public static ParticleData sparkle(float size, float r, float g, float b, int maxAgeMul) { + return new ParticleData(ModParticles.SPARKLE, size, r, g, b, maxAgeMul, true); + } + + private ParticleData(ParticleType type, float size, float r, float g, float b, float maxAgeMul, boolean depthTest) { + this.type = type; + this.size = size; + this.r = r; + this.g = g; + this.b = b; + this.maxAgeMul = maxAgeMul; + this.depthTest = depthTest; + } + + + @Nonnull + @Override + public ParticleType getType() { + return type; + } + + @Override + public void write(PacketBuffer buf) { + buf.writeFloat(size); + buf.writeFloat(r); + buf.writeFloat(g); + buf.writeFloat(b); + buf.writeFloat(maxAgeMul); + buf.writeBoolean(depthTest); + } + + @Nonnull + @Override + public String getParameters() { + return String.format(Locale.ROOT, "%s %.2f %.2f %.2f %.2f %.2f %s", + this.getType().getRegistryName(), this.size, this.r, this.g, this.b, this.maxAgeMul, this.depthTest); + } + + public static final IDeserializer DESERIALIZER = new IDeserializer() { + @Nonnull + @Override + public ParticleData deserialize(@Nonnull ParticleType type, @Nonnull StringReader reader) throws CommandSyntaxException { + reader.expect(' '); + float size = reader.readFloat(); + reader.expect(' '); + float r = reader.readFloat(); + reader.expect(' '); + float g = reader.readFloat(); + reader.expect(' '); + float b = reader.readFloat(); + reader.expect(' '); + float mam = reader.readFloat(); + boolean depth = true; + if (reader.canRead()) { + reader.expect(' '); + depth = reader.readBoolean(); + } + return new ParticleData(type, size, r, g, b, mam, depth); + } + + @Override + public ParticleData read(@Nonnull ParticleType type, PacketBuffer buf) { + return new ParticleData(type, buf.readFloat(), buf.readFloat(), buf.readFloat(), buf.readFloat(), buf.readFloat(), buf.readBoolean()); + } + }; +} diff --git a/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java b/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java index bc5514db7..714576afe 100644 --- a/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java +++ b/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java @@ -16,8 +16,14 @@ import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.profiler.IProfiler; import net.minecraft.profiler.Profiler; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.client.event.ParticleFactoryRegisterEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; import org.lwjgl.opengl.GL11; +import vazkii.botania.common.lib.LibMisc; +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD) public final class ParticleRenderDispatcher { public static int wispFxCount = 0; @@ -26,6 +32,12 @@ public final class ParticleRenderDispatcher { public static int fakeSparkleFxCount = 0; public static int lightningCount = 0; + @SubscribeEvent + public static void registerFactories(ParticleFactoryRegisterEvent evt) { + Minecraft.getInstance().particles.registerFactory(ModParticles.WISP, WispParticleType.FACTORY); + Minecraft.getInstance().particles.registerFactory(ModParticles.SPARKLE, SparkleParticleType.FACTORY); + } + // Called from LightningHandler.onRenderWorldLast since that was // already registered. /shrug public static void dispatch() { diff --git a/src/main/java/vazkii/botania/client/fx/SparkleParticleType.java b/src/main/java/vazkii/botania/client/fx/SparkleParticleType.java new file mode 100644 index 000000000..742d20a1a --- /dev/null +++ b/src/main/java/vazkii/botania/client/fx/SparkleParticleType.java @@ -0,0 +1,14 @@ +package vazkii.botania.client.fx; + +import net.minecraft.client.particle.IParticleFactory; +import net.minecraft.particles.ParticleType; + +public class SparkleParticleType extends ParticleType { + public SparkleParticleType() { + super(false, ParticleData.DESERIALIZER); + } + + public static IParticleFactory FACTORY = + (data, world, x, y, z, xSpeed, ySpeed, zSpeed) + -> new FXSparkle(world, x, y, z, data.size, data.r, data.g, data.b, (int) data.maxAgeMul); +} diff --git a/src/main/java/vazkii/botania/client/fx/WispParticleType.java b/src/main/java/vazkii/botania/client/fx/WispParticleType.java new file mode 100644 index 000000000..c801a10dc --- /dev/null +++ b/src/main/java/vazkii/botania/client/fx/WispParticleType.java @@ -0,0 +1,14 @@ +package vazkii.botania.client.fx; + +import net.minecraft.client.particle.IParticleFactory; +import net.minecraft.particles.ParticleType; + +public class WispParticleType extends ParticleType { + public WispParticleType() { + super(false, ParticleData.DESERIALIZER); + } + + public static IParticleFactory FACTORY = + (data, world, x, y, z, xSpeed, ySpeed, zSpeed) -> + new FXWisp(world, x, y, z, xSpeed, ySpeed, zSpeed, data.size, data.r, data.g, data.b, data.depthTest, data.maxAgeMul); +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java index a0718c020..209163364 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java @@ -50,8 +50,8 @@ public class ManaPoolRecipeCategory implements IRecipeCategory 0.6) - Botania.proxy.wispFX(getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, getPos().getY() + 0.75 + Math.random() * 0.2 - 0.1, getPos().getZ() + 0.5, state == INCREASING ? 0.05F : 1F, 0.05F, state == INCREASING ? 1F : 0.05F, (float) Math.random() / 7, (float) -Math.random() / 50); + if(state != NONE && Math.random() > 0.6) { + float r = state == INCREASING ? 0.05F : 1F; + float b = state == INCREASING ? 1F : 0.05F; + ParticleData data = ParticleData.wisp((float) Math.random() / 7, r, 0.05F, b, 1); + world.addParticle(data, getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, getPos().getY() + 0.75 + Math.random() * 0.2 - 0.1, getPos().getZ() + 0.5, 0, (float) Math.random() / 50, 0); + } } else { int mana = 0; for(Direction dir : MathHelper.HORIZONTALS) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java index 89b192d76..608eafa82 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java @@ -22,6 +22,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.recipe.RecipePureDaisy; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntitySpecialFlower; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.core.handler.ConfigHandler; @@ -145,7 +146,8 @@ public class SubTilePureDaisy extends TileEntitySpecialFlower { double y = coords.getY() + Math.random() + 0.5; double z = coords.getZ() + Math.random(); - Botania.proxy.wispFX(x, y, z, 1F, 1F, 1F, (float) Math.random() / 2F); + ParticleData data = ParticleData.wisp((float) Math.random() / 2F, 1, 1, 1); + getWorld().addParticle(data, x, y, z, 0, 0, 0); } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java index 65935ca6a..3664e61c9 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java @@ -12,19 +12,13 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.block.BlockState; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.LivingEntity; import net.minecraft.entity.item.ItemEntity; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; -import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -34,8 +28,7 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.common.Botania; -import vazkii.botania.common.block.ModSubtiles; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.PacketHandler; @@ -61,8 +54,10 @@ public class SubTileDaffomill extends TileEntityFunctionalFlower { public void tickFlower() { super.tickFlower(); - if(getWorld().rand.nextInt(4) == 0) - Botania.proxy.wispFX(getPos().getX() + Math.random(), getPos().getY() + Math.random(), getPos().getZ() + Math.random(), 0.05F, 0.05F, 0.05F, 0.25F + (float) Math.random() * 0.15F, orientation.getXOffset() * 0.1F, orientation.getYOffset() * 0.1F, orientation.getZOffset() * 0.1F); + if(getWorld().rand.nextInt(4) == 0) { + ParticleData data = ParticleData.wisp(0.25F + (float) Math.random() * 0.15F, 0.05F, 0.05F, 0.05F); + world.addParticle(data, getPos().getX() + Math.random(), getPos().getY() + Math.random(), getPos().getZ() + Math.random(), orientation.getXOffset() * 0.1F, orientation.getYOffset() * 0.1F, orientation.getZOffset() * 0.1F); + } if(windTicks == 0 && mana > 0) { windTicks = 20; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java index 8922afbd3..dbba77cf6 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java @@ -14,14 +14,11 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.LivingEntity; import net.minecraft.fluid.Fluid; import net.minecraft.fluid.IFluidState; -import net.minecraft.block.Blocks; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.SoundEvents; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; import net.minecraft.tags.FluidTags; import net.minecraft.tags.Tag; import net.minecraft.tileentity.TileEntityType; @@ -34,8 +31,7 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; -import vazkii.botania.common.Botania; -import vazkii.botania.common.block.ModSubtiles; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -69,8 +65,10 @@ public class SubTileHydroangeas extends TileEntityGeneratingFlower { if(cooldown > 0) { cooldown--; - for(int i = 0; i < 3; i++) - Botania.proxy.wispFX(getPos().getX() + 0.5 + Math.random() * 0.2 - 0.1, getPos().getY() + 0.5 + Math.random() * 0.2 - 0.1, getPos().getZ() + 0.5 + Math.random() * 0.2 - 0.1, 0.1F, 0.1F, 0.1F, (float) Math.random() / 6, (float) -Math.random() / 30); + for(int i = 0; i < 3; i++) { + ParticleData data = ParticleData.wisp((float) Math.random() / 6, 0.1F, 0.1F, 0.1F, 1); + world.addParticle(data, getPos().getX() + 0.5 + Math.random() * 0.2 - 0.1, getPos().getY() + 0.5 + Math.random() * 0.2 - 0.1, getPos().getZ() + 0.5 + Math.random() * 0.2 - 0.1, 0, (float) Math.random() / 30, 0); + } } if(burnTime == 0) { @@ -121,8 +119,9 @@ public class SubTileHydroangeas extends TileEntityGeneratingFlower { } public void doBurnParticles() { - Botania.proxy.wispFX(getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, getPos().getY() + 0.55 + Math.random() * 0.2 - 0.1, getPos().getZ() + 0.5, 0.05F, 0.05F, 0.7F, (float) Math.random() / 6, (float) -Math.random() / 60); - } + ParticleData data = ParticleData.wisp((float) Math.random() / 6, 0.05F, 0.05F, 0.7F, 1); + world.addParticle(data, getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, getPos().getY() + 0.55 + Math.random() * 0.2 - 0.1, getPos().getZ() + 0.5, 0, (float) Math.random() / 60, 0); + } public Tag getMaterialToSearchFor() { return FluidTags.WATER; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java index c0b563d8e..c1cc5443b 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.subtile.generating; -import net.minecraft.block.material.Material; import net.minecraft.fluid.Fluid; import net.minecraft.tags.FluidTags; import net.minecraft.tags.Tag; @@ -18,8 +17,7 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundCategory; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.Botania; -import vazkii.botania.common.block.ModSubtiles; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -44,8 +42,9 @@ public class SubTileThermalily extends SubTileHydroangeas { @Override public void doBurnParticles() { - Botania.proxy.wispFX(getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, getPos().getY() + 0.9 + Math.random() * 0.2 - 0.1, getPos().getZ() + 0.5, 0.7F, 0.05F, 0.05F, (float) Math.random() / 6, (float) -Math.random() / 60); - } + ParticleData data = ParticleData.wisp((float) Math.random() / 6, 0.7F, 0.05F, 0.05F, 1); + world.addParticle(data, getPos().getX() + 0.55 + Math.random() * 0.2 - 0.1, getPos().getY() + 0.9 + Math.random() * 0.2 - 0.1, getPos().getZ() + 0.5, 0, (float) Math.random() / 60, 0); + } @Override public Tag getMaterialToSearchFor() { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java index b43d72036..6c049975b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -12,17 +12,12 @@ package vazkii.botania.common.block.tile; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.item.ItemEntity; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.block.Blocks; import net.minecraft.item.Items; import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; import net.minecraft.item.crafting.Ingredient; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.tileentity.ITickableTileEntity; @@ -40,7 +35,7 @@ import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; -import vazkii.botania.common.Botania; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.mana.BlockPool; import vazkii.botania.common.block.tile.mana.TilePool; @@ -216,8 +211,9 @@ public class TileAlfPortal extends TileMod implements ITickableTileEntity { pos = CONVERTER_X_Z_FP.apply(pos); float motionMul = 0.2F; - Botania.proxy.wispFX(getPos().getX() + pos[0], getPos().getY() + pos[1], getPos().getZ() + pos[2], (float) (Math.random() * 0.25F), (float) (Math.random() * 0.5F + 0.5F), (float) (Math.random() * 0.25F), (float) (Math.random() * 0.15F + 0.1F), (float) (Math.random() - 0.5F) * motionMul, (float) (Math.random() - 0.5F) * motionMul, (float) (Math.random() - 0.5F) * motionMul); - } + ParticleData data = ParticleData.wisp((float) (Math.random() * 0.15F + 0.1F), (float) (Math.random() * 0.25F), (float) (Math.random() * 0.5F + 0.5F), (float) (Math.random() * 0.25F)); + world.addParticle(data, getPos().getX() + pos[0], getPos().getY() + pos[1], getPos().getZ() + pos[2], (float) (Math.random() - 0.5F) * motionMul, (float) (Math.random() - 0.5F) * motionMul, (float) (Math.random() - 0.5F) * motionMul); + } public boolean onWanded() { AlfPortalState state = world.getBlockState(getPos()).get(BotaniaStateProps.ALFPORTAL_STATE); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index d82a9a419..3adeb7aff 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -29,6 +29,7 @@ import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.api.recipe.RecipeBrew; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.RenderHelper; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ModSounds; @@ -128,9 +129,12 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver, I float g = color.getGreen() / 255F; float b = color.getBlue() / 255F; for(int i = 0; i < 5; i++) { - Botania.proxy.wispFX(pos.getX() + 0.7 - Math.random() * 0.4, pos.getY() + 0.9 - Math.random() * 0.2, pos.getZ() + 0.7 - Math.random() * 0.4, r, g, b, 0.1F + (float) Math.random() * 0.05F, 0.03F - (float) Math.random() * 0.06F, 0.03F + (float) Math.random() * 0.015F, 0.03F - (float) Math.random() * 0.06F); - for(int j = 0; j < 2; j++) - Botania.proxy.wispFX(pos.getX() + 0.7 - Math.random() * 0.4, pos.getY() + 0.9 - Math.random() * 0.2, pos.getZ() + 0.7 - Math.random() * 0.4, 0.2F, 0.2F, 0.2F, 0.1F + (float) Math.random() * 0.2F, 0.03F - (float) Math.random() * 0.06F, 0.03F + (float) Math.random() * 0.015F, 0.03F - (float) Math.random() * 0.06F); + ParticleData data1 = ParticleData.wisp(0.1F + (float) Math.random() * 0.05F, r, g, b); + world.addParticle(data1, pos.getX() + 0.7 - Math.random() * 0.4, pos.getY() + 0.9 - Math.random() * 0.2, pos.getZ() + 0.7 - Math.random() * 0.4, 0.03F - (float) Math.random() * 0.06F, 0.03F + (float) Math.random() * 0.015F, 0.03F - (float) Math.random() * 0.06F); + for(int j = 0; j < 2; j++) { + ParticleData data = ParticleData.wisp(0.1F + (float) Math.random() * 0.2F, 0.2F, 0.2F, 0.2F); + world.addParticle(data, pos.getX() + 0.7 - Math.random() * 0.4, pos.getY() + 0.9 - Math.random() * 0.2, pos.getZ() + 0.7 - Math.random() * 0.4, 0.03F - (float) Math.random() * 0.06F, 0.03F + (float) Math.random() * 0.015F, 0.03F - (float) Math.random() * 0.06F); + } } } @@ -171,8 +175,10 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver, I float g = c.getGreen() / 255F; float b = c.getBlue() / 255F; Botania.proxy.sparkleFX(pos.getX() + 0.5 + Math.random() * 0.4 - 0.2, pos.getY() + 1, pos.getZ() + 0.5 + Math.random() * 0.4 - 0.2, r, g, b, (float) Math.random() * 2F + 0.5F, 10); - for(int j = 0; j < 2; j++) - Botania.proxy.wispFX(pos.getX() + 0.7 - Math.random() * 0.4, pos.getY() + 0.9 - Math.random() * 0.2, pos.getZ() + 0.7 - Math.random() * 0.4, 0.2F, 0.2F, 0.2F, 0.1F + (float) Math.random() * 0.2F, 0.05F - (float) Math.random() * 0.1F, 0.05F + (float) Math.random() * 0.03F, 0.05F - (float) Math.random() * 0.1F); + for(int j = 0; j < 2; j++) { + ParticleData data = ParticleData.wisp(0.1F + (float) Math.random() * 0.2F, 0.2F, 0.2F, 0.2F); + world.addParticle(data, pos.getX() + 0.7 - Math.random() * 0.4, pos.getY() + 0.9 - Math.random() * 0.2, pos.getZ() + 0.7 - Math.random() * 0.4, 0.05F - (float) Math.random() * 0.1F, 0.05F + (float) Math.random() * 0.03F, 0.05F - (float) Math.random() * 0.1F); + } } world.playSound(pos.getX(), pos.getY(), pos.getZ(), ModSounds.potionCreate, SoundCategory.BLOCKS, 1F, 1.5F + (float) Math.random() * 0.25F, false); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java index 9625cfcb4..44eaa8ce1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -10,24 +10,21 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.potion.Effects; import net.minecraft.util.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.potion.Effects; import net.minecraft.potion.EffectInstance; import net.minecraft.tileentity.TileEntityType; import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.internal.VanillaPacketDispatcher; -import vazkii.botania.common.Botania; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.brew.ItemIncenseStick; import vazkii.botania.common.lib.LibBlockNames; @@ -81,9 +78,11 @@ public class TileIncensePlate extends TileSimpleInventory implements ITickableTi float r = color.getRed() / 255F; float g = color.getGreen() / 255F; float b = color.getBlue() / 255F; - Botania.proxy.wispFX(x - (Math.random() - 0.5) * 0.2, y - (Math.random() - 0.5) * 0.2, z - (Math.random() - 0.5) * 0.2, r, g, b, 0.05F + (float) Math.random() * 0.02F, 0.005F - (float) Math.random() * 0.01F, 0.01F + (float) Math.random() * 0.005F, 0.005F - (float) Math.random() * 0.01F); - Botania.proxy.wispFX(x - (Math.random() - 0.5) * 0.2, y - (Math.random() - 0.5) * 0.2, z - (Math.random() - 0.5) * 0.2, 0.2F, 0.2F, 0.2F, 0.05F + (float) Math.random() * 0.02F, 0.005F - (float) Math.random() * 0.01F, 0.01F + (float) Math.random() * 0.001F, 0.005F - (float) Math.random() * 0.01F); - } + ParticleData data1 = ParticleData.wisp(0.05F + (float) Math.random() * 0.02F, r, g, b); + world.addParticle(data1, x - (Math.random() - 0.5) * 0.2, y - (Math.random() - 0.5) * 0.2, z - (Math.random() - 0.5) * 0.2, 0.005F - (float) Math.random() * 0.01F, 0.01F + (float) Math.random() * 0.005F, 0.005F - (float) Math.random() * 0.01F); + ParticleData data = ParticleData.wisp(0.05F + (float) Math.random() * 0.02F, 0.2F, 0.2F, 0.2F); + world.addParticle(data, x - (Math.random() - 0.5) * 0.2, y - (Math.random() - 0.5) * 0.2, z - (Math.random() - 0.5) * 0.2, 0.005F - (float) Math.random() * 0.01F, 0.01F + (float) Math.random() * 0.001F, 0.005F - (float) Math.random() * 0.01F); + } } else { itemHandler.setStackInSlot(0, ItemStack.EMPTY); burning = false; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 3c99edfb1..d49f2bcc4 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -49,6 +49,7 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.api.wand.IWandBindable; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockLightRelay; import vazkii.botania.common.block.ModBlocks; @@ -116,7 +117,8 @@ public class TileLightRelay extends TileMod implements ITickableTileEntity, IWan mul = Math.min(maxMul, mul + mulPer); double rad = radPer * (i + ticksElapsed * 0.4); Vector3 vecRot = vecMag.crossProduct(Vector3.ONE).multiply(mul).rotate(rad, vecMag).add(vecTip); - Botania.proxy.wispFX(vecRot.x, vecRot.y, vecRot.z, 0.4F, 0.4F, 1F, 0.1F, (float) -vecMag.x, (float) -vecMag.y, (float) -vecMag.z, 1F); + ParticleData data = ParticleData.wisp(0.1F, 0.4F, 0.4F, 1F, 1); + world.addParticle(data, vecRot.x, vecRot.y, vecRot.z, (float) -vecMag.x, (float) -vecMag.y, (float) -vecMag.z); vecTip = vecTip.add(vecMag); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java index ee89791c8..e51967ddc 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java @@ -14,7 +14,7 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntityType; import net.minecraft.tileentity.ITickableTileEntity; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.common.Botania; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; @@ -66,8 +66,9 @@ public class TileManaFlame extends TileMod implements ITickableTileEntity { float s = 0.2F + (float) Math.random() * 0.1F; float m = 0.03F + (float) Math.random() * 0.015F; - Botania.proxy.wispFX(x, y, z, r, g, b, s, -m); - } + ParticleData data = ParticleData.wisp(s, r, g, b, 1); + world.addParticle(data, x, y, z, 0, m, 0); + } } public int getLightColor() { diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java index a8d2b0ee2..fec4f162b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -18,6 +18,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.block.BlockPylon; @@ -73,9 +74,12 @@ public class TilePylon extends TileEntity implements ITickableTileEntity { centerBlock = centerBlock.subtract(new Vector3(0, 0.5, 0)); Vector3 movementVector = centerBlock.subtract(ourCoords).normalize().multiply(0.2); - Botania.proxy.wispFX(x, pos.getY() + 0.25, z, (float) Math.random() * 0.25F, 0.75F + (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, 0.25F + (float) Math.random() * 0.1F, -0.075F - (float) Math.random() * 0.015F); - if(world.rand.nextInt(3) == 0) - Botania.proxy.wispFX(x, pos.getY() + 0.25, z, (float) Math.random() * 0.25F, 0.75F + (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, 0.25F + (float) Math.random() * 0.1F, (float) movementVector.x, (float) movementVector.y, (float) movementVector.z); + ParticleData data = ParticleData.wisp(0.25F + (float) Math.random() * 0.1F, (float) Math.random() * 0.25F, 0.75F + (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, 1); + world.addParticle(data, x, pos.getY() + 0.25, z, 0, -(-0.075F - (float) Math.random() * 0.015F), 0); + if(world.rand.nextInt(3) == 0) { + ParticleData data1 = ParticleData.wisp(0.25F + (float) Math.random() * 0.1F, (float) Math.random() * 0.25F, 0.75F + (float) Math.random() * 0.25F, (float) Math.random() * 0.25F); + world.addParticle(data1, x, pos.getY() + 0.25, z, (float) movementVector.x, (float) movementVector.y, (float) movementVector.z); + } } } else { Vector3 ourCoords = Vector3.fromTileEntityCenter(this).add(0, 1 + (Math.random() - 0.5 * 0.25), 0); @@ -91,9 +95,12 @@ public class TilePylon extends TileEntity implements ITickableTileEntity { if(world.rand.nextInt(4) == 0) Botania.proxy.sparkleFX(centerBlock.x + (Math.random() - 0.5) * 0.5, centerBlock.y, centerBlock.z + (Math.random() - 0.5) * 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random(), 8); - Botania.proxy.wispFX(pos.getX() + 0.5 + (Math.random() - 0.5) * 0.25, pos.getY() - 0.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.25, r / 255F, g / 255F, b / 255F, (float) Math.random() / 3F, -0.04F); - Botania.proxy.wispFX(pos.getX() + 0.5 + (Math.random() - 0.5) * 0.125, pos.getY() + 1.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.125, r / 255F, g / 255F, b / 255F, (float) Math.random() / 5F, -0.001F); - Botania.proxy.wispFX(pos.getX() + 0.5 + (Math.random() - 0.5) * 0.25, pos.getY() + 1.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.25, r / 255F, g / 255F, b / 255F, (float) Math.random() / 8F, (float) movementVector.x, (float) movementVector.y, (float) movementVector.z); + ParticleData data1 = ParticleData.wisp((float) Math.random() / 3F, r / 255F, g / 255F, b / 255F, 1); + world.addParticle(data1, pos.getX() + 0.5 + (Math.random() - 0.5) * 0.25, pos.getY() - 0.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.25, 0, - -0.04F, 0); + ParticleData data = ParticleData.wisp((float) Math.random() / 5F, r / 255F, g / 255F, b / 255F, 1); + world.addParticle(data, pos.getX() + 0.5 + (Math.random() - 0.5) * 0.125, pos.getY() + 1.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.125, 0, - -0.001F, 0); + ParticleData data2 = ParticleData.wisp((float) Math.random() / 8F, r / 255F, g / 255F, b / 255F); + world.addParticle(data2, pos.getX() + 0.5 + (Math.random() - 0.5) * 0.25, pos.getY() + 1.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.25, (float) movementVector.x, (float) movementVector.y, (float) movementVector.z); } } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 09d25d2d3..3c924742b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -14,16 +14,12 @@ import net.minecraft.client.Minecraft; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.resources.I18n; import net.minecraft.entity.item.ItemEntity; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Hand; -import net.minecraft.util.Hand; import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; @@ -36,6 +32,7 @@ import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.core.helper.RenderHelper; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ModSounds; @@ -44,8 +41,6 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.material.ItemRune; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; -import vazkii.botania.common.network.PacketBotaniaEffect; -import vazkii.botania.common.network.PacketHandler; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -173,8 +168,10 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver, Botania.proxy.lightningFX(vec, endVec, 2F, 0x00948B, 0x00E4D7); } - if (cooldown > 0) - Botania.proxy.wispFX(pos.getX() + Math.random(), pos.getY() + 0.8, pos.getZ() + Math.random(), 0.2F, 0.2F, 0.2F, 0.2F, -0.025F); + if (cooldown > 0) { + ParticleData data = ParticleData.wisp(0.2F, 0.2F, 0.2F, 0.2F, 1); + world.addParticle(data, pos.getX() + Math.random(), pos.getY() + 0.8, pos.getZ() + Math.random(), 0, - -0.025F, 0); + } } if(cooldown > 0) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java index 8e567a726..653e3c850 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -14,27 +14,20 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.MobEntity; import net.minecraft.entity.ILivingEntityData; -import net.minecraft.entity.MobEntity; import net.minecraft.entity.SpawnReason; -import net.minecraft.particles.ParticleTypes; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.ListNBT; import net.minecraft.nbt.ListNBT; import net.minecraft.tileentity.MobSpawnerTileEntity; import net.minecraft.world.spawner.AbstractSpawner; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.MobSpawnerTileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.util.WeightedSpawnerEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.spawner.AbstractSpawner; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.mana.IManaReceiver; -import vazkii.botania.common.Botania; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; @@ -66,8 +59,10 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver, ITickable BlockPos blockpos = logic.getSpawnerPosition(); if (world.isRemote) { // Botania - use own particles - if(Math.random() > 0.5) - Botania.proxy.wispFX(getPos().getX() + 0.3 + Math.random() * 0.5, getPos().getY() - 0.3 + Math.random() * 0.25, getPos().getZ() + Math.random(), 0.6F - (float) Math.random() * 0.3F, 0.1F, 0.6F - (float) Math.random() * 0.3F, (float) Math.random() / 3F, -0.025F - 0.005F * (float) Math.random(), 2F); + if(Math.random() > 0.5) { + ParticleData data = ParticleData.wisp((float) Math.random() / 3F, 0.6F - (float) Math.random() * 0.3F, 0.1F, 0.6F - (float) Math.random() * 0.3F, 2F); + world.addParticle(data, getPos().getX() + 0.3 + Math.random() * 0.5, getPos().getY() - 0.3 + Math.random() * 0.25, getPos().getZ() + Math.random(), 0, -(-0.025F - 0.005F * (float) Math.random()), 0); + } if (logic.spawnDelay > 0) { --logic.spawnDelay; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java b/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java index eae0a3abd..4280e2fb9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.tile; import net.minecraft.tileentity.ITickableTileEntity; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.Botania; public class TileSpiritShrine extends TileMod implements ITickableTileEntity { @@ -54,8 +55,11 @@ public class TileSpiritShrine extends TileMod implements ITickableTileEntity { wticks += tickIncrement; float[] colorsfx = colors[i >= colors.length ? 0 : i]; - Botania.proxy.wispFX(x, y, z, colorsfx[0], colorsfx[1], colorsfx[2], 0.85F, (float)g * 0.05F, 0.25F); - Botania.proxy.wispFX(x, y, z, colorsfx[0], colorsfx[1], colorsfx[2], (float) Math.random() * 0.1F + 0.1F, (float) (Math.random() - 0.5) * 0.05F, (float) (Math.random() - 0.5) * 0.05F, (float) (Math.random() - 0.5) * 0.05F, 0.9F); + ParticleData data = ParticleData.wisp(0.85F, colorsfx[0], colorsfx[1], colorsfx[2], 0.25F); + world.addParticle(data, x, y, z, 0, (float) (-g * 0.05), 0); + + data = ParticleData.wisp((float) Math.random() * 0.1F + 0.1F, colorsfx[0], colorsfx[1], colorsfx[2], 0.9F); + world.addParticle(data, x, y, z, (float) (Math.random() - 0.5) * 0.05F, (float) (Math.random() - 0.5) * 0.05F, (float) (Math.random() - 0.5) * 0.05F); } } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index 1c754af6f..6cbe8ee84 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -55,6 +55,7 @@ import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.core.helper.RenderHelper; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; @@ -259,8 +260,10 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt if(world.isRemote) { double particleChance = 1F - (double) getCurrentMana() / (double) manaCap * 0.1; - if(Math.random() > particleChance) - Botania.proxy.wispFX(pos.getX() + 0.3 + Math.random() * 0.5, pos.getY() + 0.6 + Math.random() * 0.25, pos.getZ() + Math.random(), PARTICLE_COLOR.getRed() / 255F, PARTICLE_COLOR.getGreen() / 255F, PARTICLE_COLOR.getBlue() / 255F, (float) Math.random() / 3F, (float) -Math.random() / 25F, 2F); + if(Math.random() > particleChance) { + ParticleData data = ParticleData.wisp((float) Math.random() / 3F, PARTICLE_COLOR.getRed() / 255F, PARTICLE_COLOR.getGreen() / 255F, PARTICLE_COLOR.getBlue() / 255F, 2F); + world.addParticle(data, pos.getX() + 0.3 + Math.random() * 0.5, pos.getY() + 0.6 + Math.random() * 0.25, pos.getZ() + Math.random(), 0, (float) Math.random() / 25F, 0); + } return; } diff --git a/src/main/java/vazkii/botania/common/core/proxy/IProxy.java b/src/main/java/vazkii/botania/common/core/proxy/IProxy.java index 1d3cf2986..165b4eac2 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/IProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/IProxy.java @@ -9,6 +9,7 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.core.helper.Vector3; public interface IProxy { @@ -46,28 +47,6 @@ public interface IProxy { void sparkleFX(double x, double y, double z, float r, float g, float b, float size, int m, boolean fake); - void setWispFXDistanceLimit(boolean limit); - - void setWispFXDepthTest(boolean depth); - - default void wispFX(double x, double y, double z, float r, float g, float b, float size) { - wispFX(x, y, z, r, g, b, size, 0F); - } - - default void wispFX(double x, double y, double z, float r, float g, float b, float size, float gravity) { - wispFX(x, y, z, r, g, b, size, gravity, 1F); - } - - default void wispFX(double x, double y, double z, float r, float g, float b, float size, float gravity, float maxAgeMul) { - wispFX(x, y, z, r, g, b, size, 0, -gravity, 0, maxAgeMul); - } - - default void wispFX(double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz) { - wispFX(x, y, z, r, g, b, size, motionx, motiony, motionz, 1F); - } - - void wispFX(double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz, float maxAgeMul); - default void lightningFX(Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, int colorOuter, int colorInner) { lightningFX(vectorStart, vectorEnd, ticksPerMeter, System.nanoTime(), colorOuter, colorInner); } diff --git a/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java b/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java index ffee66737..03ffee851 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java @@ -15,7 +15,6 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraft.world.dimension.DimensionType; import net.minecraftforge.fml.server.ServerLifecycleHooks; @@ -80,15 +79,6 @@ public class ServerProxy implements IProxy { @Override public void sparkleFX(double x, double y, double z, float r, float g, float b, float size, int m, boolean fake) {} - @Override - public void setWispFXDistanceLimit(boolean limit) {} - - @Override - public void setWispFXDepthTest(boolean depth) {} - - @Override - public void wispFX(double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz, float maxAgeMul) {} - @Override public void lightningFX(Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner) {} diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index 794ac1dc2..55ee006b1 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -29,7 +29,7 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.Explosion; import net.minecraft.world.World; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.common.Botania; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.core.helper.Vector3; @@ -159,8 +159,10 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { setMotion(mot); - if(liveTime > delay) - Botania.proxy.wispFX(posX, posY, posZ, 1F, 1F, 0F, 0.3F, 0F); + if(liveTime > delay) { + ParticleData data = ParticleData.wisp(0.3F, 1F, 1F, 0F, 1); + world.addParticle(data, posX, posY, posZ, 0, -0F, 0); + } if(liveTime > 200 + delay) remove(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 2cd4bd7a7..b20f779a5 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -21,8 +21,6 @@ import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.entity.*; import net.minecraft.entity.ai.goal.SwimGoal; import net.minecraft.entity.ai.goal.LookAtGoal; -import net.minecraft.entity.monster.SkeletonEntity; -import net.minecraft.entity.monster.WitchEntity; import net.minecraft.entity.monster.WitherSkeletonEntity; import net.minecraft.entity.monster.ZombieEntity; import net.minecraft.entity.player.PlayerEntity; @@ -51,7 +49,6 @@ import net.minecraft.util.SoundEvents; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.Style; @@ -75,6 +72,7 @@ import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; import vazkii.botania.client.core.handler.BossBarHandler; import vazkii.botania.client.core.helper.ShaderHelper; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.Botania; import vazkii.botania.common.advancements.DopplegangerNoArmorTrigger; import vazkii.botania.common.block.ModBlocks; @@ -199,7 +197,7 @@ public class EntityDoppleganger extends MobEntity implements IBotaniaBoss, IEnti List invalidPylonBlocks = checkPylons(world, pos); if(!invalidPylonBlocks.isEmpty()) { if(world.isRemote) { - warnInvalidBlocks(invalidPylonBlocks); + warnInvalidBlocks(world, invalidPylonBlocks); } else { player.sendMessage(new TranslationTextComponent("botaniamisc.needsCatalysts").setStyle(new Style().setColor(TextFormatting.RED))); } @@ -211,7 +209,7 @@ public class EntityDoppleganger extends MobEntity implements IBotaniaBoss, IEnti List invalidArenaBlocks = checkArena(world, pos); if(!invalidArenaBlocks.isEmpty()) { if(world.isRemote) { - warnInvalidBlocks(invalidArenaBlocks); + warnInvalidBlocks(world, invalidArenaBlocks); } else { PacketHandler.sendTo((ServerPlayerEntity) player, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.ARENA_INDICATOR, pos.getX(), pos.getY(), pos.getZ())); @@ -300,12 +298,11 @@ public class EntityDoppleganger extends MobEntity implements IBotaniaBoss, IEnti return trippedPositions; } - private static void warnInvalidBlocks(Iterable invalidPositions) { - Botania.proxy.setWispFXDepthTest(false); + private static void warnInvalidBlocks(World world, Iterable invalidPositions) { + ParticleData data = ParticleData.wisp(0.5F, 1, 0.2F, 0.2F, 8, false); for(BlockPos pos_ : invalidPositions) { - Botania.proxy.wispFX(pos_.getX() + 0.5, pos_.getY() + 0.5, pos_.getZ() + 0.5, 1F, 0.2F, 0.2F, 0.5F, 0F, 8); + world.addParticle(data, pos_.getX() + 0.5, pos_.getY() + 0.5, pos_.getZ() + 0.5, 0, 0, 0); } - Botania.proxy.setWispFXDepthTest(true); } @Override @@ -535,7 +532,8 @@ public class EntityDoppleganger extends MobEntity implements IBotaniaBoss, IEnti double y = source.getY() + 0.5; double z = source.getZ() + 0.5 - Math.sin(rad) * ARENA_RANGE; - Botania.proxy.wispFX(x, y, z, r, g, b, 0.5F, (float) (Math.random() - 0.5F) * m, (float) (Math.random() - 0.5F) * mv, (float) (Math.random() - 0.5F) * m); + ParticleData data = ParticleData.wisp(0.5F, r, g, b); + world.addParticle(data, x, y, z, (float) (Math.random() - 0.5F) * m, (float) (Math.random() - 0.5F) * mv, (float) (Math.random() - 0.5F) * m); } if(getInvulTime() > 10) { @@ -556,8 +554,10 @@ public class EntityDoppleganger extends MobEntity implements IBotaniaBoss, IEnti float g = (float) Math.random() * 0.3F; float b = 0.7F + (float) Math.random() * 0.3F; - Botania.proxy.wispFX(partPos.x, partPos.y, partPos.z, r, g, b, 0.25F + (float) Math.random() * 0.1F, -0.075F - (float) Math.random() * 0.015F); - Botania.proxy.wispFX(partPos.x, partPos.y, partPos.z, r, g, b, 0.4F, (float) mot.x, (float) mot.y, (float) mot.z); + ParticleData data = ParticleData.wisp(0.25F + (float) Math.random() * 0.1F, r, g, b, 1); + world.addParticle(data, partPos.x, partPos.y, partPos.z, 0, -(-0.075F - (float) Math.random() * 0.015F), 0); + ParticleData data1 = ParticleData.wisp(0.4F, r, g, b); + world.addParticle(data1, partPos.x, partPos.y, partPos.z, (float) mot.x, (float) mot.y, (float) mot.z); } } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java index c3d9f997b..e22a5cbf6 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java @@ -13,19 +13,16 @@ package vazkii.botania.common.entity; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.EntityType; -import net.minecraft.entity.LivingEntity; import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.IPacket; import net.minecraft.util.SoundEvents; -import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.DamageSource; import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.common.Botania; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.core.helper.MathHelper; import javax.annotation.Nonnull; @@ -66,14 +63,16 @@ public class EntityFlameRing extends Entity { double x = Math.cos(rad) * renderRadius; double z = Math.sin(rad) * renderRadius; - Botania.proxy.wispFX(posX + x, posY - 0.2, posZ + z, 1F, (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, 0.65F + (float) Math.random() * 0.45F, (float) (Math.random() - 0.5F) * 0.15F, 0.055F + (float) Math.random() * 0.025F, (float) (Math.random() - 0.5F) * 0.15F); + ParticleData data1 = ParticleData.wisp(0.65F + (float) Math.random() * 0.45F, 1F, (float) Math.random() * 0.25F, (float) Math.random() * 0.25F); + world.addParticle(data1, posX + x, posY - 0.2, posZ + z, (float) (Math.random() - 0.5F) * 0.15F, 0.055F + (float) Math.random() * 0.025F, (float) (Math.random() - 0.5F) * 0.15F); float gs = (float) Math.random() * 0.15F; float smokeRadius = (float) (renderRadius - Math.random() * renderRadius * 0.9); x = Math.cos(rad) * smokeRadius; z = Math.sin(rad) * smokeRadius; - Botania.proxy.wispFX(posX + x, posY - 0.2, posZ + z, gs, gs, gs, 0.65F + (float) Math.random() * 0.45F, -0.155F - (float) Math.random() * 0.025F); - } + ParticleData data = ParticleData.wisp(0.65F + (float) Math.random() * 0.45F, gs, gs, gs, 1); + world.addParticle(data, posX + x, posY - 0.2, posZ + z, 0, -(-0.155F - (float) Math.random() * 0.025F), 0); + } } if(world.rand.nextInt(20) == 0) diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java index 71f81387b..1a17dd524 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java @@ -13,11 +13,9 @@ package vazkii.botania.common.entity; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.IPacket; import net.minecraft.potion.Effects; -import net.minecraft.nbt.CompoundNBT; import net.minecraft.potion.EffectInstance; import net.minecraft.util.DamageSource; import net.minecraft.util.SoundCategory; @@ -26,7 +24,7 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.common.Botania; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.core.handler.ModSounds; import javax.annotation.Nonnull; @@ -61,16 +59,20 @@ public class EntityMagicLandmine extends Entity { float b = 0.2F; //Botania.proxy.wispFX(world, posX, posY, posZ, r, g, b, 0.6F, -0.2F, 1); - for(int i = 0; i < 6; i++) - Botania.proxy.wispFX(posX - range + Math.random() * range * 2, posY, posZ - range + Math.random() * range * 2, r, g, b, 0.4F, -0.015F, 1); + for(int i = 0; i < 6; i++) { + ParticleData data = ParticleData.wisp(0.4F, r, g, b, (float) 1); + world.addParticle(data, posX - range + Math.random() * range * 2, posY, posZ - range + Math.random() * range * 2, 0, - -0.015F, 0); + } if(ticksExisted >= 55) { world.playSound(null, posX, posY, posZ, ModSounds.gaiaTrap, SoundCategory.NEUTRAL, 0.3F, 1F); float m = 0.35F; g = 0.4F; - for(int i = 0; i < 25; i++) - Botania.proxy.wispFX(posX, posY + 1, posZ, r, g, b, 0.5F, (float) (Math.random() - 0.5F) * m, (float) (Math.random() - 0.5F) * m, (float) (Math.random() - 0.5F) * m); + for(int i = 0; i < 25; i++) { + ParticleData data = ParticleData.wisp(0.5F, r, g, b); + world.addParticle(data, posX, posY + 1, posZ, (float) (Math.random() - 0.5F) * m, (float) (Math.random() - 0.5F) * m, (float) (Math.random() - 0.5F) * m); + } if(!world.isRemote) { List players = world.getEntitiesWithinAABB(PlayerEntity.class, new AxisAlignedBB(posX - range, posY - range, posZ - range, posX + range, posY + range, posZ + range)); diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 128c4b2ce..9c2e15a21 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -64,6 +64,7 @@ import vazkii.botania.api.mana.IManaSpreader; import vazkii.botania.api.mana.IManaTrigger; import vazkii.botania.api.mana.IPingable; import vazkii.botania.api.mana.IThrottledPacket; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; @@ -444,13 +445,12 @@ public class EntityManaBurst extends ThrowableEntity implements IManaBurst { if(!noParticles && shouldDoFakeParticles()) Botania.proxy.sparkleFX(posX, posY, posZ, r, g, b, 0.4F * size, 1, true); } else { - boolean monocle = Botania.proxy.isClientPlayerWearingMonocle(); - if(monocle) - Botania.proxy.setWispFXDepthTest(false); + boolean depth = !Botania.proxy.isClientPlayerWearingMonocle(); - if(ConfigHandler.CLIENT.subtlePowerSystem.get()) - Botania.proxy.wispFX(posX, posY, posZ, r, g, b, 0.1F * size, (float) (Math.random() - 0.5F) * 0.02F, (float) (Math.random() - 0.5F) * 0.02F, (float) (Math.random() - 0.5F) * 0.01F); - else { + if(ConfigHandler.CLIENT.subtlePowerSystem.get()) { + ParticleData data = ParticleData.wisp(0.1F * size, r, g, b, depth); + world.addParticle(data, posX, posY, posZ, (float) (Math.random() - 0.5F) * 0.02F, (float) (Math.random() - 0.5F) * 0.02F, (float) (Math.random() - 0.5F) * 0.01F); + } else { float or = r; float og = g; float ob = b; @@ -475,7 +475,8 @@ public class EntityManaBurst extends ThrowableEntity implements IManaBurst { b = ob + (float) Math.random() * 0.125F; } size = osize + ((float) Math.random() - 0.5F) * 0.065F + (float) Math.sin(new Random(entityUniqueID.getMostSignificantBits()).nextInt(9001)) * 0.4F; - Botania.proxy.wispFX(posX, posY, posZ, r, g, b, 0.2F * size, + ParticleData data = ParticleData.wisp(0.2F * size, r, g, b, depth); + world.addParticle(data, posX, posY, posZ, (float) -getMotion().getX() * 0.01F, (float) -getMotion().getY() * 0.01F, (float) -getMotion().getZ() * 0.01F); @@ -490,15 +491,13 @@ public class EntityManaBurst extends ThrowableEntity implements IManaBurst { break; } while(Math.abs(diffVec.mag()) > distance); - Botania.proxy.wispFX(posX, posY, posZ, or, og, ob, 0.1F * size, (float) (Math.random() - 0.5F) * 0.06F, (float) (Math.random() - 0.5F) * 0.06F, (float) (Math.random() - 0.5F) * 0.06F); + ParticleData data = ParticleData.wisp(0.1F * size, or, og, ob, depth); + world.addParticle(data, posX, posY, posZ, (float) (Math.random() - 0.5F) * 0.06F, (float) (Math.random() - 0.5F) * 0.06F, (float) (Math.random() - 0.5F) * 0.06F); posX = savedPosX; posY = savedPosY; posZ = savedPosZ; } - - if(monocle) - Botania.proxy.setWispFXDepthTest(true); } } @@ -565,8 +564,10 @@ public class EntityManaBurst extends ThrowableEntity implements IManaBurst { float size = (float) mana / (float) maxMana; if(!ConfigHandler.CLIENT.subtlePowerSystem.get()) - for(int i = 0; i < 4; i++) - Botania.proxy.wispFX(posX, posY, posZ, r, g, b, 0.15F * size, (float) (Math.random() - 0.5F) * 0.04F, (float) (Math.random() - 0.5F) * 0.04F, (float) (Math.random() - 0.5F) * 0.04F); + for(int i = 0; i < 4; i++) { + ParticleData data = ParticleData.wisp(0.15F * size, r, g, b); + world.addParticle(data, posX, posY, posZ, (float) (Math.random() - 0.5F) * 0.04F, (float) (Math.random() - 0.5F) * 0.04F, (float) (Math.random() - 0.5F) * 0.04F); + } Botania.proxy.sparkleFX((float) posX, (float) posY, (float) posZ, r, g, b, 4, 2); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index bf4a6fcea..1d96a396d 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -30,7 +30,7 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.common.Botania; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.block.tile.mana.TilePump; @@ -118,8 +118,10 @@ public class EntityPoolMinecart extends AbstractMinecartEntity { double x = MathHelper.floor(posX); double y = MathHelper.floor(posY); double z = MathHelper.floor(posZ); - if(Math.random() > particleChance) - Botania.proxy.wispFX(x + 0.3 + Math.random() * 0.5, y + 0.85 + Math.random() * 0.25, z + Math.random(), color.getRed(), color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random() / 3F, (float) -Math.random() / 25F, 2F); + if(Math.random() > particleChance) { + ParticleData data = ParticleData.wisp((float) Math.random() / 3F, (float) color.getRed(), color.getGreen() / 255F, color.getBlue() / 255F, 2F); + world.addParticle(data, x + 0.3 + Math.random() * 0.5, y + 0.85 + Math.random() * 0.25, z + Math.random(), 0, (float) Math.random() / 25F, 0); + } } } diff --git a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java index 0a46ba088..ca5b99639 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java @@ -24,6 +24,7 @@ import net.minecraft.util.SoundEvents; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; import net.minecraftforge.registries.ObjectHolder; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibMisc; @@ -68,13 +69,16 @@ public class EntitySignalFlare extends Entity { int g = (hex & 0xFF00) >> 8; int b = hex & 0xFF; - Botania.proxy.setWispFXDistanceLimit(false); - for(int i = 0; i < 3; i++) - Botania.proxy.wispFX(posX, posY, posZ + 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random() * 5 + 1F, (float) (Math.random() - 0.5F), 10F * (float) Math.sqrt(256F / (256F - (float) posY)), (float) (Math.random() - 0.5F)); + // todo 1.14 use of client only addParticle version + for(int i = 0; i < 3; i++) { + ParticleData data = ParticleData.wisp((float) Math.random() * 5 + 1F, r / 255F, g / 255F, b / 255F); + world.addParticle(data, true, posX, posY, posZ + 0.5, (float) (Math.random() - 0.5F), 10F * (float) Math.sqrt(256F / (256F - (float) posY)), (float) (Math.random() - 0.5F)); + } - for(int i = 0; i < 4; i++) - Botania.proxy.wispFX(posX + 0.5, Math.min(256, getFiredAt() + Botania.proxy.getClientRenderDistance() * 16), posZ + 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random() * 15 + 8F, (float) (Math.random() - 0.5F) * 8F, 0F, (float) (Math.random() - 0.5F) * 8F); - Botania.proxy.setWispFXDistanceLimit(true); + for(int i = 0; i < 4; i++) { + ParticleData data = ParticleData.wisp((float) Math.random() * 15 + 8F, r / 255F, g / 255F, b / 255F); + world.addParticle(data, true, posX + 0.5, Math.min(256, getFiredAt() + Botania.proxy.getClientRenderDistance() * 16), posZ + 0.5, (float) (Math.random() - 0.5F) * 8F, 0F, (float) (Math.random() - 0.5F) * 8F); + } } } } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index a62063cac..319067dc0 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -13,61 +13,39 @@ package vazkii.botania.common.item; import net.minecraft.block.Blocks; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.AbstractGui; -import net.minecraft.client.gui.AbstractGui; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.AtlasTexture; -import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.block.Blocks; import net.minecraft.inventory.CraftingInventory; -import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.SimpleNamedContainerProvider; import net.minecraft.inventory.container.WorkbenchContainer; -import net.minecraft.inventory.CraftingInventory; -import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.container.WorkbenchContainer; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipeType; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResultType; -import net.minecraft.util.ActionResultType; import net.minecraft.util.Direction; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fml.network.NetworkHooks; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; @@ -75,16 +53,14 @@ import net.minecraftforge.items.ItemStackHandler; import net.minecraftforge.items.wrapper.EmptyHandler; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.client.gui.crafting.ContainerCraftingHalo; import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.core.helper.Vector3; -import vazkii.botania.common.lib.LibGuiIDs; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.Arrays; import java.util.Optional; @@ -218,8 +194,10 @@ public class ItemCraftingHalo extends ItemMod { Vec3d lookVec3 = player.getLookVec(); Vector3 centerVector = Vector3.fromEntityCenter(player).add(lookVec3.x * 3, 1.3, lookVec3.z * 3); float m = 0.1F; - for(int i = 0; i < 4; i++) - Botania.proxy.wispFX(centerVector.x, centerVector.y, centerVector.z, 1F, 0F, 1F, 0.2F + 0.2F * (float) Math.random(), ((float) Math.random() - 0.5F) * m, ((float) Math.random() - 0.5F) * m, ((float) Math.random() - 0.5F) * m); + for(int i = 0; i < 4; i++) { + ParticleData data = ParticleData.wisp(0.2F + 0.2F * (float) Math.random(), 1F, 0F, 1F); + world.addParticle(data, centerVector.x, centerVector.y, centerVector.z, ((float) Math.random() - 0.5F) * m, ((float) Math.random() - 0.5F) * m, ((float) Math.random() - 0.5F) * m); + } } private static boolean consumeRecipeIngredients(ItemStack[] recipe, IItemHandler inv, PlayerEntity player) { diff --git a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java index 88de93804..410e938d8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java +++ b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java @@ -10,20 +10,13 @@ */ package vazkii.botania.common.item; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.DyeColor; import net.minecraft.item.DyeColor; import net.minecraft.item.ItemUseContext; import net.minecraft.util.ActionResultType; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.common.Botania; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; import java.util.ArrayList; @@ -69,8 +62,9 @@ public class ItemFertilizer extends ItemMod { float red = (float) Math.random(); float green = (float) Math.random(); float blue = (float) Math.random(); - Botania.proxy.wispFX(x, y, z, red, green, blue, 0.15F + (float) Math.random() * 0.25F, -(float) Math.random() * 0.1F - 0.05F); - } + ParticleData data = ParticleData.wisp(0.15F + (float) Math.random() * 0.25F, red, green, blue, 1); + world.addParticle(data, x, y, z, 0, (float) Math.random() * 0.1F - 0.05F, 0); + } } return ActionResultType.SUCCESS; diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index fe807e094..11ca71b92 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -13,41 +13,27 @@ package vazkii.botania.common.item; import com.google.common.collect.ImmutableMap; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.block.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.dimension.DimensionType; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.TickEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.LogicalSide; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.item.IFloatingFlower.IslandType; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.handler.ModelHandler; -import vazkii.botania.common.Botania; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; -import java.util.Locale; import java.util.Map; import java.util.Random; import java.util.Set; @@ -109,8 +95,12 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { double z = (Math.random() - 0.5) * 3; float velMul = 0.025F; - Botania.proxy.wispFX(pos.getX() + 0.5 + x, pos.getY() + 0.5 + y, pos.getZ() + 0.5 + z, r, g, b, (float) Math.random() * 0.15F + 0.15F, (float) -x * velMul, (float) -y * velMul, (float) -z * velMul); - } + float motionx = (float) -x * velMul; + float motiony = (float) -y * velMul; + float motionz = (float) -z * velMul; + ParticleData data = ParticleData.wisp((float) Math.random() * 0.15F + 0.15F, r, g, b); + world.addParticle(data, pos.getX() + 0.5 + x, pos.getY() + 0.5 + y, pos.getZ() + 0.5 + z, motionx, motiony, motionz); + } } return ActionResultType.SUCCESS; diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index 5496fdead..b7916d5ab 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -24,7 +24,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.EntityRayTraceResult; import net.minecraft.util.math.RayTraceContext; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.TextFormatting; @@ -33,6 +32,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.multiblock.Multiblock; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.MathHelper; @@ -83,8 +83,9 @@ public class ItemSextant extends ItemMod { float radian = (float) (i * Math.PI / 180); double xp = x + Math.cos(radian) * radius; double zp = z + Math.sin(radian) * radius; - Botania.proxy.wispFX(xp + 0.5, source.y + 1, zp + 0.5, 0F, 1F, 1F, 0.3F, -0.01F); - } + ParticleData data = ParticleData.wisp(0.3F, 0F, 1F, 1F, 1); + world.addParticle(data, xp + 0.5, source.y + 1, zp + 0.5, 0, - -0.01F, 0); + } } } @@ -130,9 +131,10 @@ public class ItemSextant extends ItemMod { int y = ItemNBTHelper.getInt(stack, TAG_SOURCE_Y, -1); int z = ItemNBTHelper.getInt(stack, TAG_SOURCE_Z, 0); Vector3 source = new Vector3(x, y, z); - Botania.proxy.wispFX(source.x + 0.5, source.y + 1, source.z + 0.5, 1F, 0F, 0F, 0.2F, -0.1F); + ParticleData data = ParticleData.wisp(0.2F, 1F, 0F, 0F, 1); + world.addParticle(data, source.x + 0.5, source.y + 1, source.z + 0.5, 0, - -0.1F, 0); - Vector3 centerVec = Vector3.fromEntityCenter(player); + Vector3 centerVec = Vector3.fromEntityCenter(player); Vector3 diffVec = source.subtract(centerVec); Vector3 lookVec = new Vector3(player.getLookVec()); double mul = diffVec.y / lookVec.y; diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 263a7ea11..d71aa3731 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -10,44 +10,30 @@ */ package vazkii.botania.common.item; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; -import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.EntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.block.Blocks; -import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.MobSpawnerTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.MobSpawnerTileEntity; import net.minecraft.util.ActionResultType; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; import net.minecraft.world.server.ServerWorld; import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.registries.ForgeRegistries; import vazkii.botania.api.internal.VanillaPacketDispatcher; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.Botania; import vazkii.botania.common.advancements.UseItemSuccessTrigger; import vazkii.botania.common.core.helper.PlayerHelper; -import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -168,8 +154,9 @@ public class ItemSpawnerMover extends ItemMod { float red = (float) Math.random(); float green = (float) Math.random(); float blue = (float) Math.random(); - Botania.proxy.wispFX(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, red, green, blue, (float) Math.random() * 0.1F + 0.05F, (float) (Math.random() - 0.5F) * 0.15F, (float) (Math.random() - 0.5F) * 0.15F, (float) (Math.random() - 0.5F) * 0.15F); - } + ParticleData data = ParticleData.wisp((float) Math.random() * 0.1F + 0.05F, red, green, blue); + world.addParticle(data, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, (float) (Math.random() - 0.5F) * 0.15F, (float) (Math.random() - 0.5F) * 0.15F, (float) (Math.random() - 0.5F) * 0.15F); + } } return true; } else return false; diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 1250517dc..ff6582705 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -35,7 +35,6 @@ import net.minecraft.util.Rotation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.EntityRayTraceResult; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TranslationTextComponent; @@ -48,6 +47,7 @@ import vazkii.botania.api.wand.ICoordBoundItem; import vazkii.botania.api.wand.ITileBound; import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.api.wand.IWandable; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockPistonRelay; import vazkii.botania.common.block.ModBlocks; @@ -150,8 +150,12 @@ public class ItemTwigWand extends ItemMod implements ICoordBoundItem { float velMul = 0.07F; - Botania.proxy.wispFX(pos.getX() + 0.5 + x, pos.getY() + 0.5 + y, pos.getZ() + 0.5 + z, red, green, blue, (float) Math.random() * 0.15F + 0.15F, (float) -x * velMul, (float) -y * velMul, (float) -z * velMul); - } + float motionx = (float) -x * velMul; + float motiony = (float) -y * velMul; + float motionz = (float) -z * velMul; + ParticleData data = ParticleData.wisp((float) Math.random() * 0.15F + 0.15F, red, green, blue); + world.addParticle(data, pos.getX() + 0.5 + x, pos.getY() + 0.5 + y, pos.getZ() + 0.5 + z, motionx, motiony, motionz); + } } return ActionResultType.SUCCESS; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java index 34117d037..db0b5945b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java @@ -48,6 +48,7 @@ import net.minecraftforge.items.wrapper.InvWrapper; import vazkii.botania.api.item.AccessoryRenderHelper; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.EquipmentHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -103,24 +104,22 @@ public class ItemItemFinder extends ItemBauble { return; ListNBT blocks = ItemNBTHelper.getList(stack, TAG_BLOCK_POSITIONS, Constants.NBT.TAG_LONG, false); - Botania.proxy.setWispFXDepthTest(false); for(int i = 0; i < blocks.size(); i++) { BlockPos pos = BlockPos.fromLong(((LongNBT) blocks.get(i)).getLong()); float m = 0.02F; - Botania.proxy.wispFX(pos.getX() + (float) Math.random(), pos.getY() + (float) Math.random(), pos.getZ() + (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.15F + 0.05F * (float) Math.random(), m * (float) (Math.random() - 0.5), m * (float) (Math.random() - 0.5), m * (float) (Math.random() - 0.5)); + ParticleData data = ParticleData.wisp(0.15F + 0.05F * (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), false); + player.world.addParticle(data, pos.getX() + (float) Math.random(), pos.getY() + (float) Math.random(), pos.getZ() + (float) Math.random() , m * (float) (Math.random() - 0.5), m * (float) (Math.random() - 0.5), m * (float) (Math.random() - 0.5)); } int[] entities = ItemNBTHelper.getIntArray(stack, TAG_ENTITY_POSITIONS); for(int i : entities) { Entity e = player.world.getEntityByID(i); if(e != null && Math.random() < 0.6) { - Botania.proxy.setWispFXDepthTest(Math.random() < 0.6); - Botania.proxy.wispFX(e.posX + (float) (Math.random() * 0.5 - 0.25) * 0.45F, e.posY + e.getHeight(), e.posZ + (float) (Math.random() * 0.5 - 0.25) * 0.45F, (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.15F + 0.05F * (float) Math.random(), -0.05F - 0.03F * (float) Math.random()); + ParticleData data = ParticleData.wisp(0.15F + 0.05F * (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), Math.random() < 0.6); + player.world.addParticle(data, e.posX + (float) (Math.random() * 0.5 - 0.25) * 0.45F, e.posY + e.getHeight(), e.posZ + (float) (Math.random() * 0.5 - 0.25) * 0.45F, 0, 0.05F + 0.03F * (float) Math.random(), 0); } } - - Botania.proxy.setWispFXDepthTest(true); } protected void tickServer(ItemStack stack, PlayerEntity player) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java index ecc14d4f6..e7f1e24d7 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java @@ -15,7 +15,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.ResourceLocation; @@ -24,10 +23,9 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ModSounds; -import vazkii.botania.common.lib.LibItemNames; import java.util.List; @@ -56,8 +54,9 @@ public class ItemUnholyCloak extends ItemHolyCloak { float rad = i * 4F * (float) Math.PI / 180F; float xMotion = (float) Math.cos(rad) * 0.2F; float zMotion = (float) Math.sin(rad) * 0.2F; - Botania.proxy.wispFX(player.posX, player.posY + 0.5, player.posZ, 0.4F + (float) Math.random() + 0.25F, 0F, 0F, 0.6F + (float) Math.random() * 0.2F, xMotion, 0F, zMotion); - } + ParticleData data = ParticleData.wisp(0.6F + (float) Math.random() * 0.2F, 0.4F + (float) Math.random() + 0.25F, 0F, 0F); + world.addParticle(data, player.posX, player.posY + 0.5, player.posZ, xMotion, 0F, zMotion); + } return true; } diff --git a/src/main/java/vazkii/botania/common/item/lens/LensFlare.java b/src/main/java/vazkii/botania/common/item/lens/LensFlare.java index 9394a53cf..690938b7c 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFlare.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFlare.java @@ -10,13 +10,12 @@ */ package vazkii.botania.common.item.lens; -import net.minecraft.item.DyeColor; import net.minecraft.item.DyeColor; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.MathHelper; import vazkii.botania.api.mana.IManaSpreader; -import vazkii.botania.common.Botania; +import vazkii.botania.client.fx.ParticleData; import java.awt.Color; @@ -62,7 +61,8 @@ public class LensFlare extends Lens { float g = ((hex & 0xFF00) >> 8) / 255F; float b = (hex & 0xFF) / 255F; - Botania.proxy.wispFX(tile.getPos().getX() + 0.5, tile.getPos().getY() + 0.5, tile.getPos().getZ() + 0.5, r, g, b, 0.4F, mx, my, mz); - } + ParticleData data = ParticleData.wisp(0.4F, r, g, b); + world.addParticle(data, tile.getPos().getX() + 0.5, tile.getPos().getY() + 0.5, tile.getPos().getZ() + 0.5, mx, my, mz); + } } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java index e3bafe63b..fc67a8f34 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -12,34 +12,26 @@ package vazkii.botania.common.item.relic; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.UseAction; import net.minecraft.util.ActionResultType; import net.minecraft.util.SoundEvents; -import net.minecraft.item.UseAction; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.dimension.DimensionType; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.api.wand.ICoordBoundItem; -import vazkii.botania.common.Botania; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.MathHelper; -import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; @@ -70,8 +62,9 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs float x1 = (float) (pos.getX() + Math.random()); float y1 = pos.getY() + 1; float z1 = (float) (pos.getZ() + Math.random()); - Botania.proxy.wispFX(x1, y1, z1, (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random() * 0.5F, -0.05F + (float) Math.random() * 0.05F); - } + ParticleData data = ParticleData.wisp((float) Math.random() * 0.5F, (float) Math.random(), (float) Math.random(), (float) Math.random(), 1); + world.addParticle(data, x1, y1, z1, 0, -(-0.05F + (float) Math.random() * 0.05F), 0); + } } else { ItemStack stack = ctx.getItem(); ItemNBTHelper.setInt(stack, TAG_X, pos.getX()); @@ -92,8 +85,9 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs float x = (float) (living.posX - Math.random() * living.getWidth()); float y = (float) (living.posY + Math.random()); float z = (float) (living.posZ - Math.random() * living.getWidth()); - Botania.proxy.wispFX(x, y, z, (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random() * 0.7F, -0.05F - (float) Math.random() * 0.05F); - } + ParticleData data = ParticleData.wisp((float) Math.random() * 0.7F, (float) Math.random(), (float) Math.random(), (float) Math.random(), 1); + world.addParticle(data, (double) x, (double) y, (double) z, 0, -(-0.05F - (float) Math.random() * 0.05F), 0); + } @Nonnull @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java index 4ddfe38af..0866a80a8 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -30,6 +30,7 @@ import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ModSounds; @@ -67,21 +68,19 @@ public class ItemDiviningRod extends ItemMod implements IManaUsingItem, IAvatarW } private void doHighlight(World world, BlockPos pos, int range, long seedxor) { - Botania.proxy.setWispFXDepthTest(false); for(BlockPos pos_ : BlockPos.getAllInBoxMutable(pos.add(-range, -range, -range), pos.add(range, range, range))) { BlockState state = world.getBlockState(pos_); if(Tags.Blocks.ORES.contains(state.getBlock())) { Random rand = new Random(state.hashCode() ^ seedxor); - Botania.proxy.wispFX(pos_.getX() + world.rand.nextFloat(), + ParticleData data = ParticleData.wisp(0.25F, rand.nextFloat(), rand.nextFloat(), rand.nextFloat(), 8); + world.addParticle(data, pos_.getX() + world.rand.nextFloat(), pos_.getY() + world.rand.nextFloat(), pos_.getZ() + world.rand.nextFloat(), - rand.nextFloat(), rand.nextFloat(), rand.nextFloat(), - 0.25F, 0F, 8); + 0, 0, 0); } } - Botania.proxy.setWispFXDepthTest(true); } @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java index 05bf7d14c..2763523d2 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -13,37 +13,29 @@ package vazkii.botania.common.item.rod; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.LivingEntity; import net.minecraft.entity.item.ItemEntity; -import net.minecraft.entity.item.ItemEntity; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Effects; -import net.minecraft.potion.EffectInstance; import net.minecraft.tags.EntityTypeTags; import net.minecraft.tags.Tag; import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResultType; -import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; -import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.common.Botania; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityThrownItem; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; @@ -171,12 +163,9 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { float xm = ((float) Math.random() - 0.5F) * m; float ym = ((float) Math.random() - 0.5F) * m; float zm = ((float) Math.random() - 0.5F) * m; - Botania.proxy.wispFX(target.posX + target.getWidth() / 2, - target.posY + target.getHeight() / 2, - target.posZ + target.getWidth() / 2, - r, 0F, b, - s, xm, ym, zm); - } + ParticleData data = ParticleData.wisp(s, r, 0F, b); + world.addParticle(data, target.posX + target.getWidth() / 2, target.posY + target.getHeight() / 2, target.posZ + target.getWidth() / 2, xm, ym, zm); + } MathHelper.setEntityMotionFromVector(target, target3, 0.3333333F); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java index b75a25e12..fa975cccd 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -16,7 +16,6 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.Inventory; import net.minecraft.item.BlockItem; -import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipeType; import net.minecraft.util.Hand; import net.minecraft.util.SoundEvents; @@ -33,7 +32,7 @@ import net.minecraft.world.World; import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.common.Botania; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.equipment.tool.ToolCommons; @@ -120,8 +119,9 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { double y = pos.getPos().getY() + Math.random(); double z = pos.getPos().getZ() + Math.random(); - Botania.proxy.wispFX(x, y, z, 1F, 0.2F, 0.2F, 0.5F, (float) -Math.random() / 10F); - } + ParticleData data1 = ParticleData.wisp(0.5F, 1F, 0.2F, 0.2F, 1); + p.world.addParticle(data1, x, y, z, 0, (float) -Math.random() / 10F, 0); + } } } } @@ -133,8 +133,9 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { double x = pos.getPos().getX() + Math.random(); double y = pos.getPos().getY() + Math.random(); double z = pos.getPos().getZ() + Math.random(); - Botania.proxy.wispFX(x, y, z, 1F, 0.2F, 0.2F, 0.5F, (float) -Math.random() / 10F); - } + ParticleData data = ParticleData.wisp(0.5F, 1F, 0.2F, 0.2F, 1); + p.world.addParticle(data, x, y, z, 0, (float) Math.random() / 10F, 0); + } if(time % 10 == 0) p.world.playSound(null, p.posX, p.posY, p.posZ, SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.PLAYERS, (float) Math.random() / 2F + 0.5F, 1F); } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index 288041b12..e9d0f1546 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -12,17 +12,12 @@ package vazkii.botania.common.item.rod; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.UseAction; import net.minecraft.item.ItemStack; -import net.minecraft.item.UseAction; -import net.minecraft.potion.EffectInstance; import net.minecraft.potion.EffectInstance; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResultType; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; @@ -33,13 +28,12 @@ import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.Botania; import vazkii.botania.common.brew.ModPotions; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; -import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; import java.util.List; @@ -82,8 +76,10 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi player.setMotion(player.getMotion().add(0, dy, 0)); player.world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.airRod, SoundCategory.PLAYERS, 0.1F, 0.25F); - for(int i = 0; i < 5; i++) - Botania.proxy.wispFX(player.posX, player.posY, player.posZ, 0.25F, 0.25F, 0.25F, 0.35F + (float) Math.random() * 0.1F, 0.2F * (float) (Math.random() - 0.5), -0.01F * (float) Math.random(), 0.2F * (float) (Math.random() - 0.5)); + for(int i = 0; i < 5; i++) { + ParticleData data = ParticleData.wisp(0.35F + (float) Math.random() * 0.1F, 0.25F, 0.25F, 0.25F); + world.addParticle(data, player.posX, player.posY, player.posZ, 0.2F * (float) (Math.random() - 0.5), -0.01F * (float) Math.random(), 0.2F * (float) (Math.random() - 0.5)); + } } stack.getTag().putInt(TAG_FLYCOUNTER, Math.min(max, stack.getTag().getInt(TAG_FLYCOUNTER) + FALL_MULTIPLIER)); @@ -150,8 +146,10 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi p.setMotion(p.getMotion().getX(), 2.8, p.getMotion().getZ()); for(int i = 0; i < 20; i++) - for(int j = 0; j < 5; j++) - Botania.proxy.wispFX(p.posX, p.posY + i, p.posZ, 0.25F, 0.25F, 0.25F, 0.35F + (float) Math.random() * 0.1F, 0.2F * (float) (Math.random() - 0.5), -0.01F * (float) Math.random(), 0.2F * (float) (Math.random() - 0.5)); + for(int j = 0; j < 5; j++) { + ParticleData data = ParticleData.wisp(0.35F + (float) Math.random() * 0.1F, 0.25F, 0.25F, 0.25F); + world.addParticle(data, p.posX, p.posY + i, p.posZ, 0.2F * (float) (Math.random() - 0.5), -0.01F * (float) Math.random(), 0.2F * (float) (Math.random() - 0.5)); + } if(!world.isRemote) { p.world.playSound(null, p.posX, p.posY, p.posZ, ModSounds.dash, SoundCategory.PLAYERS, 1F, 1F); diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index 6dd1dd848..c385d0b27 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -1,6 +1,5 @@ package vazkii.botania.common.network; -import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.particles.ParticleTypes; @@ -8,13 +7,12 @@ import net.minecraft.item.DyeColor; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; -import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkEvent; +import vazkii.botania.client.fx.ParticleData; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileTerraPlate; -import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.item.ItemTwigWand; @@ -167,8 +165,8 @@ public class PacketBotaniaEffect { float b = 0.4F + 0.3F * (float) Math.random(); float size = 0.125F + 0.125F * (float) Math.random(); - Botania.proxy.wispFX(thisVec.x, thisVec.y, thisVec.z, r, g, b, - size, (float) motion.x, (float) motion.y, (float) motion.z); + ParticleData data = ParticleData.wisp(size, r, g, b); + world.addParticle(data, thisVec.x, thisVec.y, thisVec.z, (float) motion.x, (float) motion.y, (float) motion.z); break; } case ENCHANTER_DESTROY: { @@ -176,8 +174,8 @@ public class PacketBotaniaEffect { float red = (float) Math.random(); float green = (float) Math.random(); float blue = (float) Math.random(); - Botania.proxy.wispFX(message.x, message.y, message.z, - red, green, blue, (float) Math.random() * 0.15F + 0.15F, (float) (Math.random() - 0.5F) * 0.25F, (float) (Math.random() - 0.5F) * 0.25F, (float) (Math.random() - 0.5F) * 0.25F); + ParticleData data = ParticleData.wisp((float) Math.random() * 0.15F + 0.15F, red, green, blue); + world.addParticle(data, message.x, message.y, message.z, (float) (Math.random() - 0.5F) * 0.25F, (float) (Math.random() - 0.5F) * 0.25F, (float) (Math.random() - 0.5F) * 0.25F); } break; } @@ -193,7 +191,8 @@ public class PacketBotaniaEffect { float my = (float) Math.random() * m; float mz = ((float) Math.random() - 0.5F) * m; - Botania.proxy.wispFX(message.x, message.y, message.z, r, g, b, s, mx, my, mz); + ParticleData data = ParticleData.wisp(s, r, g, b); + world.addParticle(data, message.x, message.y, message.z, mx, my, mz); } break; @@ -221,12 +220,16 @@ public class PacketBotaniaEffect { float[] colorsfx = new float[] { 0F, (float) ticks / (float) 100, 1F - (float) ticks / (float) 100 }; - Botania.proxy.wispFX(x, y, z, colorsfx[0], colorsfx[1], colorsfx[2], 0.85F, (float)g * 0.05F, 0.25F); - Botania.proxy.wispFX(x, y, z, colorsfx[0], colorsfx[1], colorsfx[2], (float) Math.random() * 0.1F + 0.1F, (float) (Math.random() - 0.5) * 0.05F, (float) (Math.random() - 0.5) * 0.05F, (float) (Math.random() - 0.5) * 0.05F, 0.9F); + ParticleData data = ParticleData.wisp(0.85F, colorsfx[0], colorsfx[1], colorsfx[2], 0.25F); + world.addParticle(data, x, y, z, 0, (float) (-g*0.05), 0); + data = ParticleData.wisp((float) Math.random() * 0.1F + 0.1F, colorsfx[0], colorsfx[1], colorsfx[2], 0.9F); + world.addParticle(data, x, y, z, (float) (Math.random() - 0.5) * 0.05F, (float) (Math.random() - 0.5) * 0.05F, (float) (Math.random() - 0.5) * 0.05F); if(ticks == 100) - for(int j = 0; j < 15; j++) - Botania.proxy.wispFX(message.x + 0.5, message.y + 0.5, message.z + 0.5, colorsfx[0], colorsfx[1], colorsfx[2], (float) Math.random() * 0.15F + 0.15F, (float) (Math.random() - 0.5F) * 0.125F, (float) (Math.random() - 0.5F) * 0.125F, (float) (Math.random() - 0.5F) * 0.125F); + for(int j = 0; j < 15; j++) { + data = ParticleData.wisp((float) Math.random() * 0.15F + 0.15F, colorsfx[0], colorsfx[1], colorsfx[2]); + world.addParticle(data, message.x + 0.5, message.y + 0.5, message.z + 0.5, (float) (Math.random() - 0.5F) * 0.125F, (float) (Math.random() - 0.5F) * 0.125F, (float) (Math.random() - 0.5F) * 0.125F); + } } } break; @@ -238,8 +241,9 @@ public class PacketBotaniaEffect { float x = (float) (entity.posX + Math.random()); float y = (float) (entity.posY + Math.random()); float z = (float) (entity.posZ + Math.random()); - Botania.proxy.wispFX(x, y, z, (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), -0.3F + (float) Math.random() * 0.2F); - } + ParticleData data = ParticleData.wisp((float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 1); + world.addParticle(data, x, y, z, 0, -(-0.3F + (float) Math.random() * 0.2F), 0); + } } break; } diff --git a/src/main/resources/assets/botania/particles/sparkle.json b/src/main/resources/assets/botania/particles/sparkle.json new file mode 100644 index 000000000..7a73a41bf --- /dev/null +++ b/src/main/resources/assets/botania/particles/sparkle.json @@ -0,0 +1,2 @@ +{ +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/particles/wisp.json b/src/main/resources/assets/botania/particles/wisp.json new file mode 100644 index 000000000..7a73a41bf --- /dev/null +++ b/src/main/resources/assets/botania/particles/wisp.json @@ -0,0 +1,2 @@ +{ +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/particle/sparkle_0.png b/src/main/resources/assets/botania/textures/particle/sparkle_0.png new file mode 100644 index 0000000000000000000000000000000000000000..2a2bb40fe71828ef244beda79a3f5572f2e498d1 GIT binary patch literal 1408 zcmV-`1%LX9P)J0d&Nt>!|(yDD3S_w8t6#^;* zTPnIC0#;qHMr;tJXZ=NpUkd@ofM9-(}(d>p@QJ zbi<}sdb0kT?s@0kd)_s`|7`daIih z=XP_kI)K)BT?6R^KteygLrKg=a51_0>y`}Z=& zJc_FJxxL;PB5Gc*Hw6GPBDw;R$m^D2+=qH>?1+JOU|2Di`y)P>d`pt$zHm64%;`0wBP`zrtth$urX9y&773ZOBXIU-7K zw|gWSjqc%`Ya458vq@clVQTv5zSQ$0iTwu-3|35oX^HsQ)r*%ti}dv9p-@OKl}dTj zG*_TG2Cy9)tpFGz2Dl_86ql;IeZC1rbM+E}ni?IQJay{S+X_LUUr*_$-+4DRuImBQ zrS^)I)w@%ZlZWOXJlI@WTgz}+j;bE_IODtzh%_QX0H{FiYC2v)m4wJzhMBIG%Zo^$ zcmjc>udjEvr$0V^^!SN`Ctp6%6A1*EOHnWpiArg++B^F=?JXHqS233>WHXsN#m($B zqf)&sgjfcEJOG%Tt^=ShHYxzP5i!6yPsp-7tg7mGFc>`X(b=;p%hs#VGs z3*zhVznhE2<8R8cJj^*yU`>SF_CAhywYBYn5D}3>O@LgwuD^0-X6D1>`0lY^e!spt zIyCHioLM)&{o%?ZOOm|PM~@vQ(+DjsE-e^_u@23dAi4$61O^c$P1BMC$>elmZ1ni- zoja?S&VTb|G#CmN$nsyleC6gqET(?)!OZE~b908fKfa&J6|+<*WTqpA|hf)(X_orskD&GWPY_wGXnr5$#QUP^1y39UAXvpxma8% z7{(|HQdXCjZwMiBrCk1IIiJ6$XxapjkVw$_b|-Ed1BmDc05lEbJ`ok{F#-VEl}x@m zJ3Bj{Szf+ML}vQoVtUu`(Ei2wg`c5z?-mi2EW=nJK}AFiK`jN_UWL@AkEr&N0RV6! z0()Zy0H%egE#AF%K?qR*0LW*v*H+fokJyf@Hc-oMB_b;Bgn=g@pjowqy&(|8=SsQ! zZ+4#m0JD(Im4y%$BHC;KAfSt~Y`ZJ~sK*2W03l+~s8ll~M5X~GS*Drhl9aGThZ@#& zw02j}YW0l}Rm(L0X*0*LENcUHm~sG}8EAn*1obMIni`Q|_wN|QPOMXf(@mBA%$`}3 zH5H)tuOl$6`TXROvcDa*YnSg%b~#V6lNpUcOaOqbI)G5q24{1pj-!@20QMi3mi5#C z)KNrgSkowM0JbxS0Rlt?hy>K1P{(;ABM68HwK}i0^hT&L)Ht?nVfr6Sp#J8`9wnUs O00008XP)3bMFQIhekdRuXy+Src7)S$nOGx0-%P3h&~DUMg&$P;ejhe6cLJ2 z=eDi%r>cN|VAXS>D0Ql))w_fQ9wYjV2zVsCs8s+e5vfF^s+zhz5DGOCktT$w15o4s z_f)6ABcTc*qC}(t(1=K@2?iVVNVpL|O)M7cB%%k?gNGGaSDDoa2qM}}L@~FcAR?jb zdaJ6c^+JfC5JC?}qseUz4JlpMTVt_UBN6FB2%U%mSW-g+5GEm#?(?dqtkG^Ns+tVP z<44$WBr`ACwq5S+?d_kPot*+eO{vtO`s9w5j^@;k(b3VLZQCxpeWg&8ZJ|h{mxyAH zW&H`j-Yfx6E`_C>w@h<7k=${jF_n75saiBMH8s}X-~aK*$jH^^j*g?9U0vyPb4ni? z8X5q=L0#X~)YjS;Ye?+Bmzz9iTh=H5c700(1OP#RQ!bT8rR@awy?XFevc0`GsHx5e zeSPl~94mgR@BPlRX9h0hOU2;cg9kor@994A&v<4ycWeA}mU7Mqyk!Ce07Rq^kyc$? zoSd1sbEC0&XHWg}Z7;lc^5pKfUO(2duf08#F-lE4yY?N`gb=^|F!+TroBvf&lo$X_ zO1bd33OrDPh%_S7SjtNN@4MIAnp3-8Ieci(-j-HPRTLcR?ui}ldQq>=6{d`0u~IA+ z%Z6cOZQITPkQ*tWuJr)`gb;c(8cipY$;x59R8)3P)G_}=0$9>9;~N;LPRyDY2M4{^S83MZ%dPl>G& z5JEJDB9WKOayeU=p83&ST)YcF1_FUZrBcyy)6+%Uam3VL6N8yd=5i{P+CQ1gT{PzA zF5NebiBLG)C8g9@%IUShS0ey7@;U&HWtt<7tyb@XC*3 z^30yuW1E-f&GyclLvff$WyFvLY zsQ-rL83Q2yiAZAU{O>8as4woKDZ0SEyI3n4;6h!B8F(P(rYfaR%4M25%E zsKiDxApFdU$kbZ56N$uiFZhHIVnRw8$z(E%Qp$*wG9rYC2qD6TVI&O0ND`6du``sB zVMswl@G{b^R_l0qdHEv%h7iIsP4jX#m&*ttEC40|V`gUNok%3|no{cIWf>po;~(W?N=y}iBr zsZ=Vlv9a+Ez)wzj@GuGi}a2L}&);2v`$1%YRfw*fs`EdZ93auR@P znC9iH>D0Sl-}&-(Hk*wLDWxGLe}3nSpMSdd!?%uY?`y4FTI)6ub(pzBL@srEL$F^E z(U3kMgqRM8!|7NowlFt0ms?s|%B9oknRq-tb!~C+>YIf^oQSA=c<8j7Pmj{Gv)O93 z%FSl;Zvg1Fh0ziOaK?z%x?$UP%W<6Y;o;%^VzFq2LZNsp7MsuJ^PgohnJYpFlq==t z)a2wuE|gbCL@16E;V-_Jp8fkIAx`j&CJiJy9Cdkmw|Hx%o>2^t|(?UR#sNl|E*NYAK$$B z)#j~RpZ>A4vv*RfRo2(nKiK)b_#K3}L`prSi)%h~EqV_bP@n<;_-$C^^ZECVYqe^z zSiGmT?qn7g-rC-NSS;9ZI_tYC87=yxt&hus5^xn zB2qM@{>K5}BlpjD2H-nWN-3d~s#ABp{b0<@tpJ-tCD^mkXUsp%F4zE=@PY+{bOHc| z?ty*)f->kjHb_+9eJFrnALwVO`-}|(Gxm*mkb@Vod0_yr>yYTYeHy*SbY7A{``&~^U|#Py1;)>^>?cg;KN+Bl tzh3@5zn6jTI1uveHFcQ_+Fv*u{sZ5>}ocaI&002ovPDHLkV1i{_F6RIM literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/particle/sparkle_2.png.mcmeta b/src/main/resources/assets/botania/textures/particle/sparkle_2.png.mcmeta new file mode 100644 index 000000000..e38a5ad30 --- /dev/null +++ b/src/main/resources/assets/botania/textures/particle/sparkle_2.png.mcmeta @@ -0,0 +1,5 @@ +{ + "texture": { + "blur": true + } +} diff --git a/src/main/resources/assets/botania/textures/particle/sparkle_3.png b/src/main/resources/assets/botania/textures/particle/sparkle_3.png new file mode 100644 index 0000000000000000000000000000000000000000..a2ea887771b513e29c3e1c7b7b4ff331a01e0cd9 GIT binary patch literal 1291 zcmV+m1@!ufP)VgUg)k*J{Y zrN)Hx+2|iZqW%Xy`r?D}MX4_mDN5l%f>Dz~p-Sm47IFJ)%kECQY-eZY9v?c>4y8Xq zA51vON%r2Id(Y>5@4aX40RKZHpNChq{k|m=TMXoP0YCvzLqgO&N$|}8)`IYYD?}6# zic;_Pt@eLa0sq9R=R#5HRZVMffdn2S`^^A62rp|DfJ#Iv5vi)C?hJ%NO+=&#A?g9t zxX=BoOW;AMLWnvd(g0{gq}2q2jd~>91fV7wjdl^y^77zeMK)AsEdW78JBcXj4irQr zbX{*#Rkc9~5fnn`;kvrSj>g8MuIp{lXtarlbRmRJL;)+kRXXk=vMT1#i=@vd|_m1;@q zLqkIY063`Ydz#zZ`l5~TgZFcj=WWXx1;DOv3qSx61UThVX;j)y@W9K5PbWG$dV`wk zyx-UNcEPb?r~BUPI(K&9V!l)i?mv9!gN~l=lYftAhI6;aKVvE9e1W$OKmb5Q3K415 z#l^{)iMuzOT6Xs|Jlp=1VS`Tz|gfd2{d3XB2aZL#E>-U478?*Ue6h(;w z(4>?LkE_745=5jCk;YP1@_*gC(cY5W^U~2H`}ViCX{w^&NOw>4X!?1*I#-x7ip5H? zSS%Zck+p3*2S9G7fV$ov03d|W>+0%KiA18Sv$L}^l}fdCq*86L9ow`l4FG-{AG1FF z_>*%N2fjUHS=JmgSD1MbTdW5gDWDKhjcJu>>0FIkI;|Z1k%xnXoNGx_J{mQWq1GTl`;U9;-fw3@I zcAVISt5-_jefibbje6MreeBjudr$Wp3x$GGE*T?OI(kn8Kt!a+;_SZ7kMa8;f?AOQmrz&-;|v z9)J*{DHMskV3y0-!t~4!=HlW#05T8=#4DAGmYbd~+KwZp{+t-hWHMKh$>hPwT<(%F zH+T7gVN8U=;k1-eV=1TC3%(Wr+|26%IF@OSIF56lnH>N&Gh6lb^0iP5OFY9uyP_c1z-RVT=!IgJAq{8V6|Gk2cjrg zips*m4R^2DmSxRisfao5Jd0p9u#F{nL=D%MH9U@$ApOww_tu=cUrH278lyuc4RGcy2%nG0CSdfT=cz(yurz%sU&?SBE_ zEy+`RYL9K}y|cY5Hn6nOBvwkPR~yzl@7_m@XB*ZA|AoX4!@j=NlX?AwM{hjKcZoFu zG9Iog%e4N1erK$FV5q*qUR&`!>xWfWwKqKK{{Wxh3zsGG=q&&M002ovPDHLkV1lY& BZ_)q& literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/particle/sparkle_3.png.mcmeta b/src/main/resources/assets/botania/textures/particle/sparkle_3.png.mcmeta new file mode 100644 index 000000000..e38a5ad30 --- /dev/null +++ b/src/main/resources/assets/botania/textures/particle/sparkle_3.png.mcmeta @@ -0,0 +1,5 @@ +{ + "texture": { + "blur": true + } +} diff --git a/src/main/resources/assets/botania/textures/particle/wisp.png b/src/main/resources/assets/botania/textures/particle/wisp.png new file mode 100644 index 0000000000000000000000000000000000000000..f7d556ba5c1296453571b080563c277c0aaaa21e GIT binary patch literal 885 zcmV-*1B(2KP)z@;j|==^1poj87fD1xRCwCWSBrAmKny$^Xj^EmqPN$PScf-i@+?PX3;PIAV>v`VpT3cSz7ll*_ z13?=&5g^zAnTXlmMF6~w1RWehAbQo&M>m!fi3fRHO;EO^E-hLBE;fF+Os zGd+rkw2mXFAy#3Jfo67X={XU68&A27)iR z?wLqb383dw;1{B`&mXZpFHcET1R{8@JjBJlzNF_JKFpX)$|BupS6G|$%%z~#9B z4gyeQBB)n9L&y-sBp={C-<^&YybjGh)`dCpgZ5{L!j=(eyJC6uKt3?@PV(5DAAaeb z6)=N<3C<%#>L?&EA{dFTD>6RD{iY*==Vd#z-)8iEBwriz_Fy6r8$8y8{ahrfY($2q zt=!zz>_!tBP*`vUIY;1%)ljy{GTu@FEE25}eDh-CUDFKO3}CBlf6seOSpUjU0l6#o za|a9my_SCzVtYsF$o=DOvmE5-C&?Tp=F zM{k90h1imZCt<6*GLG6^!ebL+A0*W~8LQfsrdpFzu&oT5W+@B2;WX?Z%RW zc;zl{#~&coZs-T_j_V0HmLxq2(1egEBp~g$qMPAhqBd604nx z*&94Vyf#zQq$QhxkeyOF*{cBbd@^5}l&qU=ezvq7dlc$z(LX||-00000 LNkvXXu0mjfK4Ob` literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/particle/wisp.png.mcmeta b/src/main/resources/assets/botania/textures/particle/wisp.png.mcmeta new file mode 100644 index 000000000..2077f3ce0 --- /dev/null +++ b/src/main/resources/assets/botania/textures/particle/wisp.png.mcmeta @@ -0,0 +1,6 @@ +{ + "texture": { + "blur": true + } +} +