EXPERIMENTAL 1.20.6 updates

magemonkeystudio · May 30, 2024 · fe617d5 · fe617d5
1 parent a3774ad
commit fe617d5
Show file tree

Hide file tree

Showing 18 changed files with 206 additions and 511 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>studio.magemonkey</groupId>
         <artifactId>magemonkey-parent</artifactId>
-        <version>1.20.4-SNAPSHOT</version>
+        <version>1.20.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>divinity</artifactId>
@@ -38,6 +38,11 @@
     </repositories>
 
     <dependencies>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot</artifactId>
+            <version>1.20.4-R0.1-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>com.mojang</groupId>
             <artifactId>authlib</artifactId>

diff --git a/src/main/java/studio/magemonkey/divinity/manager/damage/DamageManager.java b/src/main/java/studio/magemonkey/divinity/manager/damage/DamageManager.java
@@ -387,7 +387,7 @@ private void applyShieldDamage(Player player) {
         if (shield == null) return;
 
         Damageable shieldMeta = (Damageable) shield.getItemMeta();
-        int        level      = shieldMeta.getEnchantLevel(Enchantment.DURABILITY);
+        int        level      = shieldMeta.getEnchantLevel(Enchantment.getByName("unbreaking")); // DURABILITY/UNBREAKING
         if (Rnd.get(true) <= (100d / (level + 1))) {
             shieldMeta.setDamage(shieldMeta.getDamage() + 1);
             shield.setItemMeta(shieldMeta);
@@ -464,19 +464,19 @@ private boolean handleDamagePostEffects(
     private double getEnchantModifier(@NotNull LivingEntity zertva, @NotNull DamageCause cause) {
         EntityStats stats = EntityStats.get(zertva);
 
-        double epfAll  = stats.getEnchantProtectFactor(Enchantment.PROTECTION_ENVIRONMENTAL);
+        double epfAll  = stats.getEnchantProtectFactor(Enchantment.getByName("protection")); // PROTECTION_ENVIRONMENTAL/PROTECTION
         double epfSpec = 0D;
         double epfMod  = 1D;
 
         if (cause == DamageCause.FIRE || cause == DamageCause.FIRE_TICK
                 || cause == DamageCause.LAVA) {
-            epfSpec = stats.getEnchantProtectFactor(Enchantment.PROTECTION_FIRE);
+            epfSpec = stats.getEnchantProtectFactor(Enchantment.getByName("fire_protection")); // PROTECTION_FIRE/FIRE_PROTECTION
         } else if (cause == DamageCause.FALL) {
-            epfSpec = stats.getEnchantProtectFactor(Enchantment.PROTECTION_FALL);
+            epfSpec = stats.getEnchantProtectFactor(Enchantment.getByName("feather_falling")); // PROTECTION_FALL/FEATHER_FALLING
         } else if (cause == DamageCause.PROJECTILE) {
-            epfSpec = stats.getEnchantProtectFactor(Enchantment.PROTECTION_PROJECTILE);
+            epfSpec = stats.getEnchantProtectFactor(Enchantment.getByName("projectile_protection")); // PROTECTION_PROJECTILE/PROJECTILE_PROTECTION
         } else if (cause == DamageCause.BLOCK_EXPLOSION || cause == DamageCause.ENTITY_EXPLOSION) {
-            epfSpec = stats.getEnchantProtectFactor(Enchantment.PROTECTION_EXPLOSIONS);
+            epfSpec = stats.getEnchantProtectFactor(Enchantment.getByName("blast_protection")); // PROTECTION_EXPLOSION/BLAST_PROTECTION
         }
         epfMod = Math.min(20D, (epfSpec + epfAll));
 

diff --git a/src/main/java/studio/magemonkey/divinity/manager/effects/main/BleedEffect.java b/src/main/java/studio/magemonkey/divinity/manager/effects/main/BleedEffect.java
@@ -1,12 +1,12 @@
 package studio.magemonkey.divinity.manager.effects.main;
 
-import studio.magemonkey.codex.util.EffectUT;
-import studio.magemonkey.divinity.manager.effects.IEffectType;
-import studio.magemonkey.divinity.manager.effects.IPeriodicEffect;
 import org.bukkit.Material;
 import org.bukkit.Particle;
 import org.bukkit.entity.LivingEntity;
 import org.jetbrains.annotations.NotNull;
+import studio.magemonkey.codex.util.EffectUT;
+import studio.magemonkey.divinity.manager.effects.IEffectType;
+import studio.magemonkey.divinity.manager.effects.IPeriodicEffect;
 
 import java.util.function.Function;
 
@@ -59,7 +59,13 @@ public static class Builder extends IPeriodicEffect.Builder<Builder> {
         public Builder(double lifeTime, double interval, @NotNull Function<LivingEntity, Double> damageFunction) {
             super(lifeTime, interval);
             this.withFunction(damageFunction);
-            this.withBlood(Particle.BLOCK_CRACK);
+            Particle particle;
+            try {
+                particle = Particle.BLOCK;
+            } catch (Exception e) {
+                particle = Particle.valueOf("BLOCK_CRACK");
+            }
+            this.withBlood(particle);
             this.withColor(Material.REDSTONE_BLOCK.name());
         }
 

diff --git a/src/main/java/studio/magemonkey/divinity/manager/effects/main/RootEffect.java b/src/main/java/studio/magemonkey/divinity/manager/effects/main/RootEffect.java
@@ -57,7 +57,7 @@ public static class Builder extends IPeriodicEffect.Builder<Builder> {
 
         public Builder(double lifeTime) {
             super(lifeTime, 1D / 20D);
-            this.addPotionEffects(new PotionEffect(PotionEffectType.SLOW, (int) (lifeTime * 20), 127));
+            this.addPotionEffects(new PotionEffect(PotionEffectType.getByName("slowness"), (int) (lifeTime * 20), 127)); // SLOWNESS/SLOW
         }
 
         @Override

diff --git a/src/main/java/studio/magemonkey/divinity/manager/effects/main/StunEffect.java b/src/main/java/studio/magemonkey/divinity/manager/effects/main/StunEffect.java
@@ -55,8 +55,8 @@ public static class Builder extends IPeriodicEffect.Builder<Builder> {
         public Builder(double lifeTime) {
             super(lifeTime, 1D / 20D);
 
-            this.addPotionEffects(new PotionEffect(PotionEffectType.SLOW, (int) (lifeTime * 20), 127));
-            this.addPotionEffects(new PotionEffect(PotionEffectType.SLOW_DIGGING, (int) (lifeTime * 20), 127));
+            this.addPotionEffects(new PotionEffect(PotionEffectType.getByName("slowness"), (int) (lifeTime * 20), 127)); // SLOW/SLOWNESS
+            this.addPotionEffects(new PotionEffect(PotionEffectType.getByName("mining_fatigue"), (int) (lifeTime * 20), 127)); // SLOW_DIGGING/MINING_FATIGUE
             this.addPotionEffects(new PotionEffect(PotionEffectType.BLINDNESS, (int) lifeTime * 20, 127));
         }
 

diff --git a/src/main/java/studio/magemonkey/divinity/modules/ModuleItem.java b/src/main/java/studio/magemonkey/divinity/modules/ModuleItem.java
@@ -234,7 +234,7 @@ protected ItemStack build(@NotNull ItemStack item) {
         meta.addItemFlags(this.flags.toArray(new ItemFlag[this.flags.size()]));
         meta.setUnbreakable(this.isUnbreakable);
         if (this.enchanted) {
-            meta.addEnchant(Enchantment.ARROW_DAMAGE, 1, true);
+            meta.addEnchant(Enchantment.getByName("punch"), 1, true); // ARROW_DAMAGE/PUNCH
         }
 
         item.setItemMeta(meta);

diff --git a/src/main/java/studio/magemonkey/divinity/modules/list/arrows/ArrowManager.java b/src/main/java/studio/magemonkey/divinity/modules/list/arrows/ArrowManager.java
@@ -142,7 +142,7 @@ public void onQuantumArrowLaunch(DivinityProjectileLaunchEvent e) {
 
         ItemStack bow = e.getWeapon();
         if (e.isBowEvent() && !this.generalAllowInfinity && bow != null) {
-            if (bow.containsEnchantment(Enchantment.ARROW_INFINITE)) {
+            if (bow.containsEnchantment(Enchantment.getByName("infinity"))) { // ARROW_INFINITE/INFINITY
                 arrow.setAmount(arrow.getAmount() - 1);
             }
         }

diff --git a/src/main/java/studio/magemonkey/divinity/modules/list/extractor/ExtractGUI.java b/src/main/java/studio/magemonkey/divinity/modules/list/extractor/ExtractGUI.java
@@ -165,14 +165,14 @@ public void open(
                         for (int socketSlot : socketSlots) {
                             ItemStack socketItem = inv.getItem(socketSlot);
                             if (socketItem != null) {
-                                socketItem.removeEnchantment(Enchantment.ARROW_DAMAGE);
+                                socketItem.removeEnchantment(Enchantment.getByName("punch")); // ARROW_DAMAGE/PUNCH
                             }
                         }
 
                         // Add glow to selected socket item
                         ItemStack item1 = e.getCurrentItem();
                         if (item1 != null) {
-                            item1.addUnsafeEnchantment(Enchantment.ARROW_DAMAGE, 1);
+                            item1.addUnsafeEnchantment(Enchantment.getByName("punch"), 1); // ARROW_DAMAGE/PUNCH
                         }
 
                         ItemStack target1 = getItem(inv, itemSlot);
@@ -242,7 +242,7 @@ else if (e.isRightClick()) {
             Enum<?> type2 = guiItem.getType();
             if (type2 != null && type2 == type) {
                 ItemStack itemGlow = guiItem.getItem();
-                itemGlow.addUnsafeEnchantment(Enchantment.ARROW_DAMAGE, 1);
+                itemGlow.addUnsafeEnchantment(Enchantment.getByName("punch"), 1); // ARROW_DAMAGE/PUNCH
                 DataUT.setData(itemGlow, META_KEY_SOCKET_SELECT, "true");
                 JIcon active = new JIcon(itemGlow);
                 active.setClick(guiItem.getClick());

diff --git a/.../java/studio/magemonkey/divinity/modules/list/itemgenerator/editor/AbstractEditorGUI.java b/.../java/studio/magemonkey/divinity/modules/list/itemgenerator/editor/AbstractEditorGUI.java
@@ -1,11 +1,5 @@
 package studio.magemonkey.divinity.modules.list.itemgenerator.editor;
 
-import studio.magemonkey.codex.config.api.JYML;
-import studio.magemonkey.codex.core.Version;
-import studio.magemonkey.codex.manager.api.menu.Menu;
-import studio.magemonkey.codex.util.StringUT;
-import studio.magemonkey.divinity.Divinity;
-import studio.magemonkey.divinity.modules.list.itemgenerator.ItemGeneratorManager;
 import net.md_5.bungee.api.chat.BaseComponent;
 import org.bukkit.Material;
 import org.bukkit.entity.HumanEntity;
@@ -18,6 +12,12 @@
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.jetbrains.annotations.Nullable;
+import studio.magemonkey.codex.config.api.JYML;
+import studio.magemonkey.codex.core.Version;
+import studio.magemonkey.codex.manager.api.menu.Menu;
+import studio.magemonkey.codex.util.StringUT;
+import studio.magemonkey.divinity.Divinity;
+import studio.magemonkey.divinity.modules.list.itemgenerator.ItemGeneratorManager;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -68,8 +68,15 @@ protected static ItemStack createItem(ItemStack itemStack, String name, String..
     protected static ItemStack createItem(ItemStack itemStack, String name, List<String> lore) {
         ItemMeta meta = itemStack.getItemMeta();
         if (meta != null) {
+            ItemFlag hidePotionsFlag;
+            try {
+                hidePotionsFlag = ItemFlag.HIDE_ADDITIONAL_TOOLTIP;
+            } catch (IllegalArgumentException ignored) {
+                hidePotionsFlag = ItemFlag.valueOf("HIDE_POTION_EFFECTS");
+            }
+
             meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES);
-            meta.addItemFlags(ItemFlag.HIDE_POTION_EFFECTS);
+            meta.addItemFlags(hidePotionsFlag);
             if (Version.CURRENT.isHigher(Version.V1_19_R3)) {
                 meta.addItemFlags(ItemFlag.HIDE_ARMOR_TRIM);
             }

diff --git a/src/main/java/studio/magemonkey/divinity/modules/list/itemgenerator/editor/ItemFlagsGUI.java b/src/main/java/studio/magemonkey/divinity/modules/list/itemgenerator/editor/ItemFlagsGUI.java
@@ -61,10 +61,6 @@ public void setContents() {
                     material = Material.OAK_PLANKS;
                     break;
                 }
-                case HIDE_POTION_EFFECTS: {
-                    material = Material.POTION;
-                    break;
-                }
                 case HIDE_DYE: {
                     material = Material.MAGENTA_DYE;
                     break;
@@ -74,6 +70,11 @@ public void setContents() {
                     break;
                 }
             }
+
+            if(flag.name().equals("HIDE_POTION_EFFECTS") || flag.name().equals("HIDE_ADDITIONAL_TOOLTIP")) {
+                material = Material.POTION;
+            }
+
             String name = flag.name().toLowerCase();
             this.setSlot(i, new Slot(createItem(material,
                     "&e" + name,

diff --git a/src/main/java/studio/magemonkey/divinity/modules/list/repair/AnvilGUI.java b/src/main/java/studio/magemonkey/divinity/modules/list/repair/AnvilGUI.java
@@ -146,7 +146,7 @@ public void open(
             ItemStack                itemGlow   = guiItem.getItem();
             this.replaceCostHave(player, target, itemGlow, repairType);
             if (type2 == type) {
-                itemGlow.addUnsafeEnchantment(Enchantment.ARROW_DAMAGE, 1);
+                itemGlow.addUnsafeEnchantment(Enchantment.getByName("punch"), 1); // ARROW_DAMAGE/PUNCH
                 DataUT.setData(itemGlow, META_KEY_REPAIR_SELECT, "true");
             }
 

diff --git a/src/main/java/studio/magemonkey/divinity/nms/packets/versions/V1_13_R2.java b/src/main/java/studio/magemonkey/divinity/nms/packets/versions/V1_13_R2.java