gem classes formatting/chores and test auto update

buiawpkgew1 · Dec 8, 2023 · bcce7ee · bcce7ee
1 parent 3b6be0e
commit bcce7ee
Show file tree

Hide file tree

Showing 24 changed files with 87 additions and 62 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>ne.fnfal113</groupId>
     <artifactId>FNAmplifications</artifactId>
-    <version>Unoffical-4.1.3</version>
+    <version>Unoffical-4.1.4</version>
     <packaging>jar</packaging>
 
     <name>FNAmplifications</name>

diff --git a/src/main/java/ne/fnfal113/fnamplifications/gems/AchillesHeelGem.java b/src/main/java/ne/fnfal113/fnamplifications/gems/AchillesHeelGem.java
@@ -38,12 +38,12 @@ public void onDrag(Player player, SlimefunItem slimefunGemItem, ItemStack gemIte
 
     @Override
     public void onProjectileDamage(EntityDamageByEntityEvent event, Player shooter, LivingEntity entity, Projectile projectile, ItemStack itemStack) {
-        if(event.isCancelled()){
+        if(event.isCancelled()) {
             return;
         }
 
         if(ThreadLocalRandom.current().nextInt(100) < getChance() / getTier(itemStack, this.getId()) &&
-                (projectile.getLocation().getY() - entity.getLocation().getY()) < 0.5){
+                (projectile.getLocation().getY() - entity.getLocation().getY()) < 0.5) {
             event.setDamage(event.getDamage() * 2.0);
             sendGemMessage(shooter, this.getItemName());
         }

diff --git a/src/main/java/ne/fnfal113/fnamplifications/gems/AdamantineGem.java b/src/main/java/ne/fnfal113/fnamplifications/gems/AdamantineGem.java
@@ -38,7 +38,7 @@ public void onDrag(Player player, SlimefunItem slimefunGemItem, ItemStack gemIte
 
     @Override
     public void onDurabilityChange(PlayerItemDamageEvent event) {
-        if(ThreadLocalRandom.current().nextInt(100) < getChance() / getTier(event.getItem(), this.getId())){
+        if(ThreadLocalRandom.current().nextInt(100) < getChance() / getTier(event.getItem(), this.getId())) {
             event.setCancelled(true);
             sendGemMessage(event.getPlayer(), this.getItemName());
         }

diff --git a/src/main/java/ne/fnfal113/fnamplifications/gems/ArmorImpairGem.java b/src/main/java/ne/fnfal113/fnamplifications/gems/ArmorImpairGem.java
@@ -40,10 +40,11 @@ public void onDrag(Player player, SlimefunItem slimefunGemItem, ItemStack gemIte
 
     @Override
     public void onDamage(EntityDamageByEntityEvent event, ItemStack itemStack){
-        if(!(event.getEntity() instanceof LivingEntity)){
+        if(!(event.getEntity() instanceof LivingEntity)) {
             return;
         }
-        if(event.isCancelled()){
+
+        if(event.isCancelled()) {
             return;
         }
 

diff --git a/src/main/java/ne/fnfal113/fnamplifications/gems/ArrowAvertGem.java b/src/main/java/ne/fnfal113/fnamplifications/gems/ArrowAvertGem.java
@@ -38,12 +38,12 @@ public void onDrag(Player player, SlimefunItem slimefunGemItem, ItemStack gemIte
 
     @Override
     public void onDamage(EntityDamageByEntityEvent event, ItemStack itemStack) {
-        if(event.isCancelled()){
+        if(event.isCancelled()) {
             return;
         }
 
         if(ThreadLocalRandom.current().nextInt(100) < getChance() / getTier(itemStack, this.getId()) &&
-                event.getCause() == EntityDamageEvent.DamageCause.PROJECTILE){
+                event.getCause() == EntityDamageEvent.DamageCause.PROJECTILE) {
             if(event.getEntity() instanceof Player) {
                 sendGemMessage((Player) event.getEntity(), this.getItemName());
             }

diff --git a/src/main/java/ne/fnfal113/fnamplifications/gems/AtrohpyGem.java b/src/main/java/ne/fnfal113/fnamplifications/gems/AtrohpyGem.java
@@ -39,13 +39,15 @@ public void onDrag(Player player, SlimefunItem slimefunGemItem, ItemStack gemIte
 
     @Override
     public void onDamage(EntityDamageByEntityEvent event, ItemStack itemStack){
-        if(!(event.getEntity() instanceof LivingEntity)){
+        if(!(event.getEntity() instanceof LivingEntity)) {
             return;
         }
-        if(!(event.getDamager() instanceof Player)){
+
+        if(!(event.getDamager() instanceof Player)) {
             return;
         }
-        if(event.isCancelled()){
+
+        if(event.isCancelled()) {
             return;
         }
 
@@ -55,7 +57,7 @@ public void onDamage(EntityDamageByEntityEvent event, ItemStack itemStack){
 
         int tier = getTier(itemStack, this.getId());
 
-        if(ThreadLocalRandom.current().nextInt(100) < getChance() / tier){
+        if(ThreadLocalRandom.current().nextInt(100) < getChance() / tier) {
             int level = Math.abs(tier - 4);
 
             livingEntity.addPotionEffect(new PotionEffect(PotionEffectType.WITHER, 80, level));

diff --git a/src/main/java/ne/fnfal113/fnamplifications/gems/AvengeGem.java b/src/main/java/ne/fnfal113/fnamplifications/gems/AvengeGem.java
@@ -38,7 +38,7 @@ public void onDrag(Player player, SlimefunItem slimefunGemItem, ItemStack gemIte
 
     @Override
     public void onPlayerDeath(PlayerDeathEvent event, ItemStack itemStack) {
-        if(ThreadLocalRandom.current().nextInt(100) < getChance() / getTier(itemStack, this.getId())){
+        if(ThreadLocalRandom.current().nextInt(100) < getChance() / getTier(itemStack, this.getId())) {
             Player player = event.getEntity();
             Location loc = player.getLocation();
             Creeper creeper = player.getWorld().spawn(loc.clone(), Creeper.class);

diff --git a/src/main/java/ne/fnfal113/fnamplifications/gems/AwakenGem.java b/src/main/java/ne/fnfal113/fnamplifications/gems/AwakenGem.java
@@ -42,7 +42,7 @@ public void onDrag(Player player, SlimefunItem slimefunGemItem, ItemStack gemIte
 
     @Override
     public void onPlayerDeath(PlayerDeathEvent event, ItemStack itemStack) {
-        if(ThreadLocalRandom.current().nextInt(100) < getChance() / getTier(itemStack, this.getId())){
+        if(ThreadLocalRandom.current().nextInt(100) < getChance() / getTier(itemStack, this.getId())) {
             Player player = event.getEntity();
             Location loc = player.getLocation();
 

diff --git a/src/main/java/ne/fnfal113/fnamplifications/gems/BaneGem.java b/src/main/java/ne/fnfal113/fnamplifications/gems/BaneGem.java
@@ -39,13 +39,15 @@ public void onDrag(Player player, SlimefunItem slimefunGemItem, ItemStack gemIte
 
     @Override
     public void onDamage(EntityDamageByEntityEvent event, ItemStack itemStack){
-        if(!(event.getEntity() instanceof LivingEntity)){
+        if(!(event.getEntity() instanceof LivingEntity)) {
             return;
         }
-        if(!(event.getDamager() instanceof Player)){
+
+        if(!(event.getDamager() instanceof Player)) {
             return;
         }
-        if(event.isCancelled()){
+
+        if(event.isCancelled()) {
             return;
         }
 
@@ -55,7 +57,7 @@ public void onDamage(EntityDamageByEntityEvent event, ItemStack itemStack){
 
         int tier = getTier(itemStack, this.getId());
 
-        if(ThreadLocalRandom.current().nextInt(100) < getChance() / tier){
+        if(ThreadLocalRandom.current().nextInt(100) < getChance() / tier) {
             int level = Math.abs(tier - 4);
 
             livingEntity.addPotionEffect(new PotionEffect(PotionEffectType.POISON, 80, level));

diff --git a/src/main/java/ne/fnfal113/fnamplifications/gems/BlindBindGem.java b/src/main/java/ne/fnfal113/fnamplifications/gems/BlindBindGem.java
@@ -40,11 +40,11 @@ public void onDrag(Player player, SlimefunItem slimefunGemItem, ItemStack gemIte
 
     @Override
     public void onProjectileDamage(EntityDamageByEntityEvent event, Player shooter, LivingEntity entity, Projectile projectile, ItemStack itemStack) {
-        if(event.isCancelled()){
+        if(event.isCancelled()) {
             return;
         }
 
-        if(ThreadLocalRandom.current().nextInt(100) < getChance() / getTier(itemStack, this.getId())){
+        if(ThreadLocalRandom.current().nextInt(100) < getChance() / getTier(itemStack, this.getId())) {
             entity.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, 80, 2, true, false, false));
             sendGemMessage(shooter, this.getItemName());
         }

diff --git a/src/main/java/ne/fnfal113/fnamplifications/gems/CelerityGem.java b/src/main/java/ne/fnfal113/fnamplifications/gems/CelerityGem.java
@@ -39,18 +39,19 @@ public void onDrag(Player player, SlimefunItem slimefunGemItem, ItemStack gemIte
 
     @Override
     public void onDamage(EntityDamageByEntityEvent event, ItemStack itemStack){
-        if(!(event.getEntity() instanceof Player)){
+        if(!(event.getEntity() instanceof Player)) {
             return;
         }
-        if(event.isCancelled()){
+
+        if(event.isCancelled()) {
             return;
         }
 
         Player victim = (Player) event.getEntity();
 
         int tier = getTier(itemStack, this.getId());
 
-        if(ThreadLocalRandom.current().nextInt(100) < getChance() / tier){
+        if(ThreadLocalRandom.current().nextInt(100) < getChance() / tier) {
             int level = Math.abs(tier - 4);
 
             victim.addPotionEffect(new PotionEffect(PotionEffectType.SPEED, 80, level));

diff --git a/src/main/java/ne/fnfal113/fnamplifications/gems/DamnationGem.java b/src/main/java/ne/fnfal113/fnamplifications/gems/DamnationGem.java
@@ -45,11 +45,12 @@ public void onDrag(Player player, SlimefunItem slimefunGemItem, ItemStack gemIte
     }
 
     @Override
-    public void onRightClick(Player player){
+    public void onRightClick(Player player) {
         if(!player.isSneaking()){
             return;
         }
-        if(!hasPermissionToThrow(player)){
+
+        if(!hasPermissionToThrow(player)) {
             player.sendMessage(Utils.colorTranslator("&eYou don't have the permission to use damnation here! (Needs block interaction flag enabled)"));
             return;
         } // check if player has the permission to build on current location

diff --git a/src/main/java/ne/fnfal113/fnamplifications/gems/DeberserkGem.java b/src/main/java/ne/fnfal113/fnamplifications/gems/DeberserkGem.java
@@ -38,20 +38,21 @@ public void onDrag(Player player, SlimefunItem slimefunGemItem, ItemStack gemIte
 
     @Override
     public void onDamage(EntityDamageByEntityEvent event, ItemStack itemStack) {
-        if(!(event.getDamager() instanceof LivingEntity)){
+        if(!(event.getDamager() instanceof LivingEntity)) {
             return;
         }
-        if(event.isCancelled()){
+
+        if(event.isCancelled()) {
             return;
         }
 
         LivingEntity damager = (LivingEntity) event.getDamager();
 
-        if(damager.getEquipment() == null){
+        if(damager.getEquipment() == null) {
             return;
         }
 
-        if(WeaponArmorEnum.AXES.isTagged(damager.getEquipment().getItemInMainHand().getType())){
+        if(WeaponArmorEnum.AXES.isTagged(damager.getEquipment().getItemInMainHand().getType())) {
             if(ThreadLocalRandom.current().nextInt(100) < getChance() / getTier(itemStack, this.getId())){
                 event.setDamage(event.getDamage() * 0.75);
 

diff --git a/src/main/java/ne/fnfal113/fnamplifications/gems/DeceptionGem.java b/src/main/java/ne/fnfal113/fnamplifications/gems/DeceptionGem.java
@@ -40,13 +40,15 @@ public void onDrag(Player player, SlimefunItem slimefunGemItem, ItemStack gemIte
 
     @Override
     public void onDamage(EntityDamageByEntityEvent event, ItemStack itemStack){
-        if(!(event.getDamager() instanceof LivingEntity)){
+        if(!(event.getDamager() instanceof LivingEntity)) {
             return;
         }
-        if(!(event.getEntity() instanceof Player)){
+
+        if(!(event.getEntity() instanceof Player)) {
             return;
         }
-        if(event.isCancelled()){
+
+        if(event.isCancelled()) {
             return;
         }
 
@@ -56,7 +58,7 @@ public void onDamage(EntityDamageByEntityEvent event, ItemStack itemStack){
 
         int tier = getTier(itemStack, this.getId());
 
-        if(ThreadLocalRandom.current().nextInt(100) < getChance() / tier){
+        if(ThreadLocalRandom.current().nextInt(100) < getChance() / tier) {
             int level = Math.abs(tier - 4);
 
             livingEntity.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, 80, level));

diff --git a/src/main/java/ne/fnfal113/fnamplifications/gems/DecrepitGem.java b/src/main/java/ne/fnfal113/fnamplifications/gems/DecrepitGem.java
@@ -40,13 +40,15 @@ public void onDrag(Player player, SlimefunItem slimefunGemItem, ItemStack gemIte
 
     @Override
     public void onDamage(EntityDamageByEntityEvent event, ItemStack itemStack){
-        if(!(event.getDamager() instanceof LivingEntity)){
+        if(!(event.getDamager() instanceof LivingEntity)) {
             return;
         }
-        if(!(event.getEntity() instanceof Player)){
+
+        if(!(event.getEntity() instanceof Player)) {
             return;
         }
-        if(event.isCancelled()){
+
+        if(event.isCancelled()) {
             return;
         }
 
@@ -56,7 +58,7 @@ public void onDamage(EntityDamageByEntityEvent event, ItemStack itemStack){
 
         int tier = getTier(itemStack, this.getId());
 
-        if(ThreadLocalRandom.current().nextInt(100) < getChance() / tier){
+        if(ThreadLocalRandom.current().nextInt(100) < getChance() / tier) {
             int level = Math.abs(tier - 4);
 
             livingEntity.addPotionEffect(new PotionEffect(PotionEffectType.WEAKNESS, 80, level));

diff --git a/src/main/java/ne/fnfal113/fnamplifications/gems/DisarmGem.java b/src/main/java/ne/fnfal113/fnamplifications/gems/DisarmGem.java
@@ -37,13 +37,15 @@ public void onDrag(Player player, SlimefunItem slimefunGemItem, ItemStack gemIte
 
     @Override
     public void onDamage(EntityDamageByEntityEvent event, ItemStack itemStack) {
-        if(!(event.getEntity() instanceof Player)){
+        if(!(event.getEntity() instanceof Player)) {
             return;
         }
-        if(!(event.getDamager() instanceof Player)){
+
+        if(!(event.getDamager() instanceof Player)) {
             return;
         }
-        if(event.isCancelled()){
+
+        if(event.isCancelled()) {
             return;
         }
 

diff --git a/src/main/java/ne/fnfal113/fnamplifications/gems/DisarmorGem.java b/src/main/java/ne/fnfal113/fnamplifications/gems/DisarmorGem.java
@@ -37,13 +37,15 @@ public void onDrag(Player player, SlimefunItem slimefunGemItem, ItemStack gemIte
 
     @Override
     public void onDamage(EntityDamageByEntityEvent event, ItemStack itemStack) {
-        if(!(event.getEntity() instanceof Player)){
+        if(!(event.getEntity() instanceof Player)) {
             return;
         }
-        if(!(event.getDamager() instanceof Player)){
+
+        if(!(event.getDamager() instanceof Player)) {
             return;
         }
-        if(event.isCancelled()){
+
+        if(event.isCancelled()) {
             return;
         }
 

diff --git a/src/main/java/ne/fnfal113/fnamplifications/gems/DisruptedGem.java b/src/main/java/ne/fnfal113/fnamplifications/gems/DisruptedGem.java
@@ -37,7 +37,7 @@ public void onDrag(Player player, SlimefunItem slimefunGemItem, ItemStack gemIte
 
     @Override
     public void onGuardianSpawn(GuardianSpawnEvent event, ItemStack itemStack){
-        if(event.isCancelled()){
+        if(event.isCancelled()) {
             return;
         }
 

diff --git a/src/main/java/ne/fnfal113/fnamplifications/gems/GuardianGem.java b/src/main/java/ne/fnfal113/fnamplifications/gems/GuardianGem.java
@@ -55,21 +55,22 @@ public void onDrag(Player player, SlimefunItem slimefunGemItem, ItemStack gemIte
 
     @Override
     public void onDamage(EntityDamageByEntityEvent event, ItemStack itemStack){
-        if(event.isCancelled()){
+        if(event.isCancelled()) {
             return;
         }
-        if(!(event.getEntity() instanceof Player)){
+
+        if(!(event.getEntity() instanceof Player)) {
             return;
         }
 
         Player player = (Player) event.getEntity();
 
-        if(event.getDamager() instanceof Phantom || event.getDamager() instanceof Flying || event.getDamager() instanceof EnderDragon){
+        if(event.getDamager() instanceof Phantom || event.getDamager() instanceof Flying || event.getDamager() instanceof EnderDragon) {
             return;
         } // prevent guardian from attacking flying entities
 
-        if(runnableMap.containsKey(player.getUniqueId())){
-            if(runnableMap.get(player.getUniqueId()).isCancelled()){
+        if(runnableMap.containsKey(player.getUniqueId())) {
+            if(runnableMap.get(player.getUniqueId()).isCancelled()) {
                 entityUUIDMap.remove(player.getUniqueId());
                 runnableMap.remove(player.getUniqueId());
                 return;

diff --git a/src/main/java/ne/fnfal113/fnamplifications/gems/HastyGem.java b/src/main/java/ne/fnfal113/fnamplifications/gems/HastyGem.java
@@ -43,9 +43,10 @@ public void onDrag(Player player, SlimefunItem slimefunGemItem, ItemStack gemIte
 
     @Override
     public void onBlockBreak(BlockBreakEvent event, Player player, ItemStack itemStack){
-        if(event.isCancelled()){
+        if(event.isCancelled()) {
             return;
         }
+
         Block block = event.getBlock();
 
         if(SlimefunTag.ORES.isTagged(block.getType()) || SlimefunTag.STONE_VARIANTS.isTagged(block.getType())) {

diff --git a/src/main/java/ne/fnfal113/fnamplifications/gems/ImpostorGem.java b/src/main/java/ne/fnfal113/fnamplifications/gems/ImpostorGem.java
@@ -39,13 +39,15 @@ public void onDrag(Player player, SlimefunItem slimefunGemItem, ItemStack gemIte
 
     @Override
     public void onDamage(EntityDamageByEntityEvent event, ItemStack itemStack){
-        if(event.isCancelled()){
+        if(event.isCancelled()) {
             return;
         }
-        if(!(event.getEntity() instanceof Player)){
+
+        if(!(event.getEntity() instanceof Player)) {
             return;
         }
-        if(!(event.getDamager() instanceof LivingEntity)){
+
+        if(!(event.getDamager() instanceof LivingEntity)) {
             return;
         }
 

diff --git a/src/main/java/ne/fnfal113/fnamplifications/gems/InfernoGem.java b/src/main/java/ne/fnfal113/fnamplifications/gems/InfernoGem.java
@@ -38,10 +38,11 @@ public void onDrag(Player player, SlimefunItem slimefunGemItem, ItemStack gemIte
 
     @Override
     public void onDamage(EntityDamageByEntityEvent event, ItemStack itemStack){
-        if(event.isCancelled()){
+        if(event.isCancelled()) {
             return;
         }
-        if(!(event.getEntity() instanceof LivingEntity)){
+
+        if(!(event.getEntity() instanceof LivingEntity)) {
             return;
         }