Merge pull request #82 from Dark98/master

MrExtremez Fixes

2006Redone Server/.classpath

@@ -8,6 +8,9 @@
 	<classpathentry kind="lib" path="libs/slf4j.jar"/>
 	<classpathentry kind="lib" path="libs/xpp3-1.1.4c.jar"/>
 	<classpathentry kind="lib" path="libs/xstream-1.4.1.jar"/>
+	<classpathentry kind="lib" path="libs/everythingrs-api.jar"/>
+	<classpathentry kind="lib" path="libs/javacord-api-3.0.4.jar"/>
+	<classpathentry kind="lib" path="libs/json-20190722.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

2006Redone Server/.gitignore

@@ -0,0 +1 @@
+/bin/

2006Redone Server/.settings/org.eclipse.jdt.core.prefs

@@ -1,14 +1,14 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+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.7
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

2006Redone Server/src/redone/game/content/skills/fletching/LogCuttingInterface.java

@@ -20,11 +20,10 @@ public class LogCuttingInterface {
 	}
 
 	public static void Interface(Client c, int item) {
-		if (c.playerIsFletching == true && item > 1510 && item < 1522) {
+		if (c.playerIsFletching == true && (item > 1510 && item < 1522)) {
-			c.getActionSender().sendMessage("You are already fletching!");
+			LogCutting.resetFletching(c);
-			c.getPlayerAssistant().closeAllWindows();
 			return;
-		} else if (item < 1510 && item > 1521) {
+		} else if (c.playerIsFletching == true && (item < 1510 || item > 1521)) {
 			c.playerIsFletching = false;
 			c.getActionSender().sendMessage("Nothing interesting happens.");
 		}

2006Redone Server/src/redone/game/content/skills/smithing/Smelting.java

@@ -6,6 +6,7 @@ import redone.event.CycleEventHandler;
 import redone.game.content.skills.SkillHandler;
 import redone.game.items.ItemAssistant;
 import redone.game.players.Client;
+import redone.util.Misc;
 
 /**
  * Made by
@@ -71,28 +72,14 @@ public class Smelting extends SkillHandler {
 	private static void smeltBar(final Client c, int bartype) {
 		for (int i = 0; i < data.length; i++) {
 			if (bartype == data[i][0]) {
-				if (c.playerLevel[c.playerSmithing] < data[i][1]) { // Smithing
+				if (c.playerLevel[c.playerSmithing] < data[i][1]) { // Smithing level
-																	// level
+					c.getDialogueHandler().sendStatement("You need a smithing level of at least "+ data[i][1] + " in order smelt this bar.");
-					c.getDialogueHandler().sendStatement(
-							"You need a smithing level of at least "
-									+ data[i][1] + " in order smelt this bar.");
 					return;
 				}
 
 				if (data[i][3] > 0 && data[i][4] > 0) { // All OTHER bars
-					if (!c.getItemAssistant().playerHasItem(data[i][3])
+					if (!c.getItemAssistant().playerHasItem(data[i][3]) || !c.getItemAssistant().playerHasItem(data[i][4])) {
-							|| !c.getItemAssistant().playerHasItem(data[i][4])) {
+						c.getActionSender().sendMessage("You need an " + ItemAssistant.getItemName(data[i][3]).toLowerCase() + " and " + data[i][5]	+ " " + ItemAssistant.getItemName(data[i][4]).toLowerCase() + " to make this bar.");
-						c.getActionSender().sendMessage(
-								"You need an "
-										+ ItemAssistant.getItemName(data[i][3])
-												.toLowerCase()
-										+ " and "
-										+ data[i][5]
-										+ " "
-										+ ItemAssistant.getItemName(data[i][4])
-												.toLowerCase()
-										+ " to make this bar.");
-
 						c.getPlayerAssistant().removeAllWindows();
 						return;
 					}
@@ -100,25 +87,15 @@ public class Smelting extends SkillHandler {
 
 				if (data[i][4] < 0) { // Iron bar, Gold & Silver requirements
 					if (!c.getItemAssistant().playerHasItem(data[i][3])) {
-						c.getActionSender().sendMessage(
+						c.getActionSender().sendMessage("You need an " + ItemAssistant.getItemName(data[i][3]).toLowerCase() + " to make this bar.");
-								"You need an "
-										+ ItemAssistant.getItemName(data[i][3])
-												.toLowerCase()
-										+ " to make this bar.");
 						c.getPlayerAssistant().removeAllWindows();
 						return;
 					}
 				}
 
 				if (data[i][5] > 0) { // Bars with more than 1 coal requirement
-					if (!c.getItemAssistant().playerHasItem(data[i][4],
+					if (!c.getItemAssistant().playerHasItem(data[i][4], data[i][5])) {
-							data[i][5])) {
+						c.getActionSender().sendMessage("You need an " + ItemAssistant.getItemName(data[i][3]).toLowerCase() + " and " + data[i][5] + " coal ores to make this bar.");
-						c.getActionSender().sendMessage(
-								"You need an "
-										+ ItemAssistant.getItemName(data[i][3])
-												.toLowerCase() + " and "
-										+ data[i][5]
-										+ " coal ores to make this bar.");
 						c.getPlayerAssistant().removeAllWindows();
 						return;
 					}
@@ -147,51 +124,41 @@ public class Smelting extends SkillHandler {
 					@Override
 					public void execute(CycleEventContainer container) {
 						deleteTime(c);
-						c.getItemAssistant().deleteItem(
+						c.getItemAssistant().deleteItem(c.playerSkillProp[13][3], 1);
-								c.playerSkillProp[13][3], 1);
 						if (c.playerSkillProp[13][5] == -1) {
-							c.getItemAssistant().deleteItem(
+							c.getItemAssistant().deleteItem(c.playerSkillProp[13][4], 1);
-									c.playerSkillProp[13][4], 1);
 						}
-						if (c.playerSkillProp[13][5] > 0) {// if coal amount is
+						if (c.playerSkillProp[13][5] > 0) {// if coal amount is > 0
-															// >0
+							c.getItemAssistant().deleteItem2(c.playerSkillProp[13][4], c.playerSkillProp[13][5]);
-							c.getItemAssistant().deleteItem2(
-									c.playerSkillProp[13][4],
-									c.playerSkillProp[13][5]);
 						}
 
-						c.getActionSender().sendMessage(
+						if (c.playerSkillProp[13][3] == IRON && c.playerSkillProp[13][4] == -1 && Misc.random(100) >= 50) {
-								"You receive an " // Message
+							c.getPlayerAssistant().addSkillXP(c.playerSkillProp[13][2], c.playerSmithing);
-										+ ItemAssistant.getItemName(
+							c.getItemAssistant().addItem(c.playerSkillProp[13][6], 1);// item
-												c.playerSkillProp[13][6])
+							c.getActionSender().sendMessage("You receive an " + ItemAssistant.getItemName(c.playerSkillProp[13][6]).toLowerCase() + ".");
-												.toLowerCase() + ".");
+						}
-						if (c.playerSkillProp[13][3] == GOLD
+
-								&& c.playerSkillProp[13][4] == -1
+						if (c.playerSkillProp[13][3] == GOLD && c.playerSkillProp[13][4] == -1 && c.playerEquipment[c.playerHands] == 776) {
-								&& c.playerEquipment[c.playerHands] == 776) {
+							c.getActionSender().sendMessage("You receive an " + ItemAssistant.getItemName(c.playerSkillProp[13][6]).toLowerCase() + ".");
-							c.getPlayerAssistant().addSkillXP(56.2,
+							c.getPlayerAssistant().addSkillXP(56.2,	c.playerSmithing);
-									c.playerSmithing);
+							c.getItemAssistant().addItem(c.playerSkillProp[13][6], 1);// item
-						} else {
+						} else {
-							c.getPlayerAssistant().addSkillXP(
+							if (c.playerSkillProp[13][3] != IRON) {
-									c.playerSkillProp[13][2], c.playerSmithing);
+								c.getActionSender().sendMessage("You receive an " + ItemAssistant.getItemName(c.playerSkillProp[13][6]).toLowerCase() + ".");
+								c.getPlayerAssistant().addSkillXP(c.playerSkillProp[13][2], c.playerSmithing);
+								c.getItemAssistant().addItem(c.playerSkillProp[13][6], 1);// item
+							}
 						}
-						c.getItemAssistant().addItem(c.playerSkillProp[13][6],
-								1);// item
 
 						// ///////////////////////////////CHECKING//////////////////////
-						if (!c.getItemAssistant().playerHasItem(
+						if (!c.getItemAssistant().playerHasItem(c.playerSkillProp[13][3], 1)) {
-								c.playerSkillProp[13][3], 1)) {
+							c.getActionSender().sendMessage("You don't have enough ores to continue smelting!");
-							c.getActionSender()
-									.sendMessage(
-											"You don't have enough ores to continue smelting!");
 							resetSmelting(c);
 							container.stop();
 						}
 						if (c.playerSkillProp[13][4] > 0) {
-							if (!c.getItemAssistant().playerHasItem(
+							if (!c.getItemAssistant().playerHasItem(c.playerSkillProp[13][4], 1)) {
-									c.playerSkillProp[13][4], 1)) {
+								c.getActionSender().sendMessage("You don't have enough ores to continue smelting!");
-								c.getActionSender()
-										.sendMessage(
-												"You don't have enough ores to continue smelting!");
 								resetSmelting(c);
 								container.stop();
 							}

2006Redone Server/src/redone/game/npcs/Npc.java

@@ -64,7 +64,7 @@ public class Npc {
     	updateRequired = true;
 	}
 	
-	public boolean requestTransformTime(Client player, int itemId, int animation, final int currentId, final int newId, int transformTime, int npcId) {
+	public boolean requestTransformTime(Client player, int itemId, int animation, final int currentId, final int newId, int transformTime, final int npcId) {
 		if (!player.getItemAssistant().playerHasItem(itemId)) {
 			player.getActionSender().sendMessage("You need " + ItemAssistant.getItemName(itemId).toLowerCase() + " to do that.");
 			return false;