diff --git a/src/main/kotlin/net/deliciousreya/minecraftportal/extensions/Material.kt b/src/main/kotlin/net/deliciousreya/minecraftportal/extensions/Material.kt index f8f7f25..605d94d 100644 --- a/src/main/kotlin/net/deliciousreya/minecraftportal/extensions/Material.kt +++ b/src/main/kotlin/net/deliciousreya/minecraftportal/extensions/Material.kt @@ -53,6 +53,14 @@ val MINERAL_MAPPING: ImmutableBiMap = ImmutableMap.Builder = ImmutableSet.of(ACACIA_DOOR, BIRCH_DOOR, DARK_OAK_DOOR, IRON_DOOR, JUNGLE_DOOR, OAK_DOOR, SPRUCE_DOOR) @@ -233,9 +241,9 @@ data class PortalFrame(val lowerLeftFrontCorner: Location, val direction: ExitDi fun activate() { val mineral = (lowerLeftFrontCorner + direction.mineralOffset).block for (offset in direction.glassOffsets) { - (lowerLeftFrontCorner + offset).block.type = MINERAL_TYPES.getOrDefault(mineral.type, BROWN_STAINED_GLASS) + (lowerLeftFrontCorner + offset).block.type = MINERAL_TYPES.getOrDefault(mineral.type, GLASS) } - portalCenter.world?.playSound(midCenter, Sound.ENTITY_EVOKER_CAST_SPELL, 20f, 1f) + portalCenter.world?.playSound(midCenter, Sound.ENTITY_EVOKER_CAST_SPELL, 1f, 1f) portalCenter.world?.spawnParticle(Particle.SPELL, midCenter, 75) open() } @@ -244,7 +252,7 @@ data class PortalFrame(val lowerLeftFrontCorner: Location, val direction: ExitDi for (offset in direction.glassOffsets) { (lowerLeftFrontCorner + offset).block.type = GLASS } - portalCenter.world?.playSound(midCenter, Sound.ENTITY_ILLUSIONER_CAST_SPELL, 20f, 1f) + portalCenter.world?.playSound(midCenter, Sound.ENTITY_ILLUSIONER_CAST_SPELL, 1f, 1f) portalCenter.world?.spawnParticle(Particle.SMOKE_NORMAL, midCenter, 75) } @@ -253,21 +261,21 @@ data class PortalFrame(val lowerLeftFrontCorner: Location, val direction: ExitDi } fun playPortalsLinkedEffect() { - portalCenter.world?.playSound(midCenter, Sound.BLOCK_BEACON_ACTIVATE, 20f, 1f) + portalCenter.world?.playSound(midCenter, Sound.BLOCK_BEACON_ACTIVATE, 1f, 1f) portalCenter.world?.spawnParticle(Particle.SPELL, midCenter, 30) } fun playPortalsUnlinkedEffect() { - portalCenter.world?.playSound(midCenter, Sound.BLOCK_BEACON_DEACTIVATE, 20f, 1f) + portalCenter.world?.playSound(midCenter, Sound.BLOCK_BEACON_DEACTIVATE, 1f, 1f) portalCenter.world?.spawnParticle(Particle.SMOKE_NORMAL, midCenter, 30) } fun playTeleporterActivatedEffect() { - portalCenter.world?.playSound(midCenter, Sound.BLOCK_PORTAL_TRIGGER, 20f, 1f) + portalCenter.world?.playSound(midCenter, Sound.BLOCK_PORTAL_TRIGGER, 1f, 1f) } fun playTeleportTravelEffect() { - portalCenter.world?.playSound(midCenter, Sound.BLOCK_PORTAL_TRAVEL, 20f, 1f) + portalCenter.world?.playSound(midCenter, Sound.BLOCK_PORTAL_TRAVEL, 1f, 1f) portalCenter.world?.spawnParticle(Particle.FIREWORKS_SPARK, midCenter, 75) } @@ -280,13 +288,13 @@ data class PortalFrame(val lowerLeftFrontCorner: Location, val direction: ExitDi } fun playTeleportCanceledEffect() { - portalCenter.world?.playSound(midCenter, Sound.BLOCK_LAVA_EXTINGUISH, 20f, 1f) + portalCenter.world?.playSound(midCenter, Sound.BLOCK_LAVA_EXTINGUISH, 1f, 1f) portalCenter.world?.spawnParticle(Particle.SMOKE_NORMAL, midCenter, 30) } inner class MakePortalSound : BukkitRunnable() { override fun run() { - portalCenter.world?.playSound(portalCenter + MID_BLOCK, Sound.BLOCK_PORTAL_AMBIENT, 3f, 0f) + portalCenter.world?.playSound(portalCenter + MID_BLOCK, Sound.BLOCK_PORTAL_AMBIENT, 0.1f, 0f) } } inner class MakePortalSparkles : BukkitRunnable() { diff --git a/src/main/proto/portal-save-data.proto b/src/main/proto/portal-save-data.proto index 075c928..20f4f1f 100644 --- a/src/main/proto/portal-save-data.proto +++ b/src/main/proto/portal-save-data.proto @@ -30,6 +30,14 @@ message Portal { EMERALD = 6; IRON = 7; QUARTZ = 8; + TERRACOTTA = 9; + RED_SANDSTONE = 10; + END_STONE = 11; + PRISMARINE = 12; + BRICKS = 13; + PURPUR = 14; + GRANITE = 15; + ANDESITE = 16; } enum Color { UNKNOWN_COLOR = 0;