From c61d4abc0bca3e00f4224033d5294ae7c67c638c Mon Sep 17 00:00:00 2001 From: Alex Spinks Date: Wed, 29 Jul 2015 05:11:43 +0100 Subject: [PATCH] Spood Beets. --- .../avaritia/items/ItemArmorInfinity.java | 132 +++++++++++++++++- .../avaritia/items/LudicrousItems.java | 3 + .../textures/items/infinity_hammer.png | Bin 1329 -> 5000 bytes .../textures/items/infinity_hammer.png.mcmeta | 37 +++++ 4 files changed, 169 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/assets/avaritia/textures/items/infinity_hammer.png.mcmeta diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java b/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java index 1d9e16f..5483082 100644 --- a/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java +++ b/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java @@ -2,9 +2,11 @@ package fox.spiteful.avaritia.items; import com.google.common.collect.Multimap; import fox.spiteful.avaritia.Avaritia; +import fox.spiteful.avaritia.Lumberjack; import fox.spiteful.avaritia.compat.Compat; import fox.spiteful.avaritia.render.ICosmicRenderItem; import fox.spiteful.avaritia.render.ModelArmorInfinity; +import net.minecraft.block.material.Material; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import fox.spiteful.avaritia.PotionHelper; @@ -24,10 +26,13 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.EnumHelper; +import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent; +import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.common.Optional; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import thaumcraft.api.IGoggles; import thaumcraft.api.IVisDiscountGear; import thaumcraft.api.aspects.Aspect; @@ -83,7 +88,7 @@ public class ItemArmorInfinity extends ItemArmor implements ICosmicRenderItem, I player.getFoodStats().setFoodSaturationLevel(20F); } else if(armorType == 1){ - player.capabilities.allowFlying = true; + //player.capabilities.allowFlying = true; Collection effects = player.getActivePotionEffects(); if(effects.size() > 0){ ArrayList bad = new ArrayList(); @@ -128,8 +133,8 @@ public class ItemArmorInfinity extends ItemArmor implements ICosmicRenderItem, I public Multimap getAttributeModifiers(ItemStack stack) { Multimap multimap = super.getAttributeModifiers(stack); - if(armorType == 3) - multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Armor modifier", 0.7, 1)); + //if(armorType == 3) + // multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Armor modifier", 0.7, 1)); return multimap; } @@ -196,4 +201,125 @@ public class ItemArmorInfinity extends ItemArmor implements ICosmicRenderItem, I return this.cosmicMask; } + public static class abilityHandler { + public static List playersWithHat = new ArrayList(); + public static List playersWithChest = new ArrayList(); + public static List playersWithLeg = new ArrayList(); + public static List playersWithFoot = new ArrayList(); + + public static boolean playerHasHat(EntityPlayer player) { + ItemStack armour = player.getCurrentArmor(3); + return armour != null && armour.getItem() == LudicrousItems.infinity_helm; + } + + public static boolean playerHasChest(EntityPlayer player) { + ItemStack armour = player.getCurrentArmor(2); + return armour != null && armour.getItem() == LudicrousItems.infinity_armor; + } + + public static boolean playerHasLeg(EntityPlayer player) { + ItemStack armour = player.getCurrentArmor(1); + return armour != null && armour.getItem() == LudicrousItems.infinity_pants; + } + + public static boolean playerHasFoot(EntityPlayer player) { + ItemStack armour = player.getCurrentArmor(0); + return armour != null && armour.getItem() == LudicrousItems.infinity_shoes; + } + + public static String playerKey(EntityPlayer player) { + return player.getGameProfile().getName() +":"+ player.worldObj.isRemote; + } + + @SubscribeEvent + public void updatePlayerAbilityStatus(LivingUpdateEvent event) { + if (event.entityLiving instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer)event.entityLiving; + String key = playerKey(player); + + // hat + Boolean hasHat = playerHasHat(player); + if (playersWithHat.contains(key)) { + if (hasHat) { + + } else { + playersWithHat.remove(key); + } + } else if (hasHat) { + playersWithHat.add(key); + } + + // chest + Boolean hasChest = playerHasChest(player); + if (playersWithChest.contains(key)) { + if (hasChest) { + player.capabilities.allowFlying = true; + } else { + if (!player.capabilities.isCreativeMode) { + player.capabilities.allowFlying = false; + player.capabilities.isFlying = false; + } + playersWithChest.remove(key); + } + } else if (hasChest) { + playersWithChest.add(key); + } + + // legs + Boolean hasLeg = playerHasLeg(player); + if (playersWithLeg.contains(key)) { + if (hasLeg) { + + } else { + playersWithLeg.remove(key); + } + } else if (hasLeg) { + playersWithLeg.add(key); + } + + // shoes + Boolean hasFoot = playerHasFoot(player); + if (playersWithFoot.contains(key)) { + if (hasFoot) { + boolean flying = player.capabilities.isFlying; + boolean swimming = player.isInsideOfMaterial(Material.water) || player.isInWater(); + if (player.onGround || flying || swimming) { + boolean sneaking = player.isSneaking(); + + float speed = 0.2f + * (flying ? 1.5f : 1.0f) + * (swimming ? 1.2f : 1.0f) + * (sneaking ? 0.3f : 1.0f); + + if (player.moveForward > 0f) { + player.moveFlying(0f, 1f, speed); + } else if (player.moveForward < 0f) { + player.moveFlying(0f, 1f, -speed * 0.3f); + } + + if (player.moveStrafing != 0f) { + player.moveFlying(1f, 0f, speed * 0.5f * Math.signum(player.moveStrafing)); + } + } + } else { + playersWithFoot.remove(key); + } + } else if (hasFoot) { + playersWithFoot.add(key); + } + } + } + + @SubscribeEvent + public void jumpBoost(LivingJumpEvent event) { + if (event.entityLiving instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer)event.entityLiving; + String key = playerKey(player); + + if (playersWithFoot.contains(key)) { + player.motionY += 0.4f; + } + } + } + } } diff --git a/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java b/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java index 7eb8f25..e1b7881 100644 --- a/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java +++ b/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java @@ -12,6 +12,7 @@ import net.minecraft.item.ItemFood; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.EnumHelper; import static net.minecraft.item.Item.ToolMaterial; @@ -64,6 +65,8 @@ public class LudicrousItems { GameRegistry.registerItem(infinity_pants, "Infinity_Pants"); infinity_shoes = new ItemArmorInfinity(3); GameRegistry.registerItem(infinity_shoes, "Infinity_Shoes"); + + MinecraftForge.EVENT_BUS.register(new ItemArmorInfinity.abilityHandler()); } public static boolean isInfinite(EntityPlayer player){ diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_hammer.png b/src/main/resources/assets/avaritia/textures/items/infinity_hammer.png index 07c25174c686672f9ddf1ca07ce473137b4b011b..6ca56a4b80cd5ad2335dc6bb54ed1e3a7ec40465 100644 GIT binary patch delta 4980 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 diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_hammer.png.mcmeta b/src/main/resources/assets/avaritia/textures/items/infinity_hammer.png.mcmeta new file mode 100644 index 0000000..203da75 --- /dev/null +++ b/src/main/resources/assets/avaritia/textures/items/infinity_hammer.png.mcmeta @@ -0,0 +1,37 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 0, + 0, + 1, + 1, + 1, + 2, + 2, + 2, + 3, + 3, + 4, + 4, + 5, + 6, + 7, + 8, + 7, + 6, + 5, + 4, + 4, + 3, + 3, + 2, + 2, + 2, + 1, + 1, + 1, + ] + } +}