SteamWar/LobbySystem2.0
Archiviert
13
0
Fork 0
Code Issues 5 Pull-Requests Projekte Releases Wiki Aktivität

Particle #4

Zusammengeführt
Lixfel hat 24 Commits von Particle nach master 2022-03-26 16:26:40 +01:00 zusammengeführt
Diskussion 1 Commits 24 Geänderte Dateien 37 +21 -15
4 geänderte Dateien mit 21 neuen und 15 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen
Nur Änderungen aus Commit 28d84f436f werden angezeigt - Alle Commits anzeigen

22
src/de/steamwar/lobby/LobbySystem.properties
Datei anzeigen

@ -16,9 +16,9 @@ PARTICLE_INVENTORY = §6Partikel
PARTICLE_DESELECT = §8Keine Partikel PARTICLE_DESELECT = §8Keine Partikel
PARTICLE_LOCKED = {0} §8- §c§lGesperrt PARTICLE_LOCKED = {0} §8- §c§lGesperrt
PARTICLE_UNLOCKED_BY_TEAM = §eTeam Beitritt PARTICLE_UNLOCKED_BY_TEAM = §fTeam Beitritt
YoyoNow markierte diese Unterhaltung als gelöst Veraltet
Lixfel hat 2022-03-26 10:09:08 +01:00 kommentiert
Veraltet
Review
Link kopieren

Teambeitritt

Teambeitritt
PARTICLE_UNLOCKED_BY_EVENT = §eEvent teilnahme PARTICLE_UNLOCKED_BY_EVENT = §fEvent teilnahme
YoyoNow markierte diese Unterhaltung als gelöst Veraltet
Lixfel hat 2022-03-26 10:09:15 +01:00 kommentiert
Veraltet
Review
Link kopieren

Eventteilnahme

Eventteilnahme
PARTICLE_UNLOCKED_BY_SERVER_TEAM = §eServer Team PARTICLE_UNLOCKED_BY_SERVER_TEAM = §fServer Team
YoyoNow markierte diese Unterhaltung als gelöst Veraltet
Lixfel hat 2022-03-26 10:09:19 +01:00 kommentiert
Veraltet
Review
Link kopieren

Serverteam

Serverteam
PARTICLE_ATTRIBUTE_CIRCLE = §8-§f Ring PARTICLE_ATTRIBUTE_CIRCLE = §8-§f Ring
PARTICLE_ATTRIBUTE_BI_CIRCLE = §8-§f Doppel Ring PARTICLE_ATTRIBUTE_BI_CIRCLE = §8-§f Doppel Ring
YoyoNow markierte diese Unterhaltung als gelöst Veraltet
Lixfel hat 2022-03-26 10:09:26 +01:00 kommentiert
Veraltet
Review
Link kopieren

Doppelring

Doppelring
@ -65,14 +65,14 @@ PARTICLE_ENCHANTING_CIRCLE = §fEnchanted
PARTICLE_WATER_FIRE = §bWater§7/§cFire PARTICLE_WATER_FIRE = §bWater§7/§cFire
PARTICLE_MAGIC_ENCHANTING = §5Magic§7/§eZauber PARTICLE_MAGIC_ENCHANTING = §5Magic§7/§eZauber
PARTICLE_UNLOCKED_BY_WGS_PLACEMENT = WarGearSeason 1., 2. oder 3. Platz PARTICLE_UNLOCKED_BY_WGS_PLACEMENT = §fWarGearSeason 1., 2. oder 3. Platz
PARTICLE_UNLOCKED_BY_WGS = WarGearSeason PARTICLE_UNLOCKED_BY_WGS = §fWarGearSeason
PARTICLE_UNLOCKED_BY_AIRSHIPEVENT_PLACEMENT = AirshipEvent 1., 2. oder 3. Platz PARTICLE_UNLOCKED_BY_AIRSHIPEVENT_PLACEMENT = §fAirshipEvent 1., 2. oder 3. Platz
Lixfel markierte diese Unterhaltung als gelöst Veraltet
Lixfel hat 2022-03-26 10:05:33 +01:00 kommentiert
Veraltet
Review
Link kopieren

Wäre es hier nicht eleganter, den Namen des Events einfach aus der Datenbank einzufügen?

Wäre es hier nicht eleganter, den Namen des Events einfach aus der Datenbank einzufügen?
YoyoNow hat 2022-03-26 11:03:28 +01:00 kommentiert
Veraltet
Review
Link kopieren

Vermutlich, guck ich mir gleich an.

Vermutlich, guck ich mir gleich an.
PARTICLE_UNLOCKED_BY_AIRSHIPEVENT = AirshipEvent PARTICLE_UNLOCKED_BY_AIRSHIPEVENT = §fAirshipEvent
PARTICLE_UNLOCKED_BY_HELLSBELLS_PLACEMENT = HellsBells 1., 2. oder 3. Platz PARTICLE_UNLOCKED_BY_HELLSBELLS_PLACEMENT = §fHellsBells 1., 2. oder 3. Platz
PARTICLE_UNLOCKED_BY_HELLSBELLS = HellsBells PARTICLE_UNLOCKED_BY_HELLSBELLS = §fHellsBells
PARTICLE_UNLOCKED_BY_UNDERWATER_PLACEMENT = Underwater 1., 2. oder 3. Platz PARTICLE_UNLOCKED_BY_UNDERWATER_PLACEMENT = §fUnderwater 1., 2. oder 3. Platz
PARTICLE_UNLOCKED_BY_UNDERWATER = Underwater PARTICLE_UNLOCKED_BY_UNDERWATER = §fUnderwater
PARTICLE_EVENT_ENCHANTING = §cVerzaubert PARTICLE_EVENT_ENCHANTING = §cVerzaubert
PARTICLE_EVENT_CLOUD = §fCloud PARTICLE_EVENT_CLOUD = §fCloud

1
src/de/steamwar/lobby/listener/ParticleListener.java
Datei anzeigen

@ -68,6 +68,7 @@ public class ParticleListener extends BasicListener {
if (particle == null) return; if (particle == null) return;
BaseParticle baseParticle = particle.getParticle(); BaseParticle baseParticle = particle.getParticle();
if (baseParticle.needsTick()) return;
baseParticle.particle(new ParticleData(player.getWorld(), player, deg)); baseParticle.particle(new ParticleData(player.getWorld(), player, deg));
} }
} }

11
src/de/steamwar/lobby/particle/particles/ServerTeamParticle.java
Datei anzeigen

@ -24,6 +24,7 @@ import de.steamwar.lobby.particle.ParticleItem;
import de.steamwar.lobby.particle.SimpleParticle; import de.steamwar.lobby.particle.SimpleParticle;
import de.steamwar.lobby.particle.decorator.CircleParticle; import de.steamwar.lobby.particle.decorator.CircleParticle;
import de.steamwar.lobby.particle.decorator.CloudParticle; import de.steamwar.lobby.particle.decorator.CloudParticle;
import de.steamwar.lobby.particle.decorator.TickParticle;
import de.steamwar.lobby.particle.mutator.LocationParticleMutator; import de.steamwar.lobby.particle.mutator.LocationParticleMutator;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
@ -52,11 +53,13 @@ public enum ServerTeamParticle implements ParticleEnum {
ENCHANTING_CIRCLE(new CircleParticle(new LocationParticleMutator(new SimpleParticle(new ParticleItem(WHITE_DYE, "PARTICLE_ENCHANTING_CIRCLE", "PARTICLE_UNLOCKED_BY_SERVER_TEAM"), Particle.ENCHANTMENT_TABLE, 0F, 0F, 0F, 0.01), location -> location.add(0, 1.1, 0)))), ENCHANTING_CIRCLE(new CircleParticle(new LocationParticleMutator(new SimpleParticle(new ParticleItem(WHITE_DYE, "PARTICLE_ENCHANTING_CIRCLE", "PARTICLE_UNLOCKED_BY_SERVER_TEAM"), Particle.ENCHANTMENT_TABLE, 0F, 0F, 0F, 0.01), location -> location.add(0, 1.1, 0)))),
NOTES_CIRCLE(new CircleParticle(new LocationParticleMutator(new SimpleParticle(new ParticleItem(NOTE_BLOCK, "PARTICLE_NOTES", "PARTICLE_UNLOCKED_BY_SERVER_TEAM"), Particle.NOTE, 0F, 0F, 0F, 0.01), location -> location.add(0, 2.2, 0)))), NOTES_CIRCLE(new CircleParticle(new LocationParticleMutator(new SimpleParticle(new ParticleItem(NOTE_BLOCK, "PARTICLE_NOTES", "PARTICLE_UNLOCKED_BY_SERVER_TEAM"), Particle.NOTE, 0F, 0F, 0F, 0.01), location -> location.add(0, 2.2, 0)))),
WATER_FIRE(new LocationParticleMutator(new CircleParticle(new ParticleItem(GUARDIAN_SPAWN_EGG, "PARTICLE_WATER_FIRE", "PARTICLE_UNLOCKED_BY_SERVER_TEAM"), new SimpleParticle(null, Particle.DRIP_WATER, 0.0F, 0.0F, 0.0F, 0.01), new SimpleParticle(null, Particle.DRIP_LAVA, 0.0F, 0.0F, 0.0F, 0.01)), location -> location.add(0, 1.1, 0))), WATER_FIRE(new LocationParticleMutator(new CircleParticle(new ParticleItem(GUARDIAN_SPAWN_EGG, "PARTICLE_WATER_FIRE", "PARTICLE_UNLOCKED_BY_SERVER_TEAM"), new SimpleParticle(null, Particle.DRIP_WATER, 0.0F, 0.0F, 0.0F, 0.01), new SimpleParticle(null, Particle.DRIP_LAVA, 0.0F, 0.0F, 0.0F, 0.01)), location -> location.add(0, 1.1, 0))),
WATER_FIRE_ALWAYS(new TickParticle(new LocationParticleMutator(new CircleParticle(new ParticleItem(MAGMA_CUBE_SPAWN_EGG, "PARTICLE_WATER_FIRE", "PARTICLE_UNLOCKED_BY_SERVER_TEAM"), new SimpleParticle(null,Particle.DRIP_WATER, 0.0F, 0.0F, 0.0F, 0.01), new SimpleParticle(null,Particle.DRIP_LAVA, 0.0F, 0.0F, 0.0F, 0.01)), location -> location.add(0, 1.1, 0)))),
MAGIC_ENCHANTING(new LocationParticleMutator(new CircleParticle(new ParticleItem(DIAMOND_SWORD, "PARTICLE_MAGIC_ENCHANTING", "PARTICLE_UNLOCKED_BY_SERVER_TEAM"), new SimpleParticle(null, Particle.CRIT_MAGIC, 0.0F, 0.0F, 0.0F, 0.01), new SimpleParticle(null, Particle.ENCHANTMENT_TABLE, 0.0F, 0.0F, 0.0F, 0.01)), location -> location.add(0, 1.1, 0))), MAGIC_ENCHANTING(new LocationParticleMutator(new CircleParticle(new ParticleItem(DIAMOND_SWORD, "PARTICLE_MAGIC_ENCHANTING", "PARTICLE_UNLOCKED_BY_SERVER_TEAM"), new SimpleParticle(null, Particle.CRIT_MAGIC, 0.0F, 0.0F, 0.0F, 0.01), new SimpleParticle(null, Particle.ENCHANTMENT_TABLE, 0.0F, 0.0F, 0.0F, 0.01)), location -> location.add(0, 1.1, 0))),
MAGIC_CLOUD_CIRCLE(new CloudParticle(new CircleParticle(new LocationParticleMutator(new SimpleParticle(new ParticleItem(GLOWSTONE_DUST, "PARTICLE_MAGIC", "PARTICLE_UNLOCKED_BY_SERVER_TEAM"), Particle.CRIT_MAGIC), location -> location.add(0, 1.1, 0))))), MAGIC_ENCHANTING_ALWAYS(new TickParticle(new LocationParticleMutator(new CircleParticle(new ParticleItem(WOODEN_SWORD, "PARTICLE_MAGIC_ENCHANTING", "PARTICLE_UNLOCKED_BY_SERVER_TEAM"), new SimpleParticle(null, Particle.CRIT_MAGIC, 0.0F, 0.0F, 0.0F, 0.01), new SimpleParticle(null, Particle.ENCHANTMENT_TABLE, 0.0F, 0.0F, 0.0F, 0.01)), location -> location.add(0, 1.1, 0)))),
FLAME_CLOUD_CIRCLE(new CloudParticle(new CircleParticle(new LocationParticleMutator(new SimpleParticle(new ParticleItem(FIRE_CORAL, "PARTICLE_FLAME", "PARTICLE_UNLOCKED_BY_SERVER_TEAM"), Particle.FLAME), location -> location.add(0, 1.1, 0))))), MAGIC_CLOUD_CIRCLE(new CloudParticle(new CircleParticle(new LocationParticleMutator(new SimpleParticle(new ParticleItem(GLOWSTONE_DUST, "PARTICLE_MAGIC", "PARTICLE_UNLOCKED_BY_SERVER_TEAM"), Particle.CRIT_MAGIC, 0.0F, 0.0F, 0.0F, 0.01), location -> location.add(0, 1.1, 0))))),
FIREWORK_CLOUD_CIRCLE(new CloudParticle(new CircleParticle(new LocationParticleMutator(new SimpleParticle(new ParticleItem(FIREWORK_ROCKET, "PARTICLE_FIREWORK", "PARTICLE_UNLOCKED_BY_SERVER_TEAM"), Particle.FIREWORKS_SPARK), location -> location.add(0, 1.1, 0))))), FLAME_CLOUD_CIRCLE(new CloudParticle(new CircleParticle(new LocationParticleMutator(new SimpleParticle(new ParticleItem(FIRE_CORAL, "PARTICLE_FLAME", "PARTICLE_UNLOCKED_BY_SERVER_TEAM"), Particle.FLAME, 0.0F, 0.0F, 0.0F, 0.01), location -> location.add(0, 1.1, 0))))),
WATER_CLOUD_CIRCLE(new CloudParticle(new CircleParticle(new LocationParticleMutator(new SimpleParticle(new ParticleItem(CYAN_DYE, "PARTICLE_WATER", "PARTICLE_UNLOCKED_BY_SERVER_TEAM"), Particle.WATER_WAKE), location -> location.add(0, 1.1, 0))))), FIREWORK_CLOUD_CIRCLE(new CloudParticle(new CircleParticle(new LocationParticleMutator(new SimpleParticle(new ParticleItem(FIREWORK_ROCKET, "PARTICLE_FIREWORK", "PARTICLE_UNLOCKED_BY_SERVER_TEAM"), Particle.FIREWORKS_SPARK, 0.0F, 0.0F, 0.0F, 0.01), location -> location.add(0, 1.1, 0))))),
WATER_CLOUD_CIRCLE(new CloudParticle(new CircleParticle(new LocationParticleMutator(new SimpleParticle(new ParticleItem(CYAN_DYE, "PARTICLE_WATER", "PARTICLE_UNLOCKED_BY_SERVER_TEAM"), Particle.WATER_WAKE, 0.0F, 0.0F, 0.0F, 0.01), location -> location.add(0, 1.1, 0))))),
; ;
public static ParticleEnum[] particles = values(); public static ParticleEnum[] particles = values();

2
src/de/steamwar/lobby/util/LobbyPlayer.java
Datei anzeigen

@ -54,6 +54,8 @@ public class LobbyPlayer {
case "ServerTeamParticle": case "ServerTeamParticle":
particle = ServerTeamParticle.valueOf(strings[1]); particle = ServerTeamParticle.valueOf(strings[1]);
break; break;
case "EventParticle":
particle = EventParticle.valueOf(strings[1]);
case "EventParticleParticipation": case "EventParticleParticipation":
particle = EventParticleParticipation.valueOf(strings[1]); particle = EventParticleParticipation.valueOf(strings[1]);
break; break;