Merge remote-tracking branch 'upstream/master'

This commit is contained in:
RedSparr0w 2019-11-03 10:59:45 +13:00
commit e42054e76f
7360 changed files with 29356 additions and 79 deletions

1
.gitignore vendored
View file

@ -1,2 +1,3 @@
production/* production/*
.idea/* .idea/*
.idea/

19
.idea/$PRODUCT_WORKSPACE_FILE$ generated Normal file
View file

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="masterDetails">
<states>
<state key="ProjectJDKs.UI">
<settings>
<last-edited>1.7</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
</states>
</component>
</project>

66
.idea/09Scape.iml generated Normal file
View file

@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/09HDscape-management-server/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/09HDscape-server/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/Server/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/Management-Server/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/Client/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/Server" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/Client" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/Management-Server" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="file://$MODULE_DIR$/Management-Server/lib" />
</CLASSES>
<JAVADOC />
<SOURCES />
<jarDirectory url="file://$MODULE_DIR$/Management-Server/lib" recursive="false" />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="file://$MODULE_DIR$/Server/data/libs" />
</CLASSES>
<JAVADOC />
<SOURCES />
<jarDirectory url="file://$MODULE_DIR$/Server/data/libs" recursive="false" />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="file://$MODULE_DIR$/Client/lib" />
</CLASSES>
<JAVADOC />
<SOURCES />
<jarDirectory url="file://$MODULE_DIR$/Client/lib" recursive="false" />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/Client/lib/jogamp-all-platforms/jar/atomic/jogl.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/Client/clientlibs.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component>
</module>

6
.idea/misc.xml generated Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/CompiledServer" />
</component>
</project>

8
.idea/modules.xml generated Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/09Scape.iml" filepath="$PROJECT_DIR$/.idea/09Scape.iml" />
</modules>
</component>
</project>

124
.idea/uiDesigner.xml generated Normal file
View file

@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
</item>
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
<preferred-size width="-1" height="20" />
</default-constraints>
</item>
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
</item>
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
</group>
</component>
</project>

6
.idea/vcs.xml generated Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

675
.idea/workspace.xml generated Normal file
View file

@ -0,0 +1,675 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0dbfe935-8085-4dde-9815-06f8b3761458" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/09Scape/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/09Scape/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/09Scape/.settings/org.eclipse.jdt.core.prefs" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/09Scape/.settings/org.eclipse.jdt.core.prefs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/09Scape/data/eco/grand_exchange_db.emp" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/09Scape/data/eco/grand_exchange_db.emp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/09Scape/org/crandor/ServerConstants.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/09Scape/org/crandor/ServerConstants.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CompiledServer/production/09Scape/org/crandor/net/event/LoginReadEvent.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/09Scape/org/crandor/net/event/LoginReadEvent.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Server/data/eco/grand_exchange_db.emp" beforeDir="false" afterPath="$PROJECT_DIR$/Server/data/eco/grand_exchange_db.emp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Server/src/org/crandor/ServerConstants.java" beforeDir="false" afterPath="$PROJECT_DIR$/Server/src/org/crandor/ServerConstants.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Server/src/org/crandor/net/event/LoginReadEvent.java" beforeDir="false" afterPath="$PROJECT_DIR$/Server/src/org/crandor/net/event/LoginReadEvent.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Server/src/plugin/dialogue/PhantuwtiFantstuwiFarSight.java" beforeDir="false" afterPath="$PROJECT_DIR$/Server/src/plugin/dialogue/PhantuwtiFantstuwiFarSight.java" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="DefaultGradleProjectSettings">
<option name="isMigrated" value="true" />
</component>
<component name="FileEditorManager">
<leaf>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/info/PlayerDetails.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="561">
<caret line="385" column="19" selection-start-line="385" selection-start-column="19" selection-end-line="385" selection-end-column="19" />
<folding>
<element signature="e#6796#6797#0" expanded="true" />
<element signature="e#6819#6820#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/info/portal/PlayerSQLManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="329">
<caret line="91" selection-start-line="91" selection-end-line="91" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/plugin/tutorial/BasicStarter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527">
<caret line="31" column="70" selection-start-line="31" selection-start-column="70" selection-end-line="31" selection-end-column="70" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#591#592#0" expanded="true" />
<element signature="e#618#619#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/content/global/tutorial/TutorialSession.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="452">
<caret line="71" column="50" selection-start-line="71" selection-start-column="50" selection-end-line="71" selection-end-column="50" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/ServerConstants.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="422">
<caret line="57" column="7" lean-forward="true" selection-start-line="57" selection-start-column="7" selection-end-line="57" selection-end-column="7" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Server/src/plugin/dialogue/PhantuwtiFantstuwiFarSight.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540">
<caret line="85" column="22" selection-start-line="85" selection-start-column="22" selection-end-line="85" selection-end-column="22" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/link/TeleportManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="63" column="83" selection-start-line="63" selection-start-column="83" selection-end-line="63" selection-end-column="83" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/item/StarterPackPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="32" column="25" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="25" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/plugin/activity/guild/RangingGuildPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="40">
<caret line="30" column="14" selection-start-line="30" selection-start-column="14" selection-end-line="30" selection-end-column="14" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/player/LoginValidationPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="321">
<caret line="38" column="11" selection-start-line="38" selection-start-column="11" selection-end-line="38" selection-end-column="11" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Class" />
</list>
</option>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>tutorial</find>
<find>login</find>
<find>starter</find>
<find>setlastlogin</find>
<find>HOME</find>
<find>home teleport</find>
<find>mystical foresig</find>
</findStrings>
<dirStrings>
<dir>C:\Users\Michael\Desktop\rsps_trash\rs2009\Server\src\plugin\interaction\item</dir>
</dirStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/info/login/LoginConfiguration.java" />
<option value="$PROJECT_DIR$/Server/src/org/crandor/net/event/LoginReadEvent.java" />
<option value="$PROJECT_DIR$/Server/src/plugin/tutorial/BasicStarter.java" />
<option value="$PROJECT_DIR$/Server/src/org/crandor/ServerConstants.java" />
<option value="$PROJECT_DIR$/Server/src/plugin/dialogue/PhantuwtiFantstuwiFarSight.java" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-7" />
<option name="width" value="1294" />
<option name="height" value="1407" />
</component>
<component name="ProjectId" id="1SoCmFrlg0BRp0t2EAHW2CVwxLb" />
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="rs2009" type="b2602c69:ProjectViewProjectNode" />
<item name="rs2009" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="rs2009" type="b2602c69:ProjectViewProjectNode" />
<item name="rs2009" type="462c0819:PsiDirectoryNode" />
<item name="Server" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="rs2009" type="b2602c69:ProjectViewProjectNode" />
<item name="rs2009" type="462c0819:PsiDirectoryNode" />
<item name="Server" type="462c0819:PsiDirectoryNode" />
<item name="tutorial" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="Downloaded.Files.Path.Enabled" value="false" />
<property name="Repository.Attach.Annotations" value="false" />
<property name="Repository.Attach.JavaDocs" value="false" />
<property name="Repository.Attach.Sources" value="false" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="project.structure.last.edited" value="Project" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
<property name="restartRequiresConfirmation" value="false" />
<property name="settings.editor.selected.configurable" value="editing.templates" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="RunManager" selected="Application.Server">
<configuration name="GameLaunch" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="org.runite.GameLaunch" />
<module name="09Scape" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="org.runite.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="Management" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="org.keldagrim.Management" />
<module name="09Scape" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="org.keldagrim.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="Server" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="org.crandor.Server" />
<module name="09Scape" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Server" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="org.crandor.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<list>
<item itemvalue="Application.Management" />
<item itemvalue="Application.Server" />
<item itemvalue="Application.GameLaunch" />
</list>
<recent_temporary>
<list>
<item itemvalue="Application.Server" />
<item itemvalue="Application.GameLaunch" />
<item itemvalue="Application.Management" />
</list>
</recent_temporary>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="0dbfe935-8085-4dde-9815-06f8b3761458" name="Default Changelist" comment="" />
<created>1572220718424</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1572220718424</updated>
</task>
<servers />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="2576" height="1416" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Image Layers" />
<window_info id="Designer" />
<window_info id="UI Designer" />
<window_info id="Capture Tool" />
<window_info id="Favorites" side_tool="true" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18004769" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Version Control" weight="0.32969603" />
<window_info anchor="bottom" id="Terminal" weight="0.32969603" />
<window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="bottom" id="Messages" weight="0.32967034" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info active="true" anchor="bottom" id="Find" order="1" visible="true" weight="0.32969603" />
<window_info anchor="bottom" id="Run" order="2" weight="0.3289166" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.3998441" />
<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="TODO" order="6" />
<window_info anchor="right" id="Palette" />
<window_info anchor="right" id="Theme Preview" />
<window_info anchor="right" id="Maven" />
<window_info anchor="right" id="Capture Analysis" />
<window_info anchor="right" id="Palette&#9;" />
<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" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
</layout>
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State>
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
</option>
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
<collection />
</option>
<option name="COLUMN_ORDER" />
</State>
</value>
</entry>
</map>
</option>
<option name="RECENT_FILTERS">
<map>
<entry key="Branch">
<value>
<list />
</value>
</entry>
<entry key="User">
<value>
<list />
</value>
</entry>
</map>
</option>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/system/mysql/SQLManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/system/script/ScriptCompiler.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="302">
<caret line="86" column="37" lean-forward="true" selection-start-line="86" selection-start-column="37" selection-end-line="86" selection-end-column="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/Server.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="419">
<caret line="40" column="7" lean-forward="true" selection-start-line="40" selection-start-column="7" selection-end-line="40" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/content/global/travel/glider/Gliders.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-292">
<caret line="30" column="7" lean-forward="true" selection-start-line="30" selection-start-column="7" selection-end-line="30" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/content/global/travel/glider/GliderPulse.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="79">
<caret line="17" column="19" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/content/skill/free/cooking/CookingPulse.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="453">
<caret line="52" column="60" lean-forward="true" selection-start-line="52" selection-start-column="60" selection-end-line="52" selection-end-column="60" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/inter/LoginInterfacePlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<caret line="37" column="39" selection-start-line="37" selection-start-column="39" selection-end-line="37" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/state/StateManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-708">
<caret line="21" column="35" lean-forward="true" selection-start-line="21" selection-start-column="35" selection-end-line="21" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/info/login/LoginConfiguration.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="321">
<caret line="71" column="31" selection-start-line="71" selection-start-column="31" selection-end-line="71" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/plugin/tutorial/TutorialCompletionDialogue.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="44" column="26" selection-start-line="44" selection-start-column="26" selection-end-line="44" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/plugin/tutorial/TutorialIslandPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="46" column="65" lean-forward="true" selection-start-line="46" selection-start-column="65" selection-end-line="46" selection-end-column="65" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/Player.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="93" column="18" lean-forward="true" selection-start-line="93" selection-start-column="18" selection-end-line="93" selection-end-column="18" />
<folding>
<element signature="e#27874#27875#0" expanded="true" />
<element signature="e#27898#27899#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/net/event/LoginReadEvent.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2159">
<caret line="149" column="7" lean-forward="true" selection-start-line="149" selection-start-column="7" selection-end-line="149" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/tools/PlayerLoader.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="23" column="23" selection-start-line="23" selection-start-column="23" selection-end-line="23" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/tools/firewatch/Firewatch.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/plugin/tutorial/BrotherBraceDialogue.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="12" column="19" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/object/ShootingStarPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="142">
<caret line="228" column="41" selection-start-line="228" selection-start-column="41" selection-end-line="228" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/plugin/PluginManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="278">
<caret line="161" column="53" selection-start-line="161" selection-start-column="53" selection-end-line="161" selection-end-column="53" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/npc/DoomsayerTogglePlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="17" selection-start-line="17" selection-end-line="17" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/plugin/consumable/PotionPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="28" column="31" selection-start-line="28" selection-start-column="31" selection-end-line="28" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/plugin/InitializablePlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
<caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/plugin/activity/barrows/BarrowsActivityPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="40" selection-start-line="40" selection-end-line="40" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/plugin/activity/guild/RangingGuildPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="40">
<caret line="30" column="14" selection-start-line="30" selection-start-column="14" selection-end-line="30" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/item/StarterPackPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="32" column="25" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/info/portal/PlayerSQLManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="329">
<caret line="91" selection-start-line="91" selection-end-line="91" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/info/PlayerDetails.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="561">
<caret line="385" column="19" selection-start-line="385" selection-start-column="19" selection-end-line="385" selection-end-column="19" />
<folding>
<element signature="e#6796#6797#0" expanded="true" />
<element signature="e#6819#6820#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/player/LoginValidationPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="321">
<caret line="38" column="11" selection-start-line="38" selection-start-column="11" selection-end-line="38" selection-end-column="11" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/plugin/tutorial/BasicStarter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527">
<caret line="31" column="70" selection-start-line="31" selection-start-column="70" selection-end-line="31" selection-end-column="70" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#591#592#0" expanded="true" />
<element signature="e#618#619#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/content/global/tutorial/TutorialSession.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="452">
<caret line="71" column="50" selection-start-line="71" selection-start-column="50" selection-end-line="71" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/link/TeleportManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="63" column="83" selection-start-line="63" selection-start-column="83" selection-end-line="63" selection-end-column="83" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/org/crandor/ServerConstants.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="422">
<caret line="57" column="7" lean-forward="true" selection-start-line="57" selection-start-column="7" selection-end-line="57" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/plugin/dialogue/PhantuwtiFantstuwiFarSight.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540">
<caret line="85" column="22" selection-start-line="85" selection-start-column="22" selection-end-line="85" selection-end-column="22" />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
<state key="ArtifactsStructureConfigurable.UI">
<settings>
<artifact-editor />
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="FacetStructureConfigurable.UI">
<settings>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="GlobalLibrariesConfigurable.UI">
<settings>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="JdkListConfigurable.UI">
<settings>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ModuleStructureConfigurable.UI">
<settings>
<last-edited>09Scape</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ProjectLibrariesConfigurable.UI">
<settings>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
</states>
</component>
</project>

BIN
Client/lib/clientlibs.jar Normal file

Binary file not shown.

View file

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Before After
Before After

View file

@ -0,0 +1,50 @@
package org.runite;
import org.runite.jagex.GameShell;
/**
* Handles the launching of our Game Client.
* @author Keldagrim Development Team
*
*/
/*
NOTICE: THIS IS THE LIVESERVER CLIENT. For development purposes, use GameLaunch.java instead!!!
*/
public class Client {
/**
* The game settings.
*/
public static GameSetting SETTINGS = new GameSetting("2009Scape", "34.74.91.45", 1, "live", false, false);
/**
* The main method.
* @param args the arguments casted on runtime.
*/
public static void main(String[]args) {
for (int i = 0; i < args.length; i++) {
String[] cmd = args[i].split("=");
switch (cmd[0]) {
case "ip":
SETTINGS.setIp(cmd[1]);
break;
case "world":
SETTINGS.setWorld(Integer.parseInt(cmd[1]));
break;
}
}
launch(false);
}
/**
* Launches the client in a determined mode.
* @param swiftkit If we're launching swift kit.
*/
public static void launch(boolean swiftkit) {
GameShell.launchDesktop();
}
}

View file

@ -0,0 +1,44 @@
package org.runite;
import org.runite.jagex.GameShell;
/**
* Handles the launching of our Game Client.
* @author Keldagrim Development Team
*
*/
public class GameLaunch {
/**
* The game settings.
*/
public static GameSetting SETTINGS = new GameSetting("2009Scape", Configurations.LOCAL_SERVER ? "127.0.0.1" : "frostblades.org", 1, "live", false, false);
/**
* The main method.
* @param args the arguments casted on runtime.
*/
public static void main(String[]args) {
for (int i = 0; i < args.length; i++) {
String[] cmd = args[i].split("=");
switch (cmd[0]) {
case "ip":
SETTINGS.setIp(cmd[1]);
break;
case "world":
SETTINGS.setWorld(Integer.parseInt(cmd[1]));
break;
}
}
launch(false);
}
/**
* Launches the client in a determined mode.
* @param swiftkit If we're launching swift kit.
*/
public static void launch(boolean swiftkit) {
GameShell.launchDesktop();
}
}

View file

@ -1,6 +1,5 @@
package org.runite.jagex; package org.runite.jagex;
import javax.media.opengl.GL; import javax.media.opengl.GL;
import org.runite.GameLaunch; import org.runite.GameLaunch;
final class Class104 implements Interface5 { final class Class104 implements Interface5 {

View file

@ -1,4 +1,5 @@
package org.runite.jagex; package org.runite.jagex;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import javax.media.opengl.GL; import javax.media.opengl.GL;
@ -29,7 +30,7 @@ final class Class112 implements Interface5 {
} }
private final void method1701() { private final void method1701() {
GL var1 = HDToolKit.gl; javax.media.opengl.GL var1 = HDToolKit.gl;
this.anInt2177 = var1.glGenLists(2); this.anInt2177 = var1.glGenLists(2);
var1.glNewList(this.anInt2177, 4864); var1.glNewList(this.anInt2177, 4864);
var1.glTexEnvi(8960, '\u8590', 768); var1.glTexEnvi(8960, '\u8590', 768);
@ -97,7 +98,7 @@ final class Class112 implements Interface5 {
} }
public final void method23(int var1) { public final void method23(int var1) {
GL var2 = HDToolKit.gl; javax.media.opengl.GL var2 = HDToolKit.gl;
var2.glActiveTexture('\u84c1'); var2.glActiveTexture('\u84c1');
var2.glTexEnvfv(8960, 8705, Class151.aFloatArray1934, 0); var2.glTexEnvfv(8960, 8705, Class151.aFloatArray1934, 0);
var2.glActiveTexture('\u84c0'); var2.glActiveTexture('\u84c0');
@ -127,7 +128,7 @@ final class Class112 implements Interface5 {
} }
public final void method22() { public final void method22() {
GL var1 = HDToolKit.gl; javax.media.opengl.GL var1 = HDToolKit.gl;
HDToolKit.method1856(2); HDToolKit.method1856(2);
HDToolKit.method1847(2); HDToolKit.method1847(2);
HDToolKit.method1823(); HDToolKit.method1823();

View file

@ -1,4 +1,5 @@
package org.runite.jagex; package org.runite.jagex;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ByteOrder; import java.nio.ByteOrder;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
@ -30,7 +31,7 @@ final class Class125 implements Interface5 {
public final void method22() { public final void method22() {
if(this.anInt2186 >= 0) { if(this.anInt2186 >= 0) {
GL var1 = HDToolKit.gl; javax.media.opengl.GL var1 = HDToolKit.gl;
var1.glCallList(this.anInt2186); var1.glCallList(this.anInt2186);
var1.glActiveTexture('\u84c1'); var1.glActiveTexture('\u84c1');
var1.glMatrixMode(5890); var1.glMatrixMode(5890);
@ -66,7 +67,7 @@ final class Class125 implements Interface5 {
} }
private final void method1749() { private final void method1749() {
GL var1 = HDToolKit.gl; javax.media.opengl.GL var1 = HDToolKit.gl;
this.anInt2186 = var1.glGenLists(2); this.anInt2186 = var1.glGenLists(2);
var1.glNewList(this.anInt2186, 4864); var1.glNewList(this.anInt2186, 4864);
var1.glActiveTexture('\u84c1'); var1.glActiveTexture('\u84c1');
@ -99,7 +100,7 @@ final class Class125 implements Interface5 {
private final void method1750() { private final void method1750() {
if(this.anInt2186 >= 0) { if(this.anInt2186 >= 0) {
GL var1 = HDToolKit.gl; javax.media.opengl.GL var1 = HDToolKit.gl;
int[] var2 = new int[1]; int[] var2 = new int[1];
var1.glBindProgramARB('\u8620', this.anInt2184); var1.glBindProgramARB('\u8620', this.anInt2184);
var1.glProgramStringARB('\u8620', '\u8875', "!!ARBvp1.0\nATTRIB iPos = vertex.position;\nATTRIB iColour = vertex.color;\nOUTPUT oPos = result.position;\nOUTPUT oColour = result.color;\nOUTPUT oTexCoord0 = result.texcoord[0];\nOUTPUT oTexCoord1 = result.texcoord[1];\nOUTPUT oFogCoord = result.fogcoord;\nPARAM time = program.local[65];\nPARAM turbulence = program.local[64];\nPARAM lightAmbient = program.local[66]; \nPARAM pMatrix[4] = { state.matrix.projection };\nPARAM mvMatrix[4] = { state.matrix.modelview };\nPARAM ivMatrix[4] = { state.matrix.texture[1] };\nPARAM fNoise[64] = { program.local[0..63] };\nTEMP noise, clipPos, viewPos, worldPos;\nADDRESS noiseAddr;\nDP4 viewPos.x, mvMatrix[0], iPos;\nDP4 viewPos.y, mvMatrix[1], iPos;\nDP4 viewPos.z, mvMatrix[2], iPos;\nDP4 viewPos.w, mvMatrix[3], iPos;\nDP4 worldPos.x, ivMatrix[0], viewPos;\nDP4 worldPos.y, ivMatrix[1], viewPos;\nDP4 worldPos.z, ivMatrix[2], viewPos;\nDP4 worldPos.w, ivMatrix[3], viewPos;\nADD noise.x, worldPos.x, worldPos.z;SUB noise.y, worldPos.z, worldPos.x;MUL noise, noise, 0.0001220703125;\nFRC noise, noise;\nMUL noise, noise, 64;\nARL noiseAddr.x, noise.x;\nMOV noise.x, fNoise[noiseAddr.x].x;\nARL noiseAddr.x, noise.y;\nMOV noise.y, fNoise[noiseAddr.x].y;\nMUL noise, noise, turbulence.x;\nMAD oTexCoord0, worldPos.xzww, 0.0078125, noise;\nMOV oTexCoord0.w, 1;\nMUL oTexCoord1.xy, worldPos.xzww, 0.0009765625;\nMOV oTexCoord1.zw, time.xxxw;\nDP4 clipPos.x, pMatrix[0], viewPos;\nDP4 clipPos.y, pMatrix[1], viewPos;\nDP4 clipPos.z, pMatrix[2], viewPos;\nDP4 clipPos.w, pMatrix[3], viewPos;\nMUL oColour.xyz, iColour, lightAmbient;\nMOV oColour.w, 1;\nMOV oFogCoord.x, clipPos.z;\nMOV oPos, clipPos; \nEND".length(), "!!ARBvp1.0\nATTRIB iPos = vertex.position;\nATTRIB iColour = vertex.color;\nOUTPUT oPos = result.position;\nOUTPUT oColour = result.color;\nOUTPUT oTexCoord0 = result.texcoord[0];\nOUTPUT oTexCoord1 = result.texcoord[1];\nOUTPUT oFogCoord = result.fogcoord;\nPARAM time = program.local[65];\nPARAM turbulence = program.local[64];\nPARAM lightAmbient = program.local[66]; \nPARAM pMatrix[4] = { state.matrix.projection };\nPARAM mvMatrix[4] = { state.matrix.modelview };\nPARAM ivMatrix[4] = { state.matrix.texture[1] };\nPARAM fNoise[64] = { program.local[0..63] };\nTEMP noise, clipPos, viewPos, worldPos;\nADDRESS noiseAddr;\nDP4 viewPos.x, mvMatrix[0], iPos;\nDP4 viewPos.y, mvMatrix[1], iPos;\nDP4 viewPos.z, mvMatrix[2], iPos;\nDP4 viewPos.w, mvMatrix[3], iPos;\nDP4 worldPos.x, ivMatrix[0], viewPos;\nDP4 worldPos.y, ivMatrix[1], viewPos;\nDP4 worldPos.z, ivMatrix[2], viewPos;\nDP4 worldPos.w, ivMatrix[3], viewPos;\nADD noise.x, worldPos.x, worldPos.z;SUB noise.y, worldPos.z, worldPos.x;MUL noise, noise, 0.0001220703125;\nFRC noise, noise;\nMUL noise, noise, 64;\nARL noiseAddr.x, noise.x;\nMOV noise.x, fNoise[noiseAddr.x].x;\nARL noiseAddr.x, noise.y;\nMOV noise.y, fNoise[noiseAddr.x].y;\nMUL noise, noise, turbulence.x;\nMAD oTexCoord0, worldPos.xzww, 0.0078125, noise;\nMOV oTexCoord0.w, 1;\nMUL oTexCoord1.xy, worldPos.xzww, 0.0009765625;\nMOV oTexCoord1.zw, time.xxxw;\nDP4 clipPos.x, pMatrix[0], viewPos;\nDP4 clipPos.y, pMatrix[1], viewPos;\nDP4 clipPos.z, pMatrix[2], viewPos;\nDP4 clipPos.w, pMatrix[3], viewPos;\nMUL oColour.xyz, iColour, lightAmbient;\nMOV oColour.w, 1;\nMOV oFogCoord.x, clipPos.z;\nMOV oPos, clipPos; \nEND"); var1.glProgramStringARB('\u8620', '\u8875', "!!ARBvp1.0\nATTRIB iPos = vertex.position;\nATTRIB iColour = vertex.color;\nOUTPUT oPos = result.position;\nOUTPUT oColour = result.color;\nOUTPUT oTexCoord0 = result.texcoord[0];\nOUTPUT oTexCoord1 = result.texcoord[1];\nOUTPUT oFogCoord = result.fogcoord;\nPARAM time = program.local[65];\nPARAM turbulence = program.local[64];\nPARAM lightAmbient = program.local[66]; \nPARAM pMatrix[4] = { state.matrix.projection };\nPARAM mvMatrix[4] = { state.matrix.modelview };\nPARAM ivMatrix[4] = { state.matrix.texture[1] };\nPARAM fNoise[64] = { program.local[0..63] };\nTEMP noise, clipPos, viewPos, worldPos;\nADDRESS noiseAddr;\nDP4 viewPos.x, mvMatrix[0], iPos;\nDP4 viewPos.y, mvMatrix[1], iPos;\nDP4 viewPos.z, mvMatrix[2], iPos;\nDP4 viewPos.w, mvMatrix[3], iPos;\nDP4 worldPos.x, ivMatrix[0], viewPos;\nDP4 worldPos.y, ivMatrix[1], viewPos;\nDP4 worldPos.z, ivMatrix[2], viewPos;\nDP4 worldPos.w, ivMatrix[3], viewPos;\nADD noise.x, worldPos.x, worldPos.z;SUB noise.y, worldPos.z, worldPos.x;MUL noise, noise, 0.0001220703125;\nFRC noise, noise;\nMUL noise, noise, 64;\nARL noiseAddr.x, noise.x;\nMOV noise.x, fNoise[noiseAddr.x].x;\nARL noiseAddr.x, noise.y;\nMOV noise.y, fNoise[noiseAddr.x].y;\nMUL noise, noise, turbulence.x;\nMAD oTexCoord0, worldPos.xzww, 0.0078125, noise;\nMOV oTexCoord0.w, 1;\nMUL oTexCoord1.xy, worldPos.xzww, 0.0009765625;\nMOV oTexCoord1.zw, time.xxxw;\nDP4 clipPos.x, pMatrix[0], viewPos;\nDP4 clipPos.y, pMatrix[1], viewPos;\nDP4 clipPos.z, pMatrix[2], viewPos;\nDP4 clipPos.w, pMatrix[3], viewPos;\nMUL oColour.xyz, iColour, lightAmbient;\nMOV oColour.w, 1;\nMOV oFogCoord.x, clipPos.z;\nMOV oPos, clipPos; \nEND".length(), "!!ARBvp1.0\nATTRIB iPos = vertex.position;\nATTRIB iColour = vertex.color;\nOUTPUT oPos = result.position;\nOUTPUT oColour = result.color;\nOUTPUT oTexCoord0 = result.texcoord[0];\nOUTPUT oTexCoord1 = result.texcoord[1];\nOUTPUT oFogCoord = result.fogcoord;\nPARAM time = program.local[65];\nPARAM turbulence = program.local[64];\nPARAM lightAmbient = program.local[66]; \nPARAM pMatrix[4] = { state.matrix.projection };\nPARAM mvMatrix[4] = { state.matrix.modelview };\nPARAM ivMatrix[4] = { state.matrix.texture[1] };\nPARAM fNoise[64] = { program.local[0..63] };\nTEMP noise, clipPos, viewPos, worldPos;\nADDRESS noiseAddr;\nDP4 viewPos.x, mvMatrix[0], iPos;\nDP4 viewPos.y, mvMatrix[1], iPos;\nDP4 viewPos.z, mvMatrix[2], iPos;\nDP4 viewPos.w, mvMatrix[3], iPos;\nDP4 worldPos.x, ivMatrix[0], viewPos;\nDP4 worldPos.y, ivMatrix[1], viewPos;\nDP4 worldPos.z, ivMatrix[2], viewPos;\nDP4 worldPos.w, ivMatrix[3], viewPos;\nADD noise.x, worldPos.x, worldPos.z;SUB noise.y, worldPos.z, worldPos.x;MUL noise, noise, 0.0001220703125;\nFRC noise, noise;\nMUL noise, noise, 64;\nARL noiseAddr.x, noise.x;\nMOV noise.x, fNoise[noiseAddr.x].x;\nARL noiseAddr.x, noise.y;\nMOV noise.y, fNoise[noiseAddr.x].y;\nMUL noise, noise, turbulence.x;\nMAD oTexCoord0, worldPos.xzww, 0.0078125, noise;\nMOV oTexCoord0.w, 1;\nMUL oTexCoord1.xy, worldPos.xzww, 0.0009765625;\nMOV oTexCoord1.zw, time.xxxw;\nDP4 clipPos.x, pMatrix[0], viewPos;\nDP4 clipPos.y, pMatrix[1], viewPos;\nDP4 clipPos.z, pMatrix[2], viewPos;\nDP4 clipPos.w, pMatrix[3], viewPos;\nMUL oColour.xyz, iColour, lightAmbient;\nMOV oColour.w, 1;\nMOV oFogCoord.x, clipPos.z;\nMOV oPos, clipPos; \nEND");
@ -113,7 +114,7 @@ final class Class125 implements Interface5 {
public final void method23(int var1) { public final void method23(int var1) {
if(this.anInt2186 >= 0) { if(this.anInt2186 >= 0) {
GL var2 = HDToolKit.gl; javax.media.opengl.GL var2 = HDToolKit.gl;
var2.glActiveTexture('\u84c1'); var2.glActiveTexture('\u84c1');
if((var1 & 128) == 0) { if((var1 & 128) == 0) {
var2.glEnable(Class88.aBoolean1227?'\u806f':3553); var2.glEnable(Class88.aBoolean1227?'\u806f':3553);
@ -145,7 +146,7 @@ final class Class125 implements Interface5 {
if(this.anInt2186 < 0) { if(this.anInt2186 < 0) {
if(HDToolKit.aBoolean1818 && HDToolKit.anInt1789 >= 2) { if(HDToolKit.aBoolean1818 && HDToolKit.anInt1789 >= 2) {
int[] var1 = new int[1]; int[] var1 = new int[1];
GL var2 = HDToolKit.gl; javax.media.opengl.GL var2 = HDToolKit.gl;
var2.glGenProgramsARB(1, var1, 0); var2.glGenProgramsARB(1, var1, 0);
this.anInt2184 = var1[0]; this.anInt2184 = var1[0];
int[][] var3 = Class15.method895(false, 3, 64, 256, 0, 4, 8, 0.4F, (byte)-73); int[][] var3 = Class15.method895(false, 3, 64, 256, 0, 4, 8, 0.4F, (byte)-73);

View file

@ -1,4 +1,5 @@
package org.runite.jagex; package org.runite.jagex;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import javax.media.opengl.GL; import javax.media.opengl.GL;
@ -564,7 +565,7 @@ final class Class140_Sub1_Sub1 extends Model {
final void method1893(int var1, int var2, int var3, int var4, int var5, int var6, int var7, long var8) { final void method1893(int var1, int var2, int var3, int var4, int var5, int var6, int var7, long var8) {
if(this.anInt3833 != 0) { if(this.anInt3833 != 0) {
GL var10 = HDToolKit.gl; javax.media.opengl.GL var10 = HDToolKit.gl;
var10.glPushMatrix(); var10.glPushMatrix();
if(var4 != 0) { if(var4 != 0) {
var10.glRotatef((float)var4 * 0.17578125F, 1.0F, 0.0F, 0.0F); var10.glRotatef((float)var4 * 0.17578125F, 1.0F, 0.0F, 0.0F);
@ -2882,7 +2883,7 @@ final class Class140_Sub1_Sub1 extends Model {
} }
private final void method1930() { private final void method1930() {
GL var1 = HDToolKit.gl; javax.media.opengl.GL var1 = HDToolKit.gl;
if(this.anInt3852 != 0) { if(this.anInt3852 != 0) {
if(this.aByte3836 != 0) { if(this.aByte3836 != 0) {
this.method1922(true, !this.aClass121_3839.aBoolean1640 && (this.aByte3836 & 1) != 0, !this.aClass121_3814.aBoolean1640 && (this.aByte3836 & 2) != 0, this.aClass121_3815 != null && !this.aClass121_3815.aBoolean1640 && (this.aByte3836 & 4) != 0, false); this.method1922(true, !this.aClass121_3839.aBoolean1640 && (this.aByte3836 & 1) != 0, !this.aClass121_3814.aBoolean1640 && (this.aByte3836 & 2) != 0, this.aClass121_3815 != null && !this.aClass121_3815.aBoolean1640 && (this.aByte3836 & 4) != 0, false);

View file

@ -1,4 +1,5 @@
package org.runite.jagex; package org.runite.jagex;
import javax.media.opengl.GL; import javax.media.opengl.GL;
final class Class141 { final class Class141 {

Some files were not shown because too many files have changed in this diff Show more