0.7 Update

zhehedream · Sep 17, 2019 · d4e67ec · d4e67ec
1 parent e31fc94
commit d4e67ec
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 22 deletions.
diff --git a/src/jaredbgreat/dldungeons/pieces/chests/BasicChest.java b/src/jaredbgreat/dldungeons/pieces/chests/BasicChest.java
@@ -12,7 +12,6 @@
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.block.Chest;
-import org.bukkit.inventory.BlockInventoryHolder;
 import org.bukkit.inventory.ItemStack;
 
 //import net.minecraft.item.ItemStack;

diff --git a/src/jaredbgreat/dldungeons/pieces/chests/LootCategory.java b/src/jaredbgreat/dldungeons/pieces/chests/LootCategory.java
@@ -16,6 +16,7 @@
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.EnchantmentStorageMeta;
 
 //import net.minecraft.enchantment.EnchantmentHelper;
 //import net.minecraft.init.Items;
@@ -127,12 +128,7 @@ private LootResult getEnchantedGear(int lootLevel, Random random) {
 		int enchPart =Math.min((5 + (diff * (diff + 1) / 2) * 5), diff * 10);
 		if(enchPart >= 1 && isEnchantable(item)) {
 			out = item.getStack(random);
-                        Enchantment randEnchant = Enchantment.values()[(int) (Math.random()*Enchantment.values().length)];
-                        try {
-                            out.addEnchantment(randEnchant, 1);
-                        } catch(IllegalArgumentException ex) {
-
-                        }
+//                        Enchantment randEnchant = Enchantment.values()[(int) (Math.random()*Enchantment.values().length)];
 //			out = EnchantmentHelper.addRandomEnchantment(random, out, enchPart, random.nextBoolean());
 		} else {
 			return enchantedLowerLevel(gear[Math.min(6, lootLevel)].getLoot(random), lootLevel, random);
@@ -154,15 +150,9 @@ private LootResult enchantedLowerLevel(LootItem item, int level, Random random)
 		ItemStack out;
 		int diff = level - item.level;
 		if(isEnchantable(item) && (diff > random.nextInt(2))) {
-			int enchPart = Math.min((5 + (level * (level + 1) / 2) * 5), level * 10);
+//			int enchPart = Math.min((5 + (level * (level + 1) / 2) * 5), level * 10);
 			out = item.getStack(random);
-                        Enchantment randEnchant = Enchantment.values()[(int) (Math.random()*Enchantment.values().length)];
-                        try {
-                            out.addEnchantment(randEnchant, 1);
-                        } catch(IllegalArgumentException ex) {
-
-                        }
-//			out = EnchantmentHelper.addRandomEnchantment(random, out, enchPart, random.nextBoolean());
+//                        Enchantment randEnchant = Enchantment.values()[(int) (Math.random()*Enchantment.values().length)];
 		} else {
 			out = item.getStack(random);
 		}
@@ -178,8 +168,11 @@ private LootResult enchantedLowerLevel(LootItem item, int level, Random random)
 	 * @return
 	 */
 	private boolean isEnchantable(LootItem in) {
-//		return ItemUtils.isEnchantable(new ItemStack(in.item, 1));
-                return false;
+////		return ItemUtils.isEnchantable(new ItemStack(in.item, 1));
+//                return false;
+            if(in.item == Material.ENCHANTED_BOOK) return true;
+            else return false;
+            // TODO: other equipments...
 	}
 
 
@@ -193,10 +186,10 @@ private boolean isEnchantable(LootItem in) {
 	private LootResult getEnchantedBook(int level, Random random) {
 		ItemStack out = new ItemStack(Material.ENCHANTED_BOOK, 1);
                 Enchantment randEnchant = Enchantment.values()[(int) (Math.random()*Enchantment.values().length)];
-                try {
-                    out.addEnchantment(randEnchant, 1);
-                } catch(IllegalArgumentException ex) {
-                            
+                if(out.getType() == Material.ENCHANTED_BOOK) {
+                    EnchantmentStorageMeta meta = (EnchantmentStorageMeta)out.getItemMeta();
+                    meta.addStoredEnchant(randEnchant, 1, true);
+                    out.setItemMeta(meta);
                 }
 //		out = EnchantmentHelper.addRandomEnchantment(random, out, Math.min(30, (int)(level * 7.5)), true);
 		return new LootResult(out, Math.min(level, 6));

diff --git a/src/jaredbgreat/dldungeons/pieces/chests/LootResult.java b/src/jaredbgreat/dldungeons/pieces/chests/LootResult.java
@@ -2,7 +2,11 @@
 
 //import net.minecraft.item.ItemStack;
 
+import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.PotionMeta;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
 
 
 public class LootResult {
@@ -12,6 +16,16 @@ public class LootResult {
 	LootResult(ItemStack item, int l) {
 		result = item;
 		level = l;
+
+                //TODO: this is not a good place for portion...
+                if(item.getType() == Material.POTION) {
+                    PotionMeta meta = (PotionMeta) item.getItemMeta();
+                    if(meta != null) {
+                        meta.addCustomEffect(new PotionEffect(PotionEffectType.REGENERATION, 100, 2), true);
+                        meta.addCustomEffect(new PotionEffect(PotionEffectType.NIGHT_VISION, 100, 2), true);
+                        result.setItemMeta(meta);
+                    }
+                }
 	}
 
 

diff --git a/src/plugin.yml b/src/plugin.yml
@@ -3,7 +3,7 @@ authors: [JaredBGreat,zhehe]
 main: me.zhehe.Main
 load: startup
 api-version: 1.13
-version: 0.2
+version: 0.7
 commands:
   doomlikedungeonspigot:
     aliases: [dld]