Commit Graph

5125 Commits

Author SHA1 Message Date
md678685
ded6f06ed2 Merge remote-tracking branch 'origin/2.x' into 1.13 2018-11-19 19:48:38 +00:00
md678685
2605e050a0 Deduplicate ItemDb code 2018-11-19 19:41:01 +00:00
md678685
19b1e19e42 Remove extraneous imports 2018-11-19 19:30:35 +00:00
md678685
f7a1149cac Port old ItemDb back 2018-11-19 14:13:05 +00:00
md678685
7dd52dab32 Add non-NMS VersionUtil
*Should* work on Glowstone. TODO: use this instead of ReflUtil where appropriate.
2018-11-19 14:12:10 +00:00
md678685
937aec600a Implement more FakeServer methods 2018-11-19 12:52:19 +00:00
md678685
4802053da6 Rename en-GB to en_GB for consistency 2018-11-19 12:51:26 +00:00
md678685
0105dff7ac Update AntiBuild default entries to enum names 2018-11-19 12:49:34 +00:00
md678685
8cc448efcf Remove meta/durability checks from AntiBuild 2018-11-19 11:38:50 +00:00
md678685
982b358bf8 Bump AntiBuild and Protect to api-version: 1.13 2018-11-19 11:28:31 +00:00
md678685
ffc80d61af Implement missing FakeWorld and OfflinePlayer methods 2018-11-19 11:26:05 +00:00
md678685
f55956612c
Add messages_en-GB.properties (#2206)
Tins what it does on the say.
2018-11-19 08:38:37 +00:00
md678685
cd3b342d74 Target Bukkit 1.13.2 2018-10-31 15:00:54 +00:00
md678685
ba959586e2 Merge remote-tracking branch 'games647/java9' into 1.13 2018-10-31 14:53:49 +00:00
md678685
4c07e584b7 Default to max stack size 2018-10-31 14:47:45 +00:00
Banbeucmas
280d1215de Adding EssentialsWarpEvent (#1921) @Banbeucmas
* Adding EssentialsWarpEvent for checking if player is wrapping

* Spacing

* Adding Trade parameter

* Refactoring

* Adding #setWarp() to the Event

* Spacing

* Documenting the purpose of the Event

* Javadoc?
2018-10-28 18:53:52 +00:00
montlikadani
a2a95ed840 Added acacia and dark oak tree types (#2001) @montlikadani
* Update Commandbigtree.java

* Update Commandbigtree.java

* Update Commandtree.java
2018-10-28 18:41:46 +00:00
md678685
4bd9461282
Rename help-.md to help.md 2018-10-28 10:54:01 +00:00
md678685
96adef5269
Update issue templates (#2045)
* Update issue templates

Add new issue templates - I didn't even know GitHub had these now

* Remove duplicate bug template

* Remove duplicate feature template

* Update help-.md

* Update report-a-bug.md

* Update request-a-feature.md

* Delete ISSUE_TEMPLATE.md
2018-10-27 15:42:56 +01:00
md678685
9576ea25a6
Use reflection-based detection for pickup listener in player listener (#2151)
Allows the plugin to start up on Glowstone correctly.

Tested on Spigot 1.12.2, Spigot 1.9.4 and Glowstone 2018.7.0, works correctly on all.
2018-10-27 15:37:29 +01:00
md678685
a7fcafb245 Filter out comment lines when loading items.json 2018-10-27 15:00:04 +01:00
md678685
73bb41d579 Merge branch '1.13-items' into 1.13 2018-10-26 15:59:51 +01:00
md678685
0a90d76493 Remove item IDs from Worth 2018-10-15 13:56:36 +01:00
md678685
010981d3c8 Remove ID-based charges in /repair 2018-10-15 13:51:04 +01:00
md678685
3353061e76 Remove ID-based permission checks in /more 2018-10-15 13:49:16 +01:00
md678685
79bc34047b Allow multiple item names in /clearinventory
Allow a comma-separated list of item names in /clearinventory.
2018-10-15 13:46:12 +01:00
md678685
60c90408e7 Remove ID-based permission checks in /give and /item 2018-10-15 13:16:10 +01:00
md678685
1218c3e226 Merge branch '1.13' into 1.13-items 2018-10-13 18:23:58 +01:00
md678685
a05fc9d08e Remove duplicated OfflinePlayer method 2018-10-13 17:14:10 +01:00
md678685
6906ef2154 Merge branch '1.13' into 1.13-items 2018-10-13 16:59:57 +01:00
md678685
7d25e84ebc Merge branch '2.x' into 1.13 2018-10-13 16:59:44 +01:00
md678685
121d935315 Implement missing FakeServer methods 2018-10-13 16:55:49 +01:00
md678685
2f66a866d8 Implement missing FakeWorld and OfflinePlayer methods 2018-10-13 16:55:42 +01:00
md678685
0e088c17a8 Remove IdProvider dependency 2018-10-13 16:45:20 +01:00
md678685
4cd8a6636b Log invalid JSON entries 2018-10-13 16:44:50 +01:00
md678685
5c7fc763fc Formatting 2018-10-13 16:44:24 +01:00
md678685
1e381a59be Throw meaningful exception when item not found 2018-10-13 16:32:21 +01:00
md678685
85111f25cb Use ItemData#equals when finding item name
Avoids accidentally causing an NPE while comparing potion data.
2018-10-13 16:09:45 +01:00
md678685
f78887a02e Remove item IDs from /itemdb 2018-10-13 15:59:25 +01:00
md678685
feba535637 Actually assign the ManagedFile to file 2018-10-13 15:38:45 +01:00
md678685
3262143c73 Implement missing FakeServer methods 2018-10-13 15:30:27 +01:00
md678685
18feb7967a Implement missing FakeWorld and OfflinePlayer methods 2018-10-13 15:26:58 +01:00
md678685
e9b1511117 Remove item ID support in Worth 2018-10-12 17:26:41 +01:00
md678685
177e5f62f7 Remove providers; move JSON support into ItemDb 2018-10-12 17:26:22 +01:00
md678685
f3f4395da7
Reset BuildTools work directory on Travis 2018-10-09 20:32:40 +01:00
md678685
442e46b012
Return to root after BuildTools on Travis 2018-10-09 20:25:36 +01:00
md678685
37d699d05b
mkdir -p in Travis 2018-10-09 19:54:31 +01:00
md678685
77ed1e1d4a
Ensure Travis runs BuildTools before mvn install 2018-10-09 19:52:42 +01:00
md678685
50e4cd67b5
Fix typo in Travis config 2018-10-09 19:47:57 +01:00
md678685
83a90eb553
Update .travis.yml 2018-10-09 19:45:28 +01:00