From 44114660b15ee2794be58673dcaabad639018f00 Mon Sep 17 00:00:00 2001 From: fewizz Date: Thu, 13 Oct 2016 16:14:49 +0300 Subject: [PATCH 1/4] Closes #30 , now no fall damage only have quantum/nano wings ( Closes #29 ) --- src/main/java/emt/block/BlockElectricCloud.java | 2 +- src/main/java/emt/item/armor/wings/ItemFeatherWing.java | 6 +----- src/main/java/emt/item/armor/wings/ItemNanoWing.java | 3 +++ src/main/java/emt/item/armor/wings/ItemQuantumWing.java | 3 +++ src/main/java/emt/tile/TileElectricCloud.java | 5 +++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/emt/block/BlockElectricCloud.java b/src/main/java/emt/block/BlockElectricCloud.java index 2f93480..d7314ac 100644 --- a/src/main/java/emt/block/BlockElectricCloud.java +++ b/src/main/java/emt/block/BlockElectricCloud.java @@ -31,7 +31,7 @@ public class BlockElectricCloud extends BlockBase { public BlockElectricCloud(String unlocName) { super(unlocName, Material.cloth, soundTypeCloth, 0.1f); - setBlockBounds(0.3f, 0.3f, 0.3f, 0.7f, 0.7f, 0.7f); + //setBlockBounds(0.3f, 0.3f, 0.3f, 0.7f, 0.7f, 0.7f); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/emt/item/armor/wings/ItemFeatherWing.java b/src/main/java/emt/item/armor/wings/ItemFeatherWing.java index a4fdddc..daac57c 100644 --- a/src/main/java/emt/item/armor/wings/ItemFeatherWing.java +++ b/src/main/java/emt/item/armor/wings/ItemFeatherWing.java @@ -65,7 +65,7 @@ public class ItemFeatherWing extends ItemArmor { @Override public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { - useWings(player, stack, world, 0.09f, 0.9f, 0.9f, 0); + useWings(player, stack, world, 0.11f, 0.9f, 0.9f, 0); } public void useWings(EntityPlayer player, ItemStack stack, World world, float motionY, float motionXZ, float f1, int amount) { @@ -115,9 +115,5 @@ public class ItemFeatherWing extends ItemArmor { if (player.isSneaking() && !player.onGround && player.motionY < 0) { player.motionY *= 0.6; } - - if (player.fallDistance > 0.0F) { - player.fallDistance = 0; - } } } diff --git a/src/main/java/emt/item/armor/wings/ItemNanoWing.java b/src/main/java/emt/item/armor/wings/ItemNanoWing.java index e0a43ed..03ec4d2 100644 --- a/src/main/java/emt/item/armor/wings/ItemNanoWing.java +++ b/src/main/java/emt/item/armor/wings/ItemNanoWing.java @@ -66,6 +66,9 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectri @Override public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { this.useWings(player, stack, world, 0.25f, 0.6f, 0.3f, 5); + if (player.fallDistance > 0.0F) { + player.fallDistance = 0; + } } @Override diff --git a/src/main/java/emt/item/armor/wings/ItemQuantumWing.java b/src/main/java/emt/item/armor/wings/ItemQuantumWing.java index 5bed83d..b8744ca 100644 --- a/src/main/java/emt/item/armor/wings/ItemQuantumWing.java +++ b/src/main/java/emt/item/armor/wings/ItemQuantumWing.java @@ -39,6 +39,9 @@ public class ItemQuantumWing extends ItemNanoWing { @Override public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { this.useWings(player, stack, world, 0.33f, 0.5f, 0.2f, 7); + if (player.fallDistance > 0.0F) { + player.fallDistance = 0; + } } @Override diff --git a/src/main/java/emt/tile/TileElectricCloud.java b/src/main/java/emt/tile/TileElectricCloud.java index 1338328..ec57d37 100644 --- a/src/main/java/emt/tile/TileElectricCloud.java +++ b/src/main/java/emt/tile/TileElectricCloud.java @@ -1,5 +1,6 @@ package emt.tile; +import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -17,7 +18,7 @@ public class TileElectricCloud extends TileEntity { @Override public void updateEntity() { - if(FMLCommonHandler.instance().getSide().isClient()) + if(worldObj.isRemote && FMLCommonHandler.instance().getSide().isClient() && FMLClientHandler.instance().getClient().renderViewEntity != null) fx(); } @@ -37,7 +38,7 @@ public class TileElectricCloud extends TileEntity { } } - if (worldObj.rand.nextInt(3) == 0) { + if (worldObj.rand.nextInt(5) == 0) { FXWisp wisp = new FXWisp(worldObj, xCoord + 0.5 + ((worldObj.rand.nextInt(40) / 160f) - 0.125f), yCoord + 0.5, zCoord + 0.5 + ((worldObj.rand.nextInt(40) / 160f) - 0.125f), 0.4f + worldObj.rand.nextInt(40) / 100f, 1); wisp.setGravity(-0.02F); wisp.setRBGColorF(worldObj.rand.nextInt(40) / 100f, 0, 1); From 28535c1d72accd6d0e3e4b8d5bc2287cb55d619e Mon Sep 17 00:00:00 2001 From: fewizz Date: Thu, 13 Oct 2016 16:16:08 +0300 Subject: [PATCH 2/4] Whoops --- src/main/java/emt/block/BlockElectricCloud.java | 2 +- src/main/java/emt/tile/TileElectricCloud.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/emt/block/BlockElectricCloud.java b/src/main/java/emt/block/BlockElectricCloud.java index d7314ac..2f93480 100644 --- a/src/main/java/emt/block/BlockElectricCloud.java +++ b/src/main/java/emt/block/BlockElectricCloud.java @@ -31,7 +31,7 @@ public class BlockElectricCloud extends BlockBase { public BlockElectricCloud(String unlocName) { super(unlocName, Material.cloth, soundTypeCloth, 0.1f); - //setBlockBounds(0.3f, 0.3f, 0.3f, 0.7f, 0.7f, 0.7f); + setBlockBounds(0.3f, 0.3f, 0.3f, 0.7f, 0.7f, 0.7f); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/emt/tile/TileElectricCloud.java b/src/main/java/emt/tile/TileElectricCloud.java index ec57d37..8d2ac9e 100644 --- a/src/main/java/emt/tile/TileElectricCloud.java +++ b/src/main/java/emt/tile/TileElectricCloud.java @@ -38,7 +38,7 @@ public class TileElectricCloud extends TileEntity { } } - if (worldObj.rand.nextInt(5) == 0) { + if (worldObj.rand.nextInt(3) == 0) { FXWisp wisp = new FXWisp(worldObj, xCoord + 0.5 + ((worldObj.rand.nextInt(40) / 160f) - 0.125f), yCoord + 0.5, zCoord + 0.5 + ((worldObj.rand.nextInt(40) / 160f) - 0.125f), 0.4f + worldObj.rand.nextInt(40) / 100f, 1); wisp.setGravity(-0.02F); wisp.setRBGColorF(worldObj.rand.nextInt(40) / 100f, 0, 1); From 3ac6826e6c0b8548c063d6bdc326c23adcdc9362 Mon Sep 17 00:00:00 2001 From: fewizz Date: Thu, 13 Oct 2016 20:29:40 +0300 Subject: [PATCH 3/4] Fixed wings (?) --- build.properties | 2 +- src/main/java/emt/EMT.java | 2 +- .../emt/item/armor/wings/ItemFeatherWing.java | 11 +++-- .../emt/item/armor/wings/ItemNanoWing.java | 8 ++-- .../emt/item/armor/wings/ItemQuantumWing.java | 8 ++-- .../wings/ItemThaumiumReinforcedWing.java | 5 +++ src/main/java/emt/util/EMTEventHandler.java | 42 +++++++++++++++++-- 7 files changed, 63 insertions(+), 15 deletions(-) diff --git a/build.properties b/build.properties index ea25c32..7d3c47d 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ package_group=emt mc_version=1.7.10 forge_version=10.13.4.1614 -mod_version=1.2.6.1 +mod_version=1.2.6.2 mod_name=ElectroMagicTools diff --git a/src/main/java/emt/EMT.java b/src/main/java/emt/EMT.java index 80c81c9..6b2a521 100644 --- a/src/main/java/emt/EMT.java +++ b/src/main/java/emt/EMT.java @@ -36,7 +36,7 @@ import org.apache.logging.log4j.Logger; public class EMT { public static final String NAME = "Electro-Magic Tools"; public static final String MOD_ID = "EMT"; - public static final String VERSION = "1.2.6.1"; + public static final String VERSION = "1.2.6.2"; public static final String TEXTURE_PATH = "emt"; public static final String GUI_FACTORY = "emt.client.gui.config.EMTGuiFactory"; public static final String CLIENT_PROXY = "emt.proxy.ClientProxy"; diff --git a/src/main/java/emt/item/armor/wings/ItemFeatherWing.java b/src/main/java/emt/item/armor/wings/ItemFeatherWing.java index daac57c..d60a869 100644 --- a/src/main/java/emt/item/armor/wings/ItemFeatherWing.java +++ b/src/main/java/emt/item/armor/wings/ItemFeatherWing.java @@ -20,12 +20,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.MathHelper; import net.minecraft.world.World; public class ItemFeatherWing extends ItemArmor { - public int visDiscount = 0; - Random rnd; public ItemFeatherWing(ArmorMaterial material, int par3, int par4) { super(material, par3, par4); @@ -33,9 +32,12 @@ public class ItemFeatherWing extends ItemArmor { this.setMaxDamage(120); this.setCreativeTab(EMT.TAB); this.isDamageable(); - rnd = new Random(); } + public float getFallDamageMult() { + return 0.6F; + } + @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister iconRegister) { @@ -70,6 +72,7 @@ public class ItemFeatherWing extends ItemArmor { public void useWings(EntityPlayer player, ItemStack stack, World world, float motionY, float motionXZ, float f1, int amount) { NBTTagCompound nbtData = StackUtil.getOrCreateNbtData(stack); + boolean isJmuping = nbtData.getBoolean("isJumping"); boolean isHolding = nbtData.getBoolean("isHolding"); @@ -93,7 +96,7 @@ public class ItemFeatherWing extends ItemArmor { } world.playSoundEffect(player.posX, player.posY, player.posZ, "mob.ghast.fireball", 1, 1); for (int i = 0; i < 4; i++) { - world.spawnParticle("cloud", player.posX - 1 + (rnd.nextInt(100) / 50d), player.posY - 1, player.posZ - 1 + (rnd.nextInt(100) / 50d), 0, -0.5, 0); + world.spawnParticle("cloud", player.posX - 1 + (world.rand.nextInt(100) / 50d), player.posY - 1, player.posZ - 1 + (world.rand.nextInt(100) / 50d), 0, -0.5, 0); } nbtData.setByte("f", (byte) 0); } diff --git a/src/main/java/emt/item/armor/wings/ItemNanoWing.java b/src/main/java/emt/item/armor/wings/ItemNanoWing.java index 03ec4d2..bf8616d 100644 --- a/src/main/java/emt/item/armor/wings/ItemNanoWing.java +++ b/src/main/java/emt/item/armor/wings/ItemNanoWing.java @@ -37,6 +37,11 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectri this.setCreativeTab(EMT.TAB); visDiscount = 5; } + + @Override + public float getFallDamageMult() { + return 0.2F; + } @SideOnly(Side.CLIENT) @Override @@ -66,9 +71,6 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectri @Override public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { this.useWings(player, stack, world, 0.25f, 0.6f, 0.3f, 5); - if (player.fallDistance > 0.0F) { - player.fallDistance = 0; - } } @Override diff --git a/src/main/java/emt/item/armor/wings/ItemQuantumWing.java b/src/main/java/emt/item/armor/wings/ItemQuantumWing.java index b8744ca..434d413 100644 --- a/src/main/java/emt/item/armor/wings/ItemQuantumWing.java +++ b/src/main/java/emt/item/armor/wings/ItemQuantumWing.java @@ -23,6 +23,11 @@ public class ItemQuantumWing extends ItemNanoWing { transferLimit = 10000; energyPerDamage = 1000; } + + @Override + public float getFallDamageMult() { + return 0.0F; + } @SideOnly(Side.CLIENT) @Override @@ -39,9 +44,6 @@ public class ItemQuantumWing extends ItemNanoWing { @Override public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { this.useWings(player, stack, world, 0.33f, 0.5f, 0.2f, 7); - if (player.fallDistance > 0.0F) { - player.fallDistance = 0; - } } @Override diff --git a/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java b/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java index 56edd87..fe00635 100644 --- a/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java +++ b/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java @@ -31,6 +31,11 @@ public class ItemThaumiumReinforcedWing extends ItemFeatherWing implements IVisD this.isDamageable(); visDiscount = 4; } + + @Override + public float getFallDamageMult() { + return 0.4F; + } @Override public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) { diff --git a/src/main/java/emt/util/EMTEventHandler.java b/src/main/java/emt/util/EMTEventHandler.java index 178ea86..831dab3 100644 --- a/src/main/java/emt/util/EMTEventHandler.java +++ b/src/main/java/emt/util/EMTEventHandler.java @@ -6,12 +6,15 @@ import baubles.api.BaublesApi; import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; +import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; +import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent; import emt.EMT; import emt.client.EMTKeys; import emt.init.EMTBlocks; import emt.init.EMTItems; +import emt.item.armor.wings.ItemFeatherWing; import emt.network.PacketEMTKeys; import emt.proxy.ClientProxy; import ic2.api.item.ElectricItem; @@ -24,7 +27,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.DamageSource; +import net.minecraftforge.event.entity.living.LivingAttackEvent; import net.minecraftforge.event.entity.living.LivingDropsEvent; +import net.minecraftforge.event.entity.living.LivingFallEvent; +import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.event.entity.living.LivingSetAttackTargetEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import thaumcraft.common.config.ConfigBlocks; @@ -32,8 +39,36 @@ import thaumcraft.common.config.ConfigItems; import thaumcraft.common.entities.monster.EntityTaintChicken; public class EMTEventHandler { - Random rnd = new Random(); - + + @SubscribeEvent + public void onLivingHurt(LivingHurtEvent e) { + if(!(e.entityLiving instanceof EntityPlayer) || e.source != DamageSource.fall) + return; + + ItemStack s = ((EntityPlayer)e.entityLiving).inventory.armorInventory[2]; + + if(s == null || !(s.getItem() instanceof ItemFeatherWing)) { + return; + } + + e.ammount *= ((ItemFeatherWing)s.getItem()).getFallDamageMult(); + } + + @SubscribeEvent + public void onPlayerTickEvent(TickEvent.PlayerTickEvent e) { + + ItemStack s = e.player.inventory.armorInventory[2]; + + if(s == null || !(s.getItem() instanceof ItemFeatherWing) || e.phase == Phase.START) { + return; + } + + if(e.player.motionY > 0) { + if(e.player.fallDistance > 0) + e.player.fallDistance -= e.player.motionY; + } + } + @SubscribeEvent public void onEntityLivingDrops(LivingDropsEvent event) { if (event.entityLiving instanceof EntityCreeper) { @@ -43,7 +78,7 @@ public class EMTEventHandler { } } if (event.entityLiving instanceof EntityTaintChicken) { - event.entityLiving.entityDropItem(new ItemStack(EMTItems.itemEMTItems, rnd.nextInt(3), 13), 1); + event.entityLiving.entityDropItem(new ItemStack(EMTItems.itemEMTItems, event.entityLiving.worldObj.rand.nextInt(3), 13), 1); } } @@ -96,4 +131,5 @@ public class EMTEventHandler { e.world.setBlock(e.x, e.y, e.z, EMTBlocks.electricCloud); } + } From 9048436bf1797035f4b0026db1563e2ff832190b Mon Sep 17 00:00:00 2001 From: fewizz Date: Thu, 13 Oct 2016 20:34:34 +0300 Subject: [PATCH 4/4] Small nerf --- src/main/java/emt/item/armor/wings/ItemFeatherWing.java | 2 +- .../java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/emt/item/armor/wings/ItemFeatherWing.java b/src/main/java/emt/item/armor/wings/ItemFeatherWing.java index d60a869..1840308 100644 --- a/src/main/java/emt/item/armor/wings/ItemFeatherWing.java +++ b/src/main/java/emt/item/armor/wings/ItemFeatherWing.java @@ -35,7 +35,7 @@ public class ItemFeatherWing extends ItemArmor { } public float getFallDamageMult() { - return 0.6F; + return 0.75F; } @SideOnly(Side.CLIENT) diff --git a/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java b/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java index fe00635..dbffd6a 100644 --- a/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java +++ b/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java @@ -34,7 +34,7 @@ public class ItemThaumiumReinforcedWing extends ItemFeatherWing implements IVisD @Override public float getFallDamageMult() { - return 0.4F; + return 0.5F; } @Override