mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-06-18 06:41:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed enchantments not applying to loot.

Browse Source
This commit is contained in:
Vatuu
2022-08-16 15:45:48 +02:00
parent 9c387475f0
commit 116c017c6d
1 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/volmit/iris/engine/object/IrisEnchantment.java
+9 -23
View File
@@ -19,21 +19,17 @@
package com.volmit.iris.engine.object; package com.volmit.iris.engine.object;
import com.volmit.iris.Iris; import com.volmit.iris.Iris;
import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.*;
import com.volmit.iris.engine.object.annotations.MaxNumber;
import com.volmit.iris.engine.object.annotations.MinNumber;
import com.volmit.iris.engine.object.annotations.Required;
import com.volmit.iris.engine.object.annotations.Snippet;
import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.math.RNG;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import org.bukkit.NamespacedKey;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.meta.EnchantmentStorageMeta; import org.bukkit.inventory.meta.EnchantmentStorageMeta;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
import java.lang.reflect.Field;
@Snippet("enchantment") @Snippet("enchantment")
@Accessors(chain = true) @Accessors(chain = true)
@@ -61,12 +57,17 @@ public class IrisEnchantment {
public void apply(RNG rng, ItemMeta meta) { public void apply(RNG rng, ItemMeta meta) {
try { try {
Enchantment enchant = Enchantment.getByKey(NamespacedKey.minecraft(getEnchantment()));
if(enchant == null) {
Iris.warn("Unknown Enchantment: " + getEnchantment());
return;
}
if(rng.nextDouble() < chance) { if(rng.nextDouble() < chance) {
if(meta instanceof EnchantmentStorageMeta) { if(meta instanceof EnchantmentStorageMeta) {
((EnchantmentStorageMeta) meta).addStoredEnchant(getEnchant(), getLevel(rng), true); ((EnchantmentStorageMeta) meta).addStoredEnchant(enchant, getLevel(rng), true);
return; return;
} }
meta.addEnchant(getEnchant(), getLevel(rng), true); meta.addEnchant(enchant, getLevel(rng), true);
} }
} catch(Throwable e) { } catch(Throwable e) {
Iris.reportError(e); Iris.reportError(e);
@@ -74,21 +75,6 @@ public class IrisEnchantment {
} }
} }
public Enchantment getEnchant() {
for(Field i : Enchantment.class.getDeclaredFields()) {
if(i.getType().equals(Enchantment.class) && i.getName().equals(getEnchantment())) {
try {
return (Enchantment) i.get(null);
} catch(IllegalArgumentException | IllegalAccessException e) {
e.printStackTrace();
Iris.reportError(e);
}
}
}
return null;
}
public int getLevel(RNG rng) { public int getLevel(RNG rng) {
return rng.i(getMinLevel(), getMaxLevel()); return rng.i(getMinLevel(), getMaxLevel());
} }