Update 2019-9-13 22:12 Fixed some bugs

WinfXK · Sep 13, 2019 · 280b7f9 · 280b7f9
1 parent 410f163
commit 280b7f9
Show file tree

Hide file tree

Showing 72 changed files with 182 additions and 143 deletions.
diff --git a/Bemilk/.classpath b/Bemilk/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/EconomyAPI"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Nukkit"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/Bemilk/.project b/Bemilk/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Bemilk</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/Bemilk/.settings/org.eclipse.jdt.core.prefs b/Bemilk/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/Bemilk/plugin.yml b/Bemilk/plugin.yml
@@ -2,11 +2,11 @@ name: Bemilk
 main: xiaokai.bemilk.Bemilk
 api:
 - 1.0.0
-version: 1.0
+version: 1.1
 load: POSTWORLD
 website: http://EpicFX.cn
 author: Winfxk
-loadbefore:
+depend:
 - EconomyAPI
 permissions:
    Bemilk.Command.Shop:

diff --git a/Bemilk/src/xiaokai/bemilk/Bemilk.java b/Bemilk/src/xiaokai/bemilk/Bemilk.java
@@ -4,7 +4,7 @@
 import xiaokai.bemilk.event.Monitor;
 import xiaokai.bemilk.event.PlayerEvent;
 import xiaokai.bemilk.mtp.Kick;
-import xiaokai.tool.Tool;
+import xiaokai.bemilk.tool.Tool;
 
 import java.time.Duration;
 import java.time.Instant;

diff --git a/Bemilk/src/xiaokai/bemilk/data/DisPlayer.java b/Bemilk/src/xiaokai/bemilk/data/DisPlayer.java
@@ -15,7 +15,7 @@
 
 import xiaokai.bemilk.form.MakeForm;
 import xiaokai.bemilk.mtp.Kick;
-import xiaokai.tool.Tool;
+import xiaokai.bemilk.tool.Tool;
 
 /**
  * @author Winfxk

diff --git a/Bemilk/src/xiaokai/bemilk/data/FormID.java b/Bemilk/src/xiaokai/bemilk/data/FormID.java
@@ -4,7 +4,7 @@
 import java.util.Map;
 
 import xiaokai.bemilk.mtp.Kick;
-import xiaokai.tool.Tool;
+import xiaokai.bemilk.tool.Tool;
 
 /**
  * @author Winfxk

diff --git a/Bemilk/src/xiaokai/bemilk/data/Message.java b/Bemilk/src/xiaokai/bemilk/data/Message.java
@@ -7,7 +7,7 @@
 import cn.nukkit.utils.Config;
 import xiaokai.bemilk.Bemilk;
 import xiaokai.bemilk.mtp.Kick;
-import xiaokai.tool.Tool;
+import xiaokai.bemilk.tool.Tool;
 
 /**
  * @author Winfxk

diff --git a/Bemilk/src/xiaokai/bemilk/event/PlayerEvent.java b/Bemilk/src/xiaokai/bemilk/event/PlayerEvent.java
@@ -17,7 +17,7 @@
 import xiaokai.bemilk.form.MakeForm;
 import xiaokai.bemilk.mtp.Belle;
 import xiaokai.bemilk.mtp.Kick;
-import xiaokai.tool.data.ItemIDSunName;
+import xiaokai.bemilk.tool.data.ItemIDSunName;
 
 /**
  * @author Winfxk

diff --git a/Bemilk/src/xiaokai/bemilk/form/Dispose.java b/Bemilk/src/xiaokai/bemilk/form/Dispose.java
@@ -14,10 +14,10 @@
 import xiaokai.bemilk.shop.delShopItem;
 import xiaokai.bemilk.shop.add.addShopItem;
 import xiaokai.bemilk.shop.open.OpenShop;
-import xiaokai.tool.data.Effectrec;
-import xiaokai.tool.data.EnchantName;
-import xiaokai.tool.data.ItemID;
-import xiaokai.tool.form.SimpleForm;
+import xiaokai.bemilk.tool.data.Effectrec;
+import xiaokai.bemilk.tool.data.EnchantName;
+import xiaokai.bemilk.tool.data.ItemID;
+import xiaokai.bemilk.tool.form.SimpleForm;
 
 import java.io.File;
 import java.util.ArrayList;

diff --git a/Bemilk/src/xiaokai/bemilk/form/MakeForm.java b/Bemilk/src/xiaokai/bemilk/form/MakeForm.java
@@ -4,10 +4,10 @@
 import xiaokai.bemilk.data.MyPlayer;
 import xiaokai.bemilk.mtp.Kick;
 import xiaokai.bemilk.shop.Shop;
-import xiaokai.tool.Tool;
-import xiaokai.tool.form.CustomForm;
-import xiaokai.tool.form.ModalForm;
-import xiaokai.tool.form.SimpleForm;
+import xiaokai.bemilk.tool.Tool;
+import xiaokai.bemilk.tool.form.CustomForm;
+import xiaokai.bemilk.tool.form.ModalForm;
+import xiaokai.bemilk.tool.form.SimpleForm;
 
 import java.io.File;
 import java.io.FilenameFilter;

diff --git a/Bemilk/src/xiaokai/bemilk/form/manage/addShop.java b/Bemilk/src/xiaokai/bemilk/form/manage/addShop.java
@@ -5,9 +5,9 @@
 import xiaokai.bemilk.form.MakeForm;
 import xiaokai.bemilk.mtp.Kick;
 import xiaokai.bemilk.shop.Shop;
-import xiaokai.tool.Tool;
-import xiaokai.tool.data.ItemID;
-import xiaokai.tool.form.CustomForm;
+import xiaokai.bemilk.tool.Tool;
+import xiaokai.bemilk.tool.data.ItemID;
+import xiaokai.bemilk.tool.form.CustomForm;
 
 import java.io.File;
 import java.io.FilenameFilter;

diff --git a/Bemilk/src/xiaokai/bemilk/form/manage/delShop.java b/Bemilk/src/xiaokai/bemilk/form/manage/delShop.java
@@ -4,9 +4,9 @@
 import xiaokai.bemilk.data.MyPlayer;
 import xiaokai.bemilk.form.MakeForm;
 import xiaokai.bemilk.mtp.Kick;
-import xiaokai.tool.Tool;
-import xiaokai.tool.data.ItemID;
-import xiaokai.tool.form.SimpleForm;
+import xiaokai.bemilk.tool.Tool;
+import xiaokai.bemilk.tool.data.ItemID;
+import xiaokai.bemilk.tool.form.SimpleForm;
 
 import java.io.File;
 import java.util.ArrayList;

diff --git a/Bemilk/src/xiaokai/bemilk/form/manage/setShop.java b/Bemilk/src/xiaokai/bemilk/form/manage/setShop.java
@@ -4,9 +4,9 @@
 import xiaokai.bemilk.data.MyPlayer;
 import xiaokai.bemilk.form.MakeForm;
 import xiaokai.bemilk.mtp.Kick;
-import xiaokai.tool.Tool;
-import xiaokai.tool.form.CustomForm;
-import xiaokai.tool.form.SimpleForm;
+import xiaokai.bemilk.tool.Tool;
+import xiaokai.bemilk.tool.form.CustomForm;
+import xiaokai.bemilk.tool.form.SimpleForm;
 
 import java.io.File;
 import java.util.ArrayList;

diff --git a/Bemilk/src/xiaokai/bemilk/mtp/Belle.java b/Bemilk/src/xiaokai/bemilk/mtp/Belle.java
@@ -1,6 +1,6 @@
 package xiaokai.bemilk.mtp;
 
-import xiaokai.tool.Tool;
+import xiaokai.bemilk.tool.Tool;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/Bemilk/src/xiaokai/bemilk/mtp/Kick.java b/Bemilk/src/xiaokai/bemilk/mtp/Kick.java
@@ -4,8 +4,8 @@
 import xiaokai.bemilk.data.FormID;
 import xiaokai.bemilk.data.Message;
 import xiaokai.bemilk.data.MyPlayer;
-import xiaokai.tool.data.Effectrec;
-import xiaokai.tool.data.ItemID;
+import xiaokai.bemilk.tool.data.Effectrec;
+import xiaokai.bemilk.tool.data.ItemID;
 
 import java.io.File;
 import java.util.LinkedHashMap;

diff --git a/Bemilk/src/xiaokai/bemilk/mtp/startThread.java b/Bemilk/src/xiaokai/bemilk/mtp/startThread.java
@@ -3,7 +3,7 @@
 import xiaokai.bemilk.cmd.ShopCommand;
 import xiaokai.bemilk.data.DisPlayer;
 import xiaokai.bemilk.data.MyPlayer;
-import xiaokai.tool.Update;
+import xiaokai.bemilk.tool.Update;
 
 import java.util.Map;
 import java.util.Set;

diff --git a/Bemilk/src/xiaokai/bemilk/set/CustomEffect.java b/Bemilk/src/xiaokai/bemilk/set/CustomEffect.java
@@ -5,9 +5,9 @@
 import xiaokai.bemilk.mtp.Kick;
 import xiaokai.bemilk.set.effect.addEffect;
 import xiaokai.bemilk.set.effect.delEffect;
-import xiaokai.tool.Tool;
-import xiaokai.tool.data.Effectrec;
-import xiaokai.tool.form.SimpleForm;
+import xiaokai.bemilk.tool.Tool;
+import xiaokai.bemilk.tool.data.Effectrec;
+import xiaokai.bemilk.tool.form.SimpleForm;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/Bemilk/src/xiaokai/bemilk/set/CustomItem.java b/Bemilk/src/xiaokai/bemilk/set/CustomItem.java
@@ -5,9 +5,9 @@
 import xiaokai.bemilk.mtp.Kick;
 import xiaokai.bemilk.set.item.addItem;
 import xiaokai.bemilk.set.item.delItem;
-import xiaokai.tool.Tool;
-import xiaokai.tool.data.ItemID;
-import xiaokai.tool.form.SimpleForm;
+import xiaokai.bemilk.tool.Tool;
+import xiaokai.bemilk.tool.data.ItemID;
+import xiaokai.bemilk.tool.form.SimpleForm;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/Bemilk/src/xiaokai/bemilk/set/SetConfig.java b/Bemilk/src/xiaokai/bemilk/set/SetConfig.java
@@ -1,9 +1,9 @@
 package xiaokai.bemilk.set;
 
 import xiaokai.bemilk.form.MakeForm;
-import xiaokai.tool.Tool;
-import xiaokai.tool.data.ItemID;
-import xiaokai.tool.form.CustomForm;
+import xiaokai.bemilk.tool.Tool;
+import xiaokai.bemilk.tool.data.ItemID;
+import xiaokai.bemilk.tool.form.CustomForm;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/Bemilk/src/xiaokai/bemilk/set/effect/addEffect.java b/Bemilk/src/xiaokai/bemilk/set/effect/addEffect.java
@@ -2,9 +2,9 @@
 
 import xiaokai.bemilk.form.MakeForm;
 import xiaokai.bemilk.set.BasesetForm;
-import xiaokai.tool.Tool;
-import xiaokai.tool.data.Effectrec;
-import xiaokai.tool.form.CustomForm;
+import xiaokai.bemilk.tool.Tool;
+import xiaokai.bemilk.tool.data.Effectrec;
+import xiaokai.bemilk.tool.form.CustomForm;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;

diff --git a/Bemilk/src/xiaokai/bemilk/set/effect/delEffect.java b/Bemilk/src/xiaokai/bemilk/set/effect/delEffect.java
@@ -2,9 +2,9 @@
 
 import xiaokai.bemilk.form.MakeForm;
 import xiaokai.bemilk.set.BasesetForm;
-import xiaokai.tool.Tool;
-import xiaokai.tool.data.Effectrec;
-import xiaokai.tool.form.SimpleForm;
+import xiaokai.bemilk.tool.Tool;
+import xiaokai.bemilk.tool.data.Effectrec;
+import xiaokai.bemilk.tool.form.SimpleForm;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;

diff --git a/Bemilk/src/xiaokai/bemilk/set/item/addItem.java b/Bemilk/src/xiaokai/bemilk/set/item/addItem.java
@@ -2,8 +2,8 @@
 
 import xiaokai.bemilk.form.MakeForm;
 import xiaokai.bemilk.set.BasesetForm;
-import xiaokai.tool.data.ItemID;
-import xiaokai.tool.form.CustomForm;
+import xiaokai.bemilk.tool.data.ItemID;
+import xiaokai.bemilk.tool.form.CustomForm;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;

diff --git a/Bemilk/src/xiaokai/bemilk/set/item/delItem.java b/Bemilk/src/xiaokai/bemilk/set/item/delItem.java
@@ -2,9 +2,9 @@
 
 import xiaokai.bemilk.form.MakeForm;
 import xiaokai.bemilk.set.BasesetForm;
-import xiaokai.tool.Tool;
-import xiaokai.tool.data.ItemID;
-import xiaokai.tool.form.SimpleForm;
+import xiaokai.bemilk.tool.Tool;
+import xiaokai.bemilk.tool.data.ItemID;
+import xiaokai.bemilk.tool.form.SimpleForm;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;

diff --git a/Bemilk/src/xiaokai/bemilk/shop/Shop.java b/Bemilk/src/xiaokai/bemilk/shop/Shop.java
@@ -11,7 +11,7 @@
 
 import xiaokai.bemilk.cmd.ShopCommand;
 import xiaokai.bemilk.mtp.Kick;
-import xiaokai.tool.Tool;
+import xiaokai.bemilk.tool.Tool;
 
 /**
  * @author Winfxk

diff --git a/Bemilk/src/xiaokai/bemilk/shop/add/ItemEnchant.java b/Bemilk/src/xiaokai/bemilk/shop/add/ItemEnchant.java
@@ -5,10 +5,10 @@
 import xiaokai.bemilk.form.MakeForm;
 import xiaokai.bemilk.mtp.Kick;
 import xiaokai.bemilk.shop.addItem;
-import xiaokai.tool.Tool;
-import xiaokai.tool.data.EnchantName;
-import xiaokai.tool.form.CustomForm;
-import xiaokai.tool.form.SimpleForm;
+import xiaokai.bemilk.tool.Tool;
+import xiaokai.bemilk.tool.data.EnchantName;
+import xiaokai.bemilk.tool.form.CustomForm;
+import xiaokai.bemilk.tool.form.SimpleForm;
 
 import java.io.File;
 import java.util.HashMap;
@@ -120,7 +120,7 @@ private boolean MakeFormLevelRand() {
 			int SBEnchantID = data.getDropdownResponse(3).getElementID();
 			SBEnchantID = (SBEnchantID > (EnchantName.getNameList().size() - 1)) ? -1 : SBEnchantID;
 			int SBEnchantLevel = data.getDropdownResponse(4).getElementID();
-			boolean isTool = data.getToggleResponse(5);
+			boolean isTool = data.getToggleResponse(6);
 			boolean isOK;
 			player.sendMessage("§6您"
 					+ ((isOK = new addItem(player, myPlayer.file).addEnchantLevelRand(EnchantID, EnchantLevel,

diff --git a/Bemilk/src/xiaokai/bemilk/shop/add/ItemRepair.java b/Bemilk/src/xiaokai/bemilk/shop/add/ItemRepair.java
@@ -5,9 +5,9 @@
 import xiaokai.bemilk.form.MakeForm;
 import xiaokai.bemilk.mtp.Kick;
 import xiaokai.bemilk.shop.addItem;
-import xiaokai.tool.Tool;
-import xiaokai.tool.form.CustomForm;
-import xiaokai.tool.form.SimpleForm;
+import xiaokai.bemilk.tool.Tool;
+import xiaokai.bemilk.tool.form.CustomForm;
+import xiaokai.bemilk.tool.form.SimpleForm;
 
 import java.io.File;
 

diff --git a/Bemilk/src/xiaokai/bemilk/shop/add/ItemTradeItem.java b/Bemilk/src/xiaokai/bemilk/shop/add/ItemTradeItem.java
@@ -6,10 +6,10 @@
 import xiaokai.bemilk.form.MakeForm;
 import xiaokai.bemilk.mtp.Kick;
 import xiaokai.bemilk.shop.addItem;
-import xiaokai.tool.Tool;
-import xiaokai.tool.data.ItemID;
-import xiaokai.tool.form.CustomForm;
-import xiaokai.tool.form.SimpleForm;
+import xiaokai.bemilk.tool.Tool;
+import xiaokai.bemilk.tool.data.ItemID;
+import xiaokai.bemilk.tool.form.CustomForm;
+import xiaokai.bemilk.tool.form.SimpleForm;
 
 import java.io.File;
 import java.util.ArrayList;

diff --git a/Bemilk/src/xiaokai/bemilk/shop/add/ShopOrSell.java b/Bemilk/src/xiaokai/bemilk/shop/add/ShopOrSell.java
@@ -5,10 +5,10 @@
 import xiaokai.bemilk.form.MakeForm;
 import xiaokai.bemilk.mtp.Kick;
 import xiaokai.bemilk.shop.addItem;
-import xiaokai.tool.Tool;
-import xiaokai.tool.data.ItemID;
-import xiaokai.tool.form.CustomForm;
-import xiaokai.tool.form.SimpleForm;
+import xiaokai.bemilk.tool.Tool;
+import xiaokai.bemilk.tool.data.ItemID;
+import xiaokai.bemilk.tool.form.CustomForm;
+import xiaokai.bemilk.tool.form.SimpleForm;
 
 import java.io.File;
 import java.util.ArrayList;

diff --git a/Bemilk/src/xiaokai/bemilk/shop/add/addShopItem.java b/Bemilk/src/xiaokai/bemilk/shop/add/addShopItem.java
@@ -5,8 +5,8 @@
 import xiaokai.bemilk.form.MakeForm;
 import xiaokai.bemilk.mtp.Kick;
 import xiaokai.bemilk.shop.add.effect.addEffect;
-import xiaokai.tool.Tool;
-import xiaokai.tool.form.SimpleForm;
+import xiaokai.bemilk.tool.Tool;
+import xiaokai.bemilk.tool.form.SimpleForm;
 
 import java.io.File;
 import java.util.ArrayList;

diff --git a/Bemilk/src/xiaokai/bemilk/shop/add/effect/CustomEffect.java b/Bemilk/src/xiaokai/bemilk/shop/add/effect/CustomEffect.java
@@ -1,8 +1,8 @@
 package xiaokai.bemilk.shop.add.effect;
 
 import xiaokai.bemilk.shop.addItem;
-import xiaokai.tool.Tool;
-import xiaokai.tool.data.Effectrec;
+import xiaokai.bemilk.tool.Tool;
+import xiaokai.bemilk.tool.data.Effectrec;
 
 import java.io.File;
 import java.util.HashMap;

diff --git a/Bemilk/src/xiaokai/bemilk/shop/add/effect/RandEffect.java b/Bemilk/src/xiaokai/bemilk/shop/add/effect/RandEffect.java
@@ -1,8 +1,8 @@
 package xiaokai.bemilk.shop.add.effect;
 
 import xiaokai.bemilk.shop.addItem;
-import xiaokai.tool.Tool;
-import xiaokai.tool.data.Effectrec;
+import xiaokai.bemilk.tool.Tool;
+import xiaokai.bemilk.tool.data.Effectrec;
 
 import java.io.File;
 import java.util.ArrayList;