From 411d3d7fbda5ed9eea168d44d92bdfb8cfde08b9 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 16 Oct 2014 02:28:14 -0400 Subject: [PATCH] Fix tormented enderman head block dropping damage 0. Allow killer joe item to charge wirelessly Update release notes --- ReleaseNotes.txt | 20 ++++++++++++++++--- resources/assets/enderio/lang/en_US.lang | 3 ++- .../item/skull/BlockEndermanSkull.java | 5 ++++- .../machine/killera/TileKillerJoe.java | 16 +++++---------- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 6ba4b1e4..ad010cd1 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,6 +1,20 @@ +------------------------------------------------------ +Version 2.1.3 +------------------------------------------------------ + +Changes +- Better bounding boxes on obelisks (tterrag) +- Left clicking XP obelisk takes one level from player (tterrag) +- WAILA support on all IInternalPowerReceptor and IConduitBundle (tterrag) +- WAILA support for photovoltaic panels (efficiency %) (tterrag) +- Allow killer joe's sword to charge from wireless chargers, this means that onUpdate() is called each tick (tterrag) + +Bugs +- Fix tormented enderman head (and future head variants) dropping damage 0 always (tterrag) + ------------------------------------------------------ Version 2.1.2 ------------------------------------------------------ +------------------------------------------------------ - Fix for client crash when using travel anchor @@ -15,12 +29,12 @@ Changes - #1040 #1059 Added key toggles for speed and step assist upgrades for DS armor - #1061 Reservoir can be disabled in the config - #1071 Added recipes to make fused quartz and enlightened glass using quartz blocks and glowstone blocks (MatthiasMann) -- Yeta wrench works with IDismantleable (Thermal Expansion) blocks (tterragT +- Yeta wrench works with IDismantleable (Thermal Expansion) blocks (tterrag) - Added config options to disable all slime and squid spawns - Improved displayed names of paint sources - Improve power bar rendering for Dark Steel tools/armor (tterrag) - Added support for connected texture facades with chisel mod. This will not work until the next release of chisel. -- Added WAILA support to capacitor bank, transceiver, and tank (tterragT) +- Added WAILA support to capacitor bank, transceiver, and tank (tterrag) - When in creative mode the 'drain xp' button of the soul binder now always works. - Added Underground Biomes Constructs Support to SAG Mill recipes (mmatis) - Added config option to dump mob names in the format required by EIOs blacklists. diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index ceb1d74b..05804970 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -378,7 +378,8 @@ tile.blockExperienceObelisk.name=Experience Obelisk tile.blockExperienceObelisk.tooltip.detailed.line1=When placed on a fluid tank tile.blockExperienceObelisk.tooltip.detailed.line2=R-Click to use stored Liquid XP tile.blockExperienceObelisk.tooltip.detailed.line3=Shift-R-Click with an empty hand -tile.blockExperienceObelisk.tooltip.detailed.line4=to drain player XP into the tank +tile.blockExperienceObelisk.tooltip.detailed.line4=to drain player XP into the tank +tile.blockExperienceObelisk.tooltip.detailed.line5=L-Click to drain 1 level of player XP enderio.machine.tooltip.configured=(Configured) diff --git a/src/main/java/crazypants/enderio/item/skull/BlockEndermanSkull.java b/src/main/java/crazypants/enderio/item/skull/BlockEndermanSkull.java index c50cfd8c..47286e1f 100644 --- a/src/main/java/crazypants/enderio/item/skull/BlockEndermanSkull.java +++ b/src/main/java/crazypants/enderio/item/skull/BlockEndermanSkull.java @@ -129,5 +129,8 @@ public class BlockEndermanSkull extends BlockEio { world.markBlockForUpdate(x, y, z); } - + @Override + public int damageDropped(int meta) { + return meta; + } } diff --git a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java index 13976960..2cc95fae 100644 --- a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java @@ -1,22 +1,16 @@ package crazypants.enderio.machine.killera; -import java.util.Collection; import java.util.List; import net.minecraft.command.IEntitySelector; -import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.item.EntityXPOrb; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.DamageSource; import net.minecraft.world.WorldServer; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.ForgeDirection; @@ -26,9 +20,11 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import com.google.common.collect.Multimap; import com.mojang.authlib.GameProfile; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.gameevent.TickEvent.Phase; +import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; @@ -39,7 +35,6 @@ import crazypants.enderio.network.PacketHandler; import crazypants.enderio.xp.ExperienceContainer; import crazypants.enderio.xp.IHaveExperience; import crazypants.enderio.xp.PacketExperianceContainer; -import crazypants.enderio.xp.XpUtil; import crazypants.render.BoundingBox; import crazypants.util.BlockCoord; import crazypants.util.FluidUtil; @@ -103,6 +98,7 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle public void updateEntity() { updateArmSwingProgress(); hooverXP(); + getAttackera().onUpdate(); super.updateEntity(); } @@ -146,7 +142,6 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle if(!ent.isDead) { FakePlayer fakee = getAttackera(); fakee.setCurrentItemOrArmor(0, getStackInSlot(0)); - fakee.onUpdate(); fakee.attackTargetEntityWithCurrentItem(ent); useNutrient(); swingWeapon(); @@ -483,8 +478,7 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle } prevWeapon = cur == null ? null : cur.copy(); } + FMLCommonHandler.instance().bus().post(new PlayerTickEvent(Phase.END, this)); } - } - }