Merge pull request #199 from VolmitSoftware/Development

Development
VolmitSoftware · Sep 22, 2022 · e2e4113 · e2e4113
2 parents 7550f6c + 87354cc
commit e2e4113
Show file tree

Hide file tree

Showing 22 changed files with 20 additions and 26 deletions.
diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,7 @@ plugins {
 }
 
 
-version '1.3.2-1.19.2' // Needs to be version specific
+version '1.3.3-1.19.2' // Needs to be version specific
 def nmsVersion = "1.19.2" //[NMS]
 def apiVersion = '1.19'
 def specialSourceVersion = '1.11.0' //[NMS]

diff --git a/src/main/java/com/volmit/adapt/AdaptConfig.java b/src/main/java/com/volmit/adapt/AdaptConfig.java
@@ -44,7 +44,7 @@ public class AdaptConfig {
     private boolean verbose = false;
     private boolean metrics = true;
     private String language = "en_US";
-    private Curves xpCurve = Curves.XL1L7;
+    private Curves xpCurve = Curves.XL2L7;
     private double playerXpPerSkillLevelUpBase = 489;
     private double playerXpPerSkillLevelUpLevelMultiplier = 44;
     private double powerPerLevel = 0.73;

diff --git a/src/main/java/com/volmit/adapt/api/Component.java b/src/main/java/com/volmit/adapt/api/Component.java
@@ -167,7 +167,7 @@ default void addPotionStacks(Player p, PotionEffectType potionEffect, int amplif
             for (PotionEffectType type : activeList) {
                 if (type.equals(potionEffect)) {
                     if (overlap) {
-                        p.sendMessage(ChatColor.RED + "You have gained a stack of " + potionEffect.getName() + "!");
+                        p.playSound(p.getLocation(), Sound.ENTITY_IRON_GOLEM_STEP, 0.25f, 0.25f);
                         int newAmplifier = Objects.requireNonNull(p.getPotionEffect(type)).getAmplifier();
                         int newDuration = Objects.requireNonNull(p.getPotionEffect(type)).getDuration();
                         p.removePotionEffect(type);
@@ -182,7 +182,7 @@ default void addPotionStacks(Player p, PotionEffectType potionEffect, int amplif
 
         }
         if (!activeList.contains(potionEffect)) {
-            p.sendMessage(ChatColor.RED + "You have gained a stack of " + potionEffect.getName() + "!");
+            p.playSound(p.getLocation(), Sound.ENTITY_IRON_GOLEM_STEP, 0.25f, 0.25f);
             p.addPotionEffect(new PotionEffect(potionEffect, duration, amplifier));
         }
     }

diff --git a/src/main/java/com/volmit/adapt/api/adaptation/Adaptation.java b/src/main/java/com/volmit/adapt/api/adaptation/Adaptation.java
@@ -36,7 +36,6 @@
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
-import org.bukkit.event.block.BlockCanBuildEvent;
 import org.bukkit.inventory.Recipe;
 
 import java.util.List;

diff --git a/src/main/java/com/volmit/adapt/api/adaptation/SimpleAdaptation.java b/src/main/java/com/volmit/adapt/api/adaptation/SimpleAdaptation.java
@@ -32,9 +32,7 @@
 import com.volmit.adapt.util.advancements.advancement.AdvancementVisibility;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.bukkit.Color;
 import org.bukkit.Material;
-import org.bukkit.entity.Horse;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/src/main/java/com/volmit/adapt/api/skill/SkillRegistry.java b/src/main/java/com/volmit/adapt/api/skill/SkillRegistry.java
@@ -35,7 +35,6 @@
 import org.bukkit.Sound;
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.Action;

diff --git a/src/main/java/com/volmit/adapt/api/world/AdaptPlayer.java b/src/main/java/com/volmit/adapt/api/world/AdaptPlayer.java
@@ -33,7 +33,6 @@
 import org.bukkit.util.Vector;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 

diff --git a/src/main/java/com/volmit/adapt/api/world/AdaptServer.java b/src/main/java/com/volmit/adapt/api/world/AdaptServer.java
@@ -159,6 +159,8 @@ public void on(ProjectileLaunchEvent e) {
                         .icon(Material.BOOK)
                         .title(C.GRAY + "+ " + C.WHITE + data.getKnowledge() + " " + skill.getDisplayName() + " Knowledge")
                         .build());
+                e.setCancelled(false);
+                e.getEntity().setVelocity(e.getEntity().getVelocity().multiply(1000));
             } else {
                 ExperienceOrb.Data datax = ExperienceOrb.get(s.getItem());
                 if (datax != null) {
@@ -171,10 +173,10 @@ public void on(ProjectileLaunchEvent e) {
                             .sound(Sound.ENTITY_SHULKER_OPEN)
                             .volume(1f).pitch(1.655f)
                             .build().play(getPlayer(p));
+                    e.setCancelled(false);
+                    e.getEntity().setVelocity(e.getEntity().getVelocity().multiply(1000));
                 }
             }
-            e.setCancelled(false);
-            e.getEntity().setVelocity(e.getEntity().getVelocity().multiply(1000));
         }
 
     }

diff --git a/src/main/java/com/volmit/adapt/api/xp/XP.java b/src/main/java/com/volmit/adapt/api/xp/XP.java
@@ -22,6 +22,7 @@
 import com.volmit.adapt.AdaptConfig;
 import com.volmit.adapt.api.skill.Skill;
 import com.volmit.adapt.api.world.AdaptPlayer;
+import com.volmit.adapt.api.world.PlayerSkillLine;
 import com.volmit.adapt.util.M;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -32,7 +33,10 @@ public static void xp(Player p, Skill skill, double xp) {
     }
 
     public static void xp(AdaptPlayer p, Skill skill, double xp) {
-        p.getSkillLine(skill.getName()).giveXP(p.getNot(), xp);
+        PlayerSkillLine skillLine = p.getSkillLine(skill.getName());
+        if (skillLine != null) {
+            skillLine.giveXP(p.getNot(), xp);
+        }
     }
 
     public static void xpSilent(Player p, Skill skill, double xp) {

diff --git a/src/main/java/com/volmit/adapt/content/adaptation/agility/AgilityArmorUp.java b/src/main/java/com/volmit/adapt/content/adaptation/agility/AgilityArmorUp.java
@@ -32,7 +32,6 @@
 import org.bukkit.attribute.AttributeModifier;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
 import java.util.HashMap;

diff --git a/src/main/java/com/volmit/adapt/content/adaptation/excavation/ExcavationOmniTool.java b/src/main/java/com/volmit/adapt/content/adaptation/excavation/ExcavationOmniTool.java
@@ -31,7 +31,6 @@
 import org.bukkit.block.Block;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.Action;

diff --git a/src/main/java/com/volmit/adapt/content/adaptation/herbalism/HerbalismReplant.java b/src/main/java/com/volmit/adapt/content/adaptation/herbalism/HerbalismReplant.java
@@ -29,7 +29,6 @@
 import org.bukkit.block.Block;
 import org.bukkit.block.data.Ageable;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.Action;

diff --git a/src/main/java/com/volmit/adapt/content/adaptation/nether/NetherSkullYeet.java b/src/main/java/com/volmit/adapt/content/adaptation/nether/NetherSkullYeet.java
@@ -32,7 +32,6 @@
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.WitherSkull;
-import org.bukkit.event.Event;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;

diff --git a/src/main/java/com/volmit/adapt/content/adaptation/pickaxe/PickaxeChisel.java b/src/main/java/com/volmit/adapt/content/adaptation/pickaxe/PickaxeChisel.java
@@ -28,7 +28,6 @@
 import org.bukkit.*;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.block.BlockCanBuildEvent;

diff --git a/src/main/java/com/volmit/adapt/content/adaptation/rift/RiftBlink.java b/src/main/java/com/volmit/adapt/content/adaptation/rift/RiftBlink.java
@@ -20,7 +20,6 @@
 
 import com.volmit.adapt.Adapt;
 import com.volmit.adapt.api.adaptation.SimpleAdaptation;
-import com.volmit.adapt.api.xp.XP;
 import com.volmit.adapt.util.C;
 import com.volmit.adapt.util.Element;
 import com.volmit.adapt.util.J;

diff --git a/src/main/java/com/volmit/adapt/content/adaptation/rift/RiftEnderchest.java b/src/main/java/com/volmit/adapt/content/adaptation/rift/RiftEnderchest.java
@@ -27,7 +27,6 @@
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;

diff --git a/src/main/java/com/volmit/adapt/content/adaptation/rift/RiftGate.java b/src/main/java/com/volmit/adapt/content/adaptation/rift/RiftGate.java
@@ -31,7 +31,6 @@
 import org.bukkit.Particle;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;

diff --git a/src/main/java/com/volmit/adapt/content/adaptation/rift/RiftResist.java b/src/main/java/com/volmit/adapt/content/adaptation/rift/RiftResist.java
@@ -26,7 +26,6 @@
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.Action;

diff --git a/src/main/java/com/volmit/adapt/content/adaptation/sword/SwordsMachete.java b/src/main/java/com/volmit/adapt/content/adaptation/sword/SwordsMachete.java
@@ -28,7 +28,6 @@
 import org.bukkit.Sound;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.block.BlockBreakEvent;

diff --git a/src/main/java/com/volmit/adapt/content/adaptation/sword/SwordsPoisonedBlade.java b/src/main/java/com/volmit/adapt/content/adaptation/sword/SwordsPoisonedBlade.java
@@ -26,15 +26,13 @@
 import com.volmit.adapt.util.Element;
 import com.volmit.adapt.util.Form;
 import de.slikey.effectlib.effect.BleedEffect;
-import io.netty.channel.Channel;
 import lombok.NoArgsConstructor;
 import org.bukkit.Material;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
 import java.util.HashMap;

diff --git a/src/main/java/com/volmit/adapt/content/skill/SkillHunter.java b/src/main/java/com/volmit/adapt/content/skill/SkillHunter.java
@@ -24,14 +24,12 @@
 import com.volmit.adapt.content.adaptation.hunter.*;
 import com.volmit.adapt.util.C;
 import lombok.NoArgsConstructor;
-import lombok.SneakyThrows;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.Action;

diff --git a/src/main/java/com/volmit/adapt/content/skill/SkillRanged.java b/src/main/java/com/volmit/adapt/content/skill/SkillRanged.java
@@ -31,6 +31,7 @@
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
+import org.bukkit.entity.Snowball;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
@@ -68,6 +69,9 @@ public void on(ProjectileLaunchEvent e) {
             if (!AdaptConfig.get().isXpInCreative() && (p.getGameMode().equals(GameMode.CREATIVE) || p.getGameMode().equals(GameMode.SPECTATOR))) {
                 return;
             }
+            if (e.getEntity() instanceof Snowball) {
+                return; // Ignore snowballs
+            }
             xp(p, getConfig().shootXP);
             getPlayer(p).getData().addStat("ranged.shotsfired", 1);
             getPlayer(p).getData().addStat("ranged.shotsfired." + e.getEntity().getType().name().toLowerCase(Locale.ROOT), 1);
@@ -90,6 +94,9 @@ public void on(EntityDamageByEntityEvent e) {
             if (!AdaptConfig.get().isXpInCreative() && (p.getGameMode().equals(GameMode.CREATIVE) || p.getGameMode().equals(GameMode.SPECTATOR))) {
                 return;
             }
+            if (e.getEntity() instanceof Snowball) {
+                return; // Ignore snowballs
+            }
             getPlayer(p).getData().addStat("ranged.damage", e.getDamage());
             getPlayer(p).getData().addStat("ranged.distance", e.getEntity().getLocation().distance(p.getLocation()));
             getPlayer(p).getData().addStat("ranged.damage." + e.getDamager().getType().name().toLowerCase(Locale.ROOT), e.getDamage());