Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
280 commits
Select commit Hold shift + click to select a range
9a4d74f
+manifest file (was deleted by reverting);
xZise Jan 31, 2011
15d09c3
!manifest file now working;
xZise Jan 31, 2011
3f23dd0
*moved my classes to com.bukkit.xzise; *first starts to use global wa…
xZise Feb 5, 2011
26359ae
+adapted tkelly's connection manager; !removed recursion in xlogger.log;
xZise Feb 6, 2011
c839668
!connectionmanager now frees the connection;
xZise Feb 6, 2011
69e90d4
*updated to 2.0.0 b13;
xZise Feb 7, 2011
513c51b
!text is now informing, that the warp is already globalized not publi…
xZise Feb 7, 2011
a787828
+implemented new subcommand layout (untested);
xZise Feb 8, 2011
1dcdeaf
+permission to reload database; !added new permissions to "has admin …
xZise Feb 8, 2011
d943eab
!before you could create a global warp which already exists (but not …
xZise Feb 8, 2011
0caf1a7
SignWarp
Jan 22, 2011
7c647d9
!no NPE if creating a global warp, which already exists but not by th…
xZise Feb 10, 2011
9c82550
+xWarp-signs;
xZise Feb 10, 2011
95e3c9a
*moved out of com.bukkit; *start with world support (needs to saved c…
xZise Feb 10, 2011
ce48838
*first "block place" prevention; !to long coordinate lines;
xZise Feb 10, 2011
d7b9d91
!lister also shows warps not on the global list;
xZise Feb 12, 2011
f5d7485
+permission wrapper now allows everyone to use signs (if permissions …
xZise Feb 12, 2011
f8289c9
+If a new warp sign is found it will print a little message;
xZise Feb 12, 2011
eca6b19
*changed database to store a world name instead of an id; !multiple X…
xZise Feb 13, 2011
da88c34
!multiple XLogger instances available;
xZise Feb 13, 2011
6195e9c
!delete warp now working;
xZise Feb 13, 2011
7ebf14b
!warp-help is not hidden by warp-to; !warp-help now tests the pages c…
xZise Feb 13, 2011
527b222
Merge branch 'master' into new_commands
xZise Feb 13, 2011
1481840
*updated package names;
xZise Feb 13, 2011
debc225
*fixed version;
xZise Feb 13, 2011
d92a9d1
+prepared to use new plugin onCommand() architecture; *uses a hashmap…
xZise Feb 13, 2011
2760f2f
-removed debug output;
xZise Feb 13, 2011
ef3c3c4
+/list legend
xZise Feb 14, 2011
2574e76
+/warp rename; !correct loging outputs;
xZise Feb 14, 2011
826794f
Merge branch 'multiverse'
xZise Feb 14, 2011
339b620
+Help message;
xZise Feb 14, 2011
af7d890
!rename don't use update/* as command;
xZise Feb 14, 2011
cf92201
!/warp list legend don't try to list anything;
xZise Feb 14, 2011
c5c0b9a
*make rename working;
xZise Feb 14, 2011
49f0ddd
*some javadoc changes; +new warpcomparator;
xZise Feb 14, 2011
66c3a76
-alternative warp name ("did you mean?"); +detailed error message if …
xZise Feb 14, 2011
ffcc145
*fixed parameter handling;
xZise Feb 14, 2011
86219cc
+/warp info command; !/warp list <name> fixed;
xZise Feb 15, 2011
16d3443
!closing group bracket; +CommandSender ability; +/warp command;
xZise Feb 16, 2011
a58242f
+added a generic lister; !logger is now back single lined;
xZise Feb 16, 2011
3c8c5e9
!warp commands could now be called ingame; !color fix in group;
xZise Feb 16, 2011
658674d
!lister is now correctly working; *first tweaked/dynamic help; +warp.…
xZise Feb 17, 2011
c27ae8b
*shorter help; *don't load non global into globals; *language fix;
xZise Feb 18, 2011
d21cb4f
!deletes the warp correctly;
xZise Feb 18, 2011
bd866eb
*reorderd the help commands; *show specific help if the command fails;
xZise Feb 18, 2011
b60dc64
!removes error that there are max -1 page; *xwarp commands from ingam…
xZise Feb 19, 2011
2598164
!warp signs now allows "xWarp:"; +prepared a create-and-give command;…
xZise Feb 19, 2011
6fa951c
!help header fixed; !title is now correctly colored; *header of pages…
xZise Feb 20, 2011
3a4b7ae
+first version of new list/manager;
xZise Feb 20, 2011
7eec296
+implemented a system to exchange to saved datastructure;
xZise Feb 20, 2011
056a0ee
+default constructor (to prevent naging); *moved database to plugin l…
xZise Feb 20, 2011
5a071a4
!creating xWarp directory if missing;
xZise Feb 20, 2011
cfc13f5
*version update;
xZise Feb 20, 2011
8dad5b4
-removed old constructor;
xZise Feb 20, 2011
809ee8b
+(senseless) null connection; *tweaked sqliteconnection; +settings to…
xZise Feb 21, 2011
3a40879
*Merge branch 'master' into new-warplist; +warplist/warpmanager model;
xZise Feb 21, 2011
8e28ec8
Revert "-removed old constructor;"
xZise Feb 21, 2011
32b74ba
+added multiple parameters warp defining command;
xZise Feb 22, 2011
b4dbcfd
Merge branch 'master' into new-warplist
xZise Feb 25, 2011
293b04f
!no error on creating a warp;
xZise Feb 25, 2011
4c90c2e
*use stripColor (like the console); !height is now a double;
xZise Feb 25, 2011
a51b0cf
+added commands to the list; !commands don't return false; !fixed par…
xZise Feb 27, 2011
32d92dc
!removes the error, that it doesn't work with newer versions;
xZise Feb 27, 2011
5de992d
Merge branch 'master' into new-warplist
xZise Feb 27, 2011
539a8a0
+the editor now could change;
xZise Feb 27, 2011
231398d
!show now invalid worlds;
xZise Feb 27, 2011
04ea085
*refactored method;
xZise Feb 27, 2011
a89389d
+hmod functionality; +import command; -null connection;
xZise Feb 28, 2011
2dfaaf1
*fixed add-editor message;
xZise Feb 28, 2011
f73b842
Merge branch 'new-warplist'
xZise Feb 28, 2011
3f6960d
!returns correct warp is no initiator is given;
xZise Mar 1, 2011
e36a1f8
Merge branch 'master' into hmod
xZise Mar 2, 2011
396ab12
+implemented parser for onCommand();
xZise Mar 2, 2011
1bbaf8d
+disabling permissions if the plugin will be disabled;
xZise Mar 2, 2011
ac828d2
*removed deprecated stuff;
xZise Mar 4, 2011
9586189
*removed deprecation of permissionwrapper;
xZise Mar 4, 2011
8f24aa4
Merge branch 'master' into hmod
xZise Mar 4, 2011
b2633d2
+save editors in hmod; !import command closes the connection;
xZise Mar 4, 2011
45c5d69
+version parameter;
xZise Mar 5, 2011
904633d
+advanced permissions command;
xZise Mar 5, 2011
b493a6f
Merge branch 'master' into hmod
xZise Mar 5, 2011
f09e695
!remove error in info command, when the warp is invalid; !show permis…
xZise Mar 5, 2011
208f752
*published & tested;
xZise Mar 5, 2011
d853b5f
Merge branch 'master' into hmod
xZise Mar 6, 2011
2703774
+first version of the export command;
xZise Mar 6, 2011
33fbecf
*improved permission detection; +export permissions;
xZise Mar 7, 2011
63fa64e
!use new listener;
xZise Mar 7, 2011
cfa4fd4
+create method;
xZise Mar 7, 2011
5ea432e
+export command;
xZise Mar 9, 2011
871a962
*moved parser to MinecraftUtil; +warpable/positionable; +force-to com…
xZise Mar 10, 2011
861716d
!no crash with info if the warp doesn't exists;
xZise Mar 10, 2011
8d9d8f4
Merge branch 'master' into hmod
xZise Mar 11, 2011
6c8ffdf
!there are no warps to list;
xZise Mar 11, 2011
d6de13c
Merge branch 'master' into hmod
xZise Mar 11, 2011
00899ca
!doesn't fail on database creation; *2.7.0 release;
xZise Mar 11, 2011
e422932
!more intelligent getName(); !corrected modify determinition; +export…
xZise Mar 15, 2011
fe2d03b
!hmod connection now reads the editors correct;
xZise Mar 18, 2011
08c0416
-isPlayer() (as deleted);
xZise Mar 18, 2011
6e39688
!fixed rename/give with hmod file; !rename is now really renaming the…
xZise Mar 27, 2011
ca4c349
*improved file close;
xZise Mar 27, 2011
d8cd98c
*version number fix;
xZise Mar 27, 2011
da386fa
Merge branch 'master' into block-events
xZise Mar 27, 2011
bfa8db9
*update version;
xZise Mar 27, 2011
816870e
*updated XLogger (to prevent problems with Qukkiz); +warp other; +add…
xZise Mar 30, 2011
1b4180a
Merge branch 'master' into block-events
xZise Apr 1, 2011
284071b
!NPE removed;
xZise Apr 1, 2011
90339db
+cooldown/warmup;
xZise Apr 2, 2011
0c156cc
*permission node name fail;
xZise Apr 2, 2011
9d5d190
!warm up message now shows up;
xZise Apr 2, 2011
05c92ac
*version number update;
xZise Apr 2, 2011
3219841
!getInteger is now working without a permissions system;
xZise Apr 3, 2011
120b826
*cleaned up code; *used newer MinecraftUtil (to prevent conflicts wit…
xZise Apr 3, 2011
07c5917
*only rightclick now warps;
xZise Apr 3, 2011
3fbad23
!permission check now works also for wrappers;
xZise Apr 3, 2011
aa9d2d4
+prices for warping/creation;
xZise Apr 3, 2011
670cf3b
+added variables in the permissions; *prepared creator storage in the…
xZise Apr 9, 2011
6f22080
+message command; *renamed some variables to prepare limit merge; +me…
xZise Apr 9, 2011
c7d2c9c
!import command now generates new ids for each warp, so no id conflic…
xZise Apr 11, 2011
3a14852
Merge branch 'master' into limits
xZise Apr 11, 2011
ac5ba57
+change creator command; +chown as alias for give; +warp.admin.change…
xZise Apr 11, 2011
5391757
!info is showing correct group and more informative player name;
xZise Apr 11, 2011
3724c63
+default creator = owner with older hmod files; !allow multiple warps…
xZise Apr 12, 2011
1fb6d6e
!no index out of bounds reading the new file; +reading the number of …
xZise Apr 12, 2011
d5ebcc2
+show amount of created warps; +unwrapping method for Players; !get c…
xZise Apr 13, 2011
406f750
*update version number;
xZise Apr 15, 2011
c1c2df3
Merge branch 'master' into prices
xZise Apr 15, 2011
85b6c05
+force-to option, so force-to is obsolete;
xZise Apr 15, 2011
fa32754
!error on startup;
xZise Apr 15, 2011
e0753eb
+limit total value;
xZise Apr 15, 2011
f9ecf36
+storage in hmod/sqlite; +price command; *info command shows price;
xZise Apr 15, 2011
153b977
*colored price in info command; +better "pay" messages; !pay also if …
xZise Apr 15, 2011
8399171
+use force-to option now; +create account if not exists; *hmod now st…
xZise Apr 15, 2011
1bb6e50
*warp.admin.price as admin permission added; +updateOwner in WarpList…
xZise Apr 15, 2011
ceb8255
*update version number;
xZise Apr 15, 2011
d469285
!start the editors read at the correct position (hmod v4); !prevent w…
xZise Apr 18, 2011
4ae0119
!list order is now alphabetical; +warp.edit.* permissions; +option to…
xZise Apr 24, 2011
cc28110
+easteregg with 1 % chance of "as beer";
xZise Apr 24, 2011
0ed5376
+test if the warp is save; !save the price now correctly within sqlit…
xZise Apr 27, 2011
91231b8
*added fixed Util;
xZise May 1, 2011
2762678
+warm up cancelation if the player moves/hurt;
xZise May 1, 2011
89a7269
!added edit-permission (except edit-cc) as default permission; +warp …
xZise May 2, 2011
03039f5
Merge branch 'master' into warm-up-cancellation
xZise May 2, 2011
f10099b
!register the movement event; +messages if the warmup was cancelled; …
xZise May 2, 2011
6379b9f
*moved listeners;
xZise May 2, 2011
ac38847
+first implementation of inter/intraworld limitation;
xZise May 2, 2011
3d81c09
+some more save blocks (e.g. water or flowers);
xZise May 2, 2011
b0c8230
+fixed location;
xZise May 2, 2011
6f3cfc8
+first class;
xZise May 2, 2011
7becd30
+introduced FixedLocation to avoid cloning the location every single …
xZise May 2, 2011
5c93694
*update plugin.yml;
xZise May 2, 2011
04feebd
Merge branch 'saver-warp' into world-limits
xZise May 2, 2011
849300e
Merge branch 'master' into world-limits
xZise May 2, 2011
d7a120b
+added steps for savety; +also test 3 blocks above;
xZise May 2, 2011
f3c6755
Merge branch 'master' into saver-warp
xZise May 2, 2011
6adea25
!LocationWrapper returns new location;
xZise May 2, 2011
fa6fdb8
Merge branch 'master' into warp-protection-areas
xZise May 2, 2011
d5301ea
Merge branch 'saver-warp' into warp-protection-areas
xZise May 2, 2011
0c47b2b
+added method, to test if a player could create a warp there;
xZise May 2, 2011
5322187
*improved command sender unwrapping;
xZise May 2, 2011
a2655ef
Merge branch 'master' into world-limits
xZise May 2, 2011
f30ae68
+added (untested) support for iConomy version 4 and version 5;
xZise May 3, 2011
e5e8337
+BOSEconomy support;
xZise May 3, 2011
770b5ae
*initialize world correctly;
xZise May 3, 2011
e1dc4b6
Merge branch 'master' into economy-wrappers
xZise May 3, 2011
c41e1ac
+account for base price; +option to define economy plugin; +recognize…
xZise May 4, 2011
a8f5384
Merge branch 'world-limits'
xZise May 4, 2011
6f6cac4
Merge branch 'saver-warp'
xZise May 4, 2011
f1b2e92
*moved WarpDestination; *formated WarpDestination; *update version;
xZise May 4, 2011
eb76076
+first test prototype in WarpManager;
xZise May 4, 2011
88df98e
+store also groups as editors;
xZise May 5, 2011
de2aa1a
*little english fix;
xZise May 5, 2011
fd8457a
*formating; *warp sign found in single line;
xZise May 6, 2011
1212955
+Sign creation permissions; +Essentials support; *is next release (no…
xZise May 7, 2011
63386c6
+re-set base account and economy plugin after reload; +untested suppo…
xZise May 7, 2011
f9f99e2
*same link message with permissions; !iConomyFactury now determines c…
xZise May 7, 2011
4218cec
!create a account before using it (iConomy 4); +warp.sign.create.* as…
xZise May 8, 2011
ec72fea
!reads the price from sqlite database; *minor changes for BOSEconomy …
xZise May 8, 2011
a8856af
!creating a new account if there is no one;
xZise May 8, 2011
b705c4f
*fixed version number;
xZise May 8, 2011
955a72d
!checking now the correct visibility permission for sign creation; +p…
xZise May 9, 2011
7434b37
*version number updated;
xZise May 9, 2011
3f7eec4
*checking list/search/info permission before;
xZise May 9, 2011
7f6041f
*changed permissions to use warp sign;
xZise May 9, 2011
46455a2
*moved economy files like in Qukkiz; *each permission has now “admin/…
xZise May 13, 2011
1bf95f9
+added (not) listed and possibility to make warps free;
xZise May 13, 2011
56d911a
+list legend added to the help list command;
xZise May 13, 2011
c2d911b
+permission to list unlisted warps;
xZise May 13, 2011
ee59801
*replaces static PermissionWrapper with modular PermissionsHandler; *…
xZise May 14, 2011
e909129
+option to update the warp with create; +listed command; !permissions…
xZise May 15, 2011
0d0f1aa
*added listed as command;
xZise May 15, 2011
ab4b6d3
Merge branch '2.11.0-main'
xZise May 15, 2011
52eba88
+missing PermissionDouble interface;
xZise May 16, 2011
dde82cb
!LocationWrapper is now updating properly; +little info if xWarp upda…
xZise May 16, 2011
fc0af02
*reorganized playerCanModifyWarp();
xZise May 16, 2011
952956e
+option to deactive the economy system completely;
xZise May 16, 2011
2eb6826
!read location values with the correct types; !copy the name of the p…
xZise May 16, 2011
cfeceb7
*version number fix;
xZise May 16, 2011
71f25e7
*removed warnings about generic arrays;
xZise May 17, 2011
1d278da
*made the permission prices as doubles;
xZise May 17, 2011
abd284c
+register support; +mineconomy support;
xZise May 25, 2011
e4081bb
+specific Permissions 3 support;
xZise May 26, 2011
3c7038b
*implemented world specific limits;
xZise May 26, 2011
a6dfecb
*moved EconomyHandler to shared package; !updated to new Essentials E…
xZise Jun 1, 2011
0ae536e
+separated legacy class for permission 3 plugin; *use the correct met…
xZise Jun 1, 2011
bce555c
Merge branch 'permissions-3' into double-permission-prices
xZise Jun 2, 2011
5c5f556
*fix version;
xZise Jun 2, 2011
add5d90
!prints now the correct message on linking; *More specific error repo…
xZise Jun 3, 2011
d98b716
*getComma(double) fixed; +print world limits and permission values in…
xZise Jun 8, 2011
c3879b7
+unload world feature (opt.); !get the correct limits;
xZise Jun 8, 2011
4526a2f
-build id;
xZise Jun 9, 2011
279d71c
+status command; !using the correct player's instance;
xZise Jun 13, 2011
1bfa68b
+variables in signs; !q&d fix for PermissionsEx; +improved warp list …
xZise Jun 23, 2011
8ea0bed
*tried to fix search command;
xZise Jun 30, 2011
77d0b11
+double prices for warps (RAM only atm); +first yml implementation;
xZise Jun 30, 2011
7c34ea9
Merge branch 'warp-protection-areas' into v3
xZise Jun 30, 2011
ea45a2f
Merge branch 'editor-groups' into v3
xZise Jun 30, 2011
4cc93f5
*simplified EditorPermissions (only true/false no null anymore); *War…
xZise Jul 11, 2011
9134f7b
*manage WPAs as non global lists; -visibility for warp objects (makes…
xZise Jul 13, 2011
191e7d3
*EditorPermissions holding now an EnumMap; +EditorPermissions.Type en…
xZise Jul 14, 2011
ef03417
-junk "com" file;
xZise Jul 15, 2011
d407362
*specific Warp- and WarpProtectionArea- Permissions; *WPA now support…
xZise Jul 16, 2011
6b765cd
+mavenised; +yml now support protection areas; +yml could add warps;
xZise Jul 21, 2011
4739b3d
+method to get idinterface for WPAs; *apply generic parameters of idi…
xZise Jul 21, 2011
0cb8b39
*use ImmutableMap from guava; +Warp editor permission nodes; *fixed i…
xZise Jul 21, 2011
cca9107
+commands separation for wpa/warp commands; +separate warp object man…
xZise Jul 27, 2011
bd8b668
+add/remove Editor in WarpObject; +WPAManager; -WarpManager.loadFromD…
xZise Jul 28, 2011
ecb57c0
+common manager (common method of both managers); +has(Player,Group,E…
xZise Jul 28, 2011
03b9ca2
+Pays the price of the visibility if it was changed;
xZise Jul 29, 2011
2007da1
*CommonManager now handles the case sensitivity of the list; *WarpMan…
xZise Jul 30, 2011
7c88f3f
+managing xwarp/xman command; +import/export supports WPAs; !fixed SQ…
xZise Aug 2, 2011
48b6176
*manager uses ImmutableSet<T> instead of T[]; !reload wpas at start u…
xZise Aug 2, 2011
0b37954
*use XLogger from Bukkit Plugin Utilities; !fixed number of NPEs beca…
xZise Aug 2, 2011
f2be285
!create a new editor permission object on invite if needed; *canModif…
xZise Aug 4, 2011
d397b0f
*final version 3.0.0; +safety test with verbose output; *WPA are now …
xZise Aug 11, 2011
8ce45e2
+cooldown/warmup command;
xZise Sep 8, 2011
7287d03
!try to fix the searcher (needs to be tested and with debug output);
xZise Sep 9, 2011
e3ae47a
*uploaded not saved file;
xZise Sep 9, 2011
3229bc3
+Marker support; -CDWUConvCommand;
xZise Sep 9, 2011
e8e41a9
+dynamic plugin.yml version; +change world command; +default columns …
xZise Sep 13, 2011
636c465
*support dynmap v0.23; !remove marker if a warp get deleted; !use IRO…
xZise Sep 14, 2011
d6efb81
!canModify is now using the correct CommandSender instance; !fixed th…
xZise Sep 17, 2011
d363460
+maven assembly to create package with marker file; +marker.enabled o…
xZise Sep 23, 2011
431df26
!define warp manager before using it in the serverlistener;
xZise Oct 5, 2011
a0812c2
*3.1.5; +permission to view own unlisted warps; !sign warp variables …
xZise Nov 29, 2011
d7d5309
*depend on newer version of Bukkit (1.1-R5-SNAPSHOT actually); *use n…
xZise Feb 19, 2012
f929d31
*make xWarp work with newer version of dynmap;
xZise Feb 19, 2012
35e48ee
+teleport cause; *depend on R4 for now;
xZise Feb 29, 2012
84f764f
*use newer configuration classes for YmlConnection;
xZise Feb 19, 2012
0dfd08e
*made compatible with 1.1-R6; *depend on BPU 1.3.0-B7 and remove all …
xZise Mar 2, 2012
e8a7379
*require BPU 1.3.0 stable; -remove option 'marker.enabled' (only as b…
xZise Apr 20, 2012
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Eclipse stuff
/.classpath
/.project
/.settings

# netbeans
/nbproject

# we use maven!
/build.xml

# maven
/target

# vim
.*.sw[a-p]

# various other potential build files
/build
/bin
/dist
/manifest.mf

# Mac filesystem dust
/.DS_Store

# intellij
*.iml
*.ipr
*.iws
.idea/
Binary file added img/marker-16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/marker.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
102 changes: 102 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>de.xzise.bukkit</groupId>
<artifactId>xWarp</artifactId>
<version>3.1.7</version>
<name>xWarp</name>
<dependencies>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.1-R6</version>
</dependency>
<dependency>
<groupId>de.xzise.bukkitutil</groupId>
<artifactId>bukkitutil</artifactId>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>org.dynmap</groupId>
<artifactId>DynmapCoreAPI</artifactId>
<version>0.33</version>
</dependency>
</dependencies>

<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>*.yml</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<excludes>
<exclude>*.yml</exclude>
</excludes>
</resource>
</resources>
<!--finalName>${project.name}</finalName -->
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>src/main/assembly/package.xml</descriptor>
</descriptors>
<!-- Hack for bug in maven-assembly: http://jira.codehaus.org/browse/MASSEMBLY-449 -->
<archiverConfig>
<fileMode>420</fileMode> <!-- 420(dec) = 644(oct) -->
<directoryMode>493</directoryMode> <!-- 493(dec) = 755(oct) -->
<defaultDirectoryMode>493</defaultDirectoryMode>
</archiverConfig>
</configuration>
<executions>
<execution>
<id>build</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.3</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version>
<configuration>
<archive>
<manifestEntries>
<Class-Path>../lib/BukkitPluginUtilities.jar
../lib/sqlitejdbc-v056.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
</project>
2 changes: 0 additions & 2 deletions src/MANIFEST.MF

This file was deleted.

2 changes: 2 additions & 0 deletions src/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Manifest-Version: 1.0
Class-Path: ../lib/sqlitejdbc-v056.jar
22 changes: 22 additions & 0 deletions src/main/assembly/package.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>bin</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>zip</format>
</formats>
<files>
<file>
<source>${project.build.directory}/${artifactId}-${version}.jar</source>
<outputDirectory>/</outputDirectory>
<destName>xWarp.jar</destName>
</file>
<file>
<source>${project.basedir}/img/marker-16.png</source>
<outputDirectory>/xWarp/</outputDirectory>
<destName>marker.png</destName>
</file>
</files>
</assembly>
149 changes: 149 additions & 0 deletions src/main/java/de/xzise/metainterfaces/FixedLocation.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
package de.xzise.metainterfaces;

import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.util.Vector;

/**
* A class which acts like a normal location, but is immutable.
* @author Fabian Neundorf
*/
public class FixedLocation implements Moveable<FixedLocation> {

public final World world;
public final double x;
public final double y;
public final double z;
public final float pitch;
public final float yaw;

public FixedLocation(Location location) {
this(location.getWorld(), location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
}

public FixedLocation(final double x, final double y, final double z) {
this((World) null, x, y, z);
}

public FixedLocation(final World world, final double x, final double y, final double z) {
this(world, x, y, z, 0, 0);
}

public FixedLocation(final World world, final double x, final double y, final double z, final float yaw, final float pitch) {
this.world = world;
this.x = x;
this.y = y;
this.z = z;
this.pitch = pitch;
this.yaw = yaw;
}

public FixedLocation(FixedLocation location, double xDelta, double yDelta, double zDelta) {
this(location.world, location.x + xDelta, location.y + yDelta, location.z + zDelta, location.yaw, location.pitch);
}

public Location toLocation() {
return new Location(this.world, this.x, this.y, this.z, this.yaw, this.pitch);
}

/**
* Gets the block at the represented location
*
* @return Block at the represented location
*/
public Block getBlock() {
return world.getBlockAt(this.getBlockX(), this.getBlockY(), this.getBlockZ());
}

/**
* Gets the floored value of the X component, indicating the block that
* this location is contained with.
*
* @return block X
*/
public int getBlockX() {
return Location.locToBlock(x);
}

/**
* Gets the floored value of the Y component, indicating the block that
* this location is contained with.
*
* @return block y
*/
public int getBlockY() {
return Location.locToBlock(y);
}

/**
* Gets the floored value of the Z component, indicating the block that
* this location is contained with.
*
* @return block z
*/
public int getBlockZ() {
return Location.locToBlock(z);
}

/**
* Gets a Vector pointing in the direction that this Location is facing
*
* @return Vector
*/
public Vector getDirection() {
return getDirection(this.yaw, this.pitch);
}

/**
* Constructs a new {@link Vector} based on this Location
*
* @return New Vector containing the coordinates represented by this Location
*/
public Vector toVector() {
return new Vector(x, y, z);
}

/**
* Gets a Vector pointing in the direction that this Location is facing
*
* @param yaw The rotation at the x-axis in degrees.
* @param pitch The rotation at the z-axis in degrees.
*
* @return Vector
*/
public static Vector getDirection(double yaw, double pitch) {
Vector vector = new Vector();

double rotX = Math.toRadians(yaw);
double rotY = Math.toRadians(pitch);

vector.setY(-Math.sin(rotY));

double h = Math.cos(rotY);
vector.setX(-h*Math.sin(rotX));
vector.setZ(h*Math.cos(rotX));

return vector;
}

public FixedLocation move(double xDelta, double yDelta, double zDelta) {
return new FixedLocation(this, xDelta, yDelta, zDelta);
}

@Override
public FixedLocation moveX(double delta) {
return this.move(delta, 0, 0);
}

@Override
public FixedLocation moveY(double delta) {
return this.move(0, delta, 0);
}

@Override
public FixedLocation moveZ(double delta) {
return this.move(0, 0, delta);
}

}
Loading