From c508b5ea965e45f7c1641767492f730f3183568b Mon Sep 17 00:00:00 2001 From: Cheese Date: Mon, 14 Dec 2015 18:13:19 +1100 Subject: [PATCH] chest visuals --- .../src/mineplex/core/treasure/Treasure.java | 6 ++++++ .../mineplex/core/treasure/TreasureStyle.java | 2 +- .../animation/BlockChangeAnimation.java | 20 +++++++++++++++---- .../animation/ChestSpawnAnimation.java | 8 ++++++++ 4 files changed, 31 insertions(+), 5 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java index e4645cad3..a9eecb3f7 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java @@ -14,6 +14,7 @@ import mineplex.core.common.util.C; import mineplex.core.common.util.Callback; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilParticle; +import mineplex.core.common.util.UtilParticle.ParticleType; import mineplex.core.common.util.UtilParticle.ViewDist; import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilServer; @@ -174,6 +175,11 @@ public class Treasure UtilParticle.PlayParticle(type, block.getLocation().add(0.5 + xDif, 0.5 + yDif, 0.5 + zDif), red, 0.2F, 0.2F, 1F, 0, ViewDist.NORMAL, UtilServer.getPlayers()); } + else if (_treasureType == TreasureType.CHRISTMAS) + { + UtilParticle.PlayParticle(ParticleType.SNOW_SHOVEL, block.getLocation().add(0.5f, 0.5f, 0.5f), 0.1f, 0.1F, 0.1F, 0.2F, 5, + ViewDist.NORMAL, UtilServer.getPlayers()); + } else { UtilParticle.PlayParticle(type, block.getLocation().add(0.5, 0.5, 0.5), 0.5F, 0.5F, 0.5F, 0.2F, 0, diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureStyle.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureStyle.java index 38828ee6b..f69e4b130 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureStyle.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureStyle.java @@ -30,7 +30,7 @@ public enum TreasureStyle CHRISTMAS( ParticleType.SNOW_SHOVEL, ParticleType.SNOWBALL_POOF, - ParticleType.FIREWORKS_SPARK, + ParticleType.SNOW_SHOVEL, Sound.FIZZ, Sound.CHICKEN_EGG_POP ); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/BlockChangeAnimation.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/BlockChangeAnimation.java index aef2e303f..2d6e42d38 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/BlockChangeAnimation.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/BlockChangeAnimation.java @@ -54,18 +54,30 @@ public class BlockChangeAnimation extends Animation if (getTreasure().getTreasureType() == TreasureType.OLD) continue; - Material newMaterial = getTreasure().getTreasureType() == TreasureType.ANCIENT ? Material.NETHER_BRICK : Material.QUARTZ_BLOCK; + Material mat; + if (getTreasure().getTreasureType() == TreasureType.ANCIENT) mat = Material.NETHER_BRICK; + else if (getTreasure().getTreasureType() == TreasureType.MYTHICAL) mat = Material.QUARTZ_BLOCK; + else if (getTreasure().getTreasureType() == TreasureType.CHRISTMAS) mat = Material.ICE; + else + continue; + _blockInfoList.add(new BlockInfo(b)); - b.setType(newMaterial); + b.setType(mat); } else if (b.getType() == Material.SMOOTH_STAIRS || b.getType() == Material.COBBLESTONE_STAIRS) { if (getTreasure().getTreasureType() == TreasureType.OLD) continue; - Material newMaterial = getTreasure().getTreasureType() == TreasureType.ANCIENT ? Material.NETHER_BRICK_STAIRS : Material.QUARTZ_STAIRS; + Material mat; + if (getTreasure().getTreasureType() == TreasureType.ANCIENT) mat = Material.NETHER_BRICK_STAIRS; + else if (getTreasure().getTreasureType() == TreasureType.MYTHICAL) mat = Material.QUARTZ_STAIRS; + else if (getTreasure().getTreasureType() == TreasureType.CHRISTMAS) mat = Material.PACKED_ICE; + else + continue; + _blockInfoList.add(new BlockInfo(b)); - b.setType(newMaterial); + b.setType(mat); } } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/ChestSpawnAnimation.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/ChestSpawnAnimation.java index 54fc12cee..65c51b163 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/ChestSpawnAnimation.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/ChestSpawnAnimation.java @@ -16,6 +16,7 @@ import net.minecraft.server.v1_8_R3.MathHelper; import mineplex.core.common.util.UtilAlg; import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilParticle; +import mineplex.core.common.util.UtilParticle.ParticleType; import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilParticle.ViewDist; import mineplex.core.treasure.BlockInfo; @@ -115,6 +116,13 @@ public class ChestSpawnAnimation extends Animation ViewDist.NORMAL, UtilServer.getPlayers()); } } + else if (getTreasure().getTreasureType() == TreasureType.CHRISTMAS) + { + float spread = 1f - (getTicks() / (float)ANIMATION_DURATION); + + UtilParticle.PlayParticle(ParticleType.SNOW_SHOVEL, _centerLocation.clone().add(0, 5, 0), spread, 0.1f, spread, 0, 30, + ViewDist.NORMAL, UtilServer.getPlayers()); + } //Spawn Chest if (getTicks() >= ANIMATION_DURATION)