From 4e054224ac149dd1ba7a2313d7ade11a50a3e379 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Tue, 9 Feb 2016 15:53:22 -0500 Subject: [PATCH] Fixed step height issues with PotionBoost. Fixed some formatting errors. Set the path blocks' max path lengths. --- .settings/org.eclipse.jdt.core.prefs | 6 +++--- .../WayofTime/bloodmagic/block/BlockPath.java | 6 ++++++ .../bloodmagic/potion/PotionEventHandlers.java | 2 -- .../bloodmagic/tile/TileIncenseAltar.java | 2 +- .../bloodmagic/util/handler/EventHandler.java | 18 ++++++++++++++++++ .../assets/bloodmagic/lang/en_US.lang | 4 ++-- 6 files changed, 30 insertions(+), 8 deletions(-) diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 6afb4b38..7135a263 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ # -#Thu Feb 04 07:30:09 EST 2016 +#Tue Feb 09 07:17:21 EST 2016 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert org.eclipse.jdt.core.formatter.brace_position_for_block=next_line org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert @@ -288,10 +288,10 @@ org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=next_line eclipse.preferences.version=1 -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=next_line org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.formatter.blank_lines_after_package=1 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java index e2fdc06a..f731127c 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java @@ -40,11 +40,17 @@ public class BlockPath extends BlockString implements IIncensePath switch (this.getMetaFromState(state)) { case 0: + case 1: return 2; case 2: + case 3: return 4; case 4: + case 5: return 6; + case 6: + case 7: + return 8; default: return 0; } diff --git a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java index f339058f..ca200124 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java +++ b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java @@ -40,7 +40,6 @@ public class PotionEventHandlers @SubscribeEvent public void onEntityUpdate(LivingEvent.LivingUpdateEvent event) { - if (event.entityLiving.isPotionActive(ModPotions.boost)) { int i = event.entityLiving.getActivePotionEffect(ModPotions.boost).getAmplifier(); @@ -50,7 +49,6 @@ public class PotionEventHandlers if (event.entityLiving instanceof EntityPlayer) { EntityPlayer entityPlayer = (EntityPlayer) event.entityLiving; - entityPlayer.stepHeight = 1.0f; if ((entityPlayer.onGround || entityPlayer.capabilities.isFlying) && entityPlayer.moveForward > 0F) entityPlayer.moveFlying(0F, 1F, entityPlayer.capabilities.isFlying ? (percentIncrease / 2.0f) : percentIncrease); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java index 54f3039f..d4f6c9e6 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java @@ -174,7 +174,7 @@ public class TileIncenseAltar extends TileInventory implements ITickable totalTranquility += entry.getValue(); } - if (totalTranquility <= 0) + if (totalTranquility < 0) { return; } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java index 4b4488a3..93f82337 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java @@ -22,6 +22,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.AnvilUpdateEvent; import net.minecraftforge.event.entity.living.LivingAttackEvent; import net.minecraftforge.event.entity.living.LivingDropsEvent; +import net.minecraftforge.event.entity.living.LivingEvent; import net.minecraftforge.event.entity.living.LivingHealEvent; import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.event.entity.player.ArrowLooseEvent; @@ -32,6 +33,7 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.client.event.ConfigChangedEvent; import net.minecraftforge.fml.common.eventhandler.Event; +import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import WayofTime.bloodmagic.ConfigHandler; @@ -76,6 +78,22 @@ public class EventHandler { Random random = new Random(); + @SubscribeEvent(priority = EventPriority.HIGHEST) + public void onEntityUpdate(LivingEvent.LivingUpdateEvent event) + { + if (event.entityLiving instanceof EntityPlayer) + { + EntityPlayer entityPlayer = (EntityPlayer) event.entityLiving; + if (event.entityLiving.isPotionActive(ModPotions.boost)) + { + entityPlayer.stepHeight = 1.0f; + } else + { + entityPlayer.stepHeight = 0.5f; + } + } + } + @SubscribeEvent public void onEntityHurt(LivingHurtEvent event) { diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 372e12f8..034acda9 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -208,7 +208,7 @@ tooltip.BloodMagic.sigil.divination.otherNetwork=Peering into the soul of %s tooltip.BloodMagic.sigil.divination.currentAltarTier=Current Tier: %d tooltip.BloodMagic.sigil.divination.currentEssence=Current Essence: %,d LP tooltip.BloodMagic.sigil.divination.currentAltarCapacity=Current Capacity: %,d LP -tooltip.BloodMagic.sigil.divination.currentTranquility=Current Tranquility: %,d +tooltip.BloodMagic.sigil.divination.currentTranquility=Current Tranquility: %,f tooltip.BloodMagic.sigil.divination.currentBonus=Current Bonus: +%,d%% tooltip.BloodMagic.sigil.water.desc=&oInfinite water, anyone? tooltip.BloodMagic.sigil.lava.desc=&oHOT! DO NOT EAT @@ -227,7 +227,7 @@ tooltip.BloodMagic.sigil.seer.currentAltarTier=Current Tier: %d tooltip.BloodMagic.sigil.seer.currentEssence=Current Essence: %,d LP tooltip.BloodMagic.sigil.seer.currentAltarCapacity=Current Capacity: %,d LP tooltip.BloodMagic.sigil.seer.currentCharge=Current Charge: %,d -tooltip.BloodMagic.sigil.seer.currentTranquility=Current Tranquility: %,d +tooltip.BloodMagic.sigil.seer.currentTranquility=Current Tranquility: %,f tooltip.BloodMagic.sigil.seer.currentBonus=Current Bonus: +%,d%% tooltip.BloodMagic.sigil.phantomBridge.desc=&oWalking on thin air... tooltip.BloodMagic.sigil.whirlwind.desc=&oBest not to wear a skirt