From 231b11de3c3b7d37d7ed874ae64f6e8fe9500157 Mon Sep 17 00:00:00 2001 From: kashike Date: Sun, 1 Oct 2017 11:45:34 -0700 Subject: [PATCH] Fix some OCD issues ref #23 --- SpongeAPI | 2 +- .../common/data/DataRegistrar.java | 2 +- ....java => AreaEffectCloudAgeProcessor.java} | 4 ++-- .../entity/living/human/EntityHuman.java | 8 ++++---- .../common/event/tracking/PhaseTracker.java | 16 ++++++++-------- .../core/entity/player/MixinEntityPlayer.java | 2 +- .../common/profile/query/Query.java | 6 +++--- .../DamageModifierTypeRegistryModule.java | 19 +++++++++++++------ .../pagination/SpongePaginationService.java | 2 +- 9 files changed, 34 insertions(+), 27 deletions(-) rename src/main/java/org/spongepowered/common/data/processor/value/entity/{AReaEffectCloudAgeProcessor.java => AreaEffectCloudAgeProcessor.java} (96%) diff --git a/SpongeAPI b/SpongeAPI index 6cb5c97d251..f9d00ec740e 160000 --- a/SpongeAPI +++ b/SpongeAPI @@ -1 +1 @@ -Subproject commit 6cb5c97d2512a650384981e1e3333c2a46e7b2e7 +Subproject commit f9d00ec740ef7f540ced92994ea5bfde46dd8a80 diff --git a/src/main/java/org/spongepowered/common/data/DataRegistrar.java b/src/main/java/org/spongepowered/common/data/DataRegistrar.java index d4f808fe70b..5fcf6f77c90 100644 --- a/src/main/java/org/spongepowered/common/data/DataRegistrar.java +++ b/src/main/java/org/spongepowered/common/data/DataRegistrar.java @@ -800,7 +800,7 @@ public static void setupSerialization() { DataUtil.registerValueProcessor(Keys.SPAWNER_NEXT_ENTITY_TO_SPAWN, new SpawnerNextEntityToSpawnValueProcessor()); DataUtil.registerValueProcessor(Keys.SPAWNER_ENTITIES, new SpawnerEntitiesValueProcessor()); DataUtil.registerValueProcessor(Keys.AREA_EFFECT_CLOUD_COLOR, new AreaEffectCloudColorProcessor()); - DataUtil.registerValueProcessor(Keys.AREA_EFFECT_CLOUD_AGE, new AReaEffectCloudAgeProcessor()); + DataUtil.registerValueProcessor(Keys.AREA_EFFECT_CLOUD_AGE, new AreaEffectCloudAgeProcessor()); DataUtil.registerValueProcessor(Keys.AREA_EFFECT_CLOUD_PARTICLE_TYPE, new AreaEffectCloudParticleTypeProcessor()); DataUtil.registerValueProcessor(Keys.AREA_EFFECT_CLOUD_DURATION, new AreaEffectCloudDurationProcessor()); DataUtil.registerValueProcessor(Keys.AREA_EFFECT_CLOUD_DURATION_ON_USE, new AreaEffectCloudDurationOnUseProcessor()); diff --git a/src/main/java/org/spongepowered/common/data/processor/value/entity/AReaEffectCloudAgeProcessor.java b/src/main/java/org/spongepowered/common/data/processor/value/entity/AreaEffectCloudAgeProcessor.java similarity index 96% rename from src/main/java/org/spongepowered/common/data/processor/value/entity/AReaEffectCloudAgeProcessor.java rename to src/main/java/org/spongepowered/common/data/processor/value/entity/AreaEffectCloudAgeProcessor.java index 4121298f7d7..d6d1b5bc18a 100644 --- a/src/main/java/org/spongepowered/common/data/processor/value/entity/AReaEffectCloudAgeProcessor.java +++ b/src/main/java/org/spongepowered/common/data/processor/value/entity/AreaEffectCloudAgeProcessor.java @@ -35,9 +35,9 @@ import java.util.Optional; -public class AReaEffectCloudAgeProcessor extends AbstractSpongeValueProcessor> { +public class AreaEffectCloudAgeProcessor extends AbstractSpongeValueProcessor> { - public AReaEffectCloudAgeProcessor() { + public AreaEffectCloudAgeProcessor() { super(EntityAreaEffectCloud.class, Keys.AREA_EFFECT_CLOUD_AGE); } diff --git a/src/main/java/org/spongepowered/common/entity/living/human/EntityHuman.java b/src/main/java/org/spongepowered/common/entity/living/human/EntityHuman.java index f0a87c48231..c5e77cfa9ef 100644 --- a/src/main/java/org/spongepowered/common/entity/living/human/EntityHuman.java +++ b/src/main/java/org/spongepowered/common/entity/living/human/EntityHuman.java @@ -260,8 +260,8 @@ public float getAIMoveSpeed() { } @Override - protected SoundEvent getFallSound(int p_184588_1_) { - return p_184588_1_ > 4 ? SoundEvents.ENTITY_PLAYER_BIG_FALL : SoundEvents.ENTITY_PLAYER_SMALL_FALL; + protected SoundEvent getFallSound(int height) { + return height > 4 ? SoundEvents.ENTITY_PLAYER_BIG_FALL : SoundEvents.ENTITY_PLAYER_SMALL_FALL; } @Override public float getEyeHeight() { @@ -499,7 +499,7 @@ public Packet[] popQueuedPackets(@Nullable EntityPlayerMP player) { } @Override - public void attackEntityWithRangedAttack(EntityLivingBase target, float p_82196_2_) { + public void attackEntityWithRangedAttack(EntityLivingBase target, float distanceFactor) { // Borrowed from Skeleton // TODO Figure out how to API this out final EntityTippedArrow entitytippedarrow = new EntityTippedArrow(this.world, this); @@ -511,7 +511,7 @@ public void attackEntityWithRangedAttack(EntityLivingBase target, float p_82196_ // These names are wrong int i = EnchantmentHelper.getMaxEnchantmentLevel(Enchantments.PUNCH, this); int j = EnchantmentHelper.getMaxEnchantmentLevel(Enchantments.FLAME, this); - entitytippedarrow.setDamage(p_82196_2_ * 2.0F + this.rand.nextGaussian() * 0.25D + this.world.getDifficulty().getDifficultyId() * 0.11F); + entitytippedarrow.setDamage(distanceFactor * 2.0F + this.rand.nextGaussian() * 0.25D + this.world.getDifficulty().getDifficultyId() * 0.11F); if (i > 0) { entitytippedarrow.setDamage(entitytippedarrow.getDamage() + i * 0.5D + 0.5D); diff --git a/src/main/java/org/spongepowered/common/event/tracking/PhaseTracker.java b/src/main/java/org/spongepowered/common/event/tracking/PhaseTracker.java index a8d3e73cbc5..4d34edc7b1c 100644 --- a/src/main/java/org/spongepowered/common/event/tracking/PhaseTracker.java +++ b/src/main/java/org/spongepowered/common/event/tracking/PhaseTracker.java @@ -247,10 +247,10 @@ private void printIncorrectPhaseCompletion(IPhaseState prevState, IPhaseState PrettyPrinter printer = new PrettyPrinter(60).add("Completing incorrect phase").centre().hr() .addWrapped(50, "Sponge's tracking system is very dependent on knowing when" - + "a change to any world takes place, however, we are attempting" - + "to complete a \"phase\" other than the one we most recently entered." - + "This is an error usually on Sponge's part, so a report" - + "is required on the issue tracker on GitHub.").hr() + + " a change to any world takes place, however, we are attempting" + + " to complete a \"phase\" other than the one we most recently entered." + + " This is an error usually on Sponge's part, so a report" + + " is required on the issue tracker on GitHub.").hr() .add("Expected to exit phase: %s", prevState) .add("But instead found phase: %s", state) .add("StackTrace:") @@ -275,10 +275,10 @@ private void printEmptyStackOnCompletion() { } final PrettyPrinter printer = new PrettyPrinter(60).add("Unexpectedly Completing An Empty Stack").centre().hr() .addWrapped(50, "Sponge's tracking system is very dependent on knowing when" - + "a change to any world takes place, however, we have been told" - + "to complete a \"phase\" without having entered any phases." - + "This is an error usually on Sponge's part, so a report" - + "is required on the issue tracker on GitHub.").hr() + + " a change to any world takes place, however, we have been told" + + " to complete a \"phase\" without having entered any phases." + + " This is an error usually on Sponge's part, so a report" + + " is required on the issue tracker on GitHub.").hr() .add("StackTrace:") .add(new Exception()) .add(); diff --git a/src/main/java/org/spongepowered/common/mixin/core/entity/player/MixinEntityPlayer.java b/src/main/java/org/spongepowered/common/mixin/core/entity/player/MixinEntityPlayer.java index 88d5d1dd675..ff4f54253b4 100644 --- a/src/main/java/org/spongepowered/common/mixin/core/entity/player/MixinEntityPlayer.java +++ b/src/main/java/org/spongepowered/common/mixin/core/entity/player/MixinEntityPlayer.java @@ -687,7 +687,7 @@ public void attackTargetEntityWithCurrentItem(Entity targetEntity) { final DamageFunction sweapingFunction = DamageFunction.of(DamageModifier.builder() .cause(Cause.of(EventContext.empty(), heldSnapshot)) .item(heldSnapshot) - .type(DamageModifierTypes.SWEAPING) + .type(DamageModifierTypes.SWEEPING) .build(), (incoming) -> EnchantmentHelper.getSweepingDamageRatio((EntityPlayer) (Object) this) * attackDamage); final List sweapingFunctions = new ArrayList<>(); diff --git a/src/main/java/org/spongepowered/common/profile/query/Query.java b/src/main/java/org/spongepowered/common/profile/query/Query.java index b1aa3163843..14068746d6b 100644 --- a/src/main/java/org/spongepowered/common/profile/query/Query.java +++ b/src/main/java/org/spongepowered/common/profile/query/Query.java @@ -87,11 +87,11 @@ protected GameProfile fillProfile(GameProfile profile, boolean signed) throws Pr Optional result = this.cache.fillProfile(profile, signed); if (result.isPresent() && result.get().isFilled()) { - GameProfile t = result.get(); + GameProfile filled = result.get(); - this.cache.add(t, true, (Instant) null); + this.cache.add(filled, true, (Instant) null); - return t; + return filled; } throw new ProfileNotFoundException("Profile: " + profile); } diff --git a/src/main/java/org/spongepowered/common/registry/type/event/DamageModifierTypeRegistryModule.java b/src/main/java/org/spongepowered/common/registry/type/event/DamageModifierTypeRegistryModule.java index 66b021fcf3d..28155d64d20 100644 --- a/src/main/java/org/spongepowered/common/registry/type/event/DamageModifierTypeRegistryModule.java +++ b/src/main/java/org/spongepowered/common/registry/type/event/DamageModifierTypeRegistryModule.java @@ -28,9 +28,8 @@ import com.google.common.collect.ImmutableList; import org.spongepowered.api.event.cause.entity.damage.DamageModifierType; -import org.spongepowered.api.event.cause.entity.damage.DamageModifierTypes; +import org.spongepowered.api.registry.AlternateCatalogRegistryModule; import org.spongepowered.api.registry.CatalogRegistryModule; -import org.spongepowered.api.registry.util.RegisterCatalog; import org.spongepowered.common.event.damage.SpongeDamageModifierType; import java.util.Collection; @@ -39,12 +38,10 @@ import java.util.Map; import java.util.Optional; -public class DamageModifierTypeRegistryModule implements CatalogRegistryModule { +public class DamageModifierTypeRegistryModule implements CatalogRegistryModule, AlternateCatalogRegistryModule { - @RegisterCatalog(DamageModifierTypes.class) private final Map modifierTypeMap = new HashMap<>(); - @Override public Optional getById(String id) { return Optional.ofNullable(this.modifierTypeMap.get(checkNotNull(id).toLowerCase(Locale.ENGLISH))); @@ -72,6 +69,16 @@ public void registerDefaults() { this.modifierTypeMap.put("absorption", new SpongeDamageModifierType("Absorption", "absorption")); this.modifierTypeMap.put("critical_hit", new SpongeDamageModifierType("Critical Hit", "critical_hit")); this.modifierTypeMap.put("attack_cooldown", new SpongeDamageModifierType("Attack Cooldown", "attack_cooldown")); - this.modifierTypeMap.put("sweaping", new SpongeDamageModifierType("Sweaping", "sweaping")); + final DamageModifierType sweeping = new SpongeDamageModifierType("Sweeping", "sweeping"); + this.modifierTypeMap.put("sweeping", sweeping); + this.modifierTypeMap.put("sweaping", sweeping); // TODO: remove + } + + // TODO: replace with @RegisterCatalog on the field - only needed until DamageModifierTypes#SWEAPING is removed + @Override + public Map provideCatalogMap() { + final Map map = new HashMap<>(this.modifierTypeMap); + map.remove("sweaping"); // do not remap + return map; } } diff --git a/src/main/java/org/spongepowered/common/service/pagination/SpongePaginationService.java b/src/main/java/org/spongepowered/common/service/pagination/SpongePaginationService.java index ace57061bf7..0d0f114f7e5 100644 --- a/src/main/java/org/spongepowered/common/service/pagination/SpongePaginationService.java +++ b/src/main/java/org/spongepowered/common/service/pagination/SpongePaginationService.java @@ -142,7 +142,7 @@ private SourcePaginations getPaginationStateForPlayer(Player source, boolean cre return this.playerActivePaginations.get(source.getUniqueId(), k -> create ? new SourcePaginations() : null); } - private CommandSpec buildPaginationCommand(){ + private CommandSpec buildPaginationCommand() { final ActivePaginationCommandElement paginationElement = new ActivePaginationCommandElement(t("pagination-id"));