From 0cb8296b058e01776be3d12c7515f54434d4ed3d Mon Sep 17 00:00:00 2001 From: Bixilon Date: Thu, 25 Mar 2021 18:05:13 +0100 Subject: [PATCH] mappings: rename MobEffect to StatusEffect --- .../commands/parser/ResourceLocationListParser.kt | 2 +- .../{StatusEffect.kt => StatusEffectInstance.kt} | 10 +++++++--- .../minosoft/data/entities/entities/Entity.java | 14 +++++++------- .../mappings/{MobEffect.kt => StatusEffect.kt} | 8 ++++---- .../data/mappings/versions/VersionMapping.kt | 6 +++--- .../clientbound/play/PacketEntityEffect.java | 10 +++++----- ...ct.java => PacketRemoveEntityStatusEffect.java} | 12 ++++++------ .../minosoft/protocol/protocol/PacketTypes.java | 2 +- 8 files changed, 34 insertions(+), 30 deletions(-) rename src/main/java/de/bixilon/minosoft/data/entities/{StatusEffect.kt => StatusEffectInstance.kt} (77%) rename src/main/java/de/bixilon/minosoft/data/mappings/{MobEffect.kt => StatusEffect.kt} (84%) rename src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/{PacketRemoveEntityEffect.java => PacketRemoveEntityStatusEffect.java} (84%) diff --git a/src/main/java/de/bixilon/minosoft/data/commands/parser/ResourceLocationListParser.kt b/src/main/java/de/bixilon/minosoft/data/commands/parser/ResourceLocationListParser.kt index 81f9a388f..320194153 100644 --- a/src/main/java/de/bixilon/minosoft/data/commands/parser/ResourceLocationListParser.kt +++ b/src/main/java/de/bixilon/minosoft/data/commands/parser/ResourceLocationListParser.kt @@ -33,7 +33,7 @@ class ResourceLocationListParser : CommandParser() { return connection.mapping.enchantmentRegistry.get(resourceLocation.value) ?: throw EnchantmentNotFoundCommandParseException(stringReader, resourceLocation.key) } if (this == MOB_EFFECT_PARSER) { - return connection.mapping.mobEffectRegistry.get(resourceLocation.value) ?: throw MobEffectNotFoundCommandParseException(stringReader, resourceLocation.key) + return connection.mapping.statusEffectRegistry.get(resourceLocation.value) ?: throw MobEffectNotFoundCommandParseException(stringReader, resourceLocation.key) } if (this == DIMENSION_EFFECT_PARSER) { return connection.mapping.dimensionRegistry.get(resourceLocation.value) ?: throw DimensionNotFoundCommandParseException(stringReader, resourceLocation.key) diff --git a/src/main/java/de/bixilon/minosoft/data/entities/StatusEffect.kt b/src/main/java/de/bixilon/minosoft/data/entities/StatusEffectInstance.kt similarity index 77% rename from src/main/java/de/bixilon/minosoft/data/entities/StatusEffect.kt rename to src/main/java/de/bixilon/minosoft/data/entities/StatusEffectInstance.kt index b9080e007..117d5e853 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/StatusEffect.kt +++ b/src/main/java/de/bixilon/minosoft/data/entities/StatusEffectInstance.kt @@ -12,11 +12,15 @@ */ package de.bixilon.minosoft.data.entities -import de.bixilon.minosoft.data.mappings.MobEffect +import de.bixilon.minosoft.data.mappings.StatusEffect -data class StatusEffect(val effect: MobEffect, val amplifier: Int, val duration: Int) { +data class StatusEffectInstance( + val statusEffect: StatusEffect, + val amplifier: Int, + val duration: Int, +) { override fun toString(): String { - return "$effect (amplifier: $amplifier, duration: $duration)" + return "$statusEffect (amplifier: $amplifier, duration: $duration)" } } diff --git a/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.java b/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.java index 44a40f995..a4612d1cd 100644 --- a/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.java +++ b/src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.java @@ -17,7 +17,7 @@ import de.bixilon.minosoft.config.StaticConfiguration; import de.bixilon.minosoft.data.entities.*; import de.bixilon.minosoft.data.inventory.InventorySlots; import de.bixilon.minosoft.data.inventory.Slot; -import de.bixilon.minosoft.data.mappings.MobEffect; +import de.bixilon.minosoft.data.mappings.StatusEffect; import de.bixilon.minosoft.data.text.ChatComponent; import de.bixilon.minosoft.modding.event.events.annotations.Unsafe; import de.bixilon.minosoft.protocol.network.Connection; @@ -37,7 +37,7 @@ public abstract class Entity { protected final int entityId; protected final UUID uuid; protected final HashMap equipment = new HashMap<>(); - protected final HashSet effectList = new HashSet<>(); + protected final HashSet effectList = new HashSet<>(); protected final int versionId; protected Position position; protected EntityRotation rotation; @@ -86,18 +86,18 @@ public abstract class Entity { return this.uuid; } - public HashSet getEffectList() { + public HashSet getEffectList() { return this.effectList; } - public void addEffect(StatusEffect effect) { + public void addEffect(StatusEffectInstance effect) { // effect already applied, maybe the duration or the amplifier changed? - this.effectList.removeIf(listEffect -> listEffect.getEffect() == effect.getEffect()); + this.effectList.removeIf(listEffect -> listEffect.getStatusEffect() == effect.getStatusEffect()); this.effectList.add(effect); } - public void removeEffect(MobEffect effect) { - this.effectList.removeIf(listEffect -> listEffect.getEffect() == effect); + public void removeEffect(StatusEffect effect) { + this.effectList.removeIf(listEffect -> listEffect.getStatusEffect() == effect); } public void attachTo(int vehicleId) { diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/MobEffect.kt b/src/main/java/de/bixilon/minosoft/data/mappings/StatusEffect.kt similarity index 84% rename from src/main/java/de/bixilon/minosoft/data/mappings/MobEffect.kt rename to src/main/java/de/bixilon/minosoft/data/mappings/StatusEffect.kt index b8e9d5f0a..f3fddeb65 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/MobEffect.kt +++ b/src/main/java/de/bixilon/minosoft/data/mappings/StatusEffect.kt @@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.mappings import com.google.gson.JsonObject import de.bixilon.minosoft.data.mappings.versions.VersionMapping -data class MobEffect( +data class StatusEffect( val resourceLocation: ResourceLocation, // ToDo ) : RegistryItem { @@ -23,9 +23,9 @@ data class MobEffect( return resourceLocation.toString() } - companion object : ResourceLocationDeserializer { - override fun deserialize(mappings: VersionMapping, resourceLocation: ResourceLocation, data: JsonObject): MobEffect { - return MobEffect(resourceLocation) + companion object : ResourceLocationDeserializer { + override fun deserialize(mappings: VersionMapping, resourceLocation: ResourceLocation, data: JsonObject): StatusEffect { + return StatusEffect(resourceLocation) } } diff --git a/src/main/java/de/bixilon/minosoft/data/mappings/versions/VersionMapping.kt b/src/main/java/de/bixilon/minosoft/data/mappings/versions/VersionMapping.kt index f0594cd30..6ecc37b1b 100644 --- a/src/main/java/de/bixilon/minosoft/data/mappings/versions/VersionMapping.kt +++ b/src/main/java/de/bixilon/minosoft/data/mappings/versions/VersionMapping.kt @@ -40,7 +40,7 @@ class VersionMapping(var version: Version?) { val itemRegistry: ItemRegistry = ItemRegistry() val enchantmentRegistry: Registry = Registry() val particleRegistry: Registry = Registry() - val mobEffectRegistry: Registry = Registry() + val statusEffectRegistry: Registry = Registry() val statisticRegistry: Registry = Registry() val biomeRegistry: Registry = Registry() val dimensionRegistry: Registry = Registry() @@ -72,7 +72,7 @@ class VersionMapping(var version: Version?) { itemRegistry.setParent(value?.itemRegistry) enchantmentRegistry.setParent(value?.enchantmentRegistry) particleRegistry.setParent(value?.particleRegistry) - mobEffectRegistry.setParent(value?.mobEffectRegistry) + statusEffectRegistry.setParent(value?.statusEffectRegistry) blockRegistry.setParent(value?.blockRegistry) statisticRegistry.setParent(value?.statisticRegistry) biomeRegistry.setParent(value?.biomeRegistry) @@ -116,7 +116,7 @@ class VersionMapping(var version: Version?) { itemRegistry.initialize(pixlyzerData["items"]?.asJsonObject, this, Item.Companion, version!!.isFlattened(), Registry.MetaTypes.BITS_16) enchantmentRegistry.initialize(pixlyzerData["enchantments"]?.asJsonObject, this, Enchantment.Companion) particleRegistry.initialize(pixlyzerData["particles"]?.asJsonObject, this, Particle.Companion) - mobEffectRegistry.initialize(pixlyzerData["mob_effect"]?.asJsonObject, this, MobEffect.Companion) + statusEffectRegistry.initialize(pixlyzerData["mob_effect"]?.asJsonObject, this, StatusEffect.Companion) biomeRegistry.initialize(pixlyzerData["biomes"]?.asJsonObject, this, Biome.Companion) dimensionRegistry.initialize(pixlyzerData["dimensions"]?.asJsonObject, this, Dimension.Companion) diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityEffect.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityEffect.java index e8f1295cd..9ae8480cc 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityEffect.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityEffect.java @@ -13,7 +13,7 @@ package de.bixilon.minosoft.protocol.packets.clientbound.play; -import de.bixilon.minosoft.data.entities.StatusEffect; +import de.bixilon.minosoft.data.entities.StatusEffectInstance; import de.bixilon.minosoft.data.entities.entities.Entity; import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.packets.ClientboundPacket; @@ -25,7 +25,7 @@ import static de.bixilon.minosoft.protocol.protocol.ProtocolVersions.*; public class PacketEntityEffect extends ClientboundPacket { int entityId; - StatusEffect effect; + StatusEffectInstance effect; boolean isAmbient; boolean hideParticles; boolean showIcon = true; @@ -34,10 +34,10 @@ public class PacketEntityEffect extends ClientboundPacket { public boolean read(InByteBuffer buffer) { this.entityId = buffer.readEntityId(); if (buffer.getVersionId() < V_14W04A) { - this.effect = new StatusEffect(buffer.getConnection().getMapping().getMobEffectRegistry().get(buffer.readByte()), buffer.readByte() + 1, buffer.readShort()); + this.effect = new StatusEffectInstance(buffer.getConnection().getMapping().getStatusEffectRegistry().get(buffer.readByte()), buffer.readByte() + 1, buffer.readShort()); return true; } - this.effect = new StatusEffect(buffer.getConnection().getMapping().getMobEffectRegistry().get(buffer.readByte()), buffer.readByte() + 1, buffer.readVarInt()); + this.effect = new StatusEffectInstance(buffer.getConnection().getMapping().getStatusEffectRegistry().get(buffer.readByte()), buffer.readByte() + 1, buffer.readVarInt()); if (buffer.getVersionId() < V_1_9_4) { // ToDo if (buffer.getVersionId() >= V_14W06B) { this.hideParticles = buffer.readBoolean(); @@ -72,7 +72,7 @@ public class PacketEntityEffect extends ClientboundPacket { return this.entityId; } - public StatusEffect getEffect() { + public StatusEffectInstance getEffect() { return this.effect; } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketRemoveEntityEffect.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketRemoveEntityStatusEffect.java similarity index 84% rename from src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketRemoveEntityEffect.java rename to src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketRemoveEntityStatusEffect.java index 008328f76..ba3180e23 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketRemoveEntityEffect.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketRemoveEntityStatusEffect.java @@ -14,21 +14,21 @@ package de.bixilon.minosoft.protocol.packets.clientbound.play; import de.bixilon.minosoft.data.entities.entities.Entity; -import de.bixilon.minosoft.data.mappings.MobEffect; +import de.bixilon.minosoft.data.mappings.StatusEffect; import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.packets.ClientboundPacket; import de.bixilon.minosoft.protocol.protocol.InByteBuffer; import de.bixilon.minosoft.util.logging.Log; -public class PacketRemoveEntityEffect extends ClientboundPacket { - int entityId; - MobEffect effect; +public class PacketRemoveEntityStatusEffect extends ClientboundPacket { + private int entityId; + private StatusEffect effect; @Override public boolean read(InByteBuffer buffer) { this.entityId = buffer.readEntityId(); - this.effect = buffer.getConnection().getMapping().getMobEffectRegistry().get(buffer.readByte()); + this.effect = buffer.getConnection().getMapping().getStatusEffectRegistry().get(buffer.readByte()); return true; } @@ -51,7 +51,7 @@ public class PacketRemoveEntityEffect extends ClientboundPacket { return this.entityId; } - public MobEffect getEffect() { + public StatusEffect getEffect() { return this.effect; } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketTypes.java b/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketTypes.java index bdf92b648..0bc8c422f 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketTypes.java +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketTypes.java @@ -155,7 +155,7 @@ public class PacketTypes { PLAY_PLAYER_POSITION_AND_ROTATION(PacketPlayerPositionAndRotation::new), PLAY_UNLOCK_RECIPES(PacketUnlockRecipes::new), PLAY_DESTROY_ENTITIES(PacketDestroyEntity::new), - PLAY_REMOVE_ENTITY_EFFECT(PacketRemoveEntityEffect::new), + PLAY_REMOVE_ENTITY_EFFECT(PacketRemoveEntityStatusEffect::new), PLAY_RESOURCE_PACK_SEND(PacketResourcePackSend::new), PLAY_RESPAWN(PacketRespawn::new, false), PLAY_ENTITY_HEAD_ROTATION(PacketEntityHeadRotation::new),