diff --git a/Server/src/main/java/Server/core/game/node/entity/skill/farming/ToolLeprechaunInterface.kt b/Server/src/main/java/Server/core/game/node/entity/skill/farming/ToolLeprechaunInterface.kt index 6e0018507..7ed725434 100644 --- a/Server/src/main/java/Server/core/game/node/entity/skill/farming/ToolLeprechaunInterface.kt +++ b/Server/src/main/java/Server/core/game/node/entity/skill/farming/ToolLeprechaunInterface.kt @@ -10,14 +10,15 @@ import core.game.node.item.Item import core.game.system.SystemLogger import core.plugin.Initializable import core.plugin.Plugin +import core.tools.Components import core.tools.Items private const val varp = 615 @Initializable class ToolLeprechaunInterface : ComponentPlugin() { override fun newInstance(arg: Any?): Plugin { - ComponentDefinition.put(125,this) - ComponentDefinition.put(126,this) + ComponentDefinition.put(Components.farming_tools_125,this) + ComponentDefinition.put(Components.farming_tools_side_126,this) return this } diff --git a/Tools/update-utils b/Tools/update-utils index 285f3c244..03700d8ea 100755 --- a/Tools/update-utils +++ b/Tools/update-utils @@ -9,7 +9,7 @@ if [[ $argcount -eq 0 ]]; then fi copy_configs () { - cd ~/IdeaProjects/2009scape/Server/data/configs + cd ~/IdeaProjects/rs09-remake/Server/data/configs rsync -v * scape2009@play.2009scape.org:configs/ cd .. scp ObjectParser.xml scape2009@play.2009scape.org:IdeaProjects/2009scape/Server/data/ @@ -17,34 +17,34 @@ copy_configs () { } build_jars () { - cp ~/IdeaProjects/2009scape/Server/src/main/java/Server/core/ServerConstants.kt ~/IdeaProjects/2009scape/Server/src/main/java/Server/core/ServerConstants.backup + cp ~/IdeaProjects/rs09-remake/Server/src/main/java/Server/core/ServerConstants.kt ~/IdeaProjects/rs09-remake/Server/src/main/java/Server/core/ServerConstants.backup - cp ~/IdeaProjects/2009scape/Client/src/main/kotlin/org/rs09/client/config/GameConfig.kt ~/IdeaProjects/2009scape/Client/src/main/kotlin/org/rs09/client/config/GameConfig.backup + cp ~/IdeaProjects/rs09-remake/Client/src/main/kotlin/org/rs09/client/config/GameConfig.kt ~/IdeaProjects/rs09-remake/Client/src/main/kotlin/org/rs09/client/config/GameConfig.backup - rsa_priv=`cat ~/IdeaProjects/2009scape/rsapriv | grep "private static final BigInteger RSA_EXPONENT = new BigInteger(" | sed 's/private static final BigInteger RSA_EXPONENT = new BigInteger(\"//' | sed 's/\")\;//'` - rsa_pub=`cat ~/IdeaProjects/2009scape/rsapriv | grep "private static final BigInteger RSA_MODULUS = new BigInteger(" | sed 's/private static final BigInteger RSA_MODULUS = new BigInteger(\"//' | sed 's/\")\;//'` + rsa_priv=`cat ~/IdeaProjects/rs09-remake/rsapriv | grep "private static final BigInteger RSA_EXPONENT = new BigInteger(" | sed 's/private static final BigInteger RSA_EXPONENT = new BigInteger(\"//' | sed 's/\")\;//'` + rsa_pub=`cat ~/IdeaProjects/rs09-remake/rsapriv | grep "private static final BigInteger RSA_MODULUS = new BigInteger(" | sed 's/private static final BigInteger RSA_MODULUS = new BigInteger(\"//' | sed 's/\")\;//'` - sed -i "s/var EXPONENT = BigInteger(\"[0-9]*\")/var EXPONENT = BigInteger(\"$rsa_priv\")/" ~/IdeaProjects/2009scape/Server/src/main/java/Server/core/ServerConstants.kt - sed -i "s/var MODULUS = BigInteger(\"[0-9]*\")/var MODULUS = BigInteger(\"$rsa_pub\")/" ~/IdeaProjects/2009scape/Server/src/main/java/Server/core/ServerConstants.kt + sed -i "s/var EXPONENT = BigInteger(\"[0-9]*\")/var EXPONENT = BigInteger(\"$rsa_priv\")/" ~/IdeaProjects/rs09-remake/Server/src/main/java/Server/core/ServerConstants.kt + sed -i "s/var MODULUS = BigInteger(\"[0-9]*\")/var MODULUS = BigInteger(\"$rsa_pub\")/" ~/IdeaProjects/rs09-remake/Server/src/main/java/Server/core/ServerConstants.kt - sed -i "s/var MODULUS = BigInteger(\"[0-9]*\")/var MODULUS = BigInteger(\"$rsa_pub\")/" ~/IdeaProjects/2009scape/Client/src/main/kotlin/org/rs09/client/config/GameConfig.kt + sed -i "s/var MODULUS = BigInteger(\"[0-9]*\")/var MODULUS = BigInteger(\"$rsa_pub\")/" ~/IdeaProjects/rs09-remake/Client/src/main/kotlin/org/rs09/client/config/GameConfig.kt - cd ~/IdeaProjects/2009scape/Client + cd ~/IdeaProjects/rs09-remake/Client gradle jar cd ../Server gradle jar - cp ~/IdeaProjects/2009scape/Server/src/main/java/Server/core/ServerConstants.backup ~/IdeaProjects/2009scape/Server/src/main/java/Server/core/ServerConstants.kt + cp ~/IdeaProjects/rs09-remake/Server/src/main/java/Server/core/ServerConstants.backup ~/IdeaProjects/rs09-remake/Server/src/main/java/Server/core/ServerConstants.kt - cp ~/IdeaProjects/2009scape/Client/src/main/kotlin/org/rs09/client/config/GameConfig.backup ~/IdeaProjects/2009scape/Client/src/main/kotlin/org/rs09/client/config/GameConfig.kt + cp ~/IdeaProjects/rs09-remake/Client/src/main/kotlin/org/rs09/client/config/GameConfig.backup ~/IdeaProjects/rs09-remake/Client/src/main/kotlin/org/rs09/client/config/GameConfig.kt - echo "Jars successfully built with RSA keys from ~/IdeaProjects/2009scape" + echo "Jars successfully built with RSA keys from ~/IdeaProjects/rs09-remake" } copy_jars() { - cd ~/IdeaProjects/2009scape/Client/build/libs - scp client-1.0.0.jar scape2009@play.2009scape.org:/opt/lampp/htdocs/2009scape.jar - cd ~/IdeaProjects/2009scape/Server/build/libs + cd ~/IdeaProjects/rs09-remake/Client/build/libs + scp client-1.0.0.jar scape2009@play.rs09-remake.org:/opt/lampp/htdocs/2009scape.jar + cd ~/IdeaProjects/rs09-remake/Server/build/libs scp server-1.0.0.jar scape2009@play.2009scape.org:server.jar echo "Jars successfully copied to remote server" }