TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-11 11:40:40 +00:00
Code Issues Projects Releases Wiki Activity

Made the following abilities usable with the API

Browse source 
For each of these abilities I've added a way to get every instance's
location, allowing developers such as myself to create counter attacks
and blocks, etc. I've used and tested this with IceWall and it works
perfectly.
This commit is contained in:
Brendan Wilson 2015-01-31 14:50:17 -05:00
parent e8c892ab67
commit f0dbfb1f71
7 changed files with 797 additions and 774 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

247
.idea/workspace.xml
View file

@ -7,24 +7,13 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="de7eef3a-d60d-459a-96cd-8b7bc4339783" name="Default" comment=""> <list default="true" id="de7eef3a-d60d-459a-96cd-8b7bc4339783" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Dev Builds/Korra.jar" afterPath="$PROJECT_DIR$/Dev Builds/Korra.jar" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/earthbending/EarthSmash.java" afterPath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/earthbending/EarthSmash.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.classpath" afterPath="$PROJECT_DIR$/.classpath" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/firebending/FireBlast.java" afterPath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/firebending/FireBlast.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/Ability/AbilityModuleManager.java" afterPath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/Ability/AbilityModuleManager.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/firebending/Fireball.java" afterPath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/firebending/Fireball.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/airbending/AirBlast.java" afterPath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/airbending/AirBlast.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/waterbending/IceBlast.java" afterPath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/waterbending/IceBlast.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/Commands.java" afterPath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/Commands.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/ConfigManager.java" afterPath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/ConfigManager.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/DBConnection.java" afterPath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/DBConnection.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/firebending/FireBurst.java" afterPath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/firebending/FireBurst.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/firebending/FireStream.java" afterPath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/firebending/FireStream.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/firebending/Lightning.java" afterPath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/firebending/Lightning.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/firebending/Lightning.java" afterPath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/firebending/Lightning.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/Methods.java" afterPath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/Methods.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/waterbending/Torrent.java" afterPath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/waterbending/Torrent.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/Storage/MySQL.java" afterPath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/Storage/MySQL.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/waterbending/OctopusForm.java" afterPath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/waterbending/OctopusForm.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/ProjectKorra.java" afterPath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/ProjectKorra.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/Storage/SQLite.java" afterPath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/Storage/SQLite.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/TagAPIListener.java" afterPath="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/TagAPIListener.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/config.yml" afterPath="$PROJECT_DIR$/src/config.yml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/plugin.yml" afterPath="$PROJECT_DIR$/src/plugin.yml" />
</list> </list>
<ignored path="ProjectKorra.iws" /> <ignored path="ProjectKorra.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
@ -50,54 +39,6 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file leaf-file-name="Torrent.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/waterbending/Torrent.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="629" max-vertical-offset="10931">
<caret line="59" column="69" selection-start-line="59" selection-start-column="69" selection-end-line="59" selection-end-column="69" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#768#785#0" expanded="true" />
<element signature="e#878#897#0" expanded="true" />
<element signature="e#2115#2126#0" expanded="true" />
<element signature="e#2187#2198#0" expanded="true" />
<element signature="e#2257#2265#0" expanded="true" />
<element signature="e#7361#7368#0" expanded="true" />
<element signature="e#8651#8662#0" expanded="true" />
<element signature="e#8805#8813#0" expanded="true" />
<element signature="e#11373#11380#0" expanded="true" />
<element signature="e#11506#11514#0" expanded="true" />
<element signature="e#12672#12673#0" expanded="true" />
<element signature="e#12723#12724#0" expanded="true" />
<element signature="e#17910#17911#0" expanded="true" />
<element signature="e#17930#17931#0" expanded="true" />
<element signature="e#17957#17958#0" expanded="true" />
<element signature="e#17977#17978#0" expanded="true" />
<element signature="e#18015#18016#0" expanded="true" />
<element signature="e#18042#18043#0" expanded="true" />
<element signature="e#18076#18077#0" expanded="true" />
<element signature="e#18103#18104#0" expanded="true" />
<element signature="e#18155#18156#0" expanded="true" />
<element signature="e#18196#18197#0" expanded="true" />
<element signature="e#18225#18226#0" expanded="true" />
<element signature="e#18244#18245#0" expanded="true" />
<element signature="e#18283#18284#0" expanded="true" />
<element signature="e#18308#18309#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="FireBlast.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/firebending/FireBlast.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="51" max-vertical-offset="5100">
<caret line="53" column="35" selection-start-line="53" selection-start-column="35" selection-end-line="53" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="plugin.yml" pinned="false" current-in-tab="false"> <file leaf-file-name="plugin.yml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/plugin.yml"> <entry file="file://$PROJECT_DIR$/src/plugin.yml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
@ -108,11 +49,31 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Methods.java" pinned="false" current-in-tab="true"> <file leaf-file-name="EarthSmash.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/earthbending/EarthSmash.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="391" max-vertical-offset="11339">
<caret line="71" column="47" selection-start-line="71" selection-start-column="47" selection-end-line="71" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Methods.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/Methods.java"> <entry file="file://$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/Methods.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.17237009" vertical-offset="0" max-vertical-offset="43367"> <state vertical-scroll-proportion="-5.586207" vertical-offset="15784" max-vertical-offset="43367">
<caret line="149" column="4" selection-start-line="149" selection-start-column="4" selection-end-line="149" selection-end-column="4" /> <caret line="1091" column="42" selection-start-line="1091" selection-start-column="28" selection-end-line="1091" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Lightning.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/firebending/Lightning.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.23954372" vertical-offset="4367" max-vertical-offset="9129">
<caret line="290" column="15" selection-start-line="290" selection-start-column="15" selection-end-line="290" selection-end-column="15" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -126,10 +87,14 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/waterbending/Torrent.java" />
<option value="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/firebending/FireBlast.java" />
<option value="$PROJECT_DIR$/src/plugin.yml" /> <option value="$PROJECT_DIR$/src/plugin.yml" />
<option value="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/Methods.java" /> <option value="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/Methods.java" />
<option value="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/waterbending/IceBlast.java" />
<option value="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/waterbending/Torrent.java" />
<option value="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/firebending/FireBlast.java" />
<option value="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/firebending/Fireball.java" />
<option value="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/earthbending/EarthSmash.java" />
<option value="$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/firebending/Lightning.java" />
</list> </list>
</option> </option>
</component> </component>
@ -164,7 +129,6 @@
<sortByType /> <sortByType />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="PackagesPane"> <pane id="PackagesPane">
<subPane> <subPane>
<PATH> <PATH>
@ -209,8 +173,27 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="ProjectKorra" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="ProjectKorra" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="com.projectkorra.ProjectKorra" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="earthbending" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
</PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
@ -338,12 +321,13 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<updated>1421974199475</updated> <updated>1421974199475</updated>
<workItem from="1421974203488" duration="120000" /> <workItem from="1421974203488" duration="120000" />
<workItem from="1422716556634" duration="2471000" /> <workItem from="1422716556634" duration="4108000" />
<workItem from="1422728278975" duration="4126000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="2591000" /> <option name="totallyTimeSpent" value="8354000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1456" height="939" extended-state="6" /> <frame x="-8" y="-8" width="1456" height="939" extended-state="6" />
@ -352,16 +336,16 @@
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32891566" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32891566" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Floobits Chat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Floobits Chat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32891566" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32891566" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="IntelliGuard" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="IntelliGuard" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@ -406,58 +390,83 @@
<option name="FILTER_TARGETS" value="false" /> <option name="FILTER_TARGETS" value="false" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/Utilities/AbilityLoader.java"> <entry file="file://$PROJECT_DIR$/src/plugin.yml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1052" max-vertical-offset="2737"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2737">
<caret line="72" column="28" selection-start-line="72" selection-start-column="28" selection-end-line="72" selection-end-column="28" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/waterbending/Torrent.java"> <entry file="file://$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/waterbending/Torrent.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="629" max-vertical-offset="10931"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="10659">
<caret line="59" column="69" selection-start-line="59" selection-start-column="69" selection-end-line="59" selection-end-column="69" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#768#785#0" expanded="true" /> <element signature="e#2186#2197#0" expanded="true" />
<element signature="e#878#897#0" expanded="true" />
<element signature="e#2115#2126#0" expanded="true" />
<element signature="e#2187#2198#0" expanded="true" />
<element signature="e#2257#2265#0" expanded="true" />
<element signature="e#7361#7368#0" expanded="true" />
<element signature="e#8651#8662#0" expanded="true" />
<element signature="e#8805#8813#0" expanded="true" />
<element signature="e#11373#11380#0" expanded="true" />
<element signature="e#11506#11514#0" expanded="true" />
<element signature="e#12672#12673#0" expanded="true" />
<element signature="e#12723#12724#0" expanded="true" />
<element signature="e#17910#17911#0" expanded="true" />
<element signature="e#17930#17931#0" expanded="true" />
<element signature="e#17957#17958#0" expanded="true" />
<element signature="e#17977#17978#0" expanded="true" />
<element signature="e#18015#18016#0" expanded="true" />
<element signature="e#18042#18043#0" expanded="true" />
<element signature="e#18076#18077#0" expanded="true" />
<element signature="e#18103#18104#0" expanded="true" />
<element signature="e#18155#18156#0" expanded="true" />
<element signature="e#18196#18197#0" expanded="true" />
<element signature="e#18225#18226#0" expanded="true" />
<element signature="e#18244#18245#0" expanded="true" />
<element signature="e#18283#18284#0" expanded="true" />
<element signature="e#18308#18309#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/waterbending/IceBlast.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="459" max-vertical-offset="5406">
<caret line="45" column="10" selection-start-line="45" selection-start-column="10" selection-end-line="45" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/Utilities/AbilityLoader.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1052" max-vertical-offset="2737">
<caret line="72" column="28" selection-start-line="72" selection-start-column="28" selection-end-line="72" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/waterbending/IceBlast.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="5406">
<caret line="45" column="10" selection-start-line="45" selection-start-column="10" selection-end-line="45" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/firebending/FireBurst.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.93194705" vertical-offset="714" max-vertical-offset="3094">
<caret line="28" column="33" selection-start-line="28" selection-start-column="33" selection-end-line="28" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/firebending/Fireball.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.65891474" vertical-offset="204" max-vertical-offset="5508">
<caret line="46" column="29" selection-start-line="46" selection-start-column="29" selection-end-line="46" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/firebending/FireBlast.java"> <entry file="file://$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/firebending/FireBlast.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="51" max-vertical-offset="5100"> <state vertical-scroll-proportion="0.42829457" vertical-offset="255" max-vertical-offset="5100">
<caret line="53" column="35" selection-start-line="53" selection-start-column="35" selection-end-line="53" selection-end-column="35" /> <caret line="48" column="26" selection-start-line="48" selection-start-column="26" selection-end-line="48" selection-end-column="26" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/waterbending/Torrent.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.75775194" vertical-offset="527" max-vertical-offset="10659">
<caret line="54" column="34" selection-start-line="54" selection-start-column="34" selection-end-line="54" selection-end-column="34" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2186#2197#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/plugin.yml"> <entry file="file://$PROJECT_DIR$/src/plugin.yml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2737"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2737">
@ -466,10 +475,26 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/earthbending/EarthSmash.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="391" max-vertical-offset="11339">
<caret line="71" column="47" selection-start-line="71" selection-start-column="47" selection-end-line="71" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/Methods.java"> <entry file="file://$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/Methods.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.17237009" vertical-offset="0" max-vertical-offset="43367"> <state vertical-scroll-proportion="-5.586207" vertical-offset="15784" max-vertical-offset="43367">
<caret line="149" column="4" selection-start-line="149" selection-start-column="4" selection-end-line="149" selection-end-column="4" /> <caret line="1091" column="42" selection-start-line="1091" selection-start-column="28" selection-end-line="1091" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/projectkorra/ProjectKorra/firebending/Lightning.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.23954372" vertical-offset="4367" max-vertical-offset="9129">
<caret line="290" column="15" selection-start-line="290" selection-start-column="15" selection-end-line="290" selection-end-column="15" />
<folding /> <folding />
</state> </state>
</provider> </provider>

25
src/com/projectkorra/ProjectKorra/earthbending/EarthSmash.java
View file

@ -1,9 +1,11 @@
package com.projectkorra.ProjectKorra.earthbending; package com.projectkorra.ProjectKorra.earthbending;
import java.util.ArrayList; import com.projectkorra.ProjectKorra.Ability.AvatarState;
import java.util.List; import com.projectkorra.ProjectKorra.BendingPlayer;
import java.util.Random; import com.projectkorra.ProjectKorra.Methods;
import com.projectkorra.ProjectKorra.ProjectKorra;
import com.projectkorra.ProjectKorra.TempBlock;
import com.projectkorra.ProjectKorra.Utilities.ParticleEffect;
import org.bukkit.Effect; import org.bukkit.Effect;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
@ -13,12 +15,9 @@ import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import com.projectkorra.ProjectKorra.BendingPlayer; import java.util.ArrayList;
import com.projectkorra.ProjectKorra.Methods; import java.util.List;
import com.projectkorra.ProjectKorra.ProjectKorra; import java.util.Random;
import com.projectkorra.ProjectKorra.TempBlock;
import com.projectkorra.ProjectKorra.Ability.AvatarState;
import com.projectkorra.ProjectKorra.Utilities.ParticleEffect;
public class EarthSmash { public class EarthSmash {
public static enum ClickType { public static enum ClickType {
@ -56,7 +55,7 @@ public class EarthSmash {
private BendingPlayer bplayer; private BendingPlayer bplayer;
private Block origin; private Block origin;
private Location loc, destination; private Location loc, destination;
private State state = State.START; public State state = State.START;
private int animCounter, progressCounter; private int animCounter, progressCounter;
private long time, delay, cooldown, flightRemove, flightStart; private long time, delay, cooldown, flightRemove, flightStart;
private double grabbedRange; private double grabbedRange;
@ -442,7 +441,8 @@ public class EarthSmash {
for(int y = -1; y <= 1; y++) for(int y = -1; y <= 1; y++)
for(int z = -1; z <= 1; z++) for(int z = -1; z <= 1; z++)
if((Math.abs(x) + Math.abs(y) + Math.abs(z)) % 2 == 0) //Give it the cool shape if((Math.abs(x) + Math.abs(y) + Math.abs(z)) % 2 == 0) //Give it the cool shape
blocks.add(loc.getWorld().getBlockAt(loc.clone().add(x,y,z))); if(loc != null)
blocks.add(loc.getWorld().getBlockAt(loc.clone().add(x,y,z)));
return blocks; return blocks;
} }
@ -455,6 +455,7 @@ public class EarthSmash {
for(int x = -1; x <= 1; x++) for(int x = -1; x <= 1; x++)
for(int y = -1; y <= 1; y++) for(int y = -1; y <= 1; y++)
for(int z = -1; z <= 1; z++) for(int z = -1; z <= 1; z++)
if(loc != null)
blocks.add(loc.getWorld().getBlockAt(loc.clone().add(x,y,z))); blocks.add(loc.getWorld().getBlockAt(loc.clone().add(x,y,z)));
return blocks; return blocks;
} }

2
src/com/projectkorra/ProjectKorra/firebending/FireBlast.java
View file

@ -42,7 +42,7 @@ public class FireBlast {
private static boolean canPowerFurnace = false; private static boolean canPowerFurnace = false;
static final int maxticks = 10000; static final int maxticks = 10000;
private Location location; public Location location;
private List<Block> safe = new ArrayList<Block>(); private List<Block> safe = new ArrayList<Block>();
private Location origin; private Location origin;
private Vector direction; private Vector direction;

13
src/com/projectkorra/ProjectKorra/firebending/Fireball.java
View file

@ -1,7 +1,9 @@
package com.projectkorra.ProjectKorra.firebending; package com.projectkorra.ProjectKorra.firebending;
import java.util.concurrent.ConcurrentHashMap; import com.projectkorra.ProjectKorra.Ability.AvatarState;
import com.projectkorra.ProjectKorra.Methods;
import com.projectkorra.ProjectKorra.ProjectKorra;
import com.projectkorra.ProjectKorra.Utilities.ParticleEffect;
import org.bukkit.Effect; import org.bukkit.Effect;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
@ -12,10 +14,7 @@ import org.bukkit.entity.Player;
import org.bukkit.entity.TNTPrimed; import org.bukkit.entity.TNTPrimed;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import com.projectkorra.ProjectKorra.Methods; import java.util.concurrent.ConcurrentHashMap;
import com.projectkorra.ProjectKorra.ProjectKorra;
import com.projectkorra.ProjectKorra.Ability.AvatarState;
import com.projectkorra.ProjectKorra.Utilities.ParticleEffect;
public class Fireball { public class Fireball {
@ -45,7 +44,7 @@ public class Fireball {
private boolean launched = false; private boolean launched = false;
private Player player; private Player player;
private Location origin; private Location origin;
private Location location; public Location location;
private Vector direction; private Vector direction;
private TNTPrimed explosion = null; private TNTPrimed explosion = null;

26
src/com/projectkorra/ProjectKorra/firebending/Lightning.java
View file

@ -1,27 +1,24 @@
package com.projectkorra.ProjectKorra.firebending; package com.projectkorra.ProjectKorra.firebending;
import java.util.ArrayList; import com.projectkorra.ProjectKorra.Ability.AvatarState;
import java.util.Arrays; import com.projectkorra.ProjectKorra.BendingManager;
import java.util.HashMap; import com.projectkorra.ProjectKorra.BendingPlayer;
import com.projectkorra.ProjectKorra.Methods;
import org.bukkit.Bukkit; import com.projectkorra.ProjectKorra.ProjectKorra;
import com.projectkorra.ProjectKorra.Utilities.ParticleEffect;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.Sound; import org.bukkit.Sound;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import com.projectkorra.ProjectKorra.BendingManager; import java.util.ArrayList;
import com.projectkorra.ProjectKorra.BendingPlayer; import java.util.Arrays;
import com.projectkorra.ProjectKorra.Methods; import java.util.HashMap;
import com.projectkorra.ProjectKorra.ProjectKorra;
import com.projectkorra.ProjectKorra.Ability.AvatarState;
import com.projectkorra.ProjectKorra.Utilities.ParticleEffect;
public class Lightning { public class Lightning {
public static enum State { public static enum State {
@ -57,7 +54,7 @@ public class Lightning {
private boolean charged, hitWater, hitIce; private boolean charged, hitWater, hitIce;
private State state = State.START; private State state = State.START;
private ArrayList<Entity> affectedEntities = new ArrayList<Entity>(); private ArrayList<Entity> affectedEntities = new ArrayList<Entity>();
private ArrayList<Arc> arcs = new ArrayList<Arc>(); public ArrayList<Arc> arcs = new ArrayList<Arc>();
private ArrayList<BukkitRunnable> tasks = new ArrayList<BukkitRunnable>(); private ArrayList<BukkitRunnable> tasks = new ArrayList<BukkitRunnable>();
private HashMap<Block, Boolean> isTransparentCache = new HashMap<Block, Boolean>(); private HashMap<Block, Boolean> isTransparentCache = new HashMap<Block, Boolean>();
@ -246,7 +243,8 @@ public class Lightning {
} }
remove(); remove();
} }
public void remove() {
public void remove() {
instances.remove(this); instances.remove(this);
} }

2
src/com/projectkorra/ProjectKorra/waterbending/IceBlast.java
View file

@ -43,7 +43,7 @@ public class IceBlast {
private Location destination; private Location destination;
private Block sourceblock; private Block sourceblock;
private Player player; private Player player;
private TempBlock source; public TempBlock source;
private double defaultdamage = DAMAGE; private double defaultdamage = DAMAGE;
public IceBlast(Player player) { public IceBlast(Player player) {

2
src/com/projectkorra/ProjectKorra/waterbending/Torrent.java
View file

@ -52,7 +52,7 @@ public class Torrent {
private boolean formed = false; private boolean formed = false;
private boolean launch = false; private boolean launch = false;
private boolean launching = false; private boolean launching = false;
private boolean freeze = false; public boolean freeze = false;
private double range = RANGE; private double range = RANGE;
private int damage = DAMAGE; private int damage = DAMAGE;
private int deflectdamage = DEFLECT_DAMAGE; private int deflectdamage = DEFLECT_DAMAGE;