From b09922ba2aa84369f47ddf4e61d69f652c52f6cb Mon Sep 17 00:00:00 2001 From: Quackster Date: Sun, 17 Nov 2024 21:50:48 +1000 Subject: [PATCH 1/2] Update AboutCommand.java --- .../alexdev/havana/game/commands/registered/AboutCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Havana-Server/src/main/java/org/alexdev/havana/game/commands/registered/AboutCommand.java b/Havana-Server/src/main/java/org/alexdev/havana/game/commands/registered/AboutCommand.java index 3086de1..c5a4f93 100644 --- a/Havana-Server/src/main/java/org/alexdev/havana/game/commands/registered/AboutCommand.java +++ b/Havana-Server/src/main/java/org/alexdev/havana/game/commands/registered/AboutCommand.java @@ -27,7 +27,7 @@ public class AboutCommand extends Command { "
" + "
Contributors:" + "
- ThuGie, Copyright, Raptosaur, Hoshiko, TOMYSSHADOW, Elijah " + // Call for help - "
Romuald, Glaceon, Nillus, Holo Team, Meth0d, office.boy, bbadzz" + + "
Romuald, Glaceon, Nillus, Jeppe, Meth0d, office.boy, bbadzz" + "
" + "
Big thanks to Sefhriloff & Ascii for assisting with SnowStorm." + "
" + From b3d6b9070759938baba2c934884ed15b866989a6 Mon Sep 17 00:00:00 2001 From: Quackster Date: Wed, 9 Apr 2025 19:26:03 +1000 Subject: [PATCH 2/2] Remove unused libraries --- Havana-Web/build.gradle | 12 ------------ .../alexdev/http/template/binders/SiteBinder.java | 3 +-- tools/scripts/run_web.bat | 3 +-- tools/scripts/run_web.sh | 2 +- 4 files changed, 3 insertions(+), 17 deletions(-) diff --git a/Havana-Web/build.gradle b/Havana-Web/build.gradle index 36e2030..be6b36d 100644 --- a/Havana-Web/build.gradle +++ b/Havana-Web/build.gradle @@ -17,9 +17,6 @@ repositories { } dependencies { - // https://mvnrepository.com/artifact/org.ini4j/ini4j - implementation group: 'org.ini4j', name: 'ini4j', version: '0.5.4' - // https://mvnrepository.com/artifact/io.pebbletemplates/pebble implementation group: 'io.pebbletemplates', name: 'pebble', version: '3.1.5' @@ -47,26 +44,17 @@ dependencies { // https://github.com/Quackster/duckHTTPD/ implementation name: 'duckHTTPD-all' - // jsoup HTML parser library @ https://jsoup.org/ - implementation 'org.jsoup:jsoup:1.13.1' - // https://github.com/Quackster/Kepler/Kepler-Server implementation project(':Havana-Server') // https://mvnrepository.com/artifact/org.slf4j/slf4j-log4j12 implementation group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.25' - // https://mvnrepository.com/artifact/com.tunyk.mvn.plugins.htmlcompressor/htmlcompressor-maven-plugin - implementation group: 'com.tunyk.mvn.plugins.htmlcompressor', name: 'htmlcompressor-maven-plugin', version: '1.3' - // https://mvnrepository.com/artifact/com.google.code.gson/gson implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.0' // https://mvnrepository.com/artifact/javax.mail/mail implementation group: 'javax.mail', name: 'mail', version: '1.4.7' - - implementation 'com.goterl:lazysodium-java:5.0.1' - implementation "net.java.dev.jna:jna:5.8.0" } task fatJar(type: Jar) { diff --git a/Havana-Web/src/main/java/org/alexdev/http/template/binders/SiteBinder.java b/Havana-Web/src/main/java/org/alexdev/http/template/binders/SiteBinder.java index 62bfaf9..8f8f8e0 100644 --- a/Havana-Web/src/main/java/org/alexdev/http/template/binders/SiteBinder.java +++ b/Havana-Web/src/main/java/org/alexdev/http/template/binders/SiteBinder.java @@ -7,7 +7,6 @@ import org.alexdev.http.Routes; import org.alexdev.http.server.Watchdog; import org.alexdev.havana.util.config.GameConfiguration; import org.alexdev.http.util.Captcha; -import org.codehaus.plexus.util.StringUtils; import java.text.NumberFormat; import java.util.Locale; @@ -61,7 +60,7 @@ public class SiteBinder implements TemplateBinder { this.furniImagerPath = "https://classichabbo.com/imager/furni"; this.emailStaticPath = GameConfiguration.getInstance().getString("email.static.content.path"); - this.emailHotelName = StringUtils.capitalise(GameConfiguration.getInstance().getString("site.path").replace("https://", "").replace("http://", "").replace("/", "")); + this.emailHotelName = GameConfiguration.getInstance().getString("site.path").replace("https://", "").replace("http://", "").replace("/", "").toUpperCase(); this.loaderGameIp = GameConfiguration.getInstance().getString("loader.game.ip"); this.loaderGamePort = GameConfiguration.getInstance().getString("loader.game.port"); diff --git a/tools/scripts/run_web.bat b/tools/scripts/run_web.bat index 0da006d..ca00898 100644 --- a/tools/scripts/run_web.bat +++ b/tools/scripts/run_web.bat @@ -1,8 +1,7 @@ @echo off title Havana Server - Habbo Hotel Emulation -set CLASSPATH=Havana-Web.jar;lib/ini4j-0.5.4.jar;lib/pebble-3.1.5.jar;lib/Havana-Server.jar;lib/HikariCP-3.4.1.jar;lib/mariadb-java-client-2.3.0.jar;lib/commons-configuration2-2.2.jar;lib/commons-text-1.5.jar;lib/htmlcompressor-maven-plugin-1.3.jar;lib/commons-io-2.5.jar;lib/velocity-tools-2.0.jar;lib/struts-taglib-1.3.8.jar;lib/struts-tiles-1.3.8.jar;lib/struts-core-1.3.8.jar;lib/commons-validator-1.6.jar;lib/geoip2-2.12.0.jar;lib/httpclient-4.5.5.jar;lib/duckHTTPD-all.jar;lib/jsoup-1.13.1.jar;lib/slf4j-log4j12-1.7.25.jar;lib/gson-2.8.0.jar;lib/mail-1.4.7.jar;lib/lazysodium-java-5.0.1.jar;lib/resource-loader-2.0.1.jar;lib/jna-5.8.0.jar;lib/unbescape-1.1.6.RELEASE.jar;lib/slf4j-api-1.7.30.jar;lib/commons-lang3-3.9.jar;lib/commons-chain-1.1.jar;lib/commons-digester-1.8.1.jar;lib/commons-beanutils-1.9.2.jar;lib/commons-logging-1.2.jar;lib/velocity-1.6.2.jar;lib/commons-collections-3.2.2.jar;lib/httpcore-4.4.9.jar;lib/commons-codec-1.10.jar;lib/netty-all-4.1.33.Final.jar;lib/log4j-1.2.17.jar;lib/commons-lang-2.6.jar;lib/spring-security-crypto-5.7.3.jar;lib/bcprov-jdk15on-1.70.jar;lib/chesslib-1.1.1.jar;lib/htmlcompressor-1.5.2.jar;lib/yuicompressor-2.4.6.jar;lib/jsp-api-2.1.jar;lib/json-20090211.jar;lib/maven-plugin-api-3.0.3.jar;lib/activation-1.1.jar;lib/maxmind-db-1.2.2.jar;lib/jackson-databind-2.9.5.jar;lib/jackson-core-2.9.5.jar;lib/jackson-annotations-2.9.5.jar;lib/js-1.6R7.jar;lib/dom4j-1.1.jar;lib/oro-2.0.8.jar;lib/sslext-1.2-0.jar;lib/maven-model-3.0.3.jar;lib/maven-artifact-3.0.3.jar;lib/sisu-inject-plexus-2.1.1.jar;lib/antlr-2.7.2.jar;lib/plexus-utils-2.0.6.jar;lib/plexus-component-annotations-1.5.5.jar;lib/plexus-classworlds-2.4.jar;lib/sisu-inject-bean-2.1.1.jar;lib/sisu-guice-2.9.4-no_aop.jar - +set CLASSPATH=Havana-Web.jar;lib/pebble-3.1.5.jar;lib/Havana-Server.jar;lib/HikariCP-3.4.1.jar;lib/mariadb-java-client-2.3.0.jar;lib/commons-configuration2-2.2.jar;lib/commons-text-1.5.jar;lib/commons-io-2.5.jar;lib/commons-validator-1.6.jar;lib/geoip2-2.12.0.jar;lib/httpclient-4.5.5.jar;lib/duckHTTPD-all.jar;lib/slf4j-log4j12-1.7.25.jar;lib/gson-2.8.0.jar;lib/mail-1.4.7.jar;lib/unbescape-1.1.6.RELEASE.jar;lib/slf4j-api-1.7.25.jar;lib/commons-lang3-3.9.jar;lib/commons-beanutils-1.9.2.jar;lib/commons-logging-1.2.jar;lib/commons-digester-1.8.1.jar;lib/commons-collections-3.2.2.jar;lib/httpcore-4.4.9.jar;lib/commons-codec-1.10.jar;lib/netty-all-4.1.33.Final.jar;lib/log4j-1.2.17.jar;lib/commons-lang-2.6.jar;lib/spring-security-crypto-5.7.3.jar;lib/bcprov-jdk15on-1.70.jar;lib/chesslib-1.1.1.jar;lib/activation-1.1.jar;lib/maxmind-db-1.2.2.jar;lib/jackson-databind-2.9.5.jar;lib/jackson-core-2.9.5.jar;lib/jackson-annotations-2.9.5.jar java -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses=true -classpath "%CLASSPATH%" org.alexdev.http.HavanaWeb pause \ No newline at end of file diff --git a/tools/scripts/run_web.sh b/tools/scripts/run_web.sh index 13f4a2b..bca1a93 100644 --- a/tools/scripts/run_web.sh +++ b/tools/scripts/run_web.sh @@ -1,5 +1,5 @@ #!/usr/bin/sh -CLASSPATH=Havana-Web.jar:lib/ini4j-0.5.4.jar:lib/pebble-3.1.5.jar:lib/Havana-Server.jar:lib/HikariCP-3.4.1.jar:lib/mariadb-java-client-2.3.0.jar:lib/commons-configuration2-2.2.jar:lib/commons-text-1.5.jar:lib/htmlcompressor-maven-plugin-1.3.jar:lib/commons-io-2.5.jar:lib/velocity-tools-2.0.jar:lib/struts-taglib-1.3.8.jar:lib/struts-tiles-1.3.8.jar:lib/struts-core-1.3.8.jar:lib/commons-validator-1.6.jar:lib/geoip2-2.12.0.jar:lib/httpclient-4.5.5.jar:lib/duckHTTPD-all.jar:lib/jsoup-1.13.1.jar:lib/slf4j-log4j12-1.7.25.jar:lib/gson-2.8.0.jar:lib/mail-1.4.7.jar:lib/lazysodium-java-5.0.1.jar:lib/resource-loader-2.0.1.jar:lib/jna-5.8.0.jar:lib/unbescape-1.1.6.RELEASE.jar:lib/slf4j-api-1.7.30.jar:lib/commons-lang3-3.9.jar:lib/commons-chain-1.1.jar:lib/commons-digester-1.8.1.jar:lib/commons-beanutils-1.9.2.jar:lib/commons-logging-1.2.jar:lib/velocity-1.6.2.jar:lib/commons-collections-3.2.2.jar:lib/httpcore-4.4.9.jar:lib/commons-codec-1.10.jar:lib/netty-all-4.1.33.Final.jar:lib/log4j-1.2.17.jar:lib/commons-lang-2.6.jar:lib/spring-security-crypto-5.7.3.jar:lib/bcprov-jdk15on-1.70.jar:lib/chesslib-1.1.1.jar:lib/htmlcompressor-1.5.2.jar:lib/yuicompressor-2.4.6.jar:lib/jsp-api-2.1.jar:lib/json-20090211.jar:lib/maven-plugin-api-3.0.3.jar:lib/activation-1.1.jar:lib/maxmind-db-1.2.2.jar:lib/jackson-databind-2.9.5.jar:lib/jackson-core-2.9.5.jar:lib/jackson-annotations-2.9.5.jar:lib/js-1.6R7.jar:lib/dom4j-1.1.jar:lib/oro-2.0.8.jar:lib/sslext-1.2-0.jar:lib/maven-model-3.0.3.jar:lib/maven-artifact-3.0.3.jar:lib/sisu-inject-plexus-2.1.1.jar:lib/antlr-2.7.2.jar:lib/plexus-utils-2.0.6.jar:lib/plexus-component-annotations-1.5.5.jar:lib/plexus-classworlds-2.4.jar:lib/sisu-inject-bean-2.1.1.jar:lib/sisu-guice-2.9.4-no_aop.jar +CLASSPATH=Havana-Web.jar;lib/pebble-3.1.5.jar;lib/Havana-Server.jar;lib/HikariCP-3.4.1.jar;lib/mariadb-java-client-2.3.0.jar;lib/commons-configuration2-2.2.jar;lib/commons-text-1.5.jar;lib/commons-io-2.5.jar;lib/commons-validator-1.6.jar;lib/geoip2-2.12.0.jar;lib/httpclient-4.5.5.jar;lib/duckHTTPD-all.jar;lib/slf4j-log4j12-1.7.25.jar;lib/gson-2.8.0.jar;lib/mail-1.4.7.jar;lib/unbescape-1.1.6.RELEASE.jar;lib/slf4j-api-1.7.25.jar;lib/commons-lang3-3.9.jar;lib/commons-beanutils-1.9.2.jar;lib/commons-logging-1.2.jar;lib/commons-digester-1.8.1.jar;lib/commons-collections-3.2.2.jar;lib/httpcore-4.4.9.jar;lib/commons-codec-1.10.jar;lib/netty-all-4.1.33.Final.jar;lib/log4j-1.2.17.jar;lib/commons-lang-2.6.jar;lib/spring-security-crypto-5.7.3.jar;lib/bcprov-jdk15on-1.70.jar;lib/chesslib-1.1.1.jar;lib/activation-1.1.jar;lib/maxmind-db-1.2.2.jar;lib/jackson-databind-2.9.5.jar;lib/jackson-core-2.9.5.jar;lib/jackson-annotations-2.9.5.jar java -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses=true -classpath $CLASSPATH org.alexdev.http.HavanaWeb