Updated for 2.4.0

This commit is contained in:
KrewsOrg 2020-05-09 19:02:37 +01:00
parent 11a2788c9a
commit fcbb8d8937
31 changed files with 356 additions and 245 deletions

3
.idea/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
# Default ignored files
/shelf/
/workspace.xml

View File

@ -11,7 +11,7 @@
</profile> </profile>
</annotationProcessing> </annotationProcessing>
<bytecodeTargetLevel> <bytecodeTargetLevel>
<module name="Apollyon" target="7" /> <module name="Apollyon" target="8" />
<module name="arcturusplugin" target="7" /> <module name="arcturusplugin" target="7" />
</bytecodeTargetLevel> </bytecodeTargetLevel>
</component> </component>

20
.idea/jarRepositories.xml Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.maven.apache.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
</component>
</project>

View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.eu.habbo:Habbo:2.4.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/eu/habbo/Habbo/2.4.0/Habbo-2.4.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/eu/habbo/Habbo/2.4.0/Habbo-2.4.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/eu/habbo/Habbo/2.4.0/Habbo-2.4.0-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: io.netty:netty-all:4.1.36.Final">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.36.Final/netty-all-4.1.36.Final.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.36.Final/netty-all-4.1.36.Final-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-all/4.1.36.Final/netty-all-4.1.36.Final-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: io.netty:netty-buffer:4.1.36.Final">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-buffer/4.1.36.Final/netty-buffer-4.1.36.Final.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-buffer/4.1.36.Final/netty-buffer-4.1.36.Final-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-buffer/4.1.36.Final/netty-buffer-4.1.36.Final-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: io.netty:netty-codec:4.1.36.Final">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec/4.1.36.Final/netty-codec-4.1.36.Final.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec/4.1.36.Final/netty-codec-4.1.36.Final-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec/4.1.36.Final/netty-codec-4.1.36.Final-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: io.netty:netty-codec-http2:4.1.36.Final">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-http2/4.1.36.Final/netty-codec-http2-4.1.36.Final.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-http2/4.1.36.Final/netty-codec-http2-4.1.36.Final-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-http2/4.1.36.Final/netty-codec-http2-4.1.36.Final-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: io.netty:netty-codec-http:4.1.36.Final">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-http/4.1.36.Final/netty-codec-http-4.1.36.Final.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-http/4.1.36.Final/netty-codec-http-4.1.36.Final-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-codec-http/4.1.36.Final/netty-codec-http-4.1.36.Final-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: io.netty:netty-common:4.1.36.Final">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-common/4.1.36.Final/netty-common-4.1.36.Final.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-common/4.1.36.Final/netty-common-4.1.36.Final-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-common/4.1.36.Final/netty-common-4.1.36.Final-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: io.netty:netty-handler:4.1.36.Final">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler/4.1.36.Final/netty-handler-4.1.36.Final.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler/4.1.36.Final/netty-handler-4.1.36.Final-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-handler/4.1.36.Final/netty-handler-4.1.36.Final-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: io.netty:netty-resolver:4.1.36.Final">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-resolver/4.1.36.Final/netty-resolver-4.1.36.Final.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-resolver/4.1.36.Final/netty-resolver-4.1.36.Final-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-resolver/4.1.36.Final/netty-resolver-4.1.36.Final-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: io.netty:netty-transport:4.1.36.Final">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport/4.1.36.Final/netty-transport-4.1.36.Final.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport/4.1.36.Final/netty-transport-4.1.36.Final-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/io/netty/netty-transport/4.1.36.Final/netty-transport-4.1.36.Final-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.fusesource.jansi:jansi:1.18">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/fusesource/jansi/jansi/1.18/jansi-1.18.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/fusesource/jansi/jansi/1.18/jansi-1.18-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/fusesource/jansi/jansi/1.18/jansi-1.18-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -2,7 +2,7 @@
<project version="4"> <project version="4">
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/src/main/resources/Apollyon.iml" filepath="$PROJECT_DIR$/src/main/resources/Apollyon.iml" /> <module fileurl="file://$PROJECT_DIR$/Apollyon.iml" filepath="$PROJECT_DIR$/Apollyon.iml" />
<module fileurl="file://$PROJECT_DIR$/arcturusplugin.iml" filepath="$PROJECT_DIR$/arcturusplugin.iml" /> <module fileurl="file://$PROJECT_DIR$/arcturusplugin.iml" filepath="$PROJECT_DIR$/arcturusplugin.iml" />
</modules> </modules>
</component> </component>

View File

@ -3,7 +3,6 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="40f4a123-65e4-4814-a70d-6bfa6b8c64d9" name="Default Changelist" comment="" /> <list default="true" id="40f4a123-65e4-4814-a70d-6bfa6b8c64d9" name="Default Changelist" comment="" />
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
<ignored path="$PROJECT_DIR$/src/main/resources/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -11,78 +10,27 @@
<option name="LAST_RESOLUTION" value="IGNORE" /> <option name="LAST_RESOLUTION" value="IGNORE" />
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/pom.xml"> <entry file="file://$PROJECT_DIR$/src/main/java/org/krews/apollyon/Main.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357"> <state relative-caret-position="1336">
<caret line="21" selection-start-line="21" selection-end-line="21" /> <caret line="82" column="79" lean-forward="true" selection-start-line="82" selection-start-column="79" selection-end-line="82" selection-end-column="79" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/arcturusplugin.iml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/org/krews/apollyon/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="27" column="63" selection-start-line="27" selection-start-column="63" selection-end-line="27" selection-end-column="63" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/plugin.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="4" column="1" selection-start-line="4" selection-start-column="1" selection-end-line="4" selection-end-column="1" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/org/krews/apollyon/incoming/CameraPurchaseEvent.java"> <entry file="file://$PROJECT_DIR$/src/main/java/org/krews/apollyon/incoming/CameraPurchaseEvent.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="263"> <state relative-caret-position="170">
<caret line="19" column="74" selection-start-line="19" selection-start-column="74" selection-end-line="19" selection-end-column="144" /> <caret line="20" column="68" lean-forward="true" selection-start-line="20" selection-start-column="44" selection-end-line="20" selection-end-column="68" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="e#1015#1016#0" expanded="true" />
</folding> <element signature="e#1041#1042#0" expanded="true" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/org/krews/apollyon/incoming/CameraPublishToWebEvent.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="23" column="63" selection-start-line="23" selection-start-column="63" selection-end-line="23" selection-end-column="63" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/org/krews/apollyon/incoming/CameraRoomThumbnailEvent.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="765">
<caret line="55" column="83" selection-start-line="55" selection-start-column="83" selection-end-line="55" selection-end-column="83" />
<folding>
<element signature="imports" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -91,11 +39,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/org/krews/apollyon/incoming/CameraRoomPictureEvent.java"> <entry file="file://$PROJECT_DIR$/src/main/java/org/krews/apollyon/incoming/CameraRoomPictureEvent.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119"> <state relative-caret-position="85">
<caret line="18" column="26" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" /> <caret line="21" column="1" selection-start-line="21" selection-start-column="1" selection-end-line="21" selection-end-column="1" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -109,35 +54,15 @@
</list> </list>
</option> </option>
</component> </component>
<component name="FindInProjectRecents">
<findStrings>
<find>messageHandler.</find>
</findStrings>
<replaceStrings>
<replace>this.</replace>
</replaceStrings>
</component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$USER_HOME$" />
</component> </component>
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/src/main/java/WelcomePlugin.java" /> <option value="$PROJECT_DIR$/src/main/java/org/krews/apollyon/incoming/CameraRoomPictureEvent.java" />
<option value="$PROJECT_DIR$/src/krews/plugins/pngcamera/Main.java" /> <option value="$PROJECT_DIR$/src/main/java/org/krews/apollyon/incoming/CameraPurchaseEvent.java" />
<option value="$PROJECT_DIR$/src/main/java/com/nextgenhabbo/plugin/ArcturusOverhaul.java" />
<option value="$PROJECT_DIR$/src/main/java/com/nextgenhabbo/plugin/Main.java" />
<option value="$PROJECT_DIR$/src/main/java/org/krews/plugin/Main.java" />
<option value="$PROJECT_DIR$/src/main/java/org/krews/pngcamera/incoming/CameraPurchaseEvent.java" />
<option value="$PROJECT_DIR$/src/main/java/org/krews/pngcamera/incoming/CameraThumbnailEvent.java" />
<option value="$PROJECT_DIR$/src/main/java/org/krews/pngcamera/incoming/CameraRoomThumbnailEvent.java" />
<option value="$PROJECT_DIR$/src/main/java/org/krews/pngcamera/incoming/CameraRoomPictureEvent.java" />
<option value="$PROJECT_DIR$/src/main/java/org/krews/pngcamera/Main.java" />
<option value="$PROJECT_DIR$/src/main/java/org/krews/pngcamera/incoming/CameraPublishToWebEvent.java" />
<option value="$PROJECT_DIR$/src/main/java/org/krews/prometheus/Main.java" />
<option value="$PROJECT_DIR$/src/main/resources/plugin.json" />
<option value="$PROJECT_DIR$/src/main/java/org/krews/apollyon/Main.java" /> <option value="$PROJECT_DIR$/src/main/java/org/krews/apollyon/Main.java" />
<option value="$PROJECT_DIR$/pom.xml" />
</list> </list>
</option> </option>
</component> </component>
@ -147,11 +72,6 @@
<option name="mavenHome" value="$PROJECT_DIR$/../NGH/apache-maven-3.6.0" /> <option name="mavenHome" value="$PROJECT_DIR$/../NGH/apache-maven-3.6.0" />
</MavenGeneralSettings> </MavenGeneralSettings>
</option> </option>
<option name="importingSettings">
<MavenImportingSettings>
<option name="importAutomatically" value="true" />
</MavenImportingSettings>
</option>
</component> </component>
<component name="MavenProjectNavigator"> <component name="MavenProjectNavigator">
<treeState> <treeState>
@ -169,47 +89,48 @@
<select /> <select />
</treeState> </treeState>
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="166" /> <option name="x" value="-1928" />
<option name="y" value="297" /> <option name="y" value="-8" />
<option name="width" value="1681" /> <option name="width" value="1936" />
<option name="height" value="1045" /> <option name="height" value="1056" />
</component> </component>
<component name="ProjectId" id="1bSlJ53zFGy6f3znvumfNCiefOd" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" /> <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView"> <component name="ProjectView">
<navigator proportions="" version="1"> <navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="PackagesPane" /> <pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
<path> <path>
<item name="arcturusplugin" type="b2602c69:ProjectViewProjectNode" /> <item name="arcturusplugin" type="b2602c69:ProjectViewProjectNode" />
<item name="PNGCameraMorningStar" type="462c0819:PsiDirectoryNode" /> <item name="apollyon-master2" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="arcturusplugin" type="b2602c69:ProjectViewProjectNode" /> <item name="arcturusplugin" type="b2602c69:ProjectViewProjectNode" />
<item name="PNGCameraMorningStar" type="462c0819:PsiDirectoryNode" /> <item name="apollyon-master2" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="arcturusplugin" type="b2602c69:ProjectViewProjectNode" /> <item name="arcturusplugin" type="b2602c69:ProjectViewProjectNode" />
<item name="PNGCameraMorningStar" type="462c0819:PsiDirectoryNode" /> <item name="apollyon-master2" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" /> <item name="main" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="arcturusplugin" type="b2602c69:ProjectViewProjectNode" /> <item name="arcturusplugin" type="b2602c69:ProjectViewProjectNode" />
<item name="PNGCameraMorningStar" type="462c0819:PsiDirectoryNode" /> <item name="apollyon-master2" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" /> <item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" /> <item name="java" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="arcturusplugin" type="b2602c69:ProjectViewProjectNode" /> <item name="arcturusplugin" type="b2602c69:ProjectViewProjectNode" />
<item name="PNGCameraMorningStar" type="462c0819:PsiDirectoryNode" /> <item name="apollyon-master2" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" /> <item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" /> <item name="java" type="462c0819:PsiDirectoryNode" />
@ -217,7 +138,7 @@
</path> </path>
<path> <path>
<item name="arcturusplugin" type="b2602c69:ProjectViewProjectNode" /> <item name="arcturusplugin" type="b2602c69:ProjectViewProjectNode" />
<item name="PNGCameraMorningStar" type="462c0819:PsiDirectoryNode" /> <item name="apollyon-master2" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" /> <item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" /> <item name="java" type="462c0819:PsiDirectoryNode" />
@ -226,7 +147,7 @@
</path> </path>
<path> <path>
<item name="arcturusplugin" type="b2602c69:ProjectViewProjectNode" /> <item name="arcturusplugin" type="b2602c69:ProjectViewProjectNode" />
<item name="PNGCameraMorningStar" type="462c0819:PsiDirectoryNode" /> <item name="apollyon-master2" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" /> <item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" /> <item name="java" type="462c0819:PsiDirectoryNode" />
@ -236,7 +157,7 @@
</path> </path>
<path> <path>
<item name="arcturusplugin" type="b2602c69:ProjectViewProjectNode" /> <item name="arcturusplugin" type="b2602c69:ProjectViewProjectNode" />
<item name="PNGCameraMorningStar" type="462c0819:PsiDirectoryNode" /> <item name="apollyon-master2" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" /> <item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" /> <item name="java" type="462c0819:PsiDirectoryNode" />
@ -247,25 +168,22 @@
</path> </path>
<path> <path>
<item name="arcturusplugin" type="b2602c69:ProjectViewProjectNode" /> <item name="arcturusplugin" type="b2602c69:ProjectViewProjectNode" />
<item name="PNGCameraMorningStar" type="462c0819:PsiDirectoryNode" /> <item name="apollyon-master2" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="target" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="arcturusplugin" type="b2602c69:ProjectViewProjectNode" />
<item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
</path> </path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" /> <pane id="PackagesPane" />
</panes> </panes>
</component> </component>
<component name="ProjectViewState">
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560270007270" /> <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560270007270" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/pom.xml" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="settings.editor.selected.configurable" value="reference.settings.project.maven.importing" /> <property name="settings.editor.selected.configurable" value="reference.settings.project.maven.importing" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
@ -304,58 +222,61 @@
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> <frame x="-1928" y="-8" width="1936" height="1056" extended-state="7" />
<editor active="true" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2468017" /> <window_info id="Favorites" side_tool="true" />
<window_info id="Image Layers" />
<window_info id="Designer" />
<window_info id="UI Designer" />
<window_info id="Capture Tool" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Designer" order="2" /> <window_info anchor="bottom" id="Version Control" />
<window_info id="Image Layers" order="3" />
<window_info id="Capture Tool" order="4" />
<window_info id="UI Designer" order="5" />
<window_info id="Favorites" order="6" side_tool="true" />
<window_info anchor="bottom" id="JProfiler" /> <window_info anchor="bottom" id="JProfiler" />
<window_info anchor="bottom" id="Terminal" />
<window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32936078" /> <window_info anchor="bottom" id="Find" order="1" />
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.5200433" /> <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.32936078" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Terminal" order="7" /> <window_info anchor="right" id="Palette" />
<window_info anchor="bottom" id="Event Log" order="8" side_tool="true" /> <window_info anchor="right" id="Theme Preview" />
<window_info anchor="bottom" id="Version Control" order="9" /> <window_info anchor="right" id="Maven" visible="true" weight="0.32995737" />
<window_info anchor="right" id="Capture Analysis" />
<window_info anchor="right" id="Palette&#9;" />
<window_info anchor="right" id="Maven-2 Build" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Palette" order="3" />
<window_info anchor="right" id="Maven-2 Build" order="4" weight="0.32995737" />
<window_info anchor="right" id="Maven" order="5" visible="true" weight="0.31023455" />
<window_info anchor="right" id="Theme Preview" order="6" />
<window_info anchor="right" id="Palette&#9;" order="7" />
<window_info anchor="right" id="Capture Analysis" order="8" />
</layout> </layout>
</component> </component>
<component name="editorHistoryManager"> <component name="WindowStateProjectService">
<entry file="file://$PROJECT_DIR$/src/krews/plugins/pngcamera/Main.java" /> <state width="1877" height="2" key="GridCell.Tab.0.bottom" timestamp="1588649880026">
<entry file="file://$PROJECT_DIR$/src/main/java/com/nextgenhabbo/plugin/prefix/Prefix.java" /> <screen x="0" y="0" width="1920" height="1040" />
<entry file="file://$PROJECT_DIR$/src/plugin.json" />
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/krews/apollyon/incoming/CameraPublishToWebEvent.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="23" column="63" selection-start-line="23" selection-start-column="63" selection-end-line="23" selection-end-column="63" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> <state width="1877" height="2" key="GridCell.Tab.0.bottom/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1588649880026" />
</entry> <state width="1877" height="2" key="GridCell.Tab.0.center" timestamp="1588649880026">
<entry file="file://$PROJECT_DIR$/src/main/java/org/krews/apollyon/incoming/CameraRoomThumbnailEvent.java"> <screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="2" key="GridCell.Tab.0.center/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1588649880026" />
<state width="1877" height="2" key="GridCell.Tab.0.left" timestamp="1588649880026">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="2" key="GridCell.Tab.0.left/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1588649880026" />
<state width="1877" height="2" key="GridCell.Tab.0.right" timestamp="1588649880026">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="2" key="GridCell.Tab.0.right/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1588649880026" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/org/krews/apollyon/Main.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="765"> <state relative-caret-position="1336">
<caret line="55" column="83" selection-start-line="55" selection-start-column="83" selection-end-line="55" selection-end-column="83" /> <caret line="82" column="79" lean-forward="true" selection-start-line="82" selection-start-column="79" selection-end-line="82" selection-end-column="79" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
@ -364,47 +285,18 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/krews/apollyon/incoming/CameraRoomPictureEvent.java"> <entry file="file://$PROJECT_DIR$/src/main/java/org/krews/apollyon/incoming/CameraRoomPictureEvent.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119"> <state relative-caret-position="85">
<caret line="18" column="26" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" /> <caret line="21" column="1" selection-start-line="21" selection-start-column="1" selection-end-line="21" selection-end-column="1" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/krews/apollyon/incoming/CameraPurchaseEvent.java"> <entry file="file://$PROJECT_DIR$/src/main/java/org/krews/apollyon/incoming/CameraPurchaseEvent.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="263"> <state relative-caret-position="170">
<caret line="19" column="74" selection-start-line="19" selection-start-column="74" selection-end-line="19" selection-end-column="144" /> <caret line="20" column="68" lean-forward="true" selection-start-line="20" selection-start-column="44" selection-end-line="20" selection-end-column="68" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="e#1015#1016#0" expanded="true" />
</folding> <element signature="e#1041#1042#0" expanded="true" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/arcturusplugin.iml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/plugin.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="4" column="1" selection-start-line="4" selection-start-column="1" selection-end-line="4" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<caret line="21" selection-start-line="21" selection-end-line="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/krews/apollyon/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="27" column="63" selection-start-line="27" selection-start-column="63" selection-end-line="27" selection-end-column="63" />
<folding>
<element signature="imports" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>

35
Apollyon.iml Normal file
View File

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: com.eu.habbo:Habbo:2.4.0" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-all:4.1.36.Final" level="project" />
<orderEntry type="library" name="Maven: org.fusesource.jansi:jansi:1.18" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.36.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.36.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.36.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.36.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.36.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.36.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-http2:4.1.36.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.36.Final" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.4" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:5.1.46" level="project" />
<orderEntry type="library" name="Maven: net.sf.trove4j:trove4j:3.0.3" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.1.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
<orderEntry type="library" name="Maven: org.jsoup:jsoup:1.11.3" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.25" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.9.9" level="project" />
</component>
</module>

View File

@ -24,7 +24,7 @@
<dependency> <dependency>
<groupId>com.eu.habbo</groupId> <groupId>com.eu.habbo</groupId>
<artifactId>Habbo</artifactId> <artifactId>Habbo</artifactId>
<version>1.16.0</version> <version>2.4.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

View File

@ -13,8 +13,12 @@ import org.krews.apollyon.incoming.CameraPublishToWebEvent;
import org.krews.apollyon.incoming.CameraPurchaseEvent; import org.krews.apollyon.incoming.CameraPurchaseEvent;
import org.krews.apollyon.incoming.CameraRoomPictureEvent; import org.krews.apollyon.incoming.CameraRoomPictureEvent;
import org.krews.apollyon.incoming.CameraRoomThumbnailEvent; import org.krews.apollyon.incoming.CameraRoomThumbnailEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.reflect.Field; import java.lang.reflect.Field;
/** /**
* Apollyon * Apollyon
* The Official Camera Plugin for Morningstar. Credits to John, Beny, Ovflowd, and Alejandro * The Official Camera Plugin for Morningstar. Credits to John, Beny, Ovflowd, and Alejandro
@ -22,7 +26,7 @@ import java.lang.reflect.Field;
*/ */
public class Main extends HabboPlugin implements EventListener { public class Main extends HabboPlugin implements EventListener {
private static final Logger LOGGER = LoggerFactory.getLogger(Emulator.class);
@Override @Override
public void onEnable() throws Exception { public void onEnable() throws Exception {
Emulator.getPluginManager().registerEvents(this, this); Emulator.getPluginManager().registerEvents(this, this);
@ -48,15 +52,14 @@ public class Main extends HabboPlugin implements EventListener {
incoming.remove(Incoming.CameraPublishToWebEvent, CameraPublishToWebEvent.class); incoming.remove(Incoming.CameraPublishToWebEvent, CameraPublishToWebEvent.class);
incoming.remove(Incoming.CameraPurchaseEvent, CameraPurchaseEvent.class); incoming.remove(Incoming.CameraPurchaseEvent, CameraPurchaseEvent.class);
incoming.remove(Incoming.CameraRoomThumbnailEvent, CameraRoomThumbnailEvent.class); incoming.remove(Incoming.CameraRoomThumbnailEvent, CameraRoomThumbnailEvent.class);
Emulator.getLogging().logStart("[Apollyon] Bye Bye.");
} }
@EventHandler @EventHandler
public void onEmulatorLoadedEvent(EmulatorLoadedEvent e) throws NoSuchFieldException, IllegalArgumentException, IllegalAccessException, Exception { public void onEmulatorLoadedEvent(EmulatorLoadedEvent e) throws NoSuchFieldException, IllegalArgumentException, IllegalAccessException, Exception {
// Adds missing sqls if they are not found. // Adds missing sqls if they are not found.
Emulator.getConfig().register("apollyon.cooldown.amount", "250");
Emulator.getConfig().register("ftp.enabled", "0"); Emulator.getConfig().register("ftp.enabled", "0");
Emulator.getConfig().register("ftp.user", "root"); Emulator.getConfig().register("ftp.user", "root");
Emulator.getConfig().register("ftp.password", "password123"); Emulator.getConfig().register("ftp.password", "password123");
@ -83,8 +86,7 @@ public class Main extends HabboPlugin implements EventListener {
packetManager.registerHandler(Incoming.CameraRoomThumbnailEvent, CameraRoomThumbnailEvent.class); packetManager.registerHandler(Incoming.CameraRoomThumbnailEvent, CameraRoomThumbnailEvent.class);
// Send the message to the Emulator that PNGCamera has started. // Send the message to the Emulator that PNGCamera has started.
Emulator.getLogging().logStart("[Apollyon] Apollyon Preview 1 has hijacked the Arcturus Camera packets, and is ready to use!!"); LOGGER.info("Official Plugin - Rawr. Apollyon Preview 2 has officially loaded!");
Emulator.getLogging().logStart("[Apollyon] Please ensure this plugin was downloaded from Krews.org and is the latest version.");
} }

View File

@ -43,11 +43,10 @@ public class CameraPublishToWebEvent extends MessageHandler
this.client.getHabbo().getHabboInfo().setWebPublishTimestamp(timestamp); this.client.getHabbo().getHabboInfo().setWebPublishTimestamp(timestamp);
this.client.getHabbo().givePixels(-Emulator.getConfig().getInt("camera.price.points.publish")); this.client.getHabbo().givePixels(-Emulator.getConfig().getInt("camera.price.points.publish"));
published = true; published = true;
} catch (SQLException throwables) {
throwables.printStackTrace();
} }
catch (SQLException e)
{
Emulator.getLogging().logSQLException(e);
}
} }
else { else {
return; return;

View File

@ -2,49 +2,64 @@ package org.krews.apollyon.incoming;
import com.eu.habbo.Emulator; import com.eu.habbo.Emulator;
import com.eu.habbo.habbohotel.achievements.AchievementManager; import com.eu.habbo.habbohotel.achievements.AchievementManager;
import com.eu.habbo.habbohotel.catalog.CatalogManager; import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.users.HabboItem;
import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.incoming.MessageHandler;
import com.eu.habbo.messages.outgoing.camera.CameraPurchaseSuccesfullComposer; import com.eu.habbo.messages.outgoing.camera.CameraPurchaseSuccesfullComposer;
import com.eu.habbo.messages.outgoing.catalog.AlertPurchaseFailedComposer;
import com.eu.habbo.messages.outgoing.catalog.NotEnoughPointsTypeComposer; import com.eu.habbo.messages.outgoing.catalog.NotEnoughPointsTypeComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.HotelWillCloseInMinutesComposer;
import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer; import com.eu.habbo.messages.outgoing.inventory.AddHabboItemComposer;
import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer;
import com.eu.habbo.threading.runnables.ShutdownEmulator; import com.eu.habbo.plugin.events.users.UserPurchasePictureEvent;
import gnu.trove.map.hash.THashMap;
public class CameraPurchaseEvent extends MessageHandler public class CameraPurchaseEvent extends MessageHandler {
{ public static int CAMERA_PURCHASE_CREDITS = 5;
public static int CAMERA_PURCHASE_POINTS = 5;
public static int CAMERA_PURCHASE_POINTS_TYPE = 0;
public THashMap<Habbo, Integer> lastRanTimestamps = new THashMap<Habbo, Integer>();
public int getRatelimit() {
return Emulator.getConfig().getInt("apollyon.cooldown.amount");
}
@Override @Override
public void handle() { public void handle() {
if (Emulator.getIntUnixTimestamp() - this.client.getHabbo().getHabboStats().lastPurchaseTimestamp >= CatalogManager.PURCHASE_COOLDOWN) {
this.client.getHabbo().getHabboStats().lastPurchaseTimestamp = Emulator.getIntUnixTimestamp();
if (ShutdownEmulator.timestamp > 0) { if (this.client.getHabbo().getHabboInfo().getCredits() < CameraPurchaseEvent.CAMERA_PURCHASE_CREDITS) {
this.client.sendResponse(new HotelWillCloseInMinutesComposer((ShutdownEmulator.timestamp - Emulator.getIntUnixTimestamp()) / 60)); this.client.sendResponse(new NotEnoughPointsTypeComposer(true, false, 0));
} else if (this.client.getHabbo().getHabboInfo().getCredits() < Emulator.getConfig().getInt("camera.price.credits") || this.client.getHabbo().getHabboInfo().getCurrencyAmount(0) < Emulator.getConfig().getInt("camera.price.points")) { return;
this.client.sendResponse(new NotEnoughPointsTypeComposer(this.client.getHabbo().getHabboInfo().getCredits() < Emulator.getConfig().getInt("camera.price.credits"), this.client.getHabbo().getHabboInfo().getCurrencyAmount(0) < Emulator.getConfig().getInt("camera.price.points"), 0)); }
} else if (this.client.getHabbo().getHabboInfo().getPhotoTimestamp() != 0) {
if (this.client.getHabbo().getHabboInfo().getCurrencyAmount(CameraPurchaseEvent.CAMERA_PURCHASE_POINTS_TYPE) < CameraPurchaseEvent.CAMERA_PURCHASE_POINTS) {
this.client.sendResponse(new NotEnoughPointsTypeComposer(false, true, CameraPurchaseEvent.CAMERA_PURCHASE_POINTS_TYPE));
return;
}
if (this.client.getHabbo().getHabboInfo().getPhotoTimestamp() == 0) return;
if (this.client.getHabbo().getHabboInfo().getPhotoJSON().isEmpty()) return;
if (!this.client.getHabbo().getHabboInfo().getPhotoJSON().contains(this.client.getHabbo().getHabboInfo().getPhotoTimestamp() + ""))
return;
if (Emulator.getPluginManager().fireEvent(new UserPurchasePictureEvent(this.client.getHabbo(), this.client.getHabbo().getHabboInfo().getPhotoURL(), this.client.getHabbo().getHabboInfo().getCurrentRoom().getId(), this.client.getHabbo().getHabboInfo().getPhotoTimestamp())).isCancelled()) {
return;
}
HabboItem photoItem = Emulator.getGameEnvironment().getItemManager().createItem(this.client.getHabbo().getHabboInfo().getId(), Emulator.getGameEnvironment().getItemManager().getItem(Emulator.getConfig().getInt("camera.item_id")), 0, 0, this.client.getHabbo().getHabboInfo().getPhotoJSON()); HabboItem photoItem = Emulator.getGameEnvironment().getItemManager().createItem(this.client.getHabbo().getHabboInfo().getId(), Emulator.getGameEnvironment().getItemManager().getItem(Emulator.getConfig().getInt("camera.item_id")), 0, 0, this.client.getHabbo().getHabboInfo().getPhotoJSON());
if (photoItem != null) { if (photoItem != null) {
photoItem.setExtradata(photoItem.getExtradata().replace("%id%", photoItem.getId() + "")); photoItem.setExtradata(photoItem.getExtradata().replace("%id%", photoItem.getId() + ""));
photoItem.needsUpdate(true); photoItem.needsUpdate(true);
this.client.getHabbo().getInventory().getItemsComponent().addItem(photoItem); this.client.getHabbo().getInventory().getItemsComponent().addItem(photoItem);
this.client.sendResponse(new CameraPurchaseSuccesfullComposer()); this.client.sendResponse(new CameraPurchaseSuccesfullComposer());
this.client.sendResponse(new AddHabboItemComposer(photoItem)); this.client.sendResponse(new AddHabboItemComposer(photoItem));
this.client.sendResponse(new InventoryRefreshComposer()); this.client.sendResponse(new InventoryRefreshComposer());
this.client.getHabbo().giveCredits(-CameraPurchaseEvent.CAMERA_PURCHASE_CREDITS);
this.client.getHabbo().giveCredits(-Emulator.getConfig().getInt("camera.price.credits")); this.client.getHabbo().givePoints(CameraPurchaseEvent.CAMERA_PURCHASE_POINTS_TYPE, -CameraPurchaseEvent.CAMERA_PURCHASE_POINTS);
this.client.getHabbo().givePixels(-Emulator.getConfig().getInt("camera.price.points"));
AchievementManager.progressAchievement(this.client.getHabbo(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("CameraPhotoCount")); AchievementManager.progressAchievement(this.client.getHabbo(), Emulator.getGameEnvironment().getAchievementManager().getAchievement("CameraPhotoCount"));
} }
} }
} }
else
{
this.client.sendResponse(new AlertPurchaseFailedComposer(AlertPurchaseFailedComposer.SERVER_ERROR).compose());
}
}
}

View File

@ -8,6 +8,7 @@ import com.eu.habbo.messages.outgoing.camera.CameraURLComposer;
import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer; import com.eu.habbo.messages.outgoing.generic.alerts.GenericAlertComposer;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufInputStream; import io.netty.buffer.ByteBufInputStream;
import javafx.scene.Camera;
import org.krews.apollyon.ftp.FTPUploadService; import org.krews.apollyon.ftp.FTPUploadService;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
@ -21,8 +22,6 @@ public class CameraRoomPictureEvent extends MessageHandler
{ {
@Override @Override
public void handle() { public void handle() {
if (Emulator.getIntUnixTimestamp() - this.client.getHabbo().getHabboStats().lastPurchaseTimestamp >= CatalogManager.PURCHASE_COOLDOWN) {
this.client.getHabbo().getHabboStats().lastPurchaseTimestamp = Emulator.getIntUnixTimestamp();
if (!this.client.getHabbo().hasPermission("acc_camera")) { if (!this.client.getHabbo().hasPermission("acc_camera")) {
this.client.sendResponse(new GenericAlertComposer(Emulator.getTexts().getValue("camera.permission"))); this.client.sendResponse(new GenericAlertComposer(Emulator.getTexts().getValue("camera.permission")));
return; return;
@ -53,6 +52,8 @@ public class CameraRoomPictureEvent extends MessageHandler
this.client.getHabbo().getHabboInfo().setPhotoTimestamp(timestamp); this.client.getHabbo().getHabboInfo().setPhotoTimestamp(timestamp);
this.client.getHabbo().getHabboInfo().setPhotoRoomId(room.getId()); this.client.getHabbo().getHabboInfo().setPhotoRoomId(room.getId());
this.client.getHabbo().getHabboInfo().setPhotoJSON(json); this.client.getHabbo().getHabboInfo().setPhotoJSON(json);
CameraPurchaseEvent lol = new CameraPurchaseEvent();
lol.lastRanTimestamps.put(this.client.getHabbo(), Emulator.getIntUnixTimestamp());
try { try {
if(Emulator.getConfig().getInt("ftp.enabled") == 1) { if(Emulator.getConfig().getInt("ftp.enabled") == 1) {
@ -76,4 +77,3 @@ public class CameraRoomPictureEvent extends MessageHandler
this.client.sendResponse(new CameraURLComposer(URL)); this.client.sendResponse(new CameraURLComposer(URL));
} }
} }
}

Binary file not shown.

View File

@ -1,4 +1,5 @@
org\krews\apollyon\Main.class org\krews\apollyon\Main.class
org\krews\apollyon\ftp\FTPUploadService.class
org\krews\apollyon\incoming\CameraPurchaseEvent.class org\krews\apollyon\incoming\CameraPurchaseEvent.class
org\krews\apollyon\incoming\CameraPublishToWebEvent.class org\krews\apollyon\incoming\CameraPublishToWebEvent.class
org\krews\apollyon\incoming\CameraRoomThumbnailEvent.class org\krews\apollyon\incoming\CameraRoomThumbnailEvent.class

View File

@ -1,5 +1,6 @@
C:\Users\John\Desktop\PNGCameraMorningStar\src\main\java\org\krews\pngcamera\incoming\CameraPurchaseEvent.java C:\Users\John\Desktop\apollyon-master2\src\main\java\org\krews\apollyon\Main.java
C:\Users\John\Desktop\PNGCameraMorningStar\src\main\java\org\krews\pngcamera\Main.java C:\Users\John\Desktop\apollyon-master2\src\main\java\org\krews\apollyon\ftp\FTPUploadService.java
C:\Users\John\Desktop\PNGCameraMorningStar\src\main\java\org\krews\pngcamera\incoming\CameraPublishToWebEvent.java C:\Users\John\Desktop\apollyon-master2\src\main\java\org\krews\apollyon\incoming\CameraRoomPictureEvent.java
C:\Users\John\Desktop\PNGCameraMorningStar\src\main\java\org\krews\pngcamera\incoming\CameraRoomThumbnailEvent.java C:\Users\John\Desktop\apollyon-master2\src\main\java\org\krews\apollyon\incoming\CameraRoomThumbnailEvent.java
C:\Users\John\Desktop\PNGCameraMorningStar\src\main\java\org\krews\pngcamera\incoming\CameraRoomPictureEvent.java C:\Users\John\Desktop\apollyon-master2\src\main\java\org\krews\apollyon\incoming\CameraPurchaseEvent.java
C:\Users\John\Desktop\apollyon-master2\src\main\java\org\krews\apollyon\incoming\CameraPublishToWebEvent.java