From e77d237649974e494542b44a3d0b86aaf58d693e Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Sun, 20 Feb 2022 20:32:57 +0000 Subject: [PATCH] Added Slime Boots & Slimesling. (#44) * Added Slime Boots & Slimesling. * Added tooltip to Slime Boots on how to stop bouncing. Added tooltip to Slimesling. --- src/main/java/tconstruct/TConstruct.java | 11 + .../tconstruct/gadgets/TinkerGadgets.java | 82 +++++ .../gadgets/item/ItemSlimeBoots.java | 239 +++++++++++++++ .../gadgets/item/ItemSlimeSling.java | 108 +++++++ .../library/SlimeBounceHandler.java | 288 ++++++++++++++++++ .../library/TConstructRegistry.java | 1 + .../resources/assets/tinker/lang/en_US.lang | 3 + src/main/resources/assets/tinker/sounds.json | 6 + .../assets/tinker/sounds/slimesling.ogg | Bin 0 -> 11082 bytes .../assets/tinker/textures/armor/slime_1.png | Bin 0 -> 1673 bytes .../textures/items/armor/slime_boots.png | Bin 0 -> 421 bytes .../textures/items/gadgets/slimesling.png | Bin 0 -> 560 bytes 12 files changed, 738 insertions(+) create mode 100644 src/main/java/tconstruct/gadgets/TinkerGadgets.java create mode 100644 src/main/java/tconstruct/gadgets/item/ItemSlimeBoots.java create mode 100644 src/main/java/tconstruct/gadgets/item/ItemSlimeSling.java create mode 100644 src/main/java/tconstruct/library/SlimeBounceHandler.java create mode 100644 src/main/resources/assets/tinker/sounds/slimesling.ogg create mode 100644 src/main/resources/assets/tinker/textures/armor/slime_1.png create mode 100644 src/main/resources/assets/tinker/textures/items/armor/slime_boots.png create mode 100644 src/main/resources/assets/tinker/textures/items/gadgets/slimesling.png diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java index 24d7987c..5fcd636d 100644 --- a/src/main/java/tconstruct/TConstruct.java +++ b/src/main/java/tconstruct/TConstruct.java @@ -27,6 +27,8 @@ import tconstruct.armor.TinkerArmor; import tconstruct.armor.player.TPlayerHandler; import tconstruct.armor.player.TPlayerStats; import tconstruct.common.TProxyCommon; +import tconstruct.gadgets.TinkerGadgets; +import tconstruct.library.SlimeBounceHandler; import tconstruct.library.TConstructCreativeTab; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.Detailing; @@ -148,6 +150,7 @@ public class TConstruct pulsar.registerPulse(new TinkerMechworks()); pulsar.registerPulse(new TinkerArmor()); pulsar.registerPulse(new TinkerWeaponry()); + pulsar.registerPulse(new TinkerGadgets()); pulsar.registerPulse(new TinkerThaumcraft()); pulsar.registerPulse(new TinkerWaila()); pulsar.registerPulse(new TinkerBuildCraft()); @@ -170,6 +173,7 @@ public class TConstruct TConstructRegistry.blockTab = new TConstructCreativeTab("TConstructBlocks"); TConstructRegistry.equipableTab = new TConstructCreativeTab("TConstructEquipables"); TConstructRegistry.weaponryTab = new TConstructCreativeTab("TConstructWeaponry"); + TConstructRegistry.gadgetsTab = new TConstructCreativeTab("TConstructGadgets"); tableCasting = new LiquidCasting(); basinCasting = new LiquidCasting(); @@ -240,6 +244,13 @@ public class TConstruct MinecraftForge.EVENT_BUS.register(new AchievementEvents()); } } + + /** Called on server shutdown to prevent memory leaks */ + @EventHandler + public void serverStopping(FMLServerStoppingEvent event) { + TinkerGadgets.log.info("Cleaning up SlimeBounceHandler data."); + SlimeBounceHandler.BOUNCING_ENTITIES.clear(); + } /* IMC Mod Support */ @EventHandler diff --git a/src/main/java/tconstruct/gadgets/TinkerGadgets.java b/src/main/java/tconstruct/gadgets/TinkerGadgets.java new file mode 100644 index 00000000..74420ee1 --- /dev/null +++ b/src/main/java/tconstruct/gadgets/TinkerGadgets.java @@ -0,0 +1,82 @@ +package tconstruct.gadgets; + +import java.util.Locale; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.registry.GameRegistry; +import mantle.pulsar.pulse.Handler; +import mantle.pulsar.pulse.Pulse; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.oredict.ShapedOreRecipe; +import tconstruct.TConstruct; +import tconstruct.gadgets.item.ItemSlimeBoots; +import tconstruct.gadgets.item.ItemSlimeSling; +import tconstruct.library.SlimeBounceHandler; +import tconstruct.library.TConstructRegistry; + +@Pulse(id = "Tinkers' Gadgets", description = "All the fun toys.") +public class TinkerGadgets { + + public static final String PulseId = "TinkerGadgets"; + public static final Logger log = LogManager.getLogger(PulseId); + + // Gadgets + public static ItemSlimeSling slimeSling; + public static ItemSlimeBoots slimeBoots; + + @Handler + public void preInit(FMLPreInitializationEvent event) { + + SlimeBounceHandler.init(); + slimeSling = registerItem(new ItemSlimeSling(), "slimesling"); + slimeBoots = registerItem(new ItemSlimeBoots(), "slime_boots"); + + } + + @Handler + public void init(FMLInitializationEvent event) { + String ore = "blockSlime"; + + GameRegistry.addRecipe( + new ShapedOreRecipe(new ItemStack(slimeBoots), " ", "s s", "b b", 's', "slimeball", 'b', ore)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(slimeSling), "fbf", "s s", " s ", 'f', Items.string, + 's', "slimeball", 'b', ore)); + TConstructRegistry.gadgetsTab.init(new ItemStack(slimeBoots)); + + } + + @Handler + public void postInit(FMLPostInitializationEvent evt) { + + } + + public static String resource(String res) { + return String.format("%s:%s", "tinker", res); + } + + public static ResourceLocation getResource(String res) { + return new ResourceLocation("tinker", res); + } + + public static String prefix(String name) { + return String.format("%s.%s", TConstruct.modID, name.toLowerCase(Locale.US)); + } + + protected static T registerItem(T item, String name) { + if (!name.equals(name.toLowerCase(Locale.US))) { + throw new IllegalArgumentException( + String.format("Unlocalized names need to be all lowercase! Item: %s", name)); + } + item.setUnlocalizedName(prefix(name)); + GameRegistry.registerItem(item, name); + return item; + } +} diff --git a/src/main/java/tconstruct/gadgets/item/ItemSlimeBoots.java b/src/main/java/tconstruct/gadgets/item/ItemSlimeBoots.java new file mode 100644 index 00000000..e7a052cf --- /dev/null +++ b/src/main/java/tconstruct/gadgets/item/ItemSlimeBoots.java @@ -0,0 +1,239 @@ +package tconstruct.gadgets.item; + +import java.util.List; + +import javax.vecmath.Vector3d; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.resources.I18n; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraft.util.DamageSource; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraftforge.common.ISpecialArmor; +import net.minecraftforge.common.util.EnumHelper; +import net.minecraftforge.event.entity.living.LivingFallEvent; +import tconstruct.library.SlimeBounceHandler; +import tconstruct.library.TConstructRegistry; +import tconstruct.library.armor.ArmorPart; +import tconstruct.tools.entity.FancyEntityItem; + +public class ItemSlimeBoots extends ItemArmor implements ISpecialArmor { + + public static ArmorMaterial SLIME_MATERIAL = EnumHelper.addArmorMaterial("SLIME", 100, new int[] { 0, 0, 0, 0 }, 0); + + public final ArmorPart armorPart; + protected final String textureFolder; + protected final String textureName; + + public ItemSlimeBoots() { + super(SLIME_MATERIAL, 0, 3); + this.setCreativeTab(TConstructRegistry.gadgetsTab); + this.setMaxStackSize(1); + this.setMaxDamage(100); + SLIME_MATERIAL.customCraftingMaterial = Items.slime_ball; + armorPart = ArmorPart.Feet; + textureFolder = "armor"; + textureName = "slime"; + SlimeBounceHandler.registerEvent(this); + } + + @Override + public boolean isValidArmor(ItemStack stack, int armorType1, Entity entity) { + // can be worn as boots + return armorType1 == 3; + } + + // equipping with rightclick + @Override + public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn) { + int slot = 1; // 0 = current item, 1 = feet + ItemStack itemstack = playerIn.getEquipmentInSlot(slot); + if (itemstack == null) { + playerIn.setCurrentItemOrArmor(slot, itemStackIn.copy()); + itemStackIn.stackSize--; + } + else { + itemstack = itemstack.copy(); + playerIn.setCurrentItemOrArmor(1, itemStackIn.copy()); + //playerIn.setCurrentItemOrArmor(0, itemstack); + playerIn.entityDropItem(itemstack, 0); + itemStackIn.stackSize--; + } + return itemStackIn; + } + + /** Called when an entity lands to handle the event */ + @SubscribeEvent + // RUBBERY BOUNCY BOUNCERY WOOOOO + public void onFall(LivingFallEvent event) { + EntityLivingBase living = event.entityLiving; + //TinkerGadgets.log.info("Fall event."); + // using fall distance as the event distance could be reduced by jump boost + if (living == null || living.fallDistance <= 2f) { + //TinkerGadgets.log.info("Invalid event."); + return; + } + // can the entity bounce? + if (!SlimeBounceHandler.hasSlimeBoots(living)) { + //TinkerGadgets.log.info("No Boots."); + return; + } + + // reduced fall damage when crouching + if (living.isSneaking()) { + //TinkerGadgets.log.info("Sneaking"); + event.distance = 1; + return; + } + + // thing is wearing slime boots. let's get bouncyyyyy + event.setCanceled(true); + // skip further client processing on players + if (living.worldObj.isRemote) { + //TinkerGadgets.log.info("Client Fall Handler."); + living.playSound("mob.slime.small", 1f, 1f); + SlimeBounceHandler.addBounceHandler(living); + //TConstruct.packetPipeline.sendToServer(new BouncedPacket(living)); + return; + } + + // server players behave differently than non-server players, they have no + // velocity during the event, so we need to reverse engineer it + Vector3d motion = SlimeBounceHandler.getMotion(living); + if (living instanceof EntityPlayerMP) { + // velocity is lost on server players, but we dont have to defer the bounce + double gravity = 0.2353455252; + double time = Math.sqrt(living.fallDistance / gravity); + double velocity = gravity * time; + living.setVelocity(motion.x / 0.95f, velocity, motion.z / 0.95f); + living.velocityChanged = true; + // preserve momentum + SlimeBounceHandler.addBounceHandler(living); + //TinkerGadgets.log.info("Player"); + } + else { + // for non-players, need to defer the bounce + // only slow down half as much when bouncing + living.setVelocity(motion.x / 0.95f, motion.y * -0.9, motion.z / 0.95f); + SlimeBounceHandler.addBounceHandler(living, SlimeBounceHandler.getMotion(living).y); + //TinkerGadgets.log.info("Not Player"); + } + //TinkerGadgets.log.info("Server Fall Handler."); + // update airborn status + living.isAirBorne = true; + living.onGround = false; + event.distance = 0f; + living.playSound("mob.slime.small", 1f, 1f); + } + + @Override + public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { + return 2; + } + + @Override + @SideOnly(Side.CLIENT) + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { + return "tinker:textures/armor/" + textureName + "_" + 1 + ".png"; + } + + @SideOnly(Side.CLIENT) + protected IIcon[] modifiers; + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon("tinker:" + textureFolder + "/" + textureName + "_boots"); + + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(ItemStack stack, int renderPass) { + return itemIcon; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean requiresMultipleRenderPasses() { + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean hasEffect(ItemStack par1ItemStack) { + return false; + } + + // ISpecialArmor overrides + @Override + public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, + int slot) { + return new ArmorProperties(0, armor.getItemDamage() / 100, 100); + } + + @Override + public void damageArmor(EntityLivingBase entity, ItemStack armor, DamageSource source, int damage, int slot) { + if (source == DamageSource.fall) { + return; + } + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + par3List.add(new ItemStack(par1)); + } + + // Vanilla overrides + @Override + public boolean isItemTool(ItemStack par1ItemStack) { + return false; + } + + @Override + public boolean isRepairable() { + return true; + } + + @Override + public int getItemEnchantability() { + return 0; + } + + @Override + public boolean isFull3D() { + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + list.add("Boooounce!"); + list.add("Hold "+(I18n.format(Minecraft.getMinecraft().gameSettings.keyBindSneak.getKeyDescription(), new Object[0]))+" to stop bouncing."); + } + + /* Prevent armor from dying */ + @Override + public boolean hasCustomEntity(ItemStack stack) { + return true; + } + + @Override + public Entity createEntity(World world, Entity location, ItemStack itemstack) { + return new FancyEntityItem(world, location, itemstack); + } +} diff --git a/src/main/java/tconstruct/gadgets/item/ItemSlimeSling.java b/src/main/java/tconstruct/gadgets/item/ItemSlimeSling.java new file mode 100644 index 00000000..ec336200 --- /dev/null +++ b/src/main/java/tconstruct/gadgets/item/ItemSlimeSling.java @@ -0,0 +1,108 @@ +package tconstruct.gadgets.item; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.EnumAction; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.network.play.server.S12PacketEntityVelocity; +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; +import tconstruct.TConstruct; +import tconstruct.gadgets.TinkerGadgets; +import tconstruct.library.SlimeBounceHandler; +import tconstruct.library.TConstructRegistry; +import tconstruct.util.network.MovementUpdatePacket; + +public class ItemSlimeSling extends Item { + + public ItemSlimeSling() { + this.setMaxStackSize(1); + this.setCreativeTab(TConstructRegistry.gadgetsTab); + } + + /** + * Called whenever this item is equipped and the right mouse button is pressed. + * Args: itemStack, world, entityPlayer + */ + @Override + public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn) { + playerIn.setItemInUse(itemStackIn, this.getMaxItemUseDuration(itemStackIn)); + return itemStackIn; + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int meta) { + return this.itemIcon; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon("tinker:gadgets/slimesling"); + } + + @Override + public EnumAction getItemUseAction(ItemStack stack) { + return EnumAction.bow; + } + + @Override + public int getMaxItemUseDuration(ItemStack stack) { + return 72000; + } + + // sling logic + @Override + public void onPlayerStoppedUsing(ItemStack stack, World world, EntityPlayer player, int timeLeft) { + // has to be on ground to do something + if (!player.onGround) { + return; + } + + // copy chargeup code from bow \o/ + int i = this.getMaxItemUseDuration(stack) - timeLeft; + float f = i / 20.0F; + f = (f * f + f * 2.0F) / 3.0F; + f *= 4f; + + if (f > 6f) { + f = 6f; + } + + // check if player was targeting a block + MovingObjectPosition mop = getMovingObjectPositionFromPlayer(world, player, false); + + if (mop != null && mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { + // we fling the inverted player look vector + Vec3 vec = player.getLookVec().normalize(); + + player.addVelocity(vec.xCoord * -f, vec.yCoord * -f / 3f, vec.zCoord * -f); + + if (player instanceof EntityPlayerMP) { + EntityPlayerMP playerMP = (EntityPlayerMP) player; + TConstruct.packetPipeline.sendTo(new MovementUpdatePacket(player), playerMP); + playerMP.playerNetServerHandler.sendPacket(new S12PacketEntityVelocity(player)); + } + player.playSound(TinkerGadgets.resource("slimesling"), 1f, 1f); + SlimeBounceHandler.addBounceHandler(player); + // TinkerCommons.potionSlimeBounce.apply(player); + } + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { + list.add("Aim at a block behind you to get thrown into the air."); + list.add(player.onGround ? "Shoot for the moon!" : "Must be on the ground to use."); + } +} diff --git a/src/main/java/tconstruct/library/SlimeBounceHandler.java b/src/main/java/tconstruct/library/SlimeBounceHandler.java new file mode 100644 index 00000000..2b34187d --- /dev/null +++ b/src/main/java/tconstruct/library/SlimeBounceHandler.java @@ -0,0 +1,288 @@ +package tconstruct.library; + +import java.util.IdentityHashMap; + +import javax.vecmath.Vector3d; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.FakePlayer; +import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; +import tconstruct.gadgets.TinkerGadgets; +import tconstruct.gadgets.item.ItemSlimeBoots; + +/** Logic for entities bouncing */ +public class SlimeBounceHandler { + + public static final float SQRT_2 = sqrt(2.0F); + private static final float[] SIN_TABLE = new float[65536]; + private static final double FRAC_BIAS; + private static final double[] ASINE_TAB; + private static final double[] COS_TAB; + public static final IdentityHashMap BOUNCING_ENTITIES = new IdentityHashMap(); + + static { + for (int i = 0; i < 65536; ++i) { + SIN_TABLE[i] = (float) Math.sin(i * Math.PI * 2.0D / 65536.0D); + } + FRAC_BIAS = Double.longBitsToDouble(4805340802404319232L); + ASINE_TAB = new double[257]; + COS_TAB = new double[257]; + + for (int j = 0; j < 257; ++j) { + double d0 = j / 256.0D; + double d1 = Math.asin(d0); + COS_TAB[j] = Math.cos(d1); + ASINE_TAB[j] = d1; + } + } + + private SlimeBounceHandler() { + TinkerGadgets.log.info("Created instance of Bounce Handler."); + } + + /** Registers event handlers */ + public static void init() { + TinkerGadgets.log.info("Registering Bounce Handler."); + registerEvent(new SlimeBounceHandler()); + } + + /** + * Preserves entity air momentum + * + * @param entity Entity to bounce + */ + public static void addBounceHandler(EntityLivingBase entity) { + addBounceHandler(entity, 0d); + } + + /** + * Causes the entity to bounce, needed because the fall event will reset motion + * afterwards + * + * @param entity Entity to bounce + * @param bounce Bounce amount + */ + public static void addBounceHandler(EntityLivingBase entity, double bounce) { + // no fake players PlayerTick event + if (entity instanceof FakePlayer) { + return; + } + // update bounce info + BounceInfo info = BOUNCING_ENTITIES.get(entity); + if (hasSlimeBoots(entity)) { + if (info == null) { + BOUNCING_ENTITIES.put(entity, new BounceInfo(entity, bounce)); + TinkerGadgets.log.info("Created new BounceInfo for "+entity.getCommandSenderName()); + } else if (bounce != 0) { + TinkerGadgets.log.info("Updating Bounce data?"); + // updated bounce if needed + info.bounce = bounce; + // add one to the tick as there is a 1 tick delay between falling and ticking + // for many entities + info.bounceTick = entity.ticksExisted + 1; + + info.lastMagSq = entity.motionX * entity.motionX + entity.motionZ * entity.motionZ; + info.lastAngle = atan2(entity.motionZ, entity.motionX); + } + } + } + + public static void registerEvent(Object o){ + MinecraftForge.EVENT_BUS.register(o); + FMLCommonHandler.instance().bus().register(o); + } + + /** Called on living tick to preserve momentum and bounce */ + @SubscribeEvent + public void onLivingTick(LivingUpdateEvent event) { + EntityLivingBase entity = event.entityLiving; + if (entity != null) { + BounceInfo info = BOUNCING_ENTITIES.get(entity); + + //TinkerGadgets.log.info("Bounce Data valid? "+(info != null)); + // if we have info for this entity, time to work + if (info != null) { + //TinkerGadgets.log.info("Found Bounce Data in tick handler."); + // if flying, nothing to do + if (entity.isDead || entity.noClip) { + //TinkerGadgets.log.info("Removing Bounce Data."); + BOUNCING_ENTITIES.remove(entity); + return; + } + if (!hasSlimeBoots(entity)) { + //TinkerGadgets.log.info("Removing Bounce Data. No Boots."); + BOUNCING_ENTITIES.remove(entity); + return; + } + + // if its the bounce tick, time to bounce. This is to circumvent the logic that + // resets y motion after landing + if (entity.ticksExisted == info.bounceTick) { + TinkerGadgets.log.info("Bounce Tick?"); + entity.setVelocity(entity.motionX, info.bounce, entity.motionZ); + info.bounceTick = 0; + } + + boolean isInAir = !entity.onGround && !entity.isInWater() && !entity.isOnLadder(); + + //TinkerGadgets.log.info("In Air? "+isInAir); + // preserve motion + if (isInAir && info.lastMagSq > 0) { + // figure out how much motion has reduced + double motionSq = entity.motionX * entity.motionX + entity.motionZ * entity.motionZ; + // if not moving, cancel velocity preserving in 5 ticks + if (motionSq == 0) { + if (info.stopMagTick == 0) { + info.stopMagTick = entity.ticksExisted + 5; + } else if (entity.ticksExisted > info.stopMagTick) { + info.lastMagSq = 0; + } + } else if (motionSq < info.lastMagSq) { + info.stopMagTick = 0; + // preserve 95% of former speed + double boost = Math.sqrt(info.lastMagSq / motionSq) * 0.95f; + if (boost > 1) { + entity.setVelocity(entity.motionX * boost, entity.motionY, entity.motionZ * boost); + entity.isAirBorne = true; + info.lastMagSq = info.lastMagSq * 0.95f * 0.95f; + // play sound if we had a big angle change + double newAngle = atan2(entity.motionZ, entity.motionX); + if (Math.abs(newAngle - info.lastAngle) > 1) { + entity.playSound("mob.slime.small", 1.0f, 1.0f); + } + info.lastAngle = newAngle; + } else { + info.lastMagSq = motionSq; + info.lastAngle = atan2(entity.motionZ, entity.motionX); + } + } + } + //TinkerGadgets.log.info("Did things? 1"); + + // timing the effect out + if (info.wasInAir && !isInAir) { + if (info.endHandler == 0) { + info.endHandler = entity.ticksExisted + 5; + } else if (entity.ticksExisted > info.endHandler) { + //TinkerGadgets.log.info("Removing Bounce Data for "+entity.getCommandSenderName()); + BOUNCING_ENTITIES.remove(entity); + } + } else { + info.endHandler = 0; + info.wasInAir = true; + } + //TinkerGadgets.log.info("Did things? 2"); + } + else { + //TinkerGadgets.log.info("Bad Bounce Data."); + } + } + } + + public static Vector3d getMotion(EntityLivingBase aEntity) { + return new Vector3d(aEntity.motionX, aEntity.motionY, aEntity.motionZ); + } + + public static boolean hasSlimeBoots(EntityLivingBase entity) { + if (entity != null) { + for (int i = 1; i < 5; i++) { + ItemStack aBoots = entity.getEquipmentInSlot(i); + if (aBoots != null && aBoots.getItem() instanceof ItemSlimeBoots) { + //TinkerGadgets.log.info("Found boots in slot "+i); + return true; + } + } + } + return false; + } + + public static float sqrt(float value) { + return (float) Math.sqrt(value); + } + + public static double atan2(double aArg1, double aArg2) { + double d0 = aArg2 * aArg2 + aArg1 * aArg1; + if (Double.isNaN(d0)) { + return Double.NaN; + } else { + boolean flag = aArg1 < 0.0D; + if (flag) { + aArg1 = -aArg1; + } + boolean flag1 = aArg2 < 0.0D; + if (flag1) { + aArg2 = -aArg2; + } + boolean flag2 = aArg1 > aArg2; + if (flag2) { + double d1 = aArg2; + aArg2 = aArg1; + aArg1 = d1; + } + double d9 = fastInvSqrt(d0); + aArg2 = aArg2 * d9; + aArg1 = aArg1 * d9; + double d2 = FRAC_BIAS + aArg1; + int i = (int) Double.doubleToRawLongBits(d2); + double d3 = ASINE_TAB[i]; + double d4 = COS_TAB[i]; + double d5 = d2 - FRAC_BIAS; + double d6 = aArg1 * d4 - aArg2 * d5; + double d7 = (6.0D + d6 * d6) * d6 * 0.16666666666666666D; + double d8 = d3 + d7; + if (flag2) { + d8 = (Math.PI / 2D) - d8; + } + if (flag1) { + d8 = Math.PI - d8; + } + if (flag) { + d8 = -d8; + } + return d8; + } + } + + public static double fastInvSqrt(double aArg) { + double d0 = 0.5D * aArg; + long i = Double.doubleToRawLongBits(aArg); + i = 6910469410427058090L - (i >> 1); + aArg = Double.longBitsToDouble(i); + aArg = aArg * (1.5D - d0 * aArg * aArg); + return aArg; + } + + /** Data class to keep track of bouncing info for an entity */ + private static class BounceInfo { + /** Velocity the entity should have, unused if 0 */ + private double bounce; + /** Time to update the entities velocity */ + private int bounceTick; + /** Tick to stop entity magnitude changes */ + private int stopMagTick; + /** Magnitude of the X/Z motion last tick */ + private double lastMagSq; + /** If true, the entity was in air last tick */ + private boolean wasInAir = false; + /** Time when motion should stop */ + private int endHandler = 0; + /** Last angle of motion, used for sound effects */ + private double lastAngle; + + public BounceInfo(EntityLivingBase entity, double bounce) { + this.bounce = bounce; + if (bounce != 0) { + // add one to the tick as there is a 1 tick delay between falling and ticking + // for many entities + this.bounceTick = entity.ticksExisted + 1; + } else { + this.bounceTick = 0; + } + this.lastMagSq = entity.motionX * entity.motionX + entity.motionZ * entity.motionZ; + } + } +} diff --git a/src/main/java/tconstruct/library/TConstructRegistry.java b/src/main/java/tconstruct/library/TConstructRegistry.java index 0d9e43bb..b65f84a7 100644 --- a/src/main/java/tconstruct/library/TConstructRegistry.java +++ b/src/main/java/tconstruct/library/TConstructRegistry.java @@ -28,6 +28,7 @@ public class TConstructRegistry public static TConstructCreativeTab blockTab; public static TConstructCreativeTab equipableTab; public static TConstructCreativeTab weaponryTab; + public static TConstructCreativeTab gadgetsTab; /* Items */ diff --git a/src/main/resources/assets/tinker/lang/en_US.lang b/src/main/resources/assets/tinker/lang/en_US.lang index 2a92514b..536436d7 100644 --- a/src/main/resources/assets/tinker/lang/en_US.lang +++ b/src/main/resources/assets/tinker/lang/en_US.lang @@ -989,6 +989,9 @@ armor.travelvest.ability=Ability: Swift Swim armor.travelwings.ability=Ability: High Jump armor.travelboots.ability=Ability: High Step +item.TConstruct.slimesling.name=Slimesling +item.TConstruct.slime_boots.name=Slime Boots + tool.reinforced=Reinforced tool.unbreakable=Unbreakable diff --git a/src/main/resources/assets/tinker/sounds.json b/src/main/resources/assets/tinker/sounds.json index af7090a4..28416bed 100644 --- a/src/main/resources/assets/tinker/sounds.json +++ b/src/main/resources/assets/tinker/sounds.json @@ -11,6 +11,12 @@ "little_saw" ] }, + "slimesling": { + "category": "player", + "sounds": [ + "slimesling" + ] + }, "launcher_clank": { "category": "neutral", "sounds": [ diff --git a/src/main/resources/assets/tinker/sounds/slimesling.ogg b/src/main/resources/assets/tinker/sounds/slimesling.ogg new file mode 100644 index 0000000000000000000000000000000000000000..96bc143136815cfb75d10c192a4f95cd07735b30 GIT binary patch literal 11082 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 P6PPJU0Pe@UVZi!70{9gf literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/tinker/textures/armor/slime_1.png b/src/main/resources/assets/tinker/textures/armor/slime_1.png new file mode 100644 index 0000000000000000000000000000000000000000..80c423ee94c94bd13a13230eca6e82afbce5f237 GIT binary patch literal 1673 zcmV;426p+0P)d;dV&W!lO_MaC zB%}hnaq1Q)xiINvpa zqDY;&8g|adJm-1e_j#XHY%)%}acR?Ll+Un2N=!_dgk{?tTEq)EEf~IXNB=Kte)H%x)N)0+7lIR#_}I01y#jvFua(c0T|eGTxE5 z!+M@M2B;Ddk&*3q0MyUiQ&OP{$l~o*l7&<-Ra&mrdUf5P0VXABD{2%2Hv}uR^vU=3fa3QKNZZZjq6ZkkBOuped7RG%+z587&rQu|RSEhSYBFGW7z_>wR^iM`x|#oR&kVwsi=Ow-}i(2dLO;nhPEsR5oA6ENo$IKaZDd4 zR;6_cb<3piezl)@nP)_e1Qu-PC=oLu7wM-$kyEx5fcNBGQc|X6iaTp$?{x!+kcZHuoLWEfzSbPtlNi5LCzXaTeTyJa1l9 z#bLgvzQhOe0TtEHch&c3$|Ub|6NlrZK1J8%l9Cej<}rPo^ZwVANq9y-2f*w80?V{R z?{Utb#p8KG{}_N5{qx+G5BZ7yY54ttSz;UCz|fHTx;4Nv`Z>JwQl-in$cXZaHj#}bPGT#^Px^-+>I^d1HiB=;q0P@@(Yc1arR zRO|m-1?~laLgp6K1elPE98!nE!7?%|HuM4oZTr?VV=*xfM_neEWrk5TipMh{7x8#j zWQA2+0KB;NvNSOmM%8HOYKN&Ys0O#50egtp&jFTL40)ii&5AEk0915>`XjhEWinjn zZ~>efa-E1M#B_=HKV78EW3fa;bjd^8o|9uRyd`fwcvpC%QBnQOG7}7xh=`_4u46}G zs5%^`cfdAnmT5DrhB3XV(d(@C3YEK(=>zWuUv=lD(C5WhvRG!Aq7M@c&=EC4E?wrC zBPM2+ncx|ISsi4F#bA?tTYV=u$;IJ|?y$)06)Fr+C6f+Lxw{x(Fr=hgURJe6b66kY zYwD43_@nw!zM>w&V3=iw$MoYE4AV>z6Z4pUoUf~IFv8xzfRyxO8Bl!LwQiC|lajJb zn?#i{J)kSSnUD|>QCM|b%7AI6LJW4vnP!TH)G3ot?U|pym)}t)VVD{b5pT#9DpV*D zlgbKhmRZFy$PlqAq1VhJ3@nymYFI4q$lL2O_%JnEERd20umBc&6<|vNNJs+xESCKo z;I`amRE=^#jnR@8!#(FFA_^~W z+Ji=uNe7GlL=00?C@X-2>JT^OCWrMAE=!ZY%3t`r`a(GHJaep&l2B%lp$(Aw!{eys`0bk8R9( TO#FXz00000NkvXXu0mjfGCuiT literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/tinker/textures/items/armor/slime_boots.png b/src/main/resources/assets/tinker/textures/items/armor/slime_boots.png new file mode 100644 index 0000000000000000000000000000000000000000..da2011e770fd073971e102bfa41dc951a9571dac GIT binary patch literal 421 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPNBflWOexF@}C<6ndk*AAeh{fr z_$c1Qam%Jl0*krBk8NGR?{Mej;h7s=Gf!CYenDaSl^q3(J3FTYd3#&yxomX0`}*ct zmG85SpY#2xTsfcj^g8Yax6cUo=RVKQ0G#x({`Kb3_T*w<`&D{0DH)34wv2lJl zlqb13YRR2do>~f%I%d`+o=G!f%g*YonZv9U#OS3Nv);Tg{QuVW&IK*;3`Uk3@$D9A zC(_MUHkfo~)EFO8Rtox<(vW&RH94Q#*+i{LQQ11u$L6kj@EODH`%iV%YH)%iE7N(8 z7r$)Ln|Z<`!qi2hM0E4t%rh3=>#Y1&mMX+E2=)r^uxR9Vc>b&N_OloJ^ZRbEs{Yy| zUBPmALh6ePECQ_mo^pHHExT*3e~jH58 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/tinker/textures/items/gadgets/slimesling.png b/src/main/resources/assets/tinker/textures/items/gadgets/slimesling.png new file mode 100644 index 0000000000000000000000000000000000000000..53e8fc466825f07f069c1dbcd18080bdcb69e282 GIT binary patch literal 560 zcmV-00?+-4P)dCwM&vhVH-(xILoE67gCu%Ij?A*=c%~unzUWB;iO8Xf=l1tW?~MuYf|gzgO!rPc1_MrE~sKFB}EKUFZE9; z%df|?O0IMaem`4`$&aq+d0q(ceP2Pg3v2xKe}mF7xOF=2L zx(4^O`hFxCG?!@o#mLwvywm%ki5Fq>{9Tr7EwEja@_nDG&908b z0TIOgGK8z@g^KB|F987g><)5E=K=tl+gn0F5Cjc?QmF(0=z8@Uo!xD)Qc`@_T;{+@ zyI9HeigY>+0LTn3pcw!(O=|$?x()zn)!I-zx>iqUZT|%T{2oe}gXB36(?SRU!1U*j ykN<@vy9uru_HVm;<3&mH9sN-07<@|Iv+NFWS3b&?n*;Fx0000